Restore support for OSIAM 2.x

We only want to maintain a single version of the connector by now, so
old behavior must be restored. This adds the old methods back and
integrates them with the new way of connecting to OSIAM.

Author: tkrille

CHANGELOG.md

@@ -11,6 +11,13 @@
     Please, see [Create an OSIAM connector](docs/create-osiam-connector.md#legacy-schemas),
     if you use an OSIAM version <= 2.3.
 
+- Restore support for OSIAM 2.x
+
+### Changes
+
+- `OsiamConnector#setMaxConnections(int maxConnections)` will also set
+  the maximum connections per route to the given value.
+
 ## 1.7 - 2015-09-11
 
 ### Changes

docs/create-osiam-connector.md

@@ -2,14 +2,51 @@ To be able to log in, and create or change users or groups you need to create
 an `org.osiam.client.connector.OsiamConnector` instance. You can do this by
 using the `OsiamConnector.Builder()` class.
 
+## OSIAM 3.x
+
+In OSIAM 3.x auth-server and resource-server have been merged to create a better
+user experience. Thus you have to provide only 1 endpoint for the Connector to
+connect to OSIAM:
+
+
 ```java
 OsiamConnector osiamConnector = new OsiamConnector.Builder()
-       .setEndpoint(OSIAM_ENDPOINT)
+       .withEndpoint(OSIAM_ENDPOINT)
        .setClientId(CLIENT_ID)
        .setClientSecret(CLIENT_SECRET)
        .build();
 ```
 
+## OSIAM 2.x
+
+OSIAM consists of 2 servers, namely auth-server and resource-server. Therefore
+you have to provide 2 endpoints for the Connector to connect to OSIAM:
+
+```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(OSIAM_ENDPOINT)
+        .setClientId(CLIENT_ID)
+        .setClientSecret(CLIENT_SECRET)
+        .build();
+```
+
+This will append the default context roots to the given endpoint:
+
+- auth-server: `/osiam-auth-server`
+- resource-server: `/osiam-resource-server`
+
 ## Timeouts
 
 Starting with version 1.4 you can also set the connect and read timeouts

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

@@ -26,7 +26,7 @@ With **new Scope("your scope");** you can also create and add your own scopes th
 # Retrieving an access token
 
 In a trusted environment getting an access token from OSIAM implies a successful
-login of the user. 
+login of the user.
 
 ## [Authorization Code Grant](https://github.com/osiam/osiam/blob/master/docs/api_documentation.md#authorization-code-grant)
 
@@ -73,7 +73,7 @@ AccessToken the following way
 
     AccessToken accessToken = new AccessToken.Builder(<token>).build();
 
-## [Resource Owner Password Credentials Grant](https://github.com/osiam/osiam/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/osiam/blob/master/docs/api_documentation.md#client-credentials-grant)
 

docs/vertx-example.md

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