Merge pull request #176 from tkrille/support-merge

Remove distinction between auth- and resource-server

Author: dacrome

README.md

@@ -12,16 +12,14 @@ This repository contains the OSIAM Connector for Java.
 
 The current version can be found at http://search.maven.org/#search|ga|1|osiam.
 
-Together with the OSIAM server it provides an easy to use OAuth2 SCIM based user
-login for Java.
+Together with OSIAM it provides an easy to use OAuth2 SCIM based user login for
+Java.
 
 ## Short OSIAM introduction
 
 OSIAM provides an easy and secure oauth2 standard login of users. It is also
-possible to assign users to groups with different roles.
-
-It is possible to run a dedicated OSIAM User and Group Server or to connect to
-an existing identity provider (like login over facebook).
+possible to assign users to groups with different roles. It is also possible to
+connect to an existing identity provider (like login over facebook).
 
 OSIAM provides three different ways to log in:
 
@@ -31,13 +29,13 @@ OSIAM provides three different ways to log in:
   user is used for login)
 
 - 1 Step login: The user can provide his login and password to your application
-  and you can get the security credentials directly from the OSIAM server
-  without a required authorization from the user
+  and you can get the security credentials directly from OSIAM without a
+  required authorization from the user
 
-- direct login: It is possible to get a security credentials directly from the
-  OSIAM server without the need of any user data
+- direct login: It is possible to get a security credentials directly from OSIAM
+  without the need of any user data
 
-The different ways to login depend on the configured grants on the OSIAM server.
+The different ways to login depend on the configured grants in OSIAM.
 
 
 OSIAM does not depend on any programming language.

docs/create-osiam-connector.md

@@ -4,19 +4,7 @@ using the `OsiamConnector.Builder()` class.
 
 ```java
 OsiamConnector osiamConnector = new OsiamConnector.Builder()
-       .setAuthServerEndpoint(AUTH_ENDPOINT_ADDRESS)
-       .setResourceServerEndpoint(RESOURCE_ENDPOINT_ADDRESS)
-       .setClientId(CLIENT_ID)
-       .setClientSecret(CLIENT_SECRET)
-       .build();
-```
-
-In case your auth and resource server are located at the same location and
-follow the specified naming convention you can also use:
-
-```java
-OsiamConnector osiamConnector = new OsiamConnector.Builder()
-       .setEndpoint(SERVER_ENDPOINT_ADDRESS)
+       .setEndpoint(OSIAM_ENDPOINT)
        .setClientId(CLIENT_ID)
        .setClientSecret(CLIENT_SECRET)
        .build();

docs/exceptions.md

@@ -28,26 +28,26 @@ thrown if an invalid argument has been given (e.g. an AccessToken that is null).
 ### ConnectionInitializationException
 
 The ConnectionInitializationException extends the OsiamClientException and will
-be thrown if no connection to the OSIAM server could be created.
+be thrown if no connection to OSIAM could be created.
 
 ### OsiamRequestException
 
 The OsiamRequestException extends the OsiamClientException. It is the base
-exception of all exceptions that indicate that the connection to the server was
+exception of all exceptions that indicate that the connection to OSIAM was
 successful but something else went wrong. This and all child exceptions will
 also provide a method to retrieve the HTTP status code which raised the
 exception. 
 
     int getHttpStatusCode()
 
-This exception will be raised if an unknown error is returned by the server.
-Known errors are represented by child exceptions described below.
+This exception will be raised if an unknown error is returned by OSIAM. Known
+errors are represented by child exceptions described below.
 
 #### ConflictException
 
 The ConflictException extends the OsiamRequestException and will be thrown if
-any conflicts happened while processing the request on the server (HTTP status
-code 409).
+any conflicts happened while processing the request by OSIAM (HTTP status code
+409).
 
 #### ForbiddenException
 

docs/login-and-getting-an-access-token.md

@@ -4,7 +4,7 @@ For general information about the different OAuth 2.0 grant types please see
 the [Overview of Osiam]
 (https://github.com/osiam/osiam/blob/master/docs/OSIAM-Overview.md#oauth-20).
 A more technical explanation can be found in the [API documentation]
-(https://github.com/osiam/auth-server/blob/master/docs/api_documentation.md#oauth2).
+(https://github.com/osiam/osiam/blob/master/docs/api_documentation.md#oauth2).
 
 Table of contents
 - [Retrieving an access token](login-and-getting-an-access-token.md#retrieving-an-access-token)
@@ -18,25 +18,25 @@ Table of contents
 You access token will have some scopes to grant access to the different
 procedures.
 
-The supported scopes in OSIAM are listed [here](https://github.com/osiam/auth-server/blob/master/docs/api_documentation
+The supported scopes in OSIAM are listed [here](https://github.com/osiam/osiam/blob/master/docs/api_documentation
 .md#supported-scopes)
 
 With **new Scope("your scope");** you can also create and add your own scopes that you need an your application
 
 # Retrieving an access token
 
-In a trusted environment getting an access token from the OAuth 2.0 server
-implies a successful login of the user. 
+In a trusted environment getting an access token from OSIAM implies a successful
+login of the user. 
 
-## [Authorization Code Grant](https://github.com/osiam/auth-server/blob/master/docs/api_documentation.md#authorization-code-grant)
+## [Authorization Code Grant](https://github.com/osiam/osiam/blob/master/docs/api_documentation.md#authorization-code-grant)
 
 The authorization code grant should always be used as default grant, as other
 grants are less secure and should only be used if you know what you are doing.
 
 It takes to steps to get an access token using the authorization code grant:
 
-1. Redirect the user to the OAuth 2.0 server and let the user login. You will
-get an **auth code**.
+1. Redirect the user to OSIAM and let the user login. You will get an
+   **auth code**.
 2. Send the auth code to the OAuth 2.0 in exchange for the access token.
 
 To do so follow these steps:
@@ -45,12 +45,12 @@ To do so follow these steps:
 
     OsiamConnector oConnector = [Retrieving an OsiamConnector](create-osiam-connector.md#grant-authorization-code)
 
-* Redirect the user to the Auth Server. You can get the redirect URI with the
+* Redirect the user to OSIAM. You can get the redirect URI with the
 following command:
 
     URI redirectURI = oConnector.getRedirectLoginUri(Scope.GET, Scope.PUT);
 
-* After the user is successfully authenticated the auth server redirects the
+* After the user is successfully authenticated, OSIAM redirects the
 user back to your application's redirect URI.
 
 * If everything went fine you will receive the following parameter
@@ -61,7 +61,7 @@ user back to your application's redirect URI.
 
     <YOUR_REDIRECT_URI>?error=access_denied&error_description=User+denied+access
 
-* Send the auth code to the auth server in order to get the access token
+* Send the auth code to OSIAM in order to get the access token
 
     AccessToken accessToken = oConnector.retrieveAccessToken(<AUTHENTICATION_CODE>);	
 
@@ -73,9 +73,9 @@ AccessToken the following way
 
     AccessToken accessToken = new AccessToken.Builder(<token>).build();
 
-## [Resource Owner Password Credentials Grant](https://github.com/osiam/auth-server/blob/master/docs/api_documentation.md#resource-owner-password-credentials-grant) 
+## [Resource Owner Password Credentials Grant](https://github.com/osiam/osiam/blob/master/docs/api_documentation.md#resource-owner-password-credentials-grant) 
 and
-## [Client Credentials Grant](https://github.com/osiam/auth-server/blob/master/docs/api_documentation.md#client-credentials-grant)
+## [Client Credentials Grant](https://github.com/osiam/osiam/blob/master/docs/api_documentation.md#client-credentials-grant)
 
 The OSIAM Connector4java allows you to retrieve an
 **org.osiam.client.oauth.accessToken**. The access token is required to access

docs/overview.md

@@ -3,9 +3,9 @@ and provides an easy to use Java API that enables user logins or the
 administration of users, groups and their interactions.
 
 OSIAM provides a time limited access token that regulates the access to
-resources at any one time.
-For this purpose the Connector4java API enables an easy way to retrieve this
-token on different ways depending on your rights at the OSIAM server.
+resources at any one time. For this purpose the Connector4java API enables an
+easy way to retrieve this token on different ways depending on your rights in
+OSIAM.
 
 More information about the login, retrieving an access token and the possible
 grants can be found [here](login-and-getting-an-access-token.md).

docs/vertx-example.md

@@ -26,7 +26,7 @@ public class Main {
 
             {
                 oConnector = new OsiamConnector.Builder()
-                .setEndpoint("http://localhost:8180/osiam-server")
+                .setEndpoint("http://localhost:8180/osiam")
                 .setClientId("example-client")
                 .setClientSecret("secret")
                 .setClientRedirectUri("http://localhost:5000/oauth2")

pom.xml

@@ -26,7 +26,7 @@
 
     <groupId>org.osiam</groupId>
     <artifactId>connector4java</artifactId>
-    <version>1.8-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
 
     <name>OSIAM Connector 4 Java</name>
     <description>Native Java API to connect to the REST based OSIAM services</description>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.osiam</groupId>
             <artifactId>scim-schema</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

src/main/java/org/osiam/client/AbstractOsiamService.java

@@ -71,7 +71,7 @@
  */
 abstract class AbstractOsiamService<T extends Resource> {
 
-    protected static final String CONNECTION_SETUP_ERROR_STRING = "Cannot connect to server";
+    protected static final String CONNECTION_SETUP_ERROR_STRING = "Cannot connect to OSIAM";
 
     protected static final String AUTHORIZATION = "Authorization";
     protected static final String BEARER = "Bearer ";

src/main/java/org/osiam/client/AuthService.java

@@ -587,7 +587,7 @@ public Builder setClientId(String clientId) {
         /**
          * Add a Client redirect URI to the OAuth2 request
          *
-         * @param clientRedirectUri the clientRedirectUri which is known to the OSIAM server
+         * @param clientRedirectUri the clientRedirectUri which is known to OSIAM
          * @return The builder itself
          */
         public Builder setClientRedirectUri(String clientRedirectUri) {