From cf2b24c2e8235886ce2111028f78b9b17e78510a Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Wed, 16 Nov 2011 21:45:07 +0000 Subject: [PATCH 001/583] [AMBER-39] - new version is now 0.22-incubating-SNAPSHOT for all the POMs git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1202894 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-1.0/pom.xml | 2 +- oauth-2.0/oauth2-authzserver/pom.xml | 4 ++-- oauth-2.0/oauth2-client-demo/pom.xml | 2 +- oauth-2.0/oauth2-client/pom.xml | 4 ++-- oauth-2.0/oauth2-common/pom.xml | 4 ++-- oauth-2.0/oauth2-dynamicreg-client/pom.xml | 4 ++-- oauth-2.0/oauth2-dynamicreg-common/pom.xml | 4 ++-- oauth-2.0/oauth2-dynamicreg-server/pom.xml | 4 ++-- oauth-2.0/oauth2-httpclient4/pom.xml | 2 +- oauth-2.0/oauth2-integration-tests/pom.xml | 4 ++-- oauth-2.0/oauth2-resourceserver/pom.xml | 4 ++-- oauth-2.0/oauth2-rs-filter/pom.xml | 4 ++-- oauth-2.0/oauth2-test-utils/pom.xml | 4 ++-- oauth-2.0/pom.xml | 4 ++-- pom.xml | 2 +- server/pom.xml | 2 +- signature-api/pom.xml | 2 +- spec-api/pom.xml | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/oauth-1.0/pom.xml b/oauth-1.0/pom.xml index 580da22f..4e55588e 100644 --- a/oauth-1.0/pom.xml +++ b/oauth-1.0/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT 4.0.0 diff --git a/oauth-2.0/oauth2-authzserver/pom.xml b/oauth-2.0/oauth2-authzserver/pom.xml index c4f8e22e..06c2cec7 100644 --- a/oauth-2.0/oauth2-authzserver/pom.xml +++ b/oauth-2.0/oauth2-authzserver/pom.xml @@ -26,12 +26,12 @@ org.apache.amber amber-oauth2-parent - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT 4.0.0 oauth2-authzserver - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT Apache Amber: OAuth 2.0 Implementation - Authorization Server jar diff --git a/oauth-2.0/oauth2-client-demo/pom.xml b/oauth-2.0/oauth2-client-demo/pom.xml index 9cf6e41a..5b6a691f 100644 --- a/oauth-2.0/oauth2-client-demo/pom.xml +++ b/oauth-2.0/oauth2-client-demo/pom.xml @@ -28,7 +28,7 @@ amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT 4.0.0 diff --git a/oauth-2.0/oauth2-client/pom.xml b/oauth-2.0/oauth2-client/pom.xml index 2f1ea5b9..4a5f0051 100644 --- a/oauth-2.0/oauth2-client/pom.xml +++ b/oauth-2.0/oauth2-client/pom.xml @@ -29,12 +29,12 @@ org.apache.amber Apache Amber: OAuth 2.0 Implementation - Client jar - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT diff --git a/oauth-2.0/oauth2-common/pom.xml b/oauth-2.0/oauth2-common/pom.xml index ce528c89..76d040ee 100644 --- a/oauth-2.0/oauth2-common/pom.xml +++ b/oauth-2.0/oauth2-common/pom.xml @@ -27,13 +27,13 @@ amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT 4.0.0 oauth2-common Apache Amber: OAuth 2.0 Implementation - Common - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT jar OAuth 2.0 library - Common diff --git a/oauth-2.0/oauth2-dynamicreg-client/pom.xml b/oauth-2.0/oauth2-dynamicreg-client/pom.xml index 655925ab..434bd673 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-client/pom.xml @@ -28,12 +28,12 @@ oauth2-dynamicreg-client Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Client jar - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT diff --git a/oauth-2.0/oauth2-dynamicreg-common/pom.xml b/oauth-2.0/oauth2-dynamicreg-common/pom.xml index 6a6b7f1d..6293baef 100644 --- a/oauth-2.0/oauth2-dynamicreg-common/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-common/pom.xml @@ -27,12 +27,12 @@ oauth2-dynamicreg-common Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Common jar - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT diff --git a/oauth-2.0/oauth2-dynamicreg-server/pom.xml b/oauth-2.0/oauth2-dynamicreg-server/pom.xml index 9e38c255..1d02487a 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-server/pom.xml @@ -28,12 +28,12 @@ oauth2-dynamicreg-server Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Server jar - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT diff --git a/oauth-2.0/oauth2-httpclient4/pom.xml b/oauth-2.0/oauth2-httpclient4/pom.xml index 3983b85a..18d9383d 100644 --- a/oauth-2.0/oauth2-httpclient4/pom.xml +++ b/oauth-2.0/oauth2-httpclient4/pom.xml @@ -32,7 +32,7 @@ amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT diff --git a/oauth-2.0/oauth2-integration-tests/pom.xml b/oauth-2.0/oauth2-integration-tests/pom.xml index 18876dc7..5a1ef88c 100644 --- a/oauth-2.0/oauth2-integration-tests/pom.xml +++ b/oauth-2.0/oauth2-integration-tests/pom.xml @@ -26,12 +26,12 @@ amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT 4.0.0 Apache Amber: OAuth 2.0 Implementation - Integration Tests oauth2-integration-tests - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT oauth2-integration-tests diff --git a/oauth-2.0/oauth2-resourceserver/pom.xml b/oauth-2.0/oauth2-resourceserver/pom.xml index 5d610ddf..8428e5eb 100644 --- a/oauth-2.0/oauth2-resourceserver/pom.xml +++ b/oauth-2.0/oauth2-resourceserver/pom.xml @@ -27,13 +27,13 @@ amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT 4.0.0 oauth2-resourceserver Apache Amber: OAuth 2.0 Implementation - Resource Server - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT oauth2-resourceserver diff --git a/oauth-2.0/oauth2-rs-filter/pom.xml b/oauth-2.0/oauth2-rs-filter/pom.xml index 3906a016..3ef7608e 100644 --- a/oauth-2.0/oauth2-rs-filter/pom.xml +++ b/oauth-2.0/oauth2-rs-filter/pom.xml @@ -28,10 +28,10 @@ amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT oauth2-rs-filter - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT Apache Amber: OAuth 2.0 Implementation - Resource Server Filter diff --git a/oauth-2.0/oauth2-test-utils/pom.xml b/oauth-2.0/oauth2-test-utils/pom.xml index 7046b34d..6dda9c43 100644 --- a/oauth-2.0/oauth2-test-utils/pom.xml +++ b/oauth-2.0/oauth2-test-utils/pom.xml @@ -28,12 +28,12 @@ oauth2-test-utils Apache Amber: OAuth 2.0 Implementation - Test Utils jar - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT amber-oauth2-parent org.apache.amber - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 08244268..ec67b049 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -27,14 +27,14 @@ Apache Amber: OAuth 2.0 Implementation - Parent org.apache.amber amber-oauth2-parent - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT 4.0.0 pom org.apache.amber amber-parent - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT diff --git a/pom.xml b/pom.xml index 56d4173e..e9f5a658 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.amber amber-parent pom - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT Apache Amber https://cwiki.apache.org/confluence/display/AMBER diff --git a/server/pom.xml b/server/pom.xml index 068afe4c..aba16cda 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT 4.0.0 diff --git a/signature-api/pom.xml b/signature-api/pom.xml index c7cee15b..beb1799e 100644 --- a/signature-api/pom.xml +++ b/signature-api/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT 4.0.0 diff --git a/spec-api/pom.xml b/spec-api/pom.xml index f1ca94eb..7d760eef 100644 --- a/spec-api/pom.xml +++ b/spec-api/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.10-incubating-SNAPSHOT + 0.22-incubating-SNAPSHOT 4.0.0 From a423244f4b3bf2f3d22051e749986568693598c3 Mon Sep 17 00:00:00 2001 From: Lukasz Moren Date: Thu, 24 Nov 2011 13:59:20 +0000 Subject: [PATCH 002/583] [AMBER-44] Add method to OAuthClient that allows sending GET request to OAuth token endpoint git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1205835 13f79535-47bb-0310-9956-ffa450edef68 --- .../amber/oauth2/client/OAuthClient.java | 18 ++++++++++++--- .../AccessTokenTestAuthCodeTest.java | 23 +++++++++++++++++-- .../integration/endpoints/TokenEndpoint.java | 18 ++++++++++++++- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java index b2cddd17..0c27c9c9 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java @@ -51,11 +51,17 @@ public T accessToken( Class responseClass) throws OAuthSystemException, OAuthProblemException { - String method = OAuth.HttpMethod.POST; + return accessToken(request, OAuth.HttpMethod.POST, responseClass); + } + + public T accessToken( + OAuthClientRequest request, String requestMethod, Class responseClass) + throws OAuthSystemException, OAuthProblemException { + Map headers = new HashMap(); headers.put(OAuth.HeaderType.CONTENT_TYPE, OAuth.ContentType.URL_ENCODED); - return httpClient.execute(request, headers, method, responseClass); + return httpClient.execute(request, headers, requestMethod, responseClass); } public OAuthJSONAccessTokenResponse accessToken( @@ -63,7 +69,13 @@ public OAuthJSONAccessTokenResponse accessToken( throws OAuthSystemException, OAuthProblemException { return accessToken(request, OAuthJSONAccessTokenResponse.class); } - + + public OAuthJSONAccessTokenResponse accessToken( + OAuthClientRequest request, String requestMethod) + throws OAuthSystemException, OAuthProblemException { + return accessToken(request, requestMethod, OAuthJSONAccessTokenResponse.class); + } + public void shutdown() { httpClient.shutdown(); } diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java index 22ee67c3..28cb72ea 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java @@ -28,9 +28,8 @@ import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.junit.Test; - import org.apache.amber.oauth2.common.message.types.GrantType; +import org.junit.Test; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -58,6 +57,26 @@ public void testSuccessfullAccesToken() throws Exception { assertNotNull(response.getExpiresIn()); + } + + @Test + public void testSuccessfullAccesTokenGETMethod() throws Exception { + + OAuthClientRequest request = OAuthClientRequest + .tokenLocation(Common.ACCESS_TOKEN_ENDPOINT) + .setGrantType(GrantType.AUTHORIZATION_CODE) + .setCode(Common.AUTHORIZATION_CODE) + .setRedirectURI(Common.REDIRECT_URL) + .setClientId(Common.CLIENT_ID) + .setClientSecret(Common.CLIENT_SECRET) + .buildQueryMessage(); + + OAuthClient oAuthClient = new OAuthClient(new URLConnectionClient()); + OAuthAccessTokenResponse response = oAuthClient.accessToken(request, OAuth.HttpMethod.GET); + assertNotNull(response.getAccessToken()); + assertNotNull(response.getExpiresIn()); + + } @Test diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java index f3c81c65..f05958f9 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java @@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.Consumes; +import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -31,8 +32,8 @@ import javax.ws.rs.core.Response; import org.apache.amber.oauth2.as.issuer.MD5Generator; -import org.apache.amber.oauth2.as.issuer.OAuthIssuerImpl; import org.apache.amber.oauth2.as.issuer.OAuthIssuer; +import org.apache.amber.oauth2.as.issuer.OAuthIssuerImpl; import org.apache.amber.oauth2.as.request.OAuthTokenRequest; import org.apache.amber.oauth2.as.response.OAuthASResponse; import org.apache.amber.oauth2.common.OAuth; @@ -132,4 +133,19 @@ public Response authorize(@Context HttpServletRequest request) throws OAuthSyste } } + @GET + @Consumes("application/x-www-form-urlencoded") + @Produces("application/json") + public Response authorizeGet(@Context HttpServletRequest request) throws OAuthSystemException { + OAuthIssuer oauthIssuerImpl = new OAuthIssuerImpl(new MD5Generator()); + + OAuthResponse response = OAuthASResponse + .tokenResponse(HttpServletResponse.SC_OK) + .setAccessToken(oauthIssuerImpl.accessToken()) + .setExpiresIn("3600") + .buildJSONMessage(); + + return Response.status(response.getResponseStatus()).entity(response.getBody()).build(); + } + } \ No newline at end of file From 4c76c26aecb6eb636a0d5bf5d6be81a74b34fd72 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Tue, 6 Dec 2011 20:42:22 +0000 Subject: [PATCH 003/583] [AMBER-36] - applied patch from Raymond Feng plus updated oauth2-common version used in authzserver to 0.22-incubating-SNAPSHOT git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1211105 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-authzserver/pom.xml | 2 +- .../amber/oauth2/as/response/OAuthASResponse.java | 5 +++++ .../oauth2/as/response/OAuthASResponseTest.java | 10 ++++------ .../java/org/apache/amber/oauth2/common/OAuth.java | 2 ++ .../oauth2/common/message/types/GrantType.java | 2 ++ .../oauth2/common/message/types/ResponseType.java | 1 + .../common/parameters/QueryParameterApplier.java | 14 ++++++++++++-- 7 files changed, 27 insertions(+), 9 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/pom.xml b/oauth-2.0/oauth2-authzserver/pom.xml index 06c2cec7..b79c12ac 100644 --- a/oauth-2.0/oauth2-authzserver/pom.xml +++ b/oauth-2.0/oauth2-authzserver/pom.xml @@ -42,7 +42,7 @@ org.apache.amber oauth2-common - 0.2-SNAPSHOT + 0.22-incubating-SNAPSHOT diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java index c0cf7f54..c80aa81b 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java @@ -102,6 +102,11 @@ public OAuthTokenResponseBuilder setRefreshToken(String refreshToken) { this.parameters.put(OAuth.OAUTH_REFRESH_TOKEN, refreshToken); return this; } + + public OAuthTokenResponseBuilder setTokenType(String tokenType) { + this.parameters.put(OAuth.OAUTH_TOKEN_TYPE, tokenType); + return this; + } public OAuthTokenResponseBuilder setParam(String key, String value) { this.parameters.put(key, value); diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java index 12ba7afc..9681ab6e 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java @@ -21,15 +21,13 @@ package org.apache.amber.oauth2.as.response; -import org.apache.amber.oauth2.as.response.OAuthASResponse; +import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.message.OAuthResponse; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; - /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) @@ -50,8 +48,8 @@ public void testAuthzResponse() throws Exception { String url = oAuthResponse.getLocationUri(); - Assert.assertEquals("http://www.example.com?testValue=value2&state=ok&code=code" - + "#expires_in=400&access_token=access_111", url); + Assert.assertEquals("http://www.example.com?testValue=value2&code=code" + + "#access_token=access_111&state=ok&expires_in=400", url); Assert.assertEquals(200, oAuthResponse.getResponseStatus()); } diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java index dfeb3046..eef611fe 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java @@ -71,6 +71,8 @@ public static final class ContentType { public static final String OAUTH_ACCESS_TOKEN = "access_token"; public static final String OAUTH_EXPIRES_IN = "expires_in"; public static final String OAUTH_REFRESH_TOKEN = "refresh_token"; + + public static final String OAUTH_TOKEN_TYPE = "token_type"; public static final String OAUTH_TOKEN = "oauth_token"; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java index 92d05b99..aaac733a 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java @@ -29,8 +29,10 @@ public enum GrantType { AUTHORIZATION_CODE("authorization_code"), PASSWORD("password"), + @Deprecated ASSERTION("assertion"), REFRESH_TOKEN("refresh_token"), + CLIENT_CREDENTIALS("client_credentials"), NONE("none"); private String grantType; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java index d6166bb6..3a19e1f2 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java @@ -30,6 +30,7 @@ public enum ResponseType { CODE("code"), TOKEN("token"), + @Deprecated CODE_AND_TOKEN("code_and_token"); private String code; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java index c5d25654..e71d2086 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java @@ -21,7 +21,7 @@ package org.apache.amber.oauth2.common.parameters; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import org.apache.amber.oauth2.common.OAuth; @@ -43,13 +43,23 @@ public OAuthMessage applyOAuthParameters(OAuthMessage message, Map fragmentParams = new HashMap(); + Map fragmentParams = new LinkedHashMap(); if (params.containsKey(OAuth.OAUTH_ACCESS_TOKEN)) { fragmentParams.put(OAuth.OAUTH_ACCESS_TOKEN, params.remove(OAuth.OAUTH_ACCESS_TOKEN)); + // State should be in the fragment too + if (params.containsKey(OAuth.OAUTH_STATE)) { + fragmentParams.put(OAuth.OAUTH_STATE, params.remove(OAuth.OAUTH_STATE)); + } + if (params.containsKey(OAuth.OAUTH_EXPIRES_IN)) { fragmentParams.put(OAuth.OAUTH_EXPIRES_IN, params.remove(OAuth.OAUTH_EXPIRES_IN)); } + + if (params.containsKey(OAuth.OAUTH_TOKEN_TYPE)) { + fragmentParams.put(OAuth.OAUTH_TOKEN_TYPE, params.remove(OAuth.OAUTH_TOKEN_TYPE)); + } + } StringBuffer query = new StringBuffer(OAuthUtils.format(params.entrySet(), "UTF-8")); From 9d6fd7f9d12032f20f5a8c1cd7a986785d0afdd8 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Tue, 6 Dec 2011 21:02:54 +0000 Subject: [PATCH 004/583] [AMBER-31] - applied patch from Antonio Sanso git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1211140 13f79535-47bb-0310-9956-ffa450edef68 --- .../oauth2/as/request/OAuthAuthzRequest.java | 2 - .../as/validator/CodeTokenValidator.java | 58 ------------- .../as/validator/CodeTokenValidatorTest.java | 84 ------------------- .../integration/endpoints/AuthzEndpoint.java | 6 +- 4 files changed, 2 insertions(+), 148 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java index 3b4cde1c..77967062 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java @@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.as.validator.CodeTokenValidator; import org.apache.amber.oauth2.as.validator.CodeValidator; import org.apache.amber.oauth2.as.validator.TokenValidator; import org.apache.amber.oauth2.common.OAuth; @@ -49,7 +48,6 @@ protected OAuthValidator initValidator() throws OAuthProblemException, OAuthSyst //end user authorization validators validators.put(ResponseType.CODE.toString(), CodeValidator.class); validators.put(ResponseType.TOKEN.toString(), TokenValidator.class); - validators.put(ResponseType.CODE_AND_TOKEN.toString(), CodeTokenValidator.class); String requestTypeValue = getParam(OAuth.OAUTH_RESPONSE_TYPE); if (OAuthUtils.isEmpty(requestTypeValue)) { throw OAuthUtils.handleOAuthProblemException("Missing response_type parameter value"); diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java index 0a7720e3..e69de29b 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java @@ -1,58 +0,0 @@ -/** - * Copyright 2010 Newcastle University - * - * http://research.ncl.ac.uk/smart/ - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.amber.oauth2.as.validator; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.validators.AbstractValidator; - - -/** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) - */ -public class CodeTokenValidator extends AbstractValidator { - - public CodeTokenValidator() { - requiredParams.add(OAuth.OAUTH_RESPONSE_TYPE); - requiredParams.add(OAuth.OAUTH_CLIENT_ID); - requiredParams.add(OAuth.OAUTH_REDIRECT_URI); - } - - @Override - public void validateMethod(HttpServletRequest request) throws OAuthProblemException { - String method = request.getMethod(); - if (!method.equals(OAuth.HttpMethod.GET) && !method.equals(OAuth.HttpMethod.POST)) { - throw OAuthProblemException.error(OAuthError.CodeResponse.INVALID_REQUEST) - .description("Method not correct."); - } - } - - @Override - public void validateContentType(HttpServletRequest request) throws OAuthProblemException { - } -} - diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/CodeTokenValidatorTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/CodeTokenValidatorTest.java index e60d600e..e69de29b 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/CodeTokenValidatorTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/CodeTokenValidatorTest.java @@ -1,84 +0,0 @@ -/** - * Copyright 2010 Newcastle University - * - * http://research.ncl.ac.uk/smart/ - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.amber.oauth2.as.validator; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.amber.oauth2.as.validator.CodeTokenValidator; -import org.apache.amber.oauth2.common.OAuth; -import org.junit.Assert; -import org.junit.Test; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; - -import static org.easymock.EasyMock.createStrictMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.reset; -import static org.easymock.EasyMock.verify; - - -/** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) - */ -public class CodeTokenValidatorTest { - @Test - public void testValidateMethod() throws Exception { - HttpServletRequest request = createStrictMock(HttpServletRequest.class); - expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); - - replay(request); - CodeTokenValidator validator = new CodeTokenValidator(); - validator.validateMethod(request); - - verify(request); - - reset(request); - - request = createStrictMock(HttpServletRequest.class); - expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); - - replay(request); - validator = new CodeTokenValidator(); - validator.validateMethod(request); - - verify(request); - - reset(request); - - request = createStrictMock(HttpServletRequest.class); - expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.DELETE); - - replay(request); - validator = new CodeTokenValidator(); - - try { - validator.validateMethod(request); - Assert.fail("Expected validation exception"); - } catch (OAuthProblemException e) { - //ok, expected - } - - verify(request); - } -} diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java index 42de80e1..3c6ccb75 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java @@ -67,12 +67,10 @@ public Response authorize(@Context HttpServletRequest request) OAuthASResponse.OAuthAuthorizationResponseBuilder builder = OAuthASResponse .authorizationResponse(HttpServletResponse.SC_FOUND); - if (responseType.equals(ResponseType.CODE.toString()) || responseType - .equals(ResponseType.CODE_AND_TOKEN.toString())) { + if (responseType.equals(ResponseType.CODE.toString())) { builder.setCode(oauthIssuerImpl.authorizationCode()); } - if (responseType.equals(ResponseType.TOKEN.toString()) || responseType - .equals(ResponseType.CODE_AND_TOKEN.toString())) { + if (responseType.equals(ResponseType.TOKEN.toString())) { builder.setAccessToken(oauthIssuerImpl.accessToken()); builder.setExpiresIn(String.valueOf(3600)); } From 629a4f9d903185a703aef2ef7e9b5a6b85768e78 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Tue, 6 Dec 2011 21:07:59 +0000 Subject: [PATCH 005/583] [AMBER-30] - applied patch from Antonio Sanso git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1211146 13f79535-47bb-0310-9956-ffa450edef68 --- .../oauth2/as/validator/CodeValidator.java | 1 - .../amber/oauth2/as/OAuthRequestTest.java | 20 ------------------- 2 files changed, 21 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java index aae9ab9f..75547eb8 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java @@ -39,7 +39,6 @@ public class CodeValidator extends AbstractValidator { public CodeValidator() { requiredParams.add(OAuth.OAUTH_RESPONSE_TYPE); requiredParams.add(OAuth.OAUTH_CLIENT_ID); - requiredParams.add(OAuth.OAUTH_REDIRECT_URI); } @Override diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java index e2a916fd..af00a2cc 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java @@ -128,26 +128,6 @@ public void testCodeRequestMissingParameter() throws Exception { } verify(request); - - reset(request); - - expect(request.getParameter(OAuth.OAUTH_RESPONSE_TYPE)).andStubReturn(ResponseType.CODE.toString()); - expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); - expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - - expect(request.getParameter(OAuth.OAUTH_CLIENT_ID)).andStubReturn("client_id"); - expect(request.getParameter(OAuth.OAUTH_REDIRECT_URI)).andStubReturn(null); - replay(request); - - try { - new OAuthAuthzRequest(request); - fail("Exception expected"); - } catch (OAuthProblemException e) { - Assert.assertEquals(OAuthError.TokenResponse.INVALID_REQUEST, e.getError()); - } - - verify(request); - } @Test From 970f31734146755882101821947b7976d0fe93ce Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 12:08:31 +0000 Subject: [PATCH 006/583] removed my affiliation git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1229971 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index e9f5a658..9c5cd6e0 100644 --- a/pom.xml +++ b/pom.xml @@ -159,8 +159,6 @@ simonetripodi Simone Tripodi simonetripodi[at]apache[dot]org - Sourcesense S.r.l. - http://www.sourcesense.com/ PMC Member Committer From cd2c76d635a466e43f83fbb755ecc236a27c9d57 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 12:09:22 +0000 Subject: [PATCH 007/583] podling PMC Members are PPMC Member git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1229973 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 9c5cd6e0..57e9c354 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ brianm[at]apache[dot]org Mentor - PMC Member + PPMC Member Committer @@ -84,7 +84,7 @@ henning[at]apache[dot]org Mentor - PMC Member + PPMC Member Committer @@ -95,7 +95,7 @@ jfclere[at]apache[dot]org Mentor - PMC Member + PPMC Member Committer @@ -106,7 +106,7 @@ gianugo[at]apache[dot]org Mentor - PMC Member + PPMC Member Committer @@ -117,7 +117,7 @@ djencks[at]apache[dot]org Mentor - PMC Member + PPMC Member Committer @@ -149,7 +149,7 @@ Semeru S.r.l. http://www.semeru.it/ - PMC Member + PPMC Member Committer +1 @@ -160,7 +160,7 @@ Simone Tripodi simonetripodi[at]apache[dot]org - PMC Member + PPMC Member Committer +1 @@ -170,7 +170,7 @@ pidster Stuart "Pid" Williams - PMC Member + PPMC Member Committer +1 @@ -181,7 +181,7 @@ David Recordon recordond[at]apache[dot]org - PMC Member + PPMC Member Committer +1 @@ -194,7 +194,7 @@ Sourcesense S.r.l. http://www.sourcesense.com/ - PMC Member + PPMC Member Committer +1 @@ -205,7 +205,7 @@ Paul Lindner lindner[at]apache[dot]org - PMC Member + PPMC Member Committer +1 @@ -215,7 +215,7 @@ TBD Pablo Fernandez - PMC Member + PPMC Member Committer +1 From 1699c1e01242c1af543b86ff11e191f7dd3ef292 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 12:50:41 +0000 Subject: [PATCH 008/583] switching to maven-fluido-skin git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1229986 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 71 ++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/src/site/site.xml b/src/site/site.xml index c881dd28..df950321 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,47 +1,50 @@ - Apache Amber OAuth reference implementation - images/amber_head.png - ${project.url}/index.html + Apache Amber OAuth reference implementation + images/amber_head.png + ${project.url}/index.html - - - + + org.apache.maven.skins + maven-fluido-skin + 1.0 + - - - + - + + - + + + + + + + + + + + + - - - - - - com.googlecode.fluido-skin - fluido-skin - 1.3 - From 6f375baf4ebe9020fe367206229e84271e4b22b1 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 12:52:29 +0000 Subject: [PATCH 009/583] linked project descriptor XSD git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1229987 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/site/site.xml b/src/site/site.xml index df950321..ef7b0eaa 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -15,18 +15,20 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - Apache Amber OAuth reference implementation - images/amber_head.png - ${project.url}/index.html + Apache Amber OAuth reference implementation + images/amber_head.png + ${project.url}/index.html - org.apache.maven.skins - maven-fluido-skin - 1.0 + org.apache.maven.skins + maven-fluido-skin + 1.0 From 0988421d197506679d71f8dba7171b534a923542 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 12:53:43 +0000 Subject: [PATCH 010/583] added trademark footer git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1229988 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/site/site.xml b/src/site/site.xml index ef7b0eaa..0ec96917 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -47,6 +47,11 @@ + +
+
Apache Amber, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation. + All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+
From 8e5ec69667b2f25cf1fda6b1c70de1d6b79d1885 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:06:01 +0000 Subject: [PATCH 011/583] reorganized stuff according to http://maven.apache.org/developers/conventions/code.html git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1229991 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1090 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 547 insertions(+), 543 deletions(-) diff --git a/pom.xml b/pom.xml index 57e9c354..79a0c647 100644 --- a/pom.xml +++ b/pom.xml @@ -1,550 +1,238 @@ - - - org.apache - apache - 7 - - - 4.0.0 - org.apache.amber - amber-parent - pom - 0.22-incubating-SNAPSHOT - Apache Amber - https://cwiki.apache.org/confluence/display/AMBER - - - scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ - scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ - https://svn.apache.org/repos/asf/incubator/amber/trunk/ - - - - JIRA - https://issues.apache.org/jira/browse/AMBER - - - - - Dev Mailing List - amber-dev[at]incubator[dot]apache[dot]org - amber-dev-subscribe[at]incubator[dot]apache[dot]org - amber-dev-unsubscribe[at]incubator[dot]apache[dot]org - - - - User Mailing List - amber-user[at]incubator[dot]apache[dot]org - amber-user-subscribe[at]incubator[dot]apache[dot]org - amber-user-unsubscribe[at]incubator[dot]apache[dot]org - - - - Commits Mailing List - amber-commits[at]incubator[dot]apache[dot]org - amber-commits-subscribe[at]incubator[dot]apache[dot]org - amber-commits-unsubscribe[at]incubator[dot]apache[dot]org - - - - - - brianm - Brian McCallister - brianm[at]apache[dot]org - - Mentor - PPMC Member - Committer - - - - - henning - Henning Schmiedehausen - henning[at]apache[dot]org - - Mentor - PPMC Member - Committer - - - - - jfclere - Jean-Frederic Clere - jfclere[at]apache[dot]org - - Mentor - PPMC Member - Committer - - - - - gianugo - Gianugo Rabellino - gianugo[at]apache[dot]org - - Mentor - PPMC Member - Committer - - - - - djencks - David Jencks - djencks[at]apache[dot]org - - Mentor - PPMC Member - Committer - - - - - lmoren - Lukasz Moren - lmoren[at]apache[dot]org - - Committer - - 0 - - - - mmachulak - Maciej Machulak - mmachulak[at]apache[dot]org - - Committer - - 0 - - - - simoneg - Simone Gianni - simoneg[at]apache[dot]org - Semeru S.r.l. - http://www.semeru.it/ - - PPMC Member - Committer - - +1 - - - - simonetripodi - Simone Tripodi - simonetripodi[at]apache[dot]org - - PPMC Member - Committer - - +1 - - - - pidster - Stuart "Pid" Williams - - PPMC Member - Committer - - +1 - - - - recordond - David Recordon - recordond[at]apache[dot]org - - PPMC Member - Committer - - +1 - - - - tommaso - Tommaso Teofili - tommaso[at]apache[dot]org - Sourcesense S.r.l. - http://www.sourcesense.com/ - - PPMC Member - Committer - - +1 - - - - lindner - Paul Lindner - lindner[at]apache[dot]org - - PPMC Member - Committer - - +1 - - - - TBD - Pablo Fernandez - - PPMC Member - Committer - - +1 - - - - - UTF-8 - 1.6 - 1.6 - yyyy-MM-dd HH:mm:ssZ - - - - - - commons-logging - commons-logging - 1.1.1 - compile - - - - log4j - log4j - 1.2.15 - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - javax.jms - jms - - - javax.mail - mail - - - junit - junit - - - oro - oro - - - - - - - - - junit - junit - 4.7 - test - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.2 - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.2 - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - true - target/findbugs-reports - target/findbugs-reports - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.6 - - - - org.apache.maven.plugins - maven-changes-plugin - 2.3 - - - - jira-report - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 2.5 - - true - 100 - 1.5 - - - - - - - - - maven-clean-plugin - 2.4.1 - - - - maven-deploy-plugin - 2.5 - - - - maven-install-plugin - 2.3.1 - - - - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - maven-jar-plugin - 2.3.1 - - - - true - true - - - r${buildNumber} - ${maven.build.timestamp} - ${javac.src.version} - ${javac.target.version} - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0-beta-1 - - - enforce-java - validate - - enforce - - - - - [1.6,) - - - [2.2.0,) - - - Best Practice is to always define plugin versions! - true - true - true - clean,deploy,site - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - ${javac.src.version} - ${javac.target.version} - ${project.build.sourceEncoding} - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - true - - - - attach-javadocs - package - - jar - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - package - - jar - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.5 - - - - org.apache.maven.plugins - maven-site-plugin - 3.0 - - ${project.reporting.outputEncoding} - - - - - - - - src/main/resources - - - - ${basedir} - META-INF - - LICENSE - NOTICE - DISCLAIMER - - - - - - - - release - - - - org.apache.maven.plugins - maven-release-plugin - 2.1 - - clean install - true - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.1 - - - sign-artifacts - verify - - sign - - - - - - - - - - - spec-api - signature-api - server - oauth-1.0 - oauth-2.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + + + org.apache + apache + 7 + + + org.apache.amber + amber-parent + 0.22-incubating-SNAPSHOT + pom + + Apache Amber + https://incubator.apache.org/amber + 2010 + + + + brianm + Brian McCallister + brianm[at]apache[dot]org + + Mentor + PPMC Member + Committer + + + + + henning + Henning Schmiedehausen + henning[at]apache[dot]org + + Mentor + PPMC Member + Committer + + + + + jfclere + Jean-Frederic Clere + jfclere[at]apache[dot]org + + Mentor + PPMC Member + Committer + + + + + gianugo + Gianugo Rabellino + gianugo[at]apache[dot]org + + Mentor + PPMC Member + Committer + + + + + djencks + David Jencks + djencks[at]apache[dot]org + + Mentor + PPMC Member + Committer + + + + + lmoren + Lukasz Moren + lmoren[at]apache[dot]org + + Committer + + 0 + + + + mmachulak + Maciej Machulak + mmachulak[at]apache[dot]org + + Committer + + 0 + + + + simoneg + Simone Gianni + simoneg[at]apache[dot]org + Semeru S.r.l. + http://www.semeru.it/ + + PPMC Member + Committer + + +1 + + + + simonetripodi + Simone Tripodi + simonetripodi[at]apache[dot]org + + PPMC Member + Committer + + +1 + + + + pidster + Stuart "Pid" Williams + + PPMC Member + Committer + + +1 + + + + recordond + David Recordon + recordond[at]apache[dot]org + + PPMC Member + Committer + + +1 + + + + tommaso + Tommaso Teofili + tommaso[at]apache[dot]org + Sourcesense S.r.l. + http://www.sourcesense.com/ + + PPMC Member + Committer + + +1 + + + + lindner + Paul Lindner + lindner[at]apache[dot]org + + PPMC Member + Committer + + +1 + + + + TBD + Pablo Fernandez + + PPMC Member + Committer + + +1 + + + + + + Dev Mailing List + amber-dev[at]incubator[dot]apache[dot]org + amber-dev-subscribe[at]incubator[dot]apache[dot]org + amber-dev-unsubscribe[at]incubator[dot]apache[dot]org + + + + User Mailing List + amber-user[at]incubator[dot]apache[dot]org + amber-user-subscribe[at]incubator[dot]apache[dot]org + amber-user-unsubscribe[at]incubator[dot]apache[dot]org + + + + Commits Mailing List + amber-commits[at]incubator[dot]apache[dot]org + amber-commits-subscribe[at]incubator[dot]apache[dot]org + amber-commits-unsubscribe[at]incubator[dot]apache[dot]org + + + + + spec-api + signature-api + server + oauth-1.0 + oauth-2.0 + + + + + + scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ + scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ + https://svn.apache.org/repos/asf/incubator/amber/trunk/ + + + + JIRA + https://issues.apache.org/jira/browse/AMBER + @@ -553,4 +241,320 @@ + + UTF-8 + 1.6 + 1.6 + yyyy-MM-dd HH:mm:ssZ + + + + + + commons-logging + commons-logging + 1.1.1 + compile + + + + log4j + log4j + 1.2.15 + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + javax.jms + jms + + + javax.mail + mail + + + junit + junit + + + oro + oro + + + + + + + + + junit + junit + 4.7 + test + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.2 + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.2 + + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0-beta-2 + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.1 + + true + target/findbugs-reports + target/findbugs-reports + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.6 + + + + org.apache.maven.plugins + maven-changes-plugin + 2.3 + + + + jira-report + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + 2.5 + + true + 100 + 1.5 + + + + + + + + + maven-clean-plugin + 2.4.1 + + + + maven-deploy-plugin + 2.5 + + + + maven-install-plugin + 2.3.1 + + + + maven-resources-plugin + 2.4.3 + + ${project.build.sourceEncoding} + + + + + maven-jar-plugin + 2.3.1 + + + + true + true + + + r${buildNumber} + ${maven.build.timestamp} + ${javac.src.version} + ${javac.target.version} + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0-beta-1 + + + enforce-java + validate + + enforce + + + + + [1.6,) + + + [2.2.0,) + + + Best Practice is to always define plugin versions! + true + true + true + clean,deploy,site + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + ${javac.src.version} + ${javac.target.version} + ${project.build.sourceEncoding} + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + true + + + + attach-javadocs + package + + jar + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + package + + jar + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.5 + + + + org.apache.maven.plugins + maven-site-plugin + 3.0 + + ${project.reporting.outputEncoding} + + + + + + + + src/main/resources + + + + ${basedir} + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + + + + + release + + + + org.apache.maven.plugins + maven-release-plugin + 2.1 + + clean install + true + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + sign-artifacts + verify + + sign + + + + + + + + + From c47aa7e8561d8ca850d7fe8bd44ae96d1c77223c Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:07:13 +0000 Subject: [PATCH 012/583] trailing spaces/empty lines git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1229992 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 79a0c647..6490ba31 100644 --- a/pom.xml +++ b/pom.xml @@ -221,19 +221,15 @@ oauth-2.0 - - scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ https://svn.apache.org/repos/asf/incubator/amber/trunk/ - JIRA https://issues.apache.org/jira/browse/AMBER - website From 2114b5b9999e368403b47044d521691f3006e587 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:08:02 +0000 Subject: [PATCH 013/583] latest junit release is 4.10 git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1229993 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6490ba31..98b8b2df 100644 --- a/pom.xml +++ b/pom.xml @@ -291,7 +291,7 @@ junit junit - 4.7 + 4.10 test From c97d22dd76ac593f1125e4ac1f3ba95ed51adb14 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:13:19 +0000 Subject: [PATCH 014/583] added Antonio Sanso as committer added missing Pablo Fernandez id git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1229999 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98b8b2df..cdabda5e 100644 --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,7 @@ - TBD + pablo Pablo Fernandez PPMC Member @@ -188,6 +188,15 @@ +1 + + + asanso + Antonio Sanso + + PPMC Member + Committer + + From 97169c148ffd17faa3bfa7ba2d4f9c3a33bce7a9 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:17:09 +0000 Subject: [PATCH 015/583] enhancing the build number via buildnumber-maven-plugin git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230000 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pom.xml b/pom.xml index cdabda5e..a2ac3aae 100644 --- a/pom.xml +++ b/pom.xml @@ -247,10 +247,14 @@ + UTF-8 + UTF-8 UTF-8 1.6 1.6 yyyy-MM-dd HH:mm:ssZ + ${buildNumber}; ${maven.build.timestamp} + ${project.version} @@ -376,6 +380,28 @@ + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0 + + + validate + + create + + + + + false + false + + true + + ?????? + + + maven-clean-plugin 2.4.1 From 641fcb7dbafa831f58481dab2a9d5acc011361b4 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:19:04 +0000 Subject: [PATCH 016/583] removed implementation.build property git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230002 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2ac3aae..9edb7abe 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,6 @@ 1.6 1.6 yyyy-MM-dd HH:mm:ssZ - ${buildNumber}; ${maven.build.timestamp} ${project.version} From 0f2e8018a2680669996e1f14200179584658d5b6 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:22:00 +0000 Subject: [PATCH 017/583] release-plugin moved to pluginsManagement section git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230003 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 9edb7abe..407b4327 100644 --- a/pom.xml +++ b/pom.xml @@ -378,6 +378,22 @@ + + + + org.apache.maven.plugins + maven-release-plugin + 2.2.1 + + forked-path + false + true + -Prelease + + + + + org.codehaus.mojo @@ -558,16 +574,6 @@ release - - org.apache.maven.plugins - maven-release-plugin - 2.1 - - clean install - true - - - org.apache.maven.plugins maven-gpg-plugin From 75a8483832102849ce46c8d1dbf4fc76f1ad18c9 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:24:10 +0000 Subject: [PATCH 018/583] deploying sources/javadocs when releasing, otherwise Nexus won't let close the staging repository git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230004 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/pom.xml b/pom.xml index 407b4327..780b72cd 100644 --- a/pom.xml +++ b/pom.xml @@ -574,6 +574,62 @@ release + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + + jar-no-fork + + + + + true + true + + + r${buildNumber} + ${maven.build.timestamp} + ${javac.src.version} + ${javac.target.version} + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + true + + + true + true + + + r${buildNumber} + ${maven.build.timestamp} + ${javac.src.version} + ${javac.target.version} + + + + + + + org.apache.maven.plugins maven-gpg-plugin From 3a7559221e20aa00a01dedd6df8271d29d0c2a64 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:25:16 +0000 Subject: [PATCH 019/583] updated gpg plugin to latest version git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230007 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 780b72cd..148d1b28 100644 --- a/pom.xml +++ b/pom.xml @@ -633,7 +633,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.1 + 1.4 sign-artifacts From df5c0a9e9fb3df4a91f58c4765da62d7310a4f71 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:27:16 +0000 Subject: [PATCH 020/583] declaring build first, then reporting git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230010 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 138 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/pom.xml b/pom.xml index 148d1b28..d2fc841f 100644 --- a/pom.xml +++ b/pom.xml @@ -308,75 +308,6 @@ - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.2 - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.2 - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - true - target/findbugs-reports - target/findbugs-reports - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.6 - - - - org.apache.maven.plugins - maven-changes-plugin - 2.3 - - - - jira-report - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 2.5 - - true - 100 - 1.5 - - - - - @@ -569,6 +500,75 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.2 + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.2 + + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0-beta-2 + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.1 + + true + target/findbugs-reports + target/findbugs-reports + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.6 + + + + org.apache.maven.plugins + maven-changes-plugin + 2.3 + + + + jira-report + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + 2.5 + + true + 100 + 1.5 + + + + + release From 6879fc28753ae09d02ca0654a63b2154a30652a1 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:30:18 +0000 Subject: [PATCH 021/583] added the index page (with ASF disclaimer) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230012 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/xdoc/index.xml | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/site/xdoc/index.xml diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml new file mode 100644 index 00000000..57ef1652 --- /dev/null +++ b/src/site/xdoc/index.xml @@ -0,0 +1,47 @@ + + + + + + Home + Apache Amber Documentation Team + + + +
+ + +
+ +

Apache Amber is an OAuth protocol implementation in Java.

+
+ +
+

Disclaimer

+

Apache Amber is an effort undergoing incubation at + The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly + accepted projects until a further review indicates that the infrastructure, communications, and decision making + process have stabilized in a manner consistent with other successful ASF projects. + While incubation status is not necessarily a reflection of the completeness or stability of the code, + it does indicate that the project has yet to be fully endorsed by the ASF.

+

You can view our current incubation status + for more details.

+
+ + \ No newline at end of file From 1e7687a288a3b54b7be598d01f03f024acf27c34 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:32:29 +0000 Subject: [PATCH 022/583] package javadoc jar just when deploying a release git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230014 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index d2fc841f..e69d1fda 100644 --- a/pom.xml +++ b/pom.xml @@ -440,15 +440,6 @@ true - - - attach-javadocs - package - - jar - - - From e73948585d4161f7dd6935428743dc5fbabc82bb Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:33:05 +0000 Subject: [PATCH 023/583] package sources jar just when deploying a release git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230016 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pom.xml b/pom.xml index e69d1fda..3e09e67b 100644 --- a/pom.xml +++ b/pom.xml @@ -442,21 +442,6 @@ - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - package - - jar - - - - - org.apache.maven.plugins maven-surefire-plugin From dbb486018749ccccbb23d54b9e11207f5e308da3 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:33:33 +0000 Subject: [PATCH 024/583] no need to specify the output encoding, taken automatically git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230017 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3e09e67b..9acd9d6b 100644 --- a/pom.xml +++ b/pom.xml @@ -452,9 +452,6 @@ org.apache.maven.plugins maven-site-plugin 3.0 - - ${project.reporting.outputEncoding} - From 678bd270f7e51ec8ff1fbf2e1c9de9486b88976b Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:33:57 +0000 Subject: [PATCH 025/583] empty line git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230018 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9acd9d6b..8fb22fed 100644 --- a/pom.xml +++ b/pom.xml @@ -453,7 +453,6 @@ maven-site-plugin 3.0 - From 0101c09c19d765cee197f0a1f8c3e17f9bb65c41 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:34:25 +0000 Subject: [PATCH 026/583] no need to specify the source encoding, taken automatically git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230021 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8fb22fed..a8f1af02 100644 --- a/pom.xml +++ b/pom.xml @@ -429,7 +429,6 @@ ${javac.src.version} ${javac.target.version} - ${project.build.sourceEncoding} From 3fde22f6604355f4ec06252253f8c24c188c806b Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:38:41 +0000 Subject: [PATCH 027/583] managed javadoc-plugin git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230023 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a8f1af02..1116ebb4 100644 --- a/pom.xml +++ b/pom.xml @@ -311,6 +311,12 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8 + + org.apache.maven.plugins maven-release-plugin @@ -435,7 +441,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.7 true @@ -476,7 +481,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.7 From c4817713b8d578bbca01096dc474cfdaaafb1f14 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:44:54 +0000 Subject: [PATCH 028/583] plugged the apache-rat-plugin git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230034 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pom.xml b/pom.xml index 1116ebb4..6793ce28 100644 --- a/pom.xml +++ b/pom.xml @@ -354,6 +354,35 @@ + + org.apache.rat + apache-rat-plugin + 0.7 + + + rat-verify + test + + check + + + + .gitignore + DEPENDENCIES + README.txt + *.sh + .git/** + .idea/** + *.bat + .repository/** + ajcore** + init-git-svn.sh + + + + + + maven-clean-plugin 2.4.1 From cbddf863a30477090977af1f92ed70daf3b9ac30 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:46:03 +0000 Subject: [PATCH 029/583] rat exclude list made coherent git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230036 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 6793ce28..301b4fd4 100644 --- a/pom.xml +++ b/pom.xml @@ -367,16 +367,9 @@ - .gitignore - DEPENDENCIES - README.txt - *.sh - .git/** - .idea/** - *.bat - .repository/** - ajcore** - init-git-svn.sh + DISCLAIMER + KEYS + NOTICE From 5714a5f7f255b2c4831d9eea627add7cd089b352 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:55:20 +0000 Subject: [PATCH 030/583] updated maven-enforcer-plugin git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230040 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 66 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index 301b4fd4..6fa780c3 100644 --- a/pom.xml +++ b/pom.xml @@ -332,6 +332,40 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0 + + + enforce-java + validate + + enforce + + + + + [1.6,) + [ERROR] The currently supported version of Java is 1.6 or higher + + + [2.2.0,) + [ERROR] The currently supported version of Maven is 2.2.0 or higher + + + Best Practice is to always define plugin versions! + true + true + true + [ERROR] clean,deploy,site + + + + + + + org.codehaus.mojo buildnumber-maven-plugin @@ -418,38 +452,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0-beta-1 - - - enforce-java - validate - - enforce - - - - - [1.6,) - - - [2.2.0,) - - - Best Practice is to always define plugin versions! - true - true - true - clean,deploy,site - - - - - - - org.apache.maven.plugins maven-compiler-plugin From b3bdc00c1ca6db14882d9ff4c5693ca4259684b1 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:59:03 +0000 Subject: [PATCH 031/583] clean, deploy, install and resources plugin moved to the managed section (they don't need to be explicitly configured) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230041 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 6fa780c3..c4fcdb83 100644 --- a/pom.xml +++ b/pom.xml @@ -317,6 +317,29 @@ 2.8 + + maven-clean-plugin + 2.4.1 + + + + maven-deploy-plugin + 2.5 + + + + maven-install-plugin + 2.3.1 + + + + maven-resources-plugin + 2.4.3 + + ${project.build.sourceEncoding} + + + org.apache.maven.plugins maven-release-plugin @@ -410,29 +433,6 @@ - - maven-clean-plugin - 2.4.1 - - - - maven-deploy-plugin - 2.5 - - - - maven-install-plugin - 2.3.1 - - - - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - maven-jar-plugin 2.3.1 From d97b53852fdd1aca2ce0fdac665f649db98377fa Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 13:59:58 +0000 Subject: [PATCH 032/583] updated resources plugin version no needs to specify the source encoding (taken automatically) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230042 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c4fcdb83..81272499 100644 --- a/pom.xml +++ b/pom.xml @@ -334,10 +334,7 @@ maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - + 2.5 From e8219bf38c992291d16f4164e6c4647d67c2e341 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:07:31 +0000 Subject: [PATCH 033/583] ASF projects won't be deployed on Sonatype repo git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230049 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index ec67b049..0f42f69a 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -146,17 +146,6 @@ cobertura-maven-plugin 2.4 - - org.apache.maven.plugins - maven-release-plugin - 2.0 - - forked-path - false - true - -Psonatype-oss-release - - From f3a526e411b7272042268b0f6da725c0cb1a0361 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:09:12 +0000 Subject: [PATCH 034/583] removed inherited elements git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230051 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 53 +---------------------------------------------- 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 0f42f69a..848b02b7 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -53,7 +53,6 @@ - 1.6 2.2.10 3.0.2.RELEASE 2.0.8 @@ -66,12 +65,12 @@ - org.slf4j slf4j-api 1.6.1 + org.slf4j slf4j-log4j12 @@ -79,13 +78,6 @@ test - - junit - junit - ${junit.version} - test - - org.springframework spring-mock @@ -150,14 +142,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - com.mycila.maven-license-plugin maven-license-plugin @@ -201,41 +185,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0-beta-1 - - - enforce-java - - enforce - - - - - - - - [1.6,) - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - verify - - jar-no-fork - - - - \ No newline at end of file From 93241c8c785422d29ffbb0362332045f02cec5bb Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:14:39 +0000 Subject: [PATCH 035/583] reorganized XML elements git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230053 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 848b02b7..5547af32 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -24,12 +24,7 @@ - Apache Amber: OAuth 2.0 Implementation - Parent - org.apache.amber - amber-oauth2-parent - 0.22-incubating-SNAPSHOT 4.0.0 - pom org.apache.amber @@ -37,6 +32,13 @@ 0.22-incubating-SNAPSHOT + org.apache.amber + amber-oauth2-parent + 0.22-incubating-SNAPSHOT + pom + + Apache Amber: OAuth 2.0 Implementation - Parent + oauth2-common oauth2-client @@ -84,12 +86,14 @@ ${spring-mock.version} test + org.easymock easymock ${easy-mock.version} test + javax.servlet servlet-api @@ -187,4 +191,4 @@ - \ No newline at end of file + From 7e2f8e0abfed8c285ffb616f38a4878e9de5a22c Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:16:46 +0000 Subject: [PATCH 036/583] managed cobertura-maven-plugin git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230055 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 81272499..0772b547 100644 --- a/pom.xml +++ b/pom.xml @@ -337,6 +337,12 @@ 2.5 + + org.codehaus.mojo + cobertura-maven-plugin + 2.5.1 + + org.apache.maven.plugins maven-release-plugin From ecacb6087e189244118e0edc5b0d48ea1e9b79c9 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:17:39 +0000 Subject: [PATCH 037/583] removed unused build elements git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230057 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 90 ----------------------------------------------- 1 file changed, 90 deletions(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 5547af32..56490dc2 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -101,94 +101,4 @@ provided - - - - release - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2-beta-5 - - - make-assembly - package - - single - - - false - - assembly.xml - - - - - - - - - - - - oauth-parent - install - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - - - - - com.mycila.maven-license-plugin - maven-license-plugin - 1.8.0 - - true - ${project.basedir} -
license.txt
- false - true - true - - target/** - **/target/** - **/.hg/** - .clover/** - **/*.class - **/*.iml - **/*.ipr - **/*.iws - - false - - XML_STYLE - XML_STYLE - XML_STYLE - JAVADOC_STYLE - - true - - 2010 - http://research.ncl.ac.uk/smart/ - - UTF-8 - - - - - format - - - - - - From d41e8e34eab876b5db9cd99d798f9ede4735b364 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:18:20 +0000 Subject: [PATCH 038/583] switched to 2spaces identation git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230058 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 179 +++++++++++++++++++++++----------------------- 1 file changed, 89 insertions(+), 90 deletions(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 56490dc2..078c187b 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -1,104 +1,103 @@ - - 4.0.0 - - - org.apache.amber - amber-parent - 0.22-incubating-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + org.apache.amber - amber-oauth2-parent + amber-parent 0.22-incubating-SNAPSHOT - pom - - Apache Amber: OAuth 2.0 Implementation - Parent - - - oauth2-common - oauth2-client - oauth2-httpclient4 - oauth2-client-demo - oauth2-dynamicreg-client - oauth2-dynamicreg-common - oauth2-authzserver - oauth2-resourceserver - oauth2-rs-filter - oauth2-dynamicreg-server - oauth2-test-utils - oauth2-integration-tests - - - - 2.2.10 - 3.0.2.RELEASE - 2.0.8 - 3.0 - 2.5 - 4.8.1 - 1.2 - 7.1.5.v20100705 - 2.5 - - - - - org.slf4j - slf4j-api - 1.6.1 - - - - org.slf4j - slf4j-log4j12 - 1.6.0 - test - - - - org.springframework - spring-mock - ${spring-mock.version} - test - - - - org.easymock - easymock - ${easy-mock.version} - test - - - - javax.servlet - servlet-api - ${servlet-api.version} - provided - - + + + org.apache.amber + amber-oauth2-parent + 0.22-incubating-SNAPSHOT + pom + + Apache Amber: OAuth 2.0 Implementation - Parent + + + oauth2-common + oauth2-client + oauth2-httpclient4 + oauth2-client-demo + oauth2-dynamicreg-client + oauth2-dynamicreg-common + oauth2-authzserver + oauth2-resourceserver + oauth2-rs-filter + oauth2-dynamicreg-server + oauth2-test-utils + oauth2-integration-tests + + + + 2.2.10 + 3.0.2.RELEASE + 2.0.8 + 3.0 + 2.5 + 4.8.1 + 1.2 + 7.1.5.v20100705 + 2.5 + + + + + org.slf4j + slf4j-api + 1.6.1 + + + + org.slf4j + slf4j-log4j12 + 1.6.0 + test + + + + org.springframework + spring-mock + ${spring-mock.version} + test + + + + org.easymock + easymock + ${easy-mock.version} + test + + + + javax.servlet + servlet-api + ${servlet-api.version} + provided + + From f56e3568d88c9515558cf898e98f2fe9c1390e79 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:18:57 +0000 Subject: [PATCH 039/583] replaced license header git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230060 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 078c187b..dc46213a 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -1,10 +1,5 @@ From 6dec00d9a6581ff8422d06587b36d001caf3bdf4 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:19:39 +0000 Subject: [PATCH 040/583] no needs to override the version, inherited git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230061 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index dc46213a..db2f4cef 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -27,7 +27,6 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating-SNAPSHOT pom Apache Amber: OAuth 2.0 Implementation - Parent From 803d8ad7ee87acedcd70fbe4138631c89df287ec Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:26:33 +0000 Subject: [PATCH 041/583] replaced old codebase header with ASF header git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230063 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-authzserver/pom.xml | 31 ++++++++----------- oauth-2.0/oauth2-client-demo/pom.xml | 35 +++++++++------------- oauth-2.0/oauth2-client/pom.xml | 31 ++++++++----------- oauth-2.0/oauth2-common/pom.xml | 31 ++++++++----------- oauth-2.0/oauth2-dynamicreg-client/pom.xml | 35 +++++++++------------- oauth-2.0/oauth2-dynamicreg-common/pom.xml | 35 +++++++++------------- oauth-2.0/oauth2-dynamicreg-server/pom.xml | 31 ++++++++----------- oauth-2.0/oauth2-httpclient4/pom.xml | 35 +++++++++------------- oauth-2.0/oauth2-integration-tests/pom.xml | 31 ++++++++----------- oauth-2.0/oauth2-resourceserver/pom.xml | 35 +++++++++------------- oauth-2.0/oauth2-rs-filter/pom.xml | 35 +++++++++------------- oauth-2.0/oauth2-test-utils/pom.xml | 35 +++++++++------------- 12 files changed, 158 insertions(+), 242 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/pom.xml b/oauth-2.0/oauth2-authzserver/pom.xml index b79c12ac..5b5d0345 100644 --- a/oauth-2.0/oauth2-authzserver/pom.xml +++ b/oauth-2.0/oauth2-authzserver/pom.xml @@ -1,27 +1,20 @@ - org.apache.amber diff --git a/oauth-2.0/oauth2-client-demo/pom.xml b/oauth-2.0/oauth2-client-demo/pom.xml index 5b6a691f..0623f540 100644 --- a/oauth-2.0/oauth2-client-demo/pom.xml +++ b/oauth-2.0/oauth2-client-demo/pom.xml @@ -1,27 +1,20 @@ - diff --git a/oauth-2.0/oauth2-client/pom.xml b/oauth-2.0/oauth2-client/pom.xml index 4a5f0051..fb6b69ef 100644 --- a/oauth-2.0/oauth2-client/pom.xml +++ b/oauth-2.0/oauth2-client/pom.xml @@ -1,27 +1,20 @@ - 4.0.0 diff --git a/oauth-2.0/oauth2-common/pom.xml b/oauth-2.0/oauth2-common/pom.xml index 76d040ee..5917384f 100644 --- a/oauth-2.0/oauth2-common/pom.xml +++ b/oauth-2.0/oauth2-common/pom.xml @@ -1,27 +1,20 @@ - diff --git a/oauth-2.0/oauth2-dynamicreg-client/pom.xml b/oauth-2.0/oauth2-dynamicreg-client/pom.xml index 434bd673..68f0dc2c 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-client/pom.xml @@ -1,27 +1,20 @@ - 4.0.0 diff --git a/oauth-2.0/oauth2-dynamicreg-common/pom.xml b/oauth-2.0/oauth2-dynamicreg-common/pom.xml index 6293baef..81fd5405 100644 --- a/oauth-2.0/oauth2-dynamicreg-common/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-common/pom.xml @@ -1,27 +1,20 @@ - 4.0.0 oauth2-dynamicreg-common diff --git a/oauth-2.0/oauth2-dynamicreg-server/pom.xml b/oauth-2.0/oauth2-dynamicreg-server/pom.xml index 1d02487a..055379db 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-server/pom.xml @@ -1,27 +1,20 @@ - 4.0.0 diff --git a/oauth-2.0/oauth2-httpclient4/pom.xml b/oauth-2.0/oauth2-httpclient4/pom.xml index 18d9383d..8497d4c2 100644 --- a/oauth-2.0/oauth2-httpclient4/pom.xml +++ b/oauth-2.0/oauth2-httpclient4/pom.xml @@ -1,26 +1,19 @@ - diff --git a/oauth-2.0/oauth2-integration-tests/pom.xml b/oauth-2.0/oauth2-integration-tests/pom.xml index 5a1ef88c..fa12311d 100644 --- a/oauth-2.0/oauth2-integration-tests/pom.xml +++ b/oauth-2.0/oauth2-integration-tests/pom.xml @@ -1,27 +1,20 @@ - amber-oauth2-parent diff --git a/oauth-2.0/oauth2-resourceserver/pom.xml b/oauth-2.0/oauth2-resourceserver/pom.xml index 8428e5eb..aba4bace 100644 --- a/oauth-2.0/oauth2-resourceserver/pom.xml +++ b/oauth-2.0/oauth2-resourceserver/pom.xml @@ -1,27 +1,20 @@ - diff --git a/oauth-2.0/oauth2-rs-filter/pom.xml b/oauth-2.0/oauth2-rs-filter/pom.xml index 3ef7608e..c43f98b8 100644 --- a/oauth-2.0/oauth2-rs-filter/pom.xml +++ b/oauth-2.0/oauth2-rs-filter/pom.xml @@ -1,27 +1,20 @@ - 4.0.0 diff --git a/oauth-2.0/oauth2-test-utils/pom.xml b/oauth-2.0/oauth2-test-utils/pom.xml index 6dda9c43..7dcc963b 100644 --- a/oauth-2.0/oauth2-test-utils/pom.xml +++ b/oauth-2.0/oauth2-test-utils/pom.xml @@ -1,27 +1,20 @@ - 4.0.0 From ecff605a41fa4b50bc1a5bb8de47f64dec1d66b4 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:52:42 +0000 Subject: [PATCH 042/583] updated spring framework version git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230074 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index db2f4cef..747680ae 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -48,7 +48,7 @@ 2.2.10 - 3.0.2.RELEASE + 3.0.3.RELEASE 2.0.8 3.0 2.5 From f6584738480856cf3cf448919715b36702f3d7fe Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:57:47 +0000 Subject: [PATCH 043/583] managed surefire-plugin git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230075 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 0772b547..fb8b3cf6 100644 --- a/pom.xml +++ b/pom.xml @@ -343,6 +343,12 @@ 2.5.1 + + org.apache.maven.plugins + maven-surefire-plugin + 2.11 + + org.apache.maven.plugins maven-release-plugin From e103da9710aec8f30c49c7c33fb9a92acb31290a Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 14:58:35 +0000 Subject: [PATCH 044/583] removed overriding maven-surefire-plugin version git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230076 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb8b3cf6..626912be 100644 --- a/pom.xml +++ b/pom.xml @@ -482,7 +482,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.5 From 12b94f73b08c9f13b389158e6a2fd2ef0f04bce9 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 15:02:37 +0000 Subject: [PATCH 045/583] moved the rap-plugin in the release profile - there are currently too many unapproved licenses that make the build failing git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230081 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 626912be..e9778921 100644 --- a/pom.xml +++ b/pom.xml @@ -420,28 +420,6 @@ - - org.apache.rat - apache-rat-plugin - 0.7 - - - rat-verify - test - - check - - - - DISCLAIMER - KEYS - NOTICE - - - - - - maven-jar-plugin 2.3.1 @@ -581,6 +559,28 @@ release + + org.apache.rat + apache-rat-plugin + 0.7 + + + rat-verify + test + + check + + + + DISCLAIMER + KEYS + NOTICE + + + + + + org.apache.maven.plugins maven-source-plugin From 43bf61e865bdc7bb00bf89f7fb806437adc7c8ae Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 15:04:37 +0000 Subject: [PATCH 046/583] cleaned up oauth 2.0 POMs git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230083 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-authzserver/pom.xml | 88 ++++---- oauth-2.0/oauth2-client-demo/pom.xml | 235 ++++++++++----------- oauth-2.0/oauth2-client/pom.xml | 88 ++++---- oauth-2.0/oauth2-common/pom.xml | 108 +++++----- oauth-2.0/oauth2-dynamicreg-client/pom.xml | 68 +++--- oauth-2.0/oauth2-dynamicreg-common/pom.xml | 39 ++-- oauth-2.0/oauth2-dynamicreg-server/pom.xml | 93 ++++---- oauth-2.0/oauth2-httpclient4/pom.xml | 60 +++--- oauth-2.0/oauth2-integration-tests/pom.xml | 234 ++++++++++---------- oauth-2.0/oauth2-resourceserver/pom.xml | 68 +++--- oauth-2.0/oauth2-rs-filter/pom.xml | 54 +++-- oauth-2.0/oauth2-test-utils/pom.xml | 41 ++-- 12 files changed, 565 insertions(+), 611 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/pom.xml b/oauth-2.0/oauth2-authzserver/pom.xml index 5b5d0345..745d501a 100644 --- a/oauth-2.0/oauth2-authzserver/pom.xml +++ b/oauth-2.0/oauth2-authzserver/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,52 +16,50 @@ limitations under the License. --> - - org.apache.amber - amber-oauth2-parent - 0.22-incubating-SNAPSHOT - + 4.0.0 - 4.0.0 - oauth2-authzserver - 0.22-incubating-SNAPSHOT - Apache Amber: OAuth 2.0 Implementation - Authorization Server - jar + + org.apache.amber + amber-oauth2-parent + 0.22-incubating-SNAPSHOT + - - oauth2-authzserver - - - - org.apache.amber - oauth2-common - 0.22-incubating-SNAPSHOT - + oauth2-authzserver - - org.codehaus.jettison - jettison - ${jettison.version} - - - stax - stax-api - - - + Apache Amber: OAuth 2.0 Implementation - Authorization Server - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - test - - - org.apache.cxf - cxf-testutils - ${cxf.version} - test - - + + + org.apache.amber + oauth2-common + ${project.version} + - \ No newline at end of file + + org.codehaus.jettison + jettison + ${jettison.version} + + + stax + stax-api + + + + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + test + + + + org.apache.cxf + cxf-testutils + ${cxf.version} + test + + + + diff --git a/oauth-2.0/oauth2-client-demo/pom.xml b/oauth-2.0/oauth2-client-demo/pom.xml index 0623f540..5f3dfc2c 100644 --- a/oauth-2.0/oauth2-client-demo/pom.xml +++ b/oauth-2.0/oauth2-client-demo/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,133 +16,110 @@ limitations under the License. --> - - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - - - 4.0.0 - oauth2-client-demo - Apache Amber: OAuth 2.0 Implementation - Demo Application - war - - - - - 3.0.3.RELEASE - - - - - oauth2-demo - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.24 - - - / - - - - 8080 - 60000 - - - 10 - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - - - - - commons-logging - commons-logging - 1.1 - - - org.slf4j - slf4j-jcl - 1.6.0 - - - - - - oauth2-common - org.apache.amber - ${project.version} - - - - - - oauth2-dynamicreg-common - org.apache.amber - ${project.version} - - - - oauth2-dynamicreg-client - org.apache.amber - ${project.version} - - - - - - org.springframework - spring-context - ${org.springframework.version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${org.springframework.version} - - - - - - - org.tuckey - urlrewritefilter - 3.1.0 - runtime - - - - - standard - taglibs - 1.1.2 - jar - runtime - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + + org.apache.amber + amber-oauth2-parent + 0.22-incubating-SNAPSHOT + + + oauth2-client-demo + war + + Apache Amber: OAuth 2.0 Implementation - Demo Application + + + + org.slf4j + slf4j-jcl + 1.6.0 + + + + + oauth2-common + org.apache.amber + ${project.version} + + + + + + oauth2-dynamicreg-common + org.apache.amber + ${project.version} + + + + oauth2-dynamicreg-client + org.apache.amber + ${project.version} + + + + + + org.springframework + spring-context + ${org.springframework.version} + + + + commons-logging + commons-logging + + + + + + org.springframework + spring-webmvc + ${org.springframework.version} + + + + + + org.tuckey + urlrewritefilter + 3.1.0 + runtime + + + + + standard + taglibs + 1.1.2 + jar + runtime + + + + + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.24 + + + / + + + + 8080 + 60000 + + + 10 + + + + diff --git a/oauth-2.0/oauth2-client/pom.xml b/oauth-2.0/oauth2-client/pom.xml index fb6b69ef..4cf7605b 100644 --- a/oauth-2.0/oauth2-client/pom.xml +++ b/oauth-2.0/oauth2-client/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,56 +16,52 @@ limitations under the License. --> - 4.0.0 - oauth2-client + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + + amber-oauth2-parent org.apache.amber - Apache Amber: OAuth 2.0 Implementation - Client - jar 0.22-incubating-SNAPSHOT + - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - + oauth2-client - - oauth2-client - - - org.apache.maven.plugins - maven-surefire-plugin - 2.5 - - - **/utils/* - **/OAuthClientTest.java - - - - - + Apache Amber: OAuth 2.0 Implementation - Client - - - org.apache.amber - oauth2-common - ${project.version} - + + + org.apache.amber + oauth2-common + ${project.version} + - - org.codehaus.jettison - jettison - ${jettison.version} - - - stax - stax-api - - - + + org.codehaus.jettison + jettison + ${jettison.version} + + + stax + stax-api + + + + - + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/utils/* + **/OAuthClientTest.java + + + + + - \ No newline at end of file + diff --git a/oauth-2.0/oauth2-common/pom.xml b/oauth-2.0/oauth2-common/pom.xml index 5917384f..dbf38718 100644 --- a/oauth-2.0/oauth2-common/pom.xml +++ b/oauth-2.0/oauth2-common/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,60 +16,60 @@ limitations under the License. --> - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - 4.0.0 - oauth2-common - Apache Amber: OAuth 2.0 Implementation - Common + + org.apache.amber + amber-oauth2-parent 0.22-incubating-SNAPSHOT - jar - OAuth 2.0 library - Common + - - oauth2-common - - - org.apache.maven.plugins - maven-surefire-plugin - 2.5 - - - **/TestOAuthClient.java - **/TestOAuthClient.java - - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - org/apache/amber/oauth2/common/message/types/**.class - org/apache/amber/oauth2/common/OAuth**.class - - - - - - + oauth2-common - - - org.codehaus.jettison - jettison - ${jettison.version} - - - stax - stax-api - - - - - \ No newline at end of file + Apache Amber: OAuth 2.0 Implementation - Common + OAuth 2.0 library - Common + + + + org.codehaus.jettison + jettison + ${jettison.version} + + + stax + stax-api + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/TestOAuthClient.java + **/TestOAuthClient.java + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + org/apache/amber/oauth2/common/message/types/**.class + org/apache/amber/oauth2/common/OAuth**.class + + + + + + + + diff --git a/oauth-2.0/oauth2-dynamicreg-client/pom.xml b/oauth-2.0/oauth2-dynamicreg-client/pom.xml index 68f0dc2c..5bd17792 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-client/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,41 +16,37 @@ limitations under the License. --> - 4.0.0 - oauth2-dynamicreg-client - Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Client - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + + org.apache.amber + amber-oauth2-parent 0.22-incubating-SNAPSHOT + + + oauth2-dynamicreg-client + + Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Client + + + + org.apache.amber + oauth2-common + ${project.version} + + + + org.apache.amber + oauth2-client + ${project.version} + + + + org.apache.amber + oauth2-dynamicreg-common + ${project.version} + + - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - - - - oauth2-dynamicreg-client - - - - - org.apache.amber - oauth2-common - ${project.version} - - - - org.apache.amber - oauth2-client - ${project.version} - - - - org.apache.amber - oauth2-dynamicreg-common - ${project.version} - - - diff --git a/oauth-2.0/oauth2-dynamicreg-common/pom.xml b/oauth-2.0/oauth2-dynamicreg-common/pom.xml index 81fd5405..b698c6df 100644 --- a/oauth-2.0/oauth2-dynamicreg-common/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-common/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,27 +16,24 @@ limitations under the License. --> - 4.0.0 - oauth2-dynamicreg-common - Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Common - jar - 0.22-incubating-SNAPSHOT + 4.0.0 - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - + + org.apache.amber + amber-oauth2-parent + 0.22-incubating-SNAPSHOT + - - oauth2-dynamicreg-common - + oauth2-dynamicreg-common + + Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Common + + + + org.apache.amber + oauth2-common + ${project.version} + + - - - org.apache.amber - oauth2-common - ${project.version} - - diff --git a/oauth-2.0/oauth2-dynamicreg-server/pom.xml b/oauth-2.0/oauth2-dynamicreg-server/pom.xml index 055379db..8c74ca21 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-server/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,58 +16,55 @@ limitations under the License. --> - 4.0.0 - oauth2-dynamicreg-server - Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Server - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + + org.apache.amber + amber-oauth2-parent 0.22-incubating-SNAPSHOT + - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - + oauth2-dynamicreg-server - - oauth2-dynamicreg-server - + Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Server - - - org.apache.amber - oauth2-common - ${project.version} - - - org.apache.amber - oauth2-authzserver - ${project.version} - + + + org.apache.amber + oauth2-common + ${project.version} + - - org.apache.amber - oauth2-dynamicreg-common - ${project.version} - + + org.apache.amber + oauth2-authzserver + ${project.version} + - - org.codehaus.jettison - jettison - ${jettison.version} - - - stax - stax-api - - - + + org.apache.amber + oauth2-dynamicreg-common + ${project.version} + - - org.apache.amber - oauth2-test-utils - ${project.version} - - - + + org.codehaus.jettison + jettison + ${jettison.version} + + + stax + stax-api + + + + + org.apache.amber + oauth2-test-utils + ${project.version} + + + + diff --git a/oauth-2.0/oauth2-httpclient4/pom.xml b/oauth-2.0/oauth2-httpclient4/pom.xml index 8497d4c2..2a82bee6 100644 --- a/oauth-2.0/oauth2-httpclient4/pom.xml +++ b/oauth-2.0/oauth2-httpclient4/pom.xml @@ -6,7 +6,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -15,38 +15,30 @@ limitations under the License. --> - - - 4.0.0 - oauth2-httpclient4 - jar - Apache Amber: OAuth 2.0 Implementation - HttpClient - - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - - - - oauth2-httpclient4 - - - 4.1.2 - - - - - org.apache.amber - oauth2-client - ${project.version} - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - + 4.0.0 + + + org.apache.amber + amber-oauth2-parent + 0.22-incubating-SNAPSHOT + + + oauth2-httpclient4 + + Apache Amber: OAuth 2.0 Implementation - HttpClient + + + + org.apache.amber + oauth2-client + ${project.version} + + + + org.apache.httpcomponents + httpclient + 4.1.2 + + diff --git a/oauth-2.0/oauth2-integration-tests/pom.xml b/oauth-2.0/oauth2-integration-tests/pom.xml index fa12311d..df9be19d 100644 --- a/oauth-2.0/oauth2-integration-tests/pom.xml +++ b/oauth-2.0/oauth2-integration-tests/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,115 +16,123 @@ limitations under the License. --> - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - - 4.0.0 - Apache Amber: OAuth 2.0 Implementation - Integration Tests - oauth2-integration-tests - 0.22-incubating-SNAPSHOT - - - oauth2-integration-tests - - - org.apache.maven.plugins - maven-surefire-plugin - 2.5 - - - **/utils/* - - - - - - - - - org.apache.amber - oauth2-common - ${project.version} - - - org.apache.amber - oauth2-client - ${project.version} - - - org.apache.amber - oauth2-authzserver - ${project.version} - - - - org.apache.amber - oauth2-httpclient4 - ${project.version} - - - - org.apache.amber - oauth2-resourceserver - ${project.version} - - - - org.apache.amber - oauth2-dynamicreg-client - ${project.version} - - - - org.apache.amber - oauth2-dynamicreg-server - ${project.version} - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf.version} - test - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - test - - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - test - - - org.apache.cxf - cxf-rt-transports-http-jetty - ${cxf.version} - test - - - org.springframework - spring-context - ${spring.version} - test - - - org.springframework - spring-core - ${spring.version} - test - - - org.springframework - spring-beans - ${spring.version} - test - - - - \ No newline at end of file + 4.0.0 + + + org.apache.amber + amber-oauth2-parent + 0.22-incubating-SNAPSHOT + + + Apache Amber: OAuth 2.0 Implementation - Integration Tests + + oauth2-integration-tests + + + + org.apache.amber + oauth2-common + ${project.version} + + + + org.apache.amber + oauth2-client + ${project.version} + + + + org.apache.amber + oauth2-authzserver + ${project.version} + + + + org.apache.amber + oauth2-httpclient4 + ${project.version} + + + + org.apache.amber + oauth2-resourceserver + ${project.version} + + + + org.apache.amber + oauth2-dynamicreg-client + ${project.version} + + + + org.apache.amber + oauth2-dynamicreg-server + ${project.version} + + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + test + + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + test + + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + test + + + + org.apache.cxf + cxf-rt-transports-http-jetty + ${cxf.version} + test + + + + org.springframework + spring-context + ${org.springframework.version} + test + + + + org.springframework + spring-core + ${org.springframework.version} + test + + + + org.springframework + spring-beans + ${org.springframework.version} + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/utils/* + + + + + + + diff --git a/oauth-2.0/oauth2-resourceserver/pom.xml b/oauth-2.0/oauth2-resourceserver/pom.xml index aba4bace..dcde8647 100644 --- a/oauth-2.0/oauth2-resourceserver/pom.xml +++ b/oauth-2.0/oauth2-resourceserver/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,40 +16,38 @@ limitations under the License. --> + 4.0.0 - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - - - 4.0.0 - oauth2-resourceserver - Apache Amber: OAuth 2.0 Implementation - Resource Server - 0.22-incubating-SNAPSHOT - - - oauth2-resourceserver - - - org.apache.maven.plugins - maven-surefire-plugin - 2.5 - - - **/utils/* - - - - - - - - - oauth2-common - org.apache.amber - ${project.version} - - + + org.apache.amber + amber-oauth2-parent + 0.22-incubating-SNAPSHOT + + + oauth2-resourceserver + + Apache Amber: OAuth 2.0 Implementation - Resource Server + + + + org.apache.amber + oauth2-common + ${project.version} + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/utils/* + + + + + diff --git a/oauth-2.0/oauth2-rs-filter/pom.xml b/oauth-2.0/oauth2-rs-filter/pom.xml index c43f98b8..189a3abb 100644 --- a/oauth-2.0/oauth2-rs-filter/pom.xml +++ b/oauth-2.0/oauth2-rs-filter/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,33 +16,31 @@ limitations under the License. --> - 4.0.0 - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - - oauth2-rs-filter + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + + org.apache.amber + amber-oauth2-parent 0.22-incubating-SNAPSHOT - Apache Amber: OAuth 2.0 Implementation - Resource Server Filter - - - oauth2-rs-filter - - - - - oauth2-resourceserver - org.apache.amber - ${project.version} - - - - org.apache.amber - oauth2-common - ${project.version} - - + + + oauth2-rs-filter + + Apache Amber: OAuth 2.0 Implementation - Resource Server Filter + + + + org.apache.amber + oauth2-resourceserver + ${project.version} + + + + org.apache.amber + oauth2-common + ${project.version} + + diff --git a/oauth-2.0/oauth2-test-utils/pom.xml b/oauth-2.0/oauth2-test-utils/pom.xml index 7dcc963b..88111a32 100644 --- a/oauth-2.0/oauth2-test-utils/pom.xml +++ b/oauth-2.0/oauth2-test-utils/pom.xml @@ -7,7 +7,7 @@ (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -16,28 +16,25 @@ limitations under the License. --> - 4.0.0 - oauth2-test-utils - Apache Amber: OAuth 2.0 Implementation - Test Utils - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + + org.apache.amber + amber-oauth2-parent 0.22-incubating-SNAPSHOT + - - amber-oauth2-parent - org.apache.amber - 0.22-incubating-SNAPSHOT - + oauth2-test-utils - - oauth2-test-utils - - - - org.springframework - spring-core - ${spring.version} - - - + Apache Amber: OAuth 2.0 Implementation - Test Utils + + + org.springframework + spring-core + ${org.springframework.version} + + + + From 6ba5de18d7d315576a791112e184f099460f7834 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 15:53:40 +0000 Subject: [PATCH 047/583] removed unneeded property git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230108 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9778921..56b09ab8 100644 --- a/pom.xml +++ b/pom.xml @@ -253,7 +253,6 @@ 1.6 1.6 yyyy-MM-dd HH:mm:ssZ - ${project.version} From a2026774f938b5bcbec26341a6ecdaf7186501b9 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 15:56:03 +0000 Subject: [PATCH 048/583] include also the build branch in build number, not just the revision git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230109 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 56b09ab8..3591d76a 100644 --- a/pom.xml +++ b/pom.xml @@ -253,6 +253,7 @@ 1.6 1.6 yyyy-MM-dd HH:mm:ssZ + ${scmBranch}@r${buildNumber} @@ -429,7 +430,7 @@ true - r${buildNumber} + ${implementation.build} ${maven.build.timestamp} ${javac.src.version} ${javac.target.version} @@ -597,7 +598,7 @@ true - r${buildNumber} + ${implementation.build} ${maven.build.timestamp} ${javac.src.version} ${javac.target.version} @@ -625,7 +626,7 @@ true - r${buildNumber} + ${implementation.build} ${maven.build.timestamp} ${javac.src.version} ${javac.target.version} From 1cf27c819fb16509fc509e0a137874821e70210e Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 15:59:38 +0000 Subject: [PATCH 049/583] removed tommaso affiliation, under his authorization git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230115 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3591d76a..ebb3818d 100644 --- a/pom.xml +++ b/pom.xml @@ -159,8 +159,6 @@ tommaso Tommaso Teofili tommaso[at]apache[dot]org - Sourcesense S.r.l. - http://www.sourcesense.com/ PPMC Member Committer From 2ed5e8899b4b8d7db676686168137e29a6b2fe09 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 16:02:41 +0000 Subject: [PATCH 050/583] double logo in homepage just makes some noise, dropped it git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230117 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/xdoc/index.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 57ef1652..cf6d07b1 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -24,13 +24,9 @@ -
- - -
- +

Apache Amber is an OAuth protocol implementation in Java.

-
+

Disclaimer

From 36fed021b08d0d3705d515d5e4835c695c9f1071 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 16:09:43 +0000 Subject: [PATCH 051/583] added the ASF menu, as required by the Foundation git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230119 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/site/site.xml b/src/site/site.xml index 0ec96917..811fa4bc 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -44,7 +44,11 @@ - + + + + + From c6668bde927fd37cfec6b69ca16961d46a2524b1 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Wed, 11 Jan 2012 16:14:37 +0000 Subject: [PATCH 052/583] updated image logo with TM as per ASF requirement git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230121 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/resources/images/amber_head.png | Bin 31983 -> 29038 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/site/resources/images/amber_head.png b/src/site/resources/images/amber_head.png index 587e0119eb569464230ba60ff074642ac0ad39de..63a1e20ea606fa68c4476d71c62097cb08854370 100644 GIT binary patch literal 29038 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 literal 31983 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 Date: Wed, 11 Jan 2012 16:17:41 +0000 Subject: [PATCH 053/583] added the wagon-ssh plugin, Maven3 doesn't handle ssh/scp by default git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230123 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index ebb3818d..d30d38a7 100644 --- a/pom.xml +++ b/pom.xml @@ -482,6 +482,17 @@ + + + + + org.apache.maven.wagon + wagon-ssh + 1.0 + + From 2a0f92c26f5bde456d3e71208d03e012767eb23d Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 16:18:48 +0000 Subject: [PATCH 054/583] no needs to redefine the groupId git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230124 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 747680ae..213d0920 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -25,7 +25,6 @@ 0.22-incubating-SNAPSHOT - org.apache.amber amber-oauth2-parent pom From 252ab8d00a5a57981c5e5bbd58fc1b624d23c472 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 16:19:22 +0000 Subject: [PATCH 055/583] removed unneeded property git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230125 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 213d0920..0cc4064f 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -51,7 +51,6 @@ 2.0.8 3.0 2.5 - 4.8.1 1.2 7.1.5.v20100705 2.5 From f4f996656dea5d2ce03cbb3d68f160b8972df1e3 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 16:43:22 +0000 Subject: [PATCH 056/583] added Google Doclava as Javadoc Doclet git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230136 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pom.xml b/pom.xml index d30d38a7..a076f34d 100644 --- a/pom.xml +++ b/pom.xml @@ -500,6 +500,30 @@ org.apache.maven.plugins maven-javadoc-plugin + + ${sun.boot.class.path} + com.google.doclava.Doclava + false + -J-Xmx1024m + + com.google.doclava + doclava + 1.0.3 + + + -hdf project.name "${project.name}" + -d ${project.reporting.outputDirectory}/apidocs + -bottom 'Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.' + + + + + default + + javadoc + + + From a768e39902bec359fe5b4d71cf6c4fad1d465ee5 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 11 Jan 2012 21:41:58 +0000 Subject: [PATCH 057/583] upgraded apache parent, enabled profile to deploy on Nexus when releasing git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230266 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a076f34d..c38cd173 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache apache - 7 + 10 org.apache.amber @@ -355,7 +355,7 @@ forked-path false true - -Prelease + -Prelease,apache-release From dd622a23ebbb87ef0be33b23fe9355453ab66621 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 12 Jan 2012 09:34:46 +0000 Subject: [PATCH 058/583] added MLs archives git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230453 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index c38cd173..0f0067a5 100644 --- a/pom.xml +++ b/pom.xml @@ -203,6 +203,7 @@ amber-dev[at]incubator[dot]apache[dot]org amber-dev-subscribe[at]incubator[dot]apache[dot]org amber-dev-unsubscribe[at]incubator[dot]apache[dot]org + http://mail-archives.apache.org/mod_mbox/incubator-amber-dev/ @@ -210,6 +211,7 @@ amber-user[at]incubator[dot]apache[dot]org amber-user-subscribe[at]incubator[dot]apache[dot]org amber-user-unsubscribe[at]incubator[dot]apache[dot]org + http://mail-archives.apache.org/mod_mbox/incubator-amber-user/ @@ -217,6 +219,7 @@ amber-commits[at]incubator[dot]apache[dot]org amber-commits-subscribe[at]incubator[dot]apache[dot]org amber-commits-unsubscribe[at]incubator[dot]apache[dot]org + http://mail-archives.apache.org/mod_mbox/incubator-amber-commits/ From 34fc9bfff8646f99411bfbf7a79c8bae6feb8ae7 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 12 Jan 2012 09:45:50 +0000 Subject: [PATCH 059/583] site distribution management id not really useful (ssh pwd is always prompted, so even if configuring it in settings.xml it has no effects) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230455 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f0067a5..20f3b6b2 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ - website + Apache Amber website scp://people.apache.org/www/incubator.apache.org/amber/ From 28b440416d02dcf8daa8e33ce460ea1f14160675 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 12 Jan 2012 09:49:13 +0000 Subject: [PATCH 060/583] wagon-ssh plugged as site-plugin dependency, no needs to have it globally (artifacts are deployed via http on Nexus) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230456 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 20f3b6b2..0f48fa84 100644 --- a/pom.xml +++ b/pom.xml @@ -467,6 +467,13 @@ org.apache.maven.plugins maven-site-plugin 3.0 + + + org.apache.maven.wagon + wagon-ssh + 1.0 + + @@ -485,17 +492,6 @@ - - - - - org.apache.maven.wagon - wagon-ssh - 1.0 - - From 3daa67866c0085ada9827ffb9ee1e0dcfac56cff Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 12 Jan 2012 09:49:48 +0000 Subject: [PATCH 061/583] made resource path coherent git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230457 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f48fa84..9ecb1e04 100644 --- a/pom.xml +++ b/pom.xml @@ -479,7 +479,7 @@ - src/main/resources + ${basedir}/src/main/resources From 66ea67e55d20db12aa9649f7271c92187b3ee4f9 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 12 Jan 2012 09:53:01 +0000 Subject: [PATCH 062/583] updated maven-project-info-reports-plugin version git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230458 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ecb1e04..c1c6b4e8 100644 --- a/pom.xml +++ b/pom.xml @@ -528,7 +528,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.2 + 2.4 From fb2a48b8789684b5d81b26233683e1576015f8fb Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 12 Jan 2012 09:55:06 +0000 Subject: [PATCH 063/583] looks like id is required to deploy the site git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230459 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index c1c6b4e8..dc2694a1 100644 --- a/pom.xml +++ b/pom.xml @@ -242,6 +242,7 @@ + amber.website Apache Amber website scp://people.apache.org/www/incubator.apache.org/amber/ From 2fd0deaef2f9111cd6556b379e942495ce6e997f Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 12 Jan 2012 10:18:20 +0000 Subject: [PATCH 064/583] dropped broken javadoc parameter git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230472 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc2694a1..59f8d5ee 100644 --- a/pom.xml +++ b/pom.xml @@ -513,7 +513,6 @@ -hdf project.name "${project.name}" -d ${project.reporting.outputDirectory}/apidocs - -bottom 'Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved.' From 1c80e04981c67260529c38e0c8a2213c0e4cc68a Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 12 Jan 2012 10:19:36 +0000 Subject: [PATCH 065/583] no more needs to version the site, it can be deployed via meven using ssh on people.apache.org git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1230473 13f79535-47bb-0310-9956-ffa450edef68 --- site/apidocs/allclasses-frame.html | 128 --- site/apidocs/allclasses-noframe.html | 128 --- site/apidocs/constant-values.html | 301 ------ site/apidocs/deprecated-list.html | 167 ---- site/apidocs/help-doc.html | 224 ----- site/apidocs/index-all.html | 1134 ---------------------- site/apidocs/index.html | 40 - site/apidocs/overview-frame.html | 55 -- site/apidocs/overview-summary.html | 183 ---- site/apidocs/overview-tree.html | 193 ---- site/apidocs/package-list | 7 - site/apidocs/serialized-form.html | 352 ------- site/apidocs/stylesheet.css | 29 - site/css/maven-base.css | 220 ----- site/css/maven-theme.css | 165 ---- site/css/niftyCorners.css | 35 - site/css/prettify.css | 92 -- site/css/site.css | 1 - site/dependencies.html | 273 ------ site/dependency-convergence.html | 256 ----- site/dependency-management.html | 252 ----- site/images/amber_head.png | Bin 31983 -> 0 bytes site/images/close.gif | Bin 279 -> 0 bytes site/images/collapsed.png | Bin 183 -> 0 bytes site/images/dialog-apply.png | Bin 611 -> 0 bytes site/images/dialog-error.png | Bin 674 -> 0 bytes site/images/dialog-information.png | Bin 752 -> 0 bytes site/images/dialog-warning.png | Bin 3286 -> 0 bytes site/images/expanded.png | Bin 286 -> 0 bytes site/images/icon_error_sml.gif | Bin 583 -> 0 bytes site/images/icon_help_sml.gif | Bin 637 -> 0 bytes site/images/icon_info_sml.gif | Bin 632 -> 0 bytes site/images/icon_success_sml.gif | Bin 325 -> 0 bytes site/images/icon_warning_sml.gif | Bin 637 -> 0 bytes site/images/window-new.png | Bin 3089 -> 0 bytes site/index.html | 257 ----- site/integration.html | 253 ----- site/issue-tracking.html | 253 ----- site/jira-report.html | 213 ---- site/js/niftycube.js | 0 site/js/prettify.js | 623 ------------ site/license.html | 455 --------- site/mail-lists.html | 253 ----- site/modules.html | 253 ----- site/plugin-management.html | 253 ----- site/plugins.html | 253 ----- site/project-info.html | 257 ----- site/project-reports.html | 213 ---- site/project-summary.html | 257 ----- site/source-repository.html | 256 ----- site/stats.html | 229 ----- site/surefire-report.html | 213 ---- site/team-list.html | 275 ------ site/testapidocs/allclasses-frame.html | 40 - site/testapidocs/allclasses-noframe.html | 40 - site/testapidocs/constant-values.html | 147 --- site/testapidocs/deprecated-list.html | 147 --- site/testapidocs/help-doc.html | 224 ----- site/testapidocs/index-all.html | 219 ----- site/testapidocs/index.html | 40 - site/testapidocs/overview-frame.html | 51 - site/testapidocs/overview-summary.html | 173 ---- site/testapidocs/overview-tree.html | 155 --- site/testapidocs/package-list | 5 - site/testapidocs/stylesheet.css | 29 - 65 files changed, 10271 deletions(-) delete mode 100644 site/apidocs/allclasses-frame.html delete mode 100644 site/apidocs/allclasses-noframe.html delete mode 100644 site/apidocs/constant-values.html delete mode 100644 site/apidocs/deprecated-list.html delete mode 100644 site/apidocs/help-doc.html delete mode 100644 site/apidocs/index-all.html delete mode 100644 site/apidocs/index.html delete mode 100644 site/apidocs/overview-frame.html delete mode 100644 site/apidocs/overview-summary.html delete mode 100644 site/apidocs/overview-tree.html delete mode 100644 site/apidocs/package-list delete mode 100644 site/apidocs/serialized-form.html delete mode 100644 site/apidocs/stylesheet.css delete mode 100644 site/css/maven-base.css delete mode 100644 site/css/maven-theme.css delete mode 100644 site/css/niftyCorners.css delete mode 100644 site/css/prettify.css delete mode 100644 site/css/site.css delete mode 100644 site/dependencies.html delete mode 100644 site/dependency-convergence.html delete mode 100644 site/dependency-management.html delete mode 100644 site/images/amber_head.png delete mode 100644 site/images/close.gif delete mode 100644 site/images/collapsed.png delete mode 100644 site/images/dialog-apply.png delete mode 100644 site/images/dialog-error.png delete mode 100644 site/images/dialog-information.png delete mode 100644 site/images/dialog-warning.png delete mode 100644 site/images/expanded.png delete mode 100644 site/images/icon_error_sml.gif delete mode 100644 site/images/icon_help_sml.gif delete mode 100644 site/images/icon_info_sml.gif delete mode 100644 site/images/icon_success_sml.gif delete mode 100644 site/images/icon_warning_sml.gif delete mode 100644 site/images/window-new.png delete mode 100644 site/index.html delete mode 100644 site/integration.html delete mode 100644 site/issue-tracking.html delete mode 100644 site/jira-report.html delete mode 100644 site/js/niftycube.js delete mode 100644 site/js/prettify.js delete mode 100644 site/license.html delete mode 100644 site/mail-lists.html delete mode 100644 site/modules.html delete mode 100644 site/plugin-management.html delete mode 100644 site/plugins.html delete mode 100644 site/project-info.html delete mode 100644 site/project-reports.html delete mode 100644 site/project-summary.html delete mode 100644 site/source-repository.html delete mode 100644 site/stats.html delete mode 100644 site/surefire-report.html delete mode 100644 site/team-list.html delete mode 100644 site/testapidocs/allclasses-frame.html delete mode 100644 site/testapidocs/allclasses-noframe.html delete mode 100644 site/testapidocs/constant-values.html delete mode 100644 site/testapidocs/deprecated-list.html delete mode 100644 site/testapidocs/help-doc.html delete mode 100644 site/testapidocs/index-all.html delete mode 100644 site/testapidocs/index.html delete mode 100644 site/testapidocs/overview-frame.html delete mode 100644 site/testapidocs/overview-summary.html delete mode 100644 site/testapidocs/overview-tree.html delete mode 100644 site/testapidocs/package-list delete mode 100644 site/testapidocs/stylesheet.css diff --git a/site/apidocs/allclasses-frame.html b/site/apidocs/allclasses-frame.html deleted file mode 100644 index 621a419c..00000000 --- a/site/apidocs/allclasses-frame.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - -All Classes (Apache Amber 1.0-SNAPSHOT API) - - - - - - - - - - - -All Classes -
- - - - - -
AbstractMethod -
-Access -
-AccessStorage -
-BasicKey -
-ConsumerStorage -
-HmacSha1Method -
-HttpConnector -
-HTTPMethod -
-Key -
-NonceGenerator -
-OAuth -
-OAuthClient -
-OAuthConsumer -
-OAuthException -
-OAuthFactory -
-OAuthMessageParameter -
-OAuthnServer -
-OAuthParameter -
-OAuthParameterLocation -
-OAuthProvider -
-OAuthProviders -
-OAuthRequest -
-OAuthRequestParameter -
-OAuthResponse -
-OAuthResponseParser -
-OAuthRuntimeException -
-OAuthServer -
-OAuthServerConfiguration -
-OAuthToken -
-OAuthzServer -
-ParseException -
-PemCertificateParserConstants -
-PemCertificateParserTokenManager -
-PemRsaSha1SigningKey -
-PemRsaSha1VerifyingKey -
-PlaintextMethod -
-RsaSha1Method -
-SignatureException -
-SignatureMethod -
-SigningKey -
-SimpleCharStream -
-StorageException -
-TemporaryCredentialsGenerator -
-Token -
-TokenCredentialsGenerator -
-TokenMgrError -
-TokenStorage -
-VerifyingKey -
-Version -
-
- - - diff --git a/site/apidocs/allclasses-noframe.html b/site/apidocs/allclasses-noframe.html deleted file mode 100644 index 68c27bc8..00000000 --- a/site/apidocs/allclasses-noframe.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - -All Classes (Apache Amber 1.0-SNAPSHOT API) - - - - - - - - - - - -All Classes -
- - - - - -
AbstractMethod -
-Access -
-AccessStorage -
-BasicKey -
-ConsumerStorage -
-HmacSha1Method -
-HttpConnector -
-HTTPMethod -
-Key -
-NonceGenerator -
-OAuth -
-OAuthClient -
-OAuthConsumer -
-OAuthException -
-OAuthFactory -
-OAuthMessageParameter -
-OAuthnServer -
-OAuthParameter -
-OAuthParameterLocation -
-OAuthProvider -
-OAuthProviders -
-OAuthRequest -
-OAuthRequestParameter -
-OAuthResponse -
-OAuthResponseParser -
-OAuthRuntimeException -
-OAuthServer -
-OAuthServerConfiguration -
-OAuthToken -
-OAuthzServer -
-ParseException -
-PemCertificateParserConstants -
-PemCertificateParserTokenManager -
-PemRsaSha1SigningKey -
-PemRsaSha1VerifyingKey -
-PlaintextMethod -
-RsaSha1Method -
-SignatureException -
-SignatureMethod -
-SigningKey -
-SimpleCharStream -
-StorageException -
-TemporaryCredentialsGenerator -
-Token -
-TokenCredentialsGenerator -
-TokenMgrError -
-TokenStorage -
-VerifyingKey -
-Version -
-
- - - diff --git a/site/apidocs/constant-values.html b/site/apidocs/constant-values.html deleted file mode 100644 index d6c6215d..00000000 --- a/site/apidocs/constant-values.html +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - -Constant Field Values (Apache Amber 1.0-SNAPSHOT API) - - - - - - - - - - - - -

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Constant Field Values

-
-
-Contents - - - - - - -
-org.apache.*
- -

- - - - - - - - - - - - - - - - - -
org.apache.amber.OAuth
-public static final StringJAXB_PACKAGE"org.apache.amber.jaxb.package"
-public static final StringOUT_OF_BAND"oob"
- -

- -

- - - - - - - - - - - - - - - - - -
org.apache.amber.OAuthMessageParameter
-protected static final intINITIAL_ODD_NUMBER1
-protected static final intMULTIPLIER_ODD_NUMBER31
- -

- -

- - - - - - - - - - - - - - - - - -
org.apache.amber.OAuthRequestParameter
-protected static final intINITIAL_ODD_NUMBER1
-protected static final intMULTIPLIER_ODD_NUMBER31
- -

- -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
org.apache.amber.signature.rsa.PemCertificateParserConstants
-public static final intBEGIN_CERTIFICATE4
-public static final intBEGIN_PRIVATE_KEY2
-public static final intCERTIFICATE_CONTENT6
-public static final intDEFAULT0
-public static final intEND_CERTIFICATE5
-public static final intEND_PRIVATE_KEY3
-public static final intEOF0
- -

- -

- - - - - - - - - - - - -
org.apache.amber.signature.rsa.SimpleCharStream
-public static final booleanstaticFlagfalse
- -

- -

-

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/apidocs/deprecated-list.html b/site/apidocs/deprecated-list.html deleted file mode 100644 index 3e044a8d..00000000 --- a/site/apidocs/deprecated-list.html +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - -Deprecated List (Apache Amber 1.0-SNAPSHOT API) - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree   Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Deprecated API

-
-
-Contents - - - - - - - - - - - - -
-Deprecated Methods
org.apache.amber.signature.rsa.SimpleCharStream.getColumn() -
-            
org.apache.amber.signature.rsa.SimpleCharStream.getLine() -
-            
-  -

-

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree   Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/apidocs/help-doc.html b/site/apidocs/help-doc.html deleted file mode 100644 index 228b0c4f..00000000 --- a/site/apidocs/help-doc.html +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - -API Help (Apache Amber 1.0-SNAPSHOT API) - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated  Index   Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-How This API Document Is Organized

-
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.

-Overview

-
- -

-The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.

-

-Package

-
- -

-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:

    -
  • Interfaces (italic)
  • Classes
  • Enums
  • Exceptions
  • Errors
  • Annotation Types
-
-

-Class/Interface

-
- -

-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:

    -
  • Class inheritance diagram
  • Direct Subclasses
  • All Known Subinterfaces
  • All Known Implementing Classes
  • Class/interface declaration
  • Class/interface description -

    -

  • Nested Class Summary
  • Field Summary
  • Constructor Summary
  • Method Summary -

    -

  • Field Detail
  • Constructor Detail
  • Method Detail
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.
- -

-Annotation Type

-
- -

-Each annotation type has its own separate page with the following sections:

    -
  • Annotation Type declaration
  • Annotation Type description
  • Required Element Summary
  • Optional Element Summary
  • Element Detail
-
- -

-Enum

-
- -

-Each enum has its own separate page with the following sections:

    -
  • Enum declaration
  • Enum description
  • Enum Constant Summary
  • Enum Constant Detail
-
-

-Use

-
-Each documented package, class and interface has its own Use page. This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.
-

-Tree (Class Hierarchy)

-
-There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object. The interfaces do not inherit from java.lang.Object.
    -
  • When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
  • When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
-
-

-Deprecated API

-
-The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.
-

-Index

-
-The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.
-

-Prev/Next

-These links take you to the next or previous class, interface, package, or related page.

-Frames/No Frames

-These links show and hide the HTML frames. All pages are available with or without frames. -

-

-Serialized Form

-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description. -

-

-Constant Field Values

-The Constant Field Values page lists the static final fields and their values. -

- - -This help file applies to API documentation generated using the standard doclet. - -
-

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated  Index   Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/apidocs/index-all.html b/site/apidocs/index-all.html deleted file mode 100644 index ef59383f..00000000 --- a/site/apidocs/index-all.html +++ /dev/null @@ -1,1134 +0,0 @@ - - - - - - - -Index (Apache Amber 1.0-SNAPSHOT API) - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated   Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -A B C D E F G H I J K L M N O P R S T U V
-

-A

-
-
AbstractMethod - Class in org.apache.amber.signature
Abstract implementation of OAuth signature method algorithm.
AbstractMethod() - -Constructor for class org.apache.amber.signature.AbstractMethod -
  -
Access - Interface in org.apache.amber.server
Association of nonce(s) and timestamp.
AccessStorage - Interface in org.apache.amber.server
Nonce/timestamp storage definition.
accessToken(OAuthRequest) - -Method in interface org.apache.amber.server.OAuthnServer -
Generates a new access token. -
add(String, long, String) - -Method in interface org.apache.amber.server.AccessStorage -
Stores a new nonce / timestamp pair associated with a consumer key. -
add(OAuthConsumer) - -Method in interface org.apache.amber.server.ConsumerStorage -
Stores consumer data. -
add(String, OAuthToken) - -Method in interface org.apache.amber.server.TokenStorage -
Stores a new token. -
add_escapes(String) - -Method in exception org.apache.amber.signature.rsa.ParseException -
Used to convert raw characters to their escaped version - when these raw version cannot be used as part of an ASCII - string literal. -
addAdditionalParameters(String, String) - -Method in interface org.apache.amber.OAuthToken -
Associates the specified value with the specified name in this additional - parameters map. -
addEscapes(String) - -Static method in error org.apache.amber.signature.rsa.TokenMgrError -
Replaces unprintable characters by their escaped (or unicode escaped) - equivalents in the given string -
additionalParametersEntrySet() - -Method in interface org.apache.amber.OAuthToken -
  -
addNonce(String) - -Method in interface org.apache.amber.server.Access -
Add a nonce to an access. -
addOAuthMessageParameter(OAuthMessageParameter) - -Method in interface org.apache.amber.OAuthRequest -
  -
addOAuthRequestParameter(OAuthRequestParameter) - -Method in interface org.apache.amber.OAuthRequest -
  -
adjustBeginLineColumn(int, int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Method to adjust line and column numbers for the start of a token. -
authorizeToken(String) - -Method in interface org.apache.amber.server.OAuthnServer -
Authorize a request token. -
-
-

-B

-
-
backup(int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Backup a number of characters. -
BasicKey - Class in org.apache.amber.signature
 
BasicKey(String) - -Constructor for class org.apache.amber.signature.BasicKey -
  -
BEGIN_CERTIFICATE - -Static variable in interface org.apache.amber.signature.rsa.PemCertificateParserConstants -
RegularExpression Id. -
BEGIN_PRIVATE_KEY - -Static variable in interface org.apache.amber.signature.rsa.PemCertificateParserConstants -
RegularExpression Id. -
beginColumn - -Variable in class org.apache.amber.signature.rsa.Token -
The column number of the first character of this Token. -
beginLine - -Variable in class org.apache.amber.signature.rsa.Token -
The line number of the first character of this Token. -
BeginToken() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Start. -
bufcolumn - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
buffer - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
bufline - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
bufpos - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
Position in buffer. -
-
-

-C

-
-
calculate(SigningKey, OAuthToken, OAuthRequest) - -Method in class org.apache.amber.signature.AbstractMethod -
Calculates the OAuth request message signature. -
calculate(SigningKey, String, String) - -Method in class org.apache.amber.signature.AbstractMethod -
Calculates the signature applying the method algorithm. -
calculate(SigningKey, String, String) - -Method in class org.apache.amber.signature.hmac.HmacSha1Method -
Calculates the signature applying the method algorithm. -
calculate(SigningKey, String, String) - -Method in class org.apache.amber.signature.plaintext.PlaintextMethod -
Calculates the signature applying the method algorithm. -
calculate(SigningKey, String, String) - -Method in class org.apache.amber.signature.rsa.RsaSha1Method -
Calculates the signature applying the method algorithm. -
calculate(SigningKey, OAuthToken, OAuthRequest) - -Method in interface org.apache.amber.signature.SignatureMethod -
Calculates the OAuth request message signature. -
CERTIFICATE_CONTENT - -Static variable in interface org.apache.amber.signature.rsa.PemCertificateParserConstants -
RegularExpression Id. -
column - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
ConsumerStorage - Interface in org.apache.amber.server
OAuthConsumer consumer storage interface.
containsNonce(String) - -Method in interface org.apache.amber.server.Access -
Checks if the access already contains a nonce. -
createFactory() - -Static method in class org.apache.amber.OAuth -
Perform initialisation of a factory -
createFactory(Properties) - -Static method in class org.apache.amber.OAuth -
Perform initialisation of a factory -
createFactory(Version) - -Static method in class org.apache.amber.OAuth -
Perform initialisation of a factory -
createFactory(Version, Properties) - -Static method in class org.apache.amber.OAuth -
Perform initialisation of a factory -
createServer(String) - -Method in interface org.apache.amber.OAuthFactory -
  -
curChar - -Variable in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
  -
currentToken - -Variable in exception org.apache.amber.signature.rsa.ParseException -
This is the last token that has been consumed successfully. -
-
-

-D

-
-
debugStream - -Variable in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
Debug output. -
decodeBase64(String) - -Static method in class org.apache.amber.signature.AbstractMethod -
Decodes an input text to a bytes sequence applying the Base64 algorithm. -
DEFAULT - -Static variable in interface org.apache.amber.signature.rsa.PemCertificateParserConstants -
Lexical state. -
delete(String) - -Method in interface org.apache.amber.server.ConsumerStorage -
Removes a token from the store. -
delete(String) - -Method in interface org.apache.amber.server.TokenStorage -
Removes a token from the store. -
Done() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Reset buffer when finished. -
-
-

-E

-
-
encodeBase64(byte[]) - -Static method in class org.apache.amber.signature.AbstractMethod -
Encodes a bytes sequence applying the Base64 algorithm without chuncking - the output string. -
END_CERTIFICATE - -Static variable in interface org.apache.amber.signature.rsa.PemCertificateParserConstants -
RegularExpression Id. -
END_PRIVATE_KEY - -Static variable in interface org.apache.amber.signature.rsa.PemCertificateParserConstants -
RegularExpression Id. -
endColumn - -Variable in class org.apache.amber.signature.rsa.Token -
The column number of the last character of this Token. -
endLine - -Variable in class org.apache.amber.signature.rsa.Token -
The line number of the last character of this Token. -
EOF - -Static variable in interface org.apache.amber.signature.rsa.PemCertificateParserConstants -
End of File. -
eol - -Variable in exception org.apache.amber.signature.rsa.ParseException -
The end of line string for this machine. -
equals(Object) - -Method in class org.apache.amber.OAuthMessageParameter -
-
equals(Object) - -Method in class org.apache.amber.OAuthRequestParameter -
-
execute(OAuthRequest, String) - -Method in interface org.apache.amber.client.HttpConnector -
The execute method does the work of processing a request and returning a - response from the Provider. -
ExpandBuff(boolean) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
expectedTokenSequences - -Variable in exception org.apache.amber.signature.rsa.ParseException -
Each entry in this array is an array of integers. -
-
-

-F

-
-
FillBuff() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
-
-

-G

-
-
generate() - -Method in interface org.apache.amber.client.NonceGenerator -
Generate a nonce string value. -
generate() - -Method in interface org.apache.amber.server.TemporaryCredentialsGenerator -
Generates a new temporary credentials. -
generate() - -Method in interface org.apache.amber.server.TokenCredentialsGenerator -
Generates a new token credentials. -
getAccessStorage() - -Method in interface org.apache.amber.server.OAuthServerConfiguration -
  -
getAccessToken(OAuthToken, String) - -Method in interface org.apache.amber.client.OAuthClient -
Convert the authorised token to an access token, using the supplied - verification code. -
getAccessToken(OAuthConsumer, OAuthToken, String) - -Method in interface org.apache.amber.client.OAuthClient -
Convert the authorised token to an access token, using the supplied - consumer and verification code. -
getAccessTokenPath() - -Method in interface org.apache.amber.server.OAuthProvider -
  -
getAlgorithm() - -Method in interface org.apache.amber.server.OAuthProvider -
  -
getAlgorithm() - -Method in class org.apache.amber.signature.hmac.HmacSha1Method -
Returns the signing algorithm method. -
getAlgorithm() - -Method in class org.apache.amber.signature.plaintext.PlaintextMethod -
Returns the signing algorithm method. -
getAlgorithm() - -Method in class org.apache.amber.signature.rsa.RsaSha1Method -
Returns the signing algorithm method. -
getAlgorithm() - -Method in interface org.apache.amber.signature.SignatureMethod -
Returns the signing algorithm method. -
getAlgorithmMethods() - -Method in class org.apache.amber.signature.BasicKey -
  -
getAlgorithmMethods() - -Method in interface org.apache.amber.signature.Key -
Returns the signing algorithm methods. -
getAuthenticatePath() - -Method in interface org.apache.amber.server.OAuthProvider -
  -
getAuthenticateURL(OAuthToken) - -Method in interface org.apache.amber.client.OAuthClient -
Get the authentication URL for the configured provider, using the - specified token. -
getAuthenticateURL(OAuthToken, String) - -Method in interface org.apache.amber.client.OAuthClient -
Get the authentication URL for the configured provider, using the - specified token and callback. -
getAuthorizePath() - -Method in interface org.apache.amber.server.OAuthProvider -
  -
getAuthorizeURL(OAuthToken) - -Method in interface org.apache.amber.client.OAuthClient -
Get the authorisation URL for the configured provider, using the - specified token. -
getAuthorizeURL(OAuthToken, String) - -Method in interface org.apache.amber.client.OAuthClient -
Get the authorisation URL for the configured provider, using the - specified token. -
getBeginColumn() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Get token beginning column number. -
getBeginLine() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Get token beginning line number. -
getCallback() - -Method in interface org.apache.amber.client.OAuthConsumer -
The callback field contains the HTTP URL that the Provider will redirect - the User to during the authentication / authorisation process. -
getColumn() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Deprecated.   -
getConfiguration() - -Method in class org.apache.amber.server.OAuthServer -
  -
getConnector() - -Method in interface org.apache.amber.client.OAuthClient -
Get the current connector. -
getConsumers() - -Method in interface org.apache.amber.server.OAuthProvider -
  -
getConsumerStorage() - -Method in interface org.apache.amber.server.OAuthServerConfiguration -
  -
getEndColumn() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Get token end column number. -
getEndLine() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Get token end line number. -
getHTTPMethod() - -Method in interface org.apache.amber.OAuthRequest -
  -
GetImage() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Get token literal value. -
getKey() - -Method in interface org.apache.amber.client.OAuthConsumer -
The key field contains the key string assigned to the Consumer by the - Provider, during registration. -
getLabel() - -Method in enum org.apache.amber.OAuthParameter -
  -
getLastAccess(String) - -Method in interface org.apache.amber.server.AccessStorage -
Get the last access (by timestamp) of a consumer. -
getLine() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Deprecated.   -
getLocation() - -Method in interface org.apache.amber.server.OAuthProvider -
  -
getLog() - -Method in class org.apache.amber.signature.AbstractMethod -
Return this class log. -
getMessage() - -Method in exception org.apache.amber.signature.rsa.ParseException -
This method has the standard behavior when this object has been - created using the standard constructors. -
getMessage() - -Method in error org.apache.amber.signature.rsa.TokenMgrError -
You can also modify the body of this method to customize your error messages. -
getName() - -Method in interface org.apache.amber.client.OAuthConsumer -
The name field is a convenient reference to the Consumer and SHOULD match - the string used during the Provider registration process -
getNextToken() - -Method in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
Get the next Token. -
getNonceGenerator() - -Method in interface org.apache.amber.client.OAuthClient -
Returns the current nonce generator to be used. -
getNonces() - -Method in interface org.apache.amber.server.Access -
Returns the whole list of nonces associated to the timestamp. -
getOAuthMessageParameter(OAuthParameter) - -Method in interface org.apache.amber.OAuthRequest -
  -
getOAuthMessageParameters() - -Method in interface org.apache.amber.OAuthRequest -
Returns the OAuth parameters will be included in the OAuth message. -
getOAuthRequestParameter(String) - -Method in interface org.apache.amber.OAuthRequest -
  -
getOAuthRequestParameters() - -Method in interface org.apache.amber.OAuthRequest -
Returns the aux parameters client will included in the request. -
getParameterLocation() - -Method in interface org.apache.amber.OAuthRequest -
  -
getProperties() - -Method in interface org.apache.amber.OAuthFactory -
  -
getProvider() - -Method in interface org.apache.amber.server.OAuthProviders -
  -
getProviders() - -Method in interface org.apache.amber.OAuthFactory -
  -
getRealm() - -Method in interface org.apache.amber.server.OAuthProvider -
  -
getRequestToken() - -Method in interface org.apache.amber.client.OAuthClient -
Get a request token using the default consumer and token. -
getRequestToken(OAuthConsumer) - -Method in interface org.apache.amber.client.OAuthClient -
Get a request token using the specified consumer. -
getRequestToken(Class<? extends OAuthToken>) - -Method in interface org.apache.amber.client.OAuthClient -
Get a request token, instantiated from the provided class, using the - default consumer. -
getRequestToken(Class<? extends OAuthToken>, OAuthConsumer) - -Method in interface org.apache.amber.client.OAuthClient -
Get a request token, instantiated from the provided class, using the - specified consumer. -
getRequestTokenPath() - -Method in interface org.apache.amber.server.OAuthProvider -
  -
getRequestURL() - -Method in interface org.apache.amber.OAuthRequest -
  -
getResponseParser() - -Method in interface org.apache.amber.server.OAuthProvider -
  -
getSecret() - -Method in interface org.apache.amber.client.OAuthConsumer -
  -
GetSuffix(int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Get the suffix. -
getTabSize(int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
getTimestamp() - -Method in interface org.apache.amber.server.Access -
Returns the timestamp access. -
getToken() - -Method in interface org.apache.amber.OAuthToken -
  -
getTokenSecret() - -Method in interface org.apache.amber.OAuthToken -
  -
getTokenStorage() - -Method in interface org.apache.amber.server.OAuthServerConfiguration -
  -
getValue() - -Method in class org.apache.amber.signature.BasicKey -
  -
getValue() - -Method in interface org.apache.amber.signature.Key -
Returns the key string representation. -
getValue() - -Method in class org.apache.amber.signature.rsa.Token -
An optional attribute value of the Token. -
getVersion() - -Method in interface org.apache.amber.OAuthFactory -
  -
-
-

-H

-
-
hashCode() - -Method in class org.apache.amber.OAuthMessageParameter -
-
hashCode() - -Method in class org.apache.amber.OAuthRequestParameter -
-
HmacSha1Method - Class in org.apache.amber.signature.hmac
HMAC-SHA1 Method implementation.
HmacSha1Method() - -Constructor for class org.apache.amber.signature.hmac.HmacSha1Method -
  -
HttpConnector - Interface in org.apache.amber.client
The HttpConnector does the work converting executing an - OAuthRequest and returning an - OAuthResponse.
HTTPMethod - Enum in org.apache.amber
Enumeration of available HTTP methods.
-
-

-I

-
-
image - -Variable in class org.apache.amber.signature.rsa.Token -
The string image of the token. -
inBuf - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
input_stream - -Variable in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
  -
inputStream - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
isAuthorized(OAuthRequest) - -Method in interface org.apache.amber.server.OAuthzServer -
Evaluates if a specific request contains authorization token to - access to a protected resource. -
isCallbackConfirmed() - -Method in interface org.apache.amber.OAuthToken -
  -
isIncludeInSignature() - -Method in enum org.apache.amber.OAuthParameter -
  -
isOptional() - -Method in enum org.apache.amber.OAuthParameter -
  -
-
-

-J

-
-
JAXB_PACKAGE - -Static variable in class org.apache.amber.OAuth -
  -
jjFillToken() - -Method in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
  -
jjstrLiteralImages - -Static variable in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
Token literal values. -
-
-

-K

-
-
Key - Interface in org.apache.amber.signature
Client Credential representation.
kind - -Variable in class org.apache.amber.signature.rsa.Token -
An integer that describes the kind of this token. -
-
-

-L

-
-
LexicalError(boolean, int, int, int, String, char) - -Static method in error org.apache.amber.signature.rsa.TokenMgrError -
Returns a detailed message for the Error when it is thrown by the - token manager to indicate a lexical error. -
lexStateNames - -Static variable in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
Lexer state names. -
line - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
-
-

-M

-
-
maxNextCharInd - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
-
-

-N

-
-
newToken(int, String) - -Static method in class org.apache.amber.signature.rsa.Token -
Returns a new Token object, by default. -
newToken(int) - -Static method in class org.apache.amber.signature.rsa.Token -
  -
next - -Variable in class org.apache.amber.signature.rsa.Token -
A reference to the next regular (non-special) token from the input - stream. -
NonceGenerator - Interface in org.apache.amber.client
Generator of nonce values.
-
-

-O

-
-
OAuth - Class in org.apache.amber
The OAuth object provides access to the OAuthFactory.
OAuth() - -Constructor for class org.apache.amber.OAuth -
  -
OAuthClient - Interface in org.apache.amber.client
- An OAuth Service is an abstract representation of the standard remote API - offered by an OAuthProvider, providing a simple mechanism - for performing OAuth authentication and authorisation - tasks.
OAuthConsumer - Interface in org.apache.amber.client
The OAuth Consumer is defined in the OAuth Specification as - the client in one of the legs during an authorisation or authentication.
OAuthException - Exception in org.apache.amber
- Check exception, wraps exceptions thrown by implementation that can be - recovered from.
OAuthException(String, Throwable) - -Constructor for exception org.apache.amber.OAuthException -
  -
OAuthException(String) - -Constructor for exception org.apache.amber.OAuthException -
  -
OAuthException(Throwable) - -Constructor for exception org.apache.amber.OAuthException -
  -
OAuthFactory - Interface in org.apache.amber
TODO Write extensive documentation
OAuthMessageParameter - Class in org.apache.amber
Identifier for the OAuth Authorization message parameter.
OAuthMessageParameter(OAuthParameter, String) - -Constructor for class org.apache.amber.OAuthMessageParameter -
  -
OAuthnServer - Interface in org.apache.amber.server
 
OAuthParameter - Enum in org.apache.amber
The OAuth specification defines individual parameters required by a provider - at different stages of the authentication and authorisation process.
OAuthParameterLocation - Enum in org.apache.amber
Defines the possible locations for the OAuth parameters during each request.
OAuthProvider - Interface in org.apache.amber.server
- The minimum configurable values required to specify the different behaviour - of a Provider (an entity defined by the OAuth specification).
OAuthProviders - Interface in org.apache.amber.server
- A convenience object which contains multiple possible OAuth Service - Providers, in order of preference.
OAuthRequest - Interface in org.apache.amber
A convenient object representing the properties of an OAuth request to a - OAuthProvider.
OAuthRequestParameter - Class in org.apache.amber
Identifier for the auxiliar OAuth server required parameter.
OAuthRequestParameter(String, String) - -Constructor for class org.apache.amber.OAuthRequestParameter -
  -
OAuthResponse - Interface in org.apache.amber
An object representing the response returned from an - OAuthClient or OAuthServer.
OAuthResponseParser - Interface in org.apache.amber
- It's possible that a OAuthProvider will return OAuth - information in a custom response format.
OAuthRuntimeException - Exception in org.apache.amber
- Unchecked exception wrapper, thrown when there is a configuration or other - unchecked exception that prevents the implementation from operating.
OAuthRuntimeException(String, Throwable) - -Constructor for exception org.apache.amber.OAuthRuntimeException -
  -
OAuthRuntimeException(String) - -Constructor for exception org.apache.amber.OAuthRuntimeException -
  -
OAuthRuntimeException(Throwable) - -Constructor for exception org.apache.amber.OAuthRuntimeException -
  -
OAuthServer - Class in org.apache.amber.server
An OAuth Server provides the functionality required to deliver OAuth Provider - functionality.
OAuthServer(OAuthServerConfiguration) - -Constructor for class org.apache.amber.server.OAuthServer -
  -
OAuthServerConfiguration - Interface in org.apache.amber.server
 
OAuthToken - Interface in org.apache.amber
- An OAuthToken is the wrapper for the pair of key values returned by the - OAuthClient during the authentication or authorisation - process.
OAuthzServer - Interface in org.apache.amber.server
 
org.apache.amber - package org.apache.amber
An OAuth Java Specification - - Provides the interfaces for an implementation of the OAuth specification.
org.apache.amber.client - package org.apache.amber.client
 
org.apache.amber.server - package org.apache.amber.server
 
org.apache.amber.signature - package org.apache.amber.signature
 
org.apache.amber.signature.hmac - package org.apache.amber.signature.hmac
 
org.apache.amber.signature.plaintext - package org.apache.amber.signature.plaintext
 
org.apache.amber.signature.rsa - package org.apache.amber.signature.rsa
 
OUT_OF_BAND - -Static variable in class org.apache.amber.OAuth -
default callback value -
-
-

-P

-
-
ParseException - Exception in org.apache.amber.signature.rsa
This exception is thrown when parse errors are encountered.
ParseException(Token, int[][], String[]) - -Constructor for exception org.apache.amber.signature.rsa.ParseException -
This constructor is used by the method "generateParseException" - in the generated parser. -
ParseException() - -Constructor for exception org.apache.amber.signature.rsa.ParseException -
The following constructors are for use by you for whatever - purpose you can think of. -
ParseException(String) - -Constructor for exception org.apache.amber.signature.rsa.ParseException -
Constructor with message. -
parseResponse(OAuthToken, OAuthResponse) - -Method in interface org.apache.amber.OAuthResponseParser -
Update the provided token, to include the details from the response -
PemCertificateParserConstants - Interface in org.apache.amber.signature.rsa
Token literal values and constants.
PemCertificateParserTokenManager - Class in org.apache.amber.signature.rsa
Token Manager.
PemCertificateParserTokenManager(SimpleCharStream) - -Constructor for class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
Constructor. -
PemCertificateParserTokenManager(SimpleCharStream, int) - -Constructor for class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
Constructor. -
PemRsaSha1SigningKey - Class in org.apache.amber.signature.rsa
 
PemRsaSha1SigningKey(File) - -Constructor for class org.apache.amber.signature.rsa.PemRsaSha1SigningKey -
  -
PemRsaSha1SigningKey(String) - -Constructor for class org.apache.amber.signature.rsa.PemRsaSha1SigningKey -
  -
PemRsaSha1SigningKey(URL) - -Constructor for class org.apache.amber.signature.rsa.PemRsaSha1SigningKey -
  -
PemRsaSha1VerifyingKey - Class in org.apache.amber.signature.rsa
 
PemRsaSha1VerifyingKey(File) - -Constructor for class org.apache.amber.signature.rsa.PemRsaSha1VerifyingKey -
  -
PemRsaSha1VerifyingKey(String) - -Constructor for class org.apache.amber.signature.rsa.PemRsaSha1VerifyingKey -
  -
PemRsaSha1VerifyingKey(URL) - -Constructor for class org.apache.amber.signature.rsa.PemRsaSha1VerifyingKey -
  -
percentEncode(String) - -Static method in class org.apache.amber.signature.AbstractMethod -
Applies the percent encoding algorithm to the input text. -
PlaintextMethod - Class in org.apache.amber.signature.plaintext
PLAINTEXT Method implementation.
PlaintextMethod() - -Constructor for class org.apache.amber.signature.plaintext.PlaintextMethod -
  -
prevCharIsCR - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
prevCharIsLF - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
-
-

-R

-
-
read(String) - -Method in interface org.apache.amber.server.ConsumerStorage -
Searches for an existing consumer. -
read(String, String) - -Method in interface org.apache.amber.server.TokenStorage -
Searches for an existing token. -
read(String) - -Method in interface org.apache.amber.server.TokenStorage -
Searches for an existing token. -
readCertificate(InputStream) - -Method in class org.apache.amber.signature.rsa.PemRsaSha1SigningKey -
-
readCertificate(InputStream) - -Method in class org.apache.amber.signature.rsa.PemRsaSha1VerifyingKey -
-
readChar() - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Read a character. -
register(OAuthProvider) - -Method in interface org.apache.amber.OAuthFactory -
  -
ReInit(SimpleCharStream) - -Method in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
Reinitialise parser. -
ReInit(SimpleCharStream, int) - -Method in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
Reinitialise parser. -
ReInit(Reader, int, int, int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Reinitialise. -
ReInit(Reader, int, int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Reinitialise. -
ReInit(Reader) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Reinitialise. -
ReInit(InputStream, String, int, int, int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Reinitialise. -
ReInit(InputStream, int, int, int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Reinitialise. -
ReInit(InputStream, String) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Reinitialise. -
ReInit(InputStream) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Reinitialise. -
ReInit(InputStream, String, int, int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Reinitialise. -
ReInit(InputStream, int, int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
Reinitialise. -
remove(String, long) - -Method in interface org.apache.amber.server.AccessStorage -
Remove a consumer access. -
requestToken(OAuthRequest) - -Method in interface org.apache.amber.server.OAuthnServer -
Generates a new request token. -
RsaSha1Method - Class in org.apache.amber.signature.rsa
RSA-SHA1 Method implementation.
RsaSha1Method() - -Constructor for class org.apache.amber.signature.rsa.RsaSha1Method -
  -
-
-

-S

-
-
setAccessTokenPath(String) - -Method in interface org.apache.amber.server.OAuthProvider -
  -
setAlgorithm(String) - -Method in interface org.apache.amber.server.OAuthProvider -
  -
setAuthenticatePath(String) - -Method in interface org.apache.amber.server.OAuthProvider -
  -
setAuthorizePath(String) - -Method in interface org.apache.amber.server.OAuthProvider -
  -
setCallback(String) - -Method in interface org.apache.amber.client.OAuthConsumer -
  -
setCallbackConfirmed(boolean) - -Method in interface org.apache.amber.OAuthToken -
  -
setConnector(HttpConnector) - -Method in interface org.apache.amber.client.OAuthClient -
Set the connector to be used. -
setConsumers(List<OAuthConsumer>) - -Method in interface org.apache.amber.server.OAuthProvider -
  -
setDebugStream(PrintStream) - -Method in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
Set debug output. -
setHTTPMethod(HTTPMethod) - -Method in interface org.apache.amber.OAuthRequest -
  -
setKey(String) - -Method in interface org.apache.amber.client.OAuthConsumer -
  -
setLocation(OAuthParameterLocation) - -Method in interface org.apache.amber.server.OAuthProvider -
  -
setName(String) - -Method in interface org.apache.amber.client.OAuthConsumer -
  -
setNonceGenerator(NonceGenerator) - -Method in interface org.apache.amber.client.OAuthClient -
Sets the nonce generator to be used. -
setParameterLocation(OAuthParameterLocation) - -Method in interface org.apache.amber.OAuthRequest -
  -
setProperties(Properties) - -Method in interface org.apache.amber.OAuthFactory -
  -
setProvider(List<OAuthProvider>) - -Method in interface org.apache.amber.server.OAuthProviders -
  -
setRealm(String) - -Method in interface org.apache.amber.server.OAuthProvider -
  -
setRequestTokenPath(String) - -Method in interface org.apache.amber.server.OAuthProvider -
  -
setRequestURL(URI) - -Method in interface org.apache.amber.OAuthRequest -
  -
setResponseParser(OAuthResponseParser) - -Method in interface org.apache.amber.server.OAuthProvider -
  -
setSecret(String) - -Method in interface org.apache.amber.client.OAuthConsumer -
The secret field contains the unique secret string generated by the - Provider, during registration. -
setTabSize(int) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
setToken(String) - -Method in interface org.apache.amber.OAuthToken -
  -
setTokenSecret(String) - -Method in interface org.apache.amber.OAuthToken -
  -
SignatureException - Exception in org.apache.amber.signature
Encapsulate a general OAuth signature error or warning.
SignatureException(String) - -Constructor for exception org.apache.amber.signature.SignatureException -
Constructs a new signature exception with the specified detail message. -
SignatureException(Throwable) - -Constructor for exception org.apache.amber.signature.SignatureException -
Constructs a new signature exception with the specified cause. -
SignatureException(String, Throwable) - -Constructor for exception org.apache.amber.signature.SignatureException -
Constructs a new signature exception with the specified detail message - and cause. -
SignatureMethod - Interface in org.apache.amber.signature
Common definition of OAuth signature method algorithm.
SigningKey - Interface in org.apache.amber.signature
Identifies that the key has to be used to sign requests.
SimpleCharStream - Class in org.apache.amber.signature.rsa
An implementation of interface CharStream, where the stream is assumed to - contain only ASCII characters (without unicode processing).
SimpleCharStream(Reader, int, int, int) - -Constructor for class org.apache.amber.signature.rsa.SimpleCharStream -
Constructor. -
SimpleCharStream(Reader, int, int) - -Constructor for class org.apache.amber.signature.rsa.SimpleCharStream -
Constructor. -
SimpleCharStream(Reader) - -Constructor for class org.apache.amber.signature.rsa.SimpleCharStream -
Constructor. -
SimpleCharStream(InputStream, String, int, int, int) - -Constructor for class org.apache.amber.signature.rsa.SimpleCharStream -
Constructor. -
SimpleCharStream(InputStream, int, int, int) - -Constructor for class org.apache.amber.signature.rsa.SimpleCharStream -
Constructor. -
SimpleCharStream(InputStream, String, int, int) - -Constructor for class org.apache.amber.signature.rsa.SimpleCharStream -
Constructor. -
SimpleCharStream(InputStream, int, int) - -Constructor for class org.apache.amber.signature.rsa.SimpleCharStream -
Constructor. -
SimpleCharStream(InputStream, String) - -Constructor for class org.apache.amber.signature.rsa.SimpleCharStream -
Constructor. -
SimpleCharStream(InputStream) - -Constructor for class org.apache.amber.signature.rsa.SimpleCharStream -
Constructor. -
specialConstructor - -Variable in exception org.apache.amber.signature.rsa.ParseException -
This variable determines which constructor was used to create - this object and thereby affects the semantics of the - "getMessage" method (see below). -
specialToken - -Variable in class org.apache.amber.signature.rsa.Token -
This field is used to access special tokens that occur prior to this - token, but after the immediately preceding regular (non-special) token. -
staticFlag - -Static variable in class org.apache.amber.signature.rsa.SimpleCharStream -
Whether parser is static. -
StorageException - Exception in org.apache.amber.server
Exception thrown when an error occurs when accessing to the Access Storage.
StorageException(String) - -Constructor for exception org.apache.amber.server.StorageException -
  -
StorageException(Throwable) - -Constructor for exception org.apache.amber.server.StorageException -
  -
StorageException(String, Throwable) - -Constructor for exception org.apache.amber.server.StorageException -
  -
SwitchTo(int) - -Method in class org.apache.amber.signature.rsa.PemCertificateParserTokenManager -
Switch to specified lex state. -
-
-

-T

-
-
tabSize - -Variable in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
TemporaryCredentialsGenerator - Interface in org.apache.amber.server
Temporary credentials generator.
toHandle() - -Method in enum org.apache.amber.Version -
  -
Token - Class in org.apache.amber.signature.rsa
Describes the input token stream.
Token() - -Constructor for class org.apache.amber.signature.rsa.Token -
No-argument constructor -
Token(int) - -Constructor for class org.apache.amber.signature.rsa.Token -
Constructs a new token for the specified Image. -
Token(int, String) - -Constructor for class org.apache.amber.signature.rsa.Token -
Constructs a new token for the specified Image and Kind. -
TokenCredentialsGenerator - Interface in org.apache.amber.server
Token credentials generator.
tokenImage - -Variable in exception org.apache.amber.signature.rsa.ParseException -
This is a reference to the "tokenImage" array of the generated - parser within which the parse error occurred. -
tokenImage - -Static variable in interface org.apache.amber.signature.rsa.PemCertificateParserConstants -
Literal token values. -
TokenMgrError - Error in org.apache.amber.signature.rsa
Token Manager Error.
TokenMgrError() - -Constructor for error org.apache.amber.signature.rsa.TokenMgrError -
No arg constructor. -
TokenMgrError(String, int) - -Constructor for error org.apache.amber.signature.rsa.TokenMgrError -
Constructor with message and reason. -
TokenMgrError(boolean, int, int, int, String, char, int) - -Constructor for error org.apache.amber.signature.rsa.TokenMgrError -
Full Constructor. -
TokenStorage - Interface in org.apache.amber.server
 
toString() - -Method in enum org.apache.amber.OAuthParameter -
  -
toString() - -Method in class org.apache.amber.signature.rsa.Token -
Returns the image. -
toString() - -Method in enum org.apache.amber.Version -
  -
toUTF8Bytes(String) - -Static method in class org.apache.amber.signature.AbstractMethod -
Converts the input text in a sequence of UTF-8 bytes. -
-
-

-U

-
-
update(OAuthConsumer) - -Method in interface org.apache.amber.server.ConsumerStorage -
Modifies a consumer data. -
update(OAuthToken) - -Method in interface org.apache.amber.server.TokenStorage -
Modifies an existing token. -
UpdateLineColumn(char) - -Method in class org.apache.amber.signature.rsa.SimpleCharStream -
  -
useService(String) - -Method in interface org.apache.amber.OAuthFactory -
  -
-
-

-V

-
-
valueOf(String) - -Static method in enum org.apache.amber.HTTPMethod -
Returns the enum constant of this type with the specified name. -
valueOf(String) - -Static method in enum org.apache.amber.OAuthParameter -
Returns the enum constant of this type with the specified name. -
valueOf(String) - -Static method in enum org.apache.amber.OAuthParameterLocation -
Returns the enum constant of this type with the specified name. -
valueOf(String) - -Static method in enum org.apache.amber.Version -
Returns the enum constant of this type with the specified name. -
values() - -Static method in enum org.apache.amber.HTTPMethod -
Returns an array containing the constants of this enum type, in -the order they are declared. -
values() - -Static method in enum org.apache.amber.OAuthParameter -
Returns an array containing the constants of this enum type, in -the order they are declared. -
values() - -Static method in enum org.apache.amber.OAuthParameterLocation -
Returns an array containing the constants of this enum type, in -the order they are declared. -
values() - -Static method in enum org.apache.amber.Version -
Returns an array containing the constants of this enum type, in -the order they are declared. -
verify(String, VerifyingKey, OAuthToken, OAuthRequest) - -Method in class org.apache.amber.signature.AbstractMethod -
Verifies the OAuth request message signature. -
verify(String, VerifyingKey, String, String) - -Method in class org.apache.amber.signature.AbstractMethod -
Verifies the signature applying the method algorithm. -
verify(String, VerifyingKey, String, String) - -Method in class org.apache.amber.signature.hmac.HmacSha1Method -
Verifies the signature applying the method algorithm. -
verify(String, VerifyingKey, String, String) - -Method in class org.apache.amber.signature.plaintext.PlaintextMethod -
Verifies the signature applying the method algorithm. -
verify(String, VerifyingKey, String, String) - -Method in class org.apache.amber.signature.rsa.RsaSha1Method -
Verifies the signature applying the method algorithm. -
verify(String, VerifyingKey, OAuthToken, OAuthRequest) - -Method in interface org.apache.amber.signature.SignatureMethod -
Verifies the OAuth request message signature. -
VerifyingKey - Interface in org.apache.amber.signature
Identifies that the key has to be used to verify requests.
Version - Enum in org.apache.amber
 
-
-A B C D E F G H I J K L M N O P R S T U V - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated   Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/apidocs/index.html b/site/apidocs/index.html deleted file mode 100644 index 91c91a6b..00000000 --- a/site/apidocs/index.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - -Apache Amber 1.0-SNAPSHOT API - - - - - - - - - - - -<H2> -Frame Alert</H2> - -<P> -This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. -<BR> -Link to<A HREF="overview-summary.html">Non-frame version.</A> - - - diff --git a/site/apidocs/overview-frame.html b/site/apidocs/overview-frame.html deleted file mode 100644 index 9662f2cd..00000000 --- a/site/apidocs/overview-frame.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - -Overview List (Apache Amber 1.0-SNAPSHOT API) - - - - - - - - - - - - - - - -
-
- - - - - -
All Classes -

- -Packages -
-org.apache.amber -
-org.apache.amber.client -
-org.apache.amber.server -
-org.apache.amber.signature -
-org.apache.amber.signature.hmac -
-org.apache.amber.signature.plaintext -
-org.apache.amber.signature.rsa -
-

- -

-  - - diff --git a/site/apidocs/overview-summary.html b/site/apidocs/overview-summary.html deleted file mode 100644 index 9817da1c..00000000 --- a/site/apidocs/overview-summary.html +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - -Overview (Apache Amber 1.0-SNAPSHOT API) - - - - - - - - - - - - -

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
 Overview  Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Apache Amber 1.0-SNAPSHOT API -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Packages
org.apache.amberAn OAuth Java Specification - - Provides the interfaces for an implementation of the OAuth specification.
org.apache.amber.client 
org.apache.amber.server 
org.apache.amber.signature 
org.apache.amber.signature.hmac 
org.apache.amber.signature.plaintext 
org.apache.amber.signature.rsa 
- -

- 

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
 Overview  Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/apidocs/overview-tree.html b/site/apidocs/overview-tree.html deleted file mode 100644 index 76bf6330..00000000 --- a/site/apidocs/overview-tree.html +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - -Class Hierarchy (Apache Amber 1.0-SNAPSHOT API) - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use   Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Hierarchy For All Packages

-
-
-
Package Hierarchies:
org.apache.amber, org.apache.amber.client, org.apache.amber.server, org.apache.amber.signature, org.apache.amber.signature.hmac, org.apache.amber.signature.plaintext, org.apache.amber.signature.rsa
-
-

-Class Hierarchy -

- -

-Interface Hierarchy -

- -

-Enum Hierarchy -

- -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use   Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/apidocs/package-list b/site/apidocs/package-list deleted file mode 100644 index a85b3453..00000000 --- a/site/apidocs/package-list +++ /dev/null @@ -1,7 +0,0 @@ -org.apache.amber -org.apache.amber.client -org.apache.amber.server -org.apache.amber.signature -org.apache.amber.signature.hmac -org.apache.amber.signature.plaintext -org.apache.amber.signature.rsa diff --git a/site/apidocs/serialized-form.html b/site/apidocs/serialized-form.html deleted file mode 100644 index 0f50773f..00000000 --- a/site/apidocs/serialized-form.html +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - - -Serialized Form (Apache Amber 1.0-SNAPSHOT API) - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Serialized Form

-
-
- - - - - -
-Package org.apache.amber
- -

- - - - - -
-Class org.apache.amber.OAuthException extends Exception implements Serializable
- -

-serialVersionUID: 1L - -

- -

- - - - - -
-Class org.apache.amber.OAuthRuntimeException extends RuntimeException implements Serializable
- -

-serialVersionUID: 1L - -

-

- - - - - -
-Package org.apache.amber.client
-
- - - - - -
-Package org.apache.amber.server
- -

- - - - - -
-Class org.apache.amber.server.StorageException extends Exception implements Serializable
- -

-serialVersionUID: 1L - -

-

- - - - - -
-Package org.apache.amber.signature
- -

- - - - - -
-Class org.apache.amber.signature.SignatureException extends OAuthException implements Serializable
- -

-serialVersionUID: 1L - -

-

- - - - - -
-Package org.apache.amber.signature.rsa
- -

- - - - - -
-Class org.apache.amber.signature.rsa.ParseException extends Exception implements Serializable
- -

- - - - - -
-Serialized Fields
- -

-specialConstructor

-
-boolean specialConstructor
-
-
This variable determines which constructor was used to create - this object and thereby affects the semantics of the - "getMessage" method (see below). -

-

-
-
-
-

-currentToken

-
-Token currentToken
-
-
This is the last token that has been consumed successfully. If - this object has been created due to a parse error, the token - followng this token will (therefore) be the first error token. -

-

-
-
-
-

-expectedTokenSequences

-
-int[][] expectedTokenSequences
-
-
Each entry in this array is an array of integers. Each array - of integers represents a sequence of tokens (by their ordinal - values) that is expected at this point of the parse. -

-

-
-
-
-

-tokenImage

-
-String[] tokenImage
-
-
This is a reference to the "tokenImage" array of the generated - parser within which the parse error occurred. This array is - defined in the generated ...Constants interface. -

-

-
-
-
-

-eol

-
-String eol
-
-
The end of line string for this machine. -

-

-
-
- -

- - - - - -
-Class org.apache.amber.signature.rsa.TokenMgrError extends Error implements Serializable
- -

- - - - - -
-Serialized Fields
- -

-errorCode

-
-int errorCode
-
-
Indicates the reason why the exception is thrown. It will have - one of the above 4 values. -

-

-
-
- -

-

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/apidocs/stylesheet.css b/site/apidocs/stylesheet.css deleted file mode 100644 index 6ea9e516..00000000 --- a/site/apidocs/stylesheet.css +++ /dev/null @@ -1,29 +0,0 @@ -/* Javadoc style sheet */ - -/* Define colors, fonts and other style attributes here to override the defaults */ - -/* Page background color */ -body { background-color: #FFFFFF; color:#000000 } - -/* Headings */ -h1 { font-size: 145% } - -/* Table colors */ -.TableHeadingColor { background: #CCCCFF; color:#000000 } /* Dark mauve */ -.TableSubHeadingColor { background: #EEEEFF; color:#000000 } /* Light mauve */ -.TableRowColor { background: #FFFFFF; color:#000000 } /* White */ - -/* Font used in left-hand frame lists */ -.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#000000 } -.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#000000 } -.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#000000 } - -/* Navigation bar fonts and colors */ -.NavBarCell1 { background-color:#EEEEFF; color:#000000} /* Light mauve */ -.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */ -.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;} -.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;} - -.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000} -.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000} - diff --git a/site/css/maven-base.css b/site/css/maven-base.css deleted file mode 100644 index 17e10bb4..00000000 --- a/site/css/maven-base.css +++ /dev/null @@ -1,220 +0,0 @@ -/* - * Copyright 2009 Simone Tripodi - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -body { - background-color: #f2f2f2; -} - -body, td, select, input, li { - font-family: "Trebuchet MS", "Geneva", "Arial", "Helvetica", "SunSans-Regular", sans-serif; - color: #555555; -} - -h2, h3, h4 { - color: #265fc2; - background: none; - border: none; -} - -a, a.externalLink, a:active, a:hover { - color: #265fc2; -} - -a:hover { - text-decoration: underline; -} - -#wrapper { - width: 80%; - margin: 1em auto 1em; - background-color: #ffffff; - padding: 1em; -} - -img { - border: none; -} - -table { - padding: 0px; - width: 100%; - margin-left: -2px; - margin-right: -2px; -} - -acronym { - cursor: help; - border-bottom: 1px dotted #feb; -} - -table.bodyTable th,table.bodyTable td { - padding: 2px 4px 2px 4px; - vertical-align: top; -} - -div.clear { - clear: both; - visibility: hidden; -} - -div.clear hr { - display: none; -} - -#bannerLeft,#bannerRight { - font-size: xx-large; - font-weight: bold; -} - -#bannerLeft img,#bannerRight img { - margin: 8px; -} - -.xleft,#bannerLeft img { - float: left; - text-shadow: #7CFC00; -} - -.xright,#bannerRight img { - float: right; - text-shadow: #7CFC00; -} - -#banner { - border-bottom: 1px solid #fff; -} - -#banner img { - border: none; -} - -#footer,#breadcrumbs { - padding: 3px 10px 3px 10px; -} - -#leftColumn { - width: 18%; - float: left; - background-color: #EAEAEA; - margin: 1.5em 0.5em; -} - -#bodyColumn { - margin-left: 20%; -} - -#legend { - padding: 8px 0 8px 0; -} - -#navcolumn { - padding: 1em; - margin: 0; - line-height: 150%; - border: 0; - background-color: #EAEAEA; -} - -#navcolumn h5,#navcolumn ul { - margin: 0; - padding: 0; - font-size: small; -} - -#navcolumn li { - background: transparent; - list-style-type: none; - padding-left: 0.7em; - list-style-position: ouside; - font-size: smaller; -} - -#navcolumn li.expanded { - background: url("../images/collapsed.png") no-repeat left top; -} - -#navcolumn li.collapsed { - background: url("../images/expanded.png") no-repeat left top; -} - -#poweredBy { - text-align: center; -} - -#navcolumn img { - margin-top: 10px; - margin-bottom: 3px; -} - -#poweredBy img { - display: block; - margin: 20px 0 20px 17px; - border: 1px solid black; - width: 90px; - height: 30px; -} - -#search img { - margin: 0px; - display: block; -} - -#search #q,#search #btnG { - border: 1px solid #999; - margin-bottom: 10px; -} - -#search form { - margin: 0px; -} - -#lastPublished { - font-size: x-small; -} - -.navSection { - margin-bottom: 2px; - padding: 8px; -} - -.navSectionHead { - font-weight: bold; - font-size: x-small; -} - -.section { - padding: 4px; -} - -#footer { - font-size: x-small; -} - -#breadcrumbs { - background-color: #EAEAEA; - font-size: x-small; - margin: 0pt; - border: none; -} - -.source { - padding: 12px; - margin: 1em 7px 1em 7px; -} - -.source pre { - margin: 0px; - padding: 0px; -} diff --git a/site/css/maven-theme.css b/site/css/maven-theme.css deleted file mode 100644 index 0bab5293..00000000 --- a/site/css/maven-theme.css +++ /dev/null @@ -1,165 +0,0 @@ -body { - padding: 0px 0px 10px 0px; -} - -body,td,select,input,li { - font-size: 13px; -} - -code { - font-family: Courier, monospace; - font-size: 13px; -} - -a { - text-decoration: none; -} - -a:link { - color: #36a; -} - -a:visited { - color: #47a; -} - -a:active,a:hover { - color: #69c; -} - -#legend li.externalLink { - background: url(../images/window-new.png) left top no-repeat; - padding-left: 18px; -} - -a.externalLink,a.externalLink:link,a.externalLink:visited,a.externalLink:active,a.externalLink:hover - { - background: url(../images/window-new.png) right center no-repeat; - padding-right: 18px; -} - -#legend li.newWindow { - background: url(../images/window-new.png) left top no-repeat; - padding-left: 18px; -} - -a.newWindow,a.newWindow:link,a.newWindow:visited,a.newWindow:active,a.newWindow:hover - { - background: url(../images/window-new.png) right center no-repeat; - padding-right: 18px; -} - -h2 { - padding: 4px 4px 4px 6px; - border: 1px solid #999; - color: #900; - background-color: #ddd; - font-weight: 900; - font-size: x-large; -} - -h3 { - padding: 4px 4px 4px 6px; - border: 1px solid #aaa; - color: #900; - background-color: #eee; - font-weight: normal; - font-size: large; -} - -h4 { - padding: 4px 4px 4px 6px; - border: 1px solid #bbb; - color: #900; - background-color: #fff; - font-weight: normal; - font-size: large; -} - -h5 { - padding: 4px 4px 4px 6px; - color: #900; - font-size: normal; -} - - -p { - line-height: 1.3em; - font-size: small; -} - -#breadcrumbs { - border-top: 1px solid #aaa; - border-bottom: 1px solid #aaa; - background-color: #ccc; -} - -#leftColumn { - margin: 10px 0 0 5px; - border: 1px solid #999; - background-color: #eee; -} - -#navcolumn h5 { - font-size: smaller; - border-bottom: 1px solid #aaaaaa; - padding-top: 2px; - color: #000; -} - -table.bodyTable th { - color: white; - background-color: #bbb; - text-align: left; - font-weight: bold; -} - -table.bodyTable th,table.bodyTable td { - font-size: 1em; -} - -table.bodyTable tr.a { - background-color: #ddd; -} - -table.bodyTable tr.b { - background-color: #eee; -} - -.source { - border: 1px solid #999; -} - -dl { - padding: 4px 4px 4px 6px; - border: 1px solid #aaa; - background-color: #ffc; -} - -dt { - color: #900; -} - -#organizationLogo img,#projectLogo img,#projectLogo span { - margin: 8px; -} - -#banner { - border-bottom: 1px solid #fff; -} - -.errormark,.warningmark,.donemark,.infomark { - background: url(../images/dialog-error.png) no-repeat; -} - -.warningmark { - background-image: url(../images/dialog-warning.png); -} - -.donemark { - background-image: url(../images/dialog-apply.png); -} - -.infomark { - background-image: url(../images/dialog-information.png); -} diff --git a/site/css/niftyCorners.css b/site/css/niftyCorners.css deleted file mode 100644 index 6570f60e..00000000 --- a/site/css/niftyCorners.css +++ /dev/null @@ -1,35 +0,0 @@ -/*Nifty Corners Cube CSS by Alessandro Fulciniti -The following classes are added dinamically by javascript, -and their use should be avoided in the markup */ - -b.niftycorners,b.niftyfill{display:block} -b.niftycorners *{display:block;height: 1px;line-height:1px;font-size: 1px; - overflow:hidden;border-style:solid;border-width: 0 1px} -/*normal*/ -b.r1{margin: 0 3px;border-width: 0 2px} -b.r2{margin: 0 2px} -b.r3{margin: 0 1px} -b.r4{height: 2px} -b.rb1{margin: 0 8px;border-width:0 2px} -b.rb2{margin: 0 6px;border-width:0 2px} -b.rb3{margin: 0 5px} -b.rb4{margin: 0 4px} -b.rb5{margin: 0 3px} -b.rb6{margin: 0 2px} -b.rb7{margin: 0 1px;height:2px} -b.rb8{margin: 0;height:2px} -b.rs1{margin: 0 1px} -/*transparent inside*/ -b.t1{border-width: 0 5px} -b.t2{border-width: 0 3px} -b.t3{border-width: 0 2px} -b.t4{height: 2px} -b.tb1{border-width: 0 10px} -b.tb2{border-width: 0 8px} -b.tb3{border-width: 0 6px} -b.tb4{border-width: 0 5px} -b.tb5{border-width: 0 4px} -b.tb6{border-width: 0 3px} -b.tb7{border-width: 0 2px;height:2px} -b.tb8{border-width: 0 1px;height:2px} -b.ts1{border-width: 0 2px} \ No newline at end of file diff --git a/site/css/prettify.css b/site/css/prettify.css deleted file mode 100644 index 43a62534..00000000 --- a/site/css/prettify.css +++ /dev/null @@ -1,92 +0,0 @@ -.str { - color: #080 -} - -.kwd { - color: #008 -} - -.com { - color: #800 -} - -.typ { - color: #606 -} - -.lit { - color: #066 -} - -.pun { - color: #660 -} - -.pln { - color: #000 -} - -.tag { - color: #008 -} - -.atn { - color: #606 -} - -.atv { - color: #080 -} - -.dec { - color: #606 -} - -.source { - background-color: #EAEAEA; - border: none; - margin: 0.5em; -} - -.source pre { - font-family: "Monaco",Courier,monospace; - font-size: 0.9em; - margin-bottom: 0; -} - -@media print { - .str { - color: #060 - } - .kwd { - color: #006; - font-weight: bold - } - .com { - color: #600; - font-style: italic - } - .typ { - color: #404; - font-weight: bold - } - .lit { - color: #044 - } - .pun { - color: #440 - } - .pln { - color: #000 - } - .tag { - color: #006; - font-weight: bold - } - .atn { - color: #404 - } - .atv { - color: #060 - } -} \ No newline at end of file diff --git a/site/css/site.css b/site/css/site.css deleted file mode 100644 index 055e7e28..00000000 --- a/site/css/site.css +++ /dev/null @@ -1 +0,0 @@ -/* You can override this file with your own styles */ \ No newline at end of file diff --git a/site/dependencies.html b/site/dependencies.html deleted file mode 100644 index d4fc95d3..00000000 --- a/site/dependencies.html +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - - - - - - - - - - Apache Amber - Project Dependencies - - - - - - - - - -
- - -
- -
-
-
-

Project Dependencies

test

The following is a list of test dependencies for this project. These dependencies are only required to compile and run unit tests for the application:

GroupIdArtifactIdVersionType
junitjunit4.7jar

Project Transitive Dependencies

No transitive dependencies are required for this project.

Project Dependency Graph

-

Dependency Tree

  • org.apache.amber:amber-parent:pom:1.0-SNAPSHOT Information
    • junit:junit:jar:4.7 (test) Information

Licenses

Common Public License Version 1.0: JUnit

The Apache Software License, Version 2.0: Apache Amber

Dependency File Details

FilenameSizeEntriesClassesPackagesJDK RevDebug
junit-4.7.jar226.91 kB261225291.5debug
TotalSizeEntriesClassesPackagesJDK RevDebug
1226.91 kB261225291.51
test: 1test: 226.91 kBtest: 261test: 225test: 29-test: 1

Dependency Repository Locations

Repo IDURLReleaseSnapshot
apache.snapshotshttp://repository.apache.org/snapshots-Yes
centralhttp://repo1.maven.org/maven2Yes-

Repository locations for each of the Dependencies.

Artifactapache.snapshotscentral
junit:junit:jar:4.7-Found at http://repo1.maven.org/maven2
Totalapache.snapshotscentral
1 (test: 1)01
-
-
-
-
-
- -
- - diff --git a/site/dependency-convergence.html b/site/dependency-convergence.html deleted file mode 100644 index 4ea49ef3..00000000 --- a/site/dependency-convergence.html +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - - - - - - - - - Apache Amber - Reactor Dependency Convergence - - - - - - - - - -
- - -
- -
-
-
-

Reactor Dependency Convergence

- Legend: -
successAll projects share one version of the dependency.
errorAt least one project has a differing version of the dependency.

- Statistics: -
Number of sub-projects:5
Number of dependencies (NOD):5
Number of unique artifacts (NOA):5
Number of SNAPSHOT artifacts (NOS):0
Convergence (NOD/NOA):success 100%
Ready for Release (100% Convergence and no SNAPSHOTS):success Success

Dependencies used in sub-projects

commons-codec:commons-codec

success
1.4
  1. org.apache.amber:amber-signature-api

commons-logging:commons-logging

success
1.1.1
  1. org.apache.amber:amber-signature-api

junit:junit

success
4.7
  1. org.apache.amber:amber-client
  2. org.apache.amber:amber-parent
  3. org.apache.amber:amber-server
  4. org.apache.amber:amber-signature-api
  5. org.apache.amber:amber-spec-api

org.apache.amber:amber-signature-api

success
1.0-SNAPSHOT
  1. org.apache.amber:amber-server

org.apache.amber:amber-spec-api

success
1.0-SNAPSHOT
  1. org.apache.amber:amber-client
  2. org.apache.amber:amber-signature-api
-
-
-
-
-
- -
- - diff --git a/site/dependency-management.html b/site/dependency-management.html deleted file mode 100644 index bca14f6b..00000000 --- a/site/dependency-management.html +++ /dev/null @@ -1,252 +0,0 @@ - - - - - - - - - - - - - - - Apache Amber - Project Dependency Management - - - - - - - - - -
- - -
- -
-
-
-

Project Dependency Management

compile

The following is a list of compile dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile and run the submodule:

GroupIdArtifactIdVersionType
commons-loggingcommons-logging1.1.1jar
log4jlog4j1.2.15jar
-
-
-
-
-
- -
- - diff --git a/site/images/amber_head.png b/site/images/amber_head.png deleted file mode 100644 index 587e0119eb569464230ba60ff074642ac0ad39de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31983 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 diff --git a/site/images/collapsed.png b/site/images/collapsed.png deleted file mode 100644 index 233e83eaf0dd16859c3fb47f6d7b5d47a6e28375..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{!3OpiN< zL_#t-VS#o6%dKO3&R^UZ5#ZqPi2uy1`u`FU4R5~7+wCc^s@NcYB<lV?NA0bj~YQQ(NG2+n546bdcK0RxboL;9~s_%`oeJa?&Y5Qa~NL2^&iQ&fmJ7!2?9U^tnn8l!ZZiD3wEOKAe!XvBIaoNX zIXReF|Ni^OaP!gQg`|$SrMIRo3 z{mPD{{y#`FBZvS35X}a}oIngx#Gv57V#vkC#CL7muk%3eKOp`A#6N-fI~4zeX$JDa x27qh_#Q-Zv00=1FZ3)3i7vm7&N(;pn3W~T0 zS~pj96C89B99-&F5R^I=!J$JkxQK;xP>c|WP=pLlCd3PAl53LtP-unsg*UHb&XO;}(UNo7!kDt;Y2z9sH-EEXgd$-!{U$g1L?2j)S8xPLq za?kXI1rkAk2nYlLSf*Jw%jFkq#p0WZW-9)?x%nhx7~3&Sbb37?aR_DNo}%k8#IRl} zJzYIGcuCt5Jw9f$*Um35??wg#*=e`KM9T}fI>SF7*jTq<=Ts;WlUG=aG;h>in- zD3YPm^Wr-|+hm;zxXmUg@wh=cIg&`EMaJ~R`Z{E`wnEXr9-aMtI5|AjNhgmu7r1SM zC`k~)r z-{)4X_V^)VKf*b`XRLaI^RsF!wn{Vgu;V@nFrFZwU0St9uNEexkF%B0MArvHmL=gHH8*#_6hwpIx0cB)DZ0%FV1ONa407*qo IM6N<$g2V_eX#fBK diff --git a/site/images/dialog-information.png b/site/images/dialog-information.png deleted file mode 100644 index 3eae22b49c42e0c72773566f4650fcd31bc66449..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 752 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 UIkxoebN~PV07*qoM6N<$g2K2ujsO4v diff --git a/site/images/expanded.png b/site/images/expanded.png deleted file mode 100644 index 0b994320443c8a264e9551d6c6359c8f574d5e6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{!3Opi$t5H(ONzF`q@^hax?>5UsVj!ZZz z*(meuRpqy%f0}BNWOCkoGb;L{)-Siu_VeH0*PG?<)z(~{S+{CB>ynQ6hV338JA88JVbHXdvW<<_`LF(U#TNw^NeKtFg9mr(&yTaM`1Jl5dk1GhVF{bY goEr@iE{7Qzc+@as=+Z`gMF41!z@+iS(@y#wYlaP@XxW3nr|wyP>pe+ChKAy&c&vJOAUFJT8OW7 zRb6Goy;_%TjivBfbD?$iGV212Hn=EkH0IrCE56ZLextY67E9jkp+?(Ny>?jh?oM<* zV9$HRk@rY~^^siPqZKhHyd_RL^PY;)KOL@dHs0u*yTG|XxeKXQ7qXo$^b}ug&A3z> zbG0@7YIoipZ|-{mLXUiT9*2lN?@fCdCi=1=@a2Z-uNE}Cju3yFr1EZB{<{@j@6)tD z6j^;JbNEo<{Gq}BW4-Ukmf(+_(I01(d|Ws2Q+vdxzNAl6vp+3v__VU?^TJwi*wCC% z{K>+}z!1lv1F{JeCk*UM8seIoTUuLWwUt{mbd_3VjXZ2Lnlv1I4HcVZ4LxJRZBt?d)R1q9WZ@n$)dBBct~1iwq4imugnC3JHmbI2jyhdbCBsJRmSI zz~A5OVvC%m-vd8yZ{wABE!^C^yxd$|ob=_I(Rx_&kxO+&dc$$GV;cT3vD8wo-HlNSn+s)1A{dHMi9Fu diff --git a/site/images/icon_help_sml.gif b/site/images/icon_help_sml.gif deleted file mode 100644 index 1ba58657a205151301ce8938ddc24304bd50822a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 637 zcmZ?wbhEHb6krfwc*Xz%JUm>YUU9PFSti-F7CE)nMJ;w^oetR*&ZVucRo$L7JzjMa ze43{CwaxJFm>t+PH>hb+Q18Ov_L-p*mqtum72UruX2zP>1>52$FNvSCF=6h;#O|3% z3$~^%-JLsWUhbUL`D+gq9J*IHb6MfK!-X4;6s_D{HhppV;*FIjpHwegSG{_7&8~B` zyDv0uJ=U~lcgwy@EeEf*?mXQ-cSYy%+dW$j_ME)iJ9k;%n(ci@ulMghIqB?!$=eQ3 zIemBProB@SUz)yX<%}%{XB@dSbH(~uXYb8kx@Pw3EweZ6U3B*D;tTf|UwpXa_|>H+ zuPr-pdexrP!?fAG|%tB!wGetP%e%ezlMK7IN2`RmWGKYsuD{RbRoR3j9BvT!mmq%r7#Oa#RV z1N*Ipw5BFO8F_gb!RGEXL1nw3@bCZ&1>qh6E#H{L_=LnTI}L$mUIiQfNLO>W=y-Qi z1^y-xZ6^;$8z1lRWH&2qku*MWJr_?;Kfl1ZSYvxVaee`5BNvYoelZCS`Ys02LPF98 zF3-H8l3cZHtqo;Ggk%kDzxt&_sK0&pK|o69ZPlH{pOV@SianGGQAj+jFiF!bMPf_f zBPLBQ*$9)6qNSdFvStwngjp6gv5T3^nX*zzc}Y9h5|6MK0*~6KDyn&utWaPSZsn3T Xir7)m=;Y&;rr@wZ;QfjP4h+@+w_*^@ diff --git a/site/images/icon_info_sml.gif b/site/images/icon_info_sml.gif deleted file mode 100644 index e789925f16f2658f21f390f129756b5369b98520..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmZ?wbhEHb6krfwc*Xz%Jlt$zqH*#vS!O1+Ru;83R?QA}tqyh_4)zt!PAzV(T^?@j z9&SBeo;|+all*;W1o%x4@S7DJI4L-APH6Dr$nYi6k*i~(XU4~FPmJG~oVYn9X=X~& zzSNW@8EHFnv)2~nZ7j@RQJ8eQ{% zr`}w?^zOxruiy}(A))w_g_D6Hfk6jk2PjS$*snGuG&Kp!sHn&YH+Lrpt62F21^QSh ziS&qQx&#M@yU%t}pWei;VC@y+8{uOW;$^8I)Fh_m=pEn{>0=z=ZKoxcARw;i7*wvBqD8i%=_eNPd8@+X;D#W11BeE*SIi!XJ?1I_aEBWJ3GY%zI3pCDX(>x)~>ImNxMd^moXja%wp)|4FuoOimUZ5u)&FTFp;mEWWh^JBxJwh8)C vF;^l!Ha=3ADD8IQ!6y}$PF``XgjEHJ&FnnlMSV#uZnw5`IkU1dF<1itkkIo; diff --git a/site/images/icon_success_sml.gif b/site/images/icon_success_sml.gif deleted file mode 100644 index 1866b0a990452d81e09b77d91776a3886f070baf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmZ?wbhEHb6krfwxXQr5;KRTW&A=4I#2L@dm%%L%!z-B0Cz2&3nkpK+I+~X<49HKUhl4h;avx#`;H{^9e3$J88cyT_QZR3lMd%hK2|XK zMAnR}?lUj+&%88Y*6HfmC$g4ZDBt#K;s5{tfo{YD6o0aCGBB7i=z!FK{KUYPW9*womn#BE`dLG~;>w&}0`k1V>fAmILRxw=0vY({1)6y;UbfuKk--`O0i|c# diff --git a/site/images/icon_warning_sml.gif b/site/images/icon_warning_sml.gif deleted file mode 100644 index 1ce360b617852f9d0e8e93d91b68532e50a2326e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 637 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 diff --git a/site/index.html b/site/index.html deleted file mode 100644 index f044b85d..00000000 --- a/site/index.html +++ /dev/null @@ -1,257 +0,0 @@ - - - - - - - - - - - - - - - Apache Amber - About - - - - - - - - - - -
- - -
- -
-
-
-

About Apache Amber

The Apache Software Foundation provides support for the Apache community of open-source software projects. - The Apache projects are characterized by a collaborative, consensus based development process, an open and - pragmatic software license, and a desire to create high quality software that leads the way in its field. - We consider ourselves not simply a group of projects sharing a server, but rather a community of developers - and users.

-
-
-
-
-
- -
- - diff --git a/site/integration.html b/site/integration.html deleted file mode 100644 index 99dddec1..00000000 --- a/site/integration.html +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - - - - - - - - - Apache Amber - Continuous Integration - - - - - - - - - - -
- - -
- -
-
-
-

Continuous Integration

No continuous integration management system is defined. Please check back at a later date.

-
-
-
-
-
- -
- - diff --git a/site/issue-tracking.html b/site/issue-tracking.html deleted file mode 100644 index 62f42bca..00000000 --- a/site/issue-tracking.html +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - - - - - - - - - Apache Amber - Issue Tracking - - - - - - - - - - -
- - -
- -
-
-
-

Overview

This project uses JIRA a J2EE-based, issue tracking and project management application.

Issue Tracking

Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.

https://issues.apache.org/jira/browse/AMBER
-
-
-
-
-
- -
- - diff --git a/site/jira-report.html b/site/jira-report.html deleted file mode 100644 index a5b4cd55..00000000 --- a/site/jira-report.html +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - Apache Amber - JIRA Report - - - - - - - - - - -
- - -
- -
-
-
-

JIRA Report

KeySummaryStatusResolutionBy
AMBER-4[server] Missing equals and hashCode methods in Access classClosedFixedTommaso Teofili
-
-
-
-
-
- -
- - diff --git a/site/js/niftycube.js b/site/js/niftycube.js deleted file mode 100644 index e69de29b..00000000 diff --git a/site/js/prettify.js b/site/js/prettify.js deleted file mode 100644 index bce1e23d..00000000 --- a/site/js/prettify.js +++ /dev/null @@ -1,623 +0,0 @@ -function H() { - var x = navigator && navigator.userAgent - && /\bMSIE 6\./.test(navigator.userAgent); - H = function() { - return x - }; - return x -} -(function() { - function x(b) { - b = b.split(/ /g); - var a = {}; - for ( var c = b.length; --c >= 0;) { - var d = b[c]; - if (d) - a[d] = null - } - return a - } - var y = "break continue do else for if return while ", U = y - + "auto case char const default double enum extern float goto int long register short signed sizeof static struct switch typedef union unsigned void volatile ", D = U - + "catch class delete false import new operator private protected public this throw true try ", I = D - + "alignof align_union asm axiom bool concept concept_map const_cast constexpr decltype dynamic_cast explicit export friend inline late_check mutable namespace nullptr reinterpret_cast static_assert static_cast template typeid typename typeof using virtual wchar_t where ", J = D - + "boolean byte extends final finally implements import instanceof null native package strictfp super synchronized throws transient ", V = J - + "as base by checked decimal delegate descending event fixed foreach from group implicit in interface internal into is lock object out override orderby params readonly ref sbyte sealed stackalloc string select uint ulong unchecked unsafe ushort var ", K = D - + "debugger eval export function get null set undefined var with Infinity NaN ", L = "caller delete die do dump elsif eval exit foreach for goto if import last local my next no our print package redo require sub undef unless until use wantarray while BEGIN END ", M = y - + "and as assert class def del elif except exec finally from global import in is lambda nonlocal not or pass print raise try with yield False True None ", N = y - + "alias and begin case class def defined elsif end ensure false in module next nil not or redo rescue retry self super then true undef unless until when yield BEGIN END ", O = y - + "case done elif esac eval fi function in local set then until ", W = I - + V + K + L + M + N + O; - function X(b) { - return b >= "a" && b <= "z" || b >= "A" && b <= "Z" - } - function u(b, a, c, d) { - b.unshift(c, d || 0); - try { - a.splice.apply(a, b) - } finally { - b.splice(0, 2) - } - } - var Y = (function() { - var b = [ "!", "!=", "!==", "#", "%", "%=", "&", "&&", "&&=", "&=", - "(", "*", "*=", "+=", ",", "-=", "->", "/", "/=", ":", "::", - ";", "<", "<<", "<<=", "<=", "=", "==", "===", ">", ">=", ">>", - ">>=", ">>>", ">>>=", "?", "@", "[", "^", "^=", "^^", "^^=", - "{", "|", "|=", "||", "||=", "~", "break", "case", "continue", - "delete", "do", "else", "finally", "instanceof", "return", - "throw", "try", "typeof" ], a = "(?:(?:(?:^|[^0-9.])\\.{1,3})|(?:(?:^|[^\\+])\\+)|(?:(?:^|[^\\-])-)"; - for ( var c = 0; c < b.length; ++c) { - var d = b[c]; - a += X(d.charAt(0)) ? "|\\b" + d : "|" - + d.replace(/([^=<>:&])/g, "\\$1") - } - a += "|^)\\s*$"; - return new RegExp(a) - })(), P = /&/g, Q = //g, Z = /\"/g; - function $(b) { - return b.replace(P, "&").replace(Q, "<").replace(R, ">") - .replace(Z, """) - } - function E(b) { - return b.replace(P, "&").replace(Q, "<").replace(R, ">") - } - var aa = /</g, ba = />/g, ca = /'/g, da = /"/g, ea = /&/g, fa = / /g; - function ga(b) { - var a = b.indexOf("&"); - if (a < 0) - return b; - for (--a; (a = b.indexOf("&#", a + 1)) >= 0;) { - var c = b.indexOf(";", a); - if (c >= 0) { - var d = b.substring(a + 3, c), g = 10; - if (d && d.charAt(0) === "x") { - d = d.substring(1); - g = 16 - } - var e = parseInt(d, g); - if (!isNaN(e)) - b = b.substring(0, a) + String.fromCharCode(e) - + b.substring(c + 1) - } - } - return b.replace(aa, "<").replace(ba, ">").replace(ca, "'").replace(da, - '"').replace(ea, "&").replace(fa, " ") - } - function S(b) { - return "XMP" === b.tagName - } - function z(b, a) { - switch (b.nodeType) { - case 1: - var c = b.tagName.toLowerCase(); - a.push("<", c); - for ( var d = 0; d < b.attributes.length; ++d) { - var g = b.attributes[d]; - if (!g.specified) - continue; - a.push(" "); - z(g, a) - } - a.push(">"); - for ( var e = b.firstChild; e; e = e.nextSibling) - z(e, a); - if (b.firstChild || !/^(?:br|link|img)$/.test(c)) - a.push(""); - break; - case 2: - a.push(b.name.toLowerCase(), '="', $(b.value), '"'); - break; - case 3: - case 4: - a.push(E(b.nodeValue)); - break - } - } - var F = null; - function ha(b) { - if (null === F) { - var a = document.createElement("pre"); - a - .appendChild(document - .createTextNode('\n')); - F = !/= 0; i -= " ".length) - d.push(" ".substring(0, i)); - g = e + 1; - break; - case "\n": - a = 0; - break; - default: - ++a - } - } - if (!d) - return c; - d.push(c.substring(g)); - return d.join("") - } - } - var ja = /(?:[^<]+| - -

Project Stats

-

Basic stats

- -
- -

Cocomo

- -
- -

Factoids

- -
- -

Languages

- -
-
- - -
- -
-
-
- - - - diff --git a/site/surefire-report.html b/site/surefire-report.html deleted file mode 100644 index 75275696..00000000 --- a/site/surefire-report.html +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - Apache Amber - Surefire Report - - - - - - - - - - -
- - -
- -
-
-
-

Surefire Report

Summary


TestsErrors FailuresSkippedSuccess RateTime
00000%0

Note: failures are anticipated and checked for with assertions while errors are unanticipated.


-
-
-
-
-
- -
- - diff --git a/site/team-list.html b/site/team-list.html deleted file mode 100644 index 6c3e0988..00000000 --- a/site/team-list.html +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - Apache Amber - Team list - - - - - - - - - - -
- - -
- -
-
-
-

The Team

A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.

The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.

Members

The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.

IdNameEmailOrganizationOrganization URLRolesTime ZoneActual Time (GMT)
brianmBrian McCallisterbrianm[at]apache[dot]org--Mentor, PMC Member, Committer--
henningHenning Schmiedehausenhenning[at]apache[dot]org--Mentor, PMC Member, Committer--
jfclereJean-Frederic Clerejfclere[at]apache[dot]org--Mentor, PMC Member, Committer--
gianugoGianugo Rabellinogianugo[at]apache[dot]org--Mentor, PMC Member, Committer--
djencksDavid Jencksdjencks[at]apache[dot]org--Mentor, PMC Member, Committer--
simonegSimone Giannisimoneg[at]apache[dot]orgSemeru S.r.l.http://www.semeru.it/PMC Member, Committer+1+1
simonetripodiSimone Tripodisimonetripodi[at]apache[dot]orgSourcesense S.r.l.http://www.sourcesense.com/PMC Member, Committer+1+1
pidsterStuart "Pid" Williams---PMC Member, Committer+1+1
recordondDavid Recordonrecordond[at]apache[dot]org--PMC Member, Committer+1+1
tommasoTommaso Teofilitommaso[at]apache[dot]orgSourcesense S.r.l.http://www.sourcesense.com/PMC Member, Committer+1+1
lindnerPaul Lindnerlindner[at]apache[dot]org--PMC Member, Committer+1+1
TBDPablo Fernandez---PMC Member, Committer+1+1

Contributors

There are no contributors listed for this project. Please check back again later.

-
-
-
-
-
- -
- - diff --git a/site/testapidocs/allclasses-frame.html b/site/testapidocs/allclasses-frame.html deleted file mode 100644 index 3576d87f..00000000 --- a/site/testapidocs/allclasses-frame.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - -All Classes (Apache Amber 1.0-SNAPSHOT Test API) - - - - - - - - - - - -All Classes -
- - - - - -
AbstractMethodTestCase -
-AccessTest -
-HmacSha1MethodTestCase -
-PlaintextMethodTestCase -
-RsaSha1MethodTestCase -
-
- - - diff --git a/site/testapidocs/allclasses-noframe.html b/site/testapidocs/allclasses-noframe.html deleted file mode 100644 index 29120e05..00000000 --- a/site/testapidocs/allclasses-noframe.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - -All Classes (Apache Amber 1.0-SNAPSHOT Test API) - - - - - - - - - - - -All Classes -
- - - - - -
AbstractMethodTestCase -
-AccessTest -
-HmacSha1MethodTestCase -
-PlaintextMethodTestCase -
-RsaSha1MethodTestCase -
-
- - - diff --git a/site/testapidocs/constant-values.html b/site/testapidocs/constant-values.html deleted file mode 100644 index ecd4ba53..00000000 --- a/site/testapidocs/constant-values.html +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - -Constant Field Values (Apache Amber 1.0-SNAPSHOT Test API) - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Constant Field Values

-
-
-Contents
    -
- -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/testapidocs/deprecated-list.html b/site/testapidocs/deprecated-list.html deleted file mode 100644 index a160fa5d..00000000 --- a/site/testapidocs/deprecated-list.html +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - -Deprecated List (Apache Amber 1.0-SNAPSHOT Test API) - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree   Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Deprecated API

-
-
-Contents
    -
- -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree   Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/testapidocs/help-doc.html b/site/testapidocs/help-doc.html deleted file mode 100644 index 1ddcd057..00000000 --- a/site/testapidocs/help-doc.html +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - -API Help (Apache Amber 1.0-SNAPSHOT Test API) - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated  Index   Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-How This API Document Is Organized

-
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.

-Overview

-
- -

-The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.

-

-Package

-
- -

-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:

    -
  • Interfaces (italic)
  • Classes
  • Enums
  • Exceptions
  • Errors
  • Annotation Types
-
-

-Class/Interface

-
- -

-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:

    -
  • Class inheritance diagram
  • Direct Subclasses
  • All Known Subinterfaces
  • All Known Implementing Classes
  • Class/interface declaration
  • Class/interface description -

    -

  • Nested Class Summary
  • Field Summary
  • Constructor Summary
  • Method Summary -

    -

  • Field Detail
  • Constructor Detail
  • Method Detail
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.
- -

-Annotation Type

-
- -

-Each annotation type has its own separate page with the following sections:

    -
  • Annotation Type declaration
  • Annotation Type description
  • Required Element Summary
  • Optional Element Summary
  • Element Detail
-
- -

-Enum

-
- -

-Each enum has its own separate page with the following sections:

    -
  • Enum declaration
  • Enum description
  • Enum Constant Summary
  • Enum Constant Detail
-
-

-Use

-
-Each documented package, class and interface has its own Use page. This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.
-

-Tree (Class Hierarchy)

-
-There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object. The interfaces do not inherit from java.lang.Object.
    -
  • When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
  • When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
-
-

-Deprecated API

-
-The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.
-

-Index

-
-The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.
-

-Prev/Next

-These links take you to the next or previous class, interface, package, or related page.

-Frames/No Frames

-These links show and hide the HTML frames. All pages are available with or without frames. -

-

-Serialized Form

-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description. -

-

-Constant Field Values

-The Constant Field Values page lists the static final fields and their values. -

- - -This help file applies to API documentation generated using the standard doclet. - -
-

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated  Index   Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/testapidocs/index-all.html b/site/testapidocs/index-all.html deleted file mode 100644 index 42d29c3b..00000000 --- a/site/testapidocs/index-all.html +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - -Index (Apache Amber 1.0-SNAPSHOT Test API) - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated   Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -A D H M N O P R V
-

-A

-
-
AbstractMethodTestCase - Class in org.apache.amber.signature
Abstract implementation of OAuth signature method algorithm test case.
AbstractMethodTestCase() - -Constructor for class org.apache.amber.signature.AbstractMethodTestCase -
  -
AccessTest - Class in org.apache.amber.server
 
AccessTest() - -Constructor for class org.apache.amber.server.AccessTest -
  -
-
-

-D

-
-
doNothing() - -Method in class org.apache.amber.signature.rsa.RsaSha1MethodTestCase -
  -
-
-

-H

-
-
HmacSha1MethodTestCase - Class in org.apache.amber.signature.hmac
HMAC-SHA1 Method test case implementation.
HmacSha1MethodTestCase() - -Constructor for class org.apache.amber.signature.hmac.HmacSha1MethodTestCase -
  -
-
-

-M

-
-
matchingEqualsHashTest() - -Method in class org.apache.amber.server.AccessTest -
  -
-
-

-N

-
-
notMatchingEqualsHashTest() - -Method in class org.apache.amber.server.AccessTest -
  -
-
-

-O

-
-
org.apache.amber.server - package org.apache.amber.server
 
org.apache.amber.signature - package org.apache.amber.signature
 
org.apache.amber.signature.hmac - package org.apache.amber.signature.hmac
 
org.apache.amber.signature.plaintext - package org.apache.amber.signature.plaintext
 
org.apache.amber.signature.rsa - package org.apache.amber.signature.rsa
 
-
-

-P

-
-
PlaintextMethodTestCase - Class in org.apache.amber.signature.plaintext
HMAC-SHA1 Method test case implementation.
PlaintextMethodTestCase() - -Constructor for class org.apache.amber.signature.plaintext.PlaintextMethodTestCase -
  -
-
-

-R

-
-
RsaSha1MethodTestCase - Class in org.apache.amber.signature.rsa
 
RsaSha1MethodTestCase() - -Constructor for class org.apache.amber.signature.rsa.RsaSha1MethodTestCase -
  -
-
-

-V

-
-
verifyHmacSha1MethodAlgorithm() - -Method in class org.apache.amber.signature.hmac.HmacSha1MethodTestCase -
  -
verifyHmacSha1MethodAlgorithm() - -Method in class org.apache.amber.signature.plaintext.PlaintextMethodTestCase -
  -
verifyRsaSha1MethodAlgorithm() - -Method in class org.apache.amber.signature.rsa.RsaSha1MethodTestCase -
  -
verifySignature(VerifyingKey, SignatureMethod, String) - -Method in class org.apache.amber.signature.AbstractMethodTestCase -
  -
-
-A D H M N O P R V - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use  Tree  Deprecated   Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/testapidocs/index.html b/site/testapidocs/index.html deleted file mode 100644 index 15197cb3..00000000 --- a/site/testapidocs/index.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - -Apache Amber 1.0-SNAPSHOT Test API - - - - - - - - - - - -<H2> -Frame Alert</H2> - -<P> -This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. -<BR> -Link to<A HREF="overview-summary.html">Non-frame version.</A> - - - diff --git a/site/testapidocs/overview-frame.html b/site/testapidocs/overview-frame.html deleted file mode 100644 index 989f895c..00000000 --- a/site/testapidocs/overview-frame.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - -Overview List (Apache Amber 1.0-SNAPSHOT Test API) - - - - - - - - - - - - - - - -
-
- - - - - -
All Classes -

- -Packages -
-org.apache.amber.server -
-org.apache.amber.signature -
-org.apache.amber.signature.hmac -
-org.apache.amber.signature.plaintext -
-org.apache.amber.signature.rsa -
-

- -

-  - - diff --git a/site/testapidocs/overview-summary.html b/site/testapidocs/overview-summary.html deleted file mode 100644 index 6fabb740..00000000 --- a/site/testapidocs/overview-summary.html +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - -Overview (Apache Amber 1.0-SNAPSHOT Test API) - - - - - - - - - - - - -

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
 Overview  Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Apache Amber 1.0-SNAPSHOT Test API -

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
-Packages
org.apache.amber.server 
org.apache.amber.signature 
org.apache.amber.signature.hmac 
org.apache.amber.signature.plaintext 
org.apache.amber.signature.rsa 
- -

- 

- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
 Overview  Package  Class  Use  Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/testapidocs/overview-tree.html b/site/testapidocs/overview-tree.html deleted file mode 100644 index 2ae9142c..00000000 --- a/site/testapidocs/overview-tree.html +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - -Class Hierarchy (Apache Amber 1.0-SNAPSHOT Test API) - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use   Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-
-

-Hierarchy For All Packages

-
-
-
Package Hierarchies:
org.apache.amber.server, org.apache.amber.signature, org.apache.amber.signature.hmac, org.apache.amber.signature.plaintext, org.apache.amber.signature.rsa
-
-

-Class Hierarchy -

- -
- - - - - - - - - - - - - - - -
- - - - - - - - - - - - -
Overview  Package  Class  Use   Tree  Deprecated  Index  Help 
-		 - -
- PREV  - NEXT - FRAMES   - NO FRAMES   -  - - - -
- - - -
-Copyright © 2010 The Apache Software Foundation. All Rights Reserved. - - diff --git a/site/testapidocs/package-list b/site/testapidocs/package-list deleted file mode 100644 index 8812ff27..00000000 --- a/site/testapidocs/package-list +++ /dev/null @@ -1,5 +0,0 @@ -org.apache.amber.server -org.apache.amber.signature -org.apache.amber.signature.hmac -org.apache.amber.signature.plaintext -org.apache.amber.signature.rsa diff --git a/site/testapidocs/stylesheet.css b/site/testapidocs/stylesheet.css deleted file mode 100644 index 6ea9e516..00000000 --- a/site/testapidocs/stylesheet.css +++ /dev/null @@ -1,29 +0,0 @@ -/* Javadoc style sheet */ - -/* Define colors, fonts and other style attributes here to override the defaults */ - -/* Page background color */ -body { background-color: #FFFFFF; color:#000000 } - -/* Headings */ -h1 { font-size: 145% } - -/* Table colors */ -.TableHeadingColor { background: #CCCCFF; color:#000000 } /* Dark mauve */ -.TableSubHeadingColor { background: #EEEEFF; color:#000000 } /* Light mauve */ -.TableRowColor { background: #FFFFFF; color:#000000 } /* White */ - -/* Font used in left-hand frame lists */ -.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#000000 } -.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#000000 } -.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#000000 } - -/* Navigation bar fonts and colors */ -.NavBarCell1 { background-color:#EEEEFF; color:#000000} /* Light mauve */ -.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */ -.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;} -.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;} - -.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000} -.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000} - From bc532e2f978d08be94fb5fcdfcb4eb8a8353f3fc Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Thu, 19 Jan 2012 10:08:39 +0000 Subject: [PATCH 066/583] update personal information on the team page git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1233264 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 59f8d5ee..1b542ea2 100644 --- a/pom.xml +++ b/pom.xml @@ -190,10 +190,14 @@ asanso Antonio Sanso + asanso[at]apache[dot]org + Adobe + http://www.day.com PPMC Member Committer + +1 From a340e695f4ab0943dc5ccb8ce7ed65316fcdaa24 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 19 Jan 2012 11:32:22 +0000 Subject: [PATCH 067/583] added incubator banner on right git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1233291 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/site/site.xml b/src/site/site.xml index 811fa4bc..adc7c5c1 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -25,6 +25,12 @@ ${project.url}/index.html + + Apache Incubator + http://incubator.apache.org/images/apache-incubator-logo.png + http://incubator.apache.org/ + + org.apache.maven.skins maven-fluido-skin From a378448750d4d899014ba02ea95a0b7f573671e9 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Wed, 25 Jan 2012 09:01:50 +0000 Subject: [PATCH 068/583] AMBER-42 : Update amber based on the latest oauth 2.0 draft v22 . Apply patch from Raymond Feng. Thanks! git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1235697 13f79535-47bb-0310-9956-ffa450edef68 --- .../oauth2/as/request/OAuthAuthzRequest.java | 11 +- .../amber/oauth2/as/request/OAuthRequest.java | 16 ++- .../oauth2/as/request/OAuthTokenRequest.java | 20 ++-- .../validator/AuthorizationCodeValidator.java | 4 +- .../validator/ClientCredentialValidator.java | 33 ++++++ .../as/validator/CodeTokenValidator.java | 59 ++++++++++ .../oauth2/as/validator/CodeValidator.java | 2 +- .../as/validator/PasswordValidator.java | 4 +- .../as/validator/RefreshTokenValidator.java | 4 +- .../oauth2/as/validator/TokenValidator.java | 2 +- .../amber/oauth2/as/OAuthRequestTest.java | 99 +++-------------- .../client/request/OAuthClientRequest.java | 6 +- .../org/apache/amber/oauth2/common/OAuth.java | 1 + .../amber/oauth2/common/error/OAuthError.java | 84 +++++++++++++- .../common/message/types/GrantType.java | 6 +- .../common/message/types/ResponseType.java | 4 +- .../amber/oauth2/common/utils/OAuthUtils.java | 5 +- .../integration/AccessTokenAssertion.java | 104 ------------------ .../AccessTokenTestAuthCodeTest.java | 2 +- .../integration/endpoints/AuthzEndpoint.java | 9 +- .../integration/endpoints/TokenEndpoint.java | 26 +---- .../rs/extractor/QueryTokenExtractor.java | 6 +- .../rs/extractor/QueryTokenExtractorTest.java | 12 +- 23 files changed, 258 insertions(+), 261 deletions(-) create mode 100644 oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/ClientCredentialValidator.java delete mode 100644 oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenAssertion.java diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java index 77967062..81d4c39a 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java @@ -44,19 +44,20 @@ public OAuthAuthzRequest(HttpServletRequest request) throws OAuthSystemException } @Override - protected OAuthValidator initValidator() throws OAuthProblemException, OAuthSystemException { + protected OAuthValidator initValidator() throws OAuthProblemException, OAuthSystemException { //end user authorization validators validators.put(ResponseType.CODE.toString(), CodeValidator.class); validators.put(ResponseType.TOKEN.toString(), TokenValidator.class); + String requestTypeValue = getParam(OAuth.OAUTH_RESPONSE_TYPE); if (OAuthUtils.isEmpty(requestTypeValue)) { throw OAuthUtils.handleOAuthProblemException("Missing response_type parameter value"); } - Class clazz = validators.get(requestTypeValue); + Class> clazz = validators.get(requestTypeValue); if (clazz == null) { throw OAuthUtils.handleOAuthProblemException("Invalid response_type parameter value"); } - return (OAuthValidator)OAuthUtils.instantiateClass(clazz); + return OAuthUtils.instantiateClass(clazz); } @@ -64,4 +65,8 @@ public String getState() { return getParam(OAuth.OAUTH_STATE); } + public String getResponseType() { + return getParam(OAuth.OAUTH_RESPONSE_TYPE); + } + } diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java index e041df70..d4a4109f 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; + import javax.servlet.http.HttpServletRequest; import org.apache.amber.oauth2.common.OAuth; @@ -44,8 +45,9 @@ public abstract class OAuthRequest { private Logger log = LoggerFactory.getLogger(OAuthRequest.class); protected HttpServletRequest request; - protected OAuthValidator validator; - protected Map validators = new HashMap(); + protected OAuthValidator validator; + protected Map>> validators = + new HashMap>>(); public OAuthRequest(HttpServletRequest request) throws OAuthSystemException, OAuthProblemException { this.request = request; @@ -69,8 +71,7 @@ protected void validate() throws OAuthSystemException, OAuthProblemException { } } catch (Exception ex) { if (log.isDebugEnabled()) { - log.debug("Cannot read redirect_url from the request: {}", - new String[] {ex.getMessage()}); + log.debug("Cannot read redirect_url from the request: {}", new String[] {ex.getMessage()}); } } @@ -79,16 +80,13 @@ protected void validate() throws OAuthSystemException, OAuthProblemException { } - protected abstract OAuthValidator initValidator() throws OAuthProblemException, OAuthSystemException; + protected abstract OAuthValidator initValidator() throws OAuthProblemException, + OAuthSystemException; public String getParam(String name) { return request.getParameter(name); } - public String getRefreshToken() { - return getParam(OAuth.OAUTH_REFRESH_TOKEN); - } - public String getClientId() { return getParam(OAuth.OAUTH_CLIENT_ID); } diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java index 642b523c..16184399 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.amber.oauth2.as.validator.AuthorizationCodeValidator; -import org.apache.amber.oauth2.as.validator.AssertionValidator; +import org.apache.amber.oauth2.as.validator.ClientCredentialValidator; import org.apache.amber.oauth2.as.validator.PasswordValidator; import org.apache.amber.oauth2.as.validator.RefreshTokenValidator; import org.apache.amber.oauth2.common.OAuth; @@ -48,20 +48,20 @@ public OAuthTokenRequest(HttpServletRequest request) throws OAuthSystemException } @Override - protected OAuthValidator initValidator() throws OAuthProblemException, OAuthSystemException { + protected OAuthValidator initValidator() throws OAuthProblemException, OAuthSystemException { validators.put(GrantType.PASSWORD.toString(), PasswordValidator.class); - validators.put(GrantType.ASSERTION.toString(), AssertionValidator.class); + validators.put(GrantType.CLIENT_CREDENTIALS.toString(), ClientCredentialValidator.class); validators.put(GrantType.AUTHORIZATION_CODE.toString(), AuthorizationCodeValidator.class); validators.put(GrantType.REFRESH_TOKEN.toString(), RefreshTokenValidator.class); String requestTypeValue = getParam(OAuth.OAUTH_GRANT_TYPE); if (OAuthUtils.isEmpty(requestTypeValue)) { throw OAuthUtils.handleOAuthProblemException("Missing grant_type parameter value"); } - Class clazz = validators.get(requestTypeValue); + Class> clazz = validators.get(requestTypeValue); if (clazz == null) { throw OAuthUtils.handleOAuthProblemException("Invalid grant_type parameter value"); } - return (OAuthValidator)OAuthUtils.instantiateClass(clazz); + return OAuthUtils.instantiateClass(clazz); } public String getPassword() { @@ -72,14 +72,10 @@ public String getUsername() { return getParam(OAuth.OAUTH_USERNAME); } - public String getAssertion() { - return getParam(OAuth.OAUTH_ASSERTION); + public String getRefreshToken() { + return getParam(OAuth.OAUTH_REFRESH_TOKEN); } - - public String getAssertionType() { - return getParam(OAuth.OAUTH_ASSERTION_TYPE); - } - + public String getCode() { return getParam(OAuth.OAUTH_CODE); } diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java index 865a18f4..b5071263 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java @@ -21,6 +21,8 @@ package org.apache.amber.oauth2.as.validator; +import javax.servlet.http.HttpServletRequest; + import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.validators.AbstractValidator; @@ -29,7 +31,7 @@ * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) */ -public class AuthorizationCodeValidator extends AbstractValidator { +public class AuthorizationCodeValidator extends AbstractValidator { public AuthorizationCodeValidator() { requiredParams.add(OAuth.OAUTH_GRANT_TYPE); diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/ClientCredentialValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/ClientCredentialValidator.java new file mode 100644 index 00000000..cb7b87f9 --- /dev/null +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/ClientCredentialValidator.java @@ -0,0 +1,33 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.amber.oauth2.as.validator; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.common.validators.AbstractValidator; + +public class ClientCredentialValidator extends AbstractValidator { + public ClientCredentialValidator() { + requiredParams.add(OAuth.OAUTH_GRANT_TYPE); + } +} diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java index e69de29b..8567e9c2 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java @@ -0,0 +1,59 @@ + +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.amber.oauth2.as.validator; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.amber.oauth2.common.validators.AbstractValidator; + + +/** + * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) + * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) + * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + */ +public class CodeTokenValidator extends AbstractValidator { + + public CodeTokenValidator() { + requiredParams.add(OAuth.OAUTH_RESPONSE_TYPE); + requiredParams.add(OAuth.OAUTH_CLIENT_ID); + requiredParams.add(OAuth.OAUTH_REDIRECT_URI); + } + + @Override + public void validateMethod(HttpServletRequest request) throws OAuthProblemException { + String method = request.getMethod(); + if (!method.equals(OAuth.HttpMethod.GET) && !method.equals(OAuth.HttpMethod.POST)) { + throw OAuthProblemException.error(OAuthError.CodeResponse.INVALID_REQUEST) + .description("Method not correct."); + } + } + + @Override + public void validateContentType(HttpServletRequest request) throws OAuthProblemException { + } +} + diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java index 75547eb8..e73b35f3 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java @@ -34,7 +34,7 @@ * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) */ -public class CodeValidator extends AbstractValidator { +public class CodeValidator extends AbstractValidator { public CodeValidator() { requiredParams.add(OAuth.OAUTH_RESPONSE_TYPE); diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java index 54f116af..2e54ccb2 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java @@ -21,6 +21,8 @@ package org.apache.amber.oauth2.as.validator; +import javax.servlet.http.HttpServletRequest; + import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.validators.AbstractValidator; @@ -29,7 +31,7 @@ * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) */ -public class PasswordValidator extends AbstractValidator { +public class PasswordValidator extends AbstractValidator { public PasswordValidator() { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java index f55e7905..f2258e02 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java @@ -22,6 +22,8 @@ package org.apache.amber.oauth2.as.validator; +import javax.servlet.http.HttpServletRequest; + import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.validators.AbstractValidator; @@ -30,7 +32,7 @@ * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) */ -public class RefreshTokenValidator extends AbstractValidator { +public class RefreshTokenValidator extends AbstractValidator { public RefreshTokenValidator() { requiredParams.add(OAuth.OAUTH_GRANT_TYPE); diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java index 81ac760d..96f87956 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java @@ -33,7 +33,7 @@ * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) */ -public class TokenValidator extends AbstractValidator { +public class TokenValidator extends AbstractValidator { public TokenValidator() { requiredParams.add(OAuth.OAUTH_RESPONSE_TYPE); diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java index af00a2cc..5c76a0c4 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java @@ -21,7 +21,15 @@ package org.apache.amber.oauth2.as; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.fail; + import java.util.Set; + import javax.servlet.http.HttpServletRequest; import junit.framework.Assert; @@ -36,13 +44,6 @@ import org.apache.amber.oauth2.common.message.types.ResponseType; import org.junit.Test; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.reset; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.fail; - /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -225,13 +226,12 @@ public void testTokenRequestInvalidMethod() throws Exception { verify(request); reset(request); - expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)) - .andStubReturn(GrantType.ASSERTION.toString()); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); expect(request.getParameter(OAuth.OAUTH_CLIENT_ID)).andStubReturn("test_client"); expect(request.getParameter(OAuth.OAUTH_REDIRECT_URI)).andStubReturn("http://example.com/callback"); + expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)).andStubReturn("authorization_code"); replay(request); try { @@ -281,7 +281,7 @@ public void testTokenRequestInvalidMethod() throws Exception { reset(request); expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)) - .andStubReturn(GrantType.NONE.toString()); + .andStubReturn(null); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); @@ -321,13 +321,13 @@ public void testTokenRequestInvalidContentType() throws Exception { verify(request); reset(request); - expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)) - .andStubReturn(GrantType.ASSERTION.toString()); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.JSON); expect(request.getParameter(OAuth.OAUTH_CLIENT_ID)).andStubReturn("test_client"); expect(request.getParameter(OAuth.OAUTH_REDIRECT_URI)).andStubReturn("http://example.com/callback"); + expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)).andStubReturn("authorization_code"); + replay(request); try { @@ -382,7 +382,7 @@ public void testTokenRequestInvalidContentType() throws Exception { reset(request); expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)) - .andStubReturn(GrantType.NONE.toString()); + .andStubReturn(null); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.JSON); @@ -535,70 +535,6 @@ public void testTokenPasswordRequestMissingParameter() throws Exception { verify(request); } - @Test - public void testTokenAssertionRequestMissingParameter() throws Exception { - HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)) - .andStubReturn(GrantType.ASSERTION.toString()); - expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); - expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameter(OAuth.OAUTH_REDIRECT_URI)).andStubReturn("http://www.example.com/red"); - - expect(request.getParameter(OAuth.OAUTH_ASSERTION)).andStubReturn(null); - expect(request.getParameter(OAuth.OAUTH_ASSERTION_TYPE)).andStubReturn("test_type"); - replay(request); - - try { - new OAuthTokenRequest(request); - fail("Exception expected"); - } catch (OAuthProblemException e) { - Assert.assertEquals(OAuthError.TokenResponse.INVALID_REQUEST, e.getError()); - } - - verify(request); - - reset(request); - - expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)) - .andStubReturn(GrantType.ASSERTION.toString()); - expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); - expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameter(OAuth.OAUTH_REDIRECT_URI)).andStubReturn("http://www.example.com/red"); - - expect(request.getParameter(OAuth.OAUTH_ASSERTION)).andStubReturn("test_assertion"); - expect(request.getParameter(OAuth.OAUTH_ASSERTION_TYPE)).andStubReturn(null); - replay(request); - - try { - new OAuthTokenRequest(request); - fail("Exception expected"); - } catch (OAuthProblemException e) { - Assert.assertEquals(OAuthError.TokenResponse.INVALID_REQUEST, e.getError()); - } - - verify(request); - - reset(request); - - expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)) - .andStubReturn(GrantType.ASSERTION.toString()); - expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); - expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameter(OAuth.OAUTH_REDIRECT_URI)).andStubReturn("http://www.example.com/red"); - - expect(request.getParameter(OAuth.OAUTH_ASSERTION)).andStubReturn(""); - expect(request.getParameter(OAuth.OAUTH_ASSERTION_TYPE)).andStubReturn(""); - replay(request); - - try { - new OAuthTokenRequest(request); - fail("Exception expected"); - } catch (OAuthProblemException e) { - Assert.assertEquals(OAuthError.TokenResponse.INVALID_REQUEST, e.getError()); - } - - verify(request); - } @Test public void testRefreshTokenRequestMissingParameter() throws Exception { @@ -720,13 +656,10 @@ public void testValidTokenRequest() throws Exception { verify(request); reset(request); - expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)) - .andStubReturn(GrantType.ASSERTION.toString()); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameter(OAuth.OAUTH_ASSERTION)).andStubReturn("test_assertion"); - expect(request.getParameter(OAuth.OAUTH_ASSERTION_TYPE)).andStubReturn("test_type"); + expect(request.getParameter(OAuth.OAUTH_GRANT_TYPE)).andStubReturn(GrantType.CLIENT_CREDENTIALS.toString()); replay(request); try { @@ -735,8 +668,8 @@ public void testValidTokenRequest() throws Exception { } catch (OAuthProblemException e) { fail("Exception not expected"); } - Assert.assertEquals("test_assertion", req.getAssertion()); - Assert.assertEquals("test_type", req.getAssertionType()); +// Assert.assertEquals("test_assertion", req.getAssertion()); +// Assert.assertEquals("test_type", req.getAssertionType()); verify(request); reset(request); diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java index dc7dfa0c..7252572d 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java @@ -27,10 +27,10 @@ import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.apache.amber.oauth2.common.message.OAuthMessage; -import org.apache.amber.oauth2.common.parameters.OAuthParametersApplier; -import org.apache.amber.oauth2.common.parameters.QueryParameterApplier; import org.apache.amber.oauth2.common.message.types.GrantType; import org.apache.amber.oauth2.common.parameters.BodyURLEncodedParametersApplier; +import org.apache.amber.oauth2.common.parameters.OAuthParametersApplier; +import org.apache.amber.oauth2.common.parameters.QueryParameterApplier; /** * OAuth Client Request @@ -169,7 +169,7 @@ public TokenRequestBuilder(String url) { } public TokenRequestBuilder setGrantType(GrantType grantType) { - this.parameters.put(OAuth.OAUTH_GRANT_TYPE, grantType.toString()); + this.parameters.put(OAuth.OAUTH_GRANT_TYPE, grantType == null ? null : grantType.toString()); return this; } diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java index eef611fe..3da23ba2 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java @@ -77,6 +77,7 @@ public static final class ContentType { public static final String OAUTH_TOKEN = "oauth_token"; public static final String OAUTH_TOKEN_DRAFT_0 = "access_token"; + public static final String OAUTH_BEARER_TOKEN = "access_token"; public static final ParameterStyle DEFAULT_PARAMETER_STYLE = ParameterStyle.HEADER; public static final String OAUTH_VERSION_DIFFER = "oauth_signature_method"; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java index 19c95e61..779bd290 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java @@ -34,22 +34,104 @@ public abstract class OAuthError { public static final String OAUTH_ERROR_URI = "error_uri"; public static final class CodeResponse { + /** + * The request is missing a required parameter, includes an + unsupported parameter value, or is otherwise malformed. + */ public static final String INVALID_REQUEST = "invalid_request"; + public static final String INVALID_CLIENT = "invalid_client"; + + /** + * The client is not authorized to request an authorization + code using this method. + */ public static final String UNAUTHORIZED_CLIENT = "unauthorized_client"; public static final String REDIRECT_URI_MISMATCH = "redirect_uri_mismatch"; + + /** + * The resource owner or authorization server denied the + request. + */ public static final String ACCESS_DENIED = "access_denied"; + + /** + * The authorization server does not support obtaining an + authorization code using this method. + */ public static final String UNSUPPORTED_RESPONSE_TYPE = "unsupported_response_type"; + + /** + * The requested scope is invalid, unknown, or malformed. + */ public static final String INVALID_SCOPE = "invalid_scope"; + + /** + * The authorization server encountered an unexpected + condition which prevented it from fulfilling the request. + */ + public static final String SERVER_ERROR = "server_error"; + + /** + * The authorization server is currently unable to handle + the request due to a temporary overloading or maintenance + of the server. + */ + public static final String TEMPORARILY_UNAVAILABLE = "temporarily_unavailable"; + } public static final class TokenResponse { + /** + The request is missing a required parameter, includes an + unsupported parameter value, repeats a parameter, + includes multiple credentials, utilizes more than one + mechanism for authenticating the client, or is otherwise + malformed. + */ + public static final String INVALID_REQUEST = "invalid_request"; + /** + Client authentication failed (e.g. unknown client, no + client authentication included, or unsupported + authentication method). The authorization server MAY + return an HTTP 401 (Unauthorized) status code to indicate + which HTTP authentication schemes are supported. If the + client attempted to authenticate via the "Authorization" + request header field, the authorization server MUST + respond with an HTTP 401 (Unauthorized) status code, and + include the "WWW-Authenticate" response header field + matching the authentication scheme used by the client. + */ public static final String INVALID_CLIENT = "invalid_client"; - public static final String UNAUTHORIZED_CLIENT = "unauthorized_client"; + + /** + The provided authorization grant (e.g. authorization + code, resource owner credentials, client credentials) is + invalid, expired, revoked, does not match the redirection + URI used in the authorization request, or was issued to + another client. + */ public static final String INVALID_GRANT = "invalid_grant"; + + /** + The authenticated client is not authorized to use this + authorization grant type. + */ + public static final String UNAUTHORIZED_CLIENT = "unauthorized_client"; + + /** + The authorization grant type is not supported by the + authorization server. + */ public static final String UNSUPPORTED_GRANT_TYPE = "unsupported_grant_type"; + + /** + * The requested scope is invalid, unknown, malformed, or exceeds the scope granted by the resource owner. + */ + public static final String INVALID_SCOPE = "invalid_scope"; + public static final String REDIRECT_URI_MISMATCH = "redirect_uri_mismatch"; } public static final class ResourceResponse { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java index aaac733a..55451c80 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java @@ -27,13 +27,11 @@ * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) */ public enum GrantType { + // NONE("none"), AUTHORIZATION_CODE("authorization_code"), PASSWORD("password"), - @Deprecated - ASSERTION("assertion"), REFRESH_TOKEN("refresh_token"), - CLIENT_CREDENTIALS("client_credentials"), - NONE("none"); + CLIENT_CREDENTIALS("client_credentials"); private String grantType; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java index 3a19e1f2..5f0d5bf1 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java @@ -29,9 +29,7 @@ public enum ResponseType { CODE("code"), - TOKEN("token"), - @Deprecated - CODE_AND_TOKEN("code_and_token"); + TOKEN("token"); private String code; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java index cdbd95d3..d8e097d9 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java @@ -39,6 +39,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.servlet.http.HttpServletRequest; import org.apache.amber.oauth2.common.OAuth; @@ -289,9 +290,9 @@ private static boolean isEmpty(Set missingParams) { return false; } - public static Object instantiateClass(Class clazz) throws OAuthSystemException { + public static T instantiateClass(Class clazz) throws OAuthSystemException { try { - return (Object)clazz.newInstance(); + return (T)clazz.newInstance(); } catch (Exception e) { throw new OAuthSystemException(e); } diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenAssertion.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenAssertion.java deleted file mode 100644 index 80bd59b3..00000000 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenAssertion.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2010 Newcastle University - * - * http://research.ncl.ac.uk/smart/ - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.amber.oauth2.integration; - -import org.apache.amber.oauth2.client.OAuthClient; -import org.apache.amber.oauth2.client.URLConnectionClient; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.client.response.OAuthAccessTokenResponse; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.junit.Test; -import org.apache.amber.oauth2.common.message.types.GrantType; -import org.apache.amber.oauth2.httpclient4.HttpClient4; - -/** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) - */ -public class AccessTokenAssertion extends ClientServerOAuthTest { - - @Test - public void testSuccessfullAccesToken() throws Exception { - - OAuthClientRequest request = OAuthClientRequest - .tokenLocation(Common.ACCESS_TOKEN_ENDPOINT) - .setGrantType(GrantType.ASSERTION) - .setAssertion(Common.ASSERTION) - .setAssertionType(Common.ASSERTION_TYPE) - .buildBodyMessage(); - - OAuthClient oAuthClient = new OAuthClient(new HttpClient4()); - OAuthAccessTokenResponse response = null; - try { - response = oAuthClient.accessToken(request); - } catch (OAuthProblemException e) { - fail("exception not expected"); - } - assertNotNull(response.getAccessToken()); - assertNotNull(response.getExpiresIn()); - - } - - @Test - public void testInvalidRequest() throws Exception { - - OAuthClientRequest request = OAuthClientRequest - .tokenLocation(Common.ACCESS_TOKEN_ENDPOINT) - .setGrantType(GrantType.ASSERTION) - .setAssertionType(Common.ASSERTION_TYPE) - .buildBodyMessage(); - - OAuthClient oAuthClient = new OAuthClient(new URLConnectionClient()); - - OAuthAccessTokenResponse response = null; - try { - oAuthClient.accessToken(request); - fail("exception expected"); - } catch (OAuthProblemException e) { - assertEquals(OAuthError.TokenResponse.INVALID_REQUEST, e.getError()); - } - - - } - - @Test - public void testInvalidRequest2() throws Exception { - - OAuthClientRequest request = OAuthClientRequest - .tokenLocation(Common.ACCESS_TOKEN_ENDPOINT) - .setGrantType(GrantType.ASSERTION) - .buildBodyMessage(); - - OAuthClient oAuthClient = new OAuthClient(new URLConnectionClient()); - OAuthClientResponse response = null; - try { - oAuthClient.accessToken(request); - fail("exception expected"); - } catch (OAuthProblemException e) { - assertEquals(OAuthError.TokenResponse.INVALID_REQUEST, e.getError()); - } - - } -} \ No newline at end of file diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java index 28cb72ea..48b66834 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java @@ -83,7 +83,7 @@ public void testSuccessfullAccesTokenGETMethod() throws Exception { public void testNoneGrantType() throws Exception { OAuthClientRequest request = OAuthClientRequest .tokenLocation(Common.ACCESS_TOKEN_ENDPOINT) - .setGrantType(GrantType.NONE) + .setGrantType(null) .setClientId(Common.CLIENT_ID) .buildBodyMessage(); diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java index 3c6ccb75..120b70a2 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java @@ -23,6 +23,7 @@ import java.net.URI; import java.net.URISyntaxException; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.GET; @@ -32,15 +33,15 @@ import javax.ws.rs.core.Response; import org.apache.amber.oauth2.as.issuer.MD5Generator; +import org.apache.amber.oauth2.as.issuer.OAuthIssuerImpl; import org.apache.amber.oauth2.as.request.OAuthAuthzRequest; import org.apache.amber.oauth2.as.response.OAuthASResponse; +import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.types.ResponseType; import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.as.issuer.OAuthIssuerImpl; -import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.message.OAuthResponse; +import org.apache.amber.oauth2.common.message.types.ResponseType; +import org.apache.amber.oauth2.common.utils.OAuthUtils; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java index f05958f9..65bab426 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java @@ -63,17 +63,14 @@ public Response authorize(@Context HttpServletRequest request) throws OAuthSyste try { oauthRequest = new OAuthTokenRequest(request); - + //check if clientid is valid - if (!GrantType.ASSERTION.toString().equals(oauthRequest.getGrantType())) { - if (!Common.CLIENT_ID.equals(oauthRequest.getParam(OAuth.OAUTH_CLIENT_ID))) { - OAuthResponse response = OAuthASResponse - .errorResponse(HttpServletResponse.SC_BAD_REQUEST) - .setError(OAuthError.TokenResponse.INVALID_CLIENT) - .setErrorDescription("client_id not found") + if (!Common.CLIENT_ID.equals(oauthRequest.getParam(OAuth.OAUTH_CLIENT_ID))) { + OAuthResponse response = + OAuthASResponse.errorResponse(HttpServletResponse.SC_BAD_REQUEST) + .setError(OAuthError.TokenResponse.INVALID_CLIENT).setErrorDescription("client_id not found") .buildJSONMessage(); - return Response.status(response.getResponseStatus()).entity(response.getBody()).build(); - } + return Response.status(response.getResponseStatus()).entity(response.getBody()).build(); } //do checking for different grant types @@ -98,17 +95,6 @@ public Response authorize(@Context HttpServletRequest request) throws OAuthSyste .buildJSONMessage(); return Response.status(response.getResponseStatus()).entity(response.getBody()).build(); } - } else if (oauthRequest.getParam(OAuth.OAUTH_GRANT_TYPE) - .equals(GrantType.ASSERTION.toString())) { - if (!Common.ASSERTION.equals(oauthRequest.getAssertion())) { - OAuthResponse response = OAuthASResponse - .errorResponse(HttpServletResponse.SC_BAD_REQUEST) - .setError(OAuthError.TokenResponse.INVALID_GRANT) - .setErrorDescription("invalid assertion") - .buildJSONMessage(); - return Response.status(response.getResponseStatus()).entity(response.getBody()).build(); - } - } else if (oauthRequest.getParam(OAuth.OAUTH_GRANT_TYPE) .equals(GrantType.REFRESH_TOKEN.toString())) { OAuthResponse response = OAuthASResponse diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java index e07a6838..b876e55c 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java @@ -34,7 +34,11 @@ public class QueryTokenExtractor implements TokenExtractor { @Override public String getAccessToken(HttpServletRequest request) { - return request.getParameter(OAuth.OAUTH_TOKEN); + String token = request.getParameter(OAuth.OAUTH_TOKEN); + if (token == null) { + token = request.getParameter(OAuth.OAUTH_BEARER_TOKEN); + } + return token; } @Override diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java index 608b30c8..a7abc715 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java @@ -21,19 +21,18 @@ package org.apache.amber.oauth2.rs.extractor; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import javax.servlet.http.HttpServletRequest; import junit.framework.Assert; import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.rs.extractor.QueryTokenExtractor; import org.junit.Test; -import static org.easymock.EasyMock.createStrictMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; - /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -59,6 +58,7 @@ public void testGetAccessTokenNull() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn(null); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); replay(request); QueryTokenExtractor qte = new QueryTokenExtractor(); Assert.assertNull(qte.getAccessToken(request)); From c8fdabdd2ea8bee854a8cd02569e1c5158112bd6 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Thu, 26 Jan 2012 16:27:04 +0000 Subject: [PATCH 069/583] AMBER-47 : Update OAuthError class using the error code as for version 22 of the spec git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1236276 13f79535-47bb-0310-9956-ffa450edef68 --- .../amber/oauth2/common/error/OAuthError.java | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java index 779bd290..fd0bf390 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java @@ -39,15 +39,12 @@ public static final class CodeResponse { unsupported parameter value, or is otherwise malformed. */ public static final String INVALID_REQUEST = "invalid_request"; - - public static final String INVALID_CLIENT = "invalid_client"; - + /** * The client is not authorized to request an authorization code using this method. */ public static final String UNAUTHORIZED_CLIENT = "unauthorized_client"; - public static final String REDIRECT_URI_MISMATCH = "redirect_uri_mismatch"; /** * The resource owner or authorization server denied the @@ -89,7 +86,6 @@ public static final class TokenResponse { mechanism for authenticating the client, or is otherwise malformed. */ - public static final String INVALID_REQUEST = "invalid_request"; /** Client authentication failed (e.g. unknown client, no @@ -129,15 +125,32 @@ The provided authorization grant (e.g. authorization /** * The requested scope is invalid, unknown, malformed, or exceeds the scope granted by the resource owner. */ - public static final String INVALID_SCOPE = "invalid_scope"; - public static final String REDIRECT_URI_MISMATCH = "redirect_uri_mismatch"; } public static final class ResourceResponse { + /** + The request is missing a required parameter, includes an + unsupported parameter value, repeats a parameter, + includes multiple credentials, utilizes more than one + mechanism for authenticating the client, or is otherwise + malformed. + */ public static final String INVALID_REQUEST = "invalid_request"; + + public static final String EXPIRED_TOKEN = "expired_token"; + + /** + * The request requires higher privileges than provided by the + * access token. + */ public static final String INSUFFICIENT_SCOPE = "insufficient_scope"; + + /** + * The access token provided is expired, revoked, malformed, or + * invalid for other reasons. + */ public static final String INVALID_TOKEN = "invalid_token"; } From f5880e1df352ab15724b51cda6b16a636f726640 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Mon, 30 Jan 2012 13:37:51 +0000 Subject: [PATCH 070/583] AMBER-37 : Specify the CI url inside the Maven POM git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1237650 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1b542ea2..949dd8e3 100644 --- a/pom.xml +++ b/pom.xml @@ -226,7 +226,12 @@ http://mail-archives.apache.org/mod_mbox/incubator-amber-commits/ - + + + Jenkins + https://builds.apache.org/job/Amber/ + + spec-api signature-api From bb0e0f3867e5e77d6d721b1e456062fded694178 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Mon, 30 Jan 2012 13:55:06 +0000 Subject: [PATCH 071/583] AMBER-37 : Specify the CI url inside the Maven POM (revised) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1237654 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 949dd8e3..9ba8a3cf 100644 --- a/pom.xml +++ b/pom.xml @@ -226,12 +226,7 @@ http://mail-archives.apache.org/mod_mbox/incubator-amber-commits/ - - - Jenkins - https://builds.apache.org/job/Amber/ - - + spec-api signature-api @@ -249,6 +244,10 @@ JIRA https://issues.apache.org/jira/browse/AMBER + + Jenkins + https://builds.apache.org/job/Amber/ + amber.website From 51e78ba2309ad9683c6baa6ef9fff81153d5d37a Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Mon, 30 Jan 2012 14:07:13 +0000 Subject: [PATCH 072/583] AMBER-37 : Specify the CI url inside the Maven POM (added notifiers) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1237663 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 9ba8a3cf..5cab483f 100644 --- a/pom.xml +++ b/pom.xml @@ -247,6 +247,16 @@ Jenkins https://builds.apache.org/job/Amber/ + + + mail + true + true + false + false +
amber-dev@incubator.apache.org
 + + From c76ce784940ad56fe6fc69253d3e003c40b73ead Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Mon, 30 Jan 2012 14:11:01 +0000 Subject: [PATCH 073/583] AMBER-45 : Authorization Response needs to be updated to latest spec git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1237665 13f79535-47bb-0310-9956-ffa450edef68 --- .../oauth2/as/response/OAuthASResponse.java | 15 +++++--- .../as/response/OAuthASResponseTest.java | 34 +++++++++++++++++-- .../integration/endpoints/AuthzEndpoint.java | 2 +- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java index c80aa81b..31cd2ea4 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java @@ -22,6 +22,8 @@ package org.apache.amber.oauth2.as.response; +import javax.servlet.http.HttpServletRequest; + import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.message.OAuthResponse; @@ -36,8 +38,8 @@ protected OAuthASResponse(String uri, int responseStatus) { super(uri, responseStatus); } - public static OAuthAuthorizationResponseBuilder authorizationResponse(int code) { - return new OAuthAuthorizationResponseBuilder(code); + public static OAuthAuthorizationResponseBuilder authorizationResponse(HttpServletRequest request,int code) { + return new OAuthAuthorizationResponseBuilder(request,code); } public static OAuthTokenResponseBuilder tokenResponse(int code) { @@ -46,11 +48,16 @@ public static OAuthTokenResponseBuilder tokenResponse(int code) { public static class OAuthAuthorizationResponseBuilder extends OAuthResponseBuilder { - public OAuthAuthorizationResponseBuilder(int responseCode) { + public OAuthAuthorizationResponseBuilder(HttpServletRequest request,int responseCode) { super(responseCode); + //AMBER-45 + String state=request.getParameter(OAuth.OAUTH_STATE); + if (state!=null){ + this.setState(state); + } } - public OAuthAuthorizationResponseBuilder setState(String state) { + OAuthAuthorizationResponseBuilder setState(String state) { this.parameters.put(OAuth.OAUTH_STATE, state); return this; } diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java index 9681ab6e..b33fdeda 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java @@ -21,6 +21,12 @@ package org.apache.amber.oauth2.as.response; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; + +import javax.servlet.http.HttpServletRequest; + import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; @@ -37,7 +43,8 @@ public class OAuthASResponseTest { @Test public void testAuthzResponse() throws Exception { - OAuthResponse oAuthResponse = OAuthASResponse.authorizationResponse(200) + HttpServletRequest request = createMock(HttpServletRequest.class); + OAuthResponse oAuthResponse = OAuthASResponse.authorizationResponse(request,200) .location("http://www.example.com") .setCode("code") .setAccessToken("access_111") @@ -47,13 +54,35 @@ public void testAuthzResponse() throws Exception { .buildQueryMessage(); String url = oAuthResponse.getLocationUri(); + + Assert.assertEquals("http://www.example.com?testValue=value2&code=code" + + "#access_token=access_111&state=ok&expires_in=400", url); + Assert.assertEquals(200, oAuthResponse.getResponseStatus()); + + } + + @Test + public void testAuthzResponseWithState() throws Exception { + HttpServletRequest request = createMock(HttpServletRequest.class); + expect(request.getParameter(OAuth.OAUTH_STATE)).andStubReturn("ok"); + replay(request); + OAuthResponse oAuthResponse = OAuthASResponse.authorizationResponse(request,200) + .location("http://www.example.com") + .setCode("code") + .setAccessToken("access_111") + .setExpiresIn("400") + .setParam("testValue", "value2") + .buildQueryMessage(); + String url = oAuthResponse.getLocationUri(); + Assert.assertEquals("http://www.example.com?testValue=value2&code=code" + "#access_token=access_111&state=ok&expires_in=400", url); Assert.assertEquals(200, oAuthResponse.getResponseStatus()); } + @Test public void testTokenResponse() throws Exception { @@ -125,7 +154,8 @@ public void testErrorResponse2() throws Exception { @Test public void testHeaderResponse() throws Exception { - OAuthResponse oAuthResponse = OAuthASResponse.authorizationResponse(400).setCode("oauth_code") + HttpServletRequest request = createMock(HttpServletRequest.class); + OAuthResponse oAuthResponse = OAuthASResponse.authorizationResponse(request,400).setCode("oauth_code") .setState("state_ok") .buildHeaderMessage(); diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java index 120b70a2..170a28c1 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java @@ -66,7 +66,7 @@ public Response authorize(@Context HttpServletRequest request) String responseType = oauthRequest.getParam(OAuth.OAUTH_RESPONSE_TYPE); OAuthASResponse.OAuthAuthorizationResponseBuilder builder = OAuthASResponse - .authorizationResponse(HttpServletResponse.SC_FOUND); + .authorizationResponse(request,HttpServletResponse.SC_FOUND); if (responseType.equals(ResponseType.CODE.toString())) { builder.setCode(oauthIssuerImpl.authorizationCode()); From de2d37f93c6c71a91d9a933973d175a094ba9c03 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Sun, 12 Feb 2012 22:21:11 +0000 Subject: [PATCH 074/583] plugged not-yet-commons-ssl to resolve Rsa signature issue looks like pem resources in test are not valid PKCS8 nor OpenSSL keys git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1243343 13f79535-47bb-0310-9956-ffa450edef68 --- signature-api/pom.xml | 36 ++---- .../amber/signature/AbstractMethod.java | 2 +- .../signature/rsa/AbstractRsaSha1Key.java | 37 ++++-- .../amber/signature/rsa/RsaSha1Method.java | 8 +- ...SigningKey.java => RsaSha1SigningKey.java} | 30 ++--- ...fyingKey.java => RsaSha1VerifyingKey.java} | 31 ++--- .../src/main/javacc/PemCertificateParser.jj | 122 ------------------ .../signature/rsa/RsaSha1MethodTestCase.java | 12 +- 8 files changed, 65 insertions(+), 213 deletions(-) rename signature-api/src/main/java/org/apache/amber/signature/rsa/{PemRsaSha1SigningKey.java => RsaSha1SigningKey.java} (60%) rename signature-api/src/main/java/org/apache/amber/signature/rsa/{PemRsaSha1VerifyingKey.java => RsaSha1VerifyingKey.java} (59%) delete mode 100644 signature-api/src/main/javacc/PemCertificateParser.jj diff --git a/signature-api/pom.xml b/signature-api/pom.xml index beb1799e..911749ee 100644 --- a/signature-api/pom.xml +++ b/signature-api/pom.xml @@ -39,10 +39,16 @@ - commons-codec - commons-codec - 1.4 - compile + ca.juliusdavies + not-yet-commons-ssl + 0.3.11 + + + + commons-codec + commons-codec + 1.4 + compile @@ -71,26 +77,4 @@ - - - - org.codehaus.mojo - javacc-maven-plugin - 2.5 - - - javacc - - javacc - - - 2 - false - - - - - - - diff --git a/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java b/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java index 00b78c6b..a5cf1501 100644 --- a/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java +++ b/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java @@ -186,7 +186,7 @@ public final boolean verify(String signature, protected abstract boolean verify(String signature, VerifyingKey verifyingKey, String tokenSecret, String baseString) throws SignatureException; /** - * + * * * @param key * @throws SignatureException diff --git a/signature-api/src/main/java/org/apache/amber/signature/rsa/AbstractRsaSha1Key.java b/signature-api/src/main/java/org/apache/amber/signature/rsa/AbstractRsaSha1Key.java index 2608ede4..78f6ed2e 100644 --- a/signature-api/src/main/java/org/apache/amber/signature/rsa/AbstractRsaSha1Key.java +++ b/signature-api/src/main/java/org/apache/amber/signature/rsa/AbstractRsaSha1Key.java @@ -24,26 +24,29 @@ import java.net.URL; import java.net.URLConnection; +import org.apache.amber.signature.Key; import org.apache.amber.signature.SignatureException; +import org.apache.commons.ssl.PKCS8Key; /** * Abstract implementation of RSA-SHA1 key. * * @version $Id$ */ -abstract class AbstractRsaSha1Key implements org.apache.amber.signature.Key { +abstract class AbstractRsaSha1Key implements Key { private static final String[] METHODS = { "RSA-SHA1" }; - private final T rsaKey; + private final PKCS8Key rsaKey; /** * Loads a key from a certificate located in the classpath. * * @param certificateClasspathLocation + * @param the certificate password * @throws SignatureException */ - public AbstractRsaSha1Key(String certificateClasspathLocation) throws SignatureException { + public AbstractRsaSha1Key(String certificateClasspathLocation, String password) throws SignatureException { if (certificateClasspathLocation == null) { throw new SignatureException("parameter 'certificateClasspathLocation' must not be null"); } @@ -62,16 +65,17 @@ public AbstractRsaSha1Key(String certificateClasspathLocation) throws SignatureE + "' not found, please make sure it exists in the classpath"); } - this.rsaKey = this.readCertificate(certificateURL); + this.rsaKey = this.readCertificate(certificateURL, password); } /** * Loads a key from a certificate located in a file. * * @param certificateFileLocation + * @param the certificate password * @throws SignatureException */ - public AbstractRsaSha1Key(File certificateFileLocation) throws SignatureException { + public AbstractRsaSha1Key(File certificateFileLocation, String password) throws SignatureException { if (certificateFileLocation == null) { throw new SignatureException("parameter 'certificateFileLocation' must not be null"); } @@ -82,7 +86,7 @@ public AbstractRsaSha1Key(File certificateFileLocation) throws SignatureExceptio } try { - this.rsaKey = this.readCertificate(certificateFileLocation.toURI().toURL()); + this.rsaKey = this.readCertificate(certificateFileLocation.toURI().toURL(), password); } catch (MalformedURLException e) { throw new SignatureException("Impossible to read the certificate from '" + certificateFileLocation @@ -94,25 +98,32 @@ public AbstractRsaSha1Key(File certificateFileLocation) throws SignatureExceptio * Loads a key from a certificate located in an URL. * * @param certificateURL + * @param the certificate password * @throws SignatureException */ - public AbstractRsaSha1Key(URL certificateURL) throws SignatureException { + public AbstractRsaSha1Key(URL certificateURL, String password) throws SignatureException { if (certificateURL == null) { throw new SignatureException("parameter 'certificateURL' must not be null"); } - this.rsaKey = this.readCertificate(certificateURL); + this.rsaKey = this.readCertificate(certificateURL, password); } - private T readCertificate(URL certificateURL) throws SignatureException { + private PKCS8Key readCertificate(URL certificateURL, String password) throws SignatureException { URLConnection urlConnection = null; InputStream input = null; + if (password == null) { + password = ""; + } + + final char[] pwd = password.toCharArray(); + try { urlConnection = certificateURL.openConnection(); input = urlConnection.getInputStream(); - return this.readCertificate(input); + return new PKCS8Key(input, pwd); } catch (Exception e) { throw new SignatureException("Impossible to read the certificate from '" + certificateURL @@ -132,8 +143,8 @@ private T readCertificate(URL certificateURL) throws SignatureException { } } - public final T getRsaKey() { - return this.rsaKey; + protected PKCS8Key getRsaKey() { + return rsaKey; } @Override @@ -141,8 +152,6 @@ public final String getValue() { return String.valueOf(this.rsaKey); } - protected abstract T readCertificate(InputStream input) throws Exception; - /** * {@inheritDoc} */ diff --git a/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java index a6fd679d..ee7ab53b 100644 --- a/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java +++ b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java @@ -17,8 +17,6 @@ package org.apache.amber.signature.rsa; import java.security.Signature; -import java.security.interfaces.RSAPrivateKey; -import java.security.interfaces.RSAPublicKey; import org.apache.amber.signature.AbstractMethod; import org.apache.amber.signature.SignatureException; @@ -54,13 +52,12 @@ public String getAlgorithm() { * {@inheritDoc} */ @Override - @SuppressWarnings("unchecked") protected String calculate(SigningKey signingKey, String tokenSecret, String baseString) throws SignatureException { try { Signature signer = Signature.getInstance(RSA_SHA1_ALGORITHM); - signer.initSign(((AbstractRsaSha1Key) signingKey).getRsaKey()); + signer.initSign(((RsaSha1SigningKey) signingKey).getPrivateKey()); signer.update(toUTF8Bytes(baseString)); byte[] signature = signer.sign(); @@ -75,14 +72,13 @@ protected String calculate(SigningKey signingKey, * {@inheritDoc} */ @Override - @SuppressWarnings("unchecked") protected boolean verify(String signature, VerifyingKey verifyingKey, String tokenSecret, String baseString) throws SignatureException { try { Signature verifier = Signature.getInstance(RSA_SHA1_ALGORITHM); - verifier.initVerify(((AbstractRsaSha1Key) verifyingKey).getRsaKey()); + verifier.initVerify(((RsaSha1VerifyingKey) verifyingKey).getPublicKey()); verifier.update(toUTF8Bytes(baseString)); return verifier.verify(decodeBase64(signature)); diff --git a/signature-api/src/main/java/org/apache/amber/signature/rsa/PemRsaSha1SigningKey.java b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1SigningKey.java similarity index 60% rename from signature-api/src/main/java/org/apache/amber/signature/rsa/PemRsaSha1SigningKey.java rename to signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1SigningKey.java index a2136ca6..29870b60 100644 --- a/signature-api/src/main/java/org/apache/amber/signature/rsa/PemRsaSha1SigningKey.java +++ b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1SigningKey.java @@ -17,43 +17,37 @@ package org.apache.amber.signature.rsa; import java.io.File; -import java.io.InputStream; import java.net.URL; -import java.security.interfaces.RSAPrivateKey; +import java.security.PrivateKey; import org.apache.amber.signature.SignatureException; import org.apache.amber.signature.SigningKey; /** - * + * * * @version $Id$ */ -public final class PemRsaSha1SigningKey - extends AbstractRsaSha1Key +public final class RsaSha1SigningKey + extends AbstractRsaSha1Key implements SigningKey { - public PemRsaSha1SigningKey(File certificateFileLocation) + public RsaSha1SigningKey(File certificateFileLocation, String password) throws SignatureException { - super(certificateFileLocation); + super(certificateFileLocation, password); } - public PemRsaSha1SigningKey(String certificateClasspathLocation) + public RsaSha1SigningKey(String certificateClasspathLocation, String password) throws SignatureException { - super(certificateClasspathLocation); + super(certificateClasspathLocation, password); } - public PemRsaSha1SigningKey(URL certificateURL) throws SignatureException { - super(certificateURL); + public RsaSha1SigningKey(URL certificateURL, String password) throws SignatureException { + super(certificateURL, password); } - /** - * {@inheritDoc} - */ - @Override - protected RSAPrivateKey readCertificate(InputStream input) throws Exception { - PemCertificateParser pemCertificateParser = new PemCertificateParser(input); - return pemCertificateParser.parsePrivateKey(); + public PrivateKey getPrivateKey() { + return getRsaKey().getPrivateKey(); } } diff --git a/signature-api/src/main/java/org/apache/amber/signature/rsa/PemRsaSha1VerifyingKey.java b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1VerifyingKey.java similarity index 59% rename from signature-api/src/main/java/org/apache/amber/signature/rsa/PemRsaSha1VerifyingKey.java rename to signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1VerifyingKey.java index e180aca3..ff3c1ea8 100644 --- a/signature-api/src/main/java/org/apache/amber/signature/rsa/PemRsaSha1VerifyingKey.java +++ b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1VerifyingKey.java @@ -17,43 +17,38 @@ package org.apache.amber.signature.rsa; import java.io.File; -import java.io.InputStream; import java.net.URL; -import java.security.interfaces.RSAPublicKey; +import java.security.GeneralSecurityException; +import java.security.PublicKey; import org.apache.amber.signature.SignatureException; import org.apache.amber.signature.VerifyingKey; /** - * + * * * @version $Id$ */ -public final class PemRsaSha1VerifyingKey - extends AbstractRsaSha1Key +public final class RsaSha1VerifyingKey + extends AbstractRsaSha1Key implements VerifyingKey { - public PemRsaSha1VerifyingKey(File certificateFileLocation) + public RsaSha1VerifyingKey(File certificateFileLocation, String password) throws SignatureException { - super(certificateFileLocation); + super(certificateFileLocation, password); } - public PemRsaSha1VerifyingKey(String certificateClasspathLocation) + public RsaSha1VerifyingKey(String certificateClasspathLocation, String password) throws SignatureException { - super(certificateClasspathLocation); + super(certificateClasspathLocation, password); } - public PemRsaSha1VerifyingKey(URL certificateURL) throws SignatureException { - super(certificateURL); + public RsaSha1VerifyingKey(URL certificateURL, String password) throws SignatureException { + super(certificateURL, password); } - /** - * {@inheritDoc} - */ - @Override - protected RSAPublicKey readCertificate(InputStream input) throws Exception { - PemCertificateParser pemCertificateParser = new PemCertificateParser(input); - return pemCertificateParser.parsePublicCertificate(); + public PublicKey getPublicKey() throws GeneralSecurityException { + return getRsaKey().getPublicKey(); } } diff --git a/signature-api/src/main/javacc/PemCertificateParser.jj b/signature-api/src/main/javacc/PemCertificateParser.jj deleted file mode 100644 index a0072eae..00000000 --- a/signature-api/src/main/javacc/PemCertificateParser.jj +++ /dev/null @@ -1,122 +0,0 @@ -PARSER_BEGIN(PemCertificateParser) -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature.rsa; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.security.KeyFactory; -import java.security.interfaces.RSAPrivateKey; -import java.security.interfaces.RSAPublicKey; -import java.security.spec.PKCS8EncodedKeySpec; -import java.security.spec.X509EncodedKeySpec; - -import org.apache.commons.codec.binary.Base64OutputStream; - -/** - * PEM private/public certificates parser. - * - * @version $Id$ - */ -final class PemCertificateParser { - - private static final String RSA_NAME = "RSA"; - - private static KeyFactory getRsaKeyFactory() { - try { - return KeyFactory.getInstance(RSA_NAME); - } catch (Exception e) { - throw new RuntimeException("Impossible to instantiate the RSA KeyFactory", e); - } - } - - private final KeyFactory keyFactory = getRsaKeyFactory(); - - private final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - private final Base64OutputStream output = new Base64OutputStream(baos, false); - -} - -PARSER_END(PemCertificateParser) - -SKIP : { - <[" ","\t","\n","\r"]> -} - -TOKEN : { - - | - | - | - | Date: Sun, 12 Feb 2012 22:30:37 +0000 Subject: [PATCH 075/583] restrict using keys in different methods using generics git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1243347 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/amber/signature/AbstractMethod.java | 11 ++++++----- .../apache/amber/signature/hmac/HmacSha1Method.java | 2 +- .../amber/signature/plaintext/PlaintextMethod.java | 2 +- .../apache/amber/signature/rsa/RsaSha1Method.java | 12 +++++------- .../amber/signature/AbstractMethodTestCase.java | 4 ++-- .../org/apache/amber/signature/SignatureMethod.java | 6 +++--- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java b/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java index a5cf1501..109413ab 100644 --- a/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java +++ b/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java @@ -38,7 +38,8 @@ * * @version $Id$ */ -public abstract class AbstractMethod implements SignatureMethod { +public abstract class AbstractMethod + implements SignatureMethod { /** * HTTP protocol name. @@ -123,7 +124,7 @@ protected Log getLog() { /** * {@inheritDoc} */ - public final String calculate(SigningKey signingKey, + public final String calculate(SK signingKey, OAuthToken token, OAuthRequest request) throws SignatureException { if (signingKey == null) { @@ -148,13 +149,13 @@ public final String calculate(SigningKey signingKey, * @return the calculated signature. * @throws SignatureException if any error occurs. */ - protected abstract String calculate(SigningKey signingKey, String tokenSecret, String baseString) throws SignatureException; + protected abstract String calculate(SK signingKey, String tokenSecret, String baseString) throws SignatureException; /** * {@inheritDoc} */ public final boolean verify(String signature, - VerifyingKey verifyingKey, + VK verifyingKey, OAuthToken token, OAuthRequest request) throws SignatureException { if (signature == null) { @@ -183,7 +184,7 @@ public final boolean verify(String signature, * @return true if the signature is verified, false otherwise. * @throws SignatureException if any error occurs. */ - protected abstract boolean verify(String signature, VerifyingKey verifyingKey, String tokenSecret, String baseString) throws SignatureException; + protected abstract boolean verify(String signature, VK verifyingKey, String tokenSecret, String baseString) throws SignatureException; /** * diff --git a/signature-api/src/main/java/org/apache/amber/signature/hmac/HmacSha1Method.java b/signature-api/src/main/java/org/apache/amber/signature/hmac/HmacSha1Method.java index 457ef570..381ef071 100644 --- a/signature-api/src/main/java/org/apache/amber/signature/hmac/HmacSha1Method.java +++ b/signature-api/src/main/java/org/apache/amber/signature/hmac/HmacSha1Method.java @@ -32,7 +32,7 @@ * * @version $Id$ */ -public final class HmacSha1Method extends AbstractMethod { +public final class HmacSha1Method extends AbstractMethod { private static final String HMAC_SHA1 = "HMAC-SHA1"; diff --git a/signature-api/src/main/java/org/apache/amber/signature/plaintext/PlaintextMethod.java b/signature-api/src/main/java/org/apache/amber/signature/plaintext/PlaintextMethod.java index a7891e48..e4404a35 100644 --- a/signature-api/src/main/java/org/apache/amber/signature/plaintext/PlaintextMethod.java +++ b/signature-api/src/main/java/org/apache/amber/signature/plaintext/PlaintextMethod.java @@ -26,7 +26,7 @@ * * @version $Id$ */ -public final class PlaintextMethod extends AbstractMethod { +public final class PlaintextMethod extends AbstractMethod { private static final String PLAINTEXT = "PLAINTEXT"; diff --git a/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java index ee7ab53b..ccaa7927 100644 --- a/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java +++ b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java @@ -20,15 +20,13 @@ import org.apache.amber.signature.AbstractMethod; import org.apache.amber.signature.SignatureException; -import org.apache.amber.signature.SigningKey; -import org.apache.amber.signature.VerifyingKey; /** * RSA-SHA1 Method implementation. * * @version $Id$ */ -public final class RsaSha1Method extends AbstractMethod { +public final class RsaSha1Method extends AbstractMethod { /** * RSA+SHA1 algorithm name. @@ -52,12 +50,12 @@ public String getAlgorithm() { * {@inheritDoc} */ @Override - protected String calculate(SigningKey signingKey, + protected String calculate(RsaSha1SigningKey signingKey, String tokenSecret, String baseString) throws SignatureException { try { Signature signer = Signature.getInstance(RSA_SHA1_ALGORITHM); - signer.initSign(((RsaSha1SigningKey) signingKey).getPrivateKey()); + signer.initSign(signingKey.getPrivateKey()); signer.update(toUTF8Bytes(baseString)); byte[] signature = signer.sign(); @@ -73,12 +71,12 @@ protected String calculate(SigningKey signingKey, */ @Override protected boolean verify(String signature, - VerifyingKey verifyingKey, + RsaSha1VerifyingKey verifyingKey, String tokenSecret, String baseString) throws SignatureException { try { Signature verifier = Signature.getInstance(RSA_SHA1_ALGORITHM); - verifier.initVerify(((RsaSha1VerifyingKey) verifyingKey).getPublicKey()); + verifier.initVerify(verifyingKey.getPublicKey()); verifier.update(toUTF8Bytes(baseString)); return verifier.verify(decodeBase64(signature)); diff --git a/signature-api/src/test/java/org/apache/amber/signature/AbstractMethodTestCase.java b/signature-api/src/test/java/org/apache/amber/signature/AbstractMethodTestCase.java index 66bd40e2..6c1ac0df 100644 --- a/signature-api/src/test/java/org/apache/amber/signature/AbstractMethodTestCase.java +++ b/signature-api/src/test/java/org/apache/amber/signature/AbstractMethodTestCase.java @@ -35,8 +35,8 @@ */ public abstract class AbstractMethodTestCase { - protected void verifySignature(VerifyingKey verifyingKey, - SignatureMethod signatureMethod, + protected void verifySignature(VK verifyingKey, + SignatureMethod signatureMethod, String expectedSignature) throws Exception { OAuthRequest request = new FakeOAuthRequest(); request.setRequestURL(URI.create("http://photos.example.net/photos")); diff --git a/spec-api/src/main/java/org/apache/amber/signature/SignatureMethod.java b/spec-api/src/main/java/org/apache/amber/signature/SignatureMethod.java index 1b9bc9e0..b9b4d69d 100644 --- a/spec-api/src/main/java/org/apache/amber/signature/SignatureMethod.java +++ b/spec-api/src/main/java/org/apache/amber/signature/SignatureMethod.java @@ -24,7 +24,7 @@ * * @version $Id$ */ -public interface SignatureMethod { +public interface SignatureMethod { /** * Returns the signing algorithm method. @@ -43,7 +43,7 @@ public interface SignatureMethod { * @return the calculated signature. * @throws SignatureException if any error occurs. */ - String calculate(SigningKey signingKey, + String calculate(SK signingKey, OAuthToken token, OAuthRequest request) throws SignatureException; @@ -59,7 +59,7 @@ String calculate(SigningKey signingKey, * @throws SignatureException if any error occurs. */ boolean verify(String signature, - VerifyingKey verifyingKey, + VK verifyingKey, OAuthToken token, OAuthRequest request) throws SignatureException; From bb5c0709c36748fadba85db3982e2088a97c0d58 Mon Sep 17 00:00:00 2001 From: Zhaohui Feng Date: Mon, 13 Feb 2012 19:51:49 +0000 Subject: [PATCH 076/583] Configure the maven eclipse and war plugin so that we can run "mvn eclipse:eclipse" git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1243669 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index 5cab483f..407e64e3 100644 --- a/pom.xml +++ b/pom.xml @@ -337,6 +337,18 @@ 2.8 + + org.apache.maven.plugins + maven-eclipse-plugin + 2.8 + + + + org.apache.maven.plugins + maven-war-plugin + 2.2 + + maven-clean-plugin 2.4.1 From c719a765d43dc1f66fd709e31a783a38b3dc16ac Mon Sep 17 00:00:00 2001 From: Lukasz Moren Date: Mon, 13 Feb 2012 20:24:15 +0000 Subject: [PATCH 077/583] AMBER-28 OAuthAccessResourceRequest and extractors using old version of spec to find access token git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1243677 13f79535-47bb-0310-9956-ffa450edef68 --- .../rs/extractor/BodyTokenExtractor.java | 6 +- .../rs/extractor/QueryTokenExtractor.java | 4 +- .../rs/validator/BodyOAuthValidator.java | 9 ++- .../rs/validator/QueryOAuthValidator.java | 10 ++- .../rs/OAuthAccessResourceRequestTest.java | 70 ++++++++++--------- .../rs/extractor/BodyTokenExtractorTest.java | 16 ++--- .../rs/extractor/QueryTokenExtractorTest.java | 2 +- .../rs/validator/BodyOAuthValidatorTest.java | 18 ++--- .../rs/validator/QueryOAuthValidatorTest.java | 20 +++--- 9 files changed, 84 insertions(+), 71 deletions(-) diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java index 69dda078..3d4e4387 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java @@ -35,7 +35,11 @@ public class BodyTokenExtractor implements TokenExtractor { @Override public String getAccessToken(HttpServletRequest request) { - return request.getParameter(OAuth.OAUTH_TOKEN); + String token = request.getParameter(OAuth.OAUTH_BEARER_TOKEN); + if (token == null) { + token = request.getParameter(OAuth.OAUTH_TOKEN); + } + return token; } @Override diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java index b876e55c..50025471 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java @@ -34,9 +34,9 @@ public class QueryTokenExtractor implements TokenExtractor { @Override public String getAccessToken(HttpServletRequest request) { - String token = request.getParameter(OAuth.OAUTH_TOKEN); + String token = request.getParameter(OAuth.OAUTH_BEARER_TOKEN); if (token == null) { - token = request.getParameter(OAuth.OAUTH_BEARER_TOKEN); + token = request.getParameter(OAuth.OAUTH_TOKEN); } return token; } diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidator.java index 023b59d3..92892ae9 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidator.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidator.java @@ -23,11 +23,11 @@ import javax.servlet.http.HttpServletRequest; +import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.utils.OAuthUtils; import org.apache.amber.oauth2.common.validators.AbstractValidator; -import org.apache.amber.oauth2.common.OAuth; /** @@ -68,9 +68,12 @@ public void validateRequiredParameters(HttpServletRequest request) throws OAuthP } - String[] tokens = request.getParameterValues(OAuth.OAUTH_TOKEN); + String[] tokens = request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN); if (OAuthUtils.hasEmptyValues(tokens)) { - throw OAuthProblemException.error(null, "Missing OAuth token."); + tokens = request.getParameterValues(OAuth.OAUTH_TOKEN); + if (OAuthUtils.hasEmptyValues(tokens)) { + throw OAuthProblemException.error(null, "Missing OAuth token."); + } } if (tokens.length > 1) { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java index 38d82833..2fea5921 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java @@ -24,8 +24,8 @@ import javax.servlet.http.HttpServletRequest; import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.utils.OAuthUtils; import org.apache.amber.oauth2.common.validators.AbstractValidator; @@ -49,10 +49,14 @@ public void validateMethod(HttpServletRequest request) throws OAuthProblemExcept public void validateRequiredParameters(HttpServletRequest request) throws OAuthProblemException { - String[] tokens = request.getParameterValues(OAuth.OAUTH_TOKEN); + String[] tokens = request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN); if (OAuthUtils.hasEmptyValues(tokens)) { - throw OAuthProblemException.error("", "Missing OAuth token."); + tokens = request.getParameterValues(OAuth.OAUTH_TOKEN); + if (OAuthUtils.hasEmptyValues(tokens)) { + throw OAuthProblemException.error(null, "Missing OAuth token."); + } } + if (tokens != null && tokens.length > 1) { throw OAuthProblemException .error(OAuthError.TokenResponse.INVALID_REQUEST, "Multiple tokens attached."); diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java index 2442437f..84b801e9 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java @@ -21,22 +21,18 @@ package org.apache.amber.oauth2.rs; +import static org.easymock.EasyMock.*; +import static org.junit.Assert.fail; + import javax.servlet.http.HttpServletRequest; import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.message.types.ParameterStyle; import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.error.OAuthError; - -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.reset; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.fail; /** @@ -152,7 +148,7 @@ public void testCreateBodyWrongMethod() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"sometoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); @@ -173,7 +169,7 @@ public void testCreateBodyInvalidEncoding() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.JSON); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"sometoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); try { @@ -193,7 +189,7 @@ public void testCreateBodyWrongOAuthVersion() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"sometoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn("HMAC-SHA1"); replay(request); try { @@ -215,7 +211,7 @@ public void testCreateBodyHeaderMixedTokens() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"sometoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)) .andStubReturn("OAuth sadfasfd,oauth_signature_method=\"HMAC-SHA1\""); @@ -238,6 +234,7 @@ public void testCreateBodyNoToken() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); @@ -257,7 +254,7 @@ public void testCreateBodyMultipleTokens() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {"sometoken", "othertoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); @@ -279,7 +276,7 @@ public void testCreateBodyValidRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"sometoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); @@ -297,6 +294,7 @@ public void testCreateQueryNoToken() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); @@ -316,7 +314,7 @@ public void testCreateQueryWrongVersion() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"sometoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn("HMAC-SHA1"); replay(request); @@ -336,7 +334,7 @@ public void testCreateQueryMultipleTokens() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {"sometoken", "othertoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); @@ -357,7 +355,7 @@ public void testCreateQueryValidRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"sometoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); @@ -373,9 +371,10 @@ public void testCreateQueryValidRequest() throws Exception { @Test public void testGetAccessTokenWrongQueryRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn(null); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); + expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {null}); replay(request); @@ -392,10 +391,10 @@ public void testGetAccessTokenWrongQueryRequest() throws Exception { @Test public void testGetAccessTokenWrongHeaderRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn(null); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getHeader("Authorization")).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {null}); replay(request); @@ -412,13 +411,14 @@ public void testGetAccessTokenWrongHeaderRequest() throws Exception { @Test public void testGetAccessTokenWrongBodyRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn(null); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {null}); - + expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + .andStubReturn(new String[] {null}); replay(request); try { @@ -435,11 +435,11 @@ public void testGetAccessCorrectRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); //test body - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn("sometoken"); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {"sometoken"}); replay(request); @@ -455,10 +455,10 @@ public void testGetAccessCorrectRequest() throws Exception { reset(request); //test header - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn("sometoken"); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getHeader("Authorization")).andStubReturn(AUTHORIZATION_HEADER_OAUTH2); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {"sometoken"}); replay(request); @@ -473,9 +473,9 @@ public void testGetAccessCorrectRequest() throws Exception { reset(request); //test uri query - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn("sometoken"); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {"sometoken"}); replay(request); @@ -488,12 +488,14 @@ public void testGetAccessCorrectRequest() throws Exception { @Test public void testMultipleStylesValidRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn(null); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {null}); + expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + .andStubReturn(new String[] {null}); expect(request.getHeader("Authorization")).andStubReturn(AUTHORIZATION_HEADER_OAUTH2); replay(request); @@ -510,11 +512,11 @@ public void testMultipleStylesValidRequest() throws Exception { @Test public void testMultipleStylesInvalidRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn("sometoken"); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {"sometoken"}); expect(request.getHeader("Authorization")).andStubReturn(AUTHORIZATION_HEADER_OAUTH2); diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java index a2b762dc..c463a1c6 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java @@ -21,18 +21,17 @@ package org.apache.amber.oauth2.rs.extractor; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import javax.servlet.http.HttpServletRequest; import junit.framework.Assert; -import org.apache.amber.oauth2.rs.extractor.BodyTokenExtractor; -import org.junit.Test; import org.apache.amber.oauth2.common.OAuth; - -import static org.easymock.EasyMock.createStrictMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import org.junit.Test; /** @@ -46,7 +45,7 @@ public class BodyTokenExtractorTest { public void testGetAccessToken() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn("sometoken"); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); replay(request); BodyTokenExtractor bte = new BodyTokenExtractor(); Assert.assertEquals("sometoken", bte.getAccessToken(request)); @@ -57,6 +56,7 @@ public void testGetAccessToken() throws Exception { public void testGetAccessTokenNull() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn(null); replay(request); BodyTokenExtractor bte = new BodyTokenExtractor(); diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java index a7abc715..2c292fe6 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java @@ -45,7 +45,7 @@ public class QueryTokenExtractorTest { public void testGetAccessToken() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn("sometoken"); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); replay(request); QueryTokenExtractor qte = new QueryTokenExtractor(); Assert.assertEquals("sometoken", qte.getAccessToken(request)); diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java index c6ba8f4f..5e4e94f1 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java @@ -21,6 +21,11 @@ package org.apache.amber.oauth2.rs.validator; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import javax.servlet.http.HttpServletRequest; import junit.framework.Assert; @@ -28,14 +33,8 @@ import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.rs.validator.BodyOAuthValidator; import org.junit.Test; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; - /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) @@ -101,7 +100,7 @@ public void tesValidateInvalidOAuthVersion() throws Exception { expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn("HMAC-SHA1"); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"access_token"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token"}); replay(request); try { BodyOAuthValidator bov = new BodyOAuthValidator(); @@ -120,6 +119,7 @@ public void tesValidateTokenMissing() throws Exception { expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); replay(request); try { @@ -139,7 +139,7 @@ public void tesValidateMultipleTokens() throws Exception { expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {"access_token1", "access_token2"}); replay(request); try { @@ -159,7 +159,7 @@ public void tesValidateValidMessage() throws Exception { expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"access_token"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token"}); replay(request); BodyOAuthValidator bov = new BodyOAuthValidator(); bov.performAllValidations(request); diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java index de57853d..2ccdc140 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java @@ -21,6 +21,11 @@ package org.apache.amber.oauth2.rs.validator; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + import javax.servlet.http.HttpServletRequest; import junit.framework.Assert; @@ -28,14 +33,8 @@ import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.rs.validator.QueryOAuthValidator; -import org.junit.Test; import org.apache.amber.oauth2.common.utils.OAuthUtils; - -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; +import org.junit.Test; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -50,7 +49,7 @@ public void testValidateWrongVersion() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn("HMAC-SHA1"); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"access_token"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token"}); replay(request); try { QueryOAuthValidator qov = new QueryOAuthValidator(); @@ -69,6 +68,7 @@ public void testValidateNoQuery() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); replay(request); try { @@ -88,7 +88,7 @@ public void testValidateMultipleTokens() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) .andStubReturn(new String[] {"access_token1", "access_token2"}); replay(request); try { @@ -108,7 +108,7 @@ public void testValidateToken() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {"access_token1"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token1"}); replay(request); QueryOAuthValidator qov = new QueryOAuthValidator(); qov.performAllValidations(request); From db87fa96db1fbc2d1143d3ab03937b15d6f68218 Mon Sep 17 00:00:00 2001 From: Lukasz Moren Date: Mon, 13 Feb 2012 20:46:51 +0000 Subject: [PATCH 078/583] AMBER-29 OAUTH_HEADER_NAME needs to be updated to latest spec git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1243684 13f79535-47bb-0310-9956-ffa450edef68 --- .../oauth2/as/response/OAuthASResponseTest.java | 4 ++-- .../java/org/apache/amber/oauth2/common/OAuth.java | 4 ++-- .../apache/amber/oauth2/common/utils/OAuthUtils.java | 2 +- .../apache/amber/oauth2/common/OAuthUtilsTest.java | 2 +- .../org/apache/amber/oauth2/integration/Common.java | 12 ++++++------ .../amber/oauth2/integration/ResourceTest.java | 10 +++++----- .../oauth2/rs/OAuthAccessResourceRequestTest.java | 10 +++++----- .../rs/extractor/HeaderTokenExtractorTest.java | 2 +- .../rs/validator/HeaderOAuthValidatorTest.java | 6 +++--- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java index b33fdeda..484500ee 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java @@ -160,10 +160,10 @@ public void testHeaderResponse() throws Exception { .buildHeaderMessage(); String header = oAuthResponse.getHeader(OAuth.HeaderType.WWW_AUTHENTICATE); - Assert.assertEquals("OAuth state=\"state_ok\",code=\"oauth_code\"", header); + Assert.assertEquals("Bearer state=\"state_ok\",code=\"oauth_code\"", header); header = oAuthResponse.getHeaders().get(OAuth.HeaderType.WWW_AUTHENTICATE); - Assert.assertEquals("OAuth state=\"state_ok\",code=\"oauth_code\"", header); + Assert.assertEquals("Bearer state=\"state_ok\",code=\"oauth_code\"", header); } } diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java index 3da23ba2..af8bc857 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java @@ -64,7 +64,7 @@ public static final class ContentType { public static final String OAUTH_STATE = "state"; public static final String OAUTH_GRANT_TYPE = "grant_type"; - public static final String OAUTH_HEADER_NAME = "OAuth"; + public static final String OAUTH_HEADER_NAME = "Bearer"; //Authorization response params public static final String OAUTH_CODE = "code"; @@ -74,7 +74,7 @@ public static final class ContentType { public static final String OAUTH_TOKEN_TYPE = "token_type"; - public static final String OAUTH_TOKEN = "oauth_token"; + public static final String OAUTH_TOKEN = "access_token"; public static final String OAUTH_TOKEN_DRAFT_0 = "access_token"; public static final String OAUTH_BEARER_TOKEN = "access_token"; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java index d8e097d9..45aa1bbc 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java @@ -63,7 +63,7 @@ public final class OAuthUtils { private static final String PARAMETER_SEPARATOR = "&"; private static final String NAME_VALUE_SEPARATOR = "="; - public static final String AUTH_SCHEME = "OAuth"; + public static final String AUTH_SCHEME = OAuth.OAUTH_HEADER_NAME; private static final Pattern OAUTH_HEADER = Pattern.compile("\\s*(\\w*)\\s+(.*)"); private static final Pattern NVP = Pattern.compile("(\\S*)\\s*\\=\\s*\"([^\"]*)\""); diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java index 9ff8c89b..16ac48c1 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java @@ -71,7 +71,7 @@ public void testEncodeOAuthHeader() throws Exception { entries.put("error", "invalid_token"); String header = OAuthUtils.encodeOAuthHeader(entries); - assertEquals("OAuth error=\"invalid_token\",realm=\"Some Example Realm\"", header); + assertEquals("Bearer error=\"invalid_token\",realm=\"Some Example Realm\"", header); } } diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java index 03885b3e..0b9cd0f1 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java @@ -48,15 +48,15 @@ private Common() { public static final String OAUTH_VERSION_2_INSUFFICIENT = ACCESS_TOKEN_INSUFFICIENT; public static final String OAUTH_URL_ENCODED_VERSION_1 = OAUTH_VERSION_1; - public static final String OAUTH_URL_ENCODED_VERSION_2 = "oauth_token=" + OAUTH_VERSION_2; - public static final String OAUTH_URL_ENCODED_VERSION_2_EXPIRED = "oauth_token=" + OAUTH_VERSION_2_EXPIRED; - public static final String OAUTH_URL_ENCODED_VERSION_2_INSUFFICIENT = "oauth_token=" + public static final String OAUTH_URL_ENCODED_VERSION_2 = "access_token=" + OAUTH_VERSION_2; + public static final String OAUTH_URL_ENCODED_VERSION_2_EXPIRED = "access_token=" + OAUTH_VERSION_2_EXPIRED; + public static final String OAUTH_URL_ENCODED_VERSION_2_INSUFFICIENT = "access_token=" + OAUTH_VERSION_2_INSUFFICIENT; public static final String AUTHORIZATION_HEADER_OAUTH1 = "OAuth " + OAUTH_VERSION_1; - public static final String AUTHORIZATION_HEADER_OAUTH2 = "OAuth " + OAUTH_VERSION_2; - public static final String AUTHORIZATION_HEADER_OAUTH2_EXPIRED = "OAuth " + OAUTH_VERSION_2_EXPIRED; - public static final String AUTHORIZATION_HEADER_OAUTH2_INSUFFICIENT = "OAuth " + public static final String AUTHORIZATION_HEADER_OAUTH2 = "Bearer " + OAUTH_VERSION_2; + public static final String AUTHORIZATION_HEADER_OAUTH2_EXPIRED = "Bearer " + OAUTH_VERSION_2_EXPIRED; + public static final String AUTHORIZATION_HEADER_OAUTH2_INSUFFICIENT = "Bearer " + OAUTH_VERSION_2_INSUFFICIENT; public static final String BODY_OAUTH1 = OAUTH_URL_ENCODED_VERSION_1; diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java index 73e04c73..70921b66 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java @@ -80,10 +80,10 @@ public void testResourceAccessBodyInvalidToken() throws Exception { httpURLConnection.setAllowUserInteraction(false); httpURLConnection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); httpURLConnection.setRequestProperty("Content-Length", - Integer.toString("oauth_token=randominvalidtoken".length())); + Integer.toString("access_token=randominvalidtoken".length())); OutputStream ost = httpURLConnection.getOutputStream(); PrintWriter pw = new PrintWriter(ost); - pw.print("oauth_token=randominvalidtoken"); + pw.print("access_token=randominvalidtoken"); pw.flush(); pw.close(); @@ -123,10 +123,10 @@ public void testResourceAccessBodyOAuthWrongVersionToken() throws Exception { httpURLConnection.setAllowUserInteraction(false); httpURLConnection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); httpURLConnection.setRequestProperty("Content-Length", - Integer.toString("oauth_token=randominvalidtoken&oauth_signature_method=HMAC-SHA1".length())); + Integer.toString("access_token=randominvalidtoken&oauth_signature_method=HMAC-SHA1".length())); OutputStream ost = httpURLConnection.getOutputStream(); PrintWriter pw = new PrintWriter(ost); - pw.print("oauth_token=randominvalidtoken&oauth_signature_method=HMAC-SHA1"); + pw.print("access_token=randominvalidtoken&oauth_signature_method=HMAC-SHA1"); pw.flush(); pw.close(); @@ -215,7 +215,7 @@ public void testResourceAccessQueryValidToken() throws Exception { public void testResourceAccessQueryInvalidToken() throws Exception { URL url = new URL(Common.RESOURCE_SERVER + Common.PROTECTED_RESOURCE_QUERY + "?" - + "oauth_token=randominvalidtoken"); + + "access_token=randominvalidtoken"); URLConnection c = url.openConnection(); if (c instanceof HttpURLConnection) { diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java index 84b801e9..91399d85 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java @@ -41,7 +41,7 @@ */ public class OAuthAccessResourceRequestTest { - public static final String AUTHORIZATION_HEADER_OAUTH2 = "OAuth sometoken"; + public static final String AUTHORIZATION_HEADER_OAUTH2 = "Bearer sometoken"; @Test public void testCreateNoHeaderRequest() throws Exception { @@ -89,7 +89,7 @@ public void testCreateHeaderMissingFieldRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.JSON); - expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("OAuth "); + expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("Bearer "); replay(request); try { @@ -110,7 +110,7 @@ public void testCreateHeaderWrongVersionRequest() throws Exception { expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.JSON); expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)) - .andStubReturn("OAuth sadfasfd,oauth_signature_method=\"HMAC-SHA1\""); + .andStubReturn("Bearer sadfasfd,oauth_signature_method=\"HMAC-SHA1\""); replay(request); try { @@ -131,7 +131,7 @@ public void testCreateValidHeaderRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.JSON); - expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("OAuth token"); + expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("Bearer token"); replay(request); try { new OAuthAccessResourceRequest(request); @@ -214,7 +214,7 @@ public void testCreateBodyHeaderMixedTokens() throws Exception { expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)) - .andStubReturn("OAuth sadfasfd,oauth_signature_method=\"HMAC-SHA1\""); + .andStubReturn("Bearer sadfasfd,oauth_signature_method=\"HMAC-SHA1\""); replay(request); try { diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java index 49763fb6..3adbd0e2 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java @@ -46,7 +46,7 @@ public class HeaderTokenExtractorTest { public void testGetAccessToken() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); - expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("OAuth sometoken"); + expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("Bearer sometoken"); replay(request); HeaderTokenExtractor hte = new HeaderTokenExtractor(); Assert.assertEquals("sometoken", hte.getAccessToken(request)); diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java index 7c0de8cd..438a9bc1 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java @@ -86,7 +86,7 @@ public void testValidateInvalidHeader() throws Exception { public void testValidateValidHeaderMissingField() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("OAuth "); + expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("Bearer "); replay(request); try { HeaderOAuthValidator bov = new HeaderOAuthValidator(); @@ -106,7 +106,7 @@ public void testValidateValidHeaderWrongVersion() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)) - .andStubReturn("OAuth sdfsadfsadf,oauth_signature_method=\"HMAC-SHA1\""); + .andStubReturn("Bearer sdfsadfsadf,oauth_signature_method=\"HMAC-SHA1\""); replay(request); try { HeaderOAuthValidator bov = new HeaderOAuthValidator(); @@ -123,7 +123,7 @@ public void testValidateValidHeaderWrongVersion() throws Exception { public void testValidateValidHeader() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("OAuth sdfsadfsadf"); + expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("Bearer sdfsadfsadf"); replay(request); HeaderOAuthValidator bov = new HeaderOAuthValidator(); bov.performAllValidations(request); From 89dc67ce26ad59a8e2be652019364130e4971af9 Mon Sep 17 00:00:00 2001 From: Lukasz Moren Date: Wed, 15 Feb 2012 09:17:12 +0000 Subject: [PATCH 079/583] AMBER-28 fix OAuthAccessResourceRequest and extractors using old version of spec to find access token git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1244409 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/amber/oauth2/common/OAuth.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java index af8bc857..fc16e09f 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java @@ -74,7 +74,7 @@ public static final class ContentType { public static final String OAUTH_TOKEN_TYPE = "token_type"; - public static final String OAUTH_TOKEN = "access_token"; + public static final String OAUTH_TOKEN = "oauth_token"; public static final String OAUTH_TOKEN_DRAFT_0 = "access_token"; public static final String OAUTH_BEARER_TOKEN = "access_token"; From ac45bb68869e52fa000d4d457cd6ea0b6c42f93d Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Thu, 1 Mar 2012 10:59:40 +0000 Subject: [PATCH 080/583] AMBER-48 : Resource Server module extension git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1295509 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/amber/oauth2/common/OAuth.java | 3 + .../common/message/types/TokenType.java | 43 +++++++ .../amber/oauth2/rs/BearerResourceServer.java | 26 +++++ .../amber/oauth2/rs/ResourceServer.java | 31 +++++ .../extractor/BearerBodyTokenExtractor.java | 49 ++++++++ .../extractor/BearerHeaderTokenExtractor.java | 51 +++++++++ .../extractor/BearerQueryTokenExtractor.java | 49 ++++++++ .../rs/extractor/BodyTokenExtractor.java | 49 -------- .../rs/extractor/HeaderTokenExtractor.java | 51 --------- .../rs/extractor/QueryTokenExtractor.java | 49 -------- .../request/OAuthAccessResourceRequest.java | 107 +++++++++--------- ...tor.java => BearerBodyOAuthValidator.java} | 2 +- .../validator/BearerHeaderOAuthValidator.java | 79 +++++++++++++ .../validator/BearerQueryOAuthValidator.java | 72 ++++++++++++ .../rs/validator/HeaderOAuthValidator.java | 79 ------------- .../rs/validator/QueryOAuthValidator.java | 72 ------------ .../rs/extractor/BodyTokenExtractorTest.java | 4 +- .../extractor/HeaderTokenExtractorTest.java | 6 +- .../rs/extractor/QueryTokenExtractorTest.java | 4 +- .../rs/validator/BodyOAuthValidatorTest.java | 14 +-- .../validator/HeaderOAuthValidatorTest.java | 12 +- .../rs/validator/QueryOAuthValidatorTest.java | 8 +- 22 files changed, 481 insertions(+), 379 deletions(-) create mode 100644 oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java create mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java create mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java create mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java create mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java create mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java rename oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/{BodyOAuthValidator.java => BearerBodyOAuthValidator.java} (98%) create mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java create mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java index fc16e09f..db5d3204 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java @@ -22,6 +22,7 @@ package org.apache.amber.oauth2.common; import org.apache.amber.oauth2.common.message.types.ParameterStyle; +import org.apache.amber.oauth2.common.message.types.TokenType; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -80,5 +81,7 @@ public static final class ContentType { public static final String OAUTH_BEARER_TOKEN = "access_token"; public static final ParameterStyle DEFAULT_PARAMETER_STYLE = ParameterStyle.HEADER; + public static final TokenType DEFAULT_TOKEN_TYPE = TokenType.BEARER; + public static final String OAUTH_VERSION_DIFFER = "oauth_signature_method"; } diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java new file mode 100644 index 00000000..0d9199a5 --- /dev/null +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java @@ -0,0 +1,43 @@ +package org.apache.amber.oauth2.common.message.types; +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +/** + * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) + * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) + * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + */ +public enum TokenType { + BEARER("Bearer"), + MAC("MAC"); + + private String tokenType; + + TokenType(String grantType) { + this.tokenType = grantType; + } + + @Override + public String toString() { + return tokenType; + } +} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java new file mode 100644 index 00000000..b57b8271 --- /dev/null +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java @@ -0,0 +1,26 @@ +package org.apache.amber.oauth2.rs; + +import java.util.HashMap; +import java.util.Map; +import org.apache.amber.oauth2.common.message.types.ParameterStyle; +import org.apache.amber.oauth2.rs.extractor.BearerBodyTokenExtractor; +import org.apache.amber.oauth2.rs.extractor.BearerHeaderTokenExtractor; +import org.apache.amber.oauth2.rs.extractor.BearerQueryTokenExtractor; +import org.apache.amber.oauth2.rs.validator.BearerBodyOAuthValidator; +import org.apache.amber.oauth2.rs.validator.BearerHeaderOAuthValidator; +import org.apache.amber.oauth2.rs.validator.BearerQueryOAuthValidator; + +public class BearerResourceServer extends ResourceServer{ + + { + extractors.put(ParameterStyle.HEADER, BearerHeaderTokenExtractor.class); + extractors.put(ParameterStyle.BODY, BearerBodyTokenExtractor.class); + extractors.put(ParameterStyle.QUERY, BearerQueryTokenExtractor.class); + + validators.put(ParameterStyle.HEADER, BearerHeaderOAuthValidator.class); + validators.put(ParameterStyle.BODY, BearerBodyOAuthValidator.class); + validators.put(ParameterStyle.QUERY, BearerQueryOAuthValidator.class); + } + + +} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java new file mode 100644 index 00000000..1dd93f5c --- /dev/null +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java @@ -0,0 +1,31 @@ +package org.apache.amber.oauth2.rs; + +import java.util.HashMap; +import java.util.Map; +import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.amber.oauth2.common.message.types.ParameterStyle; +import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.amber.oauth2.common.validators.OAuthValidator; +import org.apache.amber.oauth2.rs.extractor.TokenExtractor; + +public abstract class ResourceServer { + + protected Map extractors = new HashMap(); + protected Map validators = new HashMap(); + + public OAuthValidator instantiateValidator(ParameterStyle ps) throws OAuthSystemException { + Class clazz = validators.get(ps); + if (clazz == null) { + throw new OAuthSystemException("Cannot instantiate a message validator."); + } + return (OAuthValidator)OAuthUtils.instantiateClass(clazz); + } + + public TokenExtractor instantiateExtractor(ParameterStyle ps) throws OAuthSystemException { + Class clazz = extractors.get(ps); + if (clazz == null) { + throw new OAuthSystemException("Cannot instantiate a token extractor."); + } + return (TokenExtractor)OAuthUtils.instantiateClass(clazz); + } + } diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java new file mode 100644 index 00000000..c73e0fdb --- /dev/null +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java @@ -0,0 +1,49 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.amber.oauth2.rs.extractor; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.amber.oauth2.common.OAuth; + + +/** + * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) + * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) + * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + */ +public class BearerBodyTokenExtractor implements TokenExtractor { + + @Override + public String getAccessToken(HttpServletRequest request) { + String token = request.getParameter(OAuth.OAUTH_BEARER_TOKEN); + if (token == null) { + token = request.getParameter(OAuth.OAUTH_TOKEN); + } + return token; + } + + @Override + public String getAccessToken(HttpServletRequest request, String tokenName) { + return request.getParameter(tokenName); + } +} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java new file mode 100644 index 00000000..3cd2f757 --- /dev/null +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java @@ -0,0 +1,51 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.amber.oauth2.rs.extractor; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.amber.oauth2.common.OAuth; + + +/** + * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) + * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) + * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + */ +public class BearerHeaderTokenExtractor implements TokenExtractor { + + + @Override + public String getAccessToken(HttpServletRequest request) { + String authzHeader = request.getHeader(OAuth.HeaderType.AUTHORIZATION); + return OAuthUtils.getAuthHeaderField(authzHeader); + } + + @Override + public String getAccessToken(HttpServletRequest request, String tokenName) { + String authzHeader = request.getHeader(OAuth.HeaderType.AUTHORIZATION); + return OAuthUtils.getAuthHeaderField(authzHeader); + } + + +} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java new file mode 100644 index 00000000..f4eb342b --- /dev/null +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java @@ -0,0 +1,49 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.amber.oauth2.rs.extractor; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.amber.oauth2.common.OAuth; + +/** + * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) + * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) + * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + */ +public class BearerQueryTokenExtractor implements TokenExtractor { + + @Override + public String getAccessToken(HttpServletRequest request) { + String token = request.getParameter(OAuth.OAUTH_BEARER_TOKEN); + if (token == null) { + token = request.getParameter(OAuth.OAUTH_TOKEN); + } + return token; + } + + @Override + public String getAccessToken(HttpServletRequest request, String tokenName) { + return request.getParameter(tokenName); + } + +} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java index 3d4e4387..e69de29b 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java @@ -1,49 +0,0 @@ -/** - * Copyright 2010 Newcastle University - * - * http://research.ncl.ac.uk/smart/ - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.amber.oauth2.rs.extractor; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.amber.oauth2.common.OAuth; - - -/** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) - */ -public class BodyTokenExtractor implements TokenExtractor { - - @Override - public String getAccessToken(HttpServletRequest request) { - String token = request.getParameter(OAuth.OAUTH_BEARER_TOKEN); - if (token == null) { - token = request.getParameter(OAuth.OAUTH_TOKEN); - } - return token; - } - - @Override - public String getAccessToken(HttpServletRequest request, String tokenName) { - return request.getParameter(tokenName); - } -} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractor.java index a3ab66d2..e69de29b 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractor.java @@ -1,51 +0,0 @@ -/** - * Copyright 2010 Newcastle University - * - * http://research.ncl.ac.uk/smart/ - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.amber.oauth2.rs.extractor; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.OAuth; - - -/** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) - */ -public class HeaderTokenExtractor implements TokenExtractor { - - - @Override - public String getAccessToken(HttpServletRequest request) { - String authzHeader = request.getHeader(OAuth.HeaderType.AUTHORIZATION); - return OAuthUtils.getAuthHeaderField(authzHeader); - } - - @Override - public String getAccessToken(HttpServletRequest request, String tokenName) { - String authzHeader = request.getHeader(OAuth.HeaderType.AUTHORIZATION); - return OAuthUtils.getAuthHeaderField(authzHeader); - } - - -} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java index 50025471..e69de29b 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java @@ -1,49 +0,0 @@ -/** - * Copyright 2010 Newcastle University - * - * http://research.ncl.ac.uk/smart/ - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.amber.oauth2.rs.extractor; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.amber.oauth2.common.OAuth; - -/** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) - */ -public class QueryTokenExtractor implements TokenExtractor { - - @Override - public String getAccessToken(HttpServletRequest request) { - String token = request.getParameter(OAuth.OAUTH_BEARER_TOKEN); - if (token == null) { - token = request.getParameter(OAuth.OAUTH_TOKEN); - } - return token; - } - - @Override - public String getAccessToken(HttpServletRequest request, String tokenName) { - return request.getParameter(tokenName); - } - -} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java index 7e1dcfdf..b4a2ba08 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java @@ -25,22 +25,17 @@ import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; - import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.apache.amber.oauth2.common.message.types.ParameterStyle; +import org.apache.amber.oauth2.common.message.types.TokenType; import org.apache.amber.oauth2.common.utils.OAuthUtils; import org.apache.amber.oauth2.common.validators.OAuthValidator; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.rs.extractor.HeaderTokenExtractor; -import org.apache.amber.oauth2.rs.extractor.QueryTokenExtractor; +import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.rs.BearerResourceServer; +import org.apache.amber.oauth2.rs.ResourceServer; import org.apache.amber.oauth2.rs.extractor.TokenExtractor; -import org.apache.amber.oauth2.rs.validator.BodyOAuthValidator; -import org.apache.amber.oauth2.rs.validator.HeaderOAuthValidator; -import org.apache.amber.oauth2.rs.extractor.BodyTokenExtractor; -import org.apache.amber.oauth2.rs.validator.QueryOAuthValidator; - /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -50,32 +45,39 @@ public class OAuthAccessResourceRequest { private HttpServletRequest request; - private ParameterStyle[] parameterStyles = new ParameterStyle[] {OAuth.DEFAULT_PARAMETER_STYLE}; + private ParameterStyle[] parameterStyles=new ParameterStyle[] {OAuth.DEFAULT_PARAMETER_STYLE}; + private TokenType[] tokenTypes=new TokenType []{OAuth.DEFAULT_TOKEN_TYPE}; private ParameterStyle usedParameterStyle; + private ResourceServer usedResourceServer; - private Map extractors = new HashMap(); - private Map validators = new HashMap(); + protected static Map tokens = new HashMap(); private TokenExtractor extractor; - + { - extractors.put(ParameterStyle.HEADER, HeaderTokenExtractor.class); - extractors.put(ParameterStyle.BODY, BodyTokenExtractor.class); - extractors.put(ParameterStyle.QUERY, QueryTokenExtractor.class); - - validators.put(ParameterStyle.HEADER, HeaderOAuthValidator.class); - validators.put(ParameterStyle.BODY, BodyOAuthValidator.class); - validators.put(ParameterStyle.QUERY, QueryOAuthValidator.class); + tokens.put(TokenType.BEARER, BearerResourceServer.class); + //TODO add MACResourceServer - see AMBER-41 } - + public OAuthAccessResourceRequest(HttpServletRequest request) throws OAuthSystemException, OAuthProblemException { - this(request, OAuth.DEFAULT_PARAMETER_STYLE); + this(request,new TokenType []{OAuth.DEFAULT_TOKEN_TYPE}, new ParameterStyle[] {OAuth.DEFAULT_PARAMETER_STYLE}); } public OAuthAccessResourceRequest(HttpServletRequest request, ParameterStyle... parameterStyles) + throws OAuthSystemException, OAuthProblemException { + this(request,new TokenType []{OAuth.DEFAULT_TOKEN_TYPE}, parameterStyles); + } + + public OAuthAccessResourceRequest(HttpServletRequest request, TokenType... tokenTypes) + throws OAuthSystemException, OAuthProblemException { + this(request,tokenTypes, new ParameterStyle[] {OAuth.DEFAULT_PARAMETER_STYLE}); + } + + public OAuthAccessResourceRequest(HttpServletRequest request, TokenType[] tokenTypes ,ParameterStyle[] parameterStyles) throws OAuthSystemException, OAuthProblemException { this.request = request; + this.tokenTypes = tokenTypes; this.parameterStyles = parameterStyles; this.validate(); } @@ -90,25 +92,29 @@ private void validate() throws OAuthSystemException, OAuthProblemException { boolean lackAuthInfo = false; OAuthProblemException ex = null; String lackAuthReason = "OAuth parameters were not found"; - for (ParameterStyle style : parameterStyles) { - try { - - OAuthValidator validator = instantiateValidator(style); - validator.validateContentType(request); - validator.validateMethod(request); - validator.validateRequiredParameters(request); - - usedParameterStyle = style; - foundValidStyles++; - } catch (OAuthProblemException e) { - //request lacks any authentication information? - if (OAuthUtils.isEmpty(e.getError())) { - lackAuthInfo = true; - lackAuthReason = e.getDescription(); - } else { - ex = OAuthProblemException.error(e.getError(), e.getDescription()); - } - } + for (TokenType tokenType : tokenTypes) { + ResourceServer resourceServer=instantiateResourceServer(tokenType); + for (ParameterStyle style : parameterStyles) { + try { + + OAuthValidator validator = resourceServer.instantiateValidator(style); + validator.validateContentType(request); + validator.validateMethod(request); + validator.validateRequiredParameters(request); + + usedParameterStyle = style; + usedResourceServer = resourceServer; + foundValidStyles++; + } catch (OAuthProblemException e) { + //request lacks any authentication information? + if (OAuthUtils.isEmpty(e.getError())) { + lackAuthInfo = true; + lackAuthReason = e.getDescription(); + } else { + ex = OAuthProblemException.error(e.getError(), e.getDescription()); + } + } + } } if (foundValidStyles > 1) { @@ -129,22 +135,15 @@ private void validate() throws OAuthSystemException, OAuthProblemException { "OAuth parameters were not found"); } - instantiateExtractor(usedParameterStyle); - } - - private OAuthValidator instantiateValidator(ParameterStyle ps) throws OAuthSystemException { - Class clazz = validators.get(ps); - if (clazz == null) { - throw new OAuthSystemException("Cannot instantiate a message validator."); - } - return (OAuthValidator)OAuthUtils.instantiateClass(clazz); + extractor= usedResourceServer.instantiateExtractor(usedParameterStyle); } - private void instantiateExtractor(ParameterStyle ps) throws OAuthSystemException { - Class clazz = extractors.get(ps); + public static ResourceServer instantiateResourceServer(TokenType tokenType) throws OAuthSystemException { + Class clazz = tokens.get(tokenType); if (clazz == null) { - throw new OAuthSystemException("Cannot instantiate a token extractor."); + throw new OAuthSystemException("Cannot instantiate a resource server."); } - extractor = (TokenExtractor)OAuthUtils.instantiateClass(clazz); + return (ResourceServer)OAuthUtils.instantiateClass(clazz); } + } diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerBodyOAuthValidator.java similarity index 98% rename from oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidator.java rename to oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerBodyOAuthValidator.java index 92892ae9..f0c03f88 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidator.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerBodyOAuthValidator.java @@ -35,7 +35,7 @@ * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) */ -public class BodyOAuthValidator extends AbstractValidator { +public class BearerBodyOAuthValidator extends AbstractValidator { @Override public void validateMethod(HttpServletRequest request) throws OAuthProblemException { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java new file mode 100644 index 00000000..d657424b --- /dev/null +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java @@ -0,0 +1,79 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.amber.oauth2.rs.validator; + +import java.util.Map; +import javax.servlet.http.HttpServletRequest; + +import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.amber.oauth2.common.validators.AbstractValidator; + + +/** + * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) + * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) + * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + */ +public class BearerHeaderOAuthValidator extends AbstractValidator { + + @Override + public void validateContentType(HttpServletRequest request) throws OAuthProblemException { + } + + @Override + public void validateMethod(HttpServletRequest request) throws OAuthProblemException { + } + + @Override + public void validateRequiredParameters(HttpServletRequest request) throws OAuthProblemException { + // Check if there is the Authorization Header + String authzHeader = request.getHeader(OAuth.HeaderType.AUTHORIZATION); + if (OAuthUtils.isEmpty(authzHeader)) { + throw OAuthProblemException.error("", "Missing authorization header."); + } + + // See if the authorization method is set to OAuth + String authzMethod = OAuthUtils.getAuthzMethod(authzHeader); + if (!OAuth.OAUTH_HEADER_NAME.equals(authzMethod)) { + throw OAuthProblemException.error("", "Incorrect authorization method."); + } + + // Get the header field + String headerField = OAuthUtils.getAuthHeaderField(authzHeader); + if (OAuthUtils.isEmpty(headerField)) { + throw OAuthProblemException + .error(OAuthError.TokenResponse.INVALID_REQUEST, "Missing required parameter."); + } + + // Check if this OAuth 1.0 or OAuth 2.0 + Map values = OAuthUtils.decodeOAuthHeader(authzHeader); + String oauthVersionDiff = values.get(OAuth.OAUTH_VERSION_DIFFER); + if (!OAuthUtils.isEmpty(oauthVersionDiff)) { + throw OAuthProblemException + .error(OAuthError.TokenResponse.INVALID_REQUEST, + "Incorrect OAuth version. Found OAuth V1.0."); + } + } +} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java new file mode 100644 index 00000000..9546495f --- /dev/null +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java @@ -0,0 +1,72 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.amber.oauth2.rs.validator; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.amber.oauth2.common.validators.AbstractValidator; + + +/** + * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) + * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) + * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + */ +public class BearerQueryOAuthValidator extends AbstractValidator { + + @Override + public void validateContentType(HttpServletRequest request) throws OAuthProblemException { + } + + @Override + public void validateMethod(HttpServletRequest request) throws OAuthProblemException { + } + + @Override + public void validateRequiredParameters(HttpServletRequest request) throws OAuthProblemException { + + + String[] tokens = request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN); + if (OAuthUtils.hasEmptyValues(tokens)) { + tokens = request.getParameterValues(OAuth.OAUTH_TOKEN); + if (OAuthUtils.hasEmptyValues(tokens)) { + throw OAuthProblemException.error(null, "Missing OAuth token."); + } + } + + if (tokens != null && tokens.length > 1) { + throw OAuthProblemException + .error(OAuthError.TokenResponse.INVALID_REQUEST, "Multiple tokens attached."); + } + + String oauthVersionDiff = request.getParameter(OAuth.OAUTH_VERSION_DIFFER); + if (!OAuthUtils.isEmpty(oauthVersionDiff)) { + throw OAuthProblemException + .error(OAuthError.TokenResponse.INVALID_REQUEST, + "Incorrect OAuth version. Found OAuth V1.0."); + } + } +} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidator.java index 941d5083..e69de29b 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidator.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidator.java @@ -1,79 +0,0 @@ -/** - * Copyright 2010 Newcastle University - * - * http://research.ncl.ac.uk/smart/ - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.amber.oauth2.rs.validator; - -import java.util.Map; -import javax.servlet.http.HttpServletRequest; - -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.AbstractValidator; - - -/** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) - */ -public class HeaderOAuthValidator extends AbstractValidator { - - @Override - public void validateContentType(HttpServletRequest request) throws OAuthProblemException { - } - - @Override - public void validateMethod(HttpServletRequest request) throws OAuthProblemException { - } - - @Override - public void validateRequiredParameters(HttpServletRequest request) throws OAuthProblemException { - // Check if there is the Authorization Header - String authzHeader = request.getHeader(OAuth.HeaderType.AUTHORIZATION); - if (OAuthUtils.isEmpty(authzHeader)) { - throw OAuthProblemException.error("", "Missing authorization header."); - } - - // See if the authorization method is set to OAuth - String authzMethod = OAuthUtils.getAuthzMethod(authzHeader); - if (!OAuth.OAUTH_HEADER_NAME.equals(authzMethod)) { - throw OAuthProblemException.error("", "Incorrect authorization method."); - } - - // Get the header field - String headerField = OAuthUtils.getAuthHeaderField(authzHeader); - if (OAuthUtils.isEmpty(headerField)) { - throw OAuthProblemException - .error(OAuthError.TokenResponse.INVALID_REQUEST, "Missing required parameter."); - } - - // Check if this OAuth 1.0 or OAuth 2.0 - Map values = OAuthUtils.decodeOAuthHeader(authzHeader); - String oauthVersionDiff = values.get(OAuth.OAUTH_VERSION_DIFFER); - if (!OAuthUtils.isEmpty(oauthVersionDiff)) { - throw OAuthProblemException - .error(OAuthError.TokenResponse.INVALID_REQUEST, - "Incorrect OAuth version. Found OAuth V1.0."); - } - } -} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java index 2fea5921..e69de29b 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java @@ -1,72 +0,0 @@ -/** - * Copyright 2010 Newcastle University - * - * http://research.ncl.ac.uk/smart/ - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.amber.oauth2.rs.validator; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.AbstractValidator; - - -/** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) - */ -public class QueryOAuthValidator extends AbstractValidator { - - @Override - public void validateContentType(HttpServletRequest request) throws OAuthProblemException { - } - - @Override - public void validateMethod(HttpServletRequest request) throws OAuthProblemException { - } - - @Override - public void validateRequiredParameters(HttpServletRequest request) throws OAuthProblemException { - - - String[] tokens = request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN); - if (OAuthUtils.hasEmptyValues(tokens)) { - tokens = request.getParameterValues(OAuth.OAUTH_TOKEN); - if (OAuthUtils.hasEmptyValues(tokens)) { - throw OAuthProblemException.error(null, "Missing OAuth token."); - } - } - - if (tokens != null && tokens.length > 1) { - throw OAuthProblemException - .error(OAuthError.TokenResponse.INVALID_REQUEST, "Multiple tokens attached."); - } - - String oauthVersionDiff = request.getParameter(OAuth.OAUTH_VERSION_DIFFER); - if (!OAuthUtils.isEmpty(oauthVersionDiff)) { - throw OAuthProblemException - .error(OAuthError.TokenResponse.INVALID_REQUEST, - "Incorrect OAuth version. Found OAuth V1.0."); - } - } -} diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java index c463a1c6..86526ef2 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java @@ -47,7 +47,7 @@ public void testGetAccessToken() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); replay(request); - BodyTokenExtractor bte = new BodyTokenExtractor(); + BearerBodyTokenExtractor bte = new BearerBodyTokenExtractor(); Assert.assertEquals("sometoken", bte.getAccessToken(request)); verify(request); } @@ -59,7 +59,7 @@ public void testGetAccessTokenNull() throws Exception { expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn(null); replay(request); - BodyTokenExtractor bte = new BodyTokenExtractor(); + BearerBodyTokenExtractor bte = new BearerBodyTokenExtractor(); Assert.assertNull(bte.getAccessToken(request)); verify(request); } diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java index 3adbd0e2..ad9966c9 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java @@ -26,7 +26,7 @@ import junit.framework.Assert; import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.rs.extractor.HeaderTokenExtractor; +import org.apache.amber.oauth2.rs.extractor.BearerHeaderTokenExtractor; import org.junit.Test; import static org.easymock.EasyMock.createStrictMock; @@ -48,7 +48,7 @@ public void testGetAccessToken() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("Bearer sometoken"); replay(request); - HeaderTokenExtractor hte = new HeaderTokenExtractor(); + BearerHeaderTokenExtractor hte = new BearerHeaderTokenExtractor(); Assert.assertEquals("sometoken", hte.getAccessToken(request)); verify(request); } @@ -59,7 +59,7 @@ public void testGetAccessTokenNull() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn(null); replay(request); - HeaderTokenExtractor hte = new HeaderTokenExtractor(); + BearerHeaderTokenExtractor hte = new BearerHeaderTokenExtractor(); Assert.assertNull(hte.getAccessToken(request)); verify(request); } diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java index 2c292fe6..553ec8d7 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java @@ -47,7 +47,7 @@ public void testGetAccessToken() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); replay(request); - QueryTokenExtractor qte = new QueryTokenExtractor(); + BearerQueryTokenExtractor qte = new BearerQueryTokenExtractor(); Assert.assertEquals("sometoken", qte.getAccessToken(request)); verify(request); @@ -60,7 +60,7 @@ public void testGetAccessTokenNull() throws Exception { expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); replay(request); - QueryTokenExtractor qte = new QueryTokenExtractor(); + BearerQueryTokenExtractor qte = new BearerQueryTokenExtractor(); Assert.assertNull(qte.getAccessToken(request)); verify(request); diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java index 5e4e94f1..1608d5c5 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java @@ -50,7 +50,7 @@ public void testValidateInvalidMethod() throws Exception { expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); replay(request); try { - BodyOAuthValidator bov = new BodyOAuthValidator(); + BearerBodyOAuthValidator bov = new BearerBodyOAuthValidator(); bov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -67,7 +67,7 @@ public void tesValidateMultipartMessage() throws Exception { expect(request.getContentType()).andStubReturn("multipart/form-data"); replay(request); try { - BodyOAuthValidator bov = new BodyOAuthValidator(); + BearerBodyOAuthValidator bov = new BearerBodyOAuthValidator(); bov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -84,7 +84,7 @@ public void tesValidateInvalidEncoding() throws Exception { expect(request.getContentType()).andStubReturn(OAuth.ContentType.JSON); replay(request); try { - BodyOAuthValidator bov = new BodyOAuthValidator(); + BearerBodyOAuthValidator bov = new BearerBodyOAuthValidator(); bov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -103,7 +103,7 @@ public void tesValidateInvalidOAuthVersion() throws Exception { expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token"}); replay(request); try { - BodyOAuthValidator bov = new BodyOAuthValidator(); + BearerBodyOAuthValidator bov = new BearerBodyOAuthValidator(); bov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -123,7 +123,7 @@ public void tesValidateTokenMissing() throws Exception { expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); replay(request); try { - BodyOAuthValidator bov = new BodyOAuthValidator(); + BearerBodyOAuthValidator bov = new BearerBodyOAuthValidator(); bov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -143,7 +143,7 @@ public void tesValidateMultipleTokens() throws Exception { .andStubReturn(new String[] {"access_token1", "access_token2"}); replay(request); try { - BodyOAuthValidator bov = new BodyOAuthValidator(); + BearerBodyOAuthValidator bov = new BearerBodyOAuthValidator(); bov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -161,7 +161,7 @@ public void tesValidateValidMessage() throws Exception { expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token"}); replay(request); - BodyOAuthValidator bov = new BodyOAuthValidator(); + BearerBodyOAuthValidator bov = new BearerBodyOAuthValidator(); bov.performAllValidations(request); verify(request); } diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java index 438a9bc1..f87eeb5c 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java @@ -28,7 +28,7 @@ import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.rs.validator.HeaderOAuthValidator; +import org.apache.amber.oauth2.rs.validator.BearerHeaderOAuthValidator; import org.junit.Test; import org.apache.amber.oauth2.common.utils.OAuthUtils; @@ -52,7 +52,7 @@ public void testValidateNoHeader() throws Exception { expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn(null); replay(request); try { - HeaderOAuthValidator bov = new HeaderOAuthValidator(); + BearerHeaderOAuthValidator bov = new BearerHeaderOAuthValidator(); bov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -70,7 +70,7 @@ public void testValidateInvalidHeader() throws Exception { expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("Basic arawersadf"); replay(request); try { - HeaderOAuthValidator bov = new HeaderOAuthValidator(); + BearerHeaderOAuthValidator bov = new BearerHeaderOAuthValidator(); bov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -89,7 +89,7 @@ public void testValidateValidHeaderMissingField() throws Exception { expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("Bearer "); replay(request); try { - HeaderOAuthValidator bov = new HeaderOAuthValidator(); + BearerHeaderOAuthValidator bov = new BearerHeaderOAuthValidator(); bov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -109,7 +109,7 @@ public void testValidateValidHeaderWrongVersion() throws Exception { .andStubReturn("Bearer sdfsadfsadf,oauth_signature_method=\"HMAC-SHA1\""); replay(request); try { - HeaderOAuthValidator bov = new HeaderOAuthValidator(); + BearerHeaderOAuthValidator bov = new BearerHeaderOAuthValidator(); bov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -125,7 +125,7 @@ public void testValidateValidHeader() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("Bearer sdfsadfsadf"); replay(request); - HeaderOAuthValidator bov = new HeaderOAuthValidator(); + BearerHeaderOAuthValidator bov = new BearerHeaderOAuthValidator(); bov.performAllValidations(request); verify(request); diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java index 2ccdc140..0f1b0d7a 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java @@ -52,7 +52,7 @@ public void testValidateWrongVersion() throws Exception { expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token"}); replay(request); try { - QueryOAuthValidator qov = new QueryOAuthValidator(); + BearerQueryOAuthValidator qov = new BearerQueryOAuthValidator(); qov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -72,7 +72,7 @@ public void testValidateNoQuery() throws Exception { expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); replay(request); try { - QueryOAuthValidator qov = new QueryOAuthValidator(); + BearerQueryOAuthValidator qov = new BearerQueryOAuthValidator(); qov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -92,7 +92,7 @@ public void testValidateMultipleTokens() throws Exception { .andStubReturn(new String[] {"access_token1", "access_token2"}); replay(request); try { - QueryOAuthValidator qov = new QueryOAuthValidator(); + BearerQueryOAuthValidator qov = new BearerQueryOAuthValidator(); qov.performAllValidations(request); Assert.fail("Exception not thrown."); } catch (OAuthProblemException e) { @@ -110,7 +110,7 @@ public void testValidateToken() throws Exception { expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token1"}); replay(request); - QueryOAuthValidator qov = new QueryOAuthValidator(); + BearerQueryOAuthValidator qov = new BearerQueryOAuthValidator(); qov.performAllValidations(request); verify(request); From 2511e0a84a6fceb92007bfb5efab380e66a48930 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Thu, 1 Mar 2012 11:02:13 +0000 Subject: [PATCH 081/583] AMBER-48 : Resource Server module extension git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1295510 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java | 0 .../apache/amber/oauth2/rs/extractor/HeaderTokenExtractor.java | 0 .../org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java | 0 .../apache/amber/oauth2/rs/validator/HeaderOAuthValidator.java | 0 .../org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java | 0 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java delete mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractor.java delete mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java delete mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidator.java delete mode 100644 oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractor.java deleted file mode 100644 index e69de29b..00000000 diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractor.java deleted file mode 100644 index e69de29b..00000000 diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractor.java deleted file mode 100644 index e69de29b..00000000 diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidator.java deleted file mode 100644 index e69de29b..00000000 diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidator.java deleted file mode 100644 index e69de29b..00000000 From 3d6aa4e5946fcf62db080df28bfb121ffd01a64c Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 13 Mar 2012 13:24:31 +0000 Subject: [PATCH 082/583] moving forward the SvnPubSub, modified site distribution management URL and replaced wagon git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1300112 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 407e64e3..2cb89a38 100644 --- a/pom.xml +++ b/pom.xml @@ -262,7 +262,7 @@ amber.website Apache Amber website - scp://people.apache.org/www/incubator.apache.org/amber/ + ${site.deploymentBaseUrl} @@ -274,6 +274,18 @@ 1.6 yyyy-MM-dd HH:mm:ssZ ${scmBranch}@r${buildNumber} + + svn:https://svn.apache.org/repos/asf/incubator/amber/site @@ -500,9 +512,9 @@ 3.0 - org.apache.maven.wagon - wagon-ssh - 1.0 + org.jvnet.wagon-svn + wagon-svn + 1.12 From f43b80528ed6a487a4393923152582d4840e7e13 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 14 Mar 2012 07:55:24 +0000 Subject: [PATCH 083/583] fixed project info issue with submodules - didn't understand why, but when generating the site with older config, it occasionally raised an issue git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1300478 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2cb89a38..fba19746 100644 --- a/pom.xml +++ b/pom.xml @@ -510,6 +510,15 @@ org.apache.maven.plugins maven-site-plugin 3.0 + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.4 + + + org.jvnet.wagon-svn @@ -567,12 +576,6 @@ - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.4 - - org.apache.maven.plugins maven-jxr-plugin From 0b7f441ba913d46646863cdbda66b2a25113818c Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Mon, 23 Apr 2012 09:10:31 +0000 Subject: [PATCH 084/583] AMBER-15 : adding new unit test git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1329140 13f79535-47bb-0310-9956-ffa450edef68 --- .../rs/OAuthAccessResourceRequestTest.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java index 91399d85..cc0bf6a1 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java @@ -214,7 +214,7 @@ public void testCreateBodyHeaderMixedTokens() throws Exception { expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)) - .andStubReturn("Bearer sadfasfd,oauth_signature_method=\"HMAC-SHA1\""); + .andStubReturn("Bearer sadfasfd"); replay(request); try { @@ -228,6 +228,29 @@ public void testCreateBodyHeaderMixedTokens() throws Exception { verify(request); } + @Test + public void testCreateBodyHeaderMixedTokensAndWrongVersion() throws Exception { + + HttpServletRequest request = createMock(HttpServletRequest.class); + expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); + expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); + expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)) + .andStubReturn("Bearer sadfasfd,oauth_signature_method=\"HMAC-SHA1\""); + replay(request); + + try { + new OAuthAccessResourceRequest(request, ParameterStyle.BODY, ParameterStyle.HEADER); + fail("Exception expected"); + } catch (OAuthProblemException e) { + Assert + .assertTrue( + OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + } + verify(request); + } + @Test public void testCreateBodyNoToken() throws Exception { From fb894f09bbe69a546d8a8882f7136b028ffe08da Mon Sep 17 00:00:00 2001 From: Zhaohui Feng Date: Tue, 1 May 2012 03:34:41 +0000 Subject: [PATCH 085/583] Fix the code to not mess up with HTTP POST body git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1332515 13f79535-47bb-0310-9956-ffa450edef68 --- .../extractor/BearerQueryTokenExtractor.java | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java index f4eb342b..2923306b 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java @@ -21,6 +21,9 @@ package org.apache.amber.oauth2.rs.extractor; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; + import javax.servlet.http.HttpServletRequest; import org.apache.amber.oauth2.common.OAuth; @@ -34,16 +37,48 @@ public class BearerQueryTokenExtractor implements TokenExtractor { @Override public String getAccessToken(HttpServletRequest request) { - String token = request.getParameter(OAuth.OAUTH_BEARER_TOKEN); + String token = getQueryParameter(request, OAuth.OAUTH_BEARER_TOKEN); if (token == null) { - token = request.getParameter(OAuth.OAUTH_TOKEN); + token = getQueryParameter(request, OAuth.OAUTH_TOKEN); } return token; } @Override public String getAccessToken(HttpServletRequest request, String tokenName) { - return request.getParameter(tokenName); + return getQueryParameter(request, tokenName); + } + + /** + * A replacement for HttpServletRequest.getParameter() as it will mess up with HTTP POST body + * @param request + * @param name + * @return + */ + private String getQueryParameter(HttpServletRequest request, String name) { + String query = request.getQueryString(); + if (query == null) { + return null; + } + String[] params = query.split("&"); + for (String param : params) { + try { + param = URLDecoder.decode(param, "UTF-8"); + } catch (UnsupportedEncodingException e) { + // Ignore + } + int index = param.indexOf('='); + String key = param; + String value = null; + if (index != -1) { + key = param.substring(0, index); + value = param.substring(index + 1); + } + if (key.equals(name)) { + return value; + } + } + return null; } } From c7b9ddbeaad334d0be8907cef73d876d2d5ad0a6 Mon Sep 17 00:00:00 2001 From: Zhaohui Feng Date: Tue, 1 May 2012 05:24:09 +0000 Subject: [PATCH 086/583] Fix more code to handle query parameters git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1332525 13f79535-47bb-0310-9956-ffa450edef68 --- .../amber/oauth2/rs/BearerResourceServer.java | 11 +- .../amber/oauth2/rs/ResourceServer.java | 52 ++++++- .../extractor/BearerQueryTokenExtractor.java | 41 +---- .../validator/BearerQueryOAuthValidator.java | 21 ++- .../rs/OAuthAccessResourceRequestTest.java | 143 ++++++++---------- .../rs/extractor/QueryTokenExtractorTest.java | 10 +- .../rs/validator/QueryOAuthValidatorTest.java | 30 ++-- 7 files changed, 151 insertions(+), 157 deletions(-) diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java index b57b8271..da6f86a6 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java @@ -1,7 +1,5 @@ package org.apache.amber.oauth2.rs; -import java.util.HashMap; -import java.util.Map; import org.apache.amber.oauth2.common.message.types.ParameterStyle; import org.apache.amber.oauth2.rs.extractor.BearerBodyTokenExtractor; import org.apache.amber.oauth2.rs.extractor.BearerHeaderTokenExtractor; @@ -9,10 +7,10 @@ import org.apache.amber.oauth2.rs.validator.BearerBodyOAuthValidator; import org.apache.amber.oauth2.rs.validator.BearerHeaderOAuthValidator; import org.apache.amber.oauth2.rs.validator.BearerQueryOAuthValidator; - -public class BearerResourceServer extends ResourceServer{ - - { + +public class BearerResourceServer extends ResourceServer { + + public BearerResourceServer() { extractors.put(ParameterStyle.HEADER, BearerHeaderTokenExtractor.class); extractors.put(ParameterStyle.BODY, BearerBodyTokenExtractor.class); extractors.put(ParameterStyle.QUERY, BearerQueryTokenExtractor.class); @@ -22,5 +20,4 @@ public class BearerResourceServer extends ResourceServer{ validators.put(ParameterStyle.QUERY, BearerQueryOAuthValidator.class); } - } diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java index 1dd93f5c..dd58ea67 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java @@ -1,7 +1,14 @@ package org.apache.amber.oauth2.rs; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.apache.amber.oauth2.common.message.types.ParameterStyle; import org.apache.amber.oauth2.common.utils.OAuthUtils; @@ -12,7 +19,7 @@ public abstract class ResourceServer { protected Map extractors = new HashMap(); protected Map validators = new HashMap(); - + public OAuthValidator instantiateValidator(ParameterStyle ps) throws OAuthSystemException { Class clazz = validators.get(ps); if (clazz == null) { @@ -28,4 +35,45 @@ public TokenExtractor instantiateExtractor(ParameterStyle ps) throws OAuthSystem } return (TokenExtractor)OAuthUtils.instantiateClass(clazz); } - } + + /** + * A replacement for HttpServletRequest.getParameter() as it will mess up with HTTP POST body + * @param request + * @param name + * @return + */ + public static String[] getQueryParameterValues(HttpServletRequest request, String name) { + String query = request.getQueryString(); + if (query == null) { + return null; + } + List values = new ArrayList(); + String[] params = query.split("&"); + for (String param : params) { + try { + param = URLDecoder.decode(param, "UTF-8"); + } catch (UnsupportedEncodingException e) { + // Ignore + } + int index = param.indexOf('='); + String key = param; + String value = null; + if (index != -1) { + key = param.substring(0, index); + value = param.substring(index + 1); + } + if (key.equals(name)) { + values.add(value); + } + } + return values.toArray(new String[values.size()]); + } + + public static String getQueryParameterValue(HttpServletRequest request, String name) { + String[] values = getQueryParameterValues(request, name); + if (values == null || values.length == 0) { + return null; + } + return values[0]; + } +} diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java index 2923306b..a6d8cd1d 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java @@ -21,8 +21,7 @@ package org.apache.amber.oauth2.rs.extractor; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; +import static org.apache.amber.oauth2.rs.ResourceServer.getQueryParameterValue; import javax.servlet.http.HttpServletRequest; @@ -37,48 +36,16 @@ public class BearerQueryTokenExtractor implements TokenExtractor { @Override public String getAccessToken(HttpServletRequest request) { - String token = getQueryParameter(request, OAuth.OAUTH_BEARER_TOKEN); + String token = getQueryParameterValue(request, OAuth.OAUTH_BEARER_TOKEN); if (token == null) { - token = getQueryParameter(request, OAuth.OAUTH_TOKEN); + token = getQueryParameterValue(request, OAuth.OAUTH_TOKEN); } return token; } @Override public String getAccessToken(HttpServletRequest request, String tokenName) { - return getQueryParameter(request, tokenName); - } - - /** - * A replacement for HttpServletRequest.getParameter() as it will mess up with HTTP POST body - * @param request - * @param name - * @return - */ - private String getQueryParameter(HttpServletRequest request, String name) { - String query = request.getQueryString(); - if (query == null) { - return null; - } - String[] params = query.split("&"); - for (String param : params) { - try { - param = URLDecoder.decode(param, "UTF-8"); - } catch (UnsupportedEncodingException e) { - // Ignore - } - int index = param.indexOf('='); - String key = param; - String value = null; - if (index != -1) { - key = param.substring(0, index); - value = param.substring(index + 1); - } - if (key.equals(name)) { - return value; - } - } - return null; + return getQueryParameterValue(request, tokenName); } } diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java index 9546495f..f8f330a0 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java @@ -21,6 +21,8 @@ package org.apache.amber.oauth2.rs.validator; +import static org.apache.amber.oauth2.rs.ResourceServer.getQueryParameterValues; + import javax.servlet.http.HttpServletRequest; import org.apache.amber.oauth2.common.OAuth; @@ -28,7 +30,7 @@ import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.utils.OAuthUtils; import org.apache.amber.oauth2.common.validators.AbstractValidator; - +import org.apache.amber.oauth2.rs.ResourceServer; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -48,25 +50,22 @@ public void validateMethod(HttpServletRequest request) throws OAuthProblemExcept @Override public void validateRequiredParameters(HttpServletRequest request) throws OAuthProblemException { - - String[] tokens = request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN); + String[] tokens = getQueryParameterValues(request, OAuth.OAUTH_BEARER_TOKEN); if (OAuthUtils.hasEmptyValues(tokens)) { - tokens = request.getParameterValues(OAuth.OAUTH_TOKEN); + tokens = getQueryParameterValues(request, OAuth.OAUTH_TOKEN); if (OAuthUtils.hasEmptyValues(tokens)) { throw OAuthProblemException.error(null, "Missing OAuth token."); } } - + if (tokens != null && tokens.length > 1) { - throw OAuthProblemException - .error(OAuthError.TokenResponse.INVALID_REQUEST, "Multiple tokens attached."); + throw OAuthProblemException.error(OAuthError.TokenResponse.INVALID_REQUEST, "Multiple tokens attached."); } - String oauthVersionDiff = request.getParameter(OAuth.OAUTH_VERSION_DIFFER); + String oauthVersionDiff = ResourceServer.getQueryParameterValue(request, OAuth.OAUTH_VERSION_DIFFER); if (!OAuthUtils.isEmpty(oauthVersionDiff)) { - throw OAuthProblemException - .error(OAuthError.TokenResponse.INVALID_REQUEST, - "Incorrect OAuth version. Found OAuth V1.0."); + throw OAuthProblemException.error(OAuthError.TokenResponse.INVALID_REQUEST, + "Incorrect OAuth version. Found OAuth V1.0."); } } } diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java index cc0bf6a1..ec195f28 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java @@ -34,7 +34,6 @@ import org.junit.Assert; import org.junit.Test; - /** * @author Maciej Machulak * @author Lukasz Moren @@ -52,7 +51,6 @@ public void testCreateNoHeaderRequest() throws Exception { expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn(null); replay(request); - OAuthAccessResourceRequest req = null; try { new OAuthAccessResourceRequest(request); @@ -96,9 +94,7 @@ public void testCreateHeaderMissingFieldRequest() throws Exception { new OAuthAccessResourceRequest(request); fail("Exception expected"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); } verify(request); } @@ -117,14 +113,11 @@ public void testCreateHeaderWrongVersionRequest() throws Exception { new OAuthAccessResourceRequest(request); fail("Exception expected"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); } verify(request); } - @Test public void testCreateValidHeaderRequest() throws Exception { @@ -156,9 +149,7 @@ public void testCreateBodyWrongMethod() throws Exception { new OAuthAccessResourceRequest(request, ParameterStyle.BODY); fail("Exception expeted"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); } verify(request); } @@ -176,9 +167,7 @@ public void testCreateBodyInvalidEncoding() throws Exception { new OAuthAccessResourceRequest(request, ParameterStyle.BODY); fail("Exception expeted"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); } verify(request); } @@ -196,12 +185,8 @@ public void testCreateBodyWrongOAuthVersion() throws Exception { new OAuthAccessResourceRequest(request, ParameterStyle.BODY); fail("Exception expeted"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); - Assert - .assertEquals("Incorrect OAuth version. Found OAuth V1.0.", - e.getDescription()); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertEquals("Incorrect OAuth version. Found OAuth V1.0.", e.getDescription()); } } @@ -213,17 +198,14 @@ public void testCreateBodyHeaderMixedTokens() throws Exception { expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)) - .andStubReturn("Bearer sadfasfd"); + expect(request.getHeader(OAuth.HeaderType.AUTHORIZATION)).andStubReturn("Bearer sadfasfd"); replay(request); try { new OAuthAccessResourceRequest(request, ParameterStyle.BODY, ParameterStyle.HEADER); fail("Exception expected"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); } verify(request); } @@ -244,13 +226,11 @@ public void testCreateBodyHeaderMixedTokensAndWrongVersion() throws Exception { new OAuthAccessResourceRequest(request, ParameterStyle.BODY, ParameterStyle.HEADER); fail("Exception expected"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); } verify(request); } - + @Test public void testCreateBodyNoToken() throws Exception { @@ -277,8 +257,8 @@ public void testCreateBodyMultipleTokens() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {"sometoken", "othertoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken", + "othertoken"}); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); @@ -286,9 +266,7 @@ public void testCreateBodyMultipleTokens() throws Exception { new OAuthAccessResourceRequest(request, ParameterStyle.BODY); fail("Exception expeted"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); } verify(request); } @@ -317,9 +295,10 @@ public void testCreateQueryNoToken() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); - expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + expect(request.getQueryString()).andStubReturn(null); + // expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); + // expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); + // expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); try { @@ -337,17 +316,18 @@ public void testCreateQueryWrongVersion() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); - expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn("HMAC-SHA1"); + expect(request.getQueryString()).andStubReturn(OAuth.OAUTH_VERSION_DIFFER + "=HMAC-SHA1&" + + OAuth.OAUTH_BEARER_TOKEN + + "=sometoken"); + // expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); + // expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn("HMAC-SHA1"); replay(request); try { new OAuthAccessResourceRequest(request, ParameterStyle.QUERY); fail("Exception expeted"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); } verify(request); } @@ -357,18 +337,19 @@ public void testCreateQueryMultipleTokens() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {"sometoken", "othertoken"}); - expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + expect(request.getQueryString()).andStubReturn(OAuth.OAUTH_BEARER_TOKEN + "=sometoken&" + + OAuth.OAUTH_BEARER_TOKEN + + "=othertoken"); + // expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) + // .andStubReturn(new String[] {"sometoken", "othertoken"}); + // expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); try { new OAuthAccessResourceRequest(request, ParameterStyle.QUERY); fail("Exception expeted"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); } verify(request); } @@ -378,8 +359,9 @@ public void testCreateQueryValidRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.GET); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); - expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + expect(request.getQueryString()).andStubReturn(OAuth.OAUTH_BEARER_TOKEN + "=sometoken"); + // expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); + // expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); replay(request); try { @@ -394,11 +376,12 @@ public void testCreateQueryValidRequest() throws Exception { @Test public void testGetAccessTokenWrongQueryRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); - expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {null}); + expect(request.getQueryString()).andStubReturn(null); + // expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); + // expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); + // expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + // expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) + // .andStubReturn(new String[] {null}); replay(request); @@ -417,8 +400,7 @@ public void testGetAccessTokenWrongHeaderRequest() throws Exception { expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getHeader("Authorization")).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {null}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {null}); replay(request); @@ -438,10 +420,8 @@ public void testGetAccessTokenWrongBodyRequest() throws Exception { expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {null}); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) - .andStubReturn(new String[] {null}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {null}); + expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {null}); replay(request); try { @@ -462,8 +442,7 @@ public void testGetAccessCorrectRequest() throws Exception { expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {"sometoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); replay(request); OAuthAccessResourceRequest req = null; @@ -481,8 +460,7 @@ public void testGetAccessCorrectRequest() throws Exception { expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getHeader("Authorization")).andStubReturn(AUTHORIZATION_HEADER_OAUTH2); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {"sometoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); replay(request); try { @@ -496,10 +474,11 @@ public void testGetAccessCorrectRequest() throws Exception { reset(request); //test uri query - expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); - expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {"sometoken"}); + expect(request.getQueryString()).andStubReturn(OAuth.OAUTH_BEARER_TOKEN + "=sometoken"); + + // expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); + // expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + // expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); replay(request); req = new OAuthAccessResourceRequest(request, ParameterStyle.QUERY); @@ -511,21 +490,20 @@ public void testGetAccessCorrectRequest() throws Exception { @Test public void testMultipleStylesValidRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); + expect(request.getQueryString()).andStubReturn(null); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {null}); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)) - .andStubReturn(new String[] {null}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {null}); + expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(new String[] {null}); expect(request.getHeader("Authorization")).andStubReturn(AUTHORIZATION_HEADER_OAUTH2); replay(request); try { - new OAuthAccessResourceRequest(request, ParameterStyle.QUERY, ParameterStyle.BODY, - ParameterStyle.HEADER); + new OAuthAccessResourceRequest(request, ParameterStyle.QUERY, ParameterStyle.BODY, ParameterStyle.HEADER); } catch (OAuthProblemException e) { fail("Exception not expected"); } @@ -535,28 +513,25 @@ public void testMultipleStylesValidRequest() throws Exception { @Test public void testMultipleStylesInvalidRequest() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); + expect(request.getQueryString()).andStubReturn(null); + expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); expect(request.getMethod()).andStubReturn(OAuth.HttpMethod.POST); expect(request.getContentType()).andStubReturn(OAuth.ContentType.URL_ENCODED); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {"sometoken"}); + expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"sometoken"}); expect(request.getHeader("Authorization")).andStubReturn(AUTHORIZATION_HEADER_OAUTH2); replay(request); OAuthAccessResourceRequest req = null; try { - new OAuthAccessResourceRequest(request, ParameterStyle.BODY, - ParameterStyle.QUERY, ParameterStyle.HEADER); + new OAuthAccessResourceRequest(request, ParameterStyle.BODY, ParameterStyle.QUERY, ParameterStyle.HEADER); fail("Exception expeted"); } catch (OAuthProblemException e) { - Assert - .assertTrue( - OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); + Assert.assertTrue(OAuthError.TokenResponse.INVALID_REQUEST.equals(e.getError())); } - verify(request); } } diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java index 553ec8d7..9f0d517e 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java @@ -30,7 +30,6 @@ import junit.framework.Assert; -import org.apache.amber.oauth2.common.OAuth; import org.junit.Test; @@ -45,7 +44,8 @@ public class QueryTokenExtractorTest { public void testGetAccessToken() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); + // expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn("sometoken"); + expect(request.getQueryString()).andStubReturn("access_token=sometoken"); replay(request); BearerQueryTokenExtractor qte = new BearerQueryTokenExtractor(); Assert.assertEquals("sometoken", qte.getAccessToken(request)); @@ -57,8 +57,10 @@ public void testGetAccessToken() throws Exception { public void testGetAccessTokenNull() throws Exception { HttpServletRequest request = createStrictMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn(null); - expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); + expect(request.getQueryString()).andStubReturn(null); + +// expect(request.getParameter(OAuth.OAUTH_TOKEN)).andStubReturn(null); +// expect(request.getParameter(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); replay(request); BearerQueryTokenExtractor qte = new BearerQueryTokenExtractor(); Assert.assertNull(qte.getAccessToken(request)); diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java index 0f1b0d7a..d0a3fad4 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java @@ -43,13 +43,15 @@ */ public class QueryOAuthValidatorTest { - @Test public void testValidateWrongVersion() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn("HMAC-SHA1"); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token"}); + expect(request.getQueryString()).andStubReturn(OAuth.OAUTH_VERSION_DIFFER + "=HMAC-SHA1&" + + OAuth.OAUTH_BEARER_TOKEN + + "=access_token"); + // expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn("HMAC-SHA1"); + // expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token"}); replay(request); try { BearerQueryOAuthValidator qov = new BearerQueryOAuthValidator(); @@ -67,9 +69,10 @@ public void testValidateWrongVersion() throws Exception { public void testValidateNoQuery() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); + expect(request.getQueryString()).andStubReturn(null); + // expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + // expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(null); + // expect(request.getParameterValues(OAuth.OAUTH_TOKEN)).andStubReturn(null); replay(request); try { BearerQueryOAuthValidator qov = new BearerQueryOAuthValidator(); @@ -87,9 +90,12 @@ public void testValidateNoQuery() throws Exception { public void testValidateMultipleTokens() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)) - .andStubReturn(new String[] {"access_token1", "access_token2"}); + expect(request.getQueryString()).andStubReturn(OAuth.OAUTH_BEARER_TOKEN + "=access_token1&" + + OAuth.OAUTH_BEARER_TOKEN + + "=access_token2"); + // expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + // expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token1", + // "access_token2"}); replay(request); try { BearerQueryOAuthValidator qov = new BearerQueryOAuthValidator(); @@ -107,8 +113,9 @@ public void testValidateMultipleTokens() throws Exception { public void testValidateToken() throws Exception { HttpServletRequest request = createMock(HttpServletRequest.class); - expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); - expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token1"}); + expect(request.getQueryString()).andStubReturn(OAuth.OAUTH_BEARER_TOKEN + "=access_token1"); + // expect(request.getParameter(OAuth.OAUTH_VERSION_DIFFER)).andStubReturn(null); + // expect(request.getParameterValues(OAuth.OAUTH_BEARER_TOKEN)).andStubReturn(new String[] {"access_token1"}); replay(request); BearerQueryOAuthValidator qov = new BearerQueryOAuthValidator(); qov.performAllValidations(request); @@ -116,5 +123,4 @@ public void testValidateToken() throws Exception { } - } From 6268b517ff25a304e0afee207f46889ac6afa80f Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Fri, 11 May 2012 11:41:00 +0000 Subject: [PATCH 087/583] no Jira, addming missing AL header git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1337114 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/amber/signature/FakeToken.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/signature-api/src/test/java/org/apache/amber/signature/FakeToken.java b/signature-api/src/test/java/org/apache/amber/signature/FakeToken.java index 874e26cd..767cf9ab 100644 --- a/signature-api/src/test/java/org/apache/amber/signature/FakeToken.java +++ b/signature-api/src/test/java/org/apache/amber/signature/FakeToken.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.amber.signature; import java.util.Set; From a97df3ddb08ab29f000eb250fcf7e6339787399e Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Mon, 14 May 2012 11:41:33 +0000 Subject: [PATCH 088/583] no Jira, adding missing AL header git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1338163 13f79535-47bb-0310-9956-ffa450edef68 --- .../amber/oauth2/rs/BearerResourceServer.java | 16 ++++++++++++++++ .../apache/amber/oauth2/rs/ResourceServer.java | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java index da6f86a6..50efa726 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.amber.oauth2.rs; import org.apache.amber.oauth2.common.message.types.ParameterStyle; diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java index dd58ea67..dae41145 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.amber.oauth2.rs; import java.io.UnsupportedEncodingException; From 793e5f823fe573b4cf556f789aadf0e815b6eef0 Mon Sep 17 00:00:00 2001 From: Zhaohui Feng Date: Tue, 15 May 2012 04:50:13 +0000 Subject: [PATCH 089/583] FIX for AMBER-53: Make sure the expires_in is a number git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1338534 13f79535-47bb-0310-9956-ffa450edef68 --- .../oauth2/as/response/OAuthASResponse.java | 9 ++++++-- .../as/response/OAuthASResponseTest.java | 2 +- .../demo/controller/TokenController.java | 8 +++---- .../oauth2/client/demo/model/OAuthParams.java | 8 +++++-- .../ClientHeaderParametersApplier.java | 2 +- .../client/request/OAuthClientRequest.java | 2 +- .../client/response/GitHubTokenResponse.java | 18 +++++++--------- .../response/OAuthAccessTokenResponse.java | 2 +- .../client/response/OAuthAuthzResponse.java | 10 ++++----- .../client/response/OAuthClientResponse.java | 8 +++++-- .../OAuthJSONAccessTokenResponse.java | 15 ++++++------- .../OAuthJSONAccessTokenResponseTest.java | 4 ++-- .../amber/oauth2/client/utils/TestUtils.java | 6 +++--- .../oauth2/common/message/OAuthResponse.java | 2 +- .../BodyURLEncodedParametersApplier.java | 2 +- .../parameters/JSONBodyParametersApplier.java | 5 ++--- .../parameters/OAuthParametersApplier.java | 2 +- .../parameters/QueryParameterApplier.java | 4 ++-- .../WWWAuthHeaderParametersApplier.java | 4 ++-- .../oauth2/common/token/BasicOAuthToken.java | 10 ++++----- .../amber/oauth2/common/token/OAuthToken.java | 2 +- .../amber/oauth2/common/utils/JSONUtils.java | 10 ++++----- .../amber/oauth2/common/utils/OAuthUtils.java | 21 ++++++++++--------- .../amber/oauth2/common/OAuthUtilsTest.java | 10 ++++----- .../BodyURLEncodedParametersApplierTest.java | 8 +++---- .../JSONBodyParametersApplierTest.java | 8 +++---- .../parameters/QueryParameterApplierTest.java | 6 +++--- .../WWWAuthHeaderParametersApplierTest.java | 6 ++---- .../oauth2/common/utils/JSONUtilsTest.java | 8 +++---- .../oauth2/common/utils/OAuthUtilsTest.java | 8 +++---- .../OAuthClientRegistrationResponse.java | 17 +++++++-------- .../OAuthServerRegistrationResponse.java | 5 +++++ .../amber/oauth2/integration/CommonExt.java | 2 +- .../integration/EndUserAuthorizationTest.java | 9 ++++---- .../integration/endpoints/AuthzEndpoint.java | 2 +- 35 files changed, 124 insertions(+), 121 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java index 31cd2ea4..92d4a3f7 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java @@ -73,9 +73,14 @@ public OAuthAuthorizationResponseBuilder setAccessToken(String token) { } public OAuthAuthorizationResponseBuilder setExpiresIn(String expiresIn) { - this.parameters.put(OAuth.OAUTH_EXPIRES_IN, expiresIn); + this.parameters.put(OAuth.OAUTH_EXPIRES_IN, expiresIn == null ? null : Long.valueOf(expiresIn)); return this; } + + public OAuthAuthorizationResponseBuilder setExpiresIn(Long expiresIn) { + this.parameters.put(OAuth.OAUTH_EXPIRES_IN, expiresIn); + return this; + } public OAuthAuthorizationResponseBuilder location(String location) { this.location = location; @@ -101,7 +106,7 @@ public OAuthTokenResponseBuilder setAccessToken(String token) { } public OAuthTokenResponseBuilder setExpiresIn(String expiresIn) { - this.parameters.put(OAuth.OAUTH_EXPIRES_IN, expiresIn); + this.parameters.put(OAuth.OAUTH_EXPIRES_IN, expiresIn == null ? null : Long.valueOf(expiresIn)); return this; } diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java index 484500ee..efc48c98 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java @@ -48,7 +48,7 @@ public void testAuthzResponse() throws Exception { .location("http://www.example.com") .setCode("code") .setAccessToken("access_111") - .setExpiresIn("400") + .setExpiresIn(400l) .setState("ok") .setParam("testValue", "value2") .buildQueryMessage(); diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java index ee984257..fdd4bff9 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java @@ -22,6 +22,7 @@ package org.apache.amber.oauth2.client.demo.controller; import java.io.IOException; + import javax.servlet.http.HttpServletRequest; import org.apache.amber.oauth2.client.OAuthClient; @@ -30,18 +31,17 @@ import org.apache.amber.oauth2.client.demo.exception.ApplicationException; import org.apache.amber.oauth2.client.demo.model.OAuthParams; import org.apache.amber.oauth2.client.request.OAuthClientRequest; +import org.apache.amber.oauth2.client.response.GitHubTokenResponse; import org.apache.amber.oauth2.client.response.OAuthAccessTokenResponse; +import org.apache.amber.oauth2.client.response.OAuthJSONAccessTokenResponse; import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.apache.amber.oauth2.common.message.types.GrantType; -import org.apache.amber.oauth2.client.response.GitHubTokenResponse; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import org.apache.amber.oauth2.client.response.OAuthJSONAccessTokenResponse; - /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -84,7 +84,7 @@ public ModelAndView authorize(@ModelAttribute("oauthParams") OAuthParams oauthPa oauthResponse = client.accessToken(request, cl); oauthParams.setAccessToken(oauthResponse.getAccessToken()); - oauthParams.setExpiresIn(Utils.isIssued(oauthResponse.getExpiresIn())); + oauthParams.setExpiresIn(oauthResponse.getExpiresIn()); oauthParams.setRefreshToken(Utils.isIssued(oauthResponse.getRefreshToken())); return new ModelAndView("get_resource"); diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java index 37f85cc0..30860d5e 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java @@ -36,7 +36,7 @@ public class OAuthParams { private String tokenEndpoint; private String authzCode; private String accessToken; - private String expiresIn; + private long expiresIn; private String refreshToken; private String scope; private String resourceUrl; @@ -109,11 +109,15 @@ public void setAccessToken(String accessToken) { this.accessToken = accessToken; } - public String getExpiresIn() { + public long getExpiresIn() { return expiresIn; } public void setExpiresIn(String expiresIn) { + this.expiresIn = Long.parseLong(expiresIn); + } + + public void setExpiresIn(long expiresIn) { this.expiresIn = expiresIn; } diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java index 127e8c98..13415117 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java @@ -36,7 +36,7 @@ */ public class ClientHeaderParametersApplier implements OAuthParametersApplier { - public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) + public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) throws OAuthSystemException { String header = OAuthUtils.encodeOAuthHeader(params); diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java index 7252572d..0da8ae5f 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java @@ -98,7 +98,7 @@ public void setHeader(String name, String value) { public abstract static class OAuthRequestBuilder { protected OAuthParametersApplier applier; - protected Map parameters = new HashMap(); + protected Map parameters = new HashMap(); protected String url; diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java index 3748f34a..0de0f457 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java @@ -21,10 +21,10 @@ package org.apache.amber.oauth2.client.response; +import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.token.BasicOAuthToken; import org.apache.amber.oauth2.common.token.OAuthToken; import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.OAuth; /** @@ -36,19 +36,20 @@ public class GitHubTokenResponse extends OAuthAccessTokenResponse { public String getAccessToken() { - return parameters.get(OAuth.OAUTH_ACCESS_TOKEN); + return getParam(OAuth.OAUTH_ACCESS_TOKEN); } - public String getExpiresIn() { - return parameters.get(OAuth.OAUTH_EXPIRES_IN); + public Long getExpiresIn() { + String value = getParam(OAuth.OAUTH_EXPIRES_IN); + return value == null? null: Long.valueOf(value); } public String getRefreshToken() { - return parameters.get(OAuth.OAUTH_EXPIRES_IN); + return getParam(OAuth.OAUTH_EXPIRES_IN); } public String getScope() { - return parameters.get(OAuth.OAUTH_SCOPE); + return getParam(OAuth.OAUTH_SCOPE); } public OAuthToken getOAuthToken() { @@ -68,10 +69,5 @@ protected void setResponseCode(int code) { this.responseCode = code; } - public String getParam(String name) { - return parameters.get(name); - } - - } diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java index 96032687..6b01f6a0 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java @@ -34,7 +34,7 @@ public abstract class OAuthAccessTokenResponse extends OAuthClientResponse { public abstract String getAccessToken(); - public abstract String getExpiresIn(); + public abstract Long getExpiresIn(); public abstract String getRefreshToken(); diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java index fc5881f2..5e2bbe1f 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java @@ -22,6 +22,7 @@ package org.apache.amber.oauth2.client.response; import java.util.Map; + import javax.servlet.http.HttpServletRequest; import org.apache.amber.oauth2.client.validator.CodeTokenValidator; @@ -80,8 +81,9 @@ public String getAccessToken() { return getParam(OAuth.OAUTH_ACCESS_TOKEN); } - public String getExpiresIn() { - return getParam(OAuth.OAUTH_EXPIRES_IN); + public Long getExpiresIn() { + String value = getParam(OAuth.OAUTH_EXPIRES_IN); + return value == null? null: Long.valueOf(value); } public String getScope() { @@ -100,10 +102,6 @@ public HttpServletRequest getRequest() { return request; } - public String getParam(String key) { - return this.parameters.get(key); - } - protected void setBody(String body) { this.body = body; } diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java index bce1dd32..2619b00d 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java @@ -39,9 +39,12 @@ public abstract class OAuthClientResponse { protected int responseCode; protected OAuthClientValidator validator; - protected Map parameters = new HashMap(); + protected Map parameters = new HashMap(); - public abstract String getParam(String param); + public String getParam(String param) { + Object value = parameters.get(param); + return value == null ? null : String.valueOf(value); + } protected abstract void setBody(String body) throws OAuthProblemException; @@ -60,4 +63,5 @@ protected void init(String body, String contentType, int responseCode) throws OA protected void validate() throws OAuthProblemException { validator.validate(this); } + } diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java index 8b82ee06..abc433e0 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java @@ -41,16 +41,17 @@ public OAuthJSONAccessTokenResponse() { @Override public String getAccessToken() { - return parameters.get(OAuth.OAUTH_ACCESS_TOKEN); + return getParam(OAuth.OAUTH_ACCESS_TOKEN); } @Override - public String getExpiresIn() { - return parameters.get(OAuth.OAUTH_EXPIRES_IN); + public Long getExpiresIn() { + String value = getParam(OAuth.OAUTH_EXPIRES_IN); + return value == null? null: Long.valueOf(value); } public String getScope() { - return parameters.get(OAuth.OAUTH_SCOPE); + return getParam(OAuth.OAUTH_SCOPE); } public OAuthToken getOAuthToken() { @@ -58,7 +59,7 @@ public OAuthToken getOAuthToken() { } public String getRefreshToken() { - return parameters.get(OAuth.OAUTH_REFRESH_TOKEN); + return getParam(OAuth.OAUTH_REFRESH_TOKEN); } protected void setBody(String body) throws OAuthProblemException { @@ -81,8 +82,4 @@ protected void setResponseCode(int code) { this.responseCode = code; } - public String getParam(String name) { - return parameters.get(name); - } - } diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java index ad50a9a5..070a048d 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java @@ -23,12 +23,12 @@ import org.apache.amber.oauth2.client.utils.TestUtils; import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.amber.oauth2.common.error.OAuthError; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -147,7 +147,7 @@ public void testSetBody() throws Exception { } String accessToken = r.getAccessToken(); - String expiresIn = r.getExpiresIn(); + Long expiresIn = r.getExpiresIn(); Assert.assertEquals(TestUtils.EXPIRES_IN, expiresIn); Assert.assertEquals(TestUtils.ACCESS_TOKEN, accessToken); diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java index 7e39625b..5e44f1b4 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java @@ -21,12 +21,12 @@ package org.apache.amber.oauth2.client.utils; +import static org.easymock.EasyMock.expect; + import javax.servlet.http.HttpServletRequest; import org.apache.amber.oauth2.common.error.OAuthError; -import static org.easymock.EasyMock.expect; - /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -41,7 +41,7 @@ private TestUtils() { = "{\"expires_in\":3600,\"access_token\":\"b52d434791fd52316232b6cf2d3\",\"scope\":\"read\"," + "\"refresh_token\":\"test_refresh_token\"}"; - public static final String EXPIRES_IN = "3600"; + public static final Long EXPIRES_IN = 3600l; public static final String ACCESS_TOKEN = "b52d434791fd52316232b6cf2d3"; public static final String SCOPE = "read"; public static final String REFRESH_TOKEN = "test_refresh_token"; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java index 219aa238..fd56982c 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java @@ -107,7 +107,7 @@ public void addHeader(String name, String header) { public static class OAuthResponseBuilder { protected OAuthParametersApplier applier; - protected Map parameters = new HashMap(); + protected Map parameters = new HashMap(); protected int responseCode; protected String location; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java index 5f4bd068..ec528378 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java @@ -34,7 +34,7 @@ */ public class BodyURLEncodedParametersApplier implements OAuthParametersApplier { - public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) + public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) throws OAuthSystemException { String body = OAuthUtils.format(params.entrySet(), "UTF-8"); diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java index 96bb940c..e353b1a8 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java @@ -23,19 +23,18 @@ import java.util.Map; +import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.apache.amber.oauth2.common.message.OAuthMessage; import org.apache.amber.oauth2.common.utils.JSONUtils; import org.codehaus.jettison.json.JSONException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; - /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) */ public class JSONBodyParametersApplier implements OAuthParametersApplier { - public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) + public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) throws OAuthSystemException { String json = null; try { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java index 82683220..ebd7bfdd 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java @@ -44,6 +44,6 @@ */ public interface OAuthParametersApplier { - OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) throws + OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) throws OAuthSystemException; } diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java index e71d2086..bd39e76f 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java @@ -35,7 +35,7 @@ */ public class QueryParameterApplier implements OAuthParametersApplier { - public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) { + public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) { String messageUrl = message.getLocationUri(); if (messageUrl != null) { @@ -43,7 +43,7 @@ public OAuthMessage applyOAuthParameters(OAuthMessage message, Map fragmentParams = new LinkedHashMap(); + Map fragmentParams = new LinkedHashMap(); if (params.containsKey(OAuth.OAUTH_ACCESS_TOKEN)) { fragmentParams.put(OAuth.OAUTH_ACCESS_TOKEN, params.remove(OAuth.OAUTH_ACCESS_TOKEN)); diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java index 06d95a26..76e6b5e0 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java @@ -23,10 +23,10 @@ import java.util.Map; +import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.apache.amber.oauth2.common.message.OAuthMessage; import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.OAuth; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -35,7 +35,7 @@ */ public class WWWAuthHeaderParametersApplier implements OAuthParametersApplier { - public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) + public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) throws OAuthSystemException { String header = OAuthUtils.encodeOAuthHeader(params); message.addHeader(OAuth.HeaderType.WWW_AUTHENTICATE, header); diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java index 51e9fef3..963d3d1f 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java @@ -5,14 +5,14 @@ */ public class BasicOAuthToken implements OAuthToken { protected String accessToken; - protected String expiresIn; + protected Long expiresIn; protected String refreshToken; protected String scope; public BasicOAuthToken() { } - public BasicOAuthToken(String accessToken, String expiresIn, String refreshToken, String scope) { + public BasicOAuthToken(String accessToken, Long expiresIn, String refreshToken, String scope) { this.accessToken = accessToken; this.expiresIn = expiresIn; this.refreshToken = refreshToken; @@ -23,11 +23,11 @@ public BasicOAuthToken(String accessToken) { this(accessToken, null, null, null); } - public BasicOAuthToken(String accessToken, String expiresIn) { + public BasicOAuthToken(String accessToken, Long expiresIn) { this(accessToken, expiresIn, null, null); } - public BasicOAuthToken(String accessToken, String expiresIn, String scope) { + public BasicOAuthToken(String accessToken, Long expiresIn, String scope) { this(accessToken, expiresIn, null, scope); } @@ -35,7 +35,7 @@ public String getAccessToken() { return accessToken; } - public String getExpiresIn() { + public Long getExpiresIn() { return expiresIn; } diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java index 0517761a..f69f6971 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java @@ -7,7 +7,7 @@ public interface OAuthToken { public String getAccessToken(); - public String getExpiresIn(); + public Long getExpiresIn(); public String getRefreshToken(); diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java index 9d8022e5..fb8e0362 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java @@ -35,9 +35,9 @@ */ public final class JSONUtils { - public static String buildJSON(Map params) throws JSONException { + public static String buildJSON(Map params) throws JSONException { JSONObject jsonObject = new JSONObject(); - for (Map.Entry param : params.entrySet()) { + for (Map.Entry param : params.entrySet()) { if (param.getKey() != null && !"".equals(param.getKey()) && param.getValue() != null && !"" .equals(param.getValue())) { jsonObject.put(param.getKey(), param.getValue()); @@ -47,16 +47,16 @@ public static String buildJSON(Map params) throws JSONException return jsonObject.toString(); } - public static Map parseJSON(String jsonBody) throws JSONException { + public static Map parseJSON(String jsonBody) throws JSONException { - Map params = new HashMap(); + Map params = new HashMap(); JSONObject obj = new JSONObject(jsonBody); Iterator it = obj.keys(); while (it.hasNext()) { Object o = it.next(); if (o instanceof String) { String key = (String)o; - params.put(key, obj.getString(key)); + params.put(key, obj.get(key)); } } return params; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java index 45aa1bbc..748e7e91 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java @@ -82,14 +82,14 @@ public final class OAuthUtils { * @return Translated string */ public static String format( - final Collection> parameters, + final Collection> parameters, final String encoding) { final StringBuilder result = new StringBuilder(); - for (final Map.Entry parameter : parameters) { + for (final Map.Entry parameter : parameters) { + String value = parameter.getValue() == null? null : String.valueOf(parameter.getValue()); if (!OAuthUtils.isEmpty(parameter.getKey()) - && !OAuthUtils.isEmpty(parameter.getValue())) { + && !OAuthUtils.isEmpty(value)) { final String encodedName = encode(parameter.getKey(), encoding); - final String value = parameter.getValue(); final String encodedValue = value != null ? encode(value, encoding) : ""; if (result.length() > 0) { result.append(PARAMETER_SEPARATOR); @@ -204,8 +204,8 @@ public static OAuthProblemException handleNotAllowedParametersOAuthException( /** * Parse a form-urlencoded document. */ - public static Map decodeForm(String form) { - Map params = new HashMap(); + public static Map decodeForm(String form) { + Map params = new HashMap(); if (!OAuthUtils.isEmpty(form)) { for (String nvp : form.split("\\&")) { int equals = nvp.indexOf('='); @@ -366,14 +366,15 @@ public static Map decodeOAuthHeader(String header) { /** * Construct a WWW-Authenticate or Authorization header with the OAuth challenge/credentials */ - public static String encodeOAuthHeader(Map entries) { + public static String encodeOAuthHeader(Map entries) { StringBuffer sb = new StringBuffer(); sb.append(OAuth.OAUTH_HEADER_NAME).append(" "); - for (Map.Entry entry : entries.entrySet()) { - if (!OAuthUtils.isEmpty(entry.getKey()) && !OAuthUtils.isEmpty(entry.getValue())) { + for (Map.Entry entry : entries.entrySet()) { + String value = entry.getValue() == null? null: String.valueOf(entry.getValue()); + if (!OAuthUtils.isEmpty(entry.getKey()) && !OAuthUtils.isEmpty(value)) { sb.append(entry.getKey()); sb.append("=\""); - sb.append(entry.getValue()); + sb.append(value); sb.append("\","); } } diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java index 16ac48c1..bf101ca9 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java @@ -23,17 +23,17 @@ import java.util.HashMap; import java.util.Map; + import javax.xml.stream.XMLStreamReader; import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.amber.oauth2.common.utils.JSONUtils; +import org.apache.amber.oauth2.common.utils.OAuthUtils; import org.codehaus.jettison.AbstractXMLStreamReader; import org.codehaus.jettison.json.JSONObject; import org.codehaus.jettison.mapped.MappedXMLStreamReader; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.utils.OAuthUtils; - -import org.apache.amber.oauth2.common.utils.JSONUtils; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -44,7 +44,7 @@ public class OAuthUtilsTest extends Assert { @Test public void testBuildJSON() throws Exception { - Map params = new HashMap(); + Map params = new HashMap(); params.put(OAuthError.OAUTH_ERROR, OAuthError.TokenResponse.INVALID_REQUEST); String json = JSONUtils.buildJSON(params); @@ -66,7 +66,7 @@ public void testBuildJSON() throws Exception { @Test public void testEncodeOAuthHeader() throws Exception { - Map entries = new HashMap(); + Map entries = new HashMap(); entries.put("realm", "Some Example Realm"); entries.put("error", "invalid_token"); diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java index a137e847..9d48dd03 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java @@ -24,11 +24,11 @@ import java.util.HashMap; import java.util.Map; +import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.common.message.OAuthMessage; import org.apache.amber.oauth2.common.utils.DummyOAuthMessage; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.message.OAuthMessage; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -42,8 +42,8 @@ public void testApplyOAuthParameters() throws Exception { OAuthParametersApplier app = new BodyURLEncodedParametersApplier(); - Map params = new HashMap(); - params.put(OAuth.OAUTH_EXPIRES_IN, "3600"); + Map params = new HashMap(); + params.put(OAuth.OAUTH_EXPIRES_IN, 3600l); params.put(OAuth.OAUTH_ACCESS_TOKEN, "token_authz"); params.put(OAuth.OAUTH_CODE, "code_"); params.put(OAuth.OAUTH_SCOPE, "read"); diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java index 99bb90f2..219a4292 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java @@ -43,8 +43,8 @@ public void testApplyOAuthParameters() throws Exception { OAuthParametersApplier app = new JSONBodyParametersApplier(); - Map params = new HashMap(); - params.put(OAuth.OAUTH_EXPIRES_IN, "3600"); + Map params = new HashMap(); + params.put(OAuth.OAUTH_EXPIRES_IN, 3600l); params.put(OAuth.OAUTH_ACCESS_TOKEN, "token_authz"); params.put(OAuth.OAUTH_CODE, "code_"); params.put(OAuth.OAUTH_SCOPE, "read"); @@ -58,8 +58,8 @@ public void testApplyOAuthParameters() throws Exception { app.applyOAuthParameters(message, params); String msgBody = message.getBody(); - Map map = JSONUtils.parseJSON(msgBody); - Assert.assertEquals("3600", map.get(OAuth.OAUTH_EXPIRES_IN)); + Map map = JSONUtils.parseJSON(msgBody); + Assert.assertEquals(3600, map.get(OAuth.OAUTH_EXPIRES_IN)); Assert.assertEquals("token_authz", map.get(OAuth.OAUTH_ACCESS_TOKEN)); Assert.assertEquals("code_", map.get(OAuth.OAUTH_CODE)); Assert.assertEquals("read", map.get(OAuth.OAUTH_SCOPE)); diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java index 98cb7f78..15d0a587 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java @@ -25,10 +25,10 @@ import java.util.Map; import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.common.message.OAuthMessage; import org.apache.amber.oauth2.common.utils.DummyOAuthMessage; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.message.OAuthMessage; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -42,8 +42,8 @@ public void testApplyOAuthParameters() throws Exception { OAuthParametersApplier app = new QueryParameterApplier(); - Map params = new HashMap(); - params.put(OAuth.OAUTH_EXPIRES_IN, "3600"); + Map params = new HashMap(); + params.put(OAuth.OAUTH_EXPIRES_IN, 3600l); params.put(OAuth.OAUTH_ACCESS_TOKEN, "token_authz"); params.put(OAuth.OAUTH_CODE, "code_"); params.put(OAuth.OAUTH_SCOPE, "read"); diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java index b1a96294..e22d5d87 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java @@ -24,12 +24,10 @@ import java.util.HashMap; import java.util.Map; +import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.amber.oauth2.common.parameters.OAuthParametersApplier; -import org.apache.amber.oauth2.common.parameters.WWWAuthHeaderParametersApplier; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.OAuth; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -41,7 +39,7 @@ public class WWWAuthHeaderParametersApplierTest { @Test public void testApplyOAuthParameters() throws Exception { - Map params = new HashMap(); + Map params = new HashMap(); params.put("error", "invalid_token"); params.put("error_uri", "http://www.example.com/error"); params.put("scope", "s1 s2 s3"); diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java index 9072cd8b..63c31a2e 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java @@ -23,10 +23,10 @@ import java.util.HashMap; import java.util.Map; + import javax.xml.stream.XMLStreamReader; import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.utils.JSONUtils; import org.codehaus.jettison.AbstractXMLStreamReader; import org.codehaus.jettison.json.JSONObject; import org.codehaus.jettison.mapped.MappedXMLStreamReader; @@ -43,7 +43,7 @@ public class JSONUtilsTest { @Test public void testBuildJSON() throws Exception { - Map params = new HashMap(); + Map params = new HashMap(); params.put(OAuthError.OAUTH_ERROR, OAuthError.TokenResponse.INVALID_REQUEST); String json = JSONUtils.buildJSON(params); @@ -64,12 +64,12 @@ public void testBuildJSON() throws Exception { @Test public void testParseJson() throws Exception { - Map jsonParams = new HashMap(); + Map jsonParams = new HashMap(); jsonParams.put("author", "John B. Smith"); jsonParams.put("year", "2000"); String s = JSONUtils.buildJSON(jsonParams); - Map map = JSONUtils.parseJSON(s); + Map map = JSONUtils.parseJSON(s); Assert.assertEquals("John B. Smith", map.get("author")); Assert.assertEquals("2000", map.get("year")); diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java index 4d79191a..5a32a812 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java @@ -28,13 +28,11 @@ import java.util.Map; import java.util.Set; +import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.OAuth; - -import org.apache.amber.oauth2.common.error.OAuthError; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -44,7 +42,7 @@ public class OAuthUtilsTest { @Test public void testFormat() throws Exception { - Map parameters = new HashMap(); + Map parameters = new HashMap(); parameters.put("movie", "Kiler"); parameters.put("director", "Machulski"); diff --git a/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java b/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java index 0854bb9b..2ebcca7c 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java +++ b/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java @@ -21,13 +21,13 @@ package org.apache.amber.oauth2.ext.dynamicreg.client.response; +import org.apache.amber.oauth2.client.response.OAuthClientResponse; import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.utils.JSONUtils; import org.apache.amber.oauth2.ext.dynamicreg.client.validators.RegistrationValidator; import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; import org.codehaus.jettison.json.JSONException; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; /** @@ -46,10 +46,6 @@ protected void init(String body, String contentType, int responseCode) throws OA super.init(body, contentType, responseCode); } - @Override - public String getParam(String param) { - return parameters.get(param); - } protected void setBody(String body) throws OAuthProblemException { try { @@ -70,19 +66,20 @@ protected void setContentType(String contentType) { } public String getClientId() { - return parameters.get(OAuthRegistration.Response.CLIENT_ID); + return getParam(OAuthRegistration.Response.CLIENT_ID); } public String getClientSecret() { - return parameters.get(OAuthRegistration.Response.CLIENT_SECRET); + return getParam(OAuthRegistration.Response.CLIENT_SECRET); } public String getIssuedAt() { - return parameters.get(OAuthRegistration.Response.ISSUED_AT); + return getParam(OAuthRegistration.Response.ISSUED_AT); } - public String getExpiresIn() { - return parameters.get(OAuthRegistration.Response.EXPIRES_IN); + public Long getExpiresIn() { + String value = getParam(OAuthRegistration.Response.EXPIRES_IN); + return value == null? null: Long.valueOf(value); } } diff --git a/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java b/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java index 5def5153..26abb4bd 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java +++ b/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java @@ -61,6 +61,11 @@ public OAuthRegistrationResponseBuilder setIssuedAt(String value) { } public OAuthRegistrationResponseBuilder setExpiresIn(String value) { + this.parameters.put(OAuthRegistration.Response.EXPIRES_IN, Long.parseLong(value)); + return this; + } + + public OAuthRegistrationResponseBuilder setExpiresIn(Long value) { this.parameters.put(OAuthRegistration.Response.EXPIRES_IN, value); return this; } diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java index 7995ce6a..49549f2c 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java @@ -40,6 +40,6 @@ private CommonExt() { public static final String CLIENT_ID = "someclientid"; public static final String CLIENT_SECRET = "someclientsecret"; public static final String ISSUED_AT = "0123456789"; - public static final String EXPIRES_IN = "987654321"; + public static final Long EXPIRES_IN = 987654321l; } diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java index 3e8a96ec..a219f00b 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java @@ -23,6 +23,7 @@ import java.net.HttpURLConnection; import java.util.Map; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.GET; @@ -31,14 +32,14 @@ import javax.ws.rs.core.Response; import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.message.types.ResponseType; -import org.junit.Test; import org.apache.amber.oauth2.client.response.OAuthAuthzResponse; import org.apache.amber.oauth2.client.response.OAuthClientResponse; +import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.amber.oauth2.common.message.types.ResponseType; import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.junit.Test; /** * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) @@ -87,7 +88,7 @@ public void testTokenResponse() throws Exception { HttpURLConnection c = Common.doRequest(request); String fragment = c.getURL().toURI().getFragment(); - Map map = OAuthUtils.decodeForm(fragment); + Map map = OAuthUtils.decodeForm(fragment); assertNotNull(map.get(OAuth.OAUTH_EXPIRES_IN)); assertNotNull(map.get(OAuth.OAUTH_ACCESS_TOKEN)); diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java index 170a28c1..cea4fce4 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java @@ -73,7 +73,7 @@ public Response authorize(@Context HttpServletRequest request) } if (responseType.equals(ResponseType.TOKEN.toString())) { builder.setAccessToken(oauthIssuerImpl.accessToken()); - builder.setExpiresIn(String.valueOf(3600)); + builder.setExpiresIn(3600l); } String redirectURI = oauthRequest.getParam(OAuth.OAUTH_REDIRECT_URI); From ccfd98d99100811d906b205cda355bc8b56f2a88 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Thu, 7 Jun 2012 07:07:09 +0000 Subject: [PATCH 090/583] [AMBER-54] - excluding .idea directory from RAT check in release profile git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1347420 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index fba19746..0cddab58 100644 --- a/pom.xml +++ b/pom.xml @@ -652,6 +652,7 @@ DISCLAIMER KEYS NOTICE + .idea/** From 6ca96f81f3f545eaa50c5950b7a6a754728f321b Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Thu, 7 Jun 2012 07:37:42 +0000 Subject: [PATCH 091/583] [AMBER-54] - adding my gpg key to KEYS git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1347443 13f79535-47bb-0310-9956-ffa450edef68 --- KEYS | 91 +++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 19 deletions(-) diff --git a/KEYS b/KEYS index 6b989676..49109e6c 100644 --- a/KEYS +++ b/KEYS @@ -300,22 +300,75 @@ pub 2048R/B58B0910 2011-07-16 uid Lukasz Moren sig 3 B58B0910 2011-07-16 Lukasz Moren ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.17 (MingW32) - -mQENBE4hlPUBCAChCiZcLoXKT3FaIJh3tGqvPP3UzmRxwOO6yJ9ekt0qxKwaciAo -/Ht8w7EC13GpiARZCox95gziobV0Ykp7Imzf0Eq0ElZO8PoR5xogKUoSspe/Xg4F -yAZshIevWGjIB+3Z2yYJNMa+x8b0VOb6iRhYyfaNGpTK7iu2xtL8x4VTU0zs83mj -HdHcrORwEdr6Cnk/5oUz522soslgAWsAc3Jjfa0gZyiL1oJ2xBZJ3vTixxBU5GRj -/Su522pqQrzXd+bYCXut8dZrUb44ldJuASi3fGMKTeJMrFzxqWXvgsOnDrMVa4av -W1SZiJe1F55UV2zXZ5xlpQMM5/paQxEkKii1ABEBAAG0JUx1a2FzeiBNb3JlbiA8 -bHVrYXN6Lm1vcmVuQGdtYWlsLmNvbT6JATcEEwEKACEFAk4hlPUCGw8FCwkIBwMF -FQoJCAsFFgIDAQACHgECF4AACgkQeKA0MrWLCRByIQf/T4EBzxcfd2EgpdXcEd6/ -y/jl6TzMJ3UTaDAB9OFfc2q6CYQ2j9cQz49ycp5OwI5zo0O0+CVGfadtiW993t3D -r5uq36m1RjfM8RQDnul7MpT/Ujaxht1CdDzzet0VeQ/6NfyZps/LMZxV2bstkSuN -9BwgRwZJlRDT5nYYwpBwBuRLTR1yvcxDvVI5KBvjXVq5SxJVBIDKCxMC1fDJbmI7 -wqbn0GDvU0+VJkBFcMLkltF8TVMk/VFuZ5wtKmep9EP3JPsffIVsV/TVPa+VUvAR -akJqtvS0RBsqAT0pJ8gOYj6OvPwWkPtEvh4IfO5ajwWV+MasebWJKS+oUq50p2Q7 -GQ== -=EfW1 ------END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.17 (MingW32) + +mQENBE4hlPUBCAChCiZcLoXKT3FaIJh3tGqvPP3UzmRxwOO6yJ9ekt0qxKwaciAo +/Ht8w7EC13GpiARZCox95gziobV0Ykp7Imzf0Eq0ElZO8PoR5xogKUoSspe/Xg4F +yAZshIevWGjIB+3Z2yYJNMa+x8b0VOb6iRhYyfaNGpTK7iu2xtL8x4VTU0zs83mj +HdHcrORwEdr6Cnk/5oUz522soslgAWsAc3Jjfa0gZyiL1oJ2xBZJ3vTixxBU5GRj +/Su522pqQrzXd+bYCXut8dZrUb44ldJuASi3fGMKTeJMrFzxqWXvgsOnDrMVa4av +W1SZiJe1F55UV2zXZ5xlpQMM5/paQxEkKii1ABEBAAG0JUx1a2FzeiBNb3JlbiA8 +bHVrYXN6Lm1vcmVuQGdtYWlsLmNvbT6JATcEEwEKACEFAk4hlPUCGw8FCwkIBwMF +FQoJCAsFFgIDAQACHgECF4AACgkQeKA0MrWLCRByIQf/T4EBzxcfd2EgpdXcEd6/ +y/jl6TzMJ3UTaDAB9OFfc2q6CYQ2j9cQz49ycp5OwI5zo0O0+CVGfadtiW993t3D +r5uq36m1RjfM8RQDnul7MpT/Ujaxht1CdDzzet0VeQ/6NfyZps/LMZxV2bstkSuN +9BwgRwZJlRDT5nYYwpBwBuRLTR1yvcxDvVI5KBvjXVq5SxJVBIDKCxMC1fDJbmI7 +wqbn0GDvU0+VJkBFcMLkltF8TVMk/VFuZ5wtKmep9EP3JPsffIVsV/TVPa+VUvAR +akJqtvS0RBsqAT0pJ8gOYj6OvPwWkPtEvh4IfO5ajwWV+MasebWJKS+oUq50p2Q7 +GQ== +=EfW1 +-----END PGP PUBLIC KEY BLOCK----- + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG/MacGPG2 v2.0.17 (Darwin) + +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 +HrOQ +=H63W +-----END PGP PUBLIC KEY BLOCK----- From 549d656221030ce6782e9fd97fb6ac426d178293 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Thu, 7 Jun 2012 07:38:39 +0000 Subject: [PATCH 092/583] [AMBER-54] - adding my gpg key to KEYS git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1347444 13f79535-47bb-0310-9956-ffa450edef68 --- KEYS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/KEYS b/KEYS index 49109e6c..318063d5 100644 --- a/KEYS +++ b/KEYS @@ -320,6 +320,10 @@ GQ== =EfW1 -----END PGP PUBLIC KEY BLOCK----- +pub 4096R/891768A5 2012-06-07 + Key fingerprint = 4089 6E15 E256 D790 92DA 42F6 E1BE E911 8917 68A5 +uid Tommaso Teofili +sub 4096R/6F037735 2012-06-07 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) From 21a1753683f21374d709344a7256abc0e8a2ed6c Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Thu, 7 Jun 2012 07:52:12 +0000 Subject: [PATCH 093/583] [AMBER-54] - added missing license headers, starting removing @author tags git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1347455 13f79535-47bb-0310-9956-ffa450edef68 --- .../domain/credentials/BasicCredentials.java | 21 ++++++++++++++---- .../credentials/BasicCredentialsBuilder.java | 20 +++++++++++++++++ .../domain/credentials/Credentials.java | 21 ++++++++++++++---- .../oauth2/common/token/BasicOAuthToken.java | 22 ++++++++++++++++++- .../amber/oauth2/common/token/OAuthToken.java | 22 ++++++++++++++++++- .../domain/BasicClientInfoBuilderTest.java | 22 ++++++++++++++++++- 6 files changed, 117 insertions(+), 11 deletions(-) diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java index 63b25eb4..44263bb8 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java @@ -1,10 +1,23 @@ /** - * Copyright 2011 Newcastle University. All rights reserved. - * Maciej Machulak, Lukasz Moren, Aad van Moorsel + * Copyright 2010 Newcastle University * - * http://research.ncl.ac.uk/smart/ + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.amber.oauth2.common.domain.credentials; import java.lang.Long;import java.lang.Object;import java.lang.Override;import java.lang.String; /** diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java index a30b4934..7660fa2b 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java @@ -1,3 +1,23 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.amber.oauth2.common.domain.credentials; /** diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java index 4d7daddc..fb57e79a 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java @@ -1,10 +1,23 @@ /** - * Copyright 2011 Newcastle University. All rights reserved. - * Maciej Machulak, Lukasz Moren, Aad van Moorsel + * Copyright 2010 Newcastle University * - * http://research.ncl.ac.uk/smart/ + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.amber.oauth2.common.domain.credentials; import java.lang.Long;import java.lang.String; /** diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java index 963d3d1f..18c07814 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java @@ -1,7 +1,27 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.amber.oauth2.common.token; /** - * @author Lukasz Moren + * */ public class BasicOAuthToken implements OAuthToken { protected String accessToken; diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java index f69f6971..8b34f288 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java @@ -1,7 +1,27 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.amber.oauth2.common.token; /** - * @author Lukasz Moren + * */ public interface OAuthToken { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/domain/BasicClientInfoBuilderTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/domain/BasicClientInfoBuilderTest.java index 819d4aaa..01df62f4 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/domain/BasicClientInfoBuilderTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/domain/BasicClientInfoBuilderTest.java @@ -1,3 +1,23 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.amber.oauth2.common.domain; import org.apache.amber.oauth2.common.domain.client.BasicClientInfo; @@ -6,7 +26,7 @@ import org.junit.Test; /** - * @author Lukasz Moren + * */ public class BasicClientInfoBuilderTest { From cd318580f4f7a40d17898d5778bd720b521ddd0b Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Thu, 7 Jun 2012 16:38:56 +0000 Subject: [PATCH 094/583] [AMBER-54] - removed all @author tags git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1347707 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/amber/oauth2/as/issuer/MD5Generator.java | 5 ++--- .../apache/amber/oauth2/as/issuer/OAuthIssuer.java | 6 +++--- .../amber/oauth2/as/issuer/OAuthIssuerImpl.java | 6 +++--- .../amber/oauth2/as/issuer/UUIDValueGenerator.java | 6 +++--- .../amber/oauth2/as/issuer/ValueGenerator.java | 6 +++--- .../amber/oauth2/as/request/OAuthAuthzRequest.java | 6 +++--- .../apache/amber/oauth2/as/request/OAuthRequest.java | 6 +++--- .../amber/oauth2/as/request/OAuthTokenRequest.java | 6 +++--- .../amber/oauth2/as/response/OAuthASResponse.java | 6 +++--- .../oauth2/as/validator/AssertionValidator.java | 6 +++--- .../as/validator/AuthorizationCodeValidator.java | 6 +++--- .../oauth2/as/validator/CodeTokenValidator.java | 6 +++--- .../amber/oauth2/as/validator/CodeValidator.java | 6 +++--- .../amber/oauth2/as/validator/PasswordValidator.java | 6 +++--- .../oauth2/as/validator/RefreshTokenValidator.java | 6 +++--- .../amber/oauth2/as/validator/TokenValidator.java | 6 +++--- .../org/apache/amber/oauth2/as/MD5GeneratorTest.java | 6 +++--- .../apache/amber/oauth2/as/OAuthIssuerImplTest.java | 6 +++--- .../org/apache/amber/oauth2/as/OAuthRequestTest.java | 6 +++--- .../amber/oauth2/as/UUIDValueGeneratorTest.java | 6 +++--- .../oauth2/as/response/OAuthASResponseTest.java | 6 +++--- .../oauth2/as/validator/TokenValidatorTest.java | 6 +++--- .../org/apache/amber/oauth2/client/demo/Utils.java | 6 +++--- .../client/demo/controller/AuthzController.java | 2 -- .../client/demo/controller/MainController.java | 6 +++--- .../client/demo/controller/RedirectController.java | 6 +++--- .../demo/controller/RegistrationController.java | 6 +++--- .../client/demo/controller/ResourceController.java | 6 +++--- .../client/demo/controller/TokenController.java | 6 +++--- .../client/demo/exception/ApplicationException.java | 6 +++--- .../amber/oauth2/client/demo/model/OAuthParams.java | 6 +++--- .../oauth2/client/demo/model/OAuthRegParams.java | 6 +++--- .../org/apache/amber/oauth2/client/HttpClient.java | 6 +++--- .../org/apache/amber/oauth2/client/OAuthClient.java | 6 +++--- .../amber/oauth2/client/URLConnectionClient.java | 6 +++--- .../request/ClientHeaderParametersApplier.java | 6 +++--- .../oauth2/client/request/OAuthClientRequest.java | 6 +++--- .../oauth2/client/response/GitHubTokenResponse.java | 6 +++--- .../client/response/OAuthAccessTokenResponse.java | 6 +++--- .../oauth2/client/response/OAuthAuthzResponse.java | 6 +++--- .../oauth2/client/response/OAuthClientResponse.java | 6 +++--- .../client/response/OAuthClientResponseFactory.java | 6 +++--- .../oauth2/client/response/OAuthErrorResponse.java | 6 +++--- .../response/OAuthJSONAccessTokenResponse.java | 6 +++--- .../oauth2/client/validator/CodeTokenValidator.java | 6 +++--- .../amber/oauth2/client/validator/CodeValidator.java | 6 +++--- .../client/validator/OAuthClientValidator.java | 6 +++--- .../oauth2/client/validator/TokenValidator.java | 6 +++--- .../apache/amber/oauth2/client/OAuthClientTest.java | 6 +++--- .../client/response/GitHubTokenResponseTest.java | 6 +++--- .../response/OAuthAuthorizationResponseImplTest.java | 6 +++--- .../response/OAuthClientResponseFactoryTest.java | 6 +++--- .../response/OAuthJSONAccessTokenResponseTest.java | 6 +++--- .../apache/amber/oauth2/client/utils/TestUtils.java | 6 +++--- .../client/validator/CodeTokenValidatorTest.java | 12 +++++------- .../oauth2/client/validator/CodeValidatorTest.java | 6 +++--- .../oauth2/client/validator/TokenValidatorTest.java | 6 +++--- .../java/org/apache/amber/oauth2/common/OAuth.java | 6 +++--- .../oauth2/common/domain/client/BasicClientInfo.java | 6 +++--- .../common/domain/client/BasicClientInfoBuilder.java | 1 - .../oauth2/common/domain/client/ClientInfo.java | 6 +++--- .../common/domain/credentials/BasicCredentials.java | 6 +++--- .../domain/credentials/BasicCredentialsBuilder.java | 1 - .../common/domain/credentials/Credentials.java | 6 +++--- .../apache/amber/oauth2/common/error/OAuthError.java | 6 +++--- .../common/exception/OAuthProblemException.java | 6 +++--- .../common/exception/OAuthRuntimeException.java | 1 - .../common/exception/OAuthSystemException.java | 4 ++-- .../amber/oauth2/common/message/OAuthMessage.java | 6 +++--- .../amber/oauth2/common/message/OAuthResponse.java | 6 +++--- .../amber/oauth2/common/message/types/GrantType.java | 6 +++--- .../oauth2/common/message/types/ParameterStyle.java | 6 +++--- .../oauth2/common/message/types/ResponseType.java | 6 +++--- .../amber/oauth2/common/message/types/TokenType.java | 6 +++--- .../parameters/BodyURLEncodedParametersApplier.java | 6 +++--- .../common/parameters/JSONBodyParametersApplier.java | 6 +++--- .../common/parameters/OAuthParametersApplier.java | 6 +++--- .../common/parameters/QueryParameterApplier.java | 6 +++--- .../parameters/WWWAuthHeaderParametersApplier.java | 6 +++--- .../apache/amber/oauth2/common/utils/JSONUtils.java | 6 +++--- .../apache/amber/oauth2/common/utils/OAuthUtils.java | 6 +++--- .../oauth2/common/validators/AbstractValidator.java | 6 +++--- .../oauth2/common/validators/OAuthValidator.java | 6 +++--- .../apache/amber/oauth2/common/OAuthUtilsTest.java | 6 +++--- .../oauth2/common/message/OAuthResponseTest.java | 6 +++--- .../BodyURLEncodedParametersApplierTest.java | 6 +++--- .../parameters/JSONBodyParametersApplierTest.java | 6 +++--- .../common/parameters/QueryParameterApplierTest.java | 6 +++--- .../WWWAuthHeaderParametersApplierTest.java | 6 +++--- .../amber/oauth2/common/utils/DummyOAuthMessage.java | 6 +++--- .../amber/oauth2/common/utils/JSONUtilsTest.java | 6 +++--- .../amber/oauth2/common/utils/OAuthUtilsTest.java | 6 +++--- .../common/validators/AbstractValidatorImpl.java | 6 +++--- .../common/validators/AbstractValidatorTest.java | 6 +++--- .../dynamicreg/client/OAuthRegistrationClient.java | 6 +++--- .../request/OAuthClientRegistrationRequest.java | 6 +++--- .../response/OAuthClientRegistrationResponse.java | 6 +++--- .../client/validators/RegistrationValidator.java | 6 +++--- .../ext/dynamicreg/common/OAuthRegistration.java | 6 +++--- .../request/JSONHttpServletRequestWrapper.java | 2 +- .../request/OAuthServerRegistrationRequest.java | 6 +++--- .../response/OAuthServerRegistrationResponse.java | 6 +++--- .../server/validator/PushPullValidator.java | 6 +++--- .../request/OAuthServerRegistrationRequestTest.java | 2 +- .../apache/amber/oauth2/httpclient4/HttpClient4.java | 6 +++--- .../AccessTokenPasswordCredentialsTest.java | 6 +++--- .../integration/AccessTokenTestAuthCodeTest.java | 6 +++--- .../integration/ClientRegistrationOAuthTest.java | 1 - .../oauth2/integration/ClientRegistrationTest.java | 6 +++--- .../oauth2/integration/ClientResourceOAuthTest.java | 6 +++--- .../oauth2/integration/ClientServerOAuthTest.java | 6 +++--- .../org/apache/amber/oauth2/integration/Common.java | 6 +++--- .../apache/amber/oauth2/integration/CommonExt.java | 6 +++--- .../oauth2/integration/EndUserAuthorizationTest.java | 6 +++--- .../oauth2/integration/JUnit4SpringContextTests.java | 6 +++--- .../amber/oauth2/integration/ResourceTest.java | 6 +++--- .../oauth2/integration/endpoints/AuthzEndpoint.java | 6 +++--- .../integration/endpoints/RegistrationEndpoint.java | 6 +++--- .../integration/endpoints/ResourceBodyEndpoint.java | 6 +++--- .../endpoints/ResourceHeaderEndpoint.java | 6 +++--- .../integration/endpoints/ResourceQueryEndpoint.java | 6 +++--- .../oauth2/integration/endpoints/TokenEndpoint.java | 6 +++--- .../oauth2/integration/server/ResourceServlet.java | 6 +++--- .../rs/extractor/BearerBodyTokenExtractor.java | 6 +++--- .../rs/extractor/BearerHeaderTokenExtractor.java | 6 +++--- .../rs/extractor/BearerQueryTokenExtractor.java | 6 +++--- .../amber/oauth2/rs/extractor/TokenExtractor.java | 6 +++--- .../rs/request/OAuthAccessResourceRequest.java | 6 +++--- .../amber/oauth2/rs/response/OAuthRSResponse.java | 6 +++--- .../rs/validator/BearerBodyOAuthValidator.java | 6 +++--- .../rs/validator/BearerHeaderOAuthValidator.java | 6 +++--- .../rs/validator/BearerQueryOAuthValidator.java | 6 +++--- .../oauth2/rs/OAuthAccessResourceRequestTest.java | 4 ++-- .../oauth2/rs/extractor/BodyTokenExtractorTest.java | 6 +++--- .../rs/extractor/HeaderTokenExtractorTest.java | 6 +++--- .../oauth2/rs/extractor/QueryTokenExtractorTest.java | 6 +++--- .../oauth2/rs/validator/BodyOAuthValidatorTest.java | 6 +++--- .../rs/validator/HeaderOAuthValidatorTest.java | 6 +++--- .../oauth2/rs/validator/QueryOAuthValidatorTest.java | 6 +++--- .../apache/amber/oauth2/rsfilter/OAuthClient.java | 6 +++--- .../apache/amber/oauth2/rsfilter/OAuthDecision.java | 6 +++--- .../apache/amber/oauth2/rsfilter/OAuthFilter.java | 6 +++--- .../amber/oauth2/rsfilter/OAuthRSProvider.java | 6 +++--- .../org/apache/amber/oauth2/rsfilter/OAuthUtils.java | 6 +++--- .../apache/amber/oauth2/utils/test/FileUtils.java | 2 +- 145 files changed, 413 insertions(+), 422 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java index b46c30a1..78e97054 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java @@ -30,9 +30,8 @@ /** * Exemplar OAuth Token Generator * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * */ public class MD5Generator implements ValueGenerator { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuer.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuer.java index fb4b6f86..998b5cb2 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuer.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuer.java @@ -24,9 +24,9 @@ import org.apache.amber.oauth2.common.exception.OAuthSystemException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface OAuthIssuer { public String accessToken() throws OAuthSystemException; diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuerImpl.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuerImpl.java index 03622077..f63bcb0e 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuerImpl.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuerImpl.java @@ -25,9 +25,9 @@ import org.apache.amber.oauth2.common.exception.OAuthSystemException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthIssuerImpl implements OAuthIssuer { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/UUIDValueGenerator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/UUIDValueGenerator.java index 02292bdc..7789ce0d 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/UUIDValueGenerator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/UUIDValueGenerator.java @@ -28,9 +28,9 @@ /** * Exemplar OAuth Token Generator * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class UUIDValueGenerator implements ValueGenerator { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/ValueGenerator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/ValueGenerator.java index c03a1ee5..5798f1a1 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/ValueGenerator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/ValueGenerator.java @@ -25,9 +25,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface ValueGenerator { public String generateValue() throws OAuthSystemException; diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java index 81d4c39a..19ae11f6 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java @@ -33,9 +33,9 @@ import org.apache.amber.oauth2.common.validators.OAuthValidator; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthAuthzRequest extends OAuthRequest { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java index d4a4109f..5d76d19b 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java @@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public abstract class OAuthRequest { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java index 16184399..24e601f6 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java @@ -36,9 +36,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthTokenRequest extends OAuthRequest { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java index 92d4a3f7..ec6cdd8c 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java @@ -28,9 +28,9 @@ import org.apache.amber.oauth2.common.message.OAuthResponse; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthASResponse extends OAuthResponse { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AssertionValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AssertionValidator.java index d28e1298..973750e1 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AssertionValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AssertionValidator.java @@ -26,9 +26,9 @@ import org.apache.amber.oauth2.common.validators.AbstractValidator; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class AssertionValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java index b5071263..3c42523c 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java @@ -27,9 +27,9 @@ import org.apache.amber.oauth2.common.validators.AbstractValidator; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class AuthorizationCodeValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java index 8567e9c2..3357aaa4 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java @@ -31,9 +31,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class CodeTokenValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java index e73b35f3..5d7de438 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java @@ -30,9 +30,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class CodeValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java index 2e54ccb2..97bd932d 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java @@ -27,9 +27,9 @@ import org.apache.amber.oauth2.common.validators.AbstractValidator; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class PasswordValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java index f2258e02..43ba3850 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java @@ -28,9 +28,9 @@ import org.apache.amber.oauth2.common.validators.AbstractValidator; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class RefreshTokenValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java index 96f87956..21574910 100644 --- a/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java +++ b/oauth-2.0/oauth2-authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java @@ -29,9 +29,9 @@ import org.apache.amber.oauth2.common.validators.AbstractValidator; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class TokenValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/MD5GeneratorTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/MD5GeneratorTest.java index bf1d0d0c..648a08ad 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/MD5GeneratorTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/MD5GeneratorTest.java @@ -30,9 +30,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class MD5GeneratorTest extends Assert { @Test diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthIssuerImplTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthIssuerImplTest.java index b86d35d3..e6b50f9b 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthIssuerImplTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthIssuerImplTest.java @@ -29,9 +29,9 @@ import org.apache.amber.oauth2.as.issuer.OAuthIssuerImpl; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthIssuerImplTest { private OAuthIssuer issuer = new OAuthIssuerImpl(new MD5Generator()); diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java index 5c76a0c4..cea74002 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java @@ -46,9 +46,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthRequestTest { diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/UUIDValueGeneratorTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/UUIDValueGeneratorTest.java index daa2f495..086d887a 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/UUIDValueGeneratorTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/UUIDValueGeneratorTest.java @@ -27,9 +27,9 @@ import org.apache.amber.oauth2.as.issuer.UUIDValueGenerator; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class UUIDValueGeneratorTest extends Assert { @Test diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java index efc48c98..7ecdd527 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java @@ -35,9 +35,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthASResponseTest { diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/TokenValidatorTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/TokenValidatorTest.java index adf92c76..af081f1f 100644 --- a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/TokenValidatorTest.java +++ b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/TokenValidatorTest.java @@ -37,9 +37,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class TokenValidatorTest { @Test diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java index 38a2cf49..0eb2d634 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java @@ -29,9 +29,9 @@ import org.apache.amber.oauth2.client.demo.model.OAuthRegParams; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public final class Utils { private Utils() { diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/AuthzController.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/AuthzController.java index c7d19a6e..0f2eef56 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/AuthzController.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/AuthzController.java @@ -45,8 +45,6 @@ /** * Handles requests for the application welcome page. * - * @author Maciej Machulak - * @author Lukasz Moren */ @Controller @RequestMapping("/") diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java index 316e3752..9ea51c61 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java @@ -38,9 +38,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Controller @RequestMapping("/") diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RedirectController.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RedirectController.java index df841b90..eae7c398 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RedirectController.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RedirectController.java @@ -36,9 +36,9 @@ import org.springframework.web.servlet.ModelAndView; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Controller @RequestMapping("/redirect") diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RegistrationController.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RegistrationController.java index 311cbe7e..22aaac33 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RegistrationController.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RegistrationController.java @@ -43,9 +43,9 @@ import org.apache.amber.oauth2.client.demo.exception.ApplicationException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Controller @RequestMapping("/") diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java index d02e1812..394efa46 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java @@ -36,9 +36,9 @@ import org.springframework.web.servlet.ModelAndView; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Controller @RequestMapping("/get_resource") diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java index fdd4bff9..6c914f1e 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java @@ -44,9 +44,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Controller @RequestMapping("/get_token") diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/exception/ApplicationException.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/exception/ApplicationException.java index 11ac9f99..b087ded8 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/exception/ApplicationException.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/exception/ApplicationException.java @@ -22,9 +22,9 @@ package org.apache.amber.oauth2.client.demo.exception; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class ApplicationException extends Exception { diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java index 30860d5e..1d606317 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java @@ -23,9 +23,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthParams { diff --git a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthRegParams.java b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthRegParams.java index c617f53a..ebff7f21 100644 --- a/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthRegParams.java +++ b/oauth-2.0/oauth2-client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthRegParams.java @@ -22,9 +22,9 @@ package org.apache.amber.oauth2.client.demo.model; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthRegParams extends OAuthParams { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/HttpClient.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/HttpClient.java index 8abfa1e0..3a4ed995 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/HttpClient.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/HttpClient.java @@ -29,9 +29,9 @@ import org.apache.amber.oauth2.common.exception.OAuthSystemException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface HttpClient { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java index 0c27c9c9..3f565f7f 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java @@ -34,9 +34,9 @@ /** * OAuth Client - exposes a high-level API for Client Applications * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthClient { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java index 8edbfb71..55f85f5b 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java @@ -42,9 +42,9 @@ /** * Implementation of the OAuth HttpClient using URL Connection * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class URLConnectionClient implements HttpClient { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java index 13415117..eeb96c52 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java @@ -30,9 +30,9 @@ import org.apache.amber.oauth2.common.utils.OAuthUtils; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class ClientHeaderParametersApplier implements OAuthParametersApplier { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java index 0da8ae5f..e498cf2d 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java @@ -35,9 +35,9 @@ /** * OAuth Client Request * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthClientRequest implements OAuthMessage { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java index 0de0f457..cc87c5fc 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java @@ -28,9 +28,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class GitHubTokenResponse extends OAuthAccessTokenResponse { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java index 6b01f6a0..be8f9283 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java @@ -26,9 +26,9 @@ import org.apache.amber.oauth2.common.token.OAuthToken; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public abstract class OAuthAccessTokenResponse extends OAuthClientResponse { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java index 5e2bbe1f..55417264 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java @@ -35,9 +35,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthAuthzResponse extends OAuthClientResponse { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java index 2619b00d..d2828f9b 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java @@ -28,9 +28,9 @@ import org.apache.amber.oauth2.common.exception.OAuthProblemException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public abstract class OAuthClientResponse { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactory.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactory.java index 31732a97..e81773b4 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactory.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactory.java @@ -27,9 +27,9 @@ import org.apache.amber.oauth2.common.utils.OAuthUtils; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthClientResponseFactory { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthErrorResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthErrorResponse.java index 48410939..716c0373 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthErrorResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthErrorResponse.java @@ -25,9 +25,9 @@ import org.apache.amber.oauth2.common.exception.OAuthProblemException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthErrorResponse { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java index abc433e0..a6762eb6 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java @@ -30,9 +30,9 @@ import org.codehaus.jettison.json.JSONException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthJSONAccessTokenResponse extends OAuthAccessTokenResponse { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/CodeTokenValidator.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/CodeTokenValidator.java index 4cb06b9e..384d12bf 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/CodeTokenValidator.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/CodeTokenValidator.java @@ -25,9 +25,9 @@ import org.apache.amber.oauth2.common.OAuth; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class CodeTokenValidator extends OAuthClientValidator { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/CodeValidator.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/CodeValidator.java index 9c3583fe..aec0e014 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/CodeValidator.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/CodeValidator.java @@ -25,9 +25,9 @@ import org.apache.amber.oauth2.common.OAuth; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class CodeValidator extends OAuthClientValidator { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/OAuthClientValidator.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/OAuthClientValidator.java index 4a7a40bf..47a258d7 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/OAuthClientValidator.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/OAuthClientValidator.java @@ -35,9 +35,9 @@ import org.apache.amber.oauth2.common.OAuth; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public abstract class OAuthClientValidator { diff --git a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/TokenValidator.java b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/TokenValidator.java index 7ccc20f0..882b1ffd 100644 --- a/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/TokenValidator.java +++ b/oauth-2.0/oauth2-client/src/main/java/org/apache/amber/oauth2/client/validator/TokenValidator.java @@ -25,9 +25,9 @@ import org.apache.amber.oauth2.common.OAuth; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class TokenValidator extends OAuthClientValidator { diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/OAuthClientTest.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/OAuthClientTest.java index f9f9afdd..c65c0b57 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/OAuthClientTest.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/OAuthClientTest.java @@ -39,9 +39,9 @@ * Simple example that shows how to get OAuth 2.0 access token from Facebook * using Amber OAuth 2.0 library * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthClientTest { diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/GitHubTokenResponseTest.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/GitHubTokenResponseTest.java index 01e95856..bd2da66e 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/GitHubTokenResponseTest.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/GitHubTokenResponseTest.java @@ -24,9 +24,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class GitHubTokenResponseTest { @Test diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthAuthorizationResponseImplTest.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthAuthorizationResponseImplTest.java index 24c0d248..d3d19eff 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthAuthorizationResponseImplTest.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthAuthorizationResponseImplTest.java @@ -40,9 +40,9 @@ import static org.junit.Assert.fail; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthAuthorizationResponseImplTest { diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactoryTest.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactoryTest.java index 5d192185..26e43ba1 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactoryTest.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactoryTest.java @@ -29,9 +29,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthClientResponseFactoryTest { diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java index 070a048d..b407c90f 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java @@ -31,9 +31,9 @@ import org.slf4j.LoggerFactory; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthJSONAccessTokenResponseTest extends Assert { diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java index 5e44f1b4..cc14fd98 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java @@ -29,9 +29,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public final class TestUtils { private TestUtils() { diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/CodeTokenValidatorTest.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/CodeTokenValidatorTest.java index 80dc691a..6813b450 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/CodeTokenValidatorTest.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/CodeTokenValidatorTest.java @@ -21,17 +21,15 @@ package org.apache.amber.oauth2.client.validator; -import org.apache.amber.oauth2.client.validator.CodeTokenValidator; -import org.apache.amber.oauth2.client.validator.OAuthClientValidator; import org.apache.amber.oauth2.common.OAuth; import org.junit.Assert; import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class CodeTokenValidatorTest { @@ -42,8 +40,8 @@ public void testValidator() { OAuthClientValidator validator = new CodeTokenValidator(); Assert.assertNotNull(validator.requiredParams); Assert.assertEquals(2, validator.requiredParams.size()); - Assert.assertArrayEquals(new String[] {}, validator.requiredParams.get(OAuth.OAUTH_CODE)); - Assert.assertArrayEquals(new String[] {}, validator.requiredParams.get(OAuth.OAUTH_ACCESS_TOKEN)); + Assert.assertArrayEquals(new String[]{}, validator.requiredParams.get(OAuth.OAUTH_CODE)); + Assert.assertArrayEquals(new String[]{}, validator.requiredParams.get(OAuth.OAUTH_ACCESS_TOKEN)); Assert.assertNotNull(validator.notAllowedParams); Assert.assertEquals(1, validator.notAllowedParams.size()); Assert.assertTrue(validator.notAllowedParams.contains(OAuth.OAUTH_ACCESS_TOKEN)); diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/CodeValidatorTest.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/CodeValidatorTest.java index 8048a474..dae6bdac 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/CodeValidatorTest.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/CodeValidatorTest.java @@ -28,9 +28,9 @@ import org.apache.amber.oauth2.common.OAuth; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class CodeValidatorTest { diff --git a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/TokenValidatorTest.java b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/TokenValidatorTest.java index fafc073c..058a3933 100644 --- a/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/TokenValidatorTest.java +++ b/oauth-2.0/oauth2-client/src/test/java/org/apache/amber/oauth2/client/validator/TokenValidatorTest.java @@ -29,9 +29,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class TokenValidatorTest { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java index db5d3204..356bf323 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/OAuth.java @@ -25,9 +25,9 @@ import org.apache.amber.oauth2.common.message.types.TokenType; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public final class OAuth { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java index 4cad9aa9..f426cf4d 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java @@ -21,9 +21,9 @@ package org.apache.amber.oauth2.common.domain.client; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BasicClientInfo implements ClientInfo { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java index f9bbceca..1435bca7 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java @@ -21,7 +21,6 @@ package org.apache.amber.oauth2.common.domain.client; /** - * @author Maciej Machulak */ public class BasicClientInfoBuilder { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java index 01ef1175..1a72b376 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java @@ -22,9 +22,9 @@ package org.apache.amber.oauth2.common.domain.client; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface ClientInfo { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java index 44263bb8..317ccfe7 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java @@ -21,9 +21,9 @@ package org.apache.amber.oauth2.common.domain.credentials; import java.lang.Long;import java.lang.Object;import java.lang.Override;import java.lang.String; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BasicCredentials implements Credentials { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java index 7660fa2b..cce2f9da 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java @@ -21,7 +21,6 @@ package org.apache.amber.oauth2.common.domain.credentials; /** - * @author Maciej Machulak */ public class BasicCredentialsBuilder { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java index fb57e79a..f0bf64af 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java @@ -21,9 +21,9 @@ package org.apache.amber.oauth2.common.domain.credentials; import java.lang.Long;import java.lang.String; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface Credentials { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java index fd0bf390..bccdf707 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java @@ -22,9 +22,9 @@ package org.apache.amber.oauth2.common.error; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public abstract class OAuthError { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java index f8aec02f..3a790a93 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java @@ -27,9 +27,9 @@ import org.apache.amber.oauth2.common.utils.OAuthUtils; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public final class OAuthProblemException extends Exception { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthRuntimeException.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthRuntimeException.java index 4db85eed..d8e9902c 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthRuntimeException.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthRuntimeException.java @@ -21,7 +21,6 @@ package org.apache.amber.oauth2.common.exception; /** - * @author Lukasz Moren */ public class OAuthRuntimeException extends RuntimeException { public OAuthRuntimeException() { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthSystemException.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthSystemException.java index b6dca4a4..e6e019f1 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthSystemException.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthSystemException.java @@ -22,8 +22,8 @@ package org.apache.amber.oauth2.common.exception; /** - * @author Maciej Machulak - * @author Lukasz Moren + * + * */ public class OAuthSystemException extends Exception { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthMessage.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthMessage.java index 154ced65..bd3dd364 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthMessage.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthMessage.java @@ -24,9 +24,9 @@ import java.util.Map; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface OAuthMessage { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java index fd56982c..13c1c5e9 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java @@ -35,9 +35,9 @@ import org.apache.amber.oauth2.common.parameters.WWWAuthHeaderParametersApplier; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthResponse implements OAuthMessage { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java index 55451c80..700dcb20 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java @@ -22,9 +22,9 @@ package org.apache.amber.oauth2.common.message.types; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public enum GrantType { // NONE("none"), diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ParameterStyle.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ParameterStyle.java index 5d1a1d01..0faa4d08 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ParameterStyle.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ParameterStyle.java @@ -22,9 +22,9 @@ package org.apache.amber.oauth2.common.message.types; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public enum ParameterStyle { BODY("body"), diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java index 5f0d5bf1..f9bd4871 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java @@ -22,9 +22,9 @@ package org.apache.amber.oauth2.common.message.types; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public enum ResponseType { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java index 0d9199a5..dd2b8c23 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java @@ -22,9 +22,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public enum TokenType { BEARER("Bearer"), diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java index ec528378..4bff803e 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java @@ -28,9 +28,9 @@ import org.apache.amber.oauth2.common.utils.OAuthUtils; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BodyURLEncodedParametersApplier implements OAuthParametersApplier { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java index e353b1a8..808f114e 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java @@ -29,9 +29,9 @@ import org.codehaus.jettison.json.JSONException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class JSONBodyParametersApplier implements OAuthParametersApplier { public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java index ebd7bfdd..b82f8552 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java @@ -38,9 +38,9 @@ *

* Additional implementations can be provided. * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface OAuthParametersApplier { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java index bd39e76f..f39e71e3 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java @@ -29,9 +29,9 @@ import org.apache.amber.oauth2.common.utils.OAuthUtils; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class QueryParameterApplier implements OAuthParametersApplier { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java index 76e6b5e0..f3eda517 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java @@ -29,9 +29,9 @@ import org.apache.amber.oauth2.common.utils.OAuthUtils; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class WWWAuthHeaderParametersApplier implements OAuthParametersApplier { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java index fb8e0362..6c19a7db 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java @@ -29,9 +29,9 @@ import org.codehaus.jettison.json.JSONObject; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public final class JSONUtils { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java index 748e7e91..87f13151 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java @@ -53,9 +53,9 @@ * Some methods based on the Utils class from OAuth V1.0a library available at: * http://oauth.googlecode.com/svn/code/java/core/ * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public final class OAuthUtils { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/validators/AbstractValidator.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/validators/AbstractValidator.java index a748af34..53dfe943 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/validators/AbstractValidator.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/validators/AbstractValidator.java @@ -34,9 +34,9 @@ import org.apache.amber.oauth2.common.utils.OAuthUtils; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ //todo add client secret in header, sect 2.1 public abstract class AbstractValidator implements OAuthValidator { diff --git a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/validators/OAuthValidator.java b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/validators/OAuthValidator.java index 8cead043..ecf1f928 100644 --- a/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/validators/OAuthValidator.java +++ b/oauth-2.0/oauth2-common/src/main/java/org/apache/amber/oauth2/common/validators/OAuthValidator.java @@ -26,9 +26,9 @@ import org.apache.amber.oauth2.common.exception.OAuthProblemException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface OAuthValidator { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java index bf101ca9..a06a9717 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java @@ -36,9 +36,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthUtilsTest extends Assert { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/message/OAuthResponseTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/message/OAuthResponseTest.java index 0b0dcc4b..0b693e46 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/message/OAuthResponseTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/message/OAuthResponseTest.java @@ -26,9 +26,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthResponseTest { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java index 9d48dd03..b3f0c875 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java @@ -31,9 +31,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BodyURLEncodedParametersApplierTest { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java index 219a4292..9e14c470 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java @@ -32,9 +32,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class JSONBodyParametersApplierTest { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java index 15d0a587..b26f7249 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java @@ -31,9 +31,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class QueryParameterApplierTest { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java index e22d5d87..351bc1fc 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java @@ -30,9 +30,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class WWWAuthHeaderParametersApplierTest { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/DummyOAuthMessage.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/DummyOAuthMessage.java index 9a3cd61a..0ea98b08 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/DummyOAuthMessage.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/DummyOAuthMessage.java @@ -24,9 +24,9 @@ import org.apache.amber.oauth2.common.message.OAuthResponse; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class DummyOAuthMessage extends OAuthResponse { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java index 63c31a2e..62102c66 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java @@ -34,9 +34,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class JSONUtilsTest { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java index 5a32a812..6b1c5dfe 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java @@ -35,9 +35,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthUtilsTest { @Test diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorImpl.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorImpl.java index 2d39720e..ebfeb359 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorImpl.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorImpl.java @@ -27,9 +27,9 @@ import org.apache.amber.oauth2.common.validators.AbstractValidator; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class AbstractValidatorImpl extends AbstractValidator { diff --git a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorTest.java b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorTest.java index 0ce87175..c4f2284e 100644 --- a/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorTest.java +++ b/oauth-2.0/oauth2-common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorTest.java @@ -34,9 +34,9 @@ import static org.easymock.EasyMock.verify; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class AbstractValidatorTest { diff --git a/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java b/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java index 35552dad..6edb45f2 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java +++ b/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java @@ -35,9 +35,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthRegistrationClient extends OAuthClient { diff --git a/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java b/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java index a4a1dd1a..5917d3e4 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java +++ b/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java @@ -30,9 +30,9 @@ /** * OAuth Registration Request * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthClientRegistrationRequest extends OAuthClientRequest { diff --git a/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java b/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java index 2ebcca7c..b0370250 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java +++ b/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java @@ -31,9 +31,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthClientRegistrationResponse extends OAuthClientResponse { diff --git a/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java b/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java index b0c1825e..91c50c20 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java +++ b/oauth-2.0/oauth2-dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java @@ -33,9 +33,9 @@ import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class RegistrationValidator extends OAuthClientValidator { diff --git a/oauth-2.0/oauth2-dynamicreg-common/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/common/OAuthRegistration.java b/oauth-2.0/oauth2-dynamicreg-common/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/common/OAuthRegistration.java index 9971f8f4..e863d2a6 100644 --- a/oauth-2.0/oauth2-dynamicreg-common/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/common/OAuthRegistration.java +++ b/oauth-2.0/oauth2-dynamicreg-common/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/common/OAuthRegistration.java @@ -22,9 +22,9 @@ package org.apache.amber.oauth2.ext.dynamicreg.common; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public final class OAuthRegistration { private OAuthRegistration() { diff --git a/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java b/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java index 6a866883..d1df1630 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java +++ b/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; /** - * @author Lukasz Moren + * */ public class JSONHttpServletRequestWrapper extends HttpServletRequestWrapper { private Logger log = LoggerFactory.getLogger(JSONHttpServletRequestWrapper.class); diff --git a/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java b/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java index 79819b1c..7c1fd6f7 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java +++ b/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java @@ -32,9 +32,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthServerRegistrationRequest extends OAuthRequest { diff --git a/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java b/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java index 26abb4bd..f6fe0f51 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java +++ b/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java @@ -25,9 +25,9 @@ import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthServerRegistrationResponse extends OAuthASResponse { diff --git a/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java b/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java index e548bb47..552453e8 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java +++ b/oauth-2.0/oauth2-dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java @@ -31,9 +31,9 @@ import org.slf4j.LoggerFactory; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class PushPullValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-dynamicreg-server/src/test/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java b/oauth-2.0/oauth2-dynamicreg-server/src/test/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java index 29d1032d..ce48c300 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/src/test/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java +++ b/oauth-2.0/oauth2-dynamicreg-server/src/test/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java @@ -28,7 +28,7 @@ import org.springframework.mock.web.MockHttpServletRequest; /** - * @author Lukasz Moren + * */ public class OAuthServerRegistrationRequestTest { diff --git a/oauth-2.0/oauth2-httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java b/oauth-2.0/oauth2-httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java index f688e40a..c1bdd651 100644 --- a/oauth-2.0/oauth2-httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java +++ b/oauth-2.0/oauth2-httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java @@ -47,9 +47,9 @@ /** * Exemplar HttpClient4 * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class HttpClient4 implements HttpClient { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenPasswordCredentialsTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenPasswordCredentialsTest.java index e8a8f272..8f3b5db4 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenPasswordCredentialsTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenPasswordCredentialsTest.java @@ -35,9 +35,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class AccessTokenPasswordCredentialsTest extends ClientServerOAuthTest { private static Logger logger = LoggerFactory.getLogger(AccessTokenPasswordCredentialsTest.class); diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java index 48b66834..edd67249 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java @@ -32,9 +32,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class AccessTokenTestAuthCodeTest extends ClientServerOAuthTest { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationOAuthTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationOAuthTest.java index d63f4f8f..ad2676d1 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationOAuthTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationOAuthTest.java @@ -28,7 +28,6 @@ import org.junit.BeforeClass; /** - * @author Maciej P. Machulak */ public abstract class ClientRegistrationOAuthTest extends ClientServerOAuthTest { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationTest.java index 0df48f8e..30734626 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationTest.java @@ -32,9 +32,9 @@ import org.apache.amber.oauth2.common.exception.OAuthProblemException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class ClientRegistrationTest extends ClientServerOAuthTest { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientResourceOAuthTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientResourceOAuthTest.java index 2259a77d..c635239f 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientResourceOAuthTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientResourceOAuthTest.java @@ -28,9 +28,9 @@ import org.junit.BeforeClass; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public abstract class ClientResourceOAuthTest extends ClientServerOAuthTest { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientServerOAuthTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientServerOAuthTest.java index b25f877a..cdd973ea 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientServerOAuthTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientServerOAuthTest.java @@ -28,9 +28,9 @@ import org.junit.BeforeClass; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public abstract class ClientServerOAuthTest extends JUnit4SpringContextTests { protected static Server s2; diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java index 0b9cd0f1..52b3b5fd 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java @@ -28,9 +28,9 @@ import org.apache.amber.oauth2.client.request.OAuthClientRequest; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public final class Common { private Common() { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java index 49549f2c..1c061876 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java @@ -22,9 +22,9 @@ package org.apache.amber.oauth2.integration; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public final class CommonExt { private CommonExt() { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java index a219f00b..3e882ce5 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java @@ -42,9 +42,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Path("/") public class EndUserAuthorizationTest extends ClientServerOAuthTest { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/JUnit4SpringContextTests.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/JUnit4SpringContextTests.java index a29e12e7..87ab56dd 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/JUnit4SpringContextTests.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/JUnit4SpringContextTests.java @@ -26,9 +26,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class JUnit4SpringContextTests extends Assert { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java index 70921b66..309889e1 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java @@ -37,9 +37,9 @@ /** * This tests against Section 5 of the OAuth 2.0 Draft 10 implementation * - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class ResourceTest extends ClientResourceOAuthTest { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java index cea4fce4..da0c7a22 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java @@ -44,9 +44,9 @@ import org.apache.amber.oauth2.common.utils.OAuthUtils; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Path("/authz") public class AuthzEndpoint { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/RegistrationEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/RegistrationEndpoint.java index 5340670b..4be70332 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/RegistrationEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/RegistrationEndpoint.java @@ -39,9 +39,9 @@ import org.apache.amber.oauth2.integration.CommonExt; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Path("/register") public class RegistrationEndpoint { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceBodyEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceBodyEndpoint.java index 13113f32..7302a3ae 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceBodyEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceBodyEndpoint.java @@ -42,9 +42,9 @@ import org.apache.amber.oauth2.common.exception.OAuthSystemException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Path("/resource_body") public class ResourceBodyEndpoint { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceHeaderEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceHeaderEndpoint.java index e06978bb..82e80eba 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceHeaderEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceHeaderEndpoint.java @@ -41,9 +41,9 @@ import org.apache.amber.oauth2.common.exception.OAuthSystemException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Path("/resource_header") public class ResourceHeaderEndpoint { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceQueryEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceQueryEndpoint.java index 3389052a..07d09b7e 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceQueryEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceQueryEndpoint.java @@ -42,9 +42,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Path("/resource_query") public class ResourceQueryEndpoint { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java index 65bab426..66ab9e81 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java @@ -45,9 +45,9 @@ import org.apache.amber.oauth2.integration.Common; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ @Path("/token") public class TokenEndpoint { diff --git a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/server/ResourceServlet.java b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/server/ResourceServlet.java index ed0f3581..3fe66bef 100644 --- a/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/server/ResourceServlet.java +++ b/oauth-2.0/oauth2-integration-tests/src/test/java/org/apache/amber/oauth2/integration/server/ResourceServlet.java @@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletResponse; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class ResourceServlet extends HttpServlet { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java index c73e0fdb..b88d5aca 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java @@ -27,9 +27,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BearerBodyTokenExtractor implements TokenExtractor { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java index 3cd2f757..30504d51 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java @@ -28,9 +28,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BearerHeaderTokenExtractor implements TokenExtractor { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java index a6d8cd1d..cda8d300 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java @@ -28,9 +28,9 @@ import org.apache.amber.oauth2.common.OAuth; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BearerQueryTokenExtractor implements TokenExtractor { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/TokenExtractor.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/TokenExtractor.java index ed91b302..72c17c5e 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/TokenExtractor.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/TokenExtractor.java @@ -24,9 +24,9 @@ import javax.servlet.http.HttpServletRequest; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface TokenExtractor { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java index b4a2ba08..6d766fbb 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java @@ -38,9 +38,9 @@ import org.apache.amber.oauth2.rs.extractor.TokenExtractor; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthAccessResourceRequest { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/response/OAuthRSResponse.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/response/OAuthRSResponse.java index 229157fb..d639e381 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/response/OAuthRSResponse.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/response/OAuthRSResponse.java @@ -25,9 +25,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthRSResponse extends OAuthResponse { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerBodyOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerBodyOAuthValidator.java index f0c03f88..c4e01df0 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerBodyOAuthValidator.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerBodyOAuthValidator.java @@ -31,9 +31,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BearerBodyOAuthValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java index d657424b..7566c14f 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java @@ -32,9 +32,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BearerHeaderOAuthValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java index f8f330a0..4c9276ad 100644 --- a/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java +++ b/oauth-2.0/oauth2-resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java @@ -33,9 +33,9 @@ import org.apache.amber.oauth2.rs.ResourceServer; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BearerQueryOAuthValidator extends AbstractValidator { diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java index ec195f28..ea0ccce8 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java @@ -35,8 +35,8 @@ import org.junit.Test; /** - * @author Maciej Machulak - * @author Lukasz Moren + * + * */ public class OAuthAccessResourceRequestTest { diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java index 86526ef2..aa91126d 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java @@ -35,9 +35,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BodyTokenExtractorTest { diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java index ad9966c9..e7ff6e83 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java @@ -36,9 +36,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class HeaderTokenExtractorTest { diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java index 9f0d517e..b0a12f3f 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java @@ -34,9 +34,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class QueryTokenExtractorTest { diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java index 1608d5c5..08350ec6 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java @@ -36,9 +36,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class BodyOAuthValidatorTest { diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java index f87eeb5c..023a367b 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java @@ -38,9 +38,9 @@ import static org.easymock.EasyMock.verify; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class HeaderOAuthValidatorTest { diff --git a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java index d0a3fad4..2dc0f7e1 100644 --- a/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java +++ b/oauth-2.0/oauth2-resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java @@ -37,9 +37,9 @@ import org.junit.Test; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class QueryOAuthValidatorTest { diff --git a/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthClient.java b/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthClient.java index eee1151a..1de80970 100644 --- a/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthClient.java +++ b/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthClient.java @@ -22,9 +22,9 @@ package org.apache.amber.oauth2.rsfilter; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface OAuthClient { diff --git a/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthDecision.java b/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthDecision.java index 85ee158d..939243ab 100644 --- a/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthDecision.java +++ b/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthDecision.java @@ -24,9 +24,9 @@ import java.security.Principal; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface OAuthDecision { diff --git a/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthFilter.java b/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthFilter.java index cc5b17c2..6b5eab90 100644 --- a/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthFilter.java +++ b/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthFilter.java @@ -38,9 +38,9 @@ import java.security.Principal; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthFilter implements Filter { diff --git a/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthRSProvider.java b/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthRSProvider.java index a0708a63..3cb75345 100644 --- a/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthRSProvider.java +++ b/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthRSProvider.java @@ -27,9 +27,9 @@ /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public interface OAuthRSProvider { diff --git a/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthUtils.java b/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthUtils.java index d54192d8..adc2cce7 100644 --- a/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthUtils.java +++ b/oauth-2.0/oauth2-rs-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthUtils.java @@ -25,9 +25,9 @@ import javax.servlet.ServletException; /** - * @author Maciej Machulak (m.p.machulak@ncl.ac.uk) - * @author Lukasz Moren (lukasz.moren@ncl.ac.uk) - * @author Aad van Moorsel (aad.vanmoorsel@ncl.ac.uk) + * + * + * */ public class OAuthUtils { diff --git a/oauth-2.0/oauth2-test-utils/src/main/java/org/apache/amber/oauth2/utils/test/FileUtils.java b/oauth-2.0/oauth2-test-utils/src/main/java/org/apache/amber/oauth2/utils/test/FileUtils.java index 22728337..cfbb4f73 100644 --- a/oauth-2.0/oauth2-test-utils/src/main/java/org/apache/amber/oauth2/utils/test/FileUtils.java +++ b/oauth-2.0/oauth2-test-utils/src/main/java/org/apache/amber/oauth2/utils/test/FileUtils.java @@ -26,7 +26,7 @@ import java.net.URL; /** - * @author Lukasz Moren + * */ public class FileUtils { private FileUtils() { From b00eae8d013254f44beeaecbc97734736ca2598b Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Tue, 19 Jun 2012 16:12:08 +0000 Subject: [PATCH 095/583] [AMBER-54] - adding json files to RAT exclusions git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1351759 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0cddab58..b630e5dc 100644 --- a/pom.xml +++ b/pom.xml @@ -396,7 +396,7 @@ org.apache.maven.plugins maven-release-plugin - 2.2.1 + 2.3.1 forked-path false @@ -653,6 +653,7 @@ KEYS NOTICE .idea/** + **/*.json From 199a8e0d66ba2e073a685165cc17937b891471f5 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Tue, 19 Jun 2012 17:38:48 +0000 Subject: [PATCH 096/583] [AMBER-54] - removing empty CodeTokenValidatorTest stale file git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1351783 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/amber/oauth2/as/validator/CodeTokenValidatorTest.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/CodeTokenValidatorTest.java diff --git a/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/CodeTokenValidatorTest.java b/oauth-2.0/oauth2-authzserver/src/test/java/org/apache/amber/oauth2/as/validator/CodeTokenValidatorTest.java deleted file mode 100644 index e69de29b..00000000 From 20f6befd622b1b69ab2409a5cfd574eabd84448b Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Wed, 27 Jun 2012 15:44:38 +0000 Subject: [PATCH 097/583] [AMBER-55] - moving oauth-1.0 to sandbox git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1354586 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-1.0/pom.xml | 48 ----------------------------------------------- pom.xml | 1 - 2 files changed, 49 deletions(-) delete mode 100644 oauth-1.0/pom.xml diff --git a/oauth-1.0/pom.xml b/oauth-1.0/pom.xml deleted file mode 100644 index 4e55588e..00000000 --- a/oauth-1.0/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - org.apache.amber - amber-parent - 0.22-incubating-SNAPSHOT - - - 4.0.0 - org.apache.amber - amber-oauth-1.0 - jar - Apache Amber: OAuth 1.0 Implementation - - - - org.apache.amber - amber-signature-api - ${project.version} - compile - - - org.apache.amber - amber-spec-api - ${project.version} - compile - - - - diff --git a/pom.xml b/pom.xml index b630e5dc..061c1ce6 100644 --- a/pom.xml +++ b/pom.xml @@ -231,7 +231,6 @@ spec-api signature-api server - oauth-1.0 oauth-2.0 From fa43b00bcaacd506dd03ad423f67ac63509b243b Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Wed, 27 Jun 2012 15:47:58 +0000 Subject: [PATCH 098/583] [AMBER-55] - moving server module to sandbox git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1354589 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 - server/pom.xml | 62 --------- .../java/org/apache/amber/server/Access.java | 129 ------------------ .../apache/amber/server/AccessStorage.java | 54 -------- .../apache/amber/server/StorageException.java | 43 ------ .../server/TemporaryCredentialsGenerator.java | 33 ----- .../server/TokenCredentialsGenerator.java | 33 ----- .../org/apache/amber/server/AccessTest.java | 48 ------- 8 files changed, 403 deletions(-) delete mode 100644 server/pom.xml delete mode 100644 server/src/main/java/org/apache/amber/server/Access.java delete mode 100644 server/src/main/java/org/apache/amber/server/AccessStorage.java delete mode 100644 server/src/main/java/org/apache/amber/server/StorageException.java delete mode 100644 server/src/main/java/org/apache/amber/server/TemporaryCredentialsGenerator.java delete mode 100644 server/src/main/java/org/apache/amber/server/TokenCredentialsGenerator.java delete mode 100644 server/src/test/java/org/apache/amber/server/AccessTest.java diff --git a/pom.xml b/pom.xml index 061c1ce6..00e456b6 100644 --- a/pom.xml +++ b/pom.xml @@ -230,7 +230,6 @@ spec-api signature-api - server oauth-2.0 diff --git a/server/pom.xml b/server/pom.xml deleted file mode 100644 index aba16cda..00000000 --- a/server/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - org.apache.amber - amber-parent - 0.22-incubating-SNAPSHOT - - - 4.0.0 - org.apache.amber - amber-server - jar - Apache Amber: Server - - - - org.apache.amber - amber-signature-api - ${project.version} - compile - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.2 - - - - dependencies - dependency-convergence - index - summary - - - - - - - - diff --git a/server/src/main/java/org/apache/amber/server/Access.java b/server/src/main/java/org/apache/amber/server/Access.java deleted file mode 100644 index a066957d..00000000 --- a/server/src/main/java/org/apache/amber/server/Access.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -/** - * Association of nonce(s) and timestamp. - * - * @version $Id$ - */ -public final class Access implements Comparable { - - /** - * The nonces associated to the timestamp. - */ - private final Set nonces = new HashSet(); - - /** - * The timestamp reference. - */ - private final long timestamp; - - /** - * Creates a new access using the received timestamp and nonce. - * - * @param timestamp the received timestamp - * @param nonce the received nonce - */ - public Access(final long timestamp, final String nonce) { - this.timestamp = timestamp; - this.addNonce(nonce); - } - - /** - * Returns the timestamp access. - * - * @return the timestamp access - */ - public long getTimestamp() { - return this.timestamp; - } - - /** - * Add a nonce to an access. - * - * @param nonce the nonce has o be added. - * @return true, if the nonce has not used yet, false otherwise. - */ - public boolean addNonce(String nonce) { - return this.nonces.add(nonce); - } - - /** - * Checks if the access already contains a nonce. - * - * @param nonce the nonce has to be checked. - * @return true if the nonce is contained, false otherwise. - */ - public boolean containsNonce(String nonce) { - return this.nonces.contains(nonce); - } - - /** - * Returns the whole list of nonces associated to the timestamp. - * - * @return the whole list of nonces associated to the timestamp. - */ - protected Set getNonces() { - return Collections.unmodifiableSet(this.nonces); - } - - /** - * {@inheritDoc} - */ - public int compareTo(Long timestamp) { - if (this.timestamp > timestamp) { - return 1; - } else if (this.timestamp < timestamp) { - return -1; - } else { - return 0; - } - } - - /** - * {@inheritDoc} - */ - @Override - public boolean equals(Object obj) { - boolean equals = false; - if (obj instanceof Access) { - Access other = (Access) obj; - if (other.timestamp == this.timestamp && other.nonces.equals(this.nonces)) { - equals = true; - } - } - return equals; - } - - /** - * {@inheritDoc} - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((nonces == null) ? 0 : nonces.hashCode()); - result = prime * result + (int) (timestamp ^ (timestamp >>> 32)); - return result; - } - -} diff --git a/server/src/main/java/org/apache/amber/server/AccessStorage.java b/server/src/main/java/org/apache/amber/server/AccessStorage.java deleted file mode 100644 index f37e597e..00000000 --- a/server/src/main/java/org/apache/amber/server/AccessStorage.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -/** - * Nonce/timestamp storage definition. - * - * @version $Id$ - */ -public interface AccessStorage { - - /** - * Stores a new nonce / timestamp pair associated with a consumer key. - * - * @param clientCredentials the consumer to be associated with the access. - * @param timestamp the timestamp of the request. - * @param nonce the nonce associated with the timestamp. - * @throws StorageException if a backend error occurs. - */ - void add(String clientCredentials, long timestamp, String nonce) throws StorageException; - - /** - * Get the last access (by timestamp) of a consumer. - * - * @param clientCredentials the consumer whose access needs to be read. - * @return the access object. - * @throws StorageException if a backend error occurs. - */ - Access getLastAccess(String clientCredentials) throws StorageException; - - /** - * Remove a consumer access. - * - * @param clientCredentials the consumer key. - * @param timestamp the timestamp. - * @throws StorageException if a backend error occurs. - */ - void remove(String clientCredentials, long timestamp) throws StorageException; - -} diff --git a/server/src/main/java/org/apache/amber/server/StorageException.java b/server/src/main/java/org/apache/amber/server/StorageException.java deleted file mode 100644 index 8956db3d..00000000 --- a/server/src/main/java/org/apache/amber/server/StorageException.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -/** - * Exception thrown when an error occurs when accessing to the Access Storage. - * - * @version $Id$ - */ -public final class StorageException extends Exception { - - /** - * The default serial version UID; - */ - private static final long serialVersionUID = 1L; - - public StorageException(String message) { - super(message); - } - - public StorageException(Throwable cause) { - super(cause); - } - - public StorageException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/server/src/main/java/org/apache/amber/server/TemporaryCredentialsGenerator.java b/server/src/main/java/org/apache/amber/server/TemporaryCredentialsGenerator.java deleted file mode 100644 index 217a0868..00000000 --- a/server/src/main/java/org/apache/amber/server/TemporaryCredentialsGenerator.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -/** - * Temporary credentials generator. - * - * @version $Id$ - */ -public interface TemporaryCredentialsGenerator { - - /** - * Generates a new temporary credentials. - * - * @return a new temporary credentials. - */ - String generate(); - -} diff --git a/server/src/main/java/org/apache/amber/server/TokenCredentialsGenerator.java b/server/src/main/java/org/apache/amber/server/TokenCredentialsGenerator.java deleted file mode 100644 index 30d9bb2b..00000000 --- a/server/src/main/java/org/apache/amber/server/TokenCredentialsGenerator.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -/** - * Token credentials generator. - * - * @version $Id$ - */ -public interface TokenCredentialsGenerator { - - /** - * Generates a new token credentials. - * - * @return a new token credentials. - */ - String generate(); - -} diff --git a/server/src/test/java/org/apache/amber/server/AccessTest.java b/server/src/test/java/org/apache/amber/server/AccessTest.java deleted file mode 100644 index 348b837d..00000000 --- a/server/src/test/java/org/apache/amber/server/AccessTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -/** - * @version $Id$ - */ -public class AccessTest { - - @Test - public void matchingEqualsHashTest() { - Access access1 = new Access(123456, "313121"); - Access access2 = new Access(123456, "313121"); - assertTrue(!access1.equals(null)); - assertTrue(access1.equals(access2) && access1.hashCode() == access2.hashCode()); - } - - @Test - public void notMatchingEqualsHashTest() { - Access access1 = new Access(123456, "313121"); - Access access2 = new Access(123446, "313121"); - Access access3 = new Access(123456, "313122"); - Access access4 = new Access(123456, "313121"); - access4.addNonce("313122"); - assertTrue(!access1.equals(access2) && access1.hashCode() != access2.hashCode()); - assertTrue(!access1.equals(access3) && access1.hashCode() != access3.hashCode()); - assertTrue(!access1.equals(access4) && access1.hashCode() != access4.hashCode()); - } - -} From b0ab7a4df601486c1286e5cb5b8792ff80f1c7c5 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Wed, 27 Jun 2012 15:50:25 +0000 Subject: [PATCH 099/583] [AMBER-55][AMBER-15] - moving signature and server modules to sandbox git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1354592 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 - signature-api/pom.xml | 80 ---- .../amber/signature/AbstractMethod.java | 345 ------------------ .../org/apache/amber/signature/BasicKey.java | 42 --- .../amber/signature/hmac/HmacSha1Method.java | 105 ------ .../signature/plaintext/PlaintextMethod.java | 75 ---- .../signature/rsa/AbstractRsaSha1Key.java | 162 -------- .../amber/signature/rsa/RsaSha1Method.java | 89 ----- .../signature/rsa/RsaSha1SigningKey.java | 53 --- .../signature/rsa/RsaSha1VerifyingKey.java | 54 --- .../signature/AbstractMethodTestCase.java | 67 ---- .../amber/signature/FakeOAuthRequest.java | 105 ------ .../org/apache/amber/signature/FakeToken.java | 69 ---- .../hmac/HmacSha1MethodTestCase.java | 37 -- .../plaintext/PlaintextMethodTestCase.java | 37 -- .../signature/rsa/RsaSha1MethodTestCase.java | 38 -- .../apache/amber/signature/rsa/private.pem | 15 - .../org/apache/amber/signature/rsa/public.pem | 6 - spec-api/pom.xml | 33 -- .../org/apache/amber/AbstractParameter.java | 116 ------ .../java/org/apache/amber/HTTPMethod.java | 69 ---- .../src/main/java/org/apache/amber/OAuth.java | 253 ------------- .../java/org/apache/amber/OAuthException.java | 55 --- .../java/org/apache/amber/OAuthFactory.java | 74 ---- .../apache/amber/OAuthMessageParameter.java | 74 ---- .../java/org/apache/amber/OAuthParameter.java | 143 -------- .../apache/amber/OAuthParameterLocation.java | 45 --- .../java/org/apache/amber/OAuthRequest.java | 78 ---- .../apache/amber/OAuthRequestParameter.java | 83 ----- .../java/org/apache/amber/OAuthResponse.java | 40 -- .../org/apache/amber/OAuthResponseParser.java | 45 --- .../apache/amber/OAuthRuntimeException.java | 53 --- .../java/org/apache/amber/OAuthToken.java | 88 ----- .../main/java/org/apache/amber/Version.java | 105 ------ .../apache/amber/client/HttpConnector.java | 48 --- .../apache/amber/client/NonceGenerator.java | 33 -- .../org/apache/amber/client/OAuthClient.java | 266 -------------- .../apache/amber/client/OAuthConsumer.java | 84 ----- .../java/org/apache/amber/package-info.java | 32 -- .../java/org/apache/amber/server/Access.java | 58 --- .../apache/amber/server/AccessStorage.java | 54 --- .../apache/amber/server/ConsumerStorage.java | 61 ---- .../apache/amber/server/OAuthProvider.java | 135 ------- .../apache/amber/server/OAuthProviders.java | 48 --- .../org/apache/amber/server/OAuthServer.java | 45 --- .../server/OAuthServerConfiguration.java | 41 --- .../org/apache/amber/server/OAuthnServer.java | 57 --- .../org/apache/amber/server/OAuthzServer.java | 39 -- .../apache/amber/server/StorageException.java | 43 --- .../server/TemporaryCredentialsGenerator.java | 33 -- .../server/TokenCredentialsGenerator.java | 33 -- .../org/apache/amber/server/TokenStorage.java | 72 ---- .../java/org/apache/amber/signature/Key.java | 40 -- .../amber/signature/SignatureException.java | 62 ---- .../amber/signature/SignatureMethod.java | 66 ---- .../apache/amber/signature/SigningKey.java | 26 -- .../apache/amber/signature/VerifyingKey.java | 26 -- .../resources/META-INF/oauth-providers.xsd | 64 ---- 58 files changed, 4201 deletions(-) delete mode 100644 signature-api/pom.xml delete mode 100644 signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java delete mode 100644 signature-api/src/main/java/org/apache/amber/signature/BasicKey.java delete mode 100644 signature-api/src/main/java/org/apache/amber/signature/hmac/HmacSha1Method.java delete mode 100644 signature-api/src/main/java/org/apache/amber/signature/plaintext/PlaintextMethod.java delete mode 100644 signature-api/src/main/java/org/apache/amber/signature/rsa/AbstractRsaSha1Key.java delete mode 100644 signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java delete mode 100644 signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1SigningKey.java delete mode 100644 signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1VerifyingKey.java delete mode 100644 signature-api/src/test/java/org/apache/amber/signature/AbstractMethodTestCase.java delete mode 100644 signature-api/src/test/java/org/apache/amber/signature/FakeOAuthRequest.java delete mode 100644 signature-api/src/test/java/org/apache/amber/signature/FakeToken.java delete mode 100644 signature-api/src/test/java/org/apache/amber/signature/hmac/HmacSha1MethodTestCase.java delete mode 100644 signature-api/src/test/java/org/apache/amber/signature/plaintext/PlaintextMethodTestCase.java delete mode 100644 signature-api/src/test/java/org/apache/amber/signature/rsa/RsaSha1MethodTestCase.java delete mode 100644 signature-api/src/test/resources/org/apache/amber/signature/rsa/private.pem delete mode 100644 signature-api/src/test/resources/org/apache/amber/signature/rsa/public.pem delete mode 100644 spec-api/pom.xml delete mode 100644 spec-api/src/main/java/org/apache/amber/AbstractParameter.java delete mode 100644 spec-api/src/main/java/org/apache/amber/HTTPMethod.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuth.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthException.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthFactory.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthMessageParameter.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthParameter.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthParameterLocation.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthRequest.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthRequestParameter.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthResponse.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthResponseParser.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthRuntimeException.java delete mode 100644 spec-api/src/main/java/org/apache/amber/OAuthToken.java delete mode 100644 spec-api/src/main/java/org/apache/amber/Version.java delete mode 100644 spec-api/src/main/java/org/apache/amber/client/HttpConnector.java delete mode 100644 spec-api/src/main/java/org/apache/amber/client/NonceGenerator.java delete mode 100644 spec-api/src/main/java/org/apache/amber/client/OAuthClient.java delete mode 100644 spec-api/src/main/java/org/apache/amber/client/OAuthConsumer.java delete mode 100644 spec-api/src/main/java/org/apache/amber/package-info.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/Access.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/AccessStorage.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/ConsumerStorage.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/OAuthProvider.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/OAuthProviders.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/OAuthServer.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/OAuthServerConfiguration.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/OAuthnServer.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/OAuthzServer.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/StorageException.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/TemporaryCredentialsGenerator.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/TokenCredentialsGenerator.java delete mode 100644 spec-api/src/main/java/org/apache/amber/server/TokenStorage.java delete mode 100644 spec-api/src/main/java/org/apache/amber/signature/Key.java delete mode 100644 spec-api/src/main/java/org/apache/amber/signature/SignatureException.java delete mode 100644 spec-api/src/main/java/org/apache/amber/signature/SignatureMethod.java delete mode 100644 spec-api/src/main/java/org/apache/amber/signature/SigningKey.java delete mode 100644 spec-api/src/main/java/org/apache/amber/signature/VerifyingKey.java delete mode 100644 spec-api/src/main/resources/META-INF/oauth-providers.xsd diff --git a/pom.xml b/pom.xml index 00e456b6..c31bd841 100644 --- a/pom.xml +++ b/pom.xml @@ -228,8 +228,6 @@ - spec-api - signature-api oauth-2.0 diff --git a/signature-api/pom.xml b/signature-api/pom.xml deleted file mode 100644 index 911749ee..00000000 --- a/signature-api/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - org.apache.amber - amber-parent - 0.22-incubating-SNAPSHOT - - - 4.0.0 - org.apache.amber - amber-signature-api - jar - Apache Amber: Signature API - - - - org.apache.amber - amber-spec-api - ${project.parent.version} - compile - - - - ca.juliusdavies - not-yet-commons-ssl - 0.3.11 - - - - commons-codec - commons-codec - 1.4 - compile - - - - commons-logging - commons-logging - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.2 - - - - dependencies - dependency-convergence - index - summary - - - - - - - - diff --git a/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java b/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java deleted file mode 100644 index 109413ab..00000000 --- a/signature-api/src/main/java/org/apache/amber/signature/AbstractMethod.java +++ /dev/null @@ -1,345 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature; - -import java.net.URI; -import java.nio.charset.Charset; -import java.util.Arrays; -import java.util.BitSet; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.Map.Entry; - -import org.apache.amber.OAuthMessageParameter; -import org.apache.amber.OAuthRequest; -import org.apache.amber.OAuthRequestParameter; -import org.apache.amber.OAuthToken; -import org.apache.commons.codec.binary.Base64; -import org.apache.commons.codec.net.URLCodec; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Abstract implementation of OAuth signature method algorithm. - * - * @version $Id$ - */ -public abstract class AbstractMethod - implements SignatureMethod { - - /** - * HTTP protocol name. - */ - private static final String HTTP_PROTOCOL = "http"; - - /** - * HTTPS protocol name. - */ - private static final String HTTPS_PROTOCOL = "https"; - - /** - * URL path separator. - */ - private static final String PATH_SEPARATOR = "/"; - - /** - * URL scheme separator. - */ - private static final String SCHEME_SEPARATOR = "://"; - - /** - * The default HTTP port ({@code 80}) constant. - */ - private static final int DEFAULT_HTTP_PORT = 80; - - /** - * The default HTTPS port ({@code 443}) constant. - */ - private static final int DEFAULT_HTTPS_PORT = 443; - - /** - * The empty string constant. - */ - private static final String EMPTY = ""; - - /** - * The default {@code UTF-8} character encoding. - */ - private static final Charset UTF_8 = Charset.forName("UTF-8"); - - /** - * The {@code RFC3986} unreserved chars. - */ - private static final BitSet UNRESERVED_CHARS = new BitSet(256); - - /** - * Static unreserved chars bit set initialization. - */ - static { - for (byte b = 'A'; b <= 'Z'; b++) { - UNRESERVED_CHARS.set(b); - } - for (byte b = 'a'; b <= 'z'; b++) { - UNRESERVED_CHARS.set(b); - } - for (byte b = '0'; b <= '9'; b++) { - UNRESERVED_CHARS.set(b); - } - - // special URL encoding chars - UNRESERVED_CHARS.set('-'); - UNRESERVED_CHARS.set('.'); - UNRESERVED_CHARS.set('_'); - UNRESERVED_CHARS.set('~'); - } - - /** - * This class log. - */ - private final Log log = LogFactory.getLog(this.getClass()); - - /** - * Return this class log. - * - * @return this class log. - */ - protected Log getLog() { - return this.log; - } - - /** - * {@inheritDoc} - */ - public final String calculate(SK signingKey, - OAuthToken token, - OAuthRequest request) throws SignatureException { - if (signingKey == null) { - throw new SignatureException("parameter 'signingKey' must not be null"); - } - if (request == null) { - throw new SignatureException("parameter 'request' must not be null"); - } - this.checkKey(signingKey); - - String baseString = this.createBaseString(request); - String tokenSecret = extractTokenSecret(token); - return this.calculate(signingKey, tokenSecret, baseString); - } - - /** - * Calculates the signature applying the method algorithm. - * - * @param signingKey the key has to be used to sign the request. - * @param tokenSecret the temporary/token credential. - * @param baseString the OAuth base string. - * @return the calculated signature. - * @throws SignatureException if any error occurs. - */ - protected abstract String calculate(SK signingKey, String tokenSecret, String baseString) throws SignatureException; - - /** - * {@inheritDoc} - */ - public final boolean verify(String signature, - VK verifyingKey, - OAuthToken token, - OAuthRequest request) throws SignatureException { - if (signature == null) { - throw new SignatureException("parameter 'signature' must not be null"); - } - if (verifyingKey == null) { - throw new SignatureException("parameter 'verifyingKey' must not be null"); - } - if (request == null) { - throw new SignatureException("parameter 'request' must not be null"); - } - this.checkKey(verifyingKey); - - String baseString = this.createBaseString(request); - String tokenSecret = extractTokenSecret(token); - return this.verify(signature, verifyingKey, tokenSecret, baseString); - } - - /** - * Verifies the signature applying the method algorithm. - * - * @param signature the OAuth signature has to be verified. - * @param verifyingKey the key has to be used to verify the request. - * @param tokenSecret the temporary/token credential. - * @param baseString the OAuth base string. - * @return true if the signature is verified, false otherwise. - * @throws SignatureException if any error occurs. - */ - protected abstract boolean verify(String signature, VK verifyingKey, String tokenSecret, String baseString) throws SignatureException; - - /** - * - * - * @param key - * @throws SignatureException - */ - private void checkKey(Key key) throws SignatureException { - for (String method : key.getAlgorithmMethods()) { - if (this.getAlgorithm().equals(method)) { - return; - } - } - throw new SignatureException("Required '" - + this.getAlgorithm() - + "', key of type '" - + key.getClass().getName() - + "' only supports " - + Arrays.toString(key.getAlgorithmMethods()) - + " methods"); - } - - /** - * Calculates the OAuth base string. - * - * @param request - * @return the calculated OAuth base string. - * @throws SignatureException if any error occurs. - */ - private String createBaseString(OAuthRequest request) throws SignatureException { - // the HTTP method - String method = request.getHTTPMethod().name(); - - // the normalized request URL - URI url = request.getRequestURL(); - String scheme = url.getScheme().toLowerCase(); - String authority = url.getAuthority().toLowerCase(); - - int port = url.getPort(); - if ((HTTP_PROTOCOL.equals(scheme) && DEFAULT_HTTP_PORT == port) - || (HTTPS_PROTOCOL.equals(scheme) && DEFAULT_HTTPS_PORT == port)) { - int index = authority.lastIndexOf(':'); - if (index >= 0) { - authority = authority.substring(0, index); - } - } - - String path = url.getPath(); - if (path == null || path.length() <= 0) { - path = PATH_SEPARATOR; // conforms to RFC 2616 section 3.2.2 - } - - String requestUrl = new StringBuilder(scheme) - .append(SCHEME_SEPARATOR) - .append(authority) - .append(path) - .toString(); - - // parameters normalization - SortedSet> normalizedParameters = new TreeSet>(); - - for (OAuthMessageParameter parameter : request.getOAuthMessageParameters()) { - if (parameter.getKey().isIncludeInSignature()) { - encodeAndAddParameter(parameter.getKey().getLabel(), parameter.getValue(), normalizedParameters); - } - } - - for (OAuthRequestParameter parameter : request.getOAuthRequestParameters()) { - if (request.getOAuthMessageParameters().contains(parameter)) { - throw new SignatureException("Request parameter " - + parameter - + " can't override an OAuth message one"); - } - encodeAndAddParameter(parameter.getKey(), parameter.getValue(), normalizedParameters); - } - - // now serialize the normalized parameters - StringBuilder normalizedParametersBuffer = new StringBuilder(); - int counter = 0; - for (Entry parameter : normalizedParameters) { - if (counter > 0) { - normalizedParametersBuffer.append('&'); - } - - normalizedParametersBuffer.append(parameter.getKey()); - normalizedParametersBuffer.append('='); - normalizedParametersBuffer.append(parameter.getValue()); - counter++; - } - - return new StringBuilder(method) - .append('&') - .append(percentEncode(requestUrl)) - .append('&') - .append(percentEncode(normalizedParametersBuffer.toString())) - .toString(); - } - - private static final String extractTokenSecret(OAuthToken token) { - if (token == null) { - return EMPTY; - } - return token.getTokenSecret(); - } - - /** - * Applies the percent encoding algorithm to the input text. - * - * @param text the text has to be encoded. - * @return the encoded string. - */ - protected static String percentEncode(String text) { - return new String(URLCodec.encodeUrl(UNRESERVED_CHARS, toUTF8Bytes(text)), UTF_8); - } - - /** - * Converts the input text in a sequence of UTF-8 bytes. - * - * @param text the text has to be converted. - * @return the UTF-8 bytes sequence. - */ - protected static byte[] toUTF8Bytes(String text) { - return text.getBytes(UTF_8); - } - - /** - * Encodes a bytes sequence applying the Base64 algorithm without chuncking - * the output string. - * - * @param sequence the bytes sequence has to be encoded. - * @return the Base64 encoded string. - */ - protected static String encodeBase64(byte[] sequence) { - return new String(Base64.encodeBase64(sequence, false)); - } - - /** - * Decodes an input text to a bytes sequence applying the Base64 algorithm. - * - * @param text the text has to be encoded. - * @return the decoded bytes sequence; - */ - protected static byte[] decodeBase64(String text) { - return Base64.decodeBase64(text); - } - - /** - * Add the input parameter in the list, encoding the parameter name/value - * first, then putting it in the list in the right position - * - * @param parameter the input parameter. - * @param parametersList the list where add the parameter. - */ - private static void encodeAndAddParameter(String name, String value, SortedSet> normalizedParameters) { - normalizedParameters.add(new OAuthRequestParameter(percentEncode(name), percentEncode(value))); - } - -} diff --git a/signature-api/src/main/java/org/apache/amber/signature/BasicKey.java b/signature-api/src/main/java/org/apache/amber/signature/BasicKey.java deleted file mode 100644 index d1201400..00000000 --- a/signature-api/src/main/java/org/apache/amber/signature/BasicKey.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature; - -/** - * - * - * @version $Id$ - */ -public final class BasicKey implements SigningKey, VerifyingKey { - - private static final String[] METHODS = { "PLAINTEXT", "HMAC-SHA1" }; - - private final String value; - - public BasicKey(String value) { - this.value = value; - } - - public String getValue() { - return this.value; - } - - public String[] getAlgorithmMethods() { - return METHODS; - } - -} diff --git a/signature-api/src/main/java/org/apache/amber/signature/hmac/HmacSha1Method.java b/signature-api/src/main/java/org/apache/amber/signature/hmac/HmacSha1Method.java deleted file mode 100644 index 381ef071..00000000 --- a/signature-api/src/main/java/org/apache/amber/signature/hmac/HmacSha1Method.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature.hmac; - -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; - -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; - -import org.apache.amber.signature.AbstractMethod; -import org.apache.amber.signature.SignatureException; -import org.apache.amber.signature.SigningKey; -import org.apache.amber.signature.VerifyingKey; - -/** - * HMAC-SHA1 Method implementation. - * - * @version $Id$ - */ -public final class HmacSha1Method extends AbstractMethod { - - private static final String HMAC_SHA1 = "HMAC-SHA1"; - - private static final String HMAC_SHA1_ALGORITHM = "HmacSHA1"; - - /** - * {@inheritDoc} - */ - @Override - protected String calculate(SigningKey signingKey, - String tokenSecret, - String baseString) throws SignatureException { - String key = new StringBuilder(percentEncode(signingKey.getValue())) - .append('&') - .append(percentEncode(tokenSecret)) - .toString(); - - SecretKeySpec secretKeySpec = new SecretKeySpec(key.getBytes(), HMAC_SHA1_ALGORITHM); - - Mac mac = null; - try { - mac = Mac.getInstance(HMAC_SHA1_ALGORITHM); - } catch (NoSuchAlgorithmException e) { - throw new SignatureException("HMAC-SHA1 Algorithm not supported", e); - } - - try { - mac.init(secretKeySpec); - } catch (InvalidKeyException e) { - throw new SignatureException(new StringBuilder("Signing key '") - .append(key) - .append("' caused HMAC-SHA1 error") - .toString(), e); - } - - byte[] rawHmac = mac.doFinal(baseString.getBytes()); - - return encodeBase64(rawHmac); - } - - /** - * {@inheritDoc} - */ - @Override - protected boolean verify(String signature, - VerifyingKey verifyingKey, - String tokenSecret, - String baseString) throws SignatureException { - String expectedSignature = this.calculate((SigningKey) verifyingKey, tokenSecret, baseString); - - if (this.getLog().isDebugEnabled()) { - this.getLog().debug(new StringBuilder("Received signature {") - .append(signature) - .append("} expected signature {") - .append(expectedSignature) - .append('}') - .toString()); - } - - return expectedSignature.equals(signature); - } - - /** - * {@inheritDoc} - */ - public String getAlgorithm() { - return HMAC_SHA1; - } - -} diff --git a/signature-api/src/main/java/org/apache/amber/signature/plaintext/PlaintextMethod.java b/signature-api/src/main/java/org/apache/amber/signature/plaintext/PlaintextMethod.java deleted file mode 100644 index e4404a35..00000000 --- a/signature-api/src/main/java/org/apache/amber/signature/plaintext/PlaintextMethod.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature.plaintext; - -import org.apache.amber.signature.AbstractMethod; -import org.apache.amber.signature.SignatureException; -import org.apache.amber.signature.SigningKey; -import org.apache.amber.signature.VerifyingKey; - -/** - * PLAINTEXT Method implementation. - * - * @version $Id$ - */ -public final class PlaintextMethod extends AbstractMethod { - - private static final String PLAINTEXT = "PLAINTEXT"; - - /** - * {@inheritDoc} - */ - @Override - protected String calculate(SigningKey signingKey, - String tokenSecret, - String baseString) throws SignatureException { - return new StringBuilder(signingKey.getValue()) - .append('&') - .append(tokenSecret) - .toString(); - } - - /** - * {@inheritDoc} - */ - @Override - protected boolean verify(String signature, - VerifyingKey verifyingKey, - String tokenSecret, - String baseString) throws SignatureException { - String expectedSignature = this.calculate((SigningKey) verifyingKey, tokenSecret, baseString); - - if (this.getLog().isDebugEnabled()) { - this.getLog().debug(new StringBuilder("Received signature {") - .append(signature) - .append("} expected signature {") - .append(expectedSignature) - .append('}') - .toString()); - } - - return expectedSignature.equals(signature); - } - - /** - * {@inheritDoc} - */ - public String getAlgorithm() { - return PLAINTEXT; - } - -} diff --git a/signature-api/src/main/java/org/apache/amber/signature/rsa/AbstractRsaSha1Key.java b/signature-api/src/main/java/org/apache/amber/signature/rsa/AbstractRsaSha1Key.java deleted file mode 100644 index 78f6ed2e..00000000 --- a/signature-api/src/main/java/org/apache/amber/signature/rsa/AbstractRsaSha1Key.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature.rsa; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; - -import org.apache.amber.signature.Key; -import org.apache.amber.signature.SignatureException; -import org.apache.commons.ssl.PKCS8Key; - -/** - * Abstract implementation of RSA-SHA1 key. - * - * @version $Id$ - */ -abstract class AbstractRsaSha1Key implements Key { - - private static final String[] METHODS = { "RSA-SHA1" }; - - private final PKCS8Key rsaKey; - - /** - * Loads a key from a certificate located in the classpath. - * - * @param certificateClasspathLocation - * @param the certificate password - * @throws SignatureException - */ - public AbstractRsaSha1Key(String certificateClasspathLocation, String password) throws SignatureException { - if (certificateClasspathLocation == null) { - throw new SignatureException("parameter 'certificateClasspathLocation' must not be null"); - } - if ('/' == certificateClasspathLocation.charAt(0)) { - certificateClasspathLocation = certificateClasspathLocation.substring(1); - } - - URL certificateURL = this.getClass().getClassLoader().getResource(certificateClasspathLocation); - if (certificateURL == null) { - certificateURL = Thread.currentThread().getContextClassLoader().getResource(certificateClasspathLocation); - } - - if (certificateURL == null) { - throw new SignatureException("Classpath resource '" - + certificateClasspathLocation - + "' not found, please make sure it exists in the classpath"); - } - - this.rsaKey = this.readCertificate(certificateURL, password); - } - - /** - * Loads a key from a certificate located in a file. - * - * @param certificateFileLocation - * @param the certificate password - * @throws SignatureException - */ - public AbstractRsaSha1Key(File certificateFileLocation, String password) throws SignatureException { - if (certificateFileLocation == null) { - throw new SignatureException("parameter 'certificateFileLocation' must not be null"); - } - if (certificateFileLocation.exists() || certificateFileLocation.isDirectory()) { - throw new SignatureException("Impossible to load the certificate, '" - + certificateFileLocation - + "' doesn't exist or is a directory"); - } - - try { - this.rsaKey = this.readCertificate(certificateFileLocation.toURI().toURL(), password); - } catch (MalformedURLException e) { - throw new SignatureException("Impossible to read the certificate from '" - + certificateFileLocation - + "' file", e); - } - } - - /** - * Loads a key from a certificate located in an URL. - * - * @param certificateURL - * @param the certificate password - * @throws SignatureException - */ - public AbstractRsaSha1Key(URL certificateURL, String password) throws SignatureException { - if (certificateURL == null) { - throw new SignatureException("parameter 'certificateURL' must not be null"); - } - - this.rsaKey = this.readCertificate(certificateURL, password); - } - - private PKCS8Key readCertificate(URL certificateURL, String password) throws SignatureException { - URLConnection urlConnection = null; - InputStream input = null; - - if (password == null) { - password = ""; - } - - final char[] pwd = password.toCharArray(); - - try { - urlConnection = certificateURL.openConnection(); - input = urlConnection.getInputStream(); - - return new PKCS8Key(input, pwd); - } catch (Exception e) { - throw new SignatureException("Impossible to read the certificate from '" - + certificateURL - + "' URL", e); - } finally { - if (urlConnection != null && urlConnection instanceof HttpURLConnection) { - ((HttpURLConnection) urlConnection).disconnect(); - } - - if (input != null) { - try { - input.close(); - } catch (IOException e) { - // close quietly - } - } - } - } - - protected PKCS8Key getRsaKey() { - return rsaKey; - } - - @Override - public final String getValue() { - return String.valueOf(this.rsaKey); - } - - /** - * {@inheritDoc} - */ - public final String[] getAlgorithmMethods() { - return METHODS; - } - -} diff --git a/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java deleted file mode 100644 index ccaa7927..00000000 --- a/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1Method.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature.rsa; - -import java.security.Signature; - -import org.apache.amber.signature.AbstractMethod; -import org.apache.amber.signature.SignatureException; - -/** - * RSA-SHA1 Method implementation. - * - * @version $Id$ - */ -public final class RsaSha1Method extends AbstractMethod { - - /** - * RSA+SHA1 algorithm name. - */ - private static final String RSA_SHA1_ALGORITHM = "SHA1withRSA"; - - /** - * This method name. - */ - private final static String RSA_SHA1 = "RSA-SHA1"; - - /** - * {@inheritDoc} - */ - @Override - public String getAlgorithm() { - return RSA_SHA1; - } - - /** - * {@inheritDoc} - */ - @Override - protected String calculate(RsaSha1SigningKey signingKey, - String tokenSecret, - String baseString) throws SignatureException { - try { - Signature signer = Signature.getInstance(RSA_SHA1_ALGORITHM); - signer.initSign(signingKey.getPrivateKey()); - signer.update(toUTF8Bytes(baseString)); - byte[] signature = signer.sign(); - - return encodeBase64(signature); - } catch (Exception e) { - // TODO add a meaningful message - throw new SignatureException(e); - } - } - - /** - * {@inheritDoc} - */ - @Override - protected boolean verify(String signature, - RsaSha1VerifyingKey verifyingKey, - String tokenSecret, - String baseString) throws SignatureException { - try { - Signature verifier = Signature.getInstance(RSA_SHA1_ALGORITHM); - verifier.initVerify(verifyingKey.getPublicKey()); - verifier.update(toUTF8Bytes(baseString)); - - return verifier.verify(decodeBase64(signature)); - } catch (Exception e) { - // TODO add a meaningful message - throw new SignatureException(e); - } - } - -} diff --git a/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1SigningKey.java b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1SigningKey.java deleted file mode 100644 index 29870b60..00000000 --- a/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1SigningKey.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature.rsa; - -import java.io.File; -import java.net.URL; -import java.security.PrivateKey; - -import org.apache.amber.signature.SignatureException; -import org.apache.amber.signature.SigningKey; - -/** - * - * - * @version $Id$ - */ -public final class RsaSha1SigningKey - extends AbstractRsaSha1Key - implements SigningKey { - - public RsaSha1SigningKey(File certificateFileLocation, String password) - throws SignatureException { - super(certificateFileLocation, password); - } - - public RsaSha1SigningKey(String certificateClasspathLocation, String password) - throws SignatureException { - super(certificateClasspathLocation, password); - } - - public RsaSha1SigningKey(URL certificateURL, String password) throws SignatureException { - super(certificateURL, password); - } - - public PrivateKey getPrivateKey() { - return getRsaKey().getPrivateKey(); - } - -} diff --git a/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1VerifyingKey.java b/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1VerifyingKey.java deleted file mode 100644 index ff3c1ea8..00000000 --- a/signature-api/src/main/java/org/apache/amber/signature/rsa/RsaSha1VerifyingKey.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature.rsa; - -import java.io.File; -import java.net.URL; -import java.security.GeneralSecurityException; -import java.security.PublicKey; - -import org.apache.amber.signature.SignatureException; -import org.apache.amber.signature.VerifyingKey; - -/** - * - * - * @version $Id$ - */ -public final class RsaSha1VerifyingKey - extends AbstractRsaSha1Key - implements VerifyingKey { - - public RsaSha1VerifyingKey(File certificateFileLocation, String password) - throws SignatureException { - super(certificateFileLocation, password); - } - - public RsaSha1VerifyingKey(String certificateClasspathLocation, String password) - throws SignatureException { - super(certificateClasspathLocation, password); - } - - public RsaSha1VerifyingKey(URL certificateURL, String password) throws SignatureException { - super(certificateURL, password); - } - - public PublicKey getPublicKey() throws GeneralSecurityException { - return getRsaKey().getPublicKey(); - } - -} diff --git a/signature-api/src/test/java/org/apache/amber/signature/AbstractMethodTestCase.java b/signature-api/src/test/java/org/apache/amber/signature/AbstractMethodTestCase.java deleted file mode 100644 index 6c1ac0df..00000000 --- a/signature-api/src/test/java/org/apache/amber/signature/AbstractMethodTestCase.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature; - -import static junit.framework.Assert.assertTrue; - -import java.net.URI; - -import org.apache.amber.HTTPMethod; -import org.apache.amber.OAuthMessageParameter; -import org.apache.amber.OAuthParameter; -import org.apache.amber.OAuthRequest; -import org.apache.amber.OAuthRequestParameter; -import org.apache.amber.OAuthToken; -import org.apache.amber.Version; - -/** - * Abstract implementation of OAuth signature method algorithm test case. - * - * @version $Id$ - */ -public abstract class AbstractMethodTestCase { - - protected void verifySignature(VK verifyingKey, - SignatureMethod signatureMethod, - String expectedSignature) throws Exception { - OAuthRequest request = new FakeOAuthRequest(); - request.setRequestURL(URI.create("http://photos.example.net/photos")); - request.setHTTPMethod(HTTPMethod.GET); - addMessageParameter(OAuthParameter.CONSUMER_KEY, "dpf43f3p2l4k3l03", request); - addMessageParameter(OAuthParameter.NONCE, "kllo9940pd9333jh", request); - addMessageParameter(OAuthParameter.SIGNATURE_METHOD, signatureMethod.getAlgorithm(), request); - addMessageParameter(OAuthParameter.TIMESTAMP, "1191242096", request); - addMessageParameter(OAuthParameter.TOKEN, "nnch734d00sl2jdk", request); - addMessageParameter(OAuthParameter.VERSION, Version.v1_0.toString(), request); - addMessageParameter("size", "original", request); - addMessageParameter("file", "vacation.jpg", request); - - OAuthToken token = new FakeToken(); - token.setTokenSecret("pfkkdhi9sl3r4s00"); - - assertTrue(signatureMethod.verify(expectedSignature, verifyingKey, token, request)); - } - - private static void addMessageParameter(OAuthParameter parameter, String value, OAuthRequest request) { - request.addOAuthMessageParameter(new OAuthMessageParameter(parameter, value)); - } - - private static void addMessageParameter(String name, String value, OAuthRequest request) { - request.addOAuthRequestParameter(new OAuthRequestParameter(name, value)); - } - -} diff --git a/signature-api/src/test/java/org/apache/amber/signature/FakeOAuthRequest.java b/signature-api/src/test/java/org/apache/amber/signature/FakeOAuthRequest.java deleted file mode 100644 index 9973e72e..00000000 --- a/signature-api/src/test/java/org/apache/amber/signature/FakeOAuthRequest.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature; - -import java.net.URI; -import java.util.Collection; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.apache.amber.HTTPMethod; -import org.apache.amber.OAuthMessageParameter; -import org.apache.amber.OAuthParameter; -import org.apache.amber.OAuthParameterLocation; -import org.apache.amber.OAuthRequest; -import org.apache.amber.OAuthRequestParameter; - -/** - * - * @version $Id$ - */ -final class FakeOAuthRequest implements OAuthRequest { - - private HTTPMethod httpMethod; - - private URI requestURL; - - private OAuthParameterLocation parameterLocation; - - private final SortedSet messageParameters = new TreeSet(); - - private final SortedSet requestParameters = new TreeSet(); - - public void addOAuthMessageParameter(OAuthMessageParameter parameter) { - this.messageParameters.add(parameter); - } - - public void addOAuthRequestParameter(OAuthRequestParameter parameter) { - this.requestParameters.add(parameter); - } - - public HTTPMethod getHTTPMethod() { - return this.httpMethod; - } - - public void setHTTPMethod(HTTPMethod httpMethod) { - this.httpMethod = httpMethod; - } - - public OAuthParameterLocation getParameterLocation() { - return this.parameterLocation; - } - - public void setParameterLocation(OAuthParameterLocation parameterLocation) { - this.parameterLocation = parameterLocation; - } - - public Collection getOAuthMessageParameters() { - return this.messageParameters; - } - - public Collection getOAuthRequestParameters() { - return this.requestParameters; - } - - public URI getRequestURL() { - return this.requestURL; - } - - public void setRequestURL(URI requestURL) { - this.requestURL = requestURL; - } - - public String getOAuthMessageParameter(OAuthParameter parameter) { - for (OAuthMessageParameter omp : this.messageParameters) { - if (omp.getKey().equals(parameter)) { - return omp.getValue(); - } - } - return null; // not ideal, but it's only a test - } - - public String getOAuthRequestParameter(String name) { - for (OAuthRequestParameter orp : this.requestParameters) { - if (orp.getKey().equals(name)) { - return orp.getValue(); - } - } - return null; // not ideal, but it's only a test - } - -} diff --git a/signature-api/src/test/java/org/apache/amber/signature/FakeToken.java b/signature-api/src/test/java/org/apache/amber/signature/FakeToken.java deleted file mode 100644 index 767cf9ab..00000000 --- a/signature-api/src/test/java/org/apache/amber/signature/FakeToken.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature; - -import java.util.Set; -import java.util.Map.Entry; - -import org.apache.amber.OAuthToken; - -final class FakeToken implements OAuthToken { - - /** - * - */ - private static final long serialVersionUID = -4501539974041422272L; - - private String tokenSecret; - - public void addAdditionalParameters(String name, String value) { - // unneded for test purposes - } - - public Set> additionalParametersEntrySet() { - // unneded for test purposes - return null; - } - - public String getToken() { - // unneded for test purposes - return null; - } - - public String getTokenSecret() { - // unneded for test purposes - return this.tokenSecret; - } - - public boolean isCallbackConfirmed() { - // unneded for test purposes - return false; - } - - public void setCallbackConfirmed(boolean callbackConfirmed) { - // unneded for test purposes - } - - public void setToken(String token) { - // unneded for test purposes - } - - public void setTokenSecret(String tokenSecret) { - this.tokenSecret = tokenSecret; - } - -} diff --git a/signature-api/src/test/java/org/apache/amber/signature/hmac/HmacSha1MethodTestCase.java b/signature-api/src/test/java/org/apache/amber/signature/hmac/HmacSha1MethodTestCase.java deleted file mode 100644 index abfd2d0e..00000000 --- a/signature-api/src/test/java/org/apache/amber/signature/hmac/HmacSha1MethodTestCase.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature.hmac; - -import org.apache.amber.signature.AbstractMethodTestCase; -import org.apache.amber.signature.BasicKey; -import org.junit.Test; - -/** - * HMAC-SHA1 Method test case implementation. - * - * @version $Id$ - */ -public class HmacSha1MethodTestCase extends AbstractMethodTestCase { - - @Test - public void verifyHmacSha1MethodAlgorithm() throws Exception { - this.verifySignature(new BasicKey("kd94hf93k423kf44"), - new HmacSha1Method(), - "tR3+Ty81lMeYAr/Fid0kMTYa/WM="); - } - -} diff --git a/signature-api/src/test/java/org/apache/amber/signature/plaintext/PlaintextMethodTestCase.java b/signature-api/src/test/java/org/apache/amber/signature/plaintext/PlaintextMethodTestCase.java deleted file mode 100644 index 9b7050b9..00000000 --- a/signature-api/src/test/java/org/apache/amber/signature/plaintext/PlaintextMethodTestCase.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature.plaintext; - -import org.apache.amber.signature.AbstractMethodTestCase; -import org.apache.amber.signature.BasicKey; -import org.junit.Test; - -/** - * HMAC-SHA1 Method test case implementation. - * - * @version $Id$ - */ -public class PlaintextMethodTestCase extends AbstractMethodTestCase { - - @Test - public void verifyHmacSha1MethodAlgorithm() throws Exception { - this.verifySignature(new BasicKey("kd94hf93k423kf44"), - new PlaintextMethod(), - "kd94hf93k423kf44&pfkkdhi9sl3r4s00"); - } - -} diff --git a/signature-api/src/test/java/org/apache/amber/signature/rsa/RsaSha1MethodTestCase.java b/signature-api/src/test/java/org/apache/amber/signature/rsa/RsaSha1MethodTestCase.java deleted file mode 100644 index 7c417e47..00000000 --- a/signature-api/src/test/java/org/apache/amber/signature/rsa/RsaSha1MethodTestCase.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature.rsa; - -import org.apache.amber.signature.AbstractMethodTestCase; -import org.junit.Ignore; -import org.junit.Test; - -/** - * - * - * @version $Id$ - */ -public final class RsaSha1MethodTestCase extends AbstractMethodTestCase { - - @Test - @Ignore - public void verifyRsaSha1MethodAlgorithm() throws Exception { - this.verifySignature(new RsaSha1VerifyingKey("org/apache/amber/signature/rsa/public.pem", ""), - new RsaSha1Method(), - "kd94hf93k423kf44&pfkkdhi9sl3r4s00"); - } - -} diff --git a/signature-api/src/test/resources/org/apache/amber/signature/rsa/private.pem b/signature-api/src/test/resources/org/apache/amber/signature/rsa/private.pem deleted file mode 100644 index 53e20286..00000000 --- a/signature-api/src/test/resources/org/apache/amber/signature/rsa/private.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDEvO0izOt4zfdK5Z+BDRd0wXuiPvXzgD5ZdFI1QpS/eqZffZue -lzY6cm7MA1xTtw/jX7tHaALw5MvGh6T7SShrrKQcSxsSQWN+4RclLYfVe0xKin+7 -IOV3fXo1EPAIGrJNITffTsPgLuygsFRYBY7+3Q90PfETKIizkddBxcUL1QIDAQAB -AoGAPg/jNrEyLv+6XRQmxw0cMya+G6aE6/WutYVuUYLZbbYBOepj5xmIb9OdhBoj -S/1Zs76FU7dKBjgG2G/96Y9ggljkqbM28hCRg+M5+rsOQZGHO8+S+cUTkpR6pqT9 -GJ+tkC+ca08mtZkSBF9GOM2b18kbxNIBs+N781+JeLlwr1kCQQD1JpZkn6G2CrFC -vqzeHQyPlkZtbyf3yrAMwl2pYuq4Zhm+4l7E3KhaLped1Yu8R76CRdsUR4N8N8eq -mHDPyRdfAkEAzXHZ5/XKJs32co/e5oX+il9+cdO1qHsx7lAif2dNhLHKQ+PK8HTd -73G3Id4FH/yEUuronOoAigSb0X2q6PCtSwJAbH1uMwu+GfzzY3FUuVsrsuOzOTzm -+C8X6B2gK5UeAQsWO7accAyi6H4UFQJrO6CYe7iEcp4PX0qkLygVTK9WiwJBAMZz -dbRVfsJhLfCX/Q7c3HY5rGCzysRGzIKRseEznnPRcbqGrh/8I+4KAIaceoLdX8zg -0XXRrFemAAYqyA9ffWUCQE/euQGTP1lTxkpjFBmf5SM2Z2Ytc07WNkVaefyFrY2x -R8UhvCkS8Q5PQCfmf/Ffe5OSiRb40zxl+KZR90LsiCw= ------END RSA PRIVATE KEY----- diff --git a/signature-api/src/test/resources/org/apache/amber/signature/rsa/public.pem b/signature-api/src/test/resources/org/apache/amber/signature/rsa/public.pem deleted file mode 100644 index 3916836c..00000000 --- a/signature-api/src/test/resources/org/apache/amber/signature/rsa/public.pem +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEvO0izOt4zfdK5Z+BDRd0wXui -PvXzgD5ZdFI1QpS/eqZffZuelzY6cm7MA1xTtw/jX7tHaALw5MvGh6T7SShrrKQc -SxsSQWN+4RclLYfVe0xKin+7IOV3fXo1EPAIGrJNITffTsPgLuygsFRYBY7+3Q90 -PfETKIizkddBxcUL1QIDAQAB ------END PUBLIC KEY----- diff --git a/spec-api/pom.xml b/spec-api/pom.xml deleted file mode 100644 index 7d760eef..00000000 --- a/spec-api/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - org.apache.amber - amber-parent - 0.22-incubating-SNAPSHOT - - - 4.0.0 - org.apache.amber - amber-spec-api - jar - Apache Amber: Specification API - - diff --git a/spec-api/src/main/java/org/apache/amber/AbstractParameter.java b/spec-api/src/main/java/org/apache/amber/AbstractParameter.java deleted file mode 100644 index 0dd6314f..00000000 --- a/spec-api/src/main/java/org/apache/amber/AbstractParameter.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -import java.util.Map.Entry; - -/** - * - * - * @version $Id$ - * @param - */ -abstract class AbstractParameter - implements Entry, Comparable> { - - /** - * A non-zero, odd number used as the initial value. - */ - protected static final int INITIAL_ODD_NUMBER = 1; - - /** - * A non-zero, odd number used as the multiplier. - */ - protected static final int MULTIPLIER_ODD_NUMBER = 31; - - /** - * The parameter key. - */ - private final N key; - - /** - * The parameter value. - */ - private final String value; - - /** - * Creates a new parameter by his key and value. - * - * @param key the parameter key. - * @param value the parameter value. - */ - public AbstractParameter(N key, String value) { - if (key == null) { - throw new IllegalArgumentException("Paramater 'key' must not be null"); - } - if (value == null) { - throw new IllegalArgumentException("Paramater 'value' must not be null"); - } - this.key = key; - this.value = value; - } - - /** - * {@inheritDoc} - */ - public final int compareTo(AbstractParameter parameter) { - if (parameter == null) { - return 1; - } - - int nameComparison = String.valueOf(this.key).compareTo(String.valueOf(parameter.getKey())); - if (0 == nameComparison) { - return this.value.compareTo(parameter.getValue()); - } - return nameComparison; - } - - /** - * {@inheritDoc} - */ - public final N getKey() { - return this.key; - } - - /** - * {@inheritDoc} - */ - public final String getValue() { - return this.value; - } - - /** - * {@inheritDoc} - */ - public final String setValue(String value) { - return null; - } - - /** - * {@inheritDoc} - */ - @Override - public final String toString() { - return new StringBuilder("Parameter { key=") - .append(this.key) - .append(", value=") - .append(this.value) - .append(" }") - .toString(); - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/HTTPMethod.java b/spec-api/src/main/java/org/apache/amber/HTTPMethod.java deleted file mode 100644 index 3b8949fc..00000000 --- a/spec-api/src/main/java/org/apache/amber/HTTPMethod.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -/** - * Enumeration of available HTTP methods. - * - * Enumerates methods are defined in - * HTTP/1.1: Method Definitions. - * - * @version $Id$ - */ -public enum HTTPMethod { - - /** - * The {@code HEAD} HTTP method. - */ - HEAD, - - /** - * The {@code POST} HTTP method. - */ - POST, - - /** - * The {@code PUT} HTTP method. - */ - PUT, - - /** - * The {@code GET} HTTP method. - */ - GET, - - /** - * The {@code DELETE} HTTP method. - */ - DELETE, - - /** - * The {@code OPTIONS} HTTP method. - */ - OPTIONS, - - /** - * The {@code TRACE} HTTP method. - */ - TRACE, - - /** - * The {@code CONNECT} HTTP method. - */ - CONNECT; - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuth.java b/spec-api/src/main/java/org/apache/amber/OAuth.java deleted file mode 100644 index b02f3f7d..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuth.java +++ /dev/null @@ -1,253 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -import org.apache.amber.server.OAuthProvider; -import org.apache.amber.server.OAuthProviders; -import org.xml.sax.SAXException; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; - -import java.io.Closeable; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.Enumeration; -import java.util.Properties; -import java.util.ServiceLoader; - -import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; - -/** - * The OAuth object provides access to the {@link org.apache.amber.OAuthFactory}. - * - * @version $Id$ - */ -public final class OAuth { - - /** - * - */ - public static final String JAXB_PACKAGE = "org.apache.amber.jaxb.package"; - - /** - * default callback value - */ - public static final String OUT_OF_BAND = "oob"; - - /** - * oauth-providers.xsd schema - */ - private static final String PROVIDER_XSD = "/META-INF/oauth-providers.xsd"; - - /** - * oauth-providers.xml filename - */ - private static final String PROVIDER_XML = "META-INF/oauth-providers.xml"; - - /** - * oauth-properties.xml - */ - private static final String PROPERTIES_XML = "META-INF/oauth-properties.xml"; - - /** - * Perform initialisation of a factory - * - * @return An instantiated factory - * @throws OAuthRuntimeException - */ - public static final OAuthFactory createFactory() throws OAuthRuntimeException { - return createFactory(Version.v1_0a); - } - - /** - * Perform initialisation of a factory - * - * @param properties - * - * @return An instantiated factory - * @throws OAuthRuntimeException - */ - public static final OAuthFactory createFactory(Properties properties) throws OAuthRuntimeException { - return createFactory(Version.v1_0a, properties); - } - - /** - * Perform initialisation of a factory - * - * @param version - * - * @return An instantiated factory - * @throws OAuthRuntimeException - */ - public static final OAuthFactory createFactory(Version version) throws OAuthRuntimeException { - Properties properties = new Properties(); - - // The getContextClassLoader() method is called inside the other - // load method anyway, so we might as well expose it here - // TODO avoid classloader memory leaks? - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - - InputStream inputStream = null; - try { - Enumeration resources = loader.getResources(PROPERTIES_XML); - while (resources.hasMoreElements()) { - // TODO specify classloader search order manually? - // Load the first resource - URL resource = resources.nextElement(); - inputStream = resource.openStream(); - properties.loadFromXML(inputStream); - } - } catch (IOException e) { - throw new OAuthRuntimeException(e); - } finally { - closeQuietly(inputStream); - } - - return createFactory(version, properties); - } - - /** - * Perform initialisation of a factory - * - * @param version - * @param properties - * - * @return An instantiated factory - * @throws OAuthRuntimeException - */ - public static final OAuthFactory createFactory(Version version, Properties properties) throws OAuthRuntimeException { - - // TODO Can we avoid classloader leaks and related trauma, by: - // ClassLoader loader = OAuth.class.getClassLoader(); - - ServiceLoader factories = ServiceLoader.load(OAuthFactory.class); - - for (OAuthFactory factory : factories) { - - if (!factory.getVersion().equals(version)) { - continue; - } - - factory.setProperties(properties); - - // ------------------------------------------------------------------------ - // Load any installed OAuthProvider classes using the ServiceLoader - // mechanism - try { - ServiceLoader providers = ServiceLoader.load(OAuthProvider.class); - - for (OAuthProvider provider : providers) { - factory.register(provider); - } - - // clean up forcibly - providers = null; - } - catch (Exception e) { - throw new OAuthRuntimeException(e); - } - - // ------------------------------------------------------------------------ - // Check for JAXB support in this implementation, and register any - // OAuthProvider's found - if (factory.getProperties().containsKey(JAXB_PACKAGE)) { - - // ------------------------------------------------------------------------ - // Load any installed OAuthProviders using the JAXB XML - // mechanism - try { - - // load schema from API resources - URL schemaURL = OAuth.class.getResource(PROVIDER_XSD); - SchemaFactory schemaFactory = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); - Schema schema = schemaFactory.newSchema(schemaURL); - - // Use factory implementation class to determine package - // String packageName = - // factory.getClass().getPackage().getName(); - - String packageName = factory.getProperties().getProperty(JAXB_PACKAGE); - - // Create unMarshaller for multiple usages - JAXBContext context = JAXBContext.newInstance(packageName); - Unmarshaller unMarshaller = context.createUnmarshaller(); - unMarshaller.setSchema(schema); - - // find multiple instances of the XML configuration file - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - Enumeration providerXMLs = loader.getResources(PROVIDER_XML); - - while (providerXMLs.hasMoreElements()) { - URL resourceURL = providerXMLs.nextElement(); - InputStream inputStream = resourceURL.openStream(); - Source source = new StreamSource(inputStream); - - try { - // Parse the XML file, then loop and register the - // providers - JAXBElement element = unMarshaller.unmarshal(source, factory.getProviders().getClass()); - - for (OAuthProvider provider : element.getValue().getProvider()) { - factory.register(provider); - } - } catch (JAXBException e) { - // TODO warn of error here, in log? - e.printStackTrace(); - } finally { - closeQuietly(inputStream); - } - } - } catch (IOException e) { - throw new OAuthRuntimeException(e); - } catch (SAXException e) { - throw new OAuthRuntimeException(e); - } catch (JAXBException e) { - throw new OAuthRuntimeException(e); - } - } - - // ------------------------------------------------------------------------ - // return the completed OAuthFactory - - return factory; - } - - // clean up services forcibly, who knows what GC will do otherwise. - factories = null; - - throw new OAuthRuntimeException(OAuthFactory.class.getName() + " implementation not found."); - } - - private static void closeQuietly(Closeable closeable) { - if (closeable != null) { - try { - closeable.close(); - } catch (Exception e) { - // close quietly - } - } - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuthException.java b/spec-api/src/main/java/org/apache/amber/OAuthException.java deleted file mode 100644 index 98247091..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthException.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -/** - * - *

- * Check exception, wraps exceptions thrown by implementation that can be - * recovered from. - *

- * - * @version $Revision$ $Date$ - * - */ -public class OAuthException extends Exception { - - private static final long serialVersionUID = 1L; - - /** - * @param message - * @param cause - */ - public OAuthException(final String message, final Throwable cause) { - super(message, cause); - } - - /** - * @param message - */ - public OAuthException(final String message) { - super(message); - } - - /** - * @param cause - */ - public OAuthException(final Throwable cause) { - super(cause); - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuthFactory.java b/spec-api/src/main/java/org/apache/amber/OAuthFactory.java deleted file mode 100644 index 774d28d4..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -import org.apache.amber.client.OAuthClient; -import org.apache.amber.server.OAuthProvider; -import org.apache.amber.server.OAuthProviders; -import org.apache.amber.server.OAuthServer; - -import java.io.Serializable; -import java.util.Properties; - -/** - * TODO Write extensive documentation - * - * @version $Id $HeadURL $Revision $Date $Author - */ -public interface OAuthFactory extends Serializable { - - /** - * @return version - */ - Version getVersion(); - - /** - * @param properties - */ - void setProperties(Properties properties); - - /** - * @return properties - */ - Properties getProperties(); - - /** - * @return providers - */ - OAuthProviders getProviders(); - - /** - * @param provider - * @throws OAuthRuntimeException - */ - void register(OAuthProvider provider) throws OAuthRuntimeException; - - /** - * @param realm - * @return service - * @throws OAuthException - */ - OAuthClient useService(String realm) throws OAuthException; - - /** - * @param realm - * @return service - * @throws OAuthException - */ - T createServer(String realm) throws OAuthException; - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuthMessageParameter.java b/spec-api/src/main/java/org/apache/amber/OAuthMessageParameter.java deleted file mode 100644 index f3b235e6..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthMessageParameter.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -/** - * Identifier for the OAuth Authorization message parameter. - * - * @version $Id$ - */ -public final class OAuthMessageParameter extends AbstractParameter { - - /** - * @param key - * @param value - */ - public OAuthMessageParameter(OAuthParameter key, String value) { - super(key, value); - } - - /** - * {@inheritDoc} - */ - @Override - public int hashCode() { - int result = INITIAL_ODD_NUMBER; - result = MULTIPLIER_ODD_NUMBER * result + ((this.getKey() == null) ? 0 : this.getKey().hashCode()); - return result; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - - if (obj == null) { - return false; - } - - if (this.getClass() != obj.getClass()) { - return false; - } - - AbstractParameter other = (AbstractParameter) obj; - - if (this.getKey() == null) { - if (other.getKey() != null) { - return false; - } - } else if (!String.valueOf(this.getKey()).equals(String.valueOf(other.getKey()))) { - return false; - } - - return true; - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuthParameter.java b/spec-api/src/main/java/org/apache/amber/OAuthParameter.java deleted file mode 100644 index fa5d9e9c..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthParameter.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -/** - * The OAuth specification defines individual parameters required by a provider - * at different stages of the authentication and authorisation process. - * - * @version $Id$ - */ -public enum OAuthParameter { - - /** - * The callback parameter name. - * - * Value: {@code oauth_callback}. - */ - CALLBACK("oauth_callback"), - - /** - * The Consumer key parameter name. - * - * Value: {@code oauth_consumer_key}. - */ - CONSUMER_KEY("oauth_consumer_key"), - - /** - * The nonce parameter name. - * - * Value: {@code oauth_nonce}. - */ - NONCE("oauth_nonce"), - - /** - * The realm parameter name. - * - * Value: {@code realm}. - */ - REALM("realm", false, false), - - /** - * The signature parameter name. - * - * Value: {@code oauth_signature}. - */ - SIGNATURE("oauth_signature"), - - /** - * The signature method parameter name. - * - * Value: {@code oauth_signature_method}. - */ - SIGNATURE_METHOD("oauth_signature_method"), - - /** - * The timestamp parameter name. - * - * Value: {@code oauth_timestamp}. - */ - TIMESTAMP("oauth_timestamp", true, true), - - /** - * The token parameter name. - * - * Value: {@code oauth_token}. - * - * @see org.apache.amber.OAuthToken - */ - TOKEN("oauth_token"), - - /** - * The token secret parameter name. - * - * Value: {@code oauth_token_secret}. - * - * @see org.apache.amber.OAuthToken - */ - TOKEN_SECRET("oauth_token_secret", false, false), - - /** - * The verifier parameter name. - * - * Value: {@code oauth_verifier}. - */ - VERIFIER("oauth_verifier", false, false), - - /** - * The version parameter name. - * - * Value: {@code oauth_version}. - * - * @see org.apache.amber.Version - */ - VERSION("oauth_version", false, true); - - private final String label; - - private final boolean optional; - - private final boolean includeInSignature; - - private OAuthParameter(String label) { - this(label, false, true); - } - - private OAuthParameter(String label, boolean optional, boolean includeInSignature) { - this.label = label; - this.optional = optional; - this.includeInSignature = includeInSignature; - } - - public String getLabel() { - return this.label; - } - - public boolean isOptional() { - return this.optional; - } - - public boolean isIncludeInSignature() { - return this.includeInSignature; - } - - @Override - public String toString() { - return this.label; - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuthParameterLocation.java b/spec-api/src/main/java/org/apache/amber/OAuthParameterLocation.java deleted file mode 100644 index e59b82a8..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthParameterLocation.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -/** - * Defines the possible locations for the OAuth parameters during each request. - * - * N.B. Each Provider is likely to have a preferred location. - * - * @version $Id$ - */ -public enum OAuthParameterLocation { - - /** - * OAuth parameters should be included in the appropriate header. - */ - Header, - - /** - * OAuth parameters are included in the query string. - * - * N.B. size/length limits may impact on the request. - */ - Query, - - /** - * OAuth parameters are included in the body of the request. - */ - Body, - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuthRequest.java b/spec-api/src/main/java/org/apache/amber/OAuthRequest.java deleted file mode 100644 index bf014e42..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthRequest.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -import java.net.URI; -import java.util.Collection; - -/** - * A convenient object representing the properties of an OAuth request to a - * {@link org.apache.amber.server.OAuthProvider}. - * - * @version $Id$ - */ -public interface OAuthRequest { - - URI getRequestURL(); - - void setRequestURL(URI requestURL); - - HTTPMethod getHTTPMethod(); - - void setHTTPMethod(HTTPMethod httpMethod); - - OAuthParameterLocation getParameterLocation(); - - void setParameterLocation(OAuthParameterLocation parameterLocation); - - /** - * @param parameter - */ - void addOAuthMessageParameter(OAuthMessageParameter parameter); - - /** - * Returns the OAuth parameters will be included in the OAuth message. - * - * @return the OAuth parameters will be included in the OAuth message. - */ - Collection getOAuthMessageParameters(); - - /** - * @param parameter - */ - void addOAuthRequestParameter(OAuthRequestParameter parameter); - - /** - * @param signatureMethod - * @return - */ - String getOAuthMessageParameter(OAuthParameter parameter); - - /** - * Returns the aux parameters client will included in the request. - * - * @return the aux parameters client will included in the request. - */ - Collection getOAuthRequestParameters(); - - /** - * @param signatureMethod - * @return - */ - String getOAuthRequestParameter(String name); - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuthRequestParameter.java b/spec-api/src/main/java/org/apache/amber/OAuthRequestParameter.java deleted file mode 100644 index 9ea667ff..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthRequestParameter.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -/** - * Identifier for the auxiliar OAuth server required parameter. - * - * @version $Id$ - */ -public class OAuthRequestParameter extends AbstractParameter { - - /** - * @param key - * @param value - */ - public OAuthRequestParameter(String key, String value) { - super(key, value); - } - - /** - * {@inheritDoc} - */ - @Override - public int hashCode() { - int result = INITIAL_ODD_NUMBER; - result = MULTIPLIER_ODD_NUMBER * result + ((this.getKey() == null) ? 0 : this.getKey().hashCode()); - result = MULTIPLIER_ODD_NUMBER * result + ((this.getValue() == null) ? 0 : this.getValue().hashCode()); - return result; - } - - /** - * {@inheritDoc} - */ - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - - if (obj == null) { - return false; - } - - if (this.getClass() != obj.getClass()) { - return false; - } - - AbstractParameter other = (AbstractParameter) obj; - - if (this.getKey() == null) { - if (other.getKey() != null) { - return false; - } - } else if (!String.valueOf(this.getKey()).equals(String.valueOf(other.getKey()))) { - return false; - } - - if (this.getValue() == null) { - if (other.getValue() != null) { - return false; - } - } else if (!this.getValue().equals(other.getValue())) { - return false; - } - - return true; - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuthResponse.java b/spec-api/src/main/java/org/apache/amber/OAuthResponse.java deleted file mode 100644 index 9020b40d..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthResponse.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -import java.util.Map; - -/** - * An object representing the response returned from an - * {@link org.apache.amber.client.OAuthClient} or {@link org.apache.amber.server.OAuthServer}. - * - * @version $Id$ - * @see org.apache.amber.client.OAuthClient - */ -public interface OAuthResponse { - - public String getLocationUri(); - - public String getBody(); - - public String getHeader(String name); - - public Map getHeaders(); - - public int getResponseStatus(); - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuthResponseParser.java b/spec-api/src/main/java/org/apache/amber/OAuthResponseParser.java deleted file mode 100644 index 6031c0cb..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthResponseParser.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -/** - *

- * It's possible that a {@link org.apache.amber.server.OAuthProvider} will return OAuth - * information in a custom response format. The response parser interface allows - * a {@link org.apache.amber.server.OAuthProvider} to specific a concrete implementation. - *

- * - *

- * An OAuth API implementation MUST provide a response parser that assumes the - * returned parameters are name/value pairs, separated by ampersand characters. - *

- * - * @version $Revision$ $Date$ - * - */ -public interface OAuthResponseParser { - - /** - * Update the provided token, to include the details from the response - * - * @param token - * @param response - * @return token - */ - OAuthToken parseResponse(OAuthToken token, OAuthResponse response); - -} \ No newline at end of file diff --git a/spec-api/src/main/java/org/apache/amber/OAuthRuntimeException.java b/spec-api/src/main/java/org/apache/amber/OAuthRuntimeException.java deleted file mode 100644 index c488b0d8..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthRuntimeException.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -/** - *

- * Unchecked exception wrapper, thrown when there is a configuration or other - * unchecked exception that prevents the implementation from operating. - *

- * - * @version $Id$ - */ -public class OAuthRuntimeException extends RuntimeException { - - private static final long serialVersionUID = 1L; - - /** - * @param message - * @param cause - */ - public OAuthRuntimeException(final String message, final Throwable cause) { - super(message, cause); - } - - /** - * @param message - */ - public OAuthRuntimeException(final String message) { - super(message); - } - - /** - * @param cause - */ - public OAuthRuntimeException(final Throwable cause) { - super(cause); - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/OAuthToken.java b/spec-api/src/main/java/org/apache/amber/OAuthToken.java deleted file mode 100644 index 7ab41306..00000000 --- a/spec-api/src/main/java/org/apache/amber/OAuthToken.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -import java.io.Serializable; -import java.util.Map.Entry; -import java.util.Set; - -/** - *

- * An OAuthToken is the wrapper for the pair of key values returned by the - * {@link org.apache.amber.client.OAuthClient} during the authentication or authorisation - * process. - *

- * - *

- * The implementation MUST also support validation of the returned access token - * values to determine whether the token is authorised or unauthorised. - *

- * - *

- * A Map contains additional response parameters, sent by the provider. - *

- * - * @version $Id$ - */ -public interface OAuthToken extends Serializable { - - /** - * @return the the {@code oauth_token} parameter. - */ - String getToken(); - - /** - * @param token the {@code oauth_token} parameter. - */ - void setToken(String token); - - /** - * @return the {@code oauth_token_secret} parameter. - */ - String getTokenSecret(); - - /** - * @param tokenSecret the {@code oauth_token_secret} parameter. - */ - void setTokenSecret(String tokenSecret); - - /** - * @return the {@code oauth_callback_confirmed} parameter. - */ - boolean isCallbackConfirmed(); - - /** - * @param callbackConfirmed the {@code oauth_callback_confirmed} parameter. - */ - void setCallbackConfirmed(boolean callbackConfirmed); - - /** - * Associates the specified value with the specified name in this additional - * parameters map. - * - * @param name name with which the specified value is to be associated. - * @param value value to be associated with the specified name. - */ - void addAdditionalParameters(String name, String value); - - /** - * @return a {@link Set} view of the mappings contained in this additional - * parameters map - */ - Set> additionalParametersEntrySet(); - -} diff --git a/spec-api/src/main/java/org/apache/amber/Version.java b/spec-api/src/main/java/org/apache/amber/Version.java deleted file mode 100644 index ae762e66..00000000 --- a/spec-api/src/main/java/org/apache/amber/Version.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber; - -/** - * @version $Revision$ $Date$ - * - */ -public enum Version { - - /** - * 1.0 - * - * @since 1.0 - */ - v1_0(1, 0), - - /** - * 1.0a - * - * @since 1.0a - */ - v1_0a(1, 0, 'a') - - ; // End of enum type definitions - - private static final char EMPTY_VARIANT = ' '; - - private static final char UNDERSCORE_SEPARATOR = '_'; - - private static final char DOT_SEPARATOR = '.'; - - private final int major; - - private final int minor; - - private final char variant; - - /** - * - */ - Version(int major, int minor) { - this(major, minor, EMPTY_VARIANT); - } - - /** - * - */ - Version(int major, int minor, char variant) { - this.major = major; - this.minor = minor; - this.variant = variant; - } - - /** - * @return handle - */ - public String toHandle() { - StringBuilder s = new StringBuilder(this.getClass().getSimpleName()) - .append(UNDERSCORE_SEPARATOR) - .append(this.major) - .append(UNDERSCORE_SEPARATOR) - .append(this.minor); - if (this.variant != ' ') { - s.append(UNDERSCORE_SEPARATOR); - s.append(this.variant); - } - - return s.toString(); - } - - /* - * (non-Javadoc) - * - * @see java.lang.Enum#toString() - */ - @Override - public String toString() { - StringBuilder s = new StringBuilder(); - - s.append(this.major) - .append(DOT_SEPARATOR) - .append(this.minor); - if (EMPTY_VARIANT != this.variant) { - s.append(this.variant); - } - - return s.toString(); - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/client/HttpConnector.java b/spec-api/src/main/java/org/apache/amber/client/HttpConnector.java deleted file mode 100644 index 31f6e70f..00000000 --- a/spec-api/src/main/java/org/apache/amber/client/HttpConnector.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.client; - -import org.apache.amber.OAuthRequest; -import org.apache.amber.OAuthResponse; - -import java.io.IOException; - -/** - * The HttpConnector does the work converting executing an - * {@link org.apache.amber.OAuthRequest} and returning an - * {@link org.apache.amber.OAuthResponse}. This is configurable to allow some choice - * with regard to libraries, code etc. - * - * An implementation MUST provide a default connector. - * - * @version $Id$ - */ -public interface HttpConnector { - - /** - * The execute method does the work of processing a request and returning a - * response from the Provider. - * - * @param request - * @param authorization - * @return response - * @throws IOException - * if something untoward happened, propagate the exception - */ - OAuthResponse execute(OAuthRequest request, String authorization) throws IOException; - -} diff --git a/spec-api/src/main/java/org/apache/amber/client/NonceGenerator.java b/spec-api/src/main/java/org/apache/amber/client/NonceGenerator.java deleted file mode 100644 index d9212e63..00000000 --- a/spec-api/src/main/java/org/apache/amber/client/NonceGenerator.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.client; - -/** - * Generator of {@code nonce} values. - * - * @version $Id$ - */ -public interface NonceGenerator { - - /** - * Generate a {@code nonce} string value. - * - * @return a {@code nonce} string value. - */ - String generate(); - -} diff --git a/spec-api/src/main/java/org/apache/amber/client/OAuthClient.java b/spec-api/src/main/java/org/apache/amber/client/OAuthClient.java deleted file mode 100644 index 5f8201eb..00000000 --- a/spec-api/src/main/java/org/apache/amber/client/OAuthClient.java +++ /dev/null @@ -1,266 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.client; - -import org.apache.amber.OAuthException; -import org.apache.amber.OAuthToken; - -import java.io.Serializable; - -/** - *

- * An OAuth Service is an abstract representation of the standard remote API - * offered by an {@link org.apache.amber.server.OAuthProvider}, providing a simple mechanism - * for performing {@link org.apache.amber.OAuth} authentication and authorisation - * tasks. - *

- * - *

Using an OAuthClient

- * - *

- * By far the easiest way to use an OAuthClient is by configuring an - * {@link org.apache.amber.server.OAuthProvider} in an XML file (called - * "oauth-providers.xml") and placing it in the META-INF directory on - * the applications classpath. - *

- * - * 
- * <?xml version="1.0" encoding="UTF-8"?>
- *  <providers>
- *      <provider
- *          realm="http://example.com"
- *          algorithm="HmacSHA1"
- *          requestTokenPath="/oauth/request_token"
- *          authorizePath="/oauth/authorize"
- *          accessTokenPath="/oauth/access_token">
- *          <consumer
- *              name="mysite.com"
- *              callback="http://www.mysite.com/oauth/response"
- *              key="mykey"
- *              secret="mysecret"/>
- *      </provider>
- *  </providers>
- *
- * - *

- * The OAuthClient is called by using it's realm name as a reference. The - * example below assumes the API is used in a Servlet environment, and simply - * redirects the user to the {@link org.apache.amber.server.OAuthProvider} to authorize the - * token. - *

- * - *

- * The {@link org.apache.amber.server.OAuthProvider} uses the default - * {@link OAuthConsumer} configured in the XML file. - *

- * - * 
- * HttpSession session = request.getSession();
- *
- * OAuthClient service = OAuth.useService("http://example.com");
- * OAuthToken requestToken = service.getRequestToken(); // This method also takes an OAuthToken implementation class 
- *
- * session.setAttribute("requestToken", requestToken);
- *
- * String authorizePath = service.getAuthorizeURL(requestToken);
- * response.sendRedirect(authorizePath);
- *
- * - *

- * If you supply your own implementation of the {@link org.apache.amber.OAuthToken} - * interface when you call the requestToken method, you could store the - * OAuthToken in a database. - *

- * - *

- * The token is stored in the user session, as we can re-use it when the - * response comes back. We initialise the service and retrieve the token from - * the session, before resubmitting the token and the verifier to the - * {@link org.apache.amber.server.OAuthProvider}, who converts the authorised Request Token - * into an Access Token. - *

- * - *

- * After checking that the token is authorised, we remove the old request token - * from the session and add the access token, so it can be used to sign future - * requests for services at the {@link org.apache.amber.server.OAuthProvider}. - *

- * - * 
- * HttpSession session = req.getSession();
- *
- * OAuthClient service = OAuth.useService("http://oauth.apache.site/");
- * OAuthToken requestToken = OAuthToken.class.cast(session
- *         .getAttribute("requestToken"));
- *
- * String oauth_token = req.getParameter("oauth_token"); // you could check this matches the one in the session
- * String oauth_verifier = req.getParameter("oauth_verifier"); // supplied with the response
- * OAuthToken accessToken = service.getAccessToken(requestToken, oauth_verifier);
- *
- * if (accessToken.isAuthorized()) {
- *     session.removeAttribute("requestToken");
- *     session.setAttribute("accessToken", accessToken);
- * }
- *
- * - *

- * The OAuthClient could be initialised in an HttpServlet.init() method and - * stored in an instance field. Implementations must be thread-safe. - *

- * - * @version $Id$ - */ -public interface OAuthClient extends Serializable { - - /** - * Get a request token using the default consumer and token. - * - * @return token - * @throws org.apache.amber.OAuthException - */ - OAuthToken getRequestToken() throws OAuthException; - - /** - * Get a request token using the specified consumer. - * - * @param consumer - * @return token - * @throws OAuthException - */ - OAuthToken getRequestToken(OAuthConsumer consumer) throws OAuthException; - - /** - * Get a request token, instantiated from the provided class, using the - * default consumer. - * - * @param tokenClass - * @return token - * @throws OAuthException - */ - OAuthToken getRequestToken(Class tokenClass) throws OAuthException; - - /** - * Get a request token, instantiated from the provided class, using the - * specified consumer. - * - * @param tokenClass - * @param consumer - * @return token - * @throws OAuthException - */ - OAuthToken getRequestToken(Class tokenClass, OAuthConsumer consumer) throws OAuthException; - - /** - * Get the authentication URL for the configured provider, using the - * specified token. - * - * @param token - * The token to be authenticated - * @return path The path to which the user should be directed for - * authentication - */ - String getAuthenticateURL(OAuthToken token); - - /** - * Get the authentication URL for the configured provider, using the - * specified token and callback. - * - * @param token - * @param callback - * The URL to which the user should be redirected after - * authentication - * @return path The path to which the user should be directed for - * authentication - */ - String getAuthenticateURL(OAuthToken token, String callback); - - /** - * Get the authorisation URL for the configured provider, using the - * specified token. - * - * @param token - * The token to be authorised - * @return path The path to which the user should be directed for - * authentication - */ - String getAuthorizeURL(OAuthToken token); - - /** - * Get the authorisation URL for the configured provider, using the - * specified token. - * - * @param token - * @param callback - * The URL to which the user should be redirected after - * authorisation - * @return path The path to which the user should be directed for - * authorisation - */ - String getAuthorizeURL(OAuthToken token, String callback); - - /** - * Convert the authorised token to an access token, using the supplied - * verification code. - * - * @param token - * @param verifier - * @return authorised token - * @throws OAuthException - */ - OAuthToken getAccessToken(OAuthToken token, String verifier) throws OAuthException; - - /** - * Convert the authorised token to an access token, using the supplied - * consumer and verification code. - * - * @param consumer - * @param token - * @param verifier - * @return authorised token - * @throws OAuthException - */ - OAuthToken getAccessToken(OAuthConsumer consumer, OAuthToken token, String verifier) throws OAuthException; - - /** - * Get the current connector. - * - * @return connector - */ - HttpConnector getConnector(); - - /** - * Set the connector to be used. - * - * @param httpConnector - */ - void setConnector(HttpConnector httpConnector); - - /** - * Returns the current nonce generator to be used. - * - * @return the current nonce generator to be used. - */ - NonceGenerator getNonceGenerator(); - - /** - * Sets the nonce generator to be used. - * - * @param nonceGenerator the nonce generator to be used. - */ - void setNonceGenerator(NonceGenerator nonceGenerator); - -} diff --git a/spec-api/src/main/java/org/apache/amber/client/OAuthConsumer.java b/spec-api/src/main/java/org/apache/amber/client/OAuthConsumer.java deleted file mode 100644 index 79e34b7f..00000000 --- a/spec-api/src/main/java/org/apache/amber/client/OAuthConsumer.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.client; - -import java.io.Serializable; - -/** - * The OAuth Consumer is defined in the {@link org.apache.amber.OAuth} Specification as - * the client in one of the legs during an authorisation or authentication. - * - * @version $Id$ - */ -public interface OAuthConsumer extends Serializable { - - /** - * The name field is a convenient reference to the Consumer and SHOULD match - * the string used during the Provider registration process - * - * @return name - */ - String getName(); - - /** - * @param name the name to set - */ - void setName(String name); - - /** - * The key field contains the key string assigned to the Consumer by the - * Provider, during registration. - * - * @return the key - */ - String getKey(); - - /** - * @param key the key to set - */ - void setKey(String key); - - /** - * @return the secret - */ - String getSecret(); - - /** - * The secret field contains the unique secret string generated by the - * Provider, during registration. - * - * @param secret the secret to set - */ - void setSecret(String secret); - - /** - * The callback field contains the HTTP URL that the Provider will redirect - * the User to during the authentication / authorisation process. - * - * It MUST be set to the "OUT OF BAND" value "oob" if - * the response can't be sent via an HTTP redirect. - * - * @return the callback - */ - String getCallback(); - - /** - * @param callback the callback to set - */ - void setCallback(String callback); - -} diff --git a/spec-api/src/main/java/org/apache/amber/package-info.java b/spec-api/src/main/java/org/apache/amber/package-info.java deleted file mode 100644 index a4399256..00000000 --- a/spec-api/src/main/java/org/apache/amber/package-info.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - *

An OAuth Java Specification

- * - *

Provides the interfaces for an implementation of the OAuth specification.

- * - *

The implementation MUST permit entirely programmatical configuration, configuration - * by the presence of an XML file called "oauth-providers.xml" located in a META-INF - * directory on the classpath and by detecting classes configured using the ServiceLoader - * mechanism.

- * - * @version $Revision$ $Date$ - * @see org.apache.amber.OAuth - * - */ -package org.apache.amber; - diff --git a/spec-api/src/main/java/org/apache/amber/server/Access.java b/spec-api/src/main/java/org/apache/amber/server/Access.java deleted file mode 100644 index 3c18c5de..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/Access.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -import java.util.Collection; - -/** - * Association of nonce(s) and timestamp. - * - * @version $Id$ - */ -public interface Access extends Comparable { - - /** - * Returns the timestamp access. - * - * @return the timestamp access - */ - long getTimestamp(); - - /** - * Add a nonce to an access. - * - * @param nonce the nonce has o be added. - * @return true, if the nonce has not used yet, false otherwise. - */ - boolean addNonce(String nonce); - - /** - * Checks if the access already contains a nonce. - * - * @param nonce the nonce has to be checked. - * @return true if the nonce is contained, false otherwise. - */ - boolean containsNonce(String nonce); - - /** - * Returns the whole list of nonces associated to the timestamp. - * - * @return the whole list of nonces associated to the timestamp. - */ - Collection getNonces(); - -} diff --git a/spec-api/src/main/java/org/apache/amber/server/AccessStorage.java b/spec-api/src/main/java/org/apache/amber/server/AccessStorage.java deleted file mode 100644 index f37e597e..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/AccessStorage.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -/** - * Nonce/timestamp storage definition. - * - * @version $Id$ - */ -public interface AccessStorage { - - /** - * Stores a new nonce / timestamp pair associated with a consumer key. - * - * @param clientCredentials the consumer to be associated with the access. - * @param timestamp the timestamp of the request. - * @param nonce the nonce associated with the timestamp. - * @throws StorageException if a backend error occurs. - */ - void add(String clientCredentials, long timestamp, String nonce) throws StorageException; - - /** - * Get the last access (by timestamp) of a consumer. - * - * @param clientCredentials the consumer whose access needs to be read. - * @return the access object. - * @throws StorageException if a backend error occurs. - */ - Access getLastAccess(String clientCredentials) throws StorageException; - - /** - * Remove a consumer access. - * - * @param clientCredentials the consumer key. - * @param timestamp the timestamp. - * @throws StorageException if a backend error occurs. - */ - void remove(String clientCredentials, long timestamp) throws StorageException; - -} diff --git a/spec-api/src/main/java/org/apache/amber/server/ConsumerStorage.java b/spec-api/src/main/java/org/apache/amber/server/ConsumerStorage.java deleted file mode 100644 index 2cc5eec2..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/ConsumerStorage.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -import org.apache.amber.client.OAuthConsumer; - -/** - * OAuthConsumer consumer storage interface. - * - * @version $Id$ - */ -public interface ConsumerStorage { - - /** - * Stores consumer data. - * - * @param consumer the consumer has to be stored. - * @throws StorageException if a backend error occurs. - */ - void add(OAuthConsumer consumer) throws StorageException; - - /** - * Modifies a consumer data. - * - * @param consumer the consumer has to be stored. - * @throws StorageException if a backend error occurs. - */ - void update(OAuthConsumer consumer) throws StorageException; - - /** - * Searches for an existing consumer. - * - * @param consumerKey the consumer key. - * @return the consumer data if any, null otherwise. - * @throws StorageException if a backend error occurs. - */ - OAuthConsumer read(String consumerKey) throws StorageException; - - /** - * Removes a token from the store. - * - * @param consumerKey the consumer key. - * @throws StorageException if a backend error occurs. - */ - void delete(String consumerKey) throws StorageException; - -} diff --git a/spec-api/src/main/java/org/apache/amber/server/OAuthProvider.java b/spec-api/src/main/java/org/apache/amber/server/OAuthProvider.java deleted file mode 100644 index 6cb75871..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/OAuthProvider.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -import org.apache.amber.OAuthParameterLocation; -import org.apache.amber.OAuthResponseParser; -import org.apache.amber.client.OAuthConsumer; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * The minimum configurable values required to specify the different behaviour - * of a Provider (an entity defined by the OAuth specification). - *

- * - * @version $Revision$ $Date$ - * - */ -public interface OAuthProvider extends Serializable { - - /** - * @return consumer - */ - List getConsumers(); - - /** - * @param consumers - */ - void setConsumers(List consumers); - - /** - * @return the algorithm - */ - String getAlgorithm(); - - /** - * @param algorithm - * the algorithm to set - */ - void setAlgorithm(String algorithm); - - /** - * @return the location - */ - OAuthParameterLocation getLocation(); - - /** - * @param location - * the location to set - */ - void setLocation(OAuthParameterLocation location); - - /** - * @return the realm - */ - String getRealm(); - - /** - * @param realm - * the realm to set - */ - void setRealm(String realm); - - /** - * @return the requestTokenPath - */ - String getRequestTokenPath(); - - /** - * @param requestTokenPath - * the requestTokenPath to set - */ - void setRequestTokenPath(String requestTokenPath); - - /** - * @return the accessTokenPath - */ - String getAccessTokenPath(); - - /** - * @param accessTokenPath - * the accessTokenPath to set - */ - void setAccessTokenPath(String accessTokenPath); - - /** - * @return the authorizePath - */ - String getAuthorizePath(); - - /** - * @param authorizePath - * the authorizePath to set - */ - void setAuthorizePath(String authorizePath); - - /** - * @return the authenticatePath - */ - String getAuthenticatePath(); - - /** - * @param authenticatePath - * the authenticatePath to set - */ - void setAuthenticatePath(String authenticatePath); - - /** - * @return the responseParser - */ - OAuthResponseParser getResponseParser(); - - /** - * @param responseParser - * the responseParser to set - */ - void setResponseParser(OAuthResponseParser responseParser); - -} \ No newline at end of file diff --git a/spec-api/src/main/java/org/apache/amber/server/OAuthProviders.java b/spec-api/src/main/java/org/apache/amber/server/OAuthProviders.java deleted file mode 100644 index 232ac1d5..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/OAuthProviders.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -import java.util.List; - -/** - *

- * A convenience object which contains multiple possible OAuth Service - * Providers, in order of preference. - *

- * - *

- * The first Provider will be considered to be the default one, where - * applicable. - *

- * - * @version $Revision$ $Date$ - * - */ -public interface OAuthProviders { - - /** - * @return the provider - */ - List getProvider(); - - /** - * @param provider - * the provider to set - */ - void setProvider(List provider); - -} \ No newline at end of file diff --git a/spec-api/src/main/java/org/apache/amber/server/OAuthServer.java b/spec-api/src/main/java/org/apache/amber/server/OAuthServer.java deleted file mode 100644 index 80057a4c..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/OAuthServer.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -/** - * An OAuth Server provides the functionality required to deliver OAuth Provider - * functionality. It can be exposed by wrapping it in an HTTP layer, e.g. that - * provided by the Servlet Spec or perhaps directly exposed by a custom HTTP - * server. - * - * @version $Id$ - */ -public abstract class OAuthServer implements OAuthnServer, OAuthzServer { - - private OAuthServerConfiguration configuration; - - /** - * @param configuration - */ - protected OAuthServer(OAuthServerConfiguration configuration) { - this.configuration = configuration; - } - - /** - * @return configuration - */ - protected OAuthServerConfiguration getConfiguration() { - return configuration; - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/server/OAuthServerConfiguration.java b/spec-api/src/main/java/org/apache/amber/server/OAuthServerConfiguration.java deleted file mode 100644 index d40a567c..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/OAuthServerConfiguration.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -/** - * - * - * @version $Id$ - */ -public interface OAuthServerConfiguration { - - /** - * @return access storage - */ - AccessStorage getAccessStorage(); - - /** - * @return consumer storage - */ - ConsumerStorage getConsumerStorage(); - - /** - * @return token storage - */ - TokenStorage getTokenStorage(); - -} diff --git a/spec-api/src/main/java/org/apache/amber/server/OAuthnServer.java b/spec-api/src/main/java/org/apache/amber/server/OAuthnServer.java deleted file mode 100644 index 12831e7b..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/OAuthnServer.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -import org.apache.amber.OAuthException; -import org.apache.amber.OAuthRequest; -import org.apache.amber.OAuthToken; - -/** - * - * - * @version $Id$ - */ -public interface OAuthnServer { - - /** - * Generates a new request token. - * - * @param request - * @return - * @throws OAuthException - */ - OAuthToken requestToken(OAuthRequest request) throws OAuthException; - - /** - * Authorize a request token. - * - * @param oauthToken - * @return - * @throws OAuthException - */ - OAuthToken authorizeToken(String oauthToken) throws OAuthException; - - /** - * Generates a new access token. - * - * @param request - * @return - * @throws OAuthException - */ - OAuthToken accessToken(OAuthRequest request) throws OAuthException; - -} diff --git a/spec-api/src/main/java/org/apache/amber/server/OAuthzServer.java b/spec-api/src/main/java/org/apache/amber/server/OAuthzServer.java deleted file mode 100644 index 980953f1..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/OAuthzServer.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -import org.apache.amber.OAuthException; -import org.apache.amber.OAuthRequest; - -/** - * - * - * @version $Id$ - */ -public interface OAuthzServer { - - /** - * Evaluates if a specific request contains authorization token to - * access to a protected resource. - * - * @param request - * @return - * @throws OAuthException - */ - boolean isAuthorized(OAuthRequest request) throws OAuthException; - -} diff --git a/spec-api/src/main/java/org/apache/amber/server/StorageException.java b/spec-api/src/main/java/org/apache/amber/server/StorageException.java deleted file mode 100644 index 8956db3d..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/StorageException.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -/** - * Exception thrown when an error occurs when accessing to the Access Storage. - * - * @version $Id$ - */ -public final class StorageException extends Exception { - - /** - * The default serial version UID; - */ - private static final long serialVersionUID = 1L; - - public StorageException(String message) { - super(message); - } - - public StorageException(Throwable cause) { - super(cause); - } - - public StorageException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/server/TemporaryCredentialsGenerator.java b/spec-api/src/main/java/org/apache/amber/server/TemporaryCredentialsGenerator.java deleted file mode 100644 index 217a0868..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/TemporaryCredentialsGenerator.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -/** - * Temporary credentials generator. - * - * @version $Id$ - */ -public interface TemporaryCredentialsGenerator { - - /** - * Generates a new temporary credentials. - * - * @return a new temporary credentials. - */ - String generate(); - -} diff --git a/spec-api/src/main/java/org/apache/amber/server/TokenCredentialsGenerator.java b/spec-api/src/main/java/org/apache/amber/server/TokenCredentialsGenerator.java deleted file mode 100644 index 30d9bb2b..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/TokenCredentialsGenerator.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -/** - * Token credentials generator. - * - * @version $Id$ - */ -public interface TokenCredentialsGenerator { - - /** - * Generates a new token credentials. - * - * @return a new token credentials. - */ - String generate(); - -} diff --git a/spec-api/src/main/java/org/apache/amber/server/TokenStorage.java b/spec-api/src/main/java/org/apache/amber/server/TokenStorage.java deleted file mode 100644 index b0e25f83..00000000 --- a/spec-api/src/main/java/org/apache/amber/server/TokenStorage.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.server; - -import org.apache.amber.OAuthToken; - -/** - * - * - * @version $Id$ - */ -public interface TokenStorage { - - /** - * Stores a new token. - * - * @param consumerKey Consumer key associated to the token to be stored - * @param token The token to be stored - * @throws StorageException if a backend error occurs. - */ - void add(String consumerKey, OAuthToken token) throws StorageException; - - /** - * Modifies an existing token. - * - * @param token The token to be modified - * @throws StorageException if a backend error occurs. - */ - void update(OAuthToken token) throws StorageException; - - /** - * Searches for an existing token. - * - * @param consumerKey The consumer key associated with the Token - * @param token The token string to be searched - * @return the relative token associated to the consumerKey - * @throws StorageException if a backend error occurs. - */ - OAuthToken read(String consumerKey, String token) throws StorageException; - - /** - * Searches for an existing token. - * - * @param token The token string to be searched - * @return the relative token - * @throws StorageException if a backend error occurs. - */ - OAuthToken read(String token) throws StorageException; - - /** - * Removes a token from the store. - * - * @param token The token to be removed - * @throws StorageException if a backend error occurs. - */ - void delete(String token) throws StorageException; - -} diff --git a/spec-api/src/main/java/org/apache/amber/signature/Key.java b/spec-api/src/main/java/org/apache/amber/signature/Key.java deleted file mode 100644 index ac83ee9c..00000000 --- a/spec-api/src/main/java/org/apache/amber/signature/Key.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature; - -/** - * Client Credential representation. - * - * @version $Id$ - */ -public interface Key { - - /** - * Returns the signing algorithm methods. - * - * @return the signing algorithm methods. - */ - String[] getAlgorithmMethods(); - - /** - * Returns the key string representation. - * - * @return the key string representation. - */ - String getValue(); - -} diff --git a/spec-api/src/main/java/org/apache/amber/signature/SignatureException.java b/spec-api/src/main/java/org/apache/amber/signature/SignatureException.java deleted file mode 100644 index cef0e7c4..00000000 --- a/spec-api/src/main/java/org/apache/amber/signature/SignatureException.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature; - -import org.apache.amber.OAuthException; - -/** - * Encapsulate a general OAuth signature error or warning. - * - * @version $Id$ - */ -public final class SignatureException extends OAuthException { - - /** - * The serial version UID. - */ - private static final long serialVersionUID = 1L; - - /** - * Constructs a new signature exception with the specified detail message. - * - * @param message the specified detail message. - */ - public SignatureException(String message) { - super(message); - } - - /** - * Constructs a new signature exception with the specified cause. - * - * @param cause the specified cause. - */ - public SignatureException(Throwable cause) { - super(cause); - } - - /** - * Constructs a new signature exception with the specified detail message - * and cause. - * - * @param message the specified detail message. - * @param cause the specified cause. - */ - public SignatureException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/spec-api/src/main/java/org/apache/amber/signature/SignatureMethod.java b/spec-api/src/main/java/org/apache/amber/signature/SignatureMethod.java deleted file mode 100644 index b9b4d69d..00000000 --- a/spec-api/src/main/java/org/apache/amber/signature/SignatureMethod.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature; - -import org.apache.amber.OAuthRequest; -import org.apache.amber.OAuthToken; - -/** - * Common definition of OAuth signature method algorithm. - * - * @version $Id$ - */ -public interface SignatureMethod { - - /** - * Returns the signing algorithm method. - * - * @return the signing algorithm method. - */ - String getAlgorithm(); - - /** - * Calculates the OAuth request message signature. - * - * @param signingKey the key has to be used to sign the request. - * @param token the received OAuth token, can be {@code null} if clients - * are requesting for the authorization token. - * @param request the OAuth request message has to be signed. - * @return the calculated signature. - * @throws SignatureException if any error occurs. - */ - String calculate(SK signingKey, - OAuthToken token, - OAuthRequest request) throws SignatureException; - - /** - * Verifies the OAuth request message signature. - * - * @param signature the OAuth signature has to be verified. - * @param verifyingKey the key has to be used to verify the request. - * @param token the received OAuth token, can be {@code null} if clients - * are requesting for the authorization token. - * @param request the signed OAuth request message. - * @return true if the signature is correct, false otherwise. - * @throws SignatureException if any error occurs. - */ - boolean verify(String signature, - VK verifyingKey, - OAuthToken token, - OAuthRequest request) throws SignatureException; - -} diff --git a/spec-api/src/main/java/org/apache/amber/signature/SigningKey.java b/spec-api/src/main/java/org/apache/amber/signature/SigningKey.java deleted file mode 100644 index 27abd233..00000000 --- a/spec-api/src/main/java/org/apache/amber/signature/SigningKey.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature; - -/** - * Identifies that the key has to be used to sign requests. - * - * @version $Id$ - */ -public interface SigningKey extends Key { - -} diff --git a/spec-api/src/main/java/org/apache/amber/signature/VerifyingKey.java b/spec-api/src/main/java/org/apache/amber/signature/VerifyingKey.java deleted file mode 100644 index 1e261367..00000000 --- a/spec-api/src/main/java/org/apache/amber/signature/VerifyingKey.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.amber.signature; - -/** - * Identifies that the key has to be used to verify requests. - * - * @version $Id$ - */ -public interface VerifyingKey extends Key { - -} diff --git a/spec-api/src/main/resources/META-INF/oauth-providers.xsd b/spec-api/src/main/resources/META-INF/oauth-providers.xsd deleted file mode 100644 index 02fe667e..00000000 --- a/spec-api/src/main/resources/META-INF/oauth-providers.xsd +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From f2bdd896979d491d0a5ce38dbe123f3b830d6a8a Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Wed, 27 Jun 2012 16:20:33 +0000 Subject: [PATCH 100/583] [AMBER-54] - fixing warning about missing javadoc maven plugin version (inside the reporting section) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1354609 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c31bd841..2e13ec95 100644 --- a/pom.xml +++ b/pom.xml @@ -342,7 +342,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.8 + 2.8.1 @@ -547,6 +547,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 2.8.1 ${sun.boot.class.path} com.google.doclava.Doclava From 1e7ac8c0e516d07b2b63a9a1c985323329cafe10 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 09:37:38 +0000 Subject: [PATCH 101/583] Brian went emeritus :( git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356641 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 2e13ec95..a7e87001 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ Mentor PPMC Member Committer + Emeritus From 33cfbb7012b64f4288f46719507f8b53e83e2b1e Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 09:40:50 +0000 Subject: [PATCH 102/583] trailing spaces git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356643 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index a7e87001..cd1b282c 100644 --- a/pom.xml +++ b/pom.xml @@ -244,17 +244,17 @@ Jenkins https://builds.apache.org/job/Amber/ - - - mail - true - true - false - false + + + mail + true + true + false + false
amber-dev@incubator.apache.org
 - + - + amber.website From 04b89ea72165398e617b16745a13623f83d7b48d Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 09:45:09 +0000 Subject: [PATCH 103/583] initial checkin of (empty) CHANGES file git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356644 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 CHANGES diff --git a/CHANGES b/CHANGES new file mode 100644 index 00000000..66f909fc --- /dev/null +++ b/CHANGES @@ -0,0 +1,3 @@ + Apache Amber 0.22-incubating + Release Notes + 2012/07/03 - yyyymmdd From 1d0a0c43bc3b286abfe09be77229597a67128961 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 09:50:56 +0000 Subject: [PATCH 104/583] added the module to create the sources distribution package (merely copied from Any23, not added in the reactor list yet for that reason :P) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356648 13f79535-47bb-0310-9956-ffa450edef68 --- sources-dist/pom.xml | 51 ++++++++++++++++++++++++++ sources-dist/src/main/assembly/src.xml | 46 +++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 sources-dist/pom.xml create mode 100644 sources-dist/src/main/assembly/src.xml diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml new file mode 100644 index 00000000..1aab2f83 --- /dev/null +++ b/sources-dist/pom.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + + + org.apache.amber + amber-parent + 0.22-incubating-SNAPSHOT + ../ + + + amber-sources-dist + + Apache Amber :: Sources distribution module + + + apache-amber-${project.version} + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${basedir}/src/main/assembly/src.xml + + + + + + + diff --git a/sources-dist/src/main/assembly/src.xml b/sources-dist/src/main/assembly/src.xml new file mode 100644 index 00000000..c62bdb0d --- /dev/null +++ b/sources-dist/src/main/assembly/src.xml @@ -0,0 +1,46 @@ + + + + + src + + tar.gz + zip + + true + apache-amber-${project.version} + + + + + ${basedir}/../ + + + **/target/ + + **/.* + + **/.*/ + + + + + From 9798a38aa40eec90e66e38155d546eae3badb839 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 09:56:40 +0000 Subject: [PATCH 105/583] initial checkin of the release guide (could contain typos or refused from copy'n'paste...) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356649 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/xdoc/release-howto.xml | 404 ++++++++++++++++++++++++++++++++ 1 file changed, 404 insertions(+) create mode 100644 src/site/xdoc/release-howto.xml diff --git a/src/site/xdoc/release-howto.xml b/src/site/xdoc/release-howto.xml new file mode 100644 index 00000000..5cc49b54 --- /dev/null +++ b/src/site/xdoc/release-howto.xml @@ -0,0 +1,404 @@ + + + + + + Apache Amber - Release HowTo + Apache Amber Team + + + +
+

This short guide is for volunteers that intend to cover the role of Release Manager

+
+ +
+
    +
  • Install/Configure GPG - The artifacts that are deployed to the ASF central repository need to + be signed. To do this you will need to have a public and private keypair. There is a very good + guide that will + walk you though this.
    • + +
  • Install Apache Maven 2.2.1 or higher. 2.2.0 has a bug that will produce invalid checksums; we strongly + encourage our committers to install Apache Maven 3.0.4.
    • +
+
+ +
+ +

As of Maven 2.1.0 you can now encrypt your servers passwords. We highly recommend that you follow this + guide to set your master password and + use it to encrypt your ASF password in the next section.

+ + + +

Using the instructions from the previous step encrypt your Sonatype password and add the following servers to + your ~/.m2/settings.xml file. You may already have other servers in this file. If not just create + the file.

+ + + + ... + + + apache.snapshots.https + simonetripodi + {put your encrypted password here} + + + apache.releases.https + simonetripodi + {put your encrypted password here} + + + ... + + + apache + + false + + + forked-path + 19FEA27D\ + + your-gpg-passphrase + + + + ... +]]> + +
+ +
+ +
    +
  1. Clean up JIRA so the Fix Version in issues resolved since the last release includes this release + version correctly. Also, transition any Resolved issues to the Closed state. +
    2. +
  2. Update the text files in a working copy of the project root: +
      +
    1. Update the CHANGES based on the Text release reports from JIRA.
      2. +
    2. Review and update README if needed.
      3. +
    3. Commit any changes back to svn: 
      svn commit -m "updating files for release"
      .
      4. +
    +
    3. +
  3. Perform a full build and deploy the SNAPSHOT artifacts: 
    mvn clean deploy
    4. +
+ + + +
    +
  1. Only for new major releases (like 1.0.0 to 1.1.0): +
    + Create a sub-branch from which to make the release. +
    + Releasing from a branch will allow any cosmetic changes that need to be made for the release to be + approved to be done without preventing other more disruptive advances in the trunk from potentially + causing problems with the release. It also provides a future maintenance branch (like 1.0.x.) +
    + A branch can be made by running: + 
    mvn release:branch -DbranchName=1.0.x
    2. +
  2. Checkout a clean copy of the trunk/branch to release using command line svn: + 
    svn checkout https://svn.apache.org/repos/asf/incubator/amber/trunk/ release
    3. +
+ + + +
    +
  1. Do a dry run of the release:prepare step. + 
    mvn release:prepare -DdryRun=true
    + + The dry run will not commit any changes back to SVN and gives you the opportunity to verify that the + release process will complete as expected. + +

    If you cancel a release:prepare before it updates the pom.xml versions, then use the + release:clean goal to just remove the extra files that were created.

    2. + +
  2. Verify that the release process completed as expected: +
      +
    1. The release plugin will create pom.xml.tag files which contain the changes that would + have been committed to SVN. The only differences between pom.xml.tag and its corresponding + pom.xml file should be the version + number.
      2. + +
    2. If other formatting changes have been made you should review the changes and then commit them: + 
      svn commit -m "fixing formatting for release"
      3. + +
    3. Assuming the .tag files look OK you may proceed and do any other validation you feel + necessary. The following list may be helpful: +
        +
      1. Check release.properties and make sure that the scm properties have the right version. + Sometimes the scm location can be the previous version not the next version.
        2. + +
      2. Verify signatures: On Un*x platforms the following command can be executed: +for file in `find . -type f -iname '*.asc'` +do + gpg --verify ${file} +done + + You'll need to look at the output to ensure it contains only good signatures: +gpg: Good signature from ... +gpg: Signature made ... +
        3. +
      +
      4. + +
    4. Once any failures or required updates have been committed to svn, rollback the release prepare files: + mvn release:rollback
      5. +
    +
    3. + +
  3. Run the release:prepare step for real this time. You'll be prompted for the same version + information and optionally your GPG passphrase again. 
    mvn release:prepare
    +
    4. +
+ + + +
    +
  1. + From the directory where you have launched release:prepare execute (this step will create a maven staging repository): + mvn release:perform [-Duser.name=<your_apache_uid>] + +

    + If your local OS userid doesn't match your Apache userid, then you'll have to also override the value + provided by the OS to Maven for the site-deploy step to work. This is known to work for Linux, + but not for Mac and unknown for Windows. + +

    + +
      +
    1. Verify the staged artifacts in the Nexus repository: +
        +
      1. https://repository.apache.org/
        2. +
      2. Enterprise --> Staging
        3. +
      3. Staging tab --> Name column --> org.apache.amber
        4. +
      4. Navigate through the artifact tree and make sure that all binary, + javadoc, + sources, and + tests jars, as well as + poms, ... have + .asc (GPG signature) and checksum files (see + Repository FAQ and + Detached Signatures). + The amber-sources-dist-X.Y.tar.gz and + amber-sources-dist-X.Y.zip files shall likewise have signature and checksum files. +
        5. +
      +
      2. + +
    2. Close the Nexus staging repo: +
        +
      1. https://repository.apache.org/
        2. +
      2. Enterprise --> Staging
        3. +
      3. Staging tab --> Name column --> org.apache.amber
        4. +
      4. Right click on the open org.apache.amber-XXX staging repo and select + Close.
        5. +
      +
      3. +
    +
    2. + +
  2. + This step will create the staging site: From the directory where you have launched release:perform execute: + cd target/checkout +svn checkout https://svn.apache.org/repos/asf/incubator/amber/site/ staging-site +mvn -P site site-deploy -Dsite.deploymentBaseUrl=file:///<absolute path to/<staging-site/version>> +cd staging-site +svn add <version> +svn commit -m "staging site for release" +
    3. +
+ + + +
    +
  1. Create a VOTE email thread on amber-dev + to record votes as replies, e.g.: + 
    
+Subject: [VOTE] Release Apache Amber X.Y
+
+Hi,
+
+We solved N issues:
+http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312323&styleName=Html&version=X.Y
+
+There are still a couple of issues left in JIRA:
+http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12312323&status=1
+
+SVN source tag (r9999999):
+https://svn.apache.org/repos/asf/incubator/amber/tags/X.Y/
+
+Staging repo:
+https://repository.apache.org/content/repositories/orgapacheamber-[YOUR REPOSITORY ID]/
+
+Staging site:
+http://incubator.apache.org/amber/X.Y/
+
+PGP release keys (signed using ABCDEFG):
+http://www.apache.org/dist/incubator/amber/KEYS
+
+Vote will be open for 72 hours.
+
+[ ] +1, let's get it ruuuumbleeeeee!!!
+[ ] +/-0, fine, but consider to fix few issues before...
+[ ] -1, nope, because... (and please explain why)]]>
    +
    2. + +
  2. Create a DISCUSS email thread on amber-dev@ for any vote questions, e.g.: + 
    
+Subject: [DISCUSS] Apache Amber X.Y
+
+Discussion thread for vote on <version> release candidate, with SVN source tag (r9999999).
+
+For more information on the release process, check out http://www.apache.org/dev/release.html
+
+Some of the things to check before voting are:
+ - does "mvn rat:check" pass on the source
+ - can you build the contents of source-release.zip and svn tag
+ - do all of the staged jars/zips contain the required LICENSE and NOTICE files
+ - are all of the staged jars signed and the signature verifiable
+ - is the signing key in the project's KEYS file and on a public server (i.e. http://www.apache.org/dist/incubator/amber/)]]>
+
    +
    3. + +
  3. Perform a review of the release and cast your vote. For more details on Apache releases see + http://www.apache.org/dev/release.html.
    4. + +
  4. A -1 vote does not necessarily mean that the vote must be redone, however it is usually a + good idea to rollback the release if a -1 vote is received + (see "Recovering from a vetoed release" below).
    5. + +
  5. After the vote has been open for at least 72 hours, has at least three +1 PMC votes and no -1 votes, then + post the results to the vote thread, replying to the initial email prepending [RESULT] to the + original subject and include a list of every binding +1, 0 and -1 vote. + 
    
+CC: "Apache Amber PMC List" 
+Subject: [RESULT] [VOTE] Release Apache Amber X.Y
+
+Hi,
+The vote has passed with the following result :
+
++1 (binding):
+
+    Antonio Sanso
+    Tommaso Teofili
+    Stuart "Pid" Williams
+    Simone Tripodi
+
++1 (non binding):
+
+    Mario Rossi
+    John Doe
+
+I will promote the artifacts to the central repo.]]>
    +
    6. +
+ + + +
    +
  1. Promote the staged nexus artifacts: +
      +
    1. https://repository.apache.org/
      2. +
    2. Enterprise --> Staging
      3. +
    3. Staging tab --> Name column --> org.apache.amber
      4. +
    4. Right click on the closed org.apache.amber-XXX staging repo and select Release. +
      5. +
    +
    2. + +
  2. Add the distribution artifacts to the distribution area + ssh people.apache.org +cd /x1/www/www.apache.org/dist/incubator/amber/ + +wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.tar.gz* -R .asc.sha1,.asc.md5 \ +https://repository.apache.org/content/repositories/releases/org/apache/amber/amber-sources-dist/<version>/ +wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.zip* -R .asc.sha1,.asc.md5 \ +https://repository.apache.org/content/repositories/releases/org/apache/amber/amber-sources-dist/<version>/ + +TODO add missing assemblies... +
    3. + +
  3. Update the + JIRA versions + page to mark the version as Released, and set the date to the date that + the release was approved. You may also need to make a new release entry for the next release.
    4. +
+ + + +

Make an announcement about the release on the + amber-user, + amber-dev, and + announce@apache.org lists as per + the Apache Announcement Mailing Lists page +

+ + 
, "Apache Amber Users List" 
+CC: "Apache Amber Developers List" 
+Subject: [ANNOUNCE] Apache Amber X.Y
+
+The Apache Amber Team is pleased to announce the release of Apache Amber X.Y.
+
+The Amber project will deliver a Java development framework mainly aimed to build OAuth-aware applications.
+
+Release Notes:
+
+(put JIRA release notes here)
+
+Have Fun,
+(committer name), on behalf of the Apache Amber PMC]]>
+ +
+ +
+
    +
  1. Reply to the initial vote email prepending [CANCELED] to the original subject.
    2. +
  2. Rollback the version upgrades in trunk by either: +
      +
    1. Restore the 0.1-rc1.tar.gz and run mvn release:rollback or + manually revert the versions in trunk to the prior version and commit
      2. +
    +
    3. + +
  3. Delete the svn tag created by the release:perform step: + 
    svn rm https://svn.apache.org/repos/asf/incubator/amber/tags/X.Y -m "deleting tag from rolled back release"
    4. + +
  4. Drop the Nexus staging repo: +
      +
    1. https://repository.apache.org/
      2. +
    2. Enterprise --> Staging
      3. +
    3. Staging tab --> Name column --> org.apache.amber
      4. +
    4. Right click on the closed org.apache.amber-XXX staging repo and select Drop. +
      5. +
    +
    5. + +
  5. Make the required updates that caused the vote to be canceled.
    6. + +
  6. Spin another release attempt!
    7. +
+
+ + + From 42a79d7b38388eb9a09708d6e374e19247ddf2b1 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 10:01:28 +0000 Subject: [PATCH 106/583] release guide linked in the sidebar menu git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356654 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/site/site.xml b/src/site/site.xml index adc7c5c1..3e097b27 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -42,6 +42,10 @@ + + + + From 2b485db0a7306285dcab0b145f0568df25ae20e9 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 10:02:15 +0000 Subject: [PATCH 107/583] fluido upgrade git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356655 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/site.xml b/src/site/site.xml index 3e097b27..18056165 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -34,7 +34,7 @@ org.apache.maven.skins maven-fluido-skin - 1.0 + 1.2.1 From b5e8c4637e64308a64b10b699c191090368d319f Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 10:08:24 +0000 Subject: [PATCH 108/583] generate the site in a proper profile, avoid automatic procedure that is incredibly slow with wagon-svn, the manual procedure is incredibly faster git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356657 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 102 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index cd1b282c..b1bd88b8 100644 --- a/pom.xml +++ b/pom.xml @@ -255,13 +255,6 @@ - - - amber.website - Apache Amber website - ${site.deploymentBaseUrl} - - UTF-8 @@ -490,40 +483,10 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - org.apache.maven.plugins maven-surefire-plugin - - - org.apache.maven.plugins - maven-site-plugin - 3.0 - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.4 - - - - - - org.jvnet.wagon-svn - wagon-svn - 1.12 - - - @@ -731,6 +694,71 @@ + + + site + + + + any23.website + Apache Any23 website + ${site.deploymentBaseUrl} + + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.1 + + en + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.4 + + false + false + scm:svn:http://svn.apache.org/repos/asf/incubator/any23/trunk + scm:svn:https://svn.apache.org/repos/asf/incubator/any23/trunk + http://svn.apache.org/viewvc/incubator/any23/trunk + + + + + index + mailing-list + project-team + scm + cim + issue-tracking + license + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + + + aggregate + + + + + + + + + + From 621249df4f5f1158460f4aa5cfcc16ebc1142880 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 10:18:15 +0000 Subject: [PATCH 109/583] fixed wrong resources management * global declaration of root resources was wrong * include src/main/resources only if really have to git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356660 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-authzserver/pom.xml | 14 ++++++++++++++ oauth-2.0/oauth2-client-demo/pom.xml | 16 ++++++++++++++++ oauth-2.0/oauth2-client/pom.xml | 12 ++++++++++++ oauth-2.0/oauth2-common/pom.xml | 12 ++++++++++++ oauth-2.0/oauth2-dynamicreg-client/pom.xml | 14 ++++++++++++++ oauth-2.0/oauth2-dynamicreg-common/pom.xml | 14 ++++++++++++++ oauth-2.0/oauth2-dynamicreg-server/pom.xml | 14 ++++++++++++++ oauth-2.0/oauth2-httpclient4/pom.xml | 14 ++++++++++++++ oauth-2.0/oauth2-integration-tests/pom.xml | 12 ++++++++++++ oauth-2.0/oauth2-resourceserver/pom.xml | 12 ++++++++++++ oauth-2.0/oauth2-rs-filter/pom.xml | 14 ++++++++++++++ oauth-2.0/oauth2-test-utils/pom.xml | 14 ++++++++++++++ pom.xml | 16 ---------------- 13 files changed, 162 insertions(+), 16 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/pom.xml b/oauth-2.0/oauth2-authzserver/pom.xml index 745d501a..aca5f397 100644 --- a/oauth-2.0/oauth2-authzserver/pom.xml +++ b/oauth-2.0/oauth2-authzserver/pom.xml @@ -62,4 +62,18 @@ + + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + + diff --git a/oauth-2.0/oauth2-client-demo/pom.xml b/oauth-2.0/oauth2-client-demo/pom.xml index 5f3dfc2c..3e69b40d 100644 --- a/oauth-2.0/oauth2-client-demo/pom.xml +++ b/oauth-2.0/oauth2-client-demo/pom.xml @@ -101,6 +101,22 @@ + + + ${basedir}/src/main/resources + + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + org.mortbay.jetty diff --git a/oauth-2.0/oauth2-client/pom.xml b/oauth-2.0/oauth2-client/pom.xml index 4cf7605b..005c8c11 100644 --- a/oauth-2.0/oauth2-client/pom.xml +++ b/oauth-2.0/oauth2-client/pom.xml @@ -50,6 +50,18 @@ + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + org.apache.maven.plugins diff --git a/oauth-2.0/oauth2-common/pom.xml b/oauth-2.0/oauth2-common/pom.xml index dbf38718..97da2f3b 100644 --- a/oauth-2.0/oauth2-common/pom.xml +++ b/oauth-2.0/oauth2-common/pom.xml @@ -45,6 +45,18 @@ + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + org.apache.maven.plugins diff --git a/oauth-2.0/oauth2-dynamicreg-client/pom.xml b/oauth-2.0/oauth2-dynamicreg-client/pom.xml index 5bd17792..a2f1e720 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-client/pom.xml @@ -49,4 +49,18 @@ + + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + + diff --git a/oauth-2.0/oauth2-dynamicreg-common/pom.xml b/oauth-2.0/oauth2-dynamicreg-common/pom.xml index b698c6df..19279a89 100644 --- a/oauth-2.0/oauth2-dynamicreg-common/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-common/pom.xml @@ -36,4 +36,18 @@ + + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + + diff --git a/oauth-2.0/oauth2-dynamicreg-server/pom.xml b/oauth-2.0/oauth2-dynamicreg-server/pom.xml index 8c74ca21..8c1479bb 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-server/pom.xml @@ -67,4 +67,18 @@ + + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + + diff --git a/oauth-2.0/oauth2-httpclient4/pom.xml b/oauth-2.0/oauth2-httpclient4/pom.xml index 2a82bee6..06a8944d 100644 --- a/oauth-2.0/oauth2-httpclient4/pom.xml +++ b/oauth-2.0/oauth2-httpclient4/pom.xml @@ -41,4 +41,18 @@ + + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + + diff --git a/oauth-2.0/oauth2-integration-tests/pom.xml b/oauth-2.0/oauth2-integration-tests/pom.xml index df9be19d..c468e3c4 100644 --- a/oauth-2.0/oauth2-integration-tests/pom.xml +++ b/oauth-2.0/oauth2-integration-tests/pom.xml @@ -122,6 +122,18 @@ + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + org.apache.maven.plugins diff --git a/oauth-2.0/oauth2-resourceserver/pom.xml b/oauth-2.0/oauth2-resourceserver/pom.xml index dcde8647..f25b6836 100644 --- a/oauth-2.0/oauth2-resourceserver/pom.xml +++ b/oauth-2.0/oauth2-resourceserver/pom.xml @@ -37,6 +37,18 @@ + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + org.apache.maven.plugins diff --git a/oauth-2.0/oauth2-rs-filter/pom.xml b/oauth-2.0/oauth2-rs-filter/pom.xml index 189a3abb..f9594ac8 100644 --- a/oauth-2.0/oauth2-rs-filter/pom.xml +++ b/oauth-2.0/oauth2-rs-filter/pom.xml @@ -43,4 +43,18 @@ + + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + + diff --git a/oauth-2.0/oauth2-test-utils/pom.xml b/oauth-2.0/oauth2-test-utils/pom.xml index 88111a32..438f5d7b 100644 --- a/oauth-2.0/oauth2-test-utils/pom.xml +++ b/oauth-2.0/oauth2-test-utils/pom.xml @@ -37,4 +37,18 @@ + + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + + diff --git a/pom.xml b/pom.xml index b1bd88b8..983c600d 100644 --- a/pom.xml +++ b/pom.xml @@ -488,22 +488,6 @@ maven-surefire-plugin - - - - ${basedir}/src/main/resources - - - - ${basedir} - META-INF - - LICENSE - NOTICE - DISCLAIMER - - - From 215157976cb2c32c38d81adff844a045460fc32a Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 10:27:22 +0000 Subject: [PATCH 110/583] the `apache-release` profile enables the assembly-plugin at all level, which is undesired behavior enable the `apache` profile instead - described in the release guide - that has the info to deploy correctly the artifacts on Nexus git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356662 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 983c600d..db8639c6 100644 --- a/pom.xml +++ b/pom.xml @@ -391,7 +391,7 @@ forked-path false true - -Prelease,apache-release + -Prelease,apache From cfdce37c78adeb2f42a92aec0093d6acab948bb1 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 10:28:40 +0000 Subject: [PATCH 111/583] managed the assembly plugin git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356663 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pom.xml b/pom.xml index db8639c6..c9c46f2b 100644 --- a/pom.xml +++ b/pom.xml @@ -276,6 +276,8 @@ | mvn site-deploy -Dsite.deploymentBaseUrl=file://path/to/checked/out/site --> svn:https://svn.apache.org/repos/asf/incubator/amber/site + apache-${project.build.finalName} + false @@ -383,6 +385,27 @@ 2.11 + + org.apache.maven.plugins + maven-assembly-plugin + ${maven-assembly-plugin.version} + + + assembly + package + + single + + + + + true + ${assembly.skip} + gnu + ${assembly.finalName} + + + org.apache.maven.plugins maven-release-plugin From e2bb393c11a9934946ef34730f969b09a011c6f0 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 10:29:21 +0000 Subject: [PATCH 112/583] `sources-dist` module can now be managed git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356664 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index c9c46f2b..74e2e5d0 100644 --- a/pom.xml +++ b/pom.xml @@ -230,6 +230,7 @@ oauth-2.0 + sources-dist From 4c595a76e4eeaa17a808b072f8f0d22e7a135baf Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 10:30:52 +0000 Subject: [PATCH 113/583] added the name format for tagged code (amber-parent looks not good) git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356665 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 74e2e5d0..a051ee45 100644 --- a/pom.xml +++ b/pom.xml @@ -415,6 +415,7 @@ forked-path false true + amber-@{project.version} -Prelease,apache From 8693d1392f2ea80d4eb0d0184bd31cf4bac1fe27 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 10:35:51 +0000 Subject: [PATCH 114/583] no automatic changes report by Maven, JIRA manages it in a better way git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356666 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pom.xml b/pom.xml index a051ee45..67b5ee33 100644 --- a/pom.xml +++ b/pom.xml @@ -575,19 +575,6 @@ 2.6 - - org.apache.maven.plugins - maven-changes-plugin - 2.3 - - - - jira-report - - - - - org.apache.maven.plugins maven-pmd-plugin From 61d73753dd0fc7637dcbd492231b0b75cf5e0c50 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Tue, 3 Jul 2012 10:36:35 +0000 Subject: [PATCH 115/583] exclude the CHANGES list from the RAT check git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1356667 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 67b5ee33..1971d422 100644 --- a/pom.xml +++ b/pom.xml @@ -606,6 +606,7 @@ + CHANGES DISCLAIMER KEYS NOTICE From f44d388a4ff3e397a0441797576d9d9dc884bb63 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 4 Jul 2012 08:01:49 +0000 Subject: [PATCH 116/583] add the staging distribution assemblies staging repo to be evaluated in the VOTE thread git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1357145 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/xdoc/release-howto.xml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/site/xdoc/release-howto.xml b/src/site/xdoc/release-howto.xml index 5cc49b54..9133addd 100644 --- a/src/site/xdoc/release-howto.xml +++ b/src/site/xdoc/release-howto.xml @@ -214,6 +214,22 @@ gpg: Signature made ... Close. + +
  • Add the distribution artifacts to the build area + ssh people.apache.org +cd /x1/builds/incubator/amber + +cd sources + +wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.tar.gz* -R .asc.sha1,.asc.md5 \ +https://repository.apache.org/content/repositories/releases/org/apache/amber/amber-sources-dist/<version>/ +wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.zip* -R .asc.sha1,.asc.md5 \ +https://repository.apache.org/content/repositories/releases/org/apache/amber/amber-sources-dist/<version>/ + +cd ../binaries + +TODO add missing assemblies... +
    • @@ -330,12 +346,8 @@ I will promote the artifacts to the central repo.]]> ssh people.apache.org cd /x1/www/www.apache.org/dist/incubator/amber/ -wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.tar.gz* -R .asc.sha1,.asc.md5 \ -https://repository.apache.org/content/repositories/releases/org/apache/amber/amber-sources-dist/<version>/ -wget -e robots=off -nH --cut-dirs=7 -np --no-check-certificate -m -A *.zip* -R .asc.sha1,.asc.md5 \ -https://repository.apache.org/content/repositories/releases/org/apache/amber/amber-sources-dist/<version>/ - -TODO add missing assemblies... +mv /x1/builds/incubator/amber/sources/* sources/ +mv /x1/builds/incubator/amber/binaries/* binaries/
  • Update the From 8ff03667dfdb72d08de9a2db7f379e2a92e18425 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 4 Jul 2012 08:06:17 +0000 Subject: [PATCH 117/583] first checkin of download page - still misses bin packages will be distribuited not just as mvn artifacts git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1357147 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/xdoc/download.xml.vm | 70 +++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 src/site/xdoc/download.xml.vm diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm new file mode 100644 index 00000000..00838b4c --- /dev/null +++ b/src/site/xdoc/download.xml.vm @@ -0,0 +1,70 @@ + + + + + + Apache Amber - Download + Apache Amber Team + + + +
    +

    Apache Amber is distributed in several formats for your convenience. Use a source archive if you intend to build + Apache Amber yourself. Otherwise, simply pick a ready-made binary distribution and follow the installation + instructions given inside the archives.

    + +

    You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24 + hours to reach all mirrors.

    + +

    In order to guard against corrupted downloads/installations, it is highly recommended to + verify the signature + of the release bundles against the public KEYS used by the Apache Amber + developers.

    + +

    Apache Amber is distributed under the Apache License, version 2.0.

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    MirrorsChecksumSignature
    Apache Amber ${project.version} (Source tar.gz) apache-amber-${project.version}-src.tar.gz apache-amber-${project.version}-src.tar.gz.md5 apache-amber-${project.version}-src.tar.gz.asc
    Apache Amber ${project.version} (Source zip) apache-amber-${project.version}-src.zip apache-amber-${project.version}-src.zip.md5 apache-amber-${project.version}-src.zip.asc
    +     +
    + +     From 5b9cda4e4d998aca11dcb33b296f2a679b978475 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 4 Jul 2012 08:12:04 +0000 Subject: [PATCH 118/583] added Download page link in the sidebar menu git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1357151 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/site/site.xml b/src/site/site.xml index 18056165..29c6646e 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -40,7 +40,9 @@ - + + + From 4aa3f833ebc545dc0ceaa0bc3cc7e5a08bf8a332 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 4 Jul 2012 08:16:08 +0000 Subject: [PATCH 119/583] code format, no functional modifications git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1357156 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/site/site.xml b/src/site/site.xml index 29c6646e..8b82375b 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -37,31 +37,31 @@ 1.2.1 - + - + - + - + - + - + - - - - - + + + + +
    From 069474905695a5384336ac0bf77f85eae80f9167 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 4 Jul 2012 08:19:05 +0000 Subject: [PATCH 120/583] produces coherent assembly archive name/extracted base directory name git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1357164 13f79535-47bb-0310-9956-ffa450edef68 --- sources-dist/pom.xml | 1 + sources-dist/src/main/assembly/src.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index 1aab2f83..c45244d6 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -40,6 +40,7 @@ org.apache.maven.plugins maven-assembly-plugin + ${assembly.finalName} ${basedir}/src/main/assembly/src.xml diff --git a/sources-dist/src/main/assembly/src.xml b/sources-dist/src/main/assembly/src.xml index c62bdb0d..ebf7c640 100644 --- a/sources-dist/src/main/assembly/src.xml +++ b/sources-dist/src/main/assembly/src.xml @@ -24,7 +24,7 @@ zip true - apache-amber-${project.version} + ${assembly.finalName}-src svn:https://svn.apache.org/repos/asf/incubator/amber/site - apache-${project.build.finalName} false diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index c45244d6..33c295df 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -29,10 +29,6 @@ Apache Amber :: Sources distribution module - - apache-amber-${project.version} - - @@ -40,7 +36,6 @@ org.apache.maven.plugins maven-assembly-plugin - ${assembly.finalName} ${basedir}/src/main/assembly/src.xml From b50a4f4b6cca24d4a4ee3a06655eebb202666487 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 08:55:26 +0000 Subject: [PATCH 126/583] sources module renamed as 'amber-sources' assembly ID (-src) removed from artifact name git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1358974 13f79535-47bb-0310-9956-ffa450edef68 --- sources-dist/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index 33c295df..02c63f14 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -25,7 +25,7 @@ ../ - amber-sources-dist + amber-sources Apache Amber :: Sources distribution module @@ -36,6 +36,7 @@ org.apache.maven.plugins maven-assembly-plugin + false ${basedir}/src/main/assembly/src.xml From 7afa80f81cf9a32306aebfc009fdfc938df5bb96 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 09:02:53 +0000 Subject: [PATCH 127/583] omit assembly ID by default from zip/tgz artifacts dropped finalName refuse git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1358976 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- sources-dist/pom.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b35ed6e4..32e8b388 100644 --- a/pom.xml +++ b/pom.xml @@ -400,9 +400,9 @@ true + false ${assembly.skip} gnu - ${assembly.finalName} diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index 02c63f14..be801b03 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -36,7 +36,6 @@ org.apache.maven.plugins maven-assembly-plugin - false ${basedir}/src/main/assembly/src.xml From db752fe673505f2718de2ff373886a3962819ac7 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 09:19:29 +0000 Subject: [PATCH 128/583] added client assemblies packaging git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1358990 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-client/pom.xml | 11 + .../src/main/assembly/LICENSE-with-deps | 234 ++++++++++++++++++ .../src/main/assembly/NOTICE-with-deps | 2 + .../oauth2-client/src/main/assembly/bin.xml | 61 +++++ 4 files changed, 308 insertions(+) create mode 100644 oauth-2.0/oauth2-client/src/main/assembly/LICENSE-with-deps create mode 100644 oauth-2.0/oauth2-client/src/main/assembly/NOTICE-with-deps create mode 100644 oauth-2.0/oauth2-client/src/main/assembly/bin.xml diff --git a/oauth-2.0/oauth2-client/pom.xml b/oauth-2.0/oauth2-client/pom.xml index 005c8c11..ab77baf0 100644 --- a/oauth-2.0/oauth2-client/pom.xml +++ b/oauth-2.0/oauth2-client/pom.xml @@ -73,6 +73,17 @@ + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${basedir}/src/main/assembly/bin.xml + + + diff --git a/oauth-2.0/oauth2-client/src/main/assembly/LICENSE-with-deps b/oauth-2.0/oauth2-client/src/main/assembly/LICENSE-with-deps new file mode 100644 index 00000000..c2622deb --- /dev/null +++ b/oauth-2.0/oauth2-client/src/main/assembly/LICENSE-with-deps @@ -0,0 +1,234 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +APACHE AMBER OAUTH 2.0 CLIENT DEPENDENCIES: + +The Apache Amber OAuth2.0 client distribution packages include a number of dependencies with +separate copyright notices and license terms. Your use of the binaries for these +dependencies is subject to the terms and conditions of the following licenses. + +For the SLF4J component (http://www.slf4j.org/) +This is licensed under the MIT license +Copyright (c) 2004-2011 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For the Jettison component (http://jettison.codehaus.org/) +This is licensed under the The Apache Software License, Version 2.0, see above diff --git a/oauth-2.0/oauth2-client/src/main/assembly/NOTICE-with-deps b/oauth-2.0/oauth2-client/src/main/assembly/NOTICE-with-deps new file mode 100644 index 00000000..3f59805c --- /dev/null +++ b/oauth-2.0/oauth2-client/src/main/assembly/NOTICE-with-deps @@ -0,0 +1,2 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/oauth-2.0/oauth2-client/src/main/assembly/bin.xml b/oauth-2.0/oauth2-client/src/main/assembly/bin.xml new file mode 100644 index 00000000..04b13d33 --- /dev/null +++ b/oauth-2.0/oauth2-client/src/main/assembly/bin.xml @@ -0,0 +1,61 @@ + + + + + bin + + tar.gz + zip + + true + ${project.build.finalName} + + + + ${basedir}/src/main/assembly/LICENSE-with-deps + LICENSE + / + 666 + + + ${basedir}/src/main/assembly/NOTICE-with-deps + NOTICE + / + 666 + + + ${basedir}/../../DISCLAIMER + / + 666 + + + ${basedir}/../../CHANGES + / + 666 + + + + + + true + /lib + + + + From 97782a7c0ffcd50f7c38c46fe0a5fb2f9036b83f Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 09:25:23 +0000 Subject: [PATCH 129/583] added missing Amber copyright 'header' in NOTICE files git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1358992 13f79535-47bb-0310-9956-ffa450edef68 --- NOTICE | 3 +++ oauth-2.0/oauth2-client/src/main/assembly/NOTICE-with-deps | 3 +++ 2 files changed, 6 insertions(+) diff --git a/NOTICE b/NOTICE index 3f59805c..c64ced11 100644 --- a/NOTICE +++ b/NOTICE @@ -1,2 +1,5 @@ +Apache Amber +Copyright 2010-2012 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). diff --git a/oauth-2.0/oauth2-client/src/main/assembly/NOTICE-with-deps b/oauth-2.0/oauth2-client/src/main/assembly/NOTICE-with-deps index 3f59805c..c64ced11 100644 --- a/oauth-2.0/oauth2-client/src/main/assembly/NOTICE-with-deps +++ b/oauth-2.0/oauth2-client/src/main/assembly/NOTICE-with-deps @@ -1,2 +1,5 @@ +Apache Amber +Copyright 2010-2012 The Apache Software Foundation + This product includes software developed by The Apache Software Foundation (http://www.apache.org/). From 233a438404521be722eafe1cadc4579e8d05c7c2 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 09:26:44 +0000 Subject: [PATCH 130/583] added authzserver assemblies packaging git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1358993 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-authzserver/pom.xml | 13 + .../src/main/assembly/LICENSE-with-deps | 234 ++++++++++++++++++ .../src/main/assembly/NOTICE-with-deps | 5 + .../src/main/assembly/bin.xml | 61 +++++ 4 files changed, 313 insertions(+) create mode 100644 oauth-2.0/oauth2-authzserver/src/main/assembly/LICENSE-with-deps create mode 100644 oauth-2.0/oauth2-authzserver/src/main/assembly/NOTICE-with-deps create mode 100644 oauth-2.0/oauth2-authzserver/src/main/assembly/bin.xml diff --git a/oauth-2.0/oauth2-authzserver/pom.xml b/oauth-2.0/oauth2-authzserver/pom.xml index aca5f397..02c092f3 100644 --- a/oauth-2.0/oauth2-authzserver/pom.xml +++ b/oauth-2.0/oauth2-authzserver/pom.xml @@ -74,6 +74,19 @@ + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${basedir}/src/main/assembly/bin.xml + + + + diff --git a/oauth-2.0/oauth2-authzserver/src/main/assembly/LICENSE-with-deps b/oauth-2.0/oauth2-authzserver/src/main/assembly/LICENSE-with-deps new file mode 100644 index 00000000..c2622deb --- /dev/null +++ b/oauth-2.0/oauth2-authzserver/src/main/assembly/LICENSE-with-deps @@ -0,0 +1,234 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +APACHE AMBER OAUTH 2.0 CLIENT DEPENDENCIES: + +The Apache Amber OAuth2.0 client distribution packages include a number of dependencies with +separate copyright notices and license terms. Your use of the binaries for these +dependencies is subject to the terms and conditions of the following licenses. + +For the SLF4J component (http://www.slf4j.org/) +This is licensed under the MIT license +Copyright (c) 2004-2011 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For the Jettison component (http://jettison.codehaus.org/) +This is licensed under the The Apache Software License, Version 2.0, see above diff --git a/oauth-2.0/oauth2-authzserver/src/main/assembly/NOTICE-with-deps b/oauth-2.0/oauth2-authzserver/src/main/assembly/NOTICE-with-deps new file mode 100644 index 00000000..c64ced11 --- /dev/null +++ b/oauth-2.0/oauth2-authzserver/src/main/assembly/NOTICE-with-deps @@ -0,0 +1,5 @@ +Apache Amber +Copyright 2010-2012 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/oauth-2.0/oauth2-authzserver/src/main/assembly/bin.xml b/oauth-2.0/oauth2-authzserver/src/main/assembly/bin.xml new file mode 100644 index 00000000..04b13d33 --- /dev/null +++ b/oauth-2.0/oauth2-authzserver/src/main/assembly/bin.xml @@ -0,0 +1,61 @@ + + + + + bin + + tar.gz + zip + + true + ${project.build.finalName} + + + + ${basedir}/src/main/assembly/LICENSE-with-deps + LICENSE + / + 666 + + + ${basedir}/src/main/assembly/NOTICE-with-deps + NOTICE + / + 666 + + + ${basedir}/../../DISCLAIMER + / + 666 + + + ${basedir}/../../CHANGES + / + 666 + + + + + + true + /lib + + + + From a7dc24976881162c8e70c8897b885976354a6a0d Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 09:38:17 +0000 Subject: [PATCH 131/583] added 'amber-' prefix in each artifact git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1358999 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-authzserver/pom.xml | 4 ++-- oauth-2.0/oauth2-client-demo/pom.xml | 8 ++++---- oauth-2.0/oauth2-client/pom.xml | 4 ++-- oauth-2.0/oauth2-common/pom.xml | 2 +- oauth-2.0/oauth2-dynamicreg-client/pom.xml | 8 ++++---- oauth-2.0/oauth2-dynamicreg-common/pom.xml | 4 ++-- oauth-2.0/oauth2-dynamicreg-server/pom.xml | 10 +++++----- oauth-2.0/oauth2-httpclient4/pom.xml | 4 ++-- oauth-2.0/oauth2-integration-tests/pom.xml | 16 ++++++++-------- oauth-2.0/oauth2-resourceserver/pom.xml | 4 ++-- oauth-2.0/oauth2-rs-filter/pom.xml | 6 +++--- oauth-2.0/oauth2-test-utils/pom.xml | 2 +- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/oauth-2.0/oauth2-authzserver/pom.xml b/oauth-2.0/oauth2-authzserver/pom.xml index 02c092f3..9c193b06 100644 --- a/oauth-2.0/oauth2-authzserver/pom.xml +++ b/oauth-2.0/oauth2-authzserver/pom.xml @@ -24,14 +24,14 @@ 0.22-incubating-SNAPSHOT - oauth2-authzserver + amber-oauth2-authzserver Apache Amber: OAuth 2.0 Implementation - Authorization Server org.apache.amber - oauth2-common + amber-oauth2-common ${project.version} diff --git a/oauth-2.0/oauth2-client-demo/pom.xml b/oauth-2.0/oauth2-client-demo/pom.xml index 3e69b40d..92e776fa 100644 --- a/oauth-2.0/oauth2-client-demo/pom.xml +++ b/oauth-2.0/oauth2-client-demo/pom.xml @@ -25,7 +25,7 @@ 0.22-incubating-SNAPSHOT - oauth2-client-demo + amber-oauth2-client-demo war Apache Amber: OAuth 2.0 Implementation - Demo Application @@ -39,7 +39,7 @@ - oauth2-common + amber-oauth2-common org.apache.amber ${project.version} @@ -47,13 +47,13 @@ - oauth2-dynamicreg-common + amber-oauth2-dynamicreg-common org.apache.amber ${project.version} - oauth2-dynamicreg-client + amber-oauth2-dynamicreg-client org.apache.amber ${project.version} diff --git a/oauth-2.0/oauth2-client/pom.xml b/oauth-2.0/oauth2-client/pom.xml index ab77baf0..06faaa8a 100644 --- a/oauth-2.0/oauth2-client/pom.xml +++ b/oauth-2.0/oauth2-client/pom.xml @@ -25,14 +25,14 @@ 0.22-incubating-SNAPSHOT - oauth2-client + amber-oauth2-client Apache Amber: OAuth 2.0 Implementation - Client org.apache.amber - oauth2-common + amber-oauth2-common ${project.version} diff --git a/oauth-2.0/oauth2-common/pom.xml b/oauth-2.0/oauth2-common/pom.xml index 97da2f3b..f7e3a236 100644 --- a/oauth-2.0/oauth2-common/pom.xml +++ b/oauth-2.0/oauth2-common/pom.xml @@ -25,7 +25,7 @@ 0.22-incubating-SNAPSHOT - oauth2-common + amber-oauth2-common Apache Amber: OAuth 2.0 Implementation - Common OAuth 2.0 library - Common diff --git a/oauth-2.0/oauth2-dynamicreg-client/pom.xml b/oauth-2.0/oauth2-dynamicreg-client/pom.xml index a2f1e720..0749fc7b 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-client/pom.xml @@ -25,26 +25,26 @@ 0.22-incubating-SNAPSHOT - oauth2-dynamicreg-client + amber-oauth2-dynamicreg-client Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Client org.apache.amber - oauth2-common + amber-oauth2-common ${project.version} org.apache.amber - oauth2-client + amber-oauth2-client ${project.version} org.apache.amber - oauth2-dynamicreg-common + amber-oauth2-dynamicreg-common ${project.version} diff --git a/oauth-2.0/oauth2-dynamicreg-common/pom.xml b/oauth-2.0/oauth2-dynamicreg-common/pom.xml index 19279a89..9bccfb42 100644 --- a/oauth-2.0/oauth2-dynamicreg-common/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-common/pom.xml @@ -24,14 +24,14 @@ 0.22-incubating-SNAPSHOT - oauth2-dynamicreg-common + amber-oauth2-dynamicreg-common Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Common org.apache.amber - oauth2-common + amber-oauth2-common ${project.version} diff --git a/oauth-2.0/oauth2-dynamicreg-server/pom.xml b/oauth-2.0/oauth2-dynamicreg-server/pom.xml index 8c1479bb..692f2874 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-server/pom.xml @@ -25,26 +25,26 @@ 0.22-incubating-SNAPSHOT - oauth2-dynamicreg-server + amber-oauth2-dynamicreg-server Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Server org.apache.amber - oauth2-common + amber-oauth2-common ${project.version} org.apache.amber - oauth2-authzserver + amber-oauth2-authzserver ${project.version} org.apache.amber - oauth2-dynamicreg-common + amber-oauth2-dynamicreg-common ${project.version} @@ -62,7 +62,7 @@ org.apache.amber - oauth2-test-utils + amber-oauth2-test-utils ${project.version} diff --git a/oauth-2.0/oauth2-httpclient4/pom.xml b/oauth-2.0/oauth2-httpclient4/pom.xml index 06a8944d..755d87d4 100644 --- a/oauth-2.0/oauth2-httpclient4/pom.xml +++ b/oauth-2.0/oauth2-httpclient4/pom.xml @@ -23,14 +23,14 @@ 0.22-incubating-SNAPSHOT - oauth2-httpclient4 + amber-oauth2-httpclient4 Apache Amber: OAuth 2.0 Implementation - HttpClient org.apache.amber - oauth2-client + amber-oauth2-client ${project.version} diff --git a/oauth-2.0/oauth2-integration-tests/pom.xml b/oauth-2.0/oauth2-integration-tests/pom.xml index c468e3c4..3c168eff 100644 --- a/oauth-2.0/oauth2-integration-tests/pom.xml +++ b/oauth-2.0/oauth2-integration-tests/pom.xml @@ -26,48 +26,48 @@ Apache Amber: OAuth 2.0 Implementation - Integration Tests - oauth2-integration-tests + amber-oauth2-integration-tests org.apache.amber - oauth2-common + amber-oauth2-common ${project.version} org.apache.amber - oauth2-client + amber-oauth2-client ${project.version} org.apache.amber - oauth2-authzserver + amber-oauth2-authzserver ${project.version} org.apache.amber - oauth2-httpclient4 + amber-oauth2-httpclient4 ${project.version} org.apache.amber - oauth2-resourceserver + amber-oauth2-resourceserver ${project.version} org.apache.amber - oauth2-dynamicreg-client + amber-oauth2-dynamicreg-client ${project.version} org.apache.amber - oauth2-dynamicreg-server + amber-oauth2-dynamicreg-server ${project.version} diff --git a/oauth-2.0/oauth2-resourceserver/pom.xml b/oauth-2.0/oauth2-resourceserver/pom.xml index f25b6836..328794af 100644 --- a/oauth-2.0/oauth2-resourceserver/pom.xml +++ b/oauth-2.0/oauth2-resourceserver/pom.xml @@ -24,14 +24,14 @@ 0.22-incubating-SNAPSHOT - oauth2-resourceserver + amber-oauth2-resourceserver Apache Amber: OAuth 2.0 Implementation - Resource Server org.apache.amber - oauth2-common + amber-oauth2-common ${project.version} diff --git a/oauth-2.0/oauth2-rs-filter/pom.xml b/oauth-2.0/oauth2-rs-filter/pom.xml index f9594ac8..9131d4f3 100644 --- a/oauth-2.0/oauth2-rs-filter/pom.xml +++ b/oauth-2.0/oauth2-rs-filter/pom.xml @@ -25,20 +25,20 @@ 0.22-incubating-SNAPSHOT - oauth2-rs-filter + amber-oauth2-rs-filter Apache Amber: OAuth 2.0 Implementation - Resource Server Filter org.apache.amber - oauth2-resourceserver + amber-oauth2-resourceserver ${project.version} org.apache.amber - oauth2-common + amber-oauth2-common ${project.version} diff --git a/oauth-2.0/oauth2-test-utils/pom.xml b/oauth-2.0/oauth2-test-utils/pom.xml index 438f5d7b..3a6b191a 100644 --- a/oauth-2.0/oauth2-test-utils/pom.xml +++ b/oauth-2.0/oauth2-test-utils/pom.xml @@ -25,7 +25,7 @@ 0.22-incubating-SNAPSHOT - oauth2-test-utils + amber-oauth2-test-utils Apache Amber: OAuth 2.0 Implementation - Test Utils From f5967774fd3b03f159b8c5f88f6889fd77667ed3 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 09:47:19 +0000 Subject: [PATCH 132/583] added dynamicreg-client assembly packaging git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1359005 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-dynamicreg-client/pom.xml | 13 + .../src/main/assembly/LICENSE-with-deps | 234 ++++++++++++++++++ .../src/main/assembly/NOTICE-with-deps | 5 + .../src/main/assembly/bin.xml | 61 +++++ 4 files changed, 313 insertions(+) create mode 100644 oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/LICENSE-with-deps create mode 100644 oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/NOTICE-with-deps create mode 100644 oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/bin.xml diff --git a/oauth-2.0/oauth2-dynamicreg-client/pom.xml b/oauth-2.0/oauth2-dynamicreg-client/pom.xml index 0749fc7b..10a1ca6e 100644 --- a/oauth-2.0/oauth2-dynamicreg-client/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-client/pom.xml @@ -61,6 +61,19 @@ + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${basedir}/src/main/assembly/bin.xml + + + + diff --git a/oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/LICENSE-with-deps b/oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/LICENSE-with-deps new file mode 100644 index 00000000..c2622deb --- /dev/null +++ b/oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/LICENSE-with-deps @@ -0,0 +1,234 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +APACHE AMBER OAUTH 2.0 CLIENT DEPENDENCIES: + +The Apache Amber OAuth2.0 client distribution packages include a number of dependencies with +separate copyright notices and license terms. Your use of the binaries for these +dependencies is subject to the terms and conditions of the following licenses. + +For the SLF4J component (http://www.slf4j.org/) +This is licensed under the MIT license +Copyright (c) 2004-2011 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For the Jettison component (http://jettison.codehaus.org/) +This is licensed under the The Apache Software License, Version 2.0, see above diff --git a/oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/NOTICE-with-deps b/oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/NOTICE-with-deps new file mode 100644 index 00000000..c64ced11 --- /dev/null +++ b/oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/NOTICE-with-deps @@ -0,0 +1,5 @@ +Apache Amber +Copyright 2010-2012 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/bin.xml b/oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/bin.xml new file mode 100644 index 00000000..04b13d33 --- /dev/null +++ b/oauth-2.0/oauth2-dynamicreg-client/src/main/assembly/bin.xml @@ -0,0 +1,61 @@ + + + + + bin + + tar.gz + zip + + true + ${project.build.finalName} + + + + ${basedir}/src/main/assembly/LICENSE-with-deps + LICENSE + / + 666 + + + ${basedir}/src/main/assembly/NOTICE-with-deps + NOTICE + / + 666 + + + ${basedir}/../../DISCLAIMER + / + 666 + + + ${basedir}/../../CHANGES + / + 666 + + + + + + true + /lib + + + + From 50f7a13d9f81d6a38ccbb2c857c29eae315dfa25 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 10:02:30 +0000 Subject: [PATCH 133/583] added dynamicreg-server assembly packaging git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1359015 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-dynamicreg-server/pom.xml | 13 + .../src/main/assembly/LICENSE-with-deps | 234 ++++++++++++++++++ .../src/main/assembly/NOTICE-with-deps | 5 + .../src/main/assembly/bin.xml | 61 +++++ 4 files changed, 313 insertions(+) create mode 100644 oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/LICENSE-with-deps create mode 100644 oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/NOTICE-with-deps create mode 100644 oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/bin.xml diff --git a/oauth-2.0/oauth2-dynamicreg-server/pom.xml b/oauth-2.0/oauth2-dynamicreg-server/pom.xml index 692f2874..68b4ef57 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-server/pom.xml @@ -79,6 +79,19 @@ + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${basedir}/src/main/assembly/bin.xml + + + + diff --git a/oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/LICENSE-with-deps b/oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/LICENSE-with-deps new file mode 100644 index 00000000..c2622deb --- /dev/null +++ b/oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/LICENSE-with-deps @@ -0,0 +1,234 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +APACHE AMBER OAUTH 2.0 CLIENT DEPENDENCIES: + +The Apache Amber OAuth2.0 client distribution packages include a number of dependencies with +separate copyright notices and license terms. Your use of the binaries for these +dependencies is subject to the terms and conditions of the following licenses. + +For the SLF4J component (http://www.slf4j.org/) +This is licensed under the MIT license +Copyright (c) 2004-2011 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For the Jettison component (http://jettison.codehaus.org/) +This is licensed under the The Apache Software License, Version 2.0, see above diff --git a/oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/NOTICE-with-deps b/oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/NOTICE-with-deps new file mode 100644 index 00000000..c64ced11 --- /dev/null +++ b/oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/NOTICE-with-deps @@ -0,0 +1,5 @@ +Apache Amber +Copyright 2010-2012 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/bin.xml b/oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/bin.xml new file mode 100644 index 00000000..04b13d33 --- /dev/null +++ b/oauth-2.0/oauth2-dynamicreg-server/src/main/assembly/bin.xml @@ -0,0 +1,61 @@ + + + + + bin + + tar.gz + zip + + true + ${project.build.finalName} + + + + ${basedir}/src/main/assembly/LICENSE-with-deps + LICENSE + / + 666 + + + ${basedir}/src/main/assembly/NOTICE-with-deps + NOTICE + / + 666 + + + ${basedir}/../../DISCLAIMER + / + 666 + + + ${basedir}/../../CHANGES + / + 666 + + + + + + true + /lib + + + + From 6d312fbb08dba5e9b96252090cb42e124d33d743 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 10:02:57 +0000 Subject: [PATCH 134/583] test-utils must be scoped as test dependencies git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1359016 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-dynamicreg-server/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/oauth-2.0/oauth2-dynamicreg-server/pom.xml b/oauth-2.0/oauth2-dynamicreg-server/pom.xml index 68b4ef57..47542577 100644 --- a/oauth-2.0/oauth2-dynamicreg-server/pom.xml +++ b/oauth-2.0/oauth2-dynamicreg-server/pom.xml @@ -64,6 +64,7 @@ org.apache.amber amber-oauth2-test-utils ${project.version} + test From 521679f3ab2b0b0e4aff472764a8a40e9039583b Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 10:06:56 +0000 Subject: [PATCH 135/583] added resourceserver assembly packaging git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1359018 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-resourceserver/pom.xml | 11 + .../src/main/assembly/LICENSE-with-deps | 234 ++++++++++++++++++ .../src/main/assembly/NOTICE-with-deps | 5 + .../src/main/assembly/bin.xml | 61 +++++ 4 files changed, 311 insertions(+) create mode 100644 oauth-2.0/oauth2-resourceserver/src/main/assembly/LICENSE-with-deps create mode 100644 oauth-2.0/oauth2-resourceserver/src/main/assembly/NOTICE-with-deps create mode 100644 oauth-2.0/oauth2-resourceserver/src/main/assembly/bin.xml diff --git a/oauth-2.0/oauth2-resourceserver/pom.xml b/oauth-2.0/oauth2-resourceserver/pom.xml index 328794af..f3e6c6bb 100644 --- a/oauth-2.0/oauth2-resourceserver/pom.xml +++ b/oauth-2.0/oauth2-resourceserver/pom.xml @@ -59,6 +59,17 @@ + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${basedir}/src/main/assembly/bin.xml + + + diff --git a/oauth-2.0/oauth2-resourceserver/src/main/assembly/LICENSE-with-deps b/oauth-2.0/oauth2-resourceserver/src/main/assembly/LICENSE-with-deps new file mode 100644 index 00000000..c2622deb --- /dev/null +++ b/oauth-2.0/oauth2-resourceserver/src/main/assembly/LICENSE-with-deps @@ -0,0 +1,234 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +APACHE AMBER OAUTH 2.0 CLIENT DEPENDENCIES: + +The Apache Amber OAuth2.0 client distribution packages include a number of dependencies with +separate copyright notices and license terms. Your use of the binaries for these +dependencies is subject to the terms and conditions of the following licenses. + +For the SLF4J component (http://www.slf4j.org/) +This is licensed under the MIT license +Copyright (c) 2004-2011 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For the Jettison component (http://jettison.codehaus.org/) +This is licensed under the The Apache Software License, Version 2.0, see above diff --git a/oauth-2.0/oauth2-resourceserver/src/main/assembly/NOTICE-with-deps b/oauth-2.0/oauth2-resourceserver/src/main/assembly/NOTICE-with-deps new file mode 100644 index 00000000..c64ced11 --- /dev/null +++ b/oauth-2.0/oauth2-resourceserver/src/main/assembly/NOTICE-with-deps @@ -0,0 +1,5 @@ +Apache Amber +Copyright 2010-2012 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/oauth-2.0/oauth2-resourceserver/src/main/assembly/bin.xml b/oauth-2.0/oauth2-resourceserver/src/main/assembly/bin.xml new file mode 100644 index 00000000..04b13d33 --- /dev/null +++ b/oauth-2.0/oauth2-resourceserver/src/main/assembly/bin.xml @@ -0,0 +1,61 @@ + + + + + bin + + tar.gz + zip + + true + ${project.build.finalName} + + + + ${basedir}/src/main/assembly/LICENSE-with-deps + LICENSE + / + 666 + + + ${basedir}/src/main/assembly/NOTICE-with-deps + NOTICE + / + 666 + + + ${basedir}/../../DISCLAIMER + / + 666 + + + ${basedir}/../../CHANGES + / + 666 + + + + + + true + /lib + + + + From f02dba3f49a752cdecd80afdaba29183af49cde1 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 10:17:31 +0000 Subject: [PATCH 136/583] added httpclient4 assembly packaging git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1359025 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-httpclient4/pom.xml | 13 + .../src/main/assembly/LICENSE-with-deps | 243 ++++++++++++++++++ .../src/main/assembly/NOTICE-with-deps | 5 + .../src/main/assembly/bin.xml | 61 +++++ 4 files changed, 322 insertions(+) create mode 100644 oauth-2.0/oauth2-httpclient4/src/main/assembly/LICENSE-with-deps create mode 100644 oauth-2.0/oauth2-httpclient4/src/main/assembly/NOTICE-with-deps create mode 100644 oauth-2.0/oauth2-httpclient4/src/main/assembly/bin.xml diff --git a/oauth-2.0/oauth2-httpclient4/pom.xml b/oauth-2.0/oauth2-httpclient4/pom.xml index 755d87d4..17333ed7 100644 --- a/oauth-2.0/oauth2-httpclient4/pom.xml +++ b/oauth-2.0/oauth2-httpclient4/pom.xml @@ -53,6 +53,19 @@ + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${basedir}/src/main/assembly/bin.xml + + + + diff --git a/oauth-2.0/oauth2-httpclient4/src/main/assembly/LICENSE-with-deps b/oauth-2.0/oauth2-httpclient4/src/main/assembly/LICENSE-with-deps new file mode 100644 index 00000000..cf02f4cd --- /dev/null +++ b/oauth-2.0/oauth2-httpclient4/src/main/assembly/LICENSE-with-deps @@ -0,0 +1,243 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +APACHE AMBER OAUTH 2.0 CLIENT DEPENDENCIES: + +The Apache Amber OAuth2.0 client distribution packages include a number of dependencies with +separate copyright notices and license terms. Your use of the binaries for these +dependencies is subject to the terms and conditions of the following licenses. + +For the SLF4J component (http://www.slf4j.org/) +This is licensed under the MIT license +Copyright (c) 2004-2011 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For the Jettison component (http://jettison.codehaus.org/) +This is licensed under the The Apache Software License, Version 2.0, see above + +For the Apache HttpClient components (http://hc.apache.org/) +This is licensed under the The Apache Software License, Version 2.0, see above + +For the Apache Commons-Logging component (http://commons.apache.org/logging/) +This is licensed under the The Apache Software License, Version 2.0, see above + +For the Apache Commons-Codec component (http://commons.apache.org/codec/) +This is licensed under the The Apache Software License, Version 2.0, see above diff --git a/oauth-2.0/oauth2-httpclient4/src/main/assembly/NOTICE-with-deps b/oauth-2.0/oauth2-httpclient4/src/main/assembly/NOTICE-with-deps new file mode 100644 index 00000000..c64ced11 --- /dev/null +++ b/oauth-2.0/oauth2-httpclient4/src/main/assembly/NOTICE-with-deps @@ -0,0 +1,5 @@ +Apache Amber +Copyright 2010-2012 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/oauth-2.0/oauth2-httpclient4/src/main/assembly/bin.xml b/oauth-2.0/oauth2-httpclient4/src/main/assembly/bin.xml new file mode 100644 index 00000000..04b13d33 --- /dev/null +++ b/oauth-2.0/oauth2-httpclient4/src/main/assembly/bin.xml @@ -0,0 +1,61 @@ + + + + + bin + + tar.gz + zip + + true + ${project.build.finalName} + + + + ${basedir}/src/main/assembly/LICENSE-with-deps + LICENSE + / + 666 + + + ${basedir}/src/main/assembly/NOTICE-with-deps + NOTICE + / + 666 + + + ${basedir}/../../DISCLAIMER + / + 666 + + + ${basedir}/../../CHANGES + / + 666 + + + + + + true + /lib + + + + From 3cc37ad064e5b44fde2a0a1a77de435bcaf7bafd Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 10:22:29 +0000 Subject: [PATCH 137/583] added rs-filter assembly packaging git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1359028 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-rs-filter/pom.xml | 13 + .../src/main/assembly/LICENSE-with-deps | 234 ++++++++++++++++++ .../src/main/assembly/NOTICE-with-deps | 5 + .../src/main/assembly/bin.xml | 61 +++++ 4 files changed, 313 insertions(+) create mode 100644 oauth-2.0/oauth2-rs-filter/src/main/assembly/LICENSE-with-deps create mode 100644 oauth-2.0/oauth2-rs-filter/src/main/assembly/NOTICE-with-deps create mode 100644 oauth-2.0/oauth2-rs-filter/src/main/assembly/bin.xml diff --git a/oauth-2.0/oauth2-rs-filter/pom.xml b/oauth-2.0/oauth2-rs-filter/pom.xml index 9131d4f3..4fe74fb3 100644 --- a/oauth-2.0/oauth2-rs-filter/pom.xml +++ b/oauth-2.0/oauth2-rs-filter/pom.xml @@ -55,6 +55,19 @@ + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + ${basedir}/src/main/assembly/bin.xml + + + + diff --git a/oauth-2.0/oauth2-rs-filter/src/main/assembly/LICENSE-with-deps b/oauth-2.0/oauth2-rs-filter/src/main/assembly/LICENSE-with-deps new file mode 100644 index 00000000..c2622deb --- /dev/null +++ b/oauth-2.0/oauth2-rs-filter/src/main/assembly/LICENSE-with-deps @@ -0,0 +1,234 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +APACHE AMBER OAUTH 2.0 CLIENT DEPENDENCIES: + +The Apache Amber OAuth2.0 client distribution packages include a number of dependencies with +separate copyright notices and license terms. Your use of the binaries for these +dependencies is subject to the terms and conditions of the following licenses. + +For the SLF4J component (http://www.slf4j.org/) +This is licensed under the MIT license +Copyright (c) 2004-2011 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For the Jettison component (http://jettison.codehaus.org/) +This is licensed under the The Apache Software License, Version 2.0, see above diff --git a/oauth-2.0/oauth2-rs-filter/src/main/assembly/NOTICE-with-deps b/oauth-2.0/oauth2-rs-filter/src/main/assembly/NOTICE-with-deps new file mode 100644 index 00000000..c64ced11 --- /dev/null +++ b/oauth-2.0/oauth2-rs-filter/src/main/assembly/NOTICE-with-deps @@ -0,0 +1,5 @@ +Apache Amber +Copyright 2010-2012 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/oauth-2.0/oauth2-rs-filter/src/main/assembly/bin.xml b/oauth-2.0/oauth2-rs-filter/src/main/assembly/bin.xml new file mode 100644 index 00000000..04b13d33 --- /dev/null +++ b/oauth-2.0/oauth2-rs-filter/src/main/assembly/bin.xml @@ -0,0 +1,61 @@ + + + + + bin + + tar.gz + zip + + true + ${project.build.finalName} + + + + ${basedir}/src/main/assembly/LICENSE-with-deps + LICENSE + / + 666 + + + ${basedir}/src/main/assembly/NOTICE-with-deps + NOTICE + / + 666 + + + ${basedir}/../../DISCLAIMER + / + 666 + + + ${basedir}/../../CHANGES + / + 666 + + + + + + true + /lib + + + + From 4c1068bb72f446c3d8c4bed9e10e56230e6ecfec Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 10:37:49 +0000 Subject: [PATCH 138/583] added war plugin to build the target war that will be redistributed better resources inclusions in war assembly added client-demo assembly packaging git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1359036 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/oauth2-client-demo/pom.xml | 68 +++-- .../src/main/assembly/LICENSE-with-deps | 234 ++++++++++++++++++ .../src/main/assembly/NOTICE-with-deps | 5 + .../src/main/assembly/bin.xml | 64 +++++ .../src/main/assembly/prepare-war-legals.xml | 42 ++++ 5 files changed, 397 insertions(+), 16 deletions(-) create mode 100644 oauth-2.0/oauth2-client-demo/src/main/assembly/LICENSE-with-deps create mode 100644 oauth-2.0/oauth2-client-demo/src/main/assembly/NOTICE-with-deps create mode 100644 oauth-2.0/oauth2-client-demo/src/main/assembly/bin.xml create mode 100644 oauth-2.0/oauth2-client-demo/src/main/assembly/prepare-war-legals.xml diff --git a/oauth-2.0/oauth2-client-demo/pom.xml b/oauth-2.0/oauth2-client-demo/pom.xml index 92e776fa..7e6cd10c 100644 --- a/oauth-2.0/oauth2-client-demo/pom.xml +++ b/oauth-2.0/oauth2-client-demo/pom.xml @@ -101,23 +101,59 @@ - - - ${basedir}/src/main/resources - - - - ${basedir}../../ - META-INF - - LICENSE - NOTICE - DISCLAIMER - - - - + + org.apache.maven.plugins + maven-war-plugin + 2.2 + + + + ${basedir}/src/main/resources/ + + + ${basedir}/../../ + /META-INF + + DISCLAIMER + + + + ${project.build.directory}/war-legals/ + /META-INF + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + prepare-package + prepare-package + + single + + + false + war-legals + false + + ${basedir}/src/main/assembly/prepare-war-legals.xml + + + + + + + ${basedir}/src/main/assembly/bin.xml + + + + org.mortbay.jetty maven-jetty-plugin diff --git a/oauth-2.0/oauth2-client-demo/src/main/assembly/LICENSE-with-deps b/oauth-2.0/oauth2-client-demo/src/main/assembly/LICENSE-with-deps new file mode 100644 index 00000000..c2622deb --- /dev/null +++ b/oauth-2.0/oauth2-client-demo/src/main/assembly/LICENSE-with-deps @@ -0,0 +1,234 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +APACHE AMBER OAUTH 2.0 CLIENT DEPENDENCIES: + +The Apache Amber OAuth2.0 client distribution packages include a number of dependencies with +separate copyright notices and license terms. Your use of the binaries for these +dependencies is subject to the terms and conditions of the following licenses. + +For the SLF4J component (http://www.slf4j.org/) +This is licensed under the MIT license +Copyright (c) 2004-2011 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For the Jettison component (http://jettison.codehaus.org/) +This is licensed under the The Apache Software License, Version 2.0, see above diff --git a/oauth-2.0/oauth2-client-demo/src/main/assembly/NOTICE-with-deps b/oauth-2.0/oauth2-client-demo/src/main/assembly/NOTICE-with-deps new file mode 100644 index 00000000..c64ced11 --- /dev/null +++ b/oauth-2.0/oauth2-client-demo/src/main/assembly/NOTICE-with-deps @@ -0,0 +1,5 @@ +Apache Amber +Copyright 2010-2012 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/oauth-2.0/oauth2-client-demo/src/main/assembly/bin.xml b/oauth-2.0/oauth2-client-demo/src/main/assembly/bin.xml new file mode 100644 index 00000000..74fba334 --- /dev/null +++ b/oauth-2.0/oauth2-client-demo/src/main/assembly/bin.xml @@ -0,0 +1,64 @@ + + + + + bin + + tar.gz + zip + + true + ${project.build.finalName} + + + + ${basedir}/src/main/assembly/LICENSE-with-deps + LICENSE + / + 666 + + + ${basedir}/src/main/assembly/NOTICE-with-deps + NOTICE + / + 666 + + + ${basedir}/../../DISCLAIMER + / + 666 + + + ${basedir}/../../CHANGES + / + 666 + + + + + + true + /lib + + ${project.groupId}:${project.artifactId} + + + + + diff --git a/oauth-2.0/oauth2-client-demo/src/main/assembly/prepare-war-legals.xml b/oauth-2.0/oauth2-client-demo/src/main/assembly/prepare-war-legals.xml new file mode 100644 index 00000000..455ec369 --- /dev/null +++ b/oauth-2.0/oauth2-client-demo/src/main/assembly/prepare-war-legals.xml @@ -0,0 +1,42 @@ + + + + + prepare-war-legals + + dir + + false + + + + ${basedir}/src/main/assembly/LICENSE-with-deps + LICENSE + / + 666 + + + ${basedir}/src/main/assembly/NOTICE-with-deps + NOTICE + / + 666 + + + + From 56bdeb90b761195637e9fbd8a2ca897bb17f321e Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 10:46:53 +0000 Subject: [PATCH 139/583] fixed assemblies base directory git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1359046 13f79535-47bb-0310-9956-ffa450edef68 --- sources-dist/src/main/assembly/src.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources-dist/src/main/assembly/src.xml b/sources-dist/src/main/assembly/src.xml index ebf7c640..8338def3 100644 --- a/sources-dist/src/main/assembly/src.xml +++ b/sources-dist/src/main/assembly/src.xml @@ -24,7 +24,7 @@ zip true - ${assembly.finalName}-src + ${project.build.finalName} - + 4.0.0 org.apache.amber amber-oauth2-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating amber-oauth2-client-demo diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 06faaa8a..ceb0ebcc 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -15,14 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 amber-oauth2-parent org.apache.amber - 0.22-incubating-SNAPSHOT + 0.22-incubating amber-oauth2-client diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index f7e3a236..2063a5db 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -15,14 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.amber amber-oauth2-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating amber-oauth2-common diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index 10a1ca6e..8bcdb810 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -15,14 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.amber amber-oauth2-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating amber-oauth2-dynamicreg-client diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index 9bccfb42..7746ba90 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating amber-oauth2-dynamicreg-common diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index 47542577..0fbb15a4 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -15,14 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.amber amber-oauth2-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating amber-oauth2-dynamicreg-server diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index 17333ed7..a8c041e0 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -20,7 +20,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating amber-oauth2-httpclient4 diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index 3c168eff..c0fec504 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating Apache Amber: OAuth 2.0 Implementation - Integration Tests diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 7d870fbb..6365ddf5 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -15,14 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.amber amber-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating amber-oauth2-parent diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index 190a1a6e..e766de05 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -15,14 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.amber amber-oauth2-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating amber-oauth2-resourceserver-filter diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index f3e6c6bb..f92c22bf 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating amber-oauth2-resourceserver diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index 3a6b191a..dae34728 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -1,54 +1,53 @@ - - - - 4.0.0 - - - org.apache.amber - amber-oauth2-parent - 0.22-incubating-SNAPSHOT - - - amber-oauth2-test-utils - - Apache Amber: OAuth 2.0 Implementation - Test Utils - - - - org.springframework - spring-core - ${org.springframework.version} - - - - - - - ${basedir}../../ - META-INF - - LICENSE - NOTICE - DISCLAIMER - - - - - - + + + + 4.0.0 + + + org.apache.amber + amber-oauth2-parent + 0.22-incubating + + + amber-oauth2-test-utils + + Apache Amber: OAuth 2.0 Implementation - Test Utils + + + + org.springframework + spring-core + ${org.springframework.version} + + + + + + + ${basedir}../../ + META-INF + + LICENSE + NOTICE + DISCLAIMER + + + + + + diff --git a/pom.xml b/pom.xml index 16619e64..6080f26d 100644 --- a/pom.xml +++ b/pom.xml @@ -15,8 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 @@ -27,7 +26,7 @@ org.apache.amber amber-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating pom Apache Amber @@ -234,9 +233,9 @@ - scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ - scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ - https://svn.apache.org/repos/asf/incubator/amber/trunk/ + scm:svn:https://svn.apache.org/repos/asf/incubator/amber/tags/amber-0.22-incubating + scm:svn:https://svn.apache.org/repos/asf/incubator/amber/tags/amber-0.22-incubating + https://svn.apache.org/repos/asf/incubator/amber/tags/amber-0.22-incubating JIRA diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index be801b03..aad033e8 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.22-incubating-SNAPSHOT + 0.22-incubating ../ From 245d55c33db9bba8a727ad9396e7c5e6b28e2fde Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 9 Jul 2012 13:34:01 +0000 Subject: [PATCH 170/583] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1359166 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/authzserver/pom.xml | 2 +- oauth-2.0/client-demo/pom.xml | 2 +- oauth-2.0/client/pom.xml | 2 +- oauth-2.0/common/pom.xml | 2 +- oauth-2.0/dynamicreg-client/pom.xml | 2 +- oauth-2.0/dynamicreg-common/pom.xml | 2 +- oauth-2.0/dynamicreg-server/pom.xml | 2 +- oauth-2.0/httpclient4/pom.xml | 2 +- oauth-2.0/integration-tests/pom.xml | 2 +- oauth-2.0/pom.xml | 2 +- oauth-2.0/resourceserver-filter/pom.xml | 2 +- oauth-2.0/resourceserver/pom.xml | 2 +- oauth-2.0/test-utils/pom.xml | 2 +- pom.xml | 8 ++++---- sources-dist/pom.xml | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index abc1776f..fcc2f5c1 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-authzserver diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index d6697dbe..cfcb147d 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-client-demo diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index ceb0ebcc..7b87168e 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -21,7 +21,7 @@ amber-oauth2-parent org.apache.amber - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-client diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index 2063a5db..14aa30fb 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-common diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index 8bcdb810..9b9936ff 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-dynamicreg-client diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index 7746ba90..10993b24 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-dynamicreg-common diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index 0fbb15a4..895c035e 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-dynamicreg-server diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index a8c041e0..9eb38a0e 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -20,7 +20,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-httpclient4 diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index c0fec504..4a950be1 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT Apache Amber: OAuth 2.0 Implementation - Integration Tests diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 6365ddf5..ed961646 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-parent diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index e766de05..4eebdda7 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-resourceserver-filter diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index f92c22bf..d0a62728 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-resourceserver diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index dae34728..b2c31414 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT amber-oauth2-test-utils diff --git a/pom.xml b/pom.xml index 6080f26d..7c917b57 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.amber amber-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT pom Apache Amber @@ -233,9 +233,9 @@ - scm:svn:https://svn.apache.org/repos/asf/incubator/amber/tags/amber-0.22-incubating - scm:svn:https://svn.apache.org/repos/asf/incubator/amber/tags/amber-0.22-incubating - https://svn.apache.org/repos/asf/incubator/amber/tags/amber-0.22-incubating + scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ + scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ + https://svn.apache.org/repos/asf/incubator/amber/trunk/ JIRA diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index aad033e8..c1ce7f64 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.22-incubating + 0.23-incubating-SNAPSHOT ../ From 48fc83b8349782e893746fa55e0f6f3d78ab2883 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 25 Jul 2012 06:56:18 +0000 Subject: [PATCH 171/583] typo, thanks Jason Millard git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1365469 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/xdoc/download.xml.vm | 98 +++++++++++++++++------------------ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index 8b304a15..0afa9c2b 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -34,7 +34,7 @@

    In order to guard against corrupted downloads/installations, it is highly recommended to verify the signature - of the release bundles against the public KEYS used by the Apache Amber + of the release bundles against the public KEYS used by the Apache Amber developers.

    Apache Amber is distributed under the Apache License, version 2.0.

    @@ -54,15 +54,15 @@ Apache Amber ${project.version} (Source tar.gz) - amber-sources-${project.version}.tar.gz - amber-sources-${project.version}.tar.gz.md5 - amber-sources-${project.version}.tar.gz.asc + amber-sources-${project.version}.tar.gz + amber-sources-${project.version}.tar.gz.md5 + amber-sources-${project.version}.tar.gz.asc Apache Amber ${project.version} (Source zip) - amber-sources-${project.version}.zip - amber-sources-${project.version}.zip.md5 - amber-sources-${project.version}.zip.asc + amber-sources-${project.version}.zip + amber-sources-${project.version}.zip.md5 + amber-sources-${project.version}.zip.asc @@ -83,39 +83,39 @@ Apache Amber Client ${project.version} (Source tar.gz) - amber-oauth2-client-${project.version}.tar.gz - amber-oauth2-client-${project.version}.tar.gz.md5 - amber-oauth2-client-${project.version}.tar.gz.asc + amber-oauth2-client-${project.version}.tar.gz + amber-oauth2-client-${project.version}.tar.gz.md5 + amber-oauth2-client-${project.version}.tar.gz.asc Apache Amber Client ${project.version} (Source zip) - amber-oauth2-client-${project.version}.zip - amber-oauth2-client-${project.version}.zip.md5 - amber-oauth2-client-${project.version}.zip.asc + amber-oauth2-client-${project.version}.zip + amber-oauth2-client-${project.version}.zip.md5 + amber-oauth2-client-${project.version}.zip.asc Apache Amber Dynamic Registration Client ${project.version} (Source tar.gz) - amber-oauth2-dynamicreg-client-${project.version}.tar.gz - amber-oauth2-dynamicreg-client-${project.version}.tar.gz.md5 - amber-oauth2-dynamicreg-client-${project.version}.tar.gz.asc + amber-oauth2-dynamicreg-client-${project.version}.tar.gz + amber-oauth2-dynamicreg-client-${project.version}.tar.gz.md5 + amber-oauth2-dynamicreg-client-${project.version}.tar.gz.asc Apache Amber Dynamic Registration Client ${project.version} (Source zip) - amber-oauth2-dynamicreg-client-${project.version}.zip - amber-oauth2-dynamicreg-client-${project.version}.zip.md5 - amber-oauth2-dynamicreg-client-${project.version}.zip.asc + amber-oauth2-dynamicreg-client-${project.version}.zip + amber-oauth2-dynamicreg-client-${project.version}.zip.md5 + amber-oauth2-dynamicreg-client-${project.version}.zip.asc Apache Amber HttpClient integration ${project.version} (Source tar.gz) - amber-oauth2-httpclient4-${project.version}.tar.gz - amber-oauth2-httpclient4-${project.version}.tar.gz.md5 - amber-oauth2-httpclient4-${project.version}.tar.gz.asc + amber-oauth2-httpclient4-${project.version}.tar.gz + amber-oauth2-httpclient4-${project.version}.tar.gz.md5 + amber-oauth2-httpclient4-${project.version}.tar.gz.asc Apache Amber HttpClient integration Client ${project.version} (Source zip) - amber-oauth2-httpclient4-${project.version}.zip - amber-oauth2-httpclient4-${project.version}.zip.md5 - amber-oauth2-httpclient4-${project.version}.zip.asc + amber-oauth2-httpclient4-${project.version}.zip + amber-oauth2-httpclient4-${project.version}.zip.md5 + amber-oauth2-httpclient4-${project.version}.zip.asc @@ -134,39 +134,39 @@ Apache Amber Authorization Server ${project.version} (Source tar.gz) - amber-oauth2-authzserver-${project.version}.tar.gz - amber-oauth2-authzserver-${project.version}.tar.gz.md5 - amber-oauth2-authzserver-${project.version}.tar.gz.asc + amber-oauth2-authzserver-${project.version}.tar.gz + amber-oauth2-authzserver-${project.version}.tar.gz.md5 + amber-oauth2-authzserver-${project.version}.tar.gz.asc Apache Amber Authorization Server ${project.version} (Source zip) - amber-oauth2-authzserver-${project.version}.zip - amber-oauth2-authzserver-${project.version}.zip.md5 - amber-oauth2-authzserver-${project.version}.zip.asc + amber-oauth2-authzserver-${project.version}.zip + amber-oauth2-authzserver-${project.version}.zip.md5 + amber-oauth2-authzserver-${project.version}.zip.asc Apache Amber Resource Server ${project.version} (Source tar.gz) - amber-oauth2-resourceserver-${project.version}.tar.gz - amber-oauth2-resourceserver-${project.version}.tar.gz.md5 - amber-oauth2-resourceserver-${project.version}.tar.gz.asc + amber-oauth2-resourceserver-${project.version}.tar.gz + amber-oauth2-resourceserver-${project.version}.tar.gz.md5 + amber-oauth2-resourceserver-${project.version}.tar.gz.asc Apache Amber Resource Server ${project.version} (Source zip) - amber-oauth2-resourceserver-${project.version}.zip - amber-oauth2-resourceserver-${project.version}.zip.md5 - amber-oauth2-resourceserver-${project.version}.zip.asc + amber-oauth2-resourceserver-${project.version}.zip + amber-oauth2-resourceserver-${project.version}.zip.md5 + amber-oauth2-resourceserver-${project.version}.zip.asc Apache Amber Resource Server ${project.version} (Source tar.gz) - amber-oauth2-resourceserver-filter-${project.version}.tar.gz - amber-oauth2-resourceserver-filter-${project.version}.tar.gz.md5 - amber-oauth2-resourceserver-filter-${project.version}.tar.gz.asc + amber-oauth2-resourceserver-filter-${project.version}.tar.gz + amber-oauth2-resourceserver-filter-${project.version}.tar.gz.md5 + amber-oauth2-resourceserver-filter-${project.version}.tar.gz.asc Apache Amber Resource Server ${project.version} (Source zip) - amber-oauth2-resourceserver-filter-${project.version}.zip - amber-oauth2-resourceserver-filter-${project.version}.zip.md5 - amber-oauth2-resourceserver-filter-${project.version}.zip.asc + amber-oauth2-resourceserver-filter-${project.version}.zip + amber-oauth2-resourceserver-filter-${project.version}.zip.md5 + amber-oauth2-resourceserver-filter-${project.version}.zip.asc @@ -185,15 +185,15 @@ Apache Amber Client Demo ${project.version} (Source tar.gz) - amber-oauth2-client-demo-${project.version}.tar.gz - amber-oauth2-client-demo-${project.version}.tar.gz.md5 - amber-oauth2-client-demo-${project.version}.tar.gz.asc + amber-oauth2-client-demo-${project.version}.tar.gz + amber-oauth2-client-demo-${project.version}.tar.gz.md5 + amber-oauth2-client-demo-${project.version}.tar.gz.asc Apache Amber Client Demo ${project.version} (Source zip) - amber-oauth2-client-demo-${project.version}.zip - amber-oauth2-client-demo-${project.version}.zip.md5 - amber-oauth2-client-demo-${project.version}.zip.asc + amber-oauth2-client-demo-${project.version}.zip + amber-oauth2-client-demo-${project.version}.zip.md5 + amber-oauth2-client-demo-${project.version}.zip.asc From f9a3c771d61fca7db3eb167983b566ccb2c60086 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Thu, 2 Aug 2012 13:48:17 +0000 Subject: [PATCH 172/583] change the pom version in order to be aligned with the latest version of OAuth 2 spec we aim for git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1368473 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/authzserver/pom.xml | 2 +- oauth-2.0/client-demo/pom.xml | 2 +- oauth-2.0/client/pom.xml | 2 +- oauth-2.0/common/pom.xml | 2 +- oauth-2.0/dynamicreg-client/pom.xml | 2 +- oauth-2.0/dynamicreg-common/pom.xml | 2 +- oauth-2.0/dynamicreg-server/pom.xml | 2 +- oauth-2.0/httpclient4/pom.xml | 2 +- oauth-2.0/integration-tests/pom.xml | 2 +- oauth-2.0/pom.xml | 2 +- oauth-2.0/resourceserver-filter/pom.xml | 2 +- oauth-2.0/resourceserver/pom.xml | 2 +- oauth-2.0/test-utils/pom.xml | 2 +- pom.xml | 2 +- sources-dist/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index fcc2f5c1..1bf43d22 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-authzserver diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index cfcb147d..0b9ff87e 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-client-demo diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 7b87168e..6ace9e99 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -21,7 +21,7 @@ amber-oauth2-parent org.apache.amber - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-client diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index 14aa30fb..c13f988e 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-common diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index 9b9936ff..2f71e1fc 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-dynamicreg-client diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index 10993b24..98b87b03 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-dynamicreg-common diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index 895c035e..cc9627cb 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-dynamicreg-server diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index 9eb38a0e..581f7dd3 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -20,7 +20,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-httpclient4 diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index 4a950be1..06b4a1c4 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT Apache Amber: OAuth 2.0 Implementation - Integration Tests diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index ed961646..925d231f 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-parent diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index 4eebdda7..46e1ed55 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-resourceserver-filter diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index d0a62728..b3f9d200 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-resourceserver diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index b2c31414..62e7e7d0 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT amber-oauth2-test-utils diff --git a/pom.xml b/pom.xml index 7c917b57..877a1b73 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.amber amber-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT pom Apache Amber diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index c1ce7f64..dc1e8ddd 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.23-incubating-SNAPSHOT + 0.31-incubating-SNAPSHOT ../ From 6b19d59604f7794f9480d2ea8aaf54d83f8307e5 Mon Sep 17 00:00:00 2001 From: Lukasz Moren Date: Thu, 6 Sep 2012 13:48:11 +0000 Subject: [PATCH 173/583] NullPointerException in the OAuth2 client demo git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1381601 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/amber/oauth2/client/demo/model/OAuthParams.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java index 1d606317..1343ad86 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java @@ -36,7 +36,7 @@ public class OAuthParams { private String tokenEndpoint; private String authzCode; private String accessToken; - private long expiresIn; + private Long expiresIn; private String refreshToken; private String scope; private String resourceUrl; @@ -109,7 +109,7 @@ public void setAccessToken(String accessToken) { this.accessToken = accessToken; } - public long getExpiresIn() { + public Long getExpiresIn() { return expiresIn; } @@ -117,7 +117,7 @@ public void setExpiresIn(String expiresIn) { this.expiresIn = Long.parseLong(expiresIn); } - public void setExpiresIn(long expiresIn) { + public void setExpiresIn(Long expiresIn) { this.expiresIn = expiresIn; } From 6837603eb218568c1bc8ca7f231f987bb9b7e2b7 Mon Sep 17 00:00:00 2001 From: Zhaohui Feng Date: Fri, 14 Sep 2012 15:36:13 +0000 Subject: [PATCH 174/583] Fix for https://issues.apache.org/jira/browse/AMBER-60 git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1384824 13f79535-47bb-0310-9956-ffa450edef68 --- .../amber/oauth2/as/issuer/MD5Generator.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java b/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java index 78e97054..345a9430 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java @@ -40,6 +40,20 @@ public String generateValue() throws OAuthSystemException { return generateValue(UUID.randomUUID().toString()); } + private static final char[] hexCode = "0123456789abcdef".toCharArray(); + + public static String toHexString(byte[] data) { + if(data == null) { + return null; + } + StringBuilder r = new StringBuilder(data.length*2); + for ( byte b : data) { + r.append(hexCode[(b >> 4) & 0xF]); + r.append(hexCode[(b & 0xF)]); + } + return r.toString(); + } + @Override public String generateValue(String param) throws OAuthSystemException { try { @@ -47,12 +61,7 @@ public String generateValue(String param) throws OAuthSystemException { algorithm.reset(); algorithm.update(param.getBytes()); byte[] messageDigest = algorithm.digest(); - StringBuffer hexString = new StringBuffer(); - for (int i = 0; i < messageDigest.length; i++) { - hexString.append(Integer.toHexString(0xFF & messageDigest[i])); - } - - return hexString.toString(); + return toHexString(messageDigest); } catch (Exception e) { throw new OAuthSystemException("OAuth Token cannot be generated.", e); } From 4eaa72272ea556ced9ecd3cbee754ad9f513d091 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Thu, 18 Oct 2012 17:48:59 +0000 Subject: [PATCH 175/583] AMBER-62 - Add Extra fields to OAuthProblemException for easier spec compliant error handling. Thanks Stein Welberg for the patch!! git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1399748 13f79535-47bb-0310-9956-ffa450edef68 --- .../common/exception/OAuthProblemException.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java b/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java index 3a790a93..db81dfe2 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java +++ b/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java @@ -40,6 +40,8 @@ public final class OAuthProblemException extends Exception { private String scope; private String redirectUri; + private int responseStatus; + private Map parameters = new HashMap(); private OAuthProblemException(String error) { @@ -81,6 +83,11 @@ public OAuthProblemException scope(String scope) { return this; } + public OAuthProblemException responseStatus(int responseStatus) { + this.responseStatus = responseStatus; + return this; + } + public OAuthProblemException setParameter(String name, String value) { parameters.put(name, value); return this; @@ -106,6 +113,10 @@ public String getScope() { return scope; } + public int getResponseStatus() { + return responseStatus == 0 ? 400 : responseStatus; + } + public String get(String name) { return parameters.get(name); } From 477c4fd1fe96d72b741fb63cb11103fb319fcb8c Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Thu, 29 Nov 2012 11:55:23 +0000 Subject: [PATCH 176/583] AMBER-61 - Client defined HTTP headers in OAuthClientRequest git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1415134 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/amber/oauth2/client/URLConnectionClient.java | 6 ++++++ .../amber/oauth2/client/request/OAuthClientRequest.java | 1 + .../org/apache/amber/oauth2/httpclient4/HttpClient4.java | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java index 55f85f5b..ba008b86 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java +++ b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java @@ -71,6 +71,12 @@ public T execute(OAuthClientRequest request, Map httpURLConnection.addRequestProperty(header.getKey(), header.getValue()); } } + + if (request.getHeaders() != null) { + for (Map.Entry header : request.getHeaders().entrySet()) { + httpURLConnection.addRequestProperty(header.getKey(), header.getValue()); + } + } if (!OAuthUtils.isEmpty(requestMethod)) { httpURLConnection.setRequestMethod(requestMethod); diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java index e498cf2d..6befd370 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java +++ b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java @@ -48,6 +48,7 @@ public class OAuthClientRequest implements OAuthMessage { protected OAuthClientRequest(String url) { this.url = url; + this.headers=new HashMap(); } public static AuthenticationRequestBuilder authorizationLocation(String url) { diff --git a/oauth-2.0/httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java b/oauth-2.0/httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java index c1bdd651..d40df1f7 100644 --- a/oauth-2.0/httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java +++ b/oauth-2.0/httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java @@ -95,6 +95,11 @@ public T execute(OAuthClientRequest request, req.setHeader(header.getKey(), header.getValue()); } } + if (request.getHeaders() != null) { + for (Map.Entry header : request.getHeaders().entrySet()) { + req.setHeader(header.getKey(), header.getValue()); + } + } HttpResponse response = client.execute(req); Header contentTypeHeader = null; HttpEntity entity = response.getEntity(); From e0b2e9911129e1c786c79e474b571d4a272df914 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 6 Dec 2012 15:14:03 +0000 Subject: [PATCH 177/583] fluido skin version upgrade git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1417933 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/site.xml b/src/site/site.xml index 0f23a249..af003d96 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -34,7 +34,7 @@ org.apache.maven.skins maven-fluido-skin - 1.2.1 + 1.3.0 From 09dfe54f64efedbd7e451df436219d5c5bb88040 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 13 Dec 2012 22:41:50 +0000 Subject: [PATCH 178/583] started plugging the scm-plugin to automate manual operations git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1421589 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 877a1b73..2962f3fc 100644 --- a/pom.xml +++ b/pom.xml @@ -255,6 +255,12 @@ + + + apache.website + ${amber.siteUrlDeployment} + + UTF-8 @@ -267,15 +273,11 @@ - svn:https://svn.apache.org/repos/asf/incubator/amber/site + ${user.home}/amber-site/ + file://${amber.siteFilePath} + ${user.home}/amber-site/ false @@ -417,6 +419,19 @@ -Prelease,apache     + + + org.apache.maven.plugins + maven-scm-publish-plugin + 1.0-beta-2 + + true + ${amber.scmPubCheckoutDirectory} + scm:svn:https://svn.apache.org/repos/asf/incubator/amber/site + Apache Amber site deployment + ${amber.siteFilePath} + +     From 339024533a6f7c8373d070d2fb181a01284ac30a Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 13 Dec 2012 22:42:48 +0000 Subject: [PATCH 179/583] updated maven-project-info-reports-plugin version git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1421590 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2962f3fc..7f03b0e1 100644 --- a/pom.xml +++ b/pom.xml @@ -736,7 +736,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.4 + 2.6 false false From d7356f9034ae8f36f9a17ecd5098aaa4a6dfcff3 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 13 Dec 2012 22:48:42 +0000 Subject: [PATCH 180/583] added Raymond in the committers list git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1421596 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 7f03b0e1..7af8490f 100644 --- a/pom.xml +++ b/pom.xml @@ -155,6 +155,17 @@ +1 + + rfeng + Raymond Zhaohui Feng + rfeng[at]apache[dot]org + + PPMC Member + Mentor + Committer + + + tommaso Tommaso Teofili From 11f378594c7f1c6c5345907407d02d0871793cc5 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 13 Dec 2012 22:53:21 +0000 Subject: [PATCH 181/583] site profile already exist, so - dropped useless site distribution management; - modified new properties name with old naming, it warranties site-deployment backward compatibility git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1421599 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 7af8490f..f170a962 100644 --- a/pom.xml +++ b/pom.xml @@ -266,12 +266,6 @@ - - - apache.website - ${amber.siteUrlDeployment} - - UTF-8 @@ -286,9 +280,9 @@ | | mvn clean site-deploy scm-publish:publish-scm -Dusername=uid -Dpassword=pwd --> - ${user.home}/amber-site/ - file://${amber.siteFilePath} - ${user.home}/amber-site/ + ${user.home}/amber-site/ + file://${site.siteFilePath} + ${user.home}/amber-site/ false @@ -437,10 +431,10 @@ 1.0-beta-2 true - ${amber.scmPubCheckoutDirectory} + ${site.scmPubCheckoutDirectory} scm:svn:https://svn.apache.org/repos/asf/incubator/amber/site Apache Amber site deployment - ${amber.siteFilePath} + ${site.siteFilePath} From 22a8d3c538153d076e4469c0a604e31fd30d7e56 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Wed, 9 Jan 2013 09:28:23 +0000 Subject: [PATCH 182/583] AMBER-68 - Add integration with Google OAuth 2.0 for Web Server Applications to client-demo webapp git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1430745 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/amber/oauth2/client/demo/Utils.java | 4 ++++ .../amber/oauth2/client/demo/controller/MainController.java | 4 ++++ .../oauth2/client/demo/controller/TokenController.java | 6 +++--- .../client-demo/src/main/webapp/WEB-INF/views/index.jsp | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java index 0eb2d634..6f737cf0 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java @@ -46,6 +46,10 @@ private Utils() { public static final String FACEBOOK = "facebook"; public static final String FACEBOOK_AUTHZ = "https://graph.facebook.com/oauth/authorize"; public static final String FACEBOOK_TOKEN = "https://graph.facebook.com/oauth/access_token"; + + public static final String GOOGLE = "google"; + public static final String GOOGLE_AUTHZ = "https://accounts.google.com/o/oauth2/auth"; + public static final String GOOGLE_TOKEN = "https://accounts.google.com/o/oauth2/token"; public static final String GOWALLA = "gowalla"; public static final String GOWALLA_AUTHZ = "https://gowalla.com/api/oauth/authorize"; diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java index 9ea51c61..82034a7f 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java @@ -71,6 +71,10 @@ public ModelAndView authorize(@ModelAttribute("oauthParams") OAuthParams oauthPa selected = true; oauthParams.setAuthzEndpoint(Utils.FACEBOOK_AUTHZ); oauthParams.setTokenEndpoint(Utils.FACEBOOK_TOKEN); + }else if (Utils.GOOGLE.equals(app)) { + selected = true; + oauthParams.setAuthzEndpoint(Utils.GOOGLE_AUTHZ); + oauthParams.setTokenEndpoint(Utils.GOOGLE_TOKEN); } else if (Utils.GOWALLA.equals(app)) { selected = true; oauthParams.setAuthzEndpoint(Utils.GOWALLA_AUTHZ); diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java index 6c914f1e..67a7fae5 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java @@ -57,7 +57,7 @@ public ModelAndView authorize(@ModelAttribute("oauthParams") OAuthParams oauthPa HttpServletRequest req) throws OAuthSystemException, IOException { try { - + Utils.validateTokenParams(oauthParams); OAuthClientRequest request = OAuthClientRequest @@ -67,11 +67,11 @@ public ModelAndView authorize(@ModelAttribute("oauthParams") OAuthParams oauthPa .setRedirectURI(oauthParams.getRedirectUri()) .setCode(oauthParams.getAuthzCode()) .setGrantType(GrantType.AUTHORIZATION_CODE) - .buildQueryMessage(); + .buildBodyMessage(); OAuthClient client = new OAuthClient(new URLConnectionClient()); String app = Utils.findCookieValue(req, "app"); - + OAuthAccessTokenResponse oauthResponse = null; Class cl = OAuthJSONAccessTokenResponse.class; diff --git a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp index e8186b44..7b046441 100644 --- a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp +++ b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp @@ -40,6 +40,7 @@ Smart Gallery Facebook +Google Github Gowalla From e59146324f3f2fe4a6d4b7e9e7c306c1b429a703 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Thu, 10 Jan 2013 13:12:08 +0000 Subject: [PATCH 183/583] AMBER-58 - Add generic flow to client-demo webapp git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1431333 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/amber/oauth2/client/demo/Utils.java | 2 ++ .../amber/oauth2/client/demo/controller/MainController.java | 4 +++- oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java index 6f737cf0..0dafe385 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java @@ -43,6 +43,8 @@ private Utils() { public static final String REG_TYPE_PULL = "pull"; public static final String REG_TYPE_PUSH = "push"; + public static final String GENERIC = "generic"; + public static final String FACEBOOK = "facebook"; public static final String FACEBOOK_AUTHZ = "https://graph.facebook.com/oauth/authorize"; public static final String FACEBOOK_TOKEN = "https://graph.facebook.com/oauth/access_token"; diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java index 82034a7f..b6cd3641 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java @@ -62,7 +62,9 @@ public ModelAndView authorize(@ModelAttribute("oauthParams") OAuthParams oauthPa throws OAuthSystemException, IOException { boolean selected = false; - if (Utils.GITHUB.equals(app)) { + if (Utils.GENERIC.equals(app)) { + selected = true; + }else if (Utils.GITHUB.equals(app)) { selected = true; oauthParams.setAuthzEndpoint(Utils.GITHUB_AUTHZ); oauthParams.setTokenEndpoint(Utils.GITHUB_TOKEN); diff --git a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp index 7b046441..2fe3440e 100644 --- a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp +++ b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp @@ -38,6 +38,7 @@

    Choose Application

    +Generic OAuth2 Application Smart Gallery Facebook Google From 408b6407b0613ac17504d5a132a6db82e31d0e60 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Fri, 11 Jan 2013 15:27:55 +0000 Subject: [PATCH 184/583] AMBER-64 - QueryParameterApplier needs to include the scope parameter in the fragment git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1432090 13f79535-47bb-0310-9956-ffa450edef68 --- .../parameters/QueryParameterApplier.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java b/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java index f39e71e3..650af72a 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java +++ b/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.message.OAuthMessage; import org.apache.amber.oauth2.common.utils.OAuthUtils; @@ -60,6 +61,22 @@ public OAuthMessage applyOAuthParameters(OAuthMessage message, Map1){ + url.append("#").append(fragmentQuery); + }else{ + if (containsQuestionMark) { + url.append("&").append(fragmentQuery); + } else { + url.append("?").append(fragmentQuery); + } + } } message.setLocationUri(url.toString()); From c0eccac4617e40df3869bce1a8683f8f125090fa Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Mon, 14 Jan 2013 12:25:53 +0000 Subject: [PATCH 185/583] AMBER-69 - Client code generates wrong header for Bearer Token git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1432899 13f79535-47bb-0310-9956-ffa450edef68 --- .../request/ClientHeaderParametersApplier.java | 2 +- .../amber/oauth2/common/utils/OAuthUtils.java | 18 +++++++++++++++++- .../oauth2/common/utils/OAuthUtilsTest.java | 17 +++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java index eeb96c52..b176d325 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java +++ b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java @@ -39,7 +39,7 @@ public class ClientHeaderParametersApplier implements OAuthParametersApplier { public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) throws OAuthSystemException { - String header = OAuthUtils.encodeOAuthHeader(params); + String header = OAuthUtils.encodeAuthorizationBearerHeader(params); message.addHeader(OAuth.HeaderType.AUTHORIZATION, header); return message; diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java b/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java index 87f13151..b56f584a 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java +++ b/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java @@ -364,7 +364,7 @@ public static Map decodeOAuthHeader(String header) { // todo: implement method to decode header form (with no challenge) /** - * Construct a WWW-Authenticate or Authorization header with the OAuth challenge/credentials + * Construct a WWW-Authenticate header */ public static String encodeOAuthHeader(Map entries) { StringBuffer sb = new StringBuffer(); @@ -381,6 +381,22 @@ public static String encodeOAuthHeader(Map entries) { return sb.substring(0, sb.length() - 1); } + + /** + * Construct an Authorization Bearer header + */ + public static String encodeAuthorizationBearerHeader(Map entries) { + StringBuffer sb = new StringBuffer(); + sb.append(OAuth.OAUTH_HEADER_NAME).append(" "); + for (Map.Entry entry : entries.entrySet()) { + String value = entry.getValue() == null? null: String.valueOf(entry.getValue()); + if (!OAuthUtils.isEmpty(entry.getKey()) && !OAuthUtils.isEmpty(value)) { + sb.append(value); + } + } + + return sb.toString(); + } public static boolean isEmpty(String value) { return value == null || "".equals(value); diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java b/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java index 6b1c5dfe..777b5fc2 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java @@ -123,6 +123,23 @@ public void testDecodeOAuthHeader() throws Exception { @Test public void testEncodeOAuthHeader() throws Exception { + Map parameters = new HashMap(); + parameters.put("realm", "example"); + + ///rfc6750#section-3 + String header = OAuthUtils.encodeOAuthHeader(parameters); + Assert.assertEquals("Bearer realm=\"example\"", header); + + } + + @Test + public void testEncodeAuthorizationBearerHeader() throws Exception { + Map parameters = new HashMap(); + parameters.put("accessToken", "mF_9.B5f-4.1JqM"); + + //rfc6749#section-7.1 + String header = OAuthUtils.encodeAuthorizationBearerHeader(parameters); + Assert.assertEquals("Bearer mF_9.B5f-4.1JqM", header); } From 47e789c4f132be5f779f4f8729fe2c4f3a718e00 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Mon, 14 Jan 2013 12:52:52 +0000 Subject: [PATCH 186/583] AMBER-70 - Extend the client library in order to easily handle bearer token request git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1432904 13f79535-47bb-0310-9956-ffa450edef68 --- .../amber/oauth2/client/OAuthClient.java | 5 ++ .../request/OAuthBearerClientRequest.java | 33 +++++++++++ .../client/response/OAuthClientResponse.java | 2 +- .../response/OAuthResourceResponse.java | 57 +++++++++++++++++++ 4 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthBearerClientRequest.java create mode 100644 oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthResourceResponse.java diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java index 3f565f7f..28fedc8d 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java +++ b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java @@ -26,6 +26,7 @@ import org.apache.amber.oauth2.client.request.OAuthClientRequest; import org.apache.amber.oauth2.client.response.OAuthAccessTokenResponse; +import org.apache.amber.oauth2.client.response.OAuthClientResponse; import org.apache.amber.oauth2.client.response.OAuthJSONAccessTokenResponse; import org.apache.amber.oauth2.common.OAuth; import org.apache.amber.oauth2.common.exception.OAuthProblemException; @@ -75,6 +76,10 @@ public OAuthJSONAccessTokenResponse accessToken( throws OAuthSystemException, OAuthProblemException { return accessToken(request, requestMethod, OAuthJSONAccessTokenResponse.class); } + + public T resource(OAuthClientRequest request, String requestMethod,Class responseClass) throws OAuthSystemException, OAuthProblemException{ + return httpClient.execute(request, null, requestMethod, responseClass); + } public void shutdown() { httpClient.shutdown(); diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthBearerClientRequest.java b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthBearerClientRequest.java new file mode 100644 index 00000000..5a41519b --- /dev/null +++ b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthBearerClientRequest.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.amber.oauth2.client.request; + +import org.apache.amber.oauth2.client.request.OAuthClientRequest.OAuthRequestBuilder; +import org.apache.amber.oauth2.common.OAuth; + +public class OAuthBearerClientRequest extends OAuthRequestBuilder { + + public OAuthBearerClientRequest(String url) { + super(url); + } + + public OAuthBearerClientRequest setAccessToken(String accessToken) { + this.parameters.put(OAuth.OAUTH_BEARER_TOKEN, accessToken); + return this; + } + +} diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java index d2828f9b..bb1cbb44 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java +++ b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java @@ -48,7 +48,7 @@ public String getParam(String param) { protected abstract void setBody(String body) throws OAuthProblemException; - protected abstract void setContentType(String contentTypr); + protected abstract void setContentType(String contentType); protected abstract void setResponseCode(int responseCode); diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthResourceResponse.java b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthResourceResponse.java new file mode 100644 index 00000000..64325321 --- /dev/null +++ b/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthResourceResponse.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.amber.oauth2.client.response; + +import org.apache.amber.oauth2.common.exception.OAuthProblemException; + +public class OAuthResourceResponse extends OAuthClientResponse { + + public String getBody() { + return body; + } + + public int getResponseCode() { + return responseCode; + } + + public String getContentType(){ + return contentType; + } + + @Override + protected void setBody(String body) throws OAuthProblemException { + this.body = body; + } + + @Override + protected void setContentType(String contentType) { + this.contentType = contentType; + } + + @Override + protected void setResponseCode(int responseCode) { + this.responseCode = responseCode; + } + + @Override + protected void init(String body, String contentType, int responseCode) throws OAuthProblemException { + this.setBody(body); + this.setContentType(contentType); + this.setResponseCode(responseCode); + } + +} From 4bc72a13a3ba6433866f478c67c5e92df5e8d3de Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Wed, 16 Jan 2013 09:21:53 +0000 Subject: [PATCH 187/583] AMBER-73 - Update the client demo web app in order to leverage the new API in AMBER-70 git-svn-id: https://svn.apache.org/repos/asf/incubator/amber/trunk@1433867 13f79535-47bb-0310-9956-ffa450edef68 --- .../amber/oauth2/client/demo/Utils.java | 4 ++ .../demo/controller/ResourceController.java | 57 +++++++++++-------- .../oauth2/client/demo/model/OAuthParams.java | 18 ++++++ .../webapp/WEB-INF/views/get_resource.jsp | 15 +++++ 4 files changed, 70 insertions(+), 24 deletions(-) diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java index 0dafe385..34d5d554 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java @@ -42,6 +42,10 @@ private Utils() { public static final String REG_TYPE_PULL = "pull"; public static final String REG_TYPE_PUSH = "push"; + + public static final String REQUEST_TYPE_QUERY= "queryParameter"; + public static final String REQUEST_TYPE_HEADER= "headerField"; + public static final String REQUEST_TYPE_BODY= "bodyParameter"; public static final String GENERIC = "generic"; diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java index 394efa46..77fa222a 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java @@ -20,16 +20,17 @@ */ package org.apache.amber.oauth2.client.demo.controller; - -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; + import javax.servlet.http.HttpServletRequest; - +import org.apache.amber.oauth2.client.OAuthClient; +import org.apache.amber.oauth2.client.URLConnectionClient; import org.apache.amber.oauth2.client.demo.Utils; import org.apache.amber.oauth2.client.demo.model.OAuthParams; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.amber.oauth2.client.request.OAuthBearerClientRequest; +import org.apache.amber.oauth2.client.request.OAuthClientRequest; +import org.apache.amber.oauth2.client.response.OAuthResourceResponse; +import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; @@ -49,23 +50,31 @@ public ModelAndView authorize(@ModelAttribute("oauthParams") OAuthParams oauthPa HttpServletRequest req) { try { - String tokenName = OAuth.OAUTH_TOKEN_DRAFT_0; - if (Utils.SMART_GALLERY.equals(oauthParams.getApplication())) { - tokenName = OAuth.OAUTH_TOKEN; - } - URL url = new URL( - oauthParams.getResourceUrl() + "?" + tokenName + "=" + oauthParams.getAccessToken()); - HttpURLConnection conn = (HttpURLConnection)url.openConnection(); - if (conn.getResponseCode() == 200) { - oauthParams.setResource(OAuthUtils.saveStreamAsString(conn.getInputStream())); - } else { - oauthParams.setErrorMessage( - "Could not access resource: " + conn.getResponseCode() + " " + conn.getResponseMessage()); - } - } catch (IOException e) { - oauthParams.setErrorMessage(e.getMessage()); - } - + OAuthClientRequest request=null; + + if (Utils.REQUEST_TYPE_QUERY.equals(oauthParams.getRequestType())){ + request= new OAuthBearerClientRequest(oauthParams.getResourceUrl()).setAccessToken(oauthParams.getAccessToken()).buildQueryMessage(); + }else if (Utils.REQUEST_TYPE_HEADER.equals(oauthParams.getRequestType())){ + request= new OAuthBearerClientRequest(oauthParams.getResourceUrl()).setAccessToken(oauthParams.getAccessToken()).buildHeaderMessage(); + }else if (Utils.REQUEST_TYPE_BODY.equals(oauthParams.getRequestType())){ + request= new OAuthBearerClientRequest(oauthParams.getResourceUrl()).setAccessToken(oauthParams.getAccessToken()).buildBodyMessage(); + } + + OAuthClient client = new OAuthClient(new URLConnectionClient()); + OAuthResourceResponse resourceResponse= client.resource(request, oauthParams.getRequestMethod(), OAuthResourceResponse.class); + + if (resourceResponse.getResponseCode()==200){ + oauthParams.setResource(resourceResponse.getBody()); + }else{ + oauthParams.setErrorMessage( + "Could not access resource: " + resourceResponse.getResponseCode() + " " + resourceResponse.getBody()); + } + } catch (OAuthSystemException e) { + oauthParams.setErrorMessage(e.getMessage()); + } catch (OAuthProblemException e) { + oauthParams.setErrorMessage(e.getMessage()); + } + return new ModelAndView("resource"); diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java index 1343ad86..b56659eb 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java @@ -42,6 +42,8 @@ public class OAuthParams { private String resourceUrl; private String resource; private String application; + private String requestType; + private String requestMethod; private String errorMessage; @@ -160,4 +162,20 @@ public String getApplication() { public void setApplication(String application) { this.application = application; } + + public String getRequestType() { + return requestType; + } + + public void setRequestType(String requestType) { + this.requestType = requestType; + } + + public String getRequestMethod() { + return requestMethod; + } + + public void setRequestMethod(String requestMethod) { + this.requestMethod = requestMethod; + } } diff --git a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_resource.jsp b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_resource.jsp index d3ef2d42..7b1d0a92 100644 --- a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_resource.jsp +++ b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_resource.jsp @@ -51,6 +51,21 @@ Resource URL: + + Authenticated Request Type: + + + + + + + + Request Method: + + + + + Access Token: From a5dfead35ec474f5a3335101998112eedf4dab85 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Fri, 18 Jan 2013 12:33:30 +0000 Subject: [PATCH 188/583] Oltu has become a TLP git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1435113 13f79535-47bb-0310-9956-ffa450edef68 From efa808185014d77a512448a593fb94daa03661a2 Mon Sep 17 00:00:00 2001 From: Tommaso Teofili Date: Mon, 21 Jan 2013 10:19:02 +0000 Subject: [PATCH 189/583] [AMBER-77] - update website from incubating-amber to oltu git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1436257 13f79535-47bb-0310-9956-ffa450edef68 --- .../images/{amber_head.png => oltu_head.png} | Bin src/site/site.xml | 6 +- src/site/xdoc/download.xml.vm | 146 +++++++++--------- src/site/xdoc/index.xml | 17 +- src/site/xdoc/release-howto.xml | 90 +++++------ 5 files changed, 124 insertions(+), 135 deletions(-) rename src/site/resources/images/{amber_head.png => oltu_head.png} (100%) diff --git a/src/site/resources/images/amber_head.png b/src/site/resources/images/oltu_head.png similarity index 100% rename from src/site/resources/images/amber_head.png rename to src/site/resources/images/oltu_head.png diff --git a/src/site/site.xml b/src/site/site.xml index af003d96..cc5de0ca 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -20,8 +20,8 @@ name="${project.name}"> - Apache Amber OAuth reference implementation - images/amber_head.png + Apache Oltu OAuth reference implementation + images/oltu_head.png ${project.url}/index.html @@ -68,7 +68,7 @@
    -
    Apache Amber, Apache, the Apache feather logo, and the Apache Amber project logos are trademarks of The Apache Software Foundation. +
    Apache Oltu, Apache, the Apache feather logo, and the Apache Oltu project logos are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
    diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index 0afa9c2b..4f64340b 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -19,14 +19,14 @@ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"> - Apache Amber - Download - Apache Amber Team + Apache Oltu - Download + Apache Oltu Team -
    -

    Apache Amber is distributed in several formats for your convenience. Use a source archive if you intend to build - Apache Amber yourself. Otherwise, simply pick a ready-made binary distribution and follow the installation +

    +

    Apache Oltu is distributed in several formats for your convenience. Use a source archive if you intend to build + Apache Oltu yourself. Otherwise, simply pick a ready-made binary distribution and follow the installation instructions given inside the archives.

    You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24 @@ -34,14 +34,14 @@

    In order to guard against corrupted downloads/installations, it is highly recommended to verify the signature - of the release bundles against the public KEYS used by the Apache Amber + of the release bundles against the public KEYS used by the Apache Oltu developers.

    -

    Apache Amber is distributed under the Apache License, version 2.0.

    +

    Apache Oltu is distributed under the Apache License, version 2.0.

    -
    +
    @@ -53,22 +53,22 @@ - - - - + + + + - - - - + + + +
    Apache Amber ${project.version} (Source tar.gz)amber-sources-${project.version}.tar.gzamber-sources-${project.version}.tar.gz.md5amber-sources-${project.version}.tar.gz.ascApache Oltu ${project.version} (Source tar.gz)oltu-sources-${project.version}.tar.gzoltu-sources-${project.version}.tar.gz.md5oltu-sources-${project.version}.tar.gz.asc
    Apache Amber ${project.version} (Source zip)amber-sources-${project.version}.zipamber-sources-${project.version}.zip.md5amber-sources-${project.version}.zip.ascApache Oltu ${project.version} (Source zip)oltu-sources-${project.version}.zipoltu-sources-${project.version}.zip.md5oltu-sources-${project.version}.zip.asc
    -
    +
    @@ -82,40 +82,40 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + +
    Apache Amber Client ${project.version} (Source tar.gz)amber-oauth2-client-${project.version}.tar.gzamber-oauth2-client-${project.version}.tar.gz.md5amber-oauth2-client-${project.version}.tar.gz.ascApache Oltu Client ${project.version} (Source tar.gz)oltu-oauth2-client-${project.version}.tar.gzoltu-oauth2-client-${project.version}.tar.gz.md5oltu-oauth2-client-${project.version}.tar.gz.asc
    Apache Amber Client ${project.version} (Source zip)amber-oauth2-client-${project.version}.zipamber-oauth2-client-${project.version}.zip.md5amber-oauth2-client-${project.version}.zip.ascApache Oltu Client ${project.version} (Source zip)oltu-oauth2-client-${project.version}.zipoltu-oauth2-client-${project.version}.zip.md5oltu-oauth2-client-${project.version}.zip.asc
    Apache Amber Dynamic Registration Client ${project.version} (Source tar.gz)amber-oauth2-dynamicreg-client-${project.version}.tar.gzamber-oauth2-dynamicreg-client-${project.version}.tar.gz.md5amber-oauth2-dynamicreg-client-${project.version}.tar.gz.ascApache Oltu Dynamic Registration Client ${project.version} (Source tar.gz)oltu-oauth2-dynamicreg-client-${project.version}.tar.gzoltu-oauth2-dynamicreg-client-${project.version}.tar.gz.md5oltu-oauth2-dynamicreg-client-${project.version}.tar.gz.asc
    Apache Amber Dynamic Registration Client ${project.version} (Source zip)amber-oauth2-dynamicreg-client-${project.version}.zipamber-oauth2-dynamicreg-client-${project.version}.zip.md5amber-oauth2-dynamicreg-client-${project.version}.zip.ascApache Oltu Dynamic Registration Client ${project.version} (Source zip)oltu-oauth2-dynamicreg-client-${project.version}.zipoltu-oauth2-dynamicreg-client-${project.version}.zip.md5oltu-oauth2-dynamicreg-client-${project.version}.zip.asc
    Apache Amber HttpClient integration ${project.version} (Source tar.gz)amber-oauth2-httpclient4-${project.version}.tar.gzamber-oauth2-httpclient4-${project.version}.tar.gz.md5amber-oauth2-httpclient4-${project.version}.tar.gz.ascApache Oltu HttpClient integration ${project.version} (Source tar.gz)oltu-oauth2-httpclient4-${project.version}.tar.gzoltu-oauth2-httpclient4-${project.version}.tar.gz.md5oltu-oauth2-httpclient4-${project.version}.tar.gz.asc
    Apache Amber HttpClient integration Client ${project.version} (Source zip)amber-oauth2-httpclient4-${project.version}.zipamber-oauth2-httpclient4-${project.version}.zip.md5amber-oauth2-httpclient4-${project.version}.zip.ascApache Oltu HttpClient integration Client ${project.version} (Source zip)oltu-oauth2-httpclient4-${project.version}.zipoltu-oauth2-httpclient4-${project.version}.zip.md5oltu-oauth2-httpclient4-${project.version}.zip.asc
    @@ -133,40 +133,40 @@ - Apache Amber Authorization Server ${project.version} (Source tar.gz) - amber-oauth2-authzserver-${project.version}.tar.gz - amber-oauth2-authzserver-${project.version}.tar.gz.md5 - amber-oauth2-authzserver-${project.version}.tar.gz.asc + Apache Oltu Authorization Server ${project.version} (Source tar.gz) + oltu-oauth2-authzserver-${project.version}.tar.gz + oltu-oauth2-authzserver-${project.version}.tar.gz.md5 + oltu-oauth2-authzserver-${project.version}.tar.gz.asc - Apache Amber Authorization Server ${project.version} (Source zip) - amber-oauth2-authzserver-${project.version}.zip - amber-oauth2-authzserver-${project.version}.zip.md5 - amber-oauth2-authzserver-${project.version}.zip.asc + Apache Oltu Authorization Server ${project.version} (Source zip) + oltu-oauth2-authzserver-${project.version}.zip + oltu-oauth2-authzserver-${project.version}.zip.md5 + oltu-oauth2-authzserver-${project.version}.zip.asc - Apache Amber Resource Server ${project.version} (Source tar.gz) - amber-oauth2-resourceserver-${project.version}.tar.gz - amber-oauth2-resourceserver-${project.version}.tar.gz.md5 - amber-oauth2-resourceserver-${project.version}.tar.gz.asc + Apache Oltu Resource Server ${project.version} (Source tar.gz) + oltu-oauth2-resourceserver-${project.version}.tar.gz + oltu-oauth2-resourceserver-${project.version}.tar.gz.md5 + oltu-oauth2-resourceserver-${project.version}.tar.gz.asc - Apache Amber Resource Server ${project.version} (Source zip) - amber-oauth2-resourceserver-${project.version}.zip - amber-oauth2-resourceserver-${project.version}.zip.md5 - amber-oauth2-resourceserver-${project.version}.zip.asc + Apache Oltu Resource Server ${project.version} (Source zip) + oltu-oauth2-resourceserver-${project.version}.zip + oltu-oauth2-resourceserver-${project.version}.zip.md5 + oltu-oauth2-resourceserver-${project.version}.zip.asc - Apache Amber Resource Server ${project.version} (Source tar.gz) - amber-oauth2-resourceserver-filter-${project.version}.tar.gz - amber-oauth2-resourceserver-filter-${project.version}.tar.gz.md5 - amber-oauth2-resourceserver-filter-${project.version}.tar.gz.asc + Apache Oltu Resource Server ${project.version} (Source tar.gz) + oltu-oauth2-resourceserver-filter-${project.version}.tar.gz + oltu-oauth2-resourceserver-filter-${project.version}.tar.gz.md5 + oltu-oauth2-resourceserver-filter-${project.version}.tar.gz.asc - Apache Amber Resource Server ${project.version} (Source zip) - amber-oauth2-resourceserver-filter-${project.version}.zip - amber-oauth2-resourceserver-filter-${project.version}.zip.md5 - amber-oauth2-resourceserver-filter-${project.version}.zip.asc + Apache Oltu Resource Server ${project.version} (Source zip) + oltu-oauth2-resourceserver-filter-${project.version}.zip + oltu-oauth2-resourceserver-filter-${project.version}.zip.md5 + oltu-oauth2-resourceserver-filter-${project.version}.zip.asc @@ -184,16 +184,16 @@ - Apache Amber Client Demo ${project.version} (Source tar.gz) - amber-oauth2-client-demo-${project.version}.tar.gz - amber-oauth2-client-demo-${project.version}.tar.gz.md5 - amber-oauth2-client-demo-${project.version}.tar.gz.asc + Apache Oltu Client Demo ${project.version} (Source tar.gz) + oltu-oauth2-client-demo-${project.version}.tar.gz + oltu-oauth2-client-demo-${project.version}.tar.gz.md5 + oltu-oauth2-client-demo-${project.version}.tar.gz.asc - Apache Amber Client Demo ${project.version} (Source zip) - amber-oauth2-client-demo-${project.version}.zip - amber-oauth2-client-demo-${project.version}.zip.md5 - amber-oauth2-client-demo-${project.version}.zip.asc + Apache Oltu Client Demo ${project.version} (Source zip) + oltu-oauth2-client-demo-${project.version}.zip + oltu-oauth2-client-demo-${project.version}.zip.md5 + oltu-oauth2-client-demo-${project.version}.zip.asc diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 4c0e6e7b..2491081a 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -20,12 +20,12 @@ Home - Apache Amber Documentation Team + Apache Amber Documentation Team
    -

    Apache Amber is an OAuth protocol implementation in Java.

    +

    Apache Oltu is an OAuth protocol implementation in Java.

    @@ -40,19 +40,8 @@
    -

    Looking for apache maven artifacts? Just query the Search service!

    +

    Looking for apache maven artifacts? Just query the Search service!

    -
    -

    Disclaimer

    -

    Apache Amber is an effort undergoing incubation at - The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly - accepted projects until a further review indicates that the infrastructure, communications, and decision making - process have stabilized in a manner consistent with other successful ASF projects. - While incubation status is not necessarily a reflection of the completeness or stability of the code, - it does indicate that the project has yet to be fully endorsed by the ASF.

    -

    You can view our current incubation status - for more details.

    -
    \ No newline at end of file diff --git a/src/site/xdoc/release-howto.xml b/src/site/xdoc/release-howto.xml index bcb2c13a..c672be1d 100644 --- a/src/site/xdoc/release-howto.xml +++ b/src/site/xdoc/release-howto.xml @@ -19,12 +19,12 @@ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"> - Apache Amber - Release HowTo - Apache Amber Team + Apache Oltu - Release HowTo + Apache Oltu Team -
    +

    This short guide is for volunteers that intend to cover the role of Release Manager

    @@ -85,7 +85,7 @@ ... ]]> -

    You can find a settings.xml +

    You can find a settings.xml template in our SVN committers space

    @@ -120,7 +120,7 @@ A branch can be made by running: 
    mvn release:branch -DbranchName=1.0.x
  • Checkout a clean copy of the trunk/branch to release using command line svn: - 
    svn checkout https://svn.apache.org/repos/asf/incubator/amber/trunk/ release
    • + 
    svn checkout https://svn.apache.org/repos/asf/oltu/trunk/ release
    @@ -193,7 +193,7 @@ gpg: Signature made ...
    1. https://repository.apache.org/
    2. Enterprise --> Staging
      3. -
    3. Staging tab --> Name column --> org.apache.amber
      4. +
    4. Staging tab --> Name column --> org.apache.oltu
    5. Navigate through the artifact tree and make sure that all binary, javadoc, sources, and @@ -202,8 +202,8 @@ gpg: Signature made ... .asc (GPG signature) and checksum files (see Repository FAQ and Detached Signatures). - The amber-sources-dist-X.Y.tar.gz and - amber-sources-dist-X.Y.zip files shall likewise have signature and checksum files. + The oltu-sources-dist-X.Y.tar.gz and + oltu-sources-dist-X.Y.zip files shall likewise have signature and checksum files.
    @@ -212,16 +212,16 @@ gpg: Signature made ...
    1. https://repository.apache.org/
    2. Enterprise --> Staging
      3. -
    3. Staging tab --> Name column --> org.apache.amber
      4. -
    4. Right click on the open org.apache.amber-XXX staging repo and select +
    5. Staging tab --> Name column --> org.apache.oltu
      6. +
    6. Right click on the open org.apache.oltu-XXX staging repo and select Close.
    -
  • Add the distribution artifacts to the build area (the grab-binaries.sh - script is versioned under the committer space of Amber SVN). +
  • Add the distribution artifacts to the build area (the grab-binaries.sh + script is versioned under the committer space of Oltu SVN). ssh asf-id@people.apache.org -cd /x1/builds/incubator/amber +cd /x1/builds/oltu bash grab-binaries.sh REPO_ID VERSION
    • @@ -231,7 +231,7 @@ bash grab-binaries.sh REPO_ID VERSION
  • This step will create the staging site: From the directory where you have launched release:perform execute: cd target/checkout -svn checkout https://svn.apache.org/repos/asf/incubator/amber/site/ staging-site +svn checkout https://svn.apache.org/repos/asf/oltu/site/ staging-site mvn -P site site-deploy -Dsite.deploymentBaseUrl=file:///<absolute path to/<staging-site/version>> cd staging-site svn add <version> @@ -242,10 +242,10 @@ svn commit -m "staging site for release"
      -
    1. Create a VOTE email thread on amber-dev +
    2. Create a VOTE email thread on dev@oltu to record votes as replies, e.g.: - 
      
-Subject: [VOTE] Release Apache Amber X.Y
+            
      
+Subject: [VOTE] Release Apache Oltu X.Y
 
 Hi,
 
@@ -256,19 +256,19 @@ There are still a couple of issues left in JIRA:
 http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12311100&status=1
 
 SVN source tag (r9999999):
-https://svn.apache.org/repos/asf/incubator/amber/tags/X.Y/
+https://svn.apache.org/repos/asf/oltu/tags/X.Y/
 
 Staging repo:
-https://repository.apache.org/content/repositories/orgapacheamber-[YOUR REPOSITORY ID]/
+https://repository.apache.org/content/repositories/orgapacheoltu-[YOUR REPOSITORY ID]/
 
 Staging binaries:
-http://people.apache.org/builds/incubator/amber/
+http://people.apache.org/builds/oltu/
 
 Staging site:
-http://incubator.apache.org/amber/X.Y/
+http://incubator.apache.org/oltu/X.Y/
 
 PGP release keys (signed using ABCDEFG):
-http://www.apache.org/dist/incubator/amber/KEYS
+http://www.apache.org/dist/oltu/KEYS
 
 Vote will be open for 72 hours.
 
@@ -277,9 +277,9 @@ Vote will be open for 72 hours.
 [ ] -1, nope, because... (and please explain why)]]>
      3. -
    3. Create a DISCUSS email thread on amber-dev@ for any vote questions, e.g.: - 
      
-Subject: [DISCUSS] Apache Amber X.Y
+          
    4. Create a DISCUSS email thread on dev@oltu for any vote questions, e.g.:
+            
      
+Subject: [DISCUSS] Apache Oltu X.Y
 
 Discussion thread for vote on <version> release candidate, with SVN source tag (r9999999).
 
@@ -290,7 +290,7 @@ Some of the things to check before voting are:
  - can you build the contents of source-release.zip and svn tag
  - do all of the staged jars/zips contain the required LICENSE and NOTICE files
  - are all of the staged jars signed and the signature verifiable
- - is the signing key in the project's KEYS file and on a public server (i.e. http://www.apache.org/dist/incubator/amber/)]]>
+ - is the signing key in the project's KEYS file and on a public server (i.e. http://www.apache.org/dist/oltu/)]]>
             
      
           
      5. 
 
@@ -304,9 +304,9 @@ Some of the things to check before voting are:
           
    5. After the vote has been open for at least 72 hours, has at least three +1 PMC votes and no -1 votes, then
           post the results to the vote thread, replying to the initial email prepending [RESULT] to the
           original subject and include a list of every binding +1, 0 and -1 vote.
-          
      
-CC: "Apache Amber PMC List" 
-Subject: [RESULT] [VOTE] Release Apache Amber X.Y
+          
      
+CC: "Apache Oltu PMC List" 
+Subject: [RESULT] [VOTE] Release Apache Oltu X.Y
 
 Hi,
 The vote has passed with the following result :
@@ -334,18 +334,18 @@ I will promote the artifacts to the central repo.]]>
      
             
        
               
      1. https://repository.apache.org/
        2. 
               
      2. Enterprise --> Staging
        3. 
-              
      3. Staging tab --> Name column --> org.apache.amber
        4. 
-              
      4. Right click on the closed org.apache.amber-XXX staging repo and select Release.
+              
      5. Staging tab --> Name column --> org.apache.oltu
        6. 
+              
      6. Right click on the closed org.apache.oltu-XXX staging repo and select Release.
               
        7. 
             
      
           
      6. 
 
           
    6. Add the distribution artifacts to the distribution area
             ssh asf-id@people.apache.org
-cd /x1/www/www.apache.org/dist/incubator/amber/
+cd /x1/www/www.apache.org/dist/oltu/
 
-mv /x1/builds/incubator/amber/sources/* sources/
-mv /x1/builds/incubator/amber/binaries/* binaries/
+mv /x1/builds/oltu/sources/* sources/
+mv /x1/builds/oltu/binaries/* binaries/
           
      7. 
 
           
    7. Update the
@@ -357,27 +357,27 @@ mv /x1/builds/incubator/amber/binaries/* binaries/
 
       
         
      Make an announcement about the release on the
-        amber-user,
-        amber-dev, and
+        user@oltu,
+        dev@oltu, and
         announce@apache.org lists as per
         the Apache Announcement Mailing Lists page
         
      
 
         
      , "Apache Amber Users List" 
-CC: "Apache Amber Developers List" 
-Subject: [ANNOUNCE] Apache Amber X.Y
+To: "ASF Announcements" , "Apache Oltu Users List" 
+CC: "Apache Oltu Developers List" 
+Subject: [ANNOUNCE] Apache Oltu X.Y
 
-The Apache Amber Team is pleased to announce the release of Apache Amber X.Y.
+The Apache Oltu Team is pleased to announce the release of Apache Oltu X.Y.
 
-The Amber project will deliver a Java development framework mainly aimed to build OAuth-aware applications.
+The Oltu project will deliver a Java development framework mainly aimed to build OAuth-aware applications.
 
 Release Notes:
 
 (put JIRA release notes here)
 
 Have Fun,
-(committer name), on behalf of the Apache Amber PMC]]>
      
+(committer name), on behalf of the Apache Oltu PMC]]>
      8. @@ -392,14 +392,14 @@ Have Fun,
    8. Delete the svn tag created by the release:perform step: - 
      svn rm https://svn.apache.org/repos/asf/incubator/amber/tags/X.Y -m "deleting tag from rolled back release"
      9. + 
      svn rm https://svn.apache.org/repos/asf/oltu/tags/X.Y -m "deleting tag from rolled back release"
    9. Drop the Nexus staging repo:
      1. https://repository.apache.org/
      2. Enterprise --> Staging
        3. -
      3. Staging tab --> Name column --> org.apache.amber
        4. -
      4. Right click on the closed org.apache.amber-XXX staging repo and select Drop. +
      5. Staging tab --> Name column --> org.apache.oltu
        6. +
      6. Right click on the closed org.apache.oltu-XXX staging repo and select Drop.
      10. From 3c384305c7d94d2e85a7d0457528e91e75f5a125 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:10:04 +0000 Subject: [PATCH 190/583] [AMBER-77] Update the Oltu website Amber/Oltu is not longer in the incubator, no needs to link to the incubator site - logo updated to link directly to the foundation homepage git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437446 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/site/site.xml b/src/site/site.xml index cc5de0ca..2ab76632 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -26,9 +26,9 @@ - Apache Incubator - http://incubator.apache.org/images/apache-incubator-logo.png - http://incubator.apache.org/ + The Apache Software Foundation + http://www.apache.org/images/asf_logo.gif + http://www.apache.org/ From 3490ccb9191edb6072a631643c86f091e0f6be77 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:10:43 +0000 Subject: [PATCH 191/583] [AMBER-77] Update the Oltu website s/Amber/Oltu git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437447 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/xdoc/index.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 2491081a..9460dff8 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -20,7 +20,7 @@ Home - Apache Amber Documentation Team + Apache Oltu Documentation Team From 968c155d3af1b24ca5138e2312a29e4f4f51da7a Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:11:42 +0000 Subject: [PATCH 192/583] [AMBER-77] Update the Oltu website MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apache Maven is a ™ of the ASF, replaced lowercase chars with uppercase git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437450 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/xdoc/index.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 9460dff8..53edbffb 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -40,7 +40,7 @@
      -

      Looking for apache maven artifacts? Just query the Search service!

      +

      Looking for Apache Maven artifacts? Just query the Search service!

      From 417dbda8df94f48f99af05e4a3326e9ba6c64d0b Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:16:21 +0000 Subject: [PATCH 193/583] [AMBER-77] Update the Oltu website PPMC doesn't exist anymore, long live the PMC git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437455 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index f170a962..fba5b7ef 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ brianm[at]apache[dot]org Mentor - PPMC Member + PMC Member Committer Emeritus @@ -52,7 +52,7 @@ henning[at]apache[dot]org Mentor - PPMC Member + PMC Member Committer @@ -63,7 +63,7 @@ jfclere[at]apache[dot]org Mentor - PPMC Member + PMC Member Committer @@ -74,7 +74,7 @@ gianugo[at]apache[dot]org Mentor - PPMC Member + PMC Member Committer @@ -85,7 +85,7 @@ djencks[at]apache[dot]org Mentor - PPMC Member + PMC Member Committer @@ -117,7 +117,7 @@ Semeru S.r.l. http://www.semeru.it/ - PPMC Member + PMC Member Committer +1 @@ -128,7 +128,7 @@ Simone Tripodi simonetripodi[at]apache[dot]org - PPMC Member + PMC Member Committer +1 @@ -138,7 +138,7 @@ pidster Stuart "Pid" Williams - PPMC Member + PMC Member Committer +1 @@ -149,7 +149,7 @@ David Recordon recordond[at]apache[dot]org - PPMC Member + PMC Member Committer +1 @@ -160,7 +160,7 @@ Raymond Zhaohui Feng rfeng[at]apache[dot]org - PPMC Member + PMC Member Mentor Committer @@ -171,7 +171,7 @@ Tommaso Teofili tommaso[at]apache[dot]org - PPMC Member + PMC Member Committer +1 @@ -182,7 +182,7 @@ Paul Lindner lindner[at]apache[dot]org - PPMC Member + PMC Member Committer +1 @@ -192,7 +192,7 @@ pablo Pablo Fernandez - PPMC Member + PMC Member Committer +1 @@ -205,7 +205,7 @@ Adobe http://www.day.com - PPMC Member + PMC Member Committer +1 From 6f5b5cd91ca4db7df941e6df9bc4691a90a62d52 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:18:04 +0000 Subject: [PATCH 194/583] [AMBER-77] Update the Oltu website updated SCM coordinates git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437456 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fba5b7ef..77a12bad 100644 --- a/pom.xml +++ b/pom.xml @@ -244,9 +244,9 @@ - scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ - scm:svn:https://svn.apache.org/repos/asf/incubator/amber/trunk/ - https://svn.apache.org/repos/asf/incubator/amber/trunk/ + scm:svn:https://svn.apache.org/repos/asf/oltu/trunk + scm:svn:https://svn.apache.org/repos/asf/oltu/trunk + https://svn.apache.org/repos/asf/oltu/trunk JIRA From 4d4adef4c9f2664f4804fa3592e8f40ab782097c Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:22:26 +0000 Subject: [PATCH 195/583] [AMBER-77] Update the Oltu website updated Mailing Lists coordinates git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437460 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 77a12bad..c2b45096 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ brianm Brian McCallister - brianm[at]apache[dot]org + brianm[at]apache.org Mentor PMC Member @@ -49,7 +49,7 @@ henning Henning Schmiedehausen - henning[at]apache[dot]org + henning[at]apache.org Mentor PMC Member @@ -60,7 +60,7 @@ jfclere Jean-Frederic Clere - jfclere[at]apache[dot]org + jfclere[at]apache.org Mentor PMC Member @@ -71,7 +71,7 @@ gianugo Gianugo Rabellino - gianugo[at]apache[dot]org + gianugo[at]apache.org Mentor PMC Member @@ -82,7 +82,7 @@ djencks David Jencks - djencks[at]apache[dot]org + djencks[at]apache.org Mentor PMC Member @@ -93,7 +93,7 @@ lmoren Lukasz Moren - lmoren[at]apache[dot]org + lmoren[at]apache.org Committer @@ -103,7 +103,7 @@ mmachulak Maciej Machulak - mmachulak[at]apache[dot]org + mmachulak[at]apache.org Committer @@ -113,7 +113,7 @@ simoneg Simone Gianni - simoneg[at]apache[dot]org + simoneg[at]apache.org Semeru S.r.l. http://www.semeru.it/ @@ -126,7 +126,7 @@ simonetripodi Simone Tripodi - simonetripodi[at]apache[dot]org + simonetripodi[at]apache.org PMC Member Committer @@ -147,7 +147,7 @@ recordond David Recordon - recordond[at]apache[dot]org + recordond[at]apache.org PMC Member Committer @@ -158,7 +158,7 @@ rfeng Raymond Zhaohui Feng - rfeng[at]apache[dot]org + rfeng[at]apache.org PMC Member Mentor @@ -169,7 +169,7 @@ tommaso Tommaso Teofili - tommaso[at]apache[dot]org + tommaso[at]apache.org PMC Member Committer @@ -180,7 +180,7 @@ lindner Paul Lindner - lindner[at]apache[dot]org + lindner[at]apache.org PMC Member Committer @@ -201,7 +201,7 @@ asanso Antonio Sanso - asanso[at]apache[dot]org + asanso[at]apache.org Adobe http://www.day.com @@ -215,26 +215,26 @@ Dev Mailing List - amber-dev[at]incubator[dot]apache[dot]org - amber-dev-subscribe[at]incubator[dot]apache[dot]org - amber-dev-unsubscribe[at]incubator[dot]apache[dot]org - http://mail-archives.apache.org/mod_mbox/incubator-amber-dev/ + dev@oltu.apache.org + dev-subscribe@oltu.apache.org + dev-unsubscribe@oltu.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-oltu-dev/ User Mailing List - amber-user[at]incubator[dot]apache[dot]org - amber-user-subscribe[at]incubator[dot]apache[dot]org - amber-user-unsubscribe[at]incubator[dot]apache[dot]org - http://mail-archives.apache.org/mod_mbox/incubator-amber-user/ + user@oltu.apache.org + user-subscribe@oltu.apache.org + user-unsubscribe@oltu.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-oltu-user/ Commits Mailing List - amber-commits[at]incubator[dot]apache[dot]org - amber-commits-subscribe[at]incubator[dot]apache[dot]org - amber-commits-unsubscribe[at]incubator[dot]apache[dot]org - http://mail-archives.apache.org/mod_mbox/incubator-amber-commits/ + commits@oltu.apache.org + commits-subscribe@oltu.apache.org + commits-unsubscribe@oltu.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-oltu-commits/ @@ -420,7 +420,7 @@ forked-path false true - amber-@{project.version} + oltu-@{project.version} -Prelease,apache From 878f140071124690a66fe627f68472c2d65eed91 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:25:35 +0000 Subject: [PATCH 196/583] [AMBER-77] Update the Oltu website writing email addresses without "antispam" characters, makes the site-plugin able to retrieve the gravatar :) git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437463 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index c2b45096..f325b45f 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ brianm Brian McCallister - brianm[at]apache.org + brianm@apache.org Mentor PMC Member @@ -49,7 +49,7 @@ henning Henning Schmiedehausen - henning[at]apache.org + henning@apache.org Mentor PMC Member @@ -60,7 +60,7 @@ jfclere Jean-Frederic Clere - jfclere[at]apache.org + jfclere@apache.org Mentor PMC Member @@ -71,7 +71,7 @@ gianugo Gianugo Rabellino - gianugo[at]apache.org + gianugo@apache.org Mentor PMC Member @@ -82,7 +82,7 @@ djencks David Jencks - djencks[at]apache.org + djencks@apache.org Mentor PMC Member @@ -93,7 +93,7 @@ lmoren Lukasz Moren - lmoren[at]apache.org + lmoren@apache.org Committer @@ -103,7 +103,7 @@ mmachulak Maciej Machulak - mmachulak[at]apache.org + mmachulak@apache.org Committer @@ -113,7 +113,7 @@ simoneg Simone Gianni - simoneg[at]apache.org + simoneg@apache.org Semeru S.r.l. http://www.semeru.it/ @@ -126,7 +126,7 @@ simonetripodi Simone Tripodi - simonetripodi[at]apache.org + simonetripodi@apache.org PMC Member Committer @@ -147,7 +147,7 @@ recordond David Recordon - recordond[at]apache.org + recordond@apache.org PMC Member Committer @@ -158,7 +158,7 @@ rfeng Raymond Zhaohui Feng - rfeng[at]apache.org + rfeng@apache.org PMC Member Mentor @@ -169,7 +169,7 @@ tommaso Tommaso Teofili - tommaso[at]apache.org + tommaso@apache.org PMC Member Committer @@ -180,7 +180,7 @@ lindner Paul Lindner - lindner[at]apache.org + lindner@apache.org PMC Member Committer @@ -201,7 +201,7 @@ asanso Antonio Sanso - asanso[at]apache.org + asanso@apache.org Adobe http://www.day.com From 7112b2f34c34cd49f8a25a0a19e5604e08d7c5b4 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:26:59 +0000 Subject: [PATCH 197/583] [AMBER-77] Update the Oltu website set the Chair role to Antonio moved Antonio on top of the stack long live to our Chair! :) git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437468 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index f325b45f..0d69e3ab 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,20 @@ 2010 + + asanso + Antonio Sanso + asanso@apache.org + Adobe + http://www.day.com + + Chair + PMC Member + Committer + + +1 + + brianm Brian McCallister @@ -197,19 +211,6 @@ +1 - - - asanso - Antonio Sanso - asanso@apache.org - Adobe - http://www.day.com - - PMC Member - Committer - - +1 - From ba56f14d5bf98a1da190c6c00a7fde8efbc2f7a9 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:28:57 +0000 Subject: [PATCH 198/583] [AMBER-77] Update the Oltu website Updated Project Name and Project URL (will be used to generate links) git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437471 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0d69e3ab..7cdf7f1b 100644 --- a/pom.xml +++ b/pom.xml @@ -29,8 +29,8 @@ 0.31-incubating-SNAPSHOT pom - Apache Amber - https://incubator.apache.org/amber + Apache Oltu + https://oltu.apache.org/ 2010 From 5b4c1ee1f5ff4a4a4ca6f0135e9331ce8681278a Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:29:46 +0000 Subject: [PATCH 199/583] [AMBER-77] Update the Oltu website Updated Jenkins notification ML git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437472 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7cdf7f1b..95b0d0c2 100644 --- a/pom.xml +++ b/pom.xml @@ -263,7 +263,7 @@ true false false -
      amber-dev@incubator.apache.org
       +
      dev@oltu.apache.org
       From f697ae026be6291392e4adfd13c77415c46c2002 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:30:31 +0000 Subject: [PATCH 200/583] [AMBER-77] Update the Oltu website Updated site local deployment directory git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437476 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 95b0d0c2..d3e519e7 100644 --- a/pom.xml +++ b/pom.xml @@ -281,9 +281,9 @@ | | mvn clean site-deploy scm-publish:publish-scm -Dusername=uid -Dpassword=pwd --> - ${user.home}/amber-site/ + ${user.home}/oltu-site/ file://${site.siteFilePath} - ${user.home}/amber-site/ + ${user.home}/oltu-site/ false From 9b9b05cba36787106e9ea02a1533c1a0430037b8 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:37:53 +0000 Subject: [PATCH 201/583] [AMBER-77] Update the Oltu website Updated modules names from Amber to Oltu (they will be rendered in module site) git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437484 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/authzserver/pom.xml | 2 +- oauth-2.0/client-demo/pom.xml | 2 +- oauth-2.0/client/pom.xml | 2 +- oauth-2.0/common/pom.xml | 2 +- oauth-2.0/dynamicreg-client/pom.xml | 2 +- oauth-2.0/dynamicreg-common/pom.xml | 2 +- oauth-2.0/dynamicreg-server/pom.xml | 2 +- oauth-2.0/httpclient4/pom.xml | 2 +- oauth-2.0/integration-tests/pom.xml | 2 +- oauth-2.0/pom.xml | 2 +- oauth-2.0/resourceserver-filter/pom.xml | 2 +- oauth-2.0/resourceserver/pom.xml | 2 +- oauth-2.0/test-utils/pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index 1bf43d22..267a53e0 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -26,7 +26,7 @@ amber-oauth2-authzserver - Apache Amber: OAuth 2.0 Implementation - Authorization Server + Apache Oltu: OAuth 2.0 Implementation - Authorization Server diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index 0b9ff87e..92422d81 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -27,7 +27,7 @@ amber-oauth2-client-demo war - Apache Amber: OAuth 2.0 Implementation - Demo Application + Apache Oltu: OAuth 2.0 Implementation - Demo Application diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 6ace9e99..37c18e4f 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -26,7 +26,7 @@ amber-oauth2-client - Apache Amber: OAuth 2.0 Implementation - Client + Apache Oltu: OAuth 2.0 Implementation - Client diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index c13f988e..97143ac1 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -26,7 +26,7 @@ amber-oauth2-common - Apache Amber: OAuth 2.0 Implementation - Common + Apache Oltu: OAuth 2.0 Implementation - Common OAuth 2.0 library - Common diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index 2f71e1fc..b60c9824 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -26,7 +26,7 @@ amber-oauth2-dynamicreg-client - Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Client + Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Client diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index 98b87b03..81c5edf8 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -26,7 +26,7 @@ amber-oauth2-dynamicreg-common - Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Common + Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Common diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index cc9627cb..5409c4aa 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -26,7 +26,7 @@ amber-oauth2-dynamicreg-server - Apache Amber: OAuth 2.0 Implementation - Dynamic Registration Server + Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Server diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index 581f7dd3..75b72178 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -25,7 +25,7 @@ amber-oauth2-httpclient4 - Apache Amber: OAuth 2.0 Implementation - HttpClient + Apache Oltu: OAuth 2.0 Implementation - HttpClient diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index 06b4a1c4..23632270 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -24,7 +24,7 @@ 0.31-incubating-SNAPSHOT - Apache Amber: OAuth 2.0 Implementation - Integration Tests + Apache Oltu: OAuth 2.0 Implementation - Integration Tests amber-oauth2-integration-tests diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 925d231f..dc39cd59 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -27,7 +27,7 @@ amber-oauth2-parent pom - Apache Amber: OAuth 2.0 Implementation - Parent + Apache Oltu: OAuth 2.0 Implementation - Parent common diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index 46e1ed55..1cb31a80 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -26,7 +26,7 @@ amber-oauth2-resourceserver-filter - Apache Amber: OAuth 2.0 Implementation - Resource Server Filter + Apache Oltu: OAuth 2.0 Implementation - Resource Server Filter diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index b3f9d200..11c61a6e 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -26,7 +26,7 @@ amber-oauth2-resourceserver - Apache Amber: OAuth 2.0 Implementation - Resource Server + Apache Oltu: OAuth 2.0 Implementation - Resource Server diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index 62e7e7d0..5931f0f7 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -26,7 +26,7 @@ amber-oauth2-test-utils - Apache Amber: OAuth 2.0 Implementation - Test Utils + Apache Oltu: OAuth 2.0 Implementation - Test Utils From 2af85ad93e7214b00e2d765fa8906b1380596dc1 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:48:59 +0000 Subject: [PATCH 202/583] [AMBER-77] Update the Oltu website Updated SVN site checkin URL from amber (incubator) to oltu (TLP) git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437498 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3e519e7..ffbf3d52 100644 --- a/pom.xml +++ b/pom.xml @@ -267,6 +267,12 @@ + + + oltu.website + ${site.deploymentBaseUrl} + + UTF-8 @@ -433,7 +439,7 @@ true ${site.scmPubCheckoutDirectory} - scm:svn:https://svn.apache.org/repos/asf/incubator/amber/site + scm:svn:https://svn.apache.org/repos/asf/oltu/site Apache Amber site deployment ${site.siteFilePath} From 0e90a024e8b19efb1f3c78918456bee0b57455ef Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:50:11 +0000 Subject: [PATCH 203/583] [AMBER-77] Update the Oltu website Updated site commit message, s/Amber/Oltu git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437500 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ffbf3d52..d29c6ee8 100644 --- a/pom.xml +++ b/pom.xml @@ -440,7 +440,7 @@ true ${site.scmPubCheckoutDirectory} scm:svn:https://svn.apache.org/repos/asf/oltu/site - Apache Amber site deployment + Apache Oltu site deployment ${site.siteFilePath} From 7bf29b569d082f386c84e559ff1735756af9f60e Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 15:52:00 +0000 Subject: [PATCH 204/583] [AMBER-77] Update the Oltu website Initial checkin of a utility script to checkin the produced site on SVN git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437502 13f79535-47bb-0310-9956-ffa450edef68 --- deploySite.sh | 22 ++++++++++++++++++++++ pom.xml | 8 ++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100755 deploySite.sh diff --git a/deploySite.sh b/deploySite.sh new file mode 100755 index 00000000..b6517a2a --- /dev/null +++ b/deploySite.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +mvn clean site-deploy scm-publish:publish-scm $@ diff --git a/pom.xml b/pom.xml index d29c6ee8..0ae68ecb 100644 --- a/pom.xml +++ b/pom.xml @@ -283,9 +283,13 @@ yyyy-MM-dd HH:mm:ssZ ${scmBranch}@r${buildNumber} ${user.home}/oltu-site/ file://${site.siteFilePath} From bf6c5e86ba5fdebc6bf73d75d0949e2e5f0fb9fc Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 16:32:25 +0000 Subject: [PATCH 205/583] [AMBER-77] Update the Oltu website added missing Pablo's ASF email address git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437545 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 0ae68ecb..4a6a48e4 100644 --- a/pom.xml +++ b/pom.xml @@ -205,6 +205,7 @@ pablo Pablo Fernandez + pablo@apache.org PMC Member Committer From 6b09a237ef24d4f046cf7bc0d7782b0830558d06 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 23 Jan 2013 16:38:17 +0000 Subject: [PATCH 206/583] [AMBER-77] Update the Oltu website fix for "Could not copy content to scm checkout: Source 'XXX' and destination 'XXX' are the same" issue git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437552 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a6a48e4..48fe94eb 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,7 @@ --> ${user.home}/oltu-site/ file://${site.siteFilePath} - ${user.home}/oltu-site/ + ${user.home}/oltu-site-content/ false From 1bea43bd81b1f613ea3b4e9d5bbb35ea1f2f9380 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Thu, 24 Jan 2013 10:16:09 +0000 Subject: [PATCH 207/583] upgrading the team list according to the discussion in http://amber.markmail.org/message/llw4wz7nqgwf226t git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1437929 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 179 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 94 insertions(+), 85 deletions(-) diff --git a/pom.xml b/pom.xml index 48fe94eb..5f66bf85 100644 --- a/pom.xml +++ b/pom.xml @@ -47,168 +47,177 @@       +1       - + - brianm - Brian McCallister - brianm@apache.org + lmoren + Lukasz Moren + lmoren@apache.org - Mentor - PMC Member + PMC Member Committer - Emeritus + 0 - + - henning - Henning Schmiedehausen - henning@apache.org + mmachulak + Maciej Machulak + mmachulak@apache.org - Mentor - PMC Member + PMC Member Committer + 0 - jfclere - Jean-Frederic Clere - jfclere@apache.org + pidster + Stuart "Pid" Williams - Mentor PMC Member Committer + +1 - - - gianugo - Gianugo Rabellino - gianugo@apache.org + + + rfeng + Raymond Zhaohui Feng + rfeng@apache.org - Mentor PMC Member Committer - + - djencks - David Jencks - djencks@apache.org + simonetripodi + Simone Tripodi + simonetripodi@apache.org - Mentor PMC Member Committer + +1 - - - lmoren - Lukasz Moren - lmoren@apache.org + + + tommaso + Tommaso Teofili + tommaso@apache.org + PMC Member Committer - 0 + +1 - - - mmachulak - Maciej Machulak - mmachulak@apache.org + + + brianm + Brian McCallister + brianm@apache.org + Mentor + PMC Member Committer + Emeritus - 0 - - - simoneg - Simone Gianni - simoneg@apache.org - Semeru S.r.l. - http://www.semeru.it/ + + + djencks + David Jencks + djencks@apache.org + Mentor PMC Member Committer + Emeritus - +1 - - - simonetripodi - Simone Tripodi - simonetripodi@apache.org + + + gianugo + Gianugo Rabellino + gianugo@apache.org + Mentor PMC Member Committer + Emeritus - +1 - - - pidster - Stuart "Pid" Williams + + + henning + Henning Schmiedehausen + henning@apache.org + Mentor PMC Member Committer + Emeritus - +1 - - - recordond - David Recordon - recordond@apache.org + + + jfclere + Jean-Frederic Clere + jfclere@apache.org + Mentor PMC Member - Committer + Committer + Emeritus - +1 - - - rfeng - Raymond Zhaohui Feng - rfeng@apache.org + + + lindner + Paul Lindner + lindner@apache.org PMC Member - Mentor Committer + Emeritus + +1 - + - tommaso - Tommaso Teofili - tommaso@apache.org + pablo + Pablo Fernandez + pablo@apache.org PMC Member Committer + Emeritus +1 - - - lindner - Paul Lindner - lindner@apache.org + + + recordond + David Recordon + recordond@apache.org PMC Member Committer + Emeritus +1 - + - pablo - Pablo Fernandez - pablo@apache.org + simoneg + Simone Gianni + simoneg@apache.org + Semeru S.r.l. + http://www.semeru.it/ PMC Member Committer + Emeritus +1 From eb99d8c6663b226a6ca6c5e5bfafd66969104e6f Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 24 Jan 2013 14:27:22 +0000 Subject: [PATCH 208/583] [AMBER-77] Update the Oltu website yet another s/Amber/Oltu module name git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438014 13f79535-47bb-0310-9956-ffa450edef68 --- sources-dist/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index dc1e8ddd..e63265d9 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -27,7 +27,7 @@ amber-sources - Apache Amber :: Sources distribution module + Apache Oltu :: Sources distribution module From f015087941808da55dfc9a9931d4f634107e2fe0 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 24 Jan 2013 15:25:18 +0000 Subject: [PATCH 209/583] code format: no tabs, dropped empty lines git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438045 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 5f66bf85..ac8b00ae 100644 --- a/pom.xml +++ b/pom.xml @@ -47,24 +47,24 @@       +1       - + lmoren Lukasz Moren lmoren@apache.org - PMC Member + PMC Member Committer 0 - + mmachulak Maciej Machulak mmachulak@apache.org - PMC Member + PMC Member Committer 0 @@ -79,8 +79,8 @@       +1       - - + + rfeng Raymond Zhaohui Feng rfeng@apache.org @@ -100,8 +100,8 @@       +1       - - + + tommaso Tommaso Teofili tommaso@apache.org @@ -111,8 +111,8 @@       +1       - - + + brianm Brian McCallister brianm@apache.org @@ -123,8 +123,8 @@ Emeritus       - - + + djencks David Jencks djencks@apache.org @@ -135,8 +135,8 @@ Emeritus       - - + + gianugo Gianugo Rabellino gianugo@apache.org @@ -147,8 +147,8 @@ Emeritus       - - + + henning Henning Schmiedehausen henning@apache.org @@ -159,8 +159,8 @@ Emeritus       - - + + jfclere Jean-Frederic Clere jfclere@apache.org @@ -171,8 +171,8 @@ Emeritus       - - + + lindner Paul Lindner lindner@apache.org @@ -183,7 +183,7 @@       +1       - + pablo Pablo Fernandez @@ -195,8 +195,8 @@       +1       - - + + recordond David Recordon recordond@apache.org @@ -207,7 +207,7 @@       +1       - + simoneg Simone Gianni From f5c4a664b7616fb5e0181dcda0e4266c8b9fbe55 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 24 Jan 2013 15:29:08 +0000 Subject: [PATCH 210/583] [AMBER-77] Update the Oltu website yet another s/Amber/Oltu case, grrrrr :P git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438048 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/xdoc/index.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 53edbffb..e9a98ef4 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -24,7 +24,7 @@ -
      +

      Apache Oltu is an OAuth protocol implementation in Java.

      From ef1018d7f3dad09ba039fa00a025c5f7e3735ddc Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 24 Jan 2013 15:30:05 +0000 Subject: [PATCH 211/583] [AMBER-77] Update the Oltu website upgraded maven-site-plugin to version 3.2 git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438050 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac8b00ae..46736483 100644 --- a/pom.xml +++ b/pom.xml @@ -755,7 +755,7 @@ org.apache.maven.plugins maven-site-plugin - 3.1 + 3.2 en From 5398645cfd9e8c336389348654672c7af4ce2895 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 24 Jan 2013 15:31:40 +0000 Subject: [PATCH 212/583] [AMBER-77] Update the Oltu website all modules name expressed with the same pattern git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438051 13f79535-47bb-0310-9956-ffa450edef68 --- sources-dist/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index e63265d9..1d82d88b 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -27,7 +27,7 @@ amber-sources - Apache Oltu :: Sources distribution module + Apache Oltu: Sources distribution module From 3a0bd59875e31de343dcf99d56ae963ed3eb40b0 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 24 Jan 2013 17:01:42 +0000 Subject: [PATCH 213/583] [AMBER-77] Update the Oltu website use the 'site' profile to manage the site - and avoid generate useless reporting during development improved site and project-info plugins collaborations (old configuration was inherited from old site-plugin) updated the script to generate and publish the site git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438074 13f79535-47bb-0310-9956-ffa450edef68 --- deploySite.sh | 2 +- pom.xml | 160 ++++++++++++++++++++++++-------------------------- 2 files changed, 78 insertions(+), 84 deletions(-) diff --git a/deploySite.sh b/deploySite.sh index b6517a2a..733fde9e 100755 --- a/deploySite.sh +++ b/deploySite.sh @@ -19,4 +19,4 @@ # under the License. # -mvn clean site-deploy scm-publish:publish-scm $@ +mvn -P site clean site-deploy scm-publish:publish-scm $@ diff --git a/pom.xml b/pom.xml index 46736483..f1089b10 100644 --- a/pom.xml +++ b/pom.xml @@ -277,12 +277,6 @@ - - - oltu.website - ${site.deploymentBaseUrl} - - UTF-8 @@ -292,14 +286,18 @@ 1.6 yyyy-MM-dd HH:mm:ssZ ${scmBranch}@r${buildNumber} + + 2.9 ${user.home}/oltu-site/ file://${site.siteFilePath} @@ -362,12 +360,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - org.apache.maven.plugins maven-eclipse-plugin @@ -560,35 +552,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - ${sun.boot.class.path} - com.google.doclava.Doclava - false - -J-Xmx1024m - - com.google.doclava - doclava - 1.0.3 - - - -hdf project.name "${project.name}" - -d ${project.reporting.outputDirectory}/apidocs - - - - - default - - javadoc - - - - - org.apache.maven.plugins maven-jxr-plugin @@ -696,6 +659,7 @@ org.apache.maven.plugins maven-javadoc-plugin + ${javadoc.version} attach-javadocs @@ -752,56 +716,86 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.version} + + true + + + org.apache.maven.plugins maven-site-plugin 3.2 en - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.6 - - false - false - scm:svn:http://svn.apache.org/repos/asf/incubator/any23/trunk - scm:svn:https://svn.apache.org/repos/asf/incubator/any23/trunk - http://svn.apache.org/viewvc/incubator/any23/trunk - - - - - index - mailing-list - project-team - scm - cim - issue-tracking - license - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - - - aggregate - - - - - + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.6 + + false + false + + + + + index + mailing-list + project-team + scm + cim + issue-tracking + license + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.version} + + true + ${sun.boot.class.path} + com.google.doclava.Doclava + false + -J-Xmx1024m + + com.google.doclava + doclava + 1.0.5 + + + -quiet + -federate JDK http://download.oracle.com/javase/6/docs/api/index.html? + -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml + -hdf project.name "Apache Oltu" + -apiversion "${project.version}" + -d ${project.reporting.outputDirectory}/apidocs + + + + + default + + javadoc + + + + + + From 35199cda1e89fbdd0ea639683fca6522a3bf7c19 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 24 Jan 2013 17:12:45 +0000 Subject: [PATCH 214/583] [AMBER-77] Update the Oltu website added missing Pid's email address git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438076 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index f1089b10..712c2a43 100644 --- a/pom.xml +++ b/pom.xml @@ -73,6 +73,7 @@ pidster Stuart "Pid" Williams + pidster@apache.org PMC Member Committer From c71b27e41e470757632a6e1996506569b96f8a2f Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 24 Jan 2013 17:35:35 +0000 Subject: [PATCH 215/583] [AMBER-77] Update the Oltu website restored the Doclava renderer for javadoc restored javadoc aggregation (and publishing) git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438097 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 54 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 712c2a43..452b1228 100644 --- a/pom.xml +++ b/pom.xml @@ -722,8 +722,34 @@ maven-javadoc-plugin ${javadoc.version} - true + true + ${sun.boot.class.path} + com.google.doclava.Doclava + false + -J-Xmx1024m + + com.google.doclava + doclava + 1.0.5 + + + -quiet + -federate JDK http://download.oracle.com/javase/6/docs/api/index.html? + -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml + -hdf project.name "Apache Oltu" + -apiversion "${project.version}" + -d ${project.reporting.outputDirectory}/apidocs + + + + aggregate + site + + aggregate + + + @@ -766,26 +792,6 @@ org.apache.maven.plugins maven-javadoc-plugin ${javadoc.version} - - true - ${sun.boot.class.path} - com.google.doclava.Doclava - false - -J-Xmx1024m - - com.google.doclava - doclava - 1.0.5 - - - -quiet - -federate JDK http://download.oracle.com/javase/6/docs/api/index.html? - -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml - -hdf project.name "Apache Oltu" - -apiversion "${project.version}" - -d ${project.reporting.outputDirectory}/apidocs - - default @@ -793,6 +799,12 @@ javadoc + + aggregate + + aggregate + + From 590b3d2c63f5727e10b5ef4e139ed555e8fdefae Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Sat, 26 Jan 2013 13:10:05 +0000 Subject: [PATCH 216/583] [AMBER-78] Remove Incubator DISCLAIMER file and relative inclusion in packages git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438889 13f79535-47bb-0310-9956-ffa450edef68 --- DISCLAIMER | 10 ---------- oauth-2.0/authzserver/pom.xml | 1 - oauth-2.0/authzserver/src/main/assembly/bin.xml | 5 ----- oauth-2.0/client-demo/pom.xml | 7 ------- oauth-2.0/client-demo/src/main/assembly/bin.xml | 5 ----- oauth-2.0/client/pom.xml | 1 - oauth-2.0/client/src/main/assembly/bin.xml | 5 ----- oauth-2.0/common/pom.xml | 1 - oauth-2.0/dynamicreg-client/pom.xml | 1 - oauth-2.0/dynamicreg-client/src/main/assembly/bin.xml | 5 ----- oauth-2.0/dynamicreg-common/pom.xml | 1 - oauth-2.0/dynamicreg-server/pom.xml | 1 - oauth-2.0/dynamicreg-server/src/main/assembly/bin.xml | 5 ----- oauth-2.0/httpclient4/pom.xml | 1 - oauth-2.0/httpclient4/src/main/assembly/bin.xml | 5 ----- oauth-2.0/integration-tests/pom.xml | 1 - oauth-2.0/resourceserver-filter/pom.xml | 1 - .../resourceserver-filter/src/main/assembly/bin.xml | 5 ----- oauth-2.0/resourceserver/pom.xml | 1 - oauth-2.0/resourceserver/src/main/assembly/bin.xml | 5 ----- oauth-2.0/test-utils/pom.xml | 1 - 21 files changed, 68 deletions(-) delete mode 100644 DISCLAIMER diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index 54053adb..00000000 --- a/DISCLAIMER +++ /dev/null @@ -1,10 +0,0 @@ -Apache Amber is an effort undergoing incubation at the Apache Software -Foundation (ASF), sponsored by the Shindig PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness -or stability of the code, it does indicate that the project has yet to be -fully endorsed by the ASF. diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index 267a53e0..6c52abf7 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -70,7 +70,6 @@ LICENSE NOTICE - DISCLAIMER diff --git a/oauth-2.0/authzserver/src/main/assembly/bin.xml b/oauth-2.0/authzserver/src/main/assembly/bin.xml index 04b13d33..2edd1c72 100644 --- a/oauth-2.0/authzserver/src/main/assembly/bin.xml +++ b/oauth-2.0/authzserver/src/main/assembly/bin.xml @@ -39,11 +39,6 @@ / 666 - - ${basedir}/../../DISCLAIMER - / - 666 - ${basedir}/../../CHANGES / diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index 92422d81..0630ee53 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -110,13 +110,6 @@ ${basedir}/src/main/resources/ - - ${basedir}/../../ - /META-INF - - DISCLAIMER - - ${project.build.directory}/war-legals/ /META-INF diff --git a/oauth-2.0/client-demo/src/main/assembly/bin.xml b/oauth-2.0/client-demo/src/main/assembly/bin.xml index 74fba334..07a26647 100644 --- a/oauth-2.0/client-demo/src/main/assembly/bin.xml +++ b/oauth-2.0/client-demo/src/main/assembly/bin.xml @@ -39,11 +39,6 @@ / 666 - - ${basedir}/../../DISCLAIMER - / - 666 - ${basedir}/../../CHANGES / diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 37c18e4f..981f9d3f 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -56,7 +56,6 @@ LICENSE NOTICE - DISCLAIMER diff --git a/oauth-2.0/client/src/main/assembly/bin.xml b/oauth-2.0/client/src/main/assembly/bin.xml index 04b13d33..2edd1c72 100644 --- a/oauth-2.0/client/src/main/assembly/bin.xml +++ b/oauth-2.0/client/src/main/assembly/bin.xml @@ -39,11 +39,6 @@ / 666 - - ${basedir}/../../DISCLAIMER - / - 666 - ${basedir}/../../CHANGES / diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index 97143ac1..cb116010 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -51,7 +51,6 @@ LICENSE NOTICE - DISCLAIMER diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index b60c9824..5c7438a5 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -56,7 +56,6 @@ LICENSE NOTICE - DISCLAIMER diff --git a/oauth-2.0/dynamicreg-client/src/main/assembly/bin.xml b/oauth-2.0/dynamicreg-client/src/main/assembly/bin.xml index 04b13d33..2edd1c72 100644 --- a/oauth-2.0/dynamicreg-client/src/main/assembly/bin.xml +++ b/oauth-2.0/dynamicreg-client/src/main/assembly/bin.xml @@ -39,11 +39,6 @@ / 666 - - ${basedir}/../../DISCLAIMER - / - 666 - ${basedir}/../../CHANGES / diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index 81c5edf8..4f97d152 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -44,7 +44,6 @@ LICENSE NOTICE - DISCLAIMER diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index 5409c4aa..80810f84 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -75,7 +75,6 @@ LICENSE NOTICE - DISCLAIMER diff --git a/oauth-2.0/dynamicreg-server/src/main/assembly/bin.xml b/oauth-2.0/dynamicreg-server/src/main/assembly/bin.xml index 04b13d33..2edd1c72 100644 --- a/oauth-2.0/dynamicreg-server/src/main/assembly/bin.xml +++ b/oauth-2.0/dynamicreg-server/src/main/assembly/bin.xml @@ -39,11 +39,6 @@ / 666 - - ${basedir}/../../DISCLAIMER - / - 666 - ${basedir}/../../CHANGES / diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index 75b72178..ad8a0185 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -49,7 +49,6 @@ LICENSE NOTICE - DISCLAIMER diff --git a/oauth-2.0/httpclient4/src/main/assembly/bin.xml b/oauth-2.0/httpclient4/src/main/assembly/bin.xml index 04b13d33..2edd1c72 100644 --- a/oauth-2.0/httpclient4/src/main/assembly/bin.xml +++ b/oauth-2.0/httpclient4/src/main/assembly/bin.xml @@ -39,11 +39,6 @@ / 666 - - ${basedir}/../../DISCLAIMER - / - 666 - ${basedir}/../../CHANGES / diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index 23632270..06b70ae6 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -129,7 +129,6 @@ LICENSE NOTICE - DISCLAIMER diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index 1cb31a80..102fd1f8 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -50,7 +50,6 @@ LICENSE NOTICE - DISCLAIMER diff --git a/oauth-2.0/resourceserver-filter/src/main/assembly/bin.xml b/oauth-2.0/resourceserver-filter/src/main/assembly/bin.xml index 04b13d33..2edd1c72 100644 --- a/oauth-2.0/resourceserver-filter/src/main/assembly/bin.xml +++ b/oauth-2.0/resourceserver-filter/src/main/assembly/bin.xml @@ -39,11 +39,6 @@ / 666 - - ${basedir}/../../DISCLAIMER - / - 666 - ${basedir}/../../CHANGES / diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index 11c61a6e..9766a7c0 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -44,7 +44,6 @@ LICENSE NOTICE - DISCLAIMER diff --git a/oauth-2.0/resourceserver/src/main/assembly/bin.xml b/oauth-2.0/resourceserver/src/main/assembly/bin.xml index 04b13d33..2edd1c72 100644 --- a/oauth-2.0/resourceserver/src/main/assembly/bin.xml +++ b/oauth-2.0/resourceserver/src/main/assembly/bin.xml @@ -39,11 +39,6 @@ / 666 - - ${basedir}/../../DISCLAIMER - / - 666 - ${basedir}/../../CHANGES / diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index 5931f0f7..14d4cff3 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -44,7 +44,6 @@ LICENSE NOTICE - DISCLAIMER From 6d9f8c704809f9691b46355703ee4c03991a7bb5 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Sat, 26 Jan 2013 13:17:36 +0000 Subject: [PATCH 217/583] [AMBER-79] drop the -incubating suffix in the version git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438890 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/authzserver/pom.xml | 2 +- oauth-2.0/client-demo/pom.xml | 2 +- oauth-2.0/client/pom.xml | 2 +- oauth-2.0/common/pom.xml | 2 +- oauth-2.0/dynamicreg-client/pom.xml | 2 +- oauth-2.0/dynamicreg-common/pom.xml | 2 +- oauth-2.0/dynamicreg-server/pom.xml | 2 +- oauth-2.0/httpclient4/pom.xml | 2 +- oauth-2.0/integration-tests/pom.xml | 2 +- oauth-2.0/pom.xml | 2 +- oauth-2.0/resourceserver-filter/pom.xml | 2 +- oauth-2.0/resourceserver/pom.xml | 2 +- oauth-2.0/test-utils/pom.xml | 2 +- pom.xml | 2 +- sources-dist/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index 6c52abf7..ad9273d1 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-authzserver diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index 0630ee53..9f6dd9c4 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-client-demo diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 981f9d3f..0b5fbd46 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -21,7 +21,7 @@ amber-oauth2-parent org.apache.amber - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-client diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index cb116010..a37c5404 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-common diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index 5c7438a5..731f75a3 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-dynamicreg-client diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index 4f97d152..9edfe434 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-dynamicreg-common diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index 80810f84..db965aa7 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-dynamicreg-server diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index ad8a0185..d0f0ae80 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -20,7 +20,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-httpclient4 diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index 06b70ae6..d611012b 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT Apache Oltu: OAuth 2.0 Implementation - Integration Tests diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index dc39cd59..ef861a5d 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-parent diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index 102fd1f8..95506b28 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-resourceserver-filter diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index 9766a7c0..3221bb9b 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-resourceserver diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index 14d4cff3..ccffc056 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-oauth2-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT amber-oauth2-test-utils diff --git a/pom.xml b/pom.xml index 452b1228..d077600a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.amber amber-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT pom Apache Oltu diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index 1d82d88b..924cbe95 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -21,7 +21,7 @@ org.apache.amber amber-parent - 0.31-incubating-SNAPSHOT + 0.31-SNAPSHOT ../ From e45b62e9ac9bfc27efc5bf05d9ee03e1fae4a0f2 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Sat, 26 Jan 2013 13:29:41 +0000 Subject: [PATCH 218/583] [AMBER-75] Change packages, artifact names, etc. to Oltu update `oltu` name in groupIds and artifactIds in POM files git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438893 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/authzserver/pom.xml | 10 ++++---- oauth-2.0/client-demo/pom.xml | 18 ++++++------- oauth-2.0/client/pom.xml | 10 ++++---- oauth-2.0/common/pom.xml | 10 ++++---- oauth-2.0/dynamicreg-client/pom.xml | 18 ++++++------- oauth-2.0/dynamicreg-common/pom.xml | 10 ++++---- oauth-2.0/dynamicreg-server/pom.xml | 22 ++++++++-------- oauth-2.0/httpclient4/pom.xml | 10 ++++---- oauth-2.0/integration-tests/pom.xml | 34 ++++++++++++------------- oauth-2.0/pom.xml | 6 ++--- oauth-2.0/resourceserver-filter/pom.xml | 14 +++++----- oauth-2.0/resourceserver/pom.xml | 10 ++++---- oauth-2.0/test-utils/pom.xml | 6 ++--- pom.xml | 4 +-- sources-dist/pom.xml | 6 ++--- 15 files changed, 94 insertions(+), 94 deletions(-) diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index ad9273d1..cc94363d 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -19,19 +19,19 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT - amber-oauth2-authzserver + oltu-oauth2-authzserver Apache Oltu: OAuth 2.0 Implementation - Authorization Server - org.apache.amber - amber-oauth2-common + org.apache.oltu + oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index 9f6dd9c4..cc739e22 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -19,12 +19,12 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT - amber-oauth2-client-demo + oltu-oauth2-client-demo war Apache Oltu: OAuth 2.0 Implementation - Demo Application @@ -38,22 +38,22 @@ - amber-oauth2-common - org.apache.amber + oltu-oauth2-common + org.apache.oltu ${project.version} - amber-oauth2-dynamicreg-common - org.apache.amber + oltu-oauth2-dynamicreg-common + org.apache.oltu ${project.version} - amber-oauth2-dynamicreg-client - org.apache.amber + oltu-oauth2-dynamicreg-client + org.apache.oltu ${project.version} diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 0b5fbd46..36e5f280 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -19,19 +19,19 @@ 4.0.0 - amber-oauth2-parent - org.apache.amber + oltu-oauth2-parent + org.apache.oltu 0.31-SNAPSHOT - amber-oauth2-client + oltu-oauth2-client Apache Oltu: OAuth 2.0 Implementation - Client - org.apache.amber - amber-oauth2-common + org.apache.oltu + oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index a37c5404..1ec5e2ba 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -19,12 +19,12 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT - amber-oauth2-common + oltu-oauth2-common Apache Oltu: OAuth 2.0 Implementation - Common OAuth 2.0 library - Common @@ -73,8 +73,8 @@ - org/apache/amber/oauth2/common/message/types/**.class - org/apache/amber/oauth2/common/OAuth**.class + org/apache/oltu/oauth2/common/message/types/**.class + org/apache/oltu/oauth2/common/OAuth**.class diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index 731f75a3..f50440d7 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -19,31 +19,31 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT - amber-oauth2-dynamicreg-client + oltu-oauth2-dynamicreg-client Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Client - org.apache.amber - amber-oauth2-common + org.apache.oltu + oltu-oauth2-common ${project.version} - org.apache.amber - amber-oauth2-client + org.apache.oltu + oltu-oauth2-client ${project.version} - org.apache.amber - amber-oauth2-dynamicreg-common + org.apache.oltu + oltu-oauth2-dynamicreg-common ${project.version} diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index 9edfe434..92cf5c11 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -19,19 +19,19 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT - amber-oauth2-dynamicreg-common + oltu-oauth2-dynamicreg-common Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Common - org.apache.amber - amber-oauth2-common + org.apache.oltu + oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index db965aa7..570e8ff3 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -19,31 +19,31 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT - amber-oauth2-dynamicreg-server + oltu-oauth2-dynamicreg-server Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Server - org.apache.amber - amber-oauth2-common + org.apache.oltu + oltu-oauth2-common ${project.version} - org.apache.amber - amber-oauth2-authzserver + org.apache.oltu + oltu-oauth2-authzserver ${project.version} - org.apache.amber - amber-oauth2-dynamicreg-common + org.apache.oltu + oltu-oauth2-dynamicreg-common ${project.version} @@ -60,8 +60,8 @@ - org.apache.amber - amber-oauth2-test-utils + org.apache.oltu + oltu-oauth2-test-utils ${project.version} test diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index d0f0ae80..39388f5e 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -18,19 +18,19 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT - amber-oauth2-httpclient4 + oltu-oauth2-httpclient4 Apache Oltu: OAuth 2.0 Implementation - HttpClient - org.apache.amber - amber-oauth2-client + org.apache.oltu + oltu-oauth2-client ${project.version} diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index d611012b..18d0402e 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -19,55 +19,55 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT Apache Oltu: OAuth 2.0 Implementation - Integration Tests - amber-oauth2-integration-tests + oltu-oauth2-integration-tests - org.apache.amber - amber-oauth2-common + org.apache.oltu + oltu-oauth2-common ${project.version} - org.apache.amber - amber-oauth2-client + org.apache.oltu + oltu-oauth2-client ${project.version} - org.apache.amber - amber-oauth2-authzserver + org.apache.oltu + oltu-oauth2-authzserver ${project.version} - org.apache.amber - amber-oauth2-httpclient4 + org.apache.oltu + oltu-oauth2-httpclient4 ${project.version} - org.apache.amber - amber-oauth2-resourceserver + org.apache.oltu + oltu-oauth2-resourceserver ${project.version} - org.apache.amber - amber-oauth2-dynamicreg-client + org.apache.oltu + oltu-oauth2-dynamicreg-client ${project.version} - org.apache.amber - amber-oauth2-dynamicreg-server + org.apache.oltu + oltu-oauth2-dynamicreg-server ${project.version} diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index ef861a5d..ebc63455 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -19,12 +19,12 @@ 4.0.0 - org.apache.amber - amber-parent + org.apache.oltu + oltu-parent 0.31-SNAPSHOT - amber-oauth2-parent + oltu-oauth2-parent pom Apache Oltu: OAuth 2.0 Implementation - Parent diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index 95506b28..3b8bff3e 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -19,25 +19,25 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT - amber-oauth2-resourceserver-filter + oltu-oauth2-resourceserver-filter Apache Oltu: OAuth 2.0 Implementation - Resource Server Filter - org.apache.amber - amber-oauth2-resourceserver + org.apache.oltu + oltu-oauth2-resourceserver ${project.version} - org.apache.amber - amber-oauth2-common + org.apache.oltu + oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index 3221bb9b..f78e414b 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -19,19 +19,19 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT - amber-oauth2-resourceserver + oltu-oauth2-resourceserver Apache Oltu: OAuth 2.0 Implementation - Resource Server - org.apache.amber - amber-oauth2-common + org.apache.oltu + oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index ccffc056..7f66b2eb 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -19,12 +19,12 @@ 4.0.0 - org.apache.amber - amber-oauth2-parent + org.apache.oltu + oltu-oauth2-parent 0.31-SNAPSHOT - amber-oauth2-test-utils + oltu-oauth2-test-utils Apache Oltu: OAuth 2.0 Implementation - Test Utils diff --git a/pom.xml b/pom.xml index d077600a..847d7381 100644 --- a/pom.xml +++ b/pom.xml @@ -24,8 +24,8 @@ 10 - org.apache.amber - amber-parent + org.apache.oltu + oltu-parent 0.31-SNAPSHOT pom diff --git a/sources-dist/pom.xml b/sources-dist/pom.xml index 924cbe95..138f3650 100644 --- a/sources-dist/pom.xml +++ b/sources-dist/pom.xml @@ -19,13 +19,13 @@ 4.0.0 - org.apache.amber - amber-parent + org.apache.oltu + oltu-parent 0.31-SNAPSHOT ../ - amber-sources + oltu-sources Apache Oltu: Sources distribution module From 391c6ef2c16b694804b8e141fb38f02de119c96b Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Sat, 26 Jan 2013 18:59:59 +0000 Subject: [PATCH 219/583] [AMBER-75] Change packages, artifact names, etc. to Oltu packages moved from org.apache.amber to org.apache.oltu updated configuration files/*.jsp/ in order to point to org.apache.oltu packages git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438947 13f79535-47bb-0310-9956-ffa450edef68 --- .../oauth2/as/issuer/MD5Generator.java | 4 +-- .../oauth2/as/issuer/OAuthIssuer.java | 4 +-- .../oauth2/as/issuer/OAuthIssuerImpl.java | 4 +-- .../oauth2/as/issuer/UUIDValueGenerator.java | 4 +-- .../oauth2/as/issuer/ValueGenerator.java | 4 +-- .../oauth2/as/request/OAuthAuthzRequest.java | 18 ++++++------- .../oauth2/as/request/OAuthRequest.java | 12 ++++----- .../oauth2/as/request/OAuthTokenRequest.java | 22 ++++++++-------- .../oauth2/as/response/OAuthASResponse.java | 6 ++--- .../as/validator/AssertionValidator.java | 6 ++--- .../validator/AuthorizationCodeValidator.java | 6 ++--- .../validator/ClientCredentialValidator.java | 6 ++--- .../as/validator/CodeTokenValidator.java | 10 +++---- .../oauth2/as/validator/CodeValidator.java | 10 +++---- .../as/validator/PasswordValidator.java | 6 ++--- .../as/validator/RefreshTokenValidator.java | 6 ++--- .../oauth2/as/validator/TokenValidator.java | 10 +++---- .../oauth2/as/MD5GeneratorTest.java | 8 +++--- .../oauth2/as/OAuthIssuerImplTest.java | 8 +++--- .../oauth2/as/OAuthRequestTest.java | 18 ++++++------- .../oauth2/as/UUIDValueGeneratorTest.java | 4 +-- .../as/response/OAuthASResponseTest.java | 11 ++++---- .../as/validator/TokenValidatorTest.java | 8 +++--- .../oauth2/client/demo/Utils.java | 8 +++--- .../demo/controller/AuthzController.java | 14 +++++----- .../demo/controller/MainController.java | 10 +++---- .../demo/controller/RedirectController.java | 10 +++---- .../controller/RegistrationController.java | 26 +++++++++---------- .../demo/controller/ResourceController.java | 20 +++++++------- .../demo/controller/TokenController.java | 26 +++++++++---------- .../demo/exception/ApplicationException.java | 2 +- .../oauth2/client/demo/model/OAuthParams.java | 2 +- .../client/demo/model/OAuthRegParams.java | 2 +- .../main/webapp/WEB-INF/spring/app-config.xml | 2 +- .../main/webapp/WEB-INF/views/get_authz.jsp | 2 +- .../webapp/WEB-INF/views/get_resource.jsp | 2 +- .../src/main/webapp/WEB-INF/views/index.jsp | 2 +- .../main/webapp/WEB-INF/views/register.jsp | 2 +- .../webapp/WEB-INF/views/request_token.jsp | 2 +- .../main/webapp/WEB-INF/views/resource.jsp | 2 +- .../oauth2/client/HttpClient.java | 10 +++---- .../oauth2/client/OAuthClient.java | 16 ++++++------ .../oauth2/client/URLConnectionClient.java | 16 ++++++------ .../ClientHeaderParametersApplier.java | 12 ++++----- .../request/OAuthBearerClientRequest.java | 6 ++--- .../client/request/OAuthClientRequest.java | 16 ++++++------ .../client/response/GitHubTokenResponse.java | 10 +++---- .../response/OAuthAccessTokenResponse.java | 8 +++--- .../client/response/OAuthAuthzResponse.java | 16 ++++++------ .../client/response/OAuthClientResponse.java | 6 ++--- .../response/OAuthClientResponseFactory.java | 8 +++--- .../client/response/OAuthErrorResponse.java | 4 +-- .../OAuthJSONAccessTokenResponse.java | 14 +++++----- .../response/OAuthResourceResponse.java | 4 +-- .../client/validator/CodeTokenValidator.java | 4 +-- .../client/validator/CodeValidator.java | 4 +-- .../validator/OAuthClientValidator.java | 12 ++++----- .../client/validator/TokenValidator.java | 4 +-- .../oauth2/client/OAuthClientTest.java | 16 ++++++------ .../response/GitHubTokenResponseTest.java | 2 +- .../OAuthAuthorizationResponseImplTest.java | 11 ++++---- .../OAuthClientResponseFactoryTest.java | 8 +++--- .../OAuthJSONAccessTokenResponseTest.java | 11 ++++---- .../oauth2/client/utils/TestUtils.java | 4 +-- .../validator/CodeTokenValidatorTest.java | 6 +++-- .../client/validator/CodeValidatorTest.java | 8 +++--- .../client/validator/TokenValidatorTest.java | 8 +++--- .../{amber => oltu}/oauth2/common/OAuth.java | 6 ++--- .../common/domain/client/BasicClientInfo.java | 2 +- .../domain/client/BasicClientInfoBuilder.java | 2 +- .../common/domain/client/ClientInfo.java | 2 +- .../domain/credentials/BasicCredentials.java | 2 +- .../credentials/BasicCredentialsBuilder.java | 2 +- .../domain/credentials/Credentials.java | 2 +- .../oauth2/common/error/OAuthError.java | 2 +- .../exception/OAuthProblemException.java | 4 +-- .../exception/OAuthRuntimeException.java | 2 +- .../exception/OAuthSystemException.java | 2 +- .../oauth2/common/message/OAuthMessage.java | 2 +- .../oauth2/common/message/OAuthResponse.java | 20 +++++++------- .../common/message/types/GrantType.java | 2 +- .../common/message/types/ParameterStyle.java | 2 +- .../common/message/types/ResponseType.java | 2 +- .../common/message/types/TokenType.java | 2 +- .../BodyURLEncodedParametersApplier.java | 8 +++--- .../parameters/JSONBodyParametersApplier.java | 8 +++--- .../parameters/OAuthParametersApplier.java | 6 ++--- .../parameters/QueryParameterApplier.java | 10 +++---- .../WWWAuthHeaderParametersApplier.java | 10 +++---- .../oauth2/common/token/BasicOAuthToken.java | 2 +- .../oauth2/common/token/OAuthToken.java | 2 +- .../oauth2/common/utils/JSONUtils.java | 2 +- .../oauth2/common/utils/OAuthUtils.java | 10 +++---- .../common/validators/AbstractValidator.java | 8 +++--- .../common/validators/OAuthValidator.java | 4 +-- .../oauth2/common/OAuthUtilsTest.java | 8 +++--- .../domain/BasicClientInfoBuilderTest.java | 6 ++--- .../common/message/OAuthResponseTest.java | 4 +-- .../BodyURLEncodedParametersApplierTest.java | 10 ++++--- .../JSONBodyParametersApplierTest.java | 12 +++++---- .../parameters/QueryParameterApplierTest.java | 10 ++++--- .../WWWAuthHeaderParametersApplierTest.java | 8 +++--- .../common/utils/DummyOAuthMessage.java | 4 +-- .../oauth2/common/utils/JSONUtilsTest.java | 5 ++-- .../oauth2/common/utils/OAuthUtilsTest.java | 9 ++++--- .../validators/AbstractValidatorImpl.java | 6 ++--- .../validators/AbstractValidatorTest.java | 7 ++--- .../client/OAuthRegistrationClient.java | 16 ++++++------ .../OAuthClientRegistrationRequest.java | 10 +++---- .../OAuthClientRegistrationResponse.java | 14 +++++----- .../validators/RegistrationValidator.java | 12 ++++----- .../dynamicreg/common/OAuthRegistration.java | 2 +- .../JSONHttpServletRequestWrapper.java | 10 +++---- .../OAuthServerRegistrationRequest.java | 14 +++++----- .../OAuthServerRegistrationResponse.java | 6 ++--- .../server/validator/PushPullValidator.java | 14 +++++----- .../OAuthServerRegistrationRequestTest.java | 10 ++++--- .../src/test/resources/log4j.properties | 2 +- .../oauth2/httpclient4/HttpClient4.java | 18 ++++++------- .../AccessTokenPasswordCredentialsTest.java | 20 +++++++------- .../AccessTokenTestAuthCodeTest.java | 20 +++++++------- .../ClientRegistrationOAuthTest.java | 2 +- .../integration/ClientRegistrationTest.java | 16 ++++++------ .../integration/ClientResourceOAuthTest.java | 2 +- .../integration/ClientServerOAuthTest.java | 2 +- .../oauth2/integration/Common.java | 4 +-- .../oauth2/integration/CommonExt.java | 2 +- .../integration/EndUserAuthorizationTest.java | 18 ++++++------- .../integration/JUnit4SpringContextTests.java | 2 +- .../oauth2/integration/ResourceTest.java | 6 ++--- .../integration/endpoints/AuthzEndpoint.java | 22 ++++++++-------- .../endpoints/RegistrationEndpoint.java | 16 ++++++------ .../endpoints/ResourceBodyEndpoint.java | 22 ++++++++-------- .../endpoints/ResourceHeaderEndpoint.java | 22 ++++++++-------- .../endpoints/ResourceQueryEndpoint.java | 22 ++++++++-------- .../integration/endpoints/TokenEndpoint.java | 26 +++++++++---------- .../integration/server/ResourceServlet.java | 2 +- .../src/test/resources/oauth-beans.xml | 14 +++++----- .../src/test/resources/server/WEB-INF/web.xml | 2 +- .../oauth2/rsfilter/OAuthClient.java | 2 +- .../oauth2/rsfilter/OAuthDecision.java | 2 +- .../oauth2/rsfilter/OAuthFilter.java | 20 +++++++------- .../oauth2/rsfilter/OAuthRSProvider.java | 4 +-- .../oauth2/rsfilter/OAuthUtils.java | 2 +- .../oauth2/rs/BearerResourceServer.java | 16 ++++++------ .../oauth2/rs/ResourceServer.java | 12 ++++----- .../extractor/BearerBodyTokenExtractor.java | 4 +-- .../extractor/BearerHeaderTokenExtractor.java | 6 ++--- .../extractor/BearerQueryTokenExtractor.java | 6 ++--- .../oauth2/rs/extractor/TokenExtractor.java | 2 +- .../request/OAuthAccessResourceRequest.java | 24 ++++++++--------- .../oauth2/rs/response/OAuthRSResponse.java | 4 +-- .../validator/BearerBodyOAuthValidator.java | 12 ++++----- .../validator/BearerHeaderOAuthValidator.java | 12 ++++----- .../validator/BearerQueryOAuthValidator.java | 16 ++++++------ .../rs/OAuthAccessResourceRequestTest.java | 12 ++++----- .../rs/extractor/BodyTokenExtractorTest.java | 5 ++-- .../extractor/HeaderTokenExtractorTest.java | 6 ++--- .../rs/extractor/QueryTokenExtractorTest.java | 3 ++- .../rs/validator/BodyOAuthValidatorTest.java | 9 ++++--- .../validator/HeaderOAuthValidatorTest.java | 12 ++++----- .../rs/validator/QueryOAuthValidatorTest.java | 11 ++++---- .../oauth2/utils/test/FileUtils.java | 2 +- 163 files changed, 693 insertions(+), 671 deletions(-) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/issuer/MD5Generator.java (94%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/issuer/OAuthIssuer.java (91%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/issuer/OAuthIssuerImpl.java (92%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/issuer/UUIDValueGenerator.java (92%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/issuer/ValueGenerator.java (90%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/request/OAuthAuthzRequest.java (80%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/request/OAuthRequest.java (90%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/request/OAuthTokenRequest.java (79%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/response/OAuthASResponse.java (96%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/validator/AssertionValidator.java (88%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/validator/AuthorizationCodeValidator.java (89%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/validator/ClientCredentialValidator.java (87%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/validator/CodeTokenValidator.java (86%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/validator/CodeValidator.java (85%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/validator/PasswordValidator.java (89%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/validator/RefreshTokenValidator.java (89%) rename oauth-2.0/authzserver/src/main/java/org/apache/{amber => oltu}/oauth2/as/validator/TokenValidator.java (86%) rename oauth-2.0/authzserver/src/test/java/org/apache/{amber => oltu}/oauth2/as/MD5GeneratorTest.java (86%) rename oauth-2.0/authzserver/src/test/java/org/apache/{amber => oltu}/oauth2/as/OAuthIssuerImplTest.java (87%) rename oauth-2.0/authzserver/src/test/java/org/apache/{amber => oltu}/oauth2/as/OAuthRequestTest.java (98%) rename oauth-2.0/authzserver/src/test/java/org/apache/{amber => oltu}/oauth2/as/UUIDValueGeneratorTest.java (92%) rename oauth-2.0/authzserver/src/test/java/org/apache/{amber => oltu}/oauth2/as/response/OAuthASResponseTest.java (95%) rename oauth-2.0/authzserver/src/test/java/org/apache/{amber => oltu}/oauth2/as/validator/TokenValidatorTest.java (93%) rename oauth-2.0/client-demo/src/main/java/org/apache/{amber => oltu}/oauth2/client/demo/Utils.java (96%) rename oauth-2.0/client-demo/src/main/java/org/apache/{amber => oltu}/oauth2/client/demo/controller/AuthzController.java (87%) rename oauth-2.0/client-demo/src/main/java/org/apache/{amber => oltu}/oauth2/client/demo/controller/MainController.java (92%) rename oauth-2.0/client-demo/src/main/java/org/apache/{amber => oltu}/oauth2/client/demo/controller/RedirectController.java (92%) rename oauth-2.0/client-demo/src/main/java/org/apache/{amber => oltu}/oauth2/client/demo/controller/RegistrationController.java (80%) rename oauth-2.0/client-demo/src/main/java/org/apache/{amber => oltu}/oauth2/client/demo/controller/ResourceController.java (82%) rename oauth-2.0/client-demo/src/main/java/org/apache/{amber => oltu}/oauth2/client/demo/controller/TokenController.java (81%) rename oauth-2.0/client-demo/src/main/java/org/apache/{amber => oltu}/oauth2/client/demo/exception/ApplicationException.java (96%) rename oauth-2.0/client-demo/src/main/java/org/apache/{amber => oltu}/oauth2/client/demo/model/OAuthParams.java (98%) rename oauth-2.0/client-demo/src/main/java/org/apache/{amber => oltu}/oauth2/client/demo/model/OAuthRegParams.java (97%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/HttpClient.java (81%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/OAuthClient.java (84%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/URLConnectionClient.java (89%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/request/ClientHeaderParametersApplier.java (79%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/request/OAuthBearerClientRequest.java (86%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/request/OAuthClientRequest.java (93%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/response/GitHubTokenResponse.java (87%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/response/OAuthAccessTokenResponse.java (86%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/response/OAuthAuthzResponse.java (87%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/response/OAuthClientResponse.java (91%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/response/OAuthClientResponseFactory.java (90%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/response/OAuthErrorResponse.java (92%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/response/OAuthJSONAccessTokenResponse.java (85%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/response/OAuthResourceResponse.java (93%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/validator/CodeTokenValidator.java (92%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/validator/CodeValidator.java (92%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/validator/OAuthClientValidator.java (91%) rename oauth-2.0/client/src/main/java/org/apache/{amber => oltu}/oauth2/client/validator/TokenValidator.java (92%) rename oauth-2.0/client/src/test/java/org/apache/{amber => oltu}/oauth2/client/OAuthClientTest.java (87%) rename oauth-2.0/client/src/test/java/org/apache/{amber => oltu}/oauth2/client/response/GitHubTokenResponseTest.java (96%) rename oauth-2.0/client/src/test/java/org/apache/{amber => oltu}/oauth2/client/response/OAuthAuthorizationResponseImplTest.java (97%) rename oauth-2.0/client/src/test/java/org/apache/{amber => oltu}/oauth2/client/response/OAuthClientResponseFactoryTest.java (87%) rename oauth-2.0/client/src/test/java/org/apache/{amber => oltu}/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java (93%) rename oauth-2.0/client/src/test/java/org/apache/{amber => oltu}/oauth2/client/utils/TestUtils.java (95%) rename oauth-2.0/client/src/test/java/org/apache/{amber => oltu}/oauth2/client/validator/CodeTokenValidatorTest.java (87%) rename oauth-2.0/client/src/test/java/org/apache/{amber => oltu}/oauth2/client/validator/CodeValidatorTest.java (87%) rename oauth-2.0/client/src/test/java/org/apache/{amber => oltu}/oauth2/client/validator/TokenValidatorTest.java (87%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/OAuth.java (95%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/domain/client/BasicClientInfo.java (95%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/domain/client/BasicClientInfoBuilder.java (94%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/domain/client/ClientInfo.java (92%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/domain/credentials/BasicCredentials.java (94%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/domain/credentials/BasicCredentialsBuilder.java (93%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/domain/credentials/Credentials.java (92%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/error/OAuthError.java (99%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/exception/OAuthProblemException.java (97%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/exception/OAuthRuntimeException.java (93%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/exception/OAuthSystemException.java (96%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/message/OAuthMessage.java (96%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/message/OAuthResponse.java (90%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/message/types/GrantType.java (96%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/message/types/ParameterStyle.java (95%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/message/types/ResponseType.java (95%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/message/types/TokenType.java (95%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/parameters/BodyURLEncodedParametersApplier.java (84%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/parameters/JSONBodyParametersApplier.java (86%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/parameters/OAuthParametersApplier.java (89%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/parameters/QueryParameterApplier.java (94%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java (82%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/token/BasicOAuthToken.java (94%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/token/OAuthToken.java (93%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/utils/JSONUtils.java (97%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/utils/OAuthUtils.java (98%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/validators/AbstractValidator.java (95%) rename oauth-2.0/common/src/main/java/org/apache/{amber => oltu}/oauth2/common/validators/OAuthValidator.java (92%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/OAuthUtilsTest.java (92%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/domain/BasicClientInfoBuilderTest.java (90%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/message/OAuthResponseTest.java (94%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java (86%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/parameters/JSONBodyParametersApplierTest.java (85%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/parameters/QueryParameterApplierTest.java (86%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java (87%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/utils/DummyOAuthMessage.java (91%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/utils/JSONUtilsTest.java (94%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/utils/OAuthUtilsTest.java (94%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/validators/AbstractValidatorImpl.java (91%) rename oauth-2.0/common/src/test/java/org/apache/{amber => oltu}/oauth2/common/validators/AbstractValidatorTest.java (91%) rename oauth-2.0/dynamicreg-client/src/main/java/org/apache/{amber => oltu}/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java (76%) rename oauth-2.0/dynamicreg-client/src/main/java/org/apache/{amber => oltu}/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java (89%) rename oauth-2.0/dynamicreg-client/src/main/java/org/apache/{amber => oltu}/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java (83%) rename oauth-2.0/dynamicreg-client/src/main/java/org/apache/{amber => oltu}/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java (86%) rename oauth-2.0/dynamicreg-common/src/main/java/org/apache/{amber => oltu}/oauth2/ext/dynamicreg/common/OAuthRegistration.java (97%) rename oauth-2.0/dynamicreg-server/src/main/java/org/apache/{amber => oltu}/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java (90%) rename oauth-2.0/dynamicreg-server/src/main/java/org/apache/{amber => oltu}/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java (84%) rename oauth-2.0/dynamicreg-server/src/main/java/org/apache/{amber => oltu}/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java (93%) rename oauth-2.0/dynamicreg-server/src/main/java/org/apache/{amber => oltu}/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java (86%) rename oauth-2.0/dynamicreg-server/src/test/java/org/apache/{amber => oltu}/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java (88%) rename oauth-2.0/httpclient4/src/main/java/org/apache/{amber => oltu}/oauth2/httpclient4/HttpClient4.java (88%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/AccessTokenPasswordCredentialsTest.java (86%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/AccessTokenTestAuthCodeTest.java (91%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/ClientRegistrationOAuthTest.java (97%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/ClientRegistrationTest.java (82%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/ClientResourceOAuthTest.java (97%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/ClientServerOAuthTest.java (97%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/Common.java (98%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/CommonExt.java (97%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/EndUserAuthorizationTest.java (87%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/JUnit4SpringContextTests.java (96%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/ResourceTest.java (98%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/endpoints/AuthzEndpoint.java (83%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/endpoints/RegistrationEndpoint.java (81%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/endpoints/ResourceBodyEndpoint.java (89%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/endpoints/ResourceHeaderEndpoint.java (86%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/endpoints/ResourceQueryEndpoint.java (85%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/endpoints/TokenEndpoint.java (87%) rename oauth-2.0/integration-tests/src/test/java/org/apache/{amber => oltu}/oauth2/integration/server/ResourceServlet.java (97%) rename oauth-2.0/resourceserver-filter/src/main/java/org/apache/{amber => oltu}/oauth2/rsfilter/OAuthClient.java (95%) rename oauth-2.0/resourceserver-filter/src/main/java/org/apache/{amber => oltu}/oauth2/rsfilter/OAuthDecision.java (96%) rename oauth-2.0/resourceserver-filter/src/main/java/org/apache/{amber => oltu}/oauth2/rsfilter/OAuthFilter.java (91%) rename oauth-2.0/resourceserver-filter/src/main/java/org/apache/{amber => oltu}/oauth2/rsfilter/OAuthRSProvider.java (90%) rename oauth-2.0/resourceserver-filter/src/main/java/org/apache/{amber => oltu}/oauth2/rsfilter/OAuthUtils.java (98%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/BearerResourceServer.java (73%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/ResourceServer.java (90%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/extractor/BearerBodyTokenExtractor.java (94%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/extractor/BearerHeaderTokenExtractor.java (91%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/extractor/BearerQueryTokenExtractor.java (89%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/extractor/TokenExtractor.java (96%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/request/OAuthAccessResourceRequest.java (87%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/response/OAuthRSResponse.java (92%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/validator/BearerBodyOAuthValidator.java (90%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/validator/BearerHeaderOAuthValidator.java (88%) rename oauth-2.0/resourceserver/src/main/java/org/apache/{amber => oltu}/oauth2/rs/validator/BearerQueryOAuthValidator.java (82%) rename oauth-2.0/resourceserver/src/test/java/org/apache/{amber => oltu}/oauth2/rs/OAuthAccessResourceRequestTest.java (98%) rename oauth-2.0/resourceserver/src/test/java/org/apache/{amber => oltu}/oauth2/rs/extractor/BodyTokenExtractorTest.java (93%) rename oauth-2.0/resourceserver/src/test/java/org/apache/{amber => oltu}/oauth2/rs/extractor/HeaderTokenExtractorTest.java (92%) rename oauth-2.0/resourceserver/src/test/java/org/apache/{amber => oltu}/oauth2/rs/extractor/QueryTokenExtractorTest.java (95%) rename oauth-2.0/resourceserver/src/test/java/org/apache/{amber => oltu}/oauth2/rs/validator/BodyOAuthValidatorTest.java (96%) rename oauth-2.0/resourceserver/src/test/java/org/apache/{amber => oltu}/oauth2/rs/validator/HeaderOAuthValidatorTest.java (93%) rename oauth-2.0/resourceserver/src/test/java/org/apache/{amber => oltu}/oauth2/rs/validator/QueryOAuthValidatorTest.java (93%) rename oauth-2.0/test-utils/src/main/java/org/apache/{amber => oltu}/oauth2/utils/test/FileUtils.java (94%) diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/MD5Generator.java similarity index 94% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/MD5Generator.java index 345a9430..fe5871f3 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/MD5Generator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/MD5Generator.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.issuer; +package org.apache.oltu.oauth2.as.issuer; import java.security.MessageDigest; import java.util.UUID; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; /** diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuer.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/OAuthIssuer.java similarity index 91% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuer.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/OAuthIssuer.java index 998b5cb2..d4b0d018 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuer.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/OAuthIssuer.java @@ -19,9 +19,9 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.issuer; +package org.apache.oltu.oauth2.as.issuer; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; /** * diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuerImpl.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/OAuthIssuerImpl.java similarity index 92% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuerImpl.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/OAuthIssuerImpl.java index f63bcb0e..7ee95460 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/OAuthIssuerImpl.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/OAuthIssuerImpl.java @@ -19,10 +19,10 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.issuer; +package org.apache.oltu.oauth2.as.issuer; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; /** * diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/UUIDValueGenerator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/UUIDValueGenerator.java similarity index 92% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/UUIDValueGenerator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/UUIDValueGenerator.java index 7789ce0d..1fcdf1f0 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/UUIDValueGenerator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/UUIDValueGenerator.java @@ -19,11 +19,11 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.issuer; +package org.apache.oltu.oauth2.as.issuer; import java.util.UUID; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; /** * Exemplar OAuth Token Generator diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/ValueGenerator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/ValueGenerator.java similarity index 90% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/ValueGenerator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/ValueGenerator.java index 5798f1a1..24a84058 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/issuer/ValueGenerator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/issuer/ValueGenerator.java @@ -19,9 +19,9 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.issuer; +package org.apache.oltu.oauth2.as.issuer; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; /** diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthAuthzRequest.java similarity index 80% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthAuthzRequest.java index 19ae11f6..c4b2d85a 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthAuthzRequest.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthAuthzRequest.java @@ -19,18 +19,18 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.request; +package org.apache.oltu.oauth2.as.request; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.as.validator.CodeValidator; -import org.apache.amber.oauth2.as.validator.TokenValidator; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.types.ResponseType; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.OAuthValidator; +import org.apache.oltu.oauth2.as.validator.CodeValidator; +import org.apache.oltu.oauth2.as.validator.TokenValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.types.ResponseType; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.OAuthValidator; /** * diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthRequest.java similarity index 90% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthRequest.java index 5d76d19b..0a089844 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthRequest.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthRequest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.request; +package org.apache.oltu.oauth2.as.request; import java.util.HashMap; import java.util.Map; @@ -27,11 +27,11 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.OAuthValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.OAuthValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthTokenRequest.java similarity index 79% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthTokenRequest.java index 24e601f6..89ac2a4a 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/request/OAuthTokenRequest.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/request/OAuthTokenRequest.java @@ -19,20 +19,20 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.request; +package org.apache.oltu.oauth2.as.request; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.as.validator.AuthorizationCodeValidator; -import org.apache.amber.oauth2.as.validator.ClientCredentialValidator; -import org.apache.amber.oauth2.as.validator.PasswordValidator; -import org.apache.amber.oauth2.as.validator.RefreshTokenValidator; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.types.GrantType; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.OAuthValidator; +import org.apache.oltu.oauth2.as.validator.AuthorizationCodeValidator; +import org.apache.oltu.oauth2.as.validator.ClientCredentialValidator; +import org.apache.oltu.oauth2.as.validator.PasswordValidator; +import org.apache.oltu.oauth2.as.validator.RefreshTokenValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.types.GrantType; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.OAuthValidator; /** diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/response/OAuthASResponse.java similarity index 96% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/response/OAuthASResponse.java index ec6cdd8c..6a6c5899 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/response/OAuthASResponse.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/response/OAuthASResponse.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.response; +package org.apache.oltu.oauth2.as.response; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.message.OAuthResponse; /** * diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AssertionValidator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/AssertionValidator.java similarity index 88% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AssertionValidator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/AssertionValidator.java index 973750e1..82d74df3 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AssertionValidator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/AssertionValidator.java @@ -19,11 +19,11 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.validator; +package org.apache.oltu.oauth2.as.validator; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; /** * diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/AuthorizationCodeValidator.java similarity index 89% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/AuthorizationCodeValidator.java index 3c42523c..f9b86d0b 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/AuthorizationCodeValidator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/AuthorizationCodeValidator.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.validator; +package org.apache.oltu.oauth2.as.validator; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; /** * diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/ClientCredentialValidator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/ClientCredentialValidator.java similarity index 87% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/ClientCredentialValidator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/ClientCredentialValidator.java index cb7b87f9..2f085963 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/ClientCredentialValidator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/ClientCredentialValidator.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.validator; +package org.apache.oltu.oauth2.as.validator; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; public class ClientCredentialValidator extends AbstractValidator { public ClientCredentialValidator() { diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/CodeTokenValidator.java similarity index 86% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/CodeTokenValidator.java index 3357aaa4..5938c3e6 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeTokenValidator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/CodeTokenValidator.java @@ -20,14 +20,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.validator; +package org.apache.oltu.oauth2.as.validator; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; /** diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/CodeValidator.java similarity index 85% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/CodeValidator.java index 5d7de438..b2931899 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/CodeValidator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/CodeValidator.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.validator; +package org.apache.oltu.oauth2.as.validator; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; /** diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/PasswordValidator.java similarity index 89% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/PasswordValidator.java index 97bd932d..1c504911 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/PasswordValidator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/PasswordValidator.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.validator; +package org.apache.oltu.oauth2.as.validator; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; /** * diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/RefreshTokenValidator.java similarity index 89% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/RefreshTokenValidator.java index 43ba3850..8ea7b19d 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/RefreshTokenValidator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/RefreshTokenValidator.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.validator; +package org.apache.oltu.oauth2.as.validator; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; /** * diff --git a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/TokenValidator.java similarity index 86% rename from oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java rename to oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/TokenValidator.java index 21574910..c826df7b 100644 --- a/oauth-2.0/authzserver/src/main/java/org/apache/amber/oauth2/as/validator/TokenValidator.java +++ b/oauth-2.0/authzserver/src/main/java/org/apache/oltu/oauth2/as/validator/TokenValidator.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.validator; +package org.apache.oltu.oauth2.as.validator; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; /** * diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/MD5GeneratorTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/MD5GeneratorTest.java similarity index 86% rename from oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/MD5GeneratorTest.java rename to oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/MD5GeneratorTest.java index 648a08ad..4c485e64 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/MD5GeneratorTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/MD5GeneratorTest.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as; +package org.apache.oltu.oauth2.as; import junit.framework.Assert; -import org.apache.amber.oauth2.as.issuer.MD5Generator; -import org.apache.amber.oauth2.as.issuer.ValueGenerator; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.as.issuer.MD5Generator; +import org.apache.oltu.oauth2.as.issuer.ValueGenerator; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; import org.junit.Test; diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthIssuerImplTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthIssuerImplTest.java similarity index 87% rename from oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthIssuerImplTest.java rename to oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthIssuerImplTest.java index e6b50f9b..3ddc8164 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthIssuerImplTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthIssuerImplTest.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as; +package org.apache.oltu.oauth2.as; import junit.framework.Assert; -import org.apache.amber.oauth2.as.issuer.MD5Generator; import org.junit.Test; -import org.apache.amber.oauth2.as.issuer.OAuthIssuer; -import org.apache.amber.oauth2.as.issuer.OAuthIssuerImpl; +import org.apache.oltu.oauth2.as.issuer.MD5Generator; +import org.apache.oltu.oauth2.as.issuer.OAuthIssuer; +import org.apache.oltu.oauth2.as.issuer.OAuthIssuerImpl; /** * diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthRequestTest.java similarity index 98% rename from oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java rename to oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthRequestTest.java index cea74002..95b7046e 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/OAuthRequestTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/OAuthRequestTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as; +package org.apache.oltu.oauth2.as; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -34,14 +34,14 @@ import junit.framework.Assert; -import org.apache.amber.oauth2.as.request.OAuthAuthzRequest; -import org.apache.amber.oauth2.as.request.OAuthRequest; -import org.apache.amber.oauth2.as.request.OAuthTokenRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.types.GrantType; -import org.apache.amber.oauth2.common.message.types.ResponseType; +import org.apache.oltu.oauth2.as.request.OAuthAuthzRequest; +import org.apache.oltu.oauth2.as.request.OAuthRequest; +import org.apache.oltu.oauth2.as.request.OAuthTokenRequest; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.message.types.GrantType; +import org.apache.oltu.oauth2.common.message.types.ResponseType; import org.junit.Test; diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/UUIDValueGeneratorTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/UUIDValueGeneratorTest.java similarity index 92% rename from oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/UUIDValueGeneratorTest.java rename to oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/UUIDValueGeneratorTest.java index 086d887a..3f189fdc 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/UUIDValueGeneratorTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/UUIDValueGeneratorTest.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as; +package org.apache.oltu.oauth2.as; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.as.issuer.UUIDValueGenerator; +import org.apache.oltu.oauth2.as.issuer.UUIDValueGenerator; /** * diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java similarity index 95% rename from oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java rename to oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java index 7ecdd527..db9fa975 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/response/OAuthASResponseTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.response; +package org.apache.oltu.oauth2.as.response; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -27,10 +27,11 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.as.response.OAuthASResponse; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.message.OAuthResponse; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/validator/TokenValidatorTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/validator/TokenValidatorTest.java similarity index 93% rename from oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/validator/TokenValidatorTest.java rename to oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/validator/TokenValidatorTest.java index af081f1f..f67ad859 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/amber/oauth2/as/validator/TokenValidatorTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/validator/TokenValidatorTest.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.as.validator; +package org.apache.oltu.oauth2.as.validator; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.as.validator.TokenValidator; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.as.validator.TokenValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/Utils.java similarity index 96% rename from oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java rename to oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/Utils.java index 34d5d554..65b51627 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/Utils.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/Utils.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.demo; +package org.apache.oltu.oauth2.client.demo; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.client.demo.exception.ApplicationException; -import org.apache.amber.oauth2.client.demo.model.OAuthParams; -import org.apache.amber.oauth2.client.demo.model.OAuthRegParams; +import org.apache.oltu.oauth2.client.demo.exception.ApplicationException; +import org.apache.oltu.oauth2.client.demo.model.OAuthParams; +import org.apache.oltu.oauth2.client.demo.model.OAuthRegParams; /** * diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/AuthzController.java b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/AuthzController.java similarity index 87% rename from oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/AuthzController.java rename to oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/AuthzController.java index 0f2eef56..a14df9c7 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/AuthzController.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/AuthzController.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.demo.controller; +package org.apache.oltu.oauth2.client.demo.controller; import java.io.IOException; @@ -27,20 +27,20 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.amber.oauth2.client.demo.exception.ApplicationException; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.types.ResponseType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.amber.oauth2.client.demo.model.OAuthParams; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.view.RedirectView; -import org.apache.amber.oauth2.client.demo.Utils; +import org.apache.oltu.oauth2.client.demo.Utils; +import org.apache.oltu.oauth2.client.demo.exception.ApplicationException; +import org.apache.oltu.oauth2.client.demo.model.OAuthParams; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.types.ResponseType; /** * Handles requests for the application welcome page. diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/MainController.java similarity index 92% rename from oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java rename to oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/MainController.java index b6cd3641..36479b49 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/MainController.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/MainController.java @@ -19,17 +19,17 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.demo.controller; +package org.apache.oltu.oauth2.client.demo.controller; import java.io.IOException; import javax.servlet.http.HttpServletResponse; -import org.apache.amber.oauth2.client.demo.Utils; -import org.apache.amber.oauth2.client.demo.model.OAuthRegParams; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.amber.oauth2.client.demo.model.OAuthParams; +import org.apache.oltu.oauth2.client.demo.Utils; +import org.apache.oltu.oauth2.client.demo.model.OAuthParams; +import org.apache.oltu.oauth2.client.demo.model.OAuthRegParams; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RedirectController.java b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/RedirectController.java similarity index 92% rename from oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RedirectController.java rename to oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/RedirectController.java index eae7c398..8796e4c4 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RedirectController.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/RedirectController.java @@ -19,16 +19,16 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.demo.controller; +package org.apache.oltu.oauth2.client.demo.controller; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.amber.oauth2.client.demo.Utils; -import org.apache.amber.oauth2.client.demo.model.OAuthParams; -import org.apache.amber.oauth2.client.response.OAuthAuthzResponse; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.client.demo.Utils; +import org.apache.oltu.oauth2.client.demo.model.OAuthParams; +import org.apache.oltu.oauth2.client.response.OAuthAuthzResponse; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RegistrationController.java b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/RegistrationController.java similarity index 80% rename from oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RegistrationController.java rename to oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/RegistrationController.java index 22aaac33..c3e47a17 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/RegistrationController.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/RegistrationController.java @@ -19,28 +19,28 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.demo.controller; +package org.apache.oltu.oauth2.client.demo.controller; import java.io.IOException; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.client.URLConnectionClient; -import org.apache.amber.oauth2.client.demo.Utils; -import org.apache.amber.oauth2.client.demo.model.OAuthParams; -import org.apache.amber.oauth2.client.demo.model.OAuthRegParams; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.ext.dynamicreg.client.OAuthRegistrationClient; -import org.apache.amber.oauth2.ext.dynamicreg.client.request.OAuthClientRegistrationRequest; -import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; -import org.apache.amber.oauth2.ext.dynamicreg.client.response.OAuthClientRegistrationResponse; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import org.apache.amber.oauth2.client.demo.exception.ApplicationException; +import org.apache.oltu.oauth2.client.URLConnectionClient; +import org.apache.oltu.oauth2.client.demo.Utils; +import org.apache.oltu.oauth2.client.demo.exception.ApplicationException; +import org.apache.oltu.oauth2.client.demo.model.OAuthParams; +import org.apache.oltu.oauth2.client.demo.model.OAuthRegParams; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.ext.dynamicreg.client.OAuthRegistrationClient; +import org.apache.oltu.oauth2.ext.dynamicreg.client.request.OAuthClientRegistrationRequest; +import org.apache.oltu.oauth2.ext.dynamicreg.client.response.OAuthClientRegistrationResponse; +import org.apache.oltu.oauth2.ext.dynamicreg.common.OAuthRegistration; /** * diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/ResourceController.java similarity index 82% rename from oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java rename to oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/ResourceController.java index 77fa222a..443747c1 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/ResourceController.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/ResourceController.java @@ -19,18 +19,18 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.demo.controller; +package org.apache.oltu.oauth2.client.demo.controller; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.client.OAuthClient; -import org.apache.amber.oauth2.client.URLConnectionClient; -import org.apache.amber.oauth2.client.demo.Utils; -import org.apache.amber.oauth2.client.demo.model.OAuthParams; -import org.apache.amber.oauth2.client.request.OAuthBearerClientRequest; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.client.response.OAuthResourceResponse; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.client.OAuthClient; +import org.apache.oltu.oauth2.client.URLConnectionClient; +import org.apache.oltu.oauth2.client.demo.Utils; +import org.apache.oltu.oauth2.client.demo.model.OAuthParams; +import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthResourceResponse; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/TokenController.java similarity index 81% rename from oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java rename to oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/TokenController.java index 67a7fae5..d3c20fa5 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/controller/TokenController.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/controller/TokenController.java @@ -19,24 +19,24 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.demo.controller; +package org.apache.oltu.oauth2.client.demo.controller; import java.io.IOException; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.client.OAuthClient; -import org.apache.amber.oauth2.client.URLConnectionClient; -import org.apache.amber.oauth2.client.demo.Utils; -import org.apache.amber.oauth2.client.demo.exception.ApplicationException; -import org.apache.amber.oauth2.client.demo.model.OAuthParams; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.client.response.GitHubTokenResponse; -import org.apache.amber.oauth2.client.response.OAuthAccessTokenResponse; -import org.apache.amber.oauth2.client.response.OAuthJSONAccessTokenResponse; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.types.GrantType; +import org.apache.oltu.oauth2.client.OAuthClient; +import org.apache.oltu.oauth2.client.URLConnectionClient; +import org.apache.oltu.oauth2.client.demo.Utils; +import org.apache.oltu.oauth2.client.demo.exception.ApplicationException; +import org.apache.oltu.oauth2.client.demo.model.OAuthParams; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.GitHubTokenResponse; +import org.apache.oltu.oauth2.client.response.OAuthAccessTokenResponse; +import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.types.GrantType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/exception/ApplicationException.java b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/exception/ApplicationException.java similarity index 96% rename from oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/exception/ApplicationException.java rename to oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/exception/ApplicationException.java index b087ded8..b030b47a 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/exception/ApplicationException.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/exception/ApplicationException.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.demo.exception; +package org.apache.oltu.oauth2.client.demo.exception; /** * diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/model/OAuthParams.java similarity index 98% rename from oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java rename to oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/model/OAuthParams.java index b56659eb..b3c5b4b9 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthParams.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/model/OAuthParams.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.demo.model; +package org.apache.oltu.oauth2.client.demo.model; /** diff --git a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthRegParams.java b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/model/OAuthRegParams.java similarity index 97% rename from oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthRegParams.java rename to oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/model/OAuthRegParams.java index ebff7f21..0517e0d8 100644 --- a/oauth-2.0/client-demo/src/main/java/org/apache/amber/oauth2/client/demo/model/OAuthRegParams.java +++ b/oauth-2.0/client-demo/src/main/java/org/apache/oltu/oauth2/client/demo/model/OAuthRegParams.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.demo.model; +package org.apache.oltu.oauth2.client.demo.model; /** * diff --git a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/spring/app-config.xml b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/spring/app-config.xml index 0dbdc76c..7fb8a2dd 100644 --- a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/spring/app-config.xml +++ b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/spring/app-config.xml @@ -30,6 +30,6 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_authz.jsp b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_authz.jsp index e6cbc3d6..b641c22d 100644 --- a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_authz.jsp +++ b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_authz.jsp @@ -24,7 +24,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ page session="false" %> -<%--@elvariable id="oauthParams" type="org.apache.amber.oauth2.client.demo.model.OAuthParams"--%> +<%--@elvariable id="oauthParams" type="org.apache.oltu.oauth2.client.demo.model.OAuthParams"--%> diff --git a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_resource.jsp b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_resource.jsp index 7b1d0a92..18f9589b 100644 --- a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_resource.jsp +++ b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/get_resource.jsp @@ -24,7 +24,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ page session="false" %> -<%--@elvariable id="oauthParams" type="org.apache.amber.oauth2.client.demo.model.OAuthParams"--%> +<%--@elvariable id="oauthParams" type="org.apache.oltu.oauth2.client.demo.model.OAuthParams"--%> diff --git a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp index 2fe3440e..dbe6abe4 100644 --- a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp +++ b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/index.jsp @@ -24,7 +24,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ page session="false" %> -<%--@elvariable id="oauthParams" type="org.apache.amber.oauth2.client.demo.model.OAuthParams"--%> +<%--@elvariable id="oauthParams" type="org.apache.oltu.oauth2.client.demo.model.OAuthParams"--%> diff --git a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/register.jsp b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/register.jsp index 6cc3017e..aa0dd0fd 100644 --- a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/register.jsp +++ b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/register.jsp @@ -24,7 +24,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ page session="false" %> -<%--@elvariable id="oauthRegParams" type="org.apache.amber.oauth2.client.demo.model.OAuthRegParams"--%> +<%--@elvariable id="oauthRegParams" type="org.apache.oltu.oauth2.client.demo.model.OAuthRegParams"--%> diff --git a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/request_token.jsp b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/request_token.jsp index f91607dd..1ad44206 100644 --- a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/request_token.jsp +++ b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/request_token.jsp @@ -24,7 +24,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ page session="false" %> -<%--@elvariable id="oauthParams" type="org.apache.amber.oauth2.client.demo.model.OAuthParams"--%> +<%--@elvariable id="oauthParams" type="org.apache.oltu.oauth2.client.demo.model.OAuthParams"--%> diff --git a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/resource.jsp b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/resource.jsp index 82d29f86..925f45eb 100644 --- a/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/resource.jsp +++ b/oauth-2.0/client-demo/src/main/webapp/WEB-INF/views/resource.jsp @@ -24,7 +24,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ page session="false" %> -<%--@elvariable id="oauthParams" type="org.apache.amber.oauth2.client.demo.model.OAuthParams"--%> +<%--@elvariable id="oauthParams" type="org.apache.oltu.oauth2.client.demo.model.OAuthParams"--%> diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/HttpClient.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/HttpClient.java similarity index 81% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/HttpClient.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/HttpClient.java index 3a4ed995..f6440ff7 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/HttpClient.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/HttpClient.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client; +package org.apache.oltu.oauth2.client; import java.util.Map; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; /** * diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/OAuthClient.java similarity index 84% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/OAuthClient.java index 28fedc8d..bc840f84 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/OAuthClient.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/OAuthClient.java @@ -19,18 +19,18 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client; +package org.apache.oltu.oauth2.client; import java.util.HashMap; import java.util.Map; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.client.response.OAuthAccessTokenResponse; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.client.response.OAuthJSONAccessTokenResponse; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthAccessTokenResponse; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; /** * OAuth Client - exposes a high-level API for Client Applications diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/URLConnectionClient.java similarity index 89% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/URLConnectionClient.java index ba008b86..6f0f06f3 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/URLConnectionClient.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/URLConnectionClient.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client; +package org.apache.oltu.oauth2.client; import java.io.IOException; import java.io.InputStream; @@ -30,13 +30,13 @@ import java.net.URLConnection; import java.util.Map; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.client.response.OAuthClientResponseFactory; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/request/ClientHeaderParametersApplier.java similarity index 79% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/request/ClientHeaderParametersApplier.java index b176d325..a1a69a5e 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/ClientHeaderParametersApplier.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/request/ClientHeaderParametersApplier.java @@ -19,15 +19,15 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.request; +package org.apache.oltu.oauth2.client.request; import java.util.Map; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthMessage; -import org.apache.amber.oauth2.common.parameters.OAuthParametersApplier; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.parameters.OAuthParametersApplier; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** * diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthBearerClientRequest.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/request/OAuthBearerClientRequest.java similarity index 86% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthBearerClientRequest.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/request/OAuthBearerClientRequest.java index 5a41519b..ea27f89c 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthBearerClientRequest.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/request/OAuthBearerClientRequest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.client.request; +package org.apache.oltu.oauth2.client.request; -import org.apache.amber.oauth2.client.request.OAuthClientRequest.OAuthRequestBuilder; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest.OAuthRequestBuilder; +import org.apache.oltu.oauth2.common.OAuth; public class OAuthBearerClientRequest extends OAuthRequestBuilder { diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/request/OAuthClientRequest.java similarity index 93% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/request/OAuthClientRequest.java index 6befd370..a52fa633 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/request/OAuthClientRequest.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/request/OAuthClientRequest.java @@ -19,18 +19,18 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.request; +package org.apache.oltu.oauth2.client.request; import java.util.HashMap; import java.util.Map; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthMessage; -import org.apache.amber.oauth2.common.message.types.GrantType; -import org.apache.amber.oauth2.common.parameters.BodyURLEncodedParametersApplier; -import org.apache.amber.oauth2.common.parameters.OAuthParametersApplier; -import org.apache.amber.oauth2.common.parameters.QueryParameterApplier; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.message.types.GrantType; +import org.apache.oltu.oauth2.common.parameters.BodyURLEncodedParametersApplier; +import org.apache.oltu.oauth2.common.parameters.OAuthParametersApplier; +import org.apache.oltu.oauth2.common.parameters.QueryParameterApplier; /** * OAuth Client Request diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/GitHubTokenResponse.java similarity index 87% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/GitHubTokenResponse.java index cc87c5fc..d7017a63 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/GitHubTokenResponse.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/GitHubTokenResponse.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.token.BasicOAuthToken; -import org.apache.amber.oauth2.common.token.OAuthToken; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.token.BasicOAuthToken; +import org.apache.oltu.oauth2.common.token.OAuthToken; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAccessTokenResponse.java similarity index 86% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAccessTokenResponse.java index be8f9283..885bac07 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAccessTokenResponse.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAccessTokenResponse.java @@ -19,11 +19,11 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; -import org.apache.amber.oauth2.client.validator.TokenValidator; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.token.OAuthToken; +import org.apache.oltu.oauth2.client.validator.TokenValidator; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.token.OAuthToken; /** * diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAuthzResponse.java similarity index 87% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAuthzResponse.java index 55417264..1cc684ef 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthAuthzResponse.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthAuthzResponse.java @@ -19,19 +19,19 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.client.validator.CodeTokenValidator; -import org.apache.amber.oauth2.client.validator.CodeValidator; -import org.apache.amber.oauth2.client.validator.OAuthClientValidator; -import org.apache.amber.oauth2.client.validator.TokenValidator; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.client.validator.CodeTokenValidator; +import org.apache.oltu.oauth2.client.validator.CodeValidator; +import org.apache.oltu.oauth2.client.validator.OAuthClientValidator; +import org.apache.oltu.oauth2.client.validator.TokenValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponse.java similarity index 91% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponse.java index bb1cbb44..2cc71ba4 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponse.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponse.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; import java.util.HashMap; import java.util.Map; -import org.apache.amber.oauth2.client.validator.OAuthClientValidator; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.client.validator.OAuthClientValidator; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; /** * diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactory.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactory.java similarity index 90% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactory.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactory.java index e81773b4..e5c2426b 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactory.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactory.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** * diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthErrorResponse.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthErrorResponse.java similarity index 92% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthErrorResponse.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthErrorResponse.java index 716c0373..90b5db24 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthErrorResponse.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthErrorResponse.java @@ -19,10 +19,10 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; /** * diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthJSONAccessTokenResponse.java similarity index 85% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthJSONAccessTokenResponse.java index a6762eb6..3cf86774 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponse.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthJSONAccessTokenResponse.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.token.BasicOAuthToken; -import org.apache.amber.oauth2.common.token.OAuthToken; -import org.apache.amber.oauth2.common.utils.JSONUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.token.BasicOAuthToken; +import org.apache.oltu.oauth2.common.token.OAuthToken; +import org.apache.oltu.oauth2.common.utils.JSONUtils; import org.codehaus.jettison.json.JSONException; /** diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthResourceResponse.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthResourceResponse.java similarity index 93% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthResourceResponse.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthResourceResponse.java index 64325321..428fb7fd 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/response/OAuthResourceResponse.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/response/OAuthResourceResponse.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; public class OAuthResourceResponse extends OAuthClientResponse { diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/CodeTokenValidator.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidator.java similarity index 92% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/CodeTokenValidator.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidator.java index 384d12bf..957d9f12 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/CodeTokenValidator.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidator.java @@ -19,10 +19,10 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.validator; +package org.apache.oltu.oauth2.client.validator; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.OAuth; /** * diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/CodeValidator.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/CodeValidator.java similarity index 92% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/CodeValidator.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/CodeValidator.java index aec0e014..3caa80b3 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/CodeValidator.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/CodeValidator.java @@ -19,10 +19,10 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.validator; +package org.apache.oltu.oauth2.client.validator; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.OAuth; /** * diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/OAuthClientValidator.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java similarity index 91% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/OAuthClientValidator.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java index 47a258d7..44c220e9 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/OAuthClientValidator.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/OAuthClientValidator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.validator; +package org.apache.oltu.oauth2.client.validator; import java.util.ArrayList; import java.util.HashMap; @@ -28,11 +28,11 @@ import java.util.Map; import java.util.Set; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** * diff --git a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/TokenValidator.java b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/TokenValidator.java similarity index 92% rename from oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/TokenValidator.java rename to oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/TokenValidator.java index 882b1ffd..6b73d05e 100644 --- a/oauth-2.0/client/src/main/java/org/apache/amber/oauth2/client/validator/TokenValidator.java +++ b/oauth-2.0/client/src/main/java/org/apache/oltu/oauth2/client/validator/TokenValidator.java @@ -19,10 +19,10 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.validator; +package org.apache.oltu.oauth2.client.validator; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.OAuth; /** * diff --git a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/OAuthClientTest.java b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/OAuthClientTest.java similarity index 87% rename from oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/OAuthClientTest.java rename to oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/OAuthClientTest.java index c65c0b57..c0b08823 100644 --- a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/OAuthClientTest.java +++ b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/OAuthClientTest.java @@ -19,21 +19,21 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client; +package org.apache.oltu.oauth2.client; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import org.apache.amber.oauth2.client.OAuthClient; -import org.apache.amber.oauth2.client.URLConnectionClient; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.junit.Test; -import org.apache.amber.oauth2.client.response.GitHubTokenResponse; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.types.GrantType; +import org.apache.oltu.oauth2.client.OAuthClient; +import org.apache.oltu.oauth2.client.URLConnectionClient; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.GitHubTokenResponse; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.types.GrantType; /** * Simple example that shows how to get OAuth 2.0 access token from Facebook diff --git a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/GitHubTokenResponseTest.java b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/GitHubTokenResponseTest.java similarity index 96% rename from oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/GitHubTokenResponseTest.java rename to oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/GitHubTokenResponseTest.java index bd2da66e..ee1c8981 100644 --- a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/GitHubTokenResponseTest.java +++ b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/GitHubTokenResponseTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; import org.junit.Test; diff --git a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/OAuthAuthorizationResponseImplTest.java b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthAuthorizationResponseImplTest.java similarity index 97% rename from oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/OAuthAuthorizationResponseImplTest.java rename to oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthAuthorizationResponseImplTest.java index d3d19eff..e834a46b 100644 --- a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/OAuthAuthorizationResponseImplTest.java +++ b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthAuthorizationResponseImplTest.java @@ -19,18 +19,19 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.client.utils.TestUtils; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.client.response.OAuthAuthzResponse; +import org.apache.oltu.oauth2.client.utils.TestUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import static org.easymock.EasyMock.createStrictMock; import static org.easymock.EasyMock.expect; diff --git a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactoryTest.java b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactoryTest.java similarity index 87% rename from oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactoryTest.java rename to oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactoryTest.java index 26e43ba1..723b5cf3 100644 --- a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/OAuthClientResponseFactoryTest.java +++ b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthClientResponseFactoryTest.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.client.response.OAuthClientResponseFactory; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory; +import org.apache.oltu.oauth2.common.OAuth; /** diff --git a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java similarity index 93% rename from oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java rename to oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java index b407c90f..2cb3099c 100644 --- a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java +++ b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/response/OAuthJSONAccessTokenResponseTest.java @@ -19,12 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.response; +package org.apache.oltu.oauth2.client.response; -import org.apache.amber.oauth2.client.utils.TestUtils; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse; +import org.apache.oltu.oauth2.client.utils.TestUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/utils/TestUtils.java similarity index 95% rename from oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java rename to oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/utils/TestUtils.java index cc14fd98..a73dd3ac 100644 --- a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/utils/TestUtils.java +++ b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/utils/TestUtils.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.utils; +package org.apache.oltu.oauth2.client.utils; import static org.easymock.EasyMock.expect; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.error.OAuthError; /** diff --git a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/validator/CodeTokenValidatorTest.java b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidatorTest.java similarity index 87% rename from oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/validator/CodeTokenValidatorTest.java rename to oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidatorTest.java index 6813b450..86d21903 100644 --- a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/validator/CodeTokenValidatorTest.java +++ b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeTokenValidatorTest.java @@ -19,9 +19,11 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.validator; +package org.apache.oltu.oauth2.client.validator; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.client.validator.CodeTokenValidator; +import org.apache.oltu.oauth2.client.validator.OAuthClientValidator; +import org.apache.oltu.oauth2.common.OAuth; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/validator/CodeValidatorTest.java b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeValidatorTest.java similarity index 87% rename from oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/validator/CodeValidatorTest.java rename to oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeValidatorTest.java index dae6bdac..77e113c4 100644 --- a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/validator/CodeValidatorTest.java +++ b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/CodeValidatorTest.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.validator; +package org.apache.oltu.oauth2.client.validator; -import org.apache.amber.oauth2.client.validator.CodeValidator; -import org.apache.amber.oauth2.client.validator.OAuthClientValidator; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.client.validator.CodeValidator; +import org.apache.oltu.oauth2.client.validator.OAuthClientValidator; +import org.apache.oltu.oauth2.common.OAuth; /** * diff --git a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/validator/TokenValidatorTest.java b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/TokenValidatorTest.java similarity index 87% rename from oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/validator/TokenValidatorTest.java rename to oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/TokenValidatorTest.java index 058a3933..be9b2746 100644 --- a/oauth-2.0/client/src/test/java/org/apache/amber/oauth2/client/validator/TokenValidatorTest.java +++ b/oauth-2.0/client/src/test/java/org/apache/oltu/oauth2/client/validator/TokenValidatorTest.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.client.validator; +package org.apache.oltu.oauth2.client.validator; -import org.apache.amber.oauth2.client.validator.OAuthClientValidator; -import org.apache.amber.oauth2.client.validator.TokenValidator; import org.junit.Assert; import org.junit.Test; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.client.validator.OAuthClientValidator; +import org.apache.oltu.oauth2.client.validator.TokenValidator; +import org.apache.oltu.oauth2.common.OAuth; /** diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/OAuth.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/OAuth.java similarity index 95% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/OAuth.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/OAuth.java index 356bf323..1fb5e3a4 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/OAuth.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/OAuth.java @@ -19,10 +19,10 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common; +package org.apache.oltu.oauth2.common; -import org.apache.amber.oauth2.common.message.types.ParameterStyle; -import org.apache.amber.oauth2.common.message.types.TokenType; +import org.apache.oltu.oauth2.common.message.types.ParameterStyle; +import org.apache.oltu.oauth2.common.message.types.TokenType; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/client/BasicClientInfo.java similarity index 95% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/client/BasicClientInfo.java index f426cf4d..ee9986bf 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfo.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/client/BasicClientInfo.java @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.common.domain.client; +package org.apache.oltu.oauth2.common.domain.client; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/client/BasicClientInfoBuilder.java similarity index 94% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/client/BasicClientInfoBuilder.java index 1435bca7..f1260683 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/client/BasicClientInfoBuilder.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/client/BasicClientInfoBuilder.java @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.common.domain.client; +package org.apache.oltu.oauth2.common.domain.client; /** */ diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/client/ClientInfo.java similarity index 92% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/client/ClientInfo.java index 1a72b376..fda61719 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/client/ClientInfo.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/client/ClientInfo.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.domain.client; +package org.apache.oltu.oauth2.common.domain.client; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/credentials/BasicCredentials.java similarity index 94% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/credentials/BasicCredentials.java index 317ccfe7..924fceb1 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentials.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/credentials/BasicCredentials.java @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.common.domain.credentials; +package org.apache.oltu.oauth2.common.domain.credentials; import java.lang.Long;import java.lang.Object;import java.lang.Override;import java.lang.String; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/credentials/BasicCredentialsBuilder.java similarity index 93% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/credentials/BasicCredentialsBuilder.java index cce2f9da..ddea8983 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/BasicCredentialsBuilder.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/credentials/BasicCredentialsBuilder.java @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.common.domain.credentials; +package org.apache.oltu.oauth2.common.domain.credentials; /** */ diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/credentials/Credentials.java similarity index 92% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/credentials/Credentials.java index f0bf64af..bff5c625 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/domain/credentials/Credentials.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/domain/credentials/Credentials.java @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.common.domain.credentials; +package org.apache.oltu.oauth2.common.domain.credentials; import java.lang.Long;import java.lang.String; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/error/OAuthError.java similarity index 99% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/error/OAuthError.java index bccdf707..7b428c8e 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/error/OAuthError.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/error/OAuthError.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.error; +package org.apache.oltu.oauth2.common.error; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthProblemException.java similarity index 97% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthProblemException.java index db81dfe2..ad09fdd4 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthProblemException.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthProblemException.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.exception; +package org.apache.oltu.oauth2.common.exception; import java.util.HashMap; import java.util.Map; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthRuntimeException.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthRuntimeException.java similarity index 93% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthRuntimeException.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthRuntimeException.java index d8e9902c..9cd3d342 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthRuntimeException.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthRuntimeException.java @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.common.exception; +package org.apache.oltu.oauth2.common.exception; /** */ diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthSystemException.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthSystemException.java similarity index 96% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthSystemException.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthSystemException.java index e6e019f1..68ec2fcb 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/exception/OAuthSystemException.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthSystemException.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.exception; +package org.apache.oltu.oauth2.common.exception; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/OAuthMessage.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/OAuthMessage.java similarity index 96% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/OAuthMessage.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/OAuthMessage.java index bd3dd364..c4905d5a 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/OAuthMessage.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/OAuthMessage.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.message; +package org.apache.oltu.oauth2.common.message; import java.util.Map; diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/OAuthResponse.java similarity index 90% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/OAuthResponse.java index 13c1c5e9..bde116e7 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/OAuthResponse.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/OAuthResponse.java @@ -19,20 +19,20 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.message; +package org.apache.oltu.oauth2.common.message; import java.util.HashMap; import java.util.Map; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.parameters.BodyURLEncodedParametersApplier; -import org.apache.amber.oauth2.common.parameters.JSONBodyParametersApplier; -import org.apache.amber.oauth2.common.parameters.OAuthParametersApplier; -import org.apache.amber.oauth2.common.parameters.QueryParameterApplier; -import org.apache.amber.oauth2.common.parameters.WWWAuthHeaderParametersApplier; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.parameters.BodyURLEncodedParametersApplier; +import org.apache.oltu.oauth2.common.parameters.JSONBodyParametersApplier; +import org.apache.oltu.oauth2.common.parameters.OAuthParametersApplier; +import org.apache.oltu.oauth2.common.parameters.QueryParameterApplier; +import org.apache.oltu.oauth2.common.parameters.WWWAuthHeaderParametersApplier; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/GrantType.java similarity index 96% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/GrantType.java index 700dcb20..f0202386 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/GrantType.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/GrantType.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.message.types; +package org.apache.oltu.oauth2.common.message.types; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/ParameterStyle.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/ParameterStyle.java similarity index 95% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/ParameterStyle.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/ParameterStyle.java index 0faa4d08..4a8b3f35 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/ParameterStyle.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/ParameterStyle.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.message.types; +package org.apache.oltu.oauth2.common.message.types; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/ResponseType.java similarity index 95% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/ResponseType.java index f9bd4871..f32d0970 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/ResponseType.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/ResponseType.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.message.types; +package org.apache.oltu.oauth2.common.message.types; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/TokenType.java similarity index 95% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/TokenType.java index dd2b8c23..da18ae40 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/message/types/TokenType.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/types/TokenType.java @@ -1,4 +1,4 @@ -package org.apache.amber.oauth2.common.message.types; +package org.apache.oltu.oauth2.common.message.types; /** * Copyright 2010 Newcastle University * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/BodyURLEncodedParametersApplier.java similarity index 84% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/BodyURLEncodedParametersApplier.java index 4bff803e..dcb162d4 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplier.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/BodyURLEncodedParametersApplier.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.parameters; +package org.apache.oltu.oauth2.common.parameters; import java.util.Map; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthMessage; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/JSONBodyParametersApplier.java similarity index 86% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/JSONBodyParametersApplier.java index 808f114e..64c5fd90 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplier.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/JSONBodyParametersApplier.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.parameters; +package org.apache.oltu.oauth2.common.parameters; import java.util.Map; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthMessage; -import org.apache.amber.oauth2.common.utils.JSONUtils; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.utils.JSONUtils; import org.codehaus.jettison.json.JSONException; /** diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/OAuthParametersApplier.java similarity index 89% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/OAuthParametersApplier.java index b82f8552..ef7b361d 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/OAuthParametersApplier.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/OAuthParametersApplier.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.parameters; +package org.apache.oltu.oauth2.common.parameters; import java.util.Map; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthMessage; /** * Applies given parameters to the OAuth message. diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/QueryParameterApplier.java similarity index 94% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/QueryParameterApplier.java index 650af72a..914ead71 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplier.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/QueryParameterApplier.java @@ -19,15 +19,15 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.parameters; +package org.apache.oltu.oauth2.common.parameters; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.message.OAuthMessage; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java similarity index 82% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java index f3eda517..2bfa7a59 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/WWWAuthHeaderParametersApplier.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.parameters; +package org.apache.oltu.oauth2.common.parameters; import java.util.Map; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthMessage; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/token/BasicOAuthToken.java similarity index 94% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/token/BasicOAuthToken.java index 18c07814..8147efc6 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/token/BasicOAuthToken.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/token/BasicOAuthToken.java @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.common.token; +package org.apache.oltu.oauth2.common.token; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/token/OAuthToken.java similarity index 93% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/token/OAuthToken.java index 8b34f288..ec08f48b 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/token/OAuthToken.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/token/OAuthToken.java @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.common.token; +package org.apache.oltu.oauth2.common.token; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/utils/JSONUtils.java similarity index 97% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/utils/JSONUtils.java index 6c19a7db..d28ca287 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/utils/JSONUtils.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/utils/JSONUtils.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.utils; +package org.apache.oltu.oauth2.common.utils; import java.util.HashMap; import java.util.Iterator; diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/utils/OAuthUtils.java similarity index 98% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/utils/OAuthUtils.java index b56f584a..b26da81c 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/utils/OAuthUtils.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/utils/OAuthUtils.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.utils; +package org.apache.oltu.oauth2.common.utils; import java.io.IOException; import java.io.InputStream; @@ -42,10 +42,10 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; /** * Common OAuth Utils class. diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/validators/AbstractValidator.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/validators/AbstractValidator.java similarity index 95% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/validators/AbstractValidator.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/validators/AbstractValidator.java index 53dfe943..4dac4181 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/validators/AbstractValidator.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/validators/AbstractValidator.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.validators; +package org.apache.oltu.oauth2.common.validators; import java.util.ArrayList; import java.util.HashMap; @@ -29,9 +29,9 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** * diff --git a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/validators/OAuthValidator.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/validators/OAuthValidator.java similarity index 92% rename from oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/validators/OAuthValidator.java rename to oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/validators/OAuthValidator.java index ecf1f928..f88b3c87 100644 --- a/oauth-2.0/common/src/main/java/org/apache/amber/oauth2/common/validators/OAuthValidator.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/validators/OAuthValidator.java @@ -19,11 +19,11 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.validators; +package org.apache.oltu.oauth2.common.validators; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; /** * diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/OAuthUtilsTest.java similarity index 92% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/OAuthUtilsTest.java index a06a9717..44232f9e 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/OAuthUtilsTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/OAuthUtilsTest.java @@ -19,16 +19,16 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common; +package org.apache.oltu.oauth2.common; import java.util.HashMap; import java.util.Map; import javax.xml.stream.XMLStreamReader; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.utils.JSONUtils; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.utils.JSONUtils; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; import org.codehaus.jettison.AbstractXMLStreamReader; import org.codehaus.jettison.json.JSONObject; import org.codehaus.jettison.mapped.MappedXMLStreamReader; diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/domain/BasicClientInfoBuilderTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/domain/BasicClientInfoBuilderTest.java similarity index 90% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/domain/BasicClientInfoBuilderTest.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/domain/BasicClientInfoBuilderTest.java index 01df62f4..bf2c15c0 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/domain/BasicClientInfoBuilderTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/domain/BasicClientInfoBuilderTest.java @@ -18,10 +18,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.common.domain; +package org.apache.oltu.oauth2.common.domain; -import org.apache.amber.oauth2.common.domain.client.BasicClientInfo; -import org.apache.amber.oauth2.common.domain.client.BasicClientInfoBuilder; +import org.apache.oltu.oauth2.common.domain.client.BasicClientInfo; +import org.apache.oltu.oauth2.common.domain.client.BasicClientInfoBuilder; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/message/OAuthResponseTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/message/OAuthResponseTest.java similarity index 94% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/message/OAuthResponseTest.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/message/OAuthResponseTest.java index 0b693e46..78138de4 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/message/OAuthResponseTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/message/OAuthResponseTest.java @@ -19,9 +19,9 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.message; +package org.apache.oltu.oauth2.common.message; -import org.apache.amber.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.message.OAuthResponse; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java similarity index 86% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java index b3f0c875..c8d716a4 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/BodyURLEncodedParametersApplierTest.java @@ -19,14 +19,16 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.parameters; +package org.apache.oltu.oauth2.common.parameters; import java.util.HashMap; import java.util.Map; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.message.OAuthMessage; -import org.apache.amber.oauth2.common.utils.DummyOAuthMessage; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.parameters.BodyURLEncodedParametersApplier; +import org.apache.oltu.oauth2.common.parameters.OAuthParametersApplier; +import org.apache.oltu.oauth2.common.utils.DummyOAuthMessage; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/JSONBodyParametersApplierTest.java similarity index 85% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/JSONBodyParametersApplierTest.java index 9e14c470..8e5d56b4 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/JSONBodyParametersApplierTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/JSONBodyParametersApplierTest.java @@ -19,15 +19,17 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.parameters; +package org.apache.oltu.oauth2.common.parameters; import java.util.HashMap; import java.util.Map; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.message.OAuthMessage; -import org.apache.amber.oauth2.common.utils.DummyOAuthMessage; -import org.apache.amber.oauth2.common.utils.JSONUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.parameters.JSONBodyParametersApplier; +import org.apache.oltu.oauth2.common.parameters.OAuthParametersApplier; +import org.apache.oltu.oauth2.common.utils.DummyOAuthMessage; +import org.apache.oltu.oauth2.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/QueryParameterApplierTest.java similarity index 86% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/QueryParameterApplierTest.java index b26f7249..b6e582a9 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/QueryParameterApplierTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/QueryParameterApplierTest.java @@ -19,14 +19,16 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.parameters; +package org.apache.oltu.oauth2.common.parameters; import java.util.HashMap; import java.util.Map; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.message.OAuthMessage; -import org.apache.amber.oauth2.common.utils.DummyOAuthMessage; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.parameters.OAuthParametersApplier; +import org.apache.oltu.oauth2.common.parameters.QueryParameterApplier; +import org.apache.oltu.oauth2.common.utils.DummyOAuthMessage; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java similarity index 87% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java index 351bc1fc..c4f85121 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/WWWAuthHeaderParametersApplierTest.java @@ -19,13 +19,15 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.parameters; +package org.apache.oltu.oauth2.common.parameters; import java.util.HashMap; import java.util.Map; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.parameters.OAuthParametersApplier; +import org.apache.oltu.oauth2.common.parameters.WWWAuthHeaderParametersApplier; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/DummyOAuthMessage.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/utils/DummyOAuthMessage.java similarity index 91% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/DummyOAuthMessage.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/utils/DummyOAuthMessage.java index 0ea98b08..ed3d5d5d 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/DummyOAuthMessage.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/utils/DummyOAuthMessage.java @@ -19,9 +19,9 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.utils; +package org.apache.oltu.oauth2.common.utils; -import org.apache.amber.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.message.OAuthResponse; /** * diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/utils/JSONUtilsTest.java similarity index 94% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/utils/JSONUtilsTest.java index 62102c66..26639a8a 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/JSONUtilsTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/utils/JSONUtilsTest.java @@ -19,14 +19,15 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.utils; +package org.apache.oltu.oauth2.common.utils; import java.util.HashMap; import java.util.Map; import javax.xml.stream.XMLStreamReader; -import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.utils.JSONUtils; import org.codehaus.jettison.AbstractXMLStreamReader; import org.codehaus.jettison.json.JSONObject; import org.codehaus.jettison.mapped.MappedXMLStreamReader; diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/utils/OAuthUtilsTest.java similarity index 94% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/utils/OAuthUtilsTest.java index 777b5fc2..b627cc58 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/utils/OAuthUtilsTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/utils/OAuthUtilsTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.utils; +package org.apache.oltu.oauth2.common.utils; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -28,9 +28,10 @@ import java.util.Map; import java.util.Set; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorImpl.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/validators/AbstractValidatorImpl.java similarity index 91% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorImpl.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/validators/AbstractValidatorImpl.java index ebfeb359..7c3b4472 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorImpl.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/validators/AbstractValidatorImpl.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.validators; +package org.apache.oltu.oauth2.common.validators; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; /** * diff --git a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/validators/AbstractValidatorTest.java similarity index 91% rename from oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorTest.java rename to oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/validators/AbstractValidatorTest.java index c4f2284e..90a68b7d 100644 --- a/oauth-2.0/common/src/test/java/org/apache/amber/oauth2/common/validators/AbstractValidatorTest.java +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/validators/AbstractValidatorTest.java @@ -19,12 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.common.validators; +package org.apache.oltu.oauth2.common.validators; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; import org.junit.Test; import static org.easymock.EasyMock.createStrictMock; diff --git a/oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java b/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java similarity index 76% rename from oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java rename to oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java index 6edb45f2..720e9ba3 100644 --- a/oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java +++ b/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/OAuthRegistrationClient.java @@ -19,19 +19,19 @@ * limitations under the License. */ -package org.apache.amber.oauth2.ext.dynamicreg.client; +package org.apache.oltu.oauth2.ext.dynamicreg.client; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.apache.amber.oauth2.client.HttpClient; -import org.apache.amber.oauth2.client.OAuthClient; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.ext.dynamicreg.client.response.OAuthClientRegistrationResponse; +import org.apache.oltu.oauth2.client.HttpClient; +import org.apache.oltu.oauth2.client.OAuthClient; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.ext.dynamicreg.client.response.OAuthClientRegistrationResponse; /** diff --git a/oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java b/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java similarity index 89% rename from oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java rename to oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java index 5917d3e4..43e3f215 100644 --- a/oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java +++ b/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/request/OAuthClientRegistrationRequest.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.ext.dynamicreg.client.request; +package org.apache.oltu.oauth2.ext.dynamicreg.client.request; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.parameters.JSONBodyParametersApplier; -import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.parameters.JSONBodyParametersApplier; +import org.apache.oltu.oauth2.ext.dynamicreg.common.OAuthRegistration; /** diff --git a/oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java b/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java similarity index 83% rename from oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java rename to oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java index b0370250..961b417e 100644 --- a/oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java +++ b/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/response/OAuthClientRegistrationResponse.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.ext.dynamicreg.client.response; +package org.apache.oltu.oauth2.ext.dynamicreg.client.response; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.JSONUtils; -import org.apache.amber.oauth2.ext.dynamicreg.client.validators.RegistrationValidator; -import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.JSONUtils; +import org.apache.oltu.oauth2.ext.dynamicreg.client.validators.RegistrationValidator; +import org.apache.oltu.oauth2.ext.dynamicreg.common.OAuthRegistration; import org.codehaus.jettison.json.JSONException; diff --git a/oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java b/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java similarity index 86% rename from oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java rename to oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java index 91c50c20..85e77427 100644 --- a/oauth-2.0/dynamicreg-client/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java +++ b/oauth-2.0/dynamicreg-client/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/client/validators/RegistrationValidator.java @@ -19,18 +19,18 @@ * limitations under the License. */ -package org.apache.amber.oauth2.ext.dynamicreg.client.validators; +package org.apache.oltu.oauth2.ext.dynamicreg.client.validators; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.client.validator.OAuthClientValidator; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.client.validator.OAuthClientValidator; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.ext.dynamicreg.common.OAuthRegistration; /** * diff --git a/oauth-2.0/dynamicreg-common/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/common/OAuthRegistration.java b/oauth-2.0/dynamicreg-common/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/common/OAuthRegistration.java similarity index 97% rename from oauth-2.0/dynamicreg-common/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/common/OAuthRegistration.java rename to oauth-2.0/dynamicreg-common/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/common/OAuthRegistration.java index e863d2a6..949f95a4 100644 --- a/oauth-2.0/dynamicreg-common/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/common/OAuthRegistration.java +++ b/oauth-2.0/dynamicreg-common/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/common/OAuthRegistration.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.ext.dynamicreg.common; +package org.apache.oltu.oauth2.ext.dynamicreg.common; /** * diff --git a/oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java b/oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java similarity index 90% rename from oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java rename to oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java index d1df1630..9734fe96 100644 --- a/oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java +++ b/oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/request/JSONHttpServletRequestWrapper.java @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.ext.dynamicreg.server.request; +package org.apache.oltu.oauth2.ext.dynamicreg.server.request; import java.util.Collections; import java.util.Enumeration; @@ -29,10 +29,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthRuntimeException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthRuntimeException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java b/oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java similarity index 84% rename from oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java rename to oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java index 7c1fd6f7..6cc9c011 100644 --- a/oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java +++ b/oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequest.java @@ -19,16 +19,16 @@ * limitations under the License. */ -package org.apache.amber.oauth2.ext.dynamicreg.server.request; +package org.apache.oltu.oauth2.ext.dynamicreg.server.request; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.validators.OAuthValidator; -import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; -import org.apache.amber.oauth2.as.request.OAuthRequest; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.ext.dynamicreg.server.validator.PushPullValidator; +import org.apache.oltu.oauth2.as.request.OAuthRequest; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.validators.OAuthValidator; +import org.apache.oltu.oauth2.ext.dynamicreg.common.OAuthRegistration; +import org.apache.oltu.oauth2.ext.dynamicreg.server.validator.PushPullValidator; /** diff --git a/oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java b/oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java similarity index 93% rename from oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java rename to oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java index f6fe0f51..8791cbbd 100644 --- a/oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java +++ b/oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/response/OAuthServerRegistrationResponse.java @@ -19,10 +19,10 @@ * limitations under the License. */ -package org.apache.amber.oauth2.ext.dynamicreg.server.response; +package org.apache.oltu.oauth2.ext.dynamicreg.server.response; -import org.apache.amber.oauth2.as.response.OAuthASResponse; -import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; +import org.apache.oltu.oauth2.as.response.OAuthASResponse; +import org.apache.oltu.oauth2.ext.dynamicreg.common.OAuthRegistration; /** * diff --git a/oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java b/oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java similarity index 86% rename from oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java rename to oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java index 552453e8..9430c258 100644 --- a/oauth-2.0/dynamicreg-server/src/main/java/org/apache/amber/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java +++ b/oauth-2.0/dynamicreg-server/src/main/java/org/apache/oltu/oauth2/ext/dynamicreg/server/validator/PushPullValidator.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.ext.dynamicreg.server.validator; +package org.apache.oltu.oauth2.ext.dynamicreg.server.validator; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.AbstractValidator; -import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; -import org.apache.amber.oauth2.ext.dynamicreg.server.request.JSONHttpServletRequestWrapper; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.ext.dynamicreg.common.OAuthRegistration; +import org.apache.oltu.oauth2.ext.dynamicreg.server.request.JSONHttpServletRequestWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/oauth-2.0/dynamicreg-server/src/test/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java b/oauth-2.0/dynamicreg-server/src/test/java/org/apache/oltu/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java similarity index 88% rename from oauth-2.0/dynamicreg-server/src/test/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java rename to oauth-2.0/dynamicreg-server/src/test/java/org/apache/oltu/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java index ce48c300..b5cf8dff 100644 --- a/oauth-2.0/dynamicreg-server/src/test/java/org/apache/amber/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java +++ b/oauth-2.0/dynamicreg-server/src/test/java/org/apache/oltu/oauth2/ext/dynamicreg/server/request/OAuthServerRegistrationRequestTest.java @@ -18,11 +18,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.ext.dynamicreg.server.request; +package org.apache.oltu.oauth2.ext.dynamicreg.server.request; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.utils.test.FileUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.ext.dynamicreg.server.request.JSONHttpServletRequestWrapper; +import org.apache.oltu.oauth2.ext.dynamicreg.server.request.OAuthServerRegistrationRequest; +import org.apache.oltu.oauth2.utils.test.FileUtils; import org.junit.Assert; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/oauth-2.0/dynamicreg-server/src/test/resources/log4j.properties b/oauth-2.0/dynamicreg-server/src/test/resources/log4j.properties index b9fcb6e8..01632066 100644 --- a/oauth-2.0/dynamicreg-server/src/test/resources/log4j.properties +++ b/oauth-2.0/dynamicreg-server/src/test/resources/log4j.properties @@ -26,4 +26,4 @@ log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern=[%d{yyyy-mm-dd hh:mm:ss.S},%6.6r]%-5p[%t]%x(%F:%L) - %m%n -log4j.logger.org.apache.amber.oauth2=DEBUG \ No newline at end of file +log4j.logger.org.apache.oltu.oauth2=DEBUG \ No newline at end of file diff --git a/oauth-2.0/httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java b/oauth-2.0/httpclient4/src/main/java/org/apache/oltu/oauth2/httpclient4/HttpClient4.java similarity index 88% rename from oauth-2.0/httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java rename to oauth-2.0/httpclient4/src/main/java/org/apache/oltu/oauth2/httpclient4/HttpClient4.java index d40df1f7..995afd14 100644 --- a/oauth-2.0/httpclient4/src/main/java/org/apache/amber/oauth2/httpclient4/HttpClient4.java +++ b/oauth-2.0/httpclient4/src/main/java/org/apache/oltu/oauth2/httpclient4/HttpClient4.java @@ -19,19 +19,11 @@ * limitations under the License. */ -package org.apache.amber.oauth2.httpclient4; +package org.apache.oltu.oauth2.httpclient4; import java.net.URI; import java.util.Map; -import org.apache.amber.oauth2.client.HttpClient; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.client.response.OAuthClientResponseFactory; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -42,6 +34,14 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; +import org.apache.oltu.oauth2.client.HttpClient; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenPasswordCredentialsTest.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/AccessTokenPasswordCredentialsTest.java similarity index 86% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenPasswordCredentialsTest.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/AccessTokenPasswordCredentialsTest.java index 8f3b5db4..9ab19a24 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenPasswordCredentialsTest.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/AccessTokenPasswordCredentialsTest.java @@ -19,19 +19,19 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; - -import org.apache.amber.oauth2.client.OAuthClient; -import org.apache.amber.oauth2.client.URLConnectionClient; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.types.GrantType; +package org.apache.oltu.oauth2.integration; + import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.amber.oauth2.client.response.OAuthJSONAccessTokenResponse; -import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.client.OAuthClient; +import org.apache.oltu.oauth2.client.URLConnectionClient; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.message.types.GrantType; /** diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/AccessTokenTestAuthCodeTest.java similarity index 91% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/AccessTokenTestAuthCodeTest.java index edd67249..d01b60dc 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/AccessTokenTestAuthCodeTest.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/AccessTokenTestAuthCodeTest.java @@ -19,16 +19,16 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; - -import org.apache.amber.oauth2.client.OAuthClient; -import org.apache.amber.oauth2.client.URLConnectionClient; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.client.response.OAuthAccessTokenResponse; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.types.GrantType; +package org.apache.oltu.oauth2.integration; + +import org.apache.oltu.oauth2.client.OAuthClient; +import org.apache.oltu.oauth2.client.URLConnectionClient; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthAccessTokenResponse; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.message.types.GrantType; import org.junit.Test; /** diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationOAuthTest.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientRegistrationOAuthTest.java similarity index 97% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationOAuthTest.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientRegistrationOAuthTest.java index ad2676d1..31c5acee 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationOAuthTest.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientRegistrationOAuthTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; +package org.apache.oltu.oauth2.integration; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationTest.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientRegistrationTest.java similarity index 82% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationTest.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientRegistrationTest.java index 30734626..798216e0 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientRegistrationTest.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientRegistrationTest.java @@ -19,17 +19,17 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; +package org.apache.oltu.oauth2.integration; -import org.apache.amber.oauth2.client.URLConnectionClient; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.ext.dynamicreg.client.OAuthRegistrationClient; -import org.apache.amber.oauth2.ext.dynamicreg.client.request.OAuthClientRegistrationRequest; import org.junit.Test; -import org.apache.amber.oauth2.ext.dynamicreg.client.response.OAuthClientRegistrationResponse; -import org.apache.amber.oauth2.ext.dynamicreg.common.OAuthRegistration; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.client.URLConnectionClient; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.ext.dynamicreg.client.OAuthRegistrationClient; +import org.apache.oltu.oauth2.ext.dynamicreg.client.request.OAuthClientRegistrationRequest; +import org.apache.oltu.oauth2.ext.dynamicreg.client.response.OAuthClientRegistrationResponse; +import org.apache.oltu.oauth2.ext.dynamicreg.common.OAuthRegistration; /** * diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientResourceOAuthTest.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientResourceOAuthTest.java similarity index 97% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientResourceOAuthTest.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientResourceOAuthTest.java index c635239f..7327b2fb 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientResourceOAuthTest.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientResourceOAuthTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; +package org.apache.oltu.oauth2.integration; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientServerOAuthTest.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientServerOAuthTest.java similarity index 97% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientServerOAuthTest.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientServerOAuthTest.java index cdd973ea..6b94906d 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ClientServerOAuthTest.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientServerOAuthTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; +package org.apache.oltu.oauth2.integration; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/Common.java similarity index 98% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/Common.java index 52b3b5fd..7001438e 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/Common.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/Common.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; +package org.apache.oltu.oauth2.integration; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; /** * diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/CommonExt.java similarity index 97% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/CommonExt.java index 1c061876..dd567ea1 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/CommonExt.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/CommonExt.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; +package org.apache.oltu.oauth2.integration; /** * diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/EndUserAuthorizationTest.java similarity index 87% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/EndUserAuthorizationTest.java index 3e882ce5..e590503f 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/EndUserAuthorizationTest.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/EndUserAuthorizationTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; +package org.apache.oltu.oauth2.integration; import java.net.HttpURLConnection; import java.util.Map; @@ -31,14 +31,14 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import org.apache.amber.oauth2.client.request.OAuthClientRequest; -import org.apache.amber.oauth2.client.response.OAuthAuthzResponse; -import org.apache.amber.oauth2.client.response.OAuthClientResponse; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.types.ResponseType; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.client.request.OAuthClientRequest; +import org.apache.oltu.oauth2.client.response.OAuthAuthzResponse; +import org.apache.oltu.oauth2.client.response.OAuthClientResponse; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.message.types.ResponseType; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; import org.junit.Test; /** diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/JUnit4SpringContextTests.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/JUnit4SpringContextTests.java similarity index 96% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/JUnit4SpringContextTests.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/JUnit4SpringContextTests.java index 87ab56dd..f5c7f030 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/JUnit4SpringContextTests.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/JUnit4SpringContextTests.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; +package org.apache.oltu.oauth2.integration; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ResourceTest.java similarity index 98% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ResourceTest.java index 309889e1..9e3bbeb9 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/ResourceTest.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ResourceTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration; +package org.apache.oltu.oauth2.integration; import java.io.InputStream; import java.io.OutputStream; @@ -29,8 +29,8 @@ import java.net.URLConnection; import java.util.Map; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; import org.junit.Test; diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/AuthzEndpoint.java similarity index 83% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/AuthzEndpoint.java index da0c7a22..76e93cff 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/AuthzEndpoint.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/AuthzEndpoint.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration.endpoints; +package org.apache.oltu.oauth2.integration.endpoints; import java.net.URI; import java.net.URISyntaxException; @@ -32,16 +32,16 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import org.apache.amber.oauth2.as.issuer.MD5Generator; -import org.apache.amber.oauth2.as.issuer.OAuthIssuerImpl; -import org.apache.amber.oauth2.as.request.OAuthAuthzRequest; -import org.apache.amber.oauth2.as.response.OAuthASResponse; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.amber.oauth2.common.message.types.ResponseType; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.as.issuer.MD5Generator; +import org.apache.oltu.oauth2.as.issuer.OAuthIssuerImpl; +import org.apache.oltu.oauth2.as.request.OAuthAuthzRequest; +import org.apache.oltu.oauth2.as.response.OAuthASResponse; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.message.types.ResponseType; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** * diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/RegistrationEndpoint.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/RegistrationEndpoint.java similarity index 81% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/RegistrationEndpoint.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/RegistrationEndpoint.java index 4be70332..97735b46 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/RegistrationEndpoint.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/RegistrationEndpoint.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration.endpoints; +package org.apache.oltu.oauth2.integration.endpoints; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -30,13 +30,13 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.amber.oauth2.ext.dynamicreg.server.request.JSONHttpServletRequestWrapper; -import org.apache.amber.oauth2.ext.dynamicreg.server.request.OAuthServerRegistrationRequest; -import org.apache.amber.oauth2.ext.dynamicreg.server.response.OAuthServerRegistrationResponse; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.integration.CommonExt; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.ext.dynamicreg.server.request.JSONHttpServletRequestWrapper; +import org.apache.oltu.oauth2.ext.dynamicreg.server.request.OAuthServerRegistrationRequest; +import org.apache.oltu.oauth2.ext.dynamicreg.server.response.OAuthServerRegistrationResponse; +import org.apache.oltu.oauth2.integration.CommonExt; /** * diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceBodyEndpoint.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/ResourceBodyEndpoint.java similarity index 89% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceBodyEndpoint.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/ResourceBodyEndpoint.java index 7302a3ae..5936240b 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceBodyEndpoint.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/ResourceBodyEndpoint.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration.endpoints; +package org.apache.oltu.oauth2.integration.endpoints; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -30,16 +30,16 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.types.ParameterStyle; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.integration.Common; -import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.amber.oauth2.rs.response.OAuthRSResponse; -import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.message.types.ParameterStyle; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.integration.Common; +import org.apache.oltu.oauth2.rs.request.OAuthAccessResourceRequest; +import org.apache.oltu.oauth2.rs.response.OAuthRSResponse; /** * diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceHeaderEndpoint.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/ResourceHeaderEndpoint.java similarity index 86% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceHeaderEndpoint.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/ResourceHeaderEndpoint.java index 82e80eba..72422d86 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceHeaderEndpoint.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/ResourceHeaderEndpoint.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration.endpoints; +package org.apache.oltu.oauth2.integration.endpoints; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,16 +29,16 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.amber.oauth2.common.message.types.ParameterStyle; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.integration.Common; -import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest; -import org.apache.amber.oauth2.rs.response.OAuthRSResponse; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.message.types.ParameterStyle; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.integration.Common; +import org.apache.oltu.oauth2.rs.request.OAuthAccessResourceRequest; +import org.apache.oltu.oauth2.rs.response.OAuthRSResponse; /** * diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceQueryEndpoint.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/ResourceQueryEndpoint.java similarity index 85% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceQueryEndpoint.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/ResourceQueryEndpoint.java index 07d09b7e..2caa1cec 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/ResourceQueryEndpoint.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/ResourceQueryEndpoint.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration.endpoints; +package org.apache.oltu.oauth2.integration.endpoints; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,16 +29,16 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.amber.oauth2.common.message.types.ParameterStyle; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.integration.Common; -import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest; -import org.apache.amber.oauth2.rs.response.OAuthRSResponse; -import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.message.types.ParameterStyle; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.integration.Common; +import org.apache.oltu.oauth2.rs.request.OAuthAccessResourceRequest; +import org.apache.oltu.oauth2.rs.response.OAuthRSResponse; /** diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/TokenEndpoint.java similarity index 87% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/TokenEndpoint.java index 66ab9e81..5e4f88df 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/endpoints/TokenEndpoint.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/endpoints/TokenEndpoint.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration.endpoints; +package org.apache.oltu.oauth2.integration.endpoints; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -31,18 +31,18 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import org.apache.amber.oauth2.as.issuer.MD5Generator; -import org.apache.amber.oauth2.as.issuer.OAuthIssuer; -import org.apache.amber.oauth2.as.issuer.OAuthIssuerImpl; -import org.apache.amber.oauth2.as.request.OAuthTokenRequest; -import org.apache.amber.oauth2.as.response.OAuthASResponse; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.amber.oauth2.common.message.types.GrantType; -import org.apache.amber.oauth2.integration.Common; +import org.apache.oltu.oauth2.as.issuer.MD5Generator; +import org.apache.oltu.oauth2.as.issuer.OAuthIssuer; +import org.apache.oltu.oauth2.as.issuer.OAuthIssuerImpl; +import org.apache.oltu.oauth2.as.request.OAuthTokenRequest; +import org.apache.oltu.oauth2.as.response.OAuthASResponse; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.message.types.GrantType; +import org.apache.oltu.oauth2.integration.Common; /** * diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/server/ResourceServlet.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/server/ResourceServlet.java similarity index 97% rename from oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/server/ResourceServlet.java rename to oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/server/ResourceServlet.java index 3fe66bef..925faf18 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/amber/oauth2/integration/server/ResourceServlet.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/server/ResourceServlet.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.integration.server; +package org.apache.oltu.oauth2.integration.server; import java.io.IOException; import javax.servlet.ServletConfig; diff --git a/oauth-2.0/integration-tests/src/test/resources/oauth-beans.xml b/oauth-2.0/integration-tests/src/test/resources/oauth-beans.xml index 95d54c32..259e0b1f 100644 --- a/oauth-2.0/integration-tests/src/test/resources/oauth-beans.xml +++ b/oauth-2.0/integration-tests/src/test/resources/oauth-beans.xml @@ -41,7 +41,7 @@ + class="org.apache.oltu.oauth2.integration.endpoints.RegistrationEndpoint"/> @@ -52,8 +52,8 @@ - + class="org.apache.oltu.oauth2.integration.endpoints.AuthzEndpoint"/> + @@ -62,7 +62,7 @@ - + @@ -74,10 +74,10 @@ + class="org.apache.oltu.oauth2.integration.endpoints.ResourceHeaderEndpoint"/> + class="org.apache.oltu.oauth2.integration.endpoints.ResourceBodyEndpoint"/> + class="org.apache.oltu.oauth2.integration.endpoints.ResourceQueryEndpoint"/> \ No newline at end of file diff --git a/oauth-2.0/integration-tests/src/test/resources/server/WEB-INF/web.xml b/oauth-2.0/integration-tests/src/test/resources/server/WEB-INF/web.xml index 580f84c0..46c3d2d3 100644 --- a/oauth-2.0/integration-tests/src/test/resources/server/WEB-INF/web.xml +++ b/oauth-2.0/integration-tests/src/test/resources/server/WEB-INF/web.xml @@ -29,7 +29,7 @@ testServlet - org.apache.amber.oauth2.integration.server.ExampleServlet + org.apache.oltu.oauth2.integration.server.ExampleServlet diff --git a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthClient.java b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthClient.java similarity index 95% rename from oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthClient.java rename to oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthClient.java index 1de80970..d09d7fd2 100644 --- a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthClient.java +++ b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthClient.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rsfilter; +package org.apache.oltu.oauth2.rsfilter; /** * diff --git a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthDecision.java b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthDecision.java similarity index 96% rename from oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthDecision.java rename to oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthDecision.java index 939243ab..7c329928 100644 --- a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthDecision.java +++ b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthDecision.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rsfilter; +package org.apache.oltu.oauth2.rsfilter; import java.security.Principal; diff --git a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthFilter.java b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthFilter.java similarity index 91% rename from oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthFilter.java rename to oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthFilter.java index 6b5eab90..804867e8 100644 --- a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthFilter.java +++ b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthFilter.java @@ -19,16 +19,16 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rsfilter; - -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.amber.oauth2.common.message.types.ParameterStyle; -import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest; -import org.apache.amber.oauth2.rs.response.OAuthRSResponse; +package org.apache.oltu.oauth2.rsfilter; + +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.message.types.ParameterStyle; +import org.apache.oltu.oauth2.rs.request.OAuthAccessResourceRequest; +import org.apache.oltu.oauth2.rs.response.OAuthRSResponse; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; diff --git a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthRSProvider.java b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthRSProvider.java similarity index 90% rename from oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthRSProvider.java rename to oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthRSProvider.java index 3cb75345..bb3eb6a7 100644 --- a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthRSProvider.java +++ b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthRSProvider.java @@ -19,11 +19,11 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rsfilter; +package org.apache.oltu.oauth2.rsfilter; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; /** diff --git a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthUtils.java b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthUtils.java similarity index 98% rename from oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthUtils.java rename to oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthUtils.java index adc2cce7..1276f773 100644 --- a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/amber/oauth2/rsfilter/OAuthUtils.java +++ b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthUtils.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rsfilter; +package org.apache.oltu.oauth2.rsfilter; import javax.servlet.ServletContext; import javax.servlet.ServletException; diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/BearerResourceServer.java similarity index 73% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/BearerResourceServer.java index 50efa726..296a04f4 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/BearerResourceServer.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/BearerResourceServer.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.rs; +package org.apache.oltu.oauth2.rs; -import org.apache.amber.oauth2.common.message.types.ParameterStyle; -import org.apache.amber.oauth2.rs.extractor.BearerBodyTokenExtractor; -import org.apache.amber.oauth2.rs.extractor.BearerHeaderTokenExtractor; -import org.apache.amber.oauth2.rs.extractor.BearerQueryTokenExtractor; -import org.apache.amber.oauth2.rs.validator.BearerBodyOAuthValidator; -import org.apache.amber.oauth2.rs.validator.BearerHeaderOAuthValidator; -import org.apache.amber.oauth2.rs.validator.BearerQueryOAuthValidator; +import org.apache.oltu.oauth2.common.message.types.ParameterStyle; +import org.apache.oltu.oauth2.rs.extractor.BearerBodyTokenExtractor; +import org.apache.oltu.oauth2.rs.extractor.BearerHeaderTokenExtractor; +import org.apache.oltu.oauth2.rs.extractor.BearerQueryTokenExtractor; +import org.apache.oltu.oauth2.rs.validator.BearerBodyOAuthValidator; +import org.apache.oltu.oauth2.rs.validator.BearerHeaderOAuthValidator; +import org.apache.oltu.oauth2.rs.validator.BearerQueryOAuthValidator; public class BearerResourceServer extends ResourceServer { diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/ResourceServer.java similarity index 90% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/ResourceServer.java index dae41145..b21239ae 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/ResourceServer.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/ResourceServer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.rs; +package org.apache.oltu.oauth2.rs; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -25,11 +25,11 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.types.ParameterStyle; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.OAuthValidator; -import org.apache.amber.oauth2.rs.extractor.TokenExtractor; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.types.ParameterStyle; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.OAuthValidator; +import org.apache.oltu.oauth2.rs.extractor.TokenExtractor; public abstract class ResourceServer { diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerBodyTokenExtractor.java similarity index 94% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerBodyTokenExtractor.java index b88d5aca..5bd47336 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerBodyTokenExtractor.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerBodyTokenExtractor.java @@ -19,11 +19,11 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.extractor; +package org.apache.oltu.oauth2.rs.extractor; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.OAuth; /** diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerHeaderTokenExtractor.java similarity index 91% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerHeaderTokenExtractor.java index 30504d51..27ee4191 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerHeaderTokenExtractor.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerHeaderTokenExtractor.java @@ -19,12 +19,12 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.extractor; +package org.apache.oltu.oauth2.rs.extractor; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; /** diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerQueryTokenExtractor.java similarity index 89% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerQueryTokenExtractor.java index cda8d300..65f48185 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/BearerQueryTokenExtractor.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerQueryTokenExtractor.java @@ -19,13 +19,13 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.extractor; +package org.apache.oltu.oauth2.rs.extractor; -import static org.apache.amber.oauth2.rs.ResourceServer.getQueryParameterValue; +import static org.apache.oltu.oauth2.rs.ResourceServer.getQueryParameterValue; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.OAuth; /** * diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/TokenExtractor.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/TokenExtractor.java similarity index 96% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/TokenExtractor.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/TokenExtractor.java index 72c17c5e..dd98b49b 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/extractor/TokenExtractor.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/TokenExtractor.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.extractor; +package org.apache.oltu.oauth2.rs.extractor; import javax.servlet.http.HttpServletRequest; diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/request/OAuthAccessResourceRequest.java similarity index 87% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/request/OAuthAccessResourceRequest.java index 6d766fbb..b69c2786 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/request/OAuthAccessResourceRequest.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/request/OAuthAccessResourceRequest.java @@ -19,23 +19,23 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.request; +package org.apache.oltu.oauth2.rs.request; import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; -import org.apache.amber.oauth2.common.message.types.ParameterStyle; -import org.apache.amber.oauth2.common.message.types.TokenType; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.OAuthValidator; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.rs.BearerResourceServer; -import org.apache.amber.oauth2.rs.ResourceServer; -import org.apache.amber.oauth2.rs.extractor.TokenExtractor; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.types.ParameterStyle; +import org.apache.oltu.oauth2.common.message.types.TokenType; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.OAuthValidator; +import org.apache.oltu.oauth2.rs.BearerResourceServer; +import org.apache.oltu.oauth2.rs.ResourceServer; +import org.apache.oltu.oauth2.rs.extractor.TokenExtractor; /** * diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/response/OAuthRSResponse.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/response/OAuthRSResponse.java similarity index 92% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/response/OAuthRSResponse.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/response/OAuthRSResponse.java index d639e381..c717ccea 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/response/OAuthRSResponse.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/response/OAuthRSResponse.java @@ -19,9 +19,9 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.response; +package org.apache.oltu.oauth2.rs.response; -import org.apache.amber.oauth2.common.message.OAuthResponse; +import org.apache.oltu.oauth2.common.message.OAuthResponse; /** diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerBodyOAuthValidator.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerBodyOAuthValidator.java similarity index 90% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerBodyOAuthValidator.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerBodyOAuthValidator.java index c4e01df0..706c03ab 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerBodyOAuthValidator.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerBodyOAuthValidator.java @@ -19,15 +19,15 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.validator; +package org.apache.oltu.oauth2.rs.validator; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; /** diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerHeaderOAuthValidator.java similarity index 88% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerHeaderOAuthValidator.java index 7566c14f..5be2d1a3 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerHeaderOAuthValidator.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerHeaderOAuthValidator.java @@ -19,16 +19,16 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.validator; +package org.apache.oltu.oauth2.rs.validator; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; /** diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerQueryOAuthValidator.java similarity index 82% rename from oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java rename to oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerQueryOAuthValidator.java index 4c9276ad..cb5200ac 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/amber/oauth2/rs/validator/BearerQueryOAuthValidator.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerQueryOAuthValidator.java @@ -19,18 +19,18 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.validator; +package org.apache.oltu.oauth2.rs.validator; -import static org.apache.amber.oauth2.rs.ResourceServer.getQueryParameterValues; +import static org.apache.oltu.oauth2.rs.ResourceServer.getQueryParameterValues; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; -import org.apache.amber.oauth2.common.validators.AbstractValidator; -import org.apache.amber.oauth2.rs.ResourceServer; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.validators.AbstractValidator; +import org.apache.oltu.oauth2.rs.ResourceServer; /** * diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/OAuthAccessResourceRequestTest.java similarity index 98% rename from oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java rename to oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/OAuthAccessResourceRequestTest.java index ea0ccce8..5dd4b3df 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/OAuthAccessResourceRequestTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/OAuthAccessResourceRequestTest.java @@ -19,18 +19,18 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs; +package org.apache.oltu.oauth2.rs; import static org.easymock.EasyMock.*; import static org.junit.Assert.fail; import javax.servlet.http.HttpServletRequest; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.types.ParameterStyle; -import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.message.types.ParameterStyle; +import org.apache.oltu.oauth2.rs.request.OAuthAccessResourceRequest; import org.junit.Assert; import org.junit.Test; diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/BodyTokenExtractorTest.java similarity index 93% rename from oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java rename to oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/BodyTokenExtractorTest.java index aa91126d..fb2b31c4 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/BodyTokenExtractorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/BodyTokenExtractorTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.extractor; +package org.apache.oltu.oauth2.rs.extractor; import static org.easymock.EasyMock.createStrictMock; import static org.easymock.EasyMock.expect; @@ -30,7 +30,8 @@ import junit.framework.Assert; -import org.apache.amber.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.rs.extractor.BearerBodyTokenExtractor; import org.junit.Test; diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/HeaderTokenExtractorTest.java similarity index 92% rename from oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java rename to oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/HeaderTokenExtractorTest.java index e7ff6e83..c0ea66f8 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/HeaderTokenExtractorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/HeaderTokenExtractorTest.java @@ -19,14 +19,14 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.extractor; +package org.apache.oltu.oauth2.rs.extractor; import javax.servlet.http.HttpServletRequest; import junit.framework.Assert; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.rs.extractor.BearerHeaderTokenExtractor; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.rs.extractor.BearerHeaderTokenExtractor; import org.junit.Test; import static org.easymock.EasyMock.createStrictMock; diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/QueryTokenExtractorTest.java similarity index 95% rename from oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java rename to oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/QueryTokenExtractorTest.java index b0a12f3f..9d3d3bde 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/extractor/QueryTokenExtractorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/QueryTokenExtractorTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.extractor; +package org.apache.oltu.oauth2.rs.extractor; import static org.easymock.EasyMock.createStrictMock; import static org.easymock.EasyMock.expect; @@ -30,6 +30,7 @@ import junit.framework.Assert; +import org.apache.oltu.oauth2.rs.extractor.BearerQueryTokenExtractor; import org.junit.Test; diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/BodyOAuthValidatorTest.java similarity index 96% rename from oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java rename to oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/BodyOAuthValidatorTest.java index 08350ec6..f6007790 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/BodyOAuthValidatorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/BodyOAuthValidatorTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.validator; +package org.apache.oltu.oauth2.rs.validator; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -30,9 +30,10 @@ import junit.framework.Assert; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.rs.validator.BearerBodyOAuthValidator; import org.junit.Test; /** diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/HeaderOAuthValidatorTest.java similarity index 93% rename from oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java rename to oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/HeaderOAuthValidatorTest.java index 023a367b..e7cb2362 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/HeaderOAuthValidatorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/HeaderOAuthValidatorTest.java @@ -19,18 +19,18 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.validator; +package org.apache.oltu.oauth2.rs.validator; import javax.servlet.http.HttpServletRequest; import junit.framework.Assert; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.rs.validator.BearerHeaderOAuthValidator; import org.junit.Test; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.rs.validator.BearerHeaderOAuthValidator; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/QueryOAuthValidatorTest.java similarity index 93% rename from oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java rename to oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/QueryOAuthValidatorTest.java index 2dc0f7e1..3f3fcfc8 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/amber/oauth2/rs/validator/QueryOAuthValidatorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/QueryOAuthValidatorTest.java @@ -19,7 +19,7 @@ * limitations under the License. */ -package org.apache.amber.oauth2.rs.validator; +package org.apache.oltu.oauth2.rs.validator; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -30,10 +30,11 @@ import junit.framework.Assert; -import org.apache.amber.oauth2.common.OAuth; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.error.OAuthError; +import org.apache.oltu.oauth2.common.exception.OAuthProblemException; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; +import org.apache.oltu.oauth2.rs.validator.BearerQueryOAuthValidator; import org.junit.Test; /** diff --git a/oauth-2.0/test-utils/src/main/java/org/apache/amber/oauth2/utils/test/FileUtils.java b/oauth-2.0/test-utils/src/main/java/org/apache/oltu/oauth2/utils/test/FileUtils.java similarity index 94% rename from oauth-2.0/test-utils/src/main/java/org/apache/amber/oauth2/utils/test/FileUtils.java rename to oauth-2.0/test-utils/src/main/java/org/apache/oltu/oauth2/utils/test/FileUtils.java index cfbb4f73..643a4952 100644 --- a/oauth-2.0/test-utils/src/main/java/org/apache/amber/oauth2/utils/test/FileUtils.java +++ b/oauth-2.0/test-utils/src/main/java/org/apache/oltu/oauth2/utils/test/FileUtils.java @@ -18,7 +18,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.amber.oauth2.utils.test; +package org.apache.oltu.oauth2.utils.test; import java.io.BufferedReader; import java.io.IOException; From 173847da74e7d4eec6dd374af06af2b3b0279c5c Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Sat, 26 Jan 2013 20:04:48 +0000 Subject: [PATCH 220/583] [AMBER-75] Change packages, artifact names, etc. to Oltu updated project name reference the NOTICE file took advantage to update the copyright year git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1438952 13f79535-47bb-0310-9956-ffa450edef68 --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index c64ced11..b7445119 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ -Apache Amber -Copyright 2010-2012 The Apache Software Foundation +Apache Oltu +Copyright 2010-2013 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). From 6e42387a66da0ee1df2c78b4a9bc3678e03125d7 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Wed, 30 Jan 2013 15:43:41 +0000 Subject: [PATCH 221/583] (re)configured ciManagement for configured modules git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1440479 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 15 +++++++++++++++ pom.xml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index ebc63455..676298af 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -44,6 +44,21 @@ integration-tests + + Jenkins + https://builds.apache.org/job/Oltu-OAuth-2.0/ + + + mail + true + true + false + false +
      dev@oltu.apache.org
       +       +       +       + 2.2.10 3.0.3.RELEASE diff --git a/pom.xml b/pom.xml index 847d7381..76ba8415 100644 --- a/pom.xml +++ b/pom.xml @@ -266,7 +266,7 @@ Jenkins - https://builds.apache.org/job/Amber/ + https://builds.apache.org/job/Oltu/ mail From 1d118995f3e6b8a323d643613b1da2cbc3a67359 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Mon, 25 Feb 2013 10:24:37 +0000 Subject: [PATCH 222/583] AMBER-64 - QueryParameterApplier needs to include the scope parameter in the fragment : - applied patch from Stein Welberg slightly modified. git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1449648 13f79535-47bb-0310-9956-ffa450edef68 --- .../as/response/OAuthASResponseTest.java | 27 +++++--- .../oauth2/common/message/OAuthResponse.java | 8 +++ .../parameters/FragmentParametersApplier.java | 53 +++++++++++++++ .../parameters/QueryParameterApplier.java | 63 +----------------- .../FragmentParametersApplierTest.java | 65 +++++++++++++++++++ 5 files changed, 148 insertions(+), 68 deletions(-) create mode 100644 oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/FragmentParametersApplier.java create mode 100644 oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/FragmentParametersApplierTest.java diff --git a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java index db9fa975..d4463a60 100644 --- a/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java +++ b/oauth-2.0/authzserver/src/test/java/org/apache/oltu/oauth2/as/response/OAuthASResponseTest.java @@ -48,16 +48,13 @@ public void testAuthzResponse() throws Exception { OAuthResponse oAuthResponse = OAuthASResponse.authorizationResponse(request,200) .location("http://www.example.com") .setCode("code") - .setAccessToken("access_111") - .setExpiresIn(400l) .setState("ok") .setParam("testValue", "value2") .buildQueryMessage(); String url = oAuthResponse.getLocationUri(); - Assert.assertEquals("http://www.example.com?testValue=value2&code=code" - + "#access_token=access_111&state=ok&expires_in=400", url); + Assert.assertEquals("http://www.example.com?testValue=value2&state=ok&code=code", url); Assert.assertEquals(200, oAuthResponse.getResponseStatus()); } @@ -70,18 +67,32 @@ public void testAuthzResponseWithState() throws Exception { OAuthResponse oAuthResponse = OAuthASResponse.authorizationResponse(request,200) .location("http://www.example.com") .setCode("code") - .setAccessToken("access_111") - .setExpiresIn("400") .setParam("testValue", "value2") .buildQueryMessage(); String url = oAuthResponse.getLocationUri(); - Assert.assertEquals("http://www.example.com?testValue=value2&code=code" - + "#access_token=access_111&state=ok&expires_in=400", url); + Assert.assertEquals("http://www.example.com?testValue=value2&state=ok&code=code", url); Assert.assertEquals(200, oAuthResponse.getResponseStatus()); } + + @Test + public void testAuthzImplicitResponseWithState() throws Exception { + HttpServletRequest request = createMock(HttpServletRequest.class); + expect(request.getParameter(OAuth.OAUTH_STATE)).andStubReturn("ok"); + replay(request); + OAuthResponse oAuthResponse = OAuthASResponse.authorizationResponse(request,200) + .location("http://www.example.com") + .setAccessToken("access_111") + .setExpiresIn("400") + .setParam("testValue", "value2") + .buildQueryMessage(); + + String url = oAuthResponse.getLocationUri(); + Assert.assertEquals("http://www.example.com#testValue=value2&state=ok&expires_in=400&access_token=access_111", url); + Assert.assertEquals(200, oAuthResponse.getResponseStatus()); + } @Test diff --git a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/OAuthResponse.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/OAuthResponse.java index bde116e7..3514ebc2 100644 --- a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/OAuthResponse.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/message/OAuthResponse.java @@ -29,6 +29,7 @@ import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.apache.oltu.oauth2.common.exception.OAuthSystemException; import org.apache.oltu.oauth2.common.parameters.BodyURLEncodedParametersApplier; +import org.apache.oltu.oauth2.common.parameters.FragmentParametersApplier; import org.apache.oltu.oauth2.common.parameters.JSONBodyParametersApplier; import org.apache.oltu.oauth2.common.parameters.OAuthParametersApplier; import org.apache.oltu.oauth2.common.parameters.QueryParameterApplier; @@ -133,6 +134,13 @@ public OAuthResponseBuilder setParam(String key, String value) { public OAuthResponse buildQueryMessage() throws OAuthSystemException { OAuthResponse msg = new OAuthResponse(location, responseCode); this.applier = new QueryParameterApplier(); + + if (parameters.containsKey(OAuth.OAUTH_ACCESS_TOKEN)) { + this.applier = new FragmentParametersApplier(); + }else{ + this.applier = new QueryParameterApplier(); + } + return (OAuthResponse)applier.applyOAuthParameters(msg, parameters); } diff --git a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/FragmentParametersApplier.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/FragmentParametersApplier.java new file mode 100644 index 00000000..6d64e192 --- /dev/null +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/FragmentParametersApplier.java @@ -0,0 +1,53 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.oltu.oauth2.common.parameters; + +import java.util.Map; + +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.exception.OAuthSystemException; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.utils.OAuthUtils; + +public class FragmentParametersApplier implements OAuthParametersApplier { + + public OAuthMessage applyOAuthParameters(OAuthMessage message, Map params) throws OAuthSystemException { + + String messageUrl = message.getLocationUri(); + if (messageUrl != null) { + StringBuilder url = new StringBuilder(messageUrl); + + if (params.containsKey(OAuth.OAUTH_REFRESH_TOKEN)) { + params.remove(OAuth.OAUTH_REFRESH_TOKEN); + } + + String fragmentQuery = OAuthUtils.format(params.entrySet(), "UTF-8"); + + if (!OAuthUtils.isEmpty(fragmentQuery)) { + if (params.size() > 0) { + url.append("#").append(fragmentQuery); + } + } + message.setLocationUri(url.toString()); + } + return message; + } +} diff --git a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/QueryParameterApplier.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/QueryParameterApplier.java index 914ead71..4680d349 100644 --- a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/QueryParameterApplier.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/parameters/QueryParameterApplier.java @@ -21,11 +21,7 @@ package org.apache.oltu.oauth2.common.parameters; -import java.util.LinkedHashMap; import java.util.Map; - -import org.apache.oltu.oauth2.common.OAuth; -import org.apache.oltu.oauth2.common.error.OAuthError; import org.apache.oltu.oauth2.common.message.OAuthMessage; import org.apache.oltu.oauth2.common.utils.OAuthUtils; @@ -42,69 +38,16 @@ public OAuthMessage applyOAuthParameters(OAuthMessage message, Map fragmentParams = new LinkedHashMap(); - if (params.containsKey(OAuth.OAUTH_ACCESS_TOKEN)) { - fragmentParams.put(OAuth.OAUTH_ACCESS_TOKEN, params.remove(OAuth.OAUTH_ACCESS_TOKEN)); - - // State should be in the fragment too - if (params.containsKey(OAuth.OAUTH_STATE)) { - fragmentParams.put(OAuth.OAUTH_STATE, params.remove(OAuth.OAUTH_STATE)); - } - - if (params.containsKey(OAuth.OAUTH_EXPIRES_IN)) { - fragmentParams.put(OAuth.OAUTH_EXPIRES_IN, params.remove(OAuth.OAUTH_EXPIRES_IN)); - } - - if (params.containsKey(OAuth.OAUTH_TOKEN_TYPE)) { - fragmentParams.put(OAuth.OAUTH_TOKEN_TYPE, params.remove(OAuth.OAUTH_TOKEN_TYPE)); - } - - if (params.containsKey(OAuth.OAUTH_SCOPE)) { - fragmentParams.put(OAuth.OAUTH_SCOPE, params.remove(OAuth.OAUTH_SCOPE)); - } - - if (params.containsKey(OAuthError.OAUTH_ERROR)) { - fragmentParams.put(OAuthError.OAUTH_ERROR, params.remove(OAuthError.OAUTH_ERROR)); - } - - if (params.containsKey(OAuthError.OAUTH_ERROR_DESCRIPTION)) { - fragmentParams.put(OAuthError.OAUTH_ERROR_DESCRIPTION, params.remove(OAuthError.OAUTH_ERROR_DESCRIPTION)); - } - - if (params.containsKey(OAuthError.OAUTH_ERROR_URI)) { - fragmentParams.put(OAuthError.OAUTH_ERROR_URI, params.remove(OAuthError.OAUTH_ERROR_URI)); - } - - } - + StringBuffer query = new StringBuffer(OAuthUtils.format(params.entrySet(), "UTF-8")); - String fragmentQuery = ""; - if (fragmentParams.containsKey(OAuth.OAUTH_ACCESS_TOKEN)) { - fragmentQuery = OAuthUtils.format(fragmentParams.entrySet(), "UTF-8"); - } - + if (!OAuthUtils.isEmpty(query.toString())) { if (containsQuestionMark) { url.append("&").append(query); } else { url.append("?").append(query); } - } - - if (!OAuthUtils.isEmpty(fragmentQuery)) { - if (fragmentParams.size()>1){ - url.append("#").append(fragmentQuery); - }else{ - if (containsQuestionMark) { - url.append("&").append(fragmentQuery); - } else { - url.append("?").append(fragmentQuery); - } - } - } - + } message.setLocationUri(url.toString()); } return message; diff --git a/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/FragmentParametersApplierTest.java b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/FragmentParametersApplierTest.java new file mode 100644 index 00000000..90c27a1f --- /dev/null +++ b/oauth-2.0/common/src/test/java/org/apache/oltu/oauth2/common/parameters/FragmentParametersApplierTest.java @@ -0,0 +1,65 @@ +/** + * Copyright 2010 Newcastle University + * + * http://research.ncl.ac.uk/smart/ + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.oltu.oauth2.common.parameters; + +import org.apache.oltu.oauth2.common.OAuth; +import org.apache.oltu.oauth2.common.message.OAuthMessage; +import org.apache.oltu.oauth2.common.utils.DummyOAuthMessage; +import org.junit.Assert; +import org.junit.Test; + +import java.util.HashMap; +import java.util.Map; + +public class FragmentParametersApplierTest { + + @Test + public void testApplyOAuthParameters() throws Exception { + + OAuthParametersApplier app = new FragmentParametersApplier(); + + Map params = new HashMap(); + params.put(OAuth.OAUTH_EXPIRES_IN, 3600l); + params.put(OAuth.OAUTH_ACCESS_TOKEN, "token_authz"); + params.put(OAuth.OAUTH_CODE, "code_"); + params.put(OAuth.OAUTH_SCOPE, "read"); + params.put(OAuth.OAUTH_STATE, "state"); + params.put(OAuth.OAUTH_REFRESH_TOKEN, "token_refresh"); + params.put("empty_param", ""); + params.put("null_param", null); + + OAuthMessage message = new DummyOAuthMessage("http://www.example.com/rd", 200); + + app.applyOAuthParameters(message, params); + + String locationURI = message.getLocationUri(); + + Assert.assertTrue(locationURI.contains("3600")); + Assert.assertTrue(locationURI.contains("token_authz")); + Assert.assertTrue(locationURI.contains("code_")); + Assert.assertTrue(locationURI.contains("read")); + Assert.assertTrue(locationURI.contains("state")); + + Assert.assertFalse(locationURI.contains("token_refresh")); + Assert.assertFalse(locationURI.contains("empty_param")); + Assert.assertFalse(locationURI.contains("null_param")); + } +} \ No newline at end of file From 9605974af8e454a46081737021f8d01a8a0ebab9 Mon Sep 17 00:00:00 2001 From: Stein Welberg Date: Mon, 11 Mar 2013 21:49:52 +0000 Subject: [PATCH 223/583] Add myself as committer :-) git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1455345 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 76ba8415..2d73cd82 100644 --- a/pom.xml +++ b/pom.xml @@ -222,6 +222,17 @@ +1 + + stein + Stein Welberg + stein@apache.org + Innovation District + http://www.innovation-district.com + + Committer + + +1 + From 3a22f530f7bc2d0d7299aab0b6819a7523c88320 Mon Sep 17 00:00:00 2001 From: Stein Welberg Date: Mon, 11 Mar 2013 21:50:23 +0000 Subject: [PATCH 224/583] Formatting git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1455346 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 2d73cd82..b5cda646 100644 --- a/pom.xml +++ b/pom.xml @@ -222,6 +222,7 @@ +1 + stein Stein Welberg From 1bcf8b6b7c26c7434356a5d3e13ef62875cd4313 Mon Sep 17 00:00:00 2001 From: Stein Welberg Date: Mon, 11 Mar 2013 21:52:32 +0000 Subject: [PATCH 225/583] Add extra svn:ignores for IntelliJ git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1455347 13f79535-47bb-0310-9956-ffa450edef68 From f75e553f5c7696abfb75d342a97eb586b5451ce5 Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Wed, 20 Mar 2013 16:55:32 +0000 Subject: [PATCH 226/583] added contributors information git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1458943 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b5cda646..c4fbd0c0 100644 --- a/pom.xml +++ b/pom.xml @@ -235,7 +235,33 @@ +1 - + + + + + Markus Sabadello + + + + + + - + + + + + Ben Noordhuis + + + + + + - + + + + + Dev Mailing List From e40c20d75c549a6ba4953c708add792e27e0e79c Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Wed, 20 Mar 2013 17:42:56 +0000 Subject: [PATCH 227/583] updated website links for Jira and wiki git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1458974 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- src/site/site.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c4fbd0c0..fa91744d 100644 --- a/pom.xml +++ b/pom.xml @@ -300,7 +300,7 @@ JIRA - https://issues.apache.org/jira/browse/AMBER + https://issues.apache.org/jira/browse/OLTU Jenkins diff --git a/src/site/site.xml b/src/site/site.xml index 2ab76632..eb953b0f 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -42,7 +42,7 @@ - + From 7692681e4a35281905f8dade3103e726a4019feb Mon Sep 17 00:00:00 2001 From: Antonio Sanso Date: Wed, 20 Mar 2013 18:22:15 +0000 Subject: [PATCH 228/583] updated website links for Jira and wiki git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1458990 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/xdoc/index.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index e9a98ef4..40fbef24 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -30,7 +30,7 @@

      Looking for documentation? The best place where finding the latest up-to-date documentation is the - Wiki.

      + Wiki.

      Please help us on keeping the documentation updated! Every contribution is more than welcome!

      have a look also to APIs documentation.

      From b51811e284b3d961328a4de55e0974e540c9ab55 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 21 Mar 2013 17:22:06 +0000 Subject: [PATCH 229/583] trivial: no tabs, no trailing spaces, dropped empty lines git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1459412 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index fa91744d..3a08c467 100644 --- a/pom.xml +++ b/pom.xml @@ -235,10 +235,9 @@ +1 - + - - + Markus Sabadello @@ -248,8 +247,8 @@ - - - + + Ben Noordhuis @@ -259,9 +258,8 @@ - - - + Dev Mailing List From 52167bfe91502512bf3fc6c808c72b502450109d Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 21 Mar 2013 17:36:40 +0000 Subject: [PATCH 230/583] [OLTU-86] Make Oltu artifacts valid OSGi bundles #comment the bundle-plugin enables OSGi metadata generation in all Oltu sub-modules #resolve git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1459417 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/pom.xml b/pom.xml index 3a08c467..303798be 100644 --- a/pom.xml +++ b/pom.xml @@ -340,6 +340,14 @@ file://${site.siteFilePath} ${user.home}/oltu-site-content/ false + + ${project.groupId}*;version=${project.version} + * + + +       @@ -560,12 +568,56 @@       + + org.apache.felix + maven-bundle-plugin + 2.3.7 + + + + true + + true + ${project.build.directory}/osgi + + + <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME + ${project.groupId}.${project.artifactId} + ${project.artifactId} + ${project.description} + ${osgi.export} + ${osgi.private} + ${osgi.import} + ${osgi.dynamicImport} + ${project.url} + J2SE-${javac.target.version} + ${osgi.activator} + + + + + bundle-manifest + process-classes + + manifest + + + + + org.apache.maven.plugins maven-jar-plugin 2.4 + ${project.build.directory}/osgi/MANIFEST.MF true true From 38a4eefb0cee0cc15cbc10fac3aaa70b00390ebf Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Fri, 22 Mar 2013 17:15:18 +0000 Subject: [PATCH 231/583] [OLTU-87] Migrate OAuth2 modules groupId to org.apache.oltu.oauth2 #comment as per subject, OAuth2 modules groupId has been updated to org.apache.oltu.oauth2 #resolve git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1459904 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/authzserver/pom.xml | 4 ++-- oauth-2.0/client-demo/pom.xml | 8 ++++---- oauth-2.0/client/pom.xml | 4 ++-- oauth-2.0/common/pom.xml | 2 +- oauth-2.0/dynamicreg-client/pom.xml | 8 ++++---- oauth-2.0/dynamicreg-common/pom.xml | 4 ++-- oauth-2.0/dynamicreg-server/pom.xml | 10 +++++----- oauth-2.0/httpclient4/pom.xml | 4 ++-- oauth-2.0/integration-tests/pom.xml | 16 ++++++++-------- oauth-2.0/pom.xml | 1 + oauth-2.0/resourceserver-filter/pom.xml | 6 +++--- oauth-2.0/resourceserver/pom.xml | 4 ++-- oauth-2.0/test-utils/pom.xml | 2 +- 13 files changed, 37 insertions(+), 36 deletions(-) diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index cc94363d..0f20fd8a 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index cc739e22..3d298e63 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -39,7 +39,7 @@ oltu-oauth2-common - org.apache.oltu + org.apache.oltu.aouth2 ${project.version} @@ -47,13 +47,13 @@ oltu-oauth2-dynamicreg-common - org.apache.oltu + org.apache.oltu.aouth2 ${project.version} oltu-oauth2-dynamicreg-client - org.apache.oltu + org.apache.oltu.aouth2 ${project.version} diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 36e5f280..38abf8ef 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -20,7 +20,7 @@ oltu-oauth2-parent - org.apache.oltu + org.apache.oltu.aouth2 0.31-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index 1ec5e2ba..96b0ad96 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index f50440d7..782ddd75 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,19 +30,19 @@ - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-common ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-client ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-dynamicreg-common ${project.version} diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index 92cf5c11..89cc024e 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index 570e8ff3..5509c446 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,19 +30,19 @@ - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-common ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-authzserver ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-dynamicreg-common ${project.version} @@ -60,7 +60,7 @@ - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-test-utils ${project.version} test diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index 39388f5e..6202ae8c 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -29,7 +29,7 @@ - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-client ${project.version} diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index 18d0402e..6c32fd33 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,43 +30,43 @@ - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-common ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-client ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-authzserver ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-httpclient4 ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-resourceserver ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-dynamicreg-client ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-dynamicreg-server ${project.version} diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 676298af..609f4f04 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -24,6 +24,7 @@ 0.31-SNAPSHOT + org.apache.oltu.aouth2 oltu-oauth2-parent pom diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index 3b8bff3e..c09fcb84 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,13 +30,13 @@ - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-resourceserver ${project.version} - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index f78e414b..8d8d5ddc 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index 7f66b2eb..02032804 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu + org.apache.oltu.aouth2 oltu-oauth2-parent 0.31-SNAPSHOT From 7bad60af9c57f864a394a0c9c1e657cfded257be Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Fri, 22 Mar 2013 17:16:32 +0000 Subject: [PATCH 232/583] [OLTU-87] Migrate OAuth2 modules groupId to org.apache.oltu.oauth2 damn typo... :( git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1459906 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/authzserver/pom.xml | 4 ++-- oauth-2.0/client-demo/pom.xml | 8 ++++---- oauth-2.0/client/pom.xml | 4 ++-- oauth-2.0/common/pom.xml | 2 +- oauth-2.0/dynamicreg-client/pom.xml | 8 ++++---- oauth-2.0/dynamicreg-common/pom.xml | 4 ++-- oauth-2.0/dynamicreg-server/pom.xml | 10 +++++----- oauth-2.0/httpclient4/pom.xml | 4 ++-- oauth-2.0/integration-tests/pom.xml | 16 ++++++++-------- oauth-2.0/pom.xml | 2 +- oauth-2.0/resourceserver-filter/pom.xml | 6 +++--- oauth-2.0/resourceserver/pom.xml | 4 ++-- oauth-2.0/test-utils/pom.xml | 2 +- 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index 0f20fd8a..5239c500 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index 3d298e63..df52f3f9 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -39,7 +39,7 @@ oltu-oauth2-common - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 ${project.version} @@ -47,13 +47,13 @@ oltu-oauth2-dynamicreg-common - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 ${project.version} oltu-oauth2-dynamicreg-client - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 ${project.version} diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 38abf8ef..84554e92 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -20,7 +20,7 @@ oltu-oauth2-parent - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 0.31-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index 96b0ad96..d381aaa4 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index 782ddd75..e7f8c252 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,19 +30,19 @@ - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-common ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-client ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-dynamicreg-common ${project.version} diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index 89cc024e..b66b57fd 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index 5509c446..41af1c93 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,19 +30,19 @@ - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-common ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-authzserver ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-dynamicreg-common ${project.version} @@ -60,7 +60,7 @@ - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-test-utils ${project.version} test diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index 6202ae8c..bf63b7c8 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -18,7 +18,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -29,7 +29,7 @@ - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-client ${project.version} diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index 6c32fd33..98b20e50 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,43 +30,43 @@ - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-common ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-client ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-authzserver ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-httpclient4 ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-resourceserver ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-dynamicreg-client ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-dynamicreg-server ${project.version} diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 609f4f04..fad4a629 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -24,7 +24,7 @@ 0.31-SNAPSHOT - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent pom diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index c09fcb84..c50f3ec2 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,13 +30,13 @@ - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-resourceserver ${project.version} - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index 8d8d5ddc..fa75e5fa 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT @@ -30,7 +30,7 @@ - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-common ${project.version} diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index 02032804..1b2dc34e 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -19,7 +19,7 @@ 4.0.0 - org.apache.oltu.aouth2 + org.apache.oltu.oauth2 oltu-oauth2-parent 0.31-SNAPSHOT From 36d06d5a9a8b240c77dcd68871326eccd059d2ff Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Fri, 22 Mar 2013 21:01:25 +0000 Subject: [PATCH 233/583] trivial: relocated groupId/artifactId order in parent declaration git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1459986 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/authzserver/pom.xml | 2 +- oauth-2.0/client/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index 5239c500..7339a6f2 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -21,7 +21,7 @@ org.apache.oltu.oauth2 oltu-oauth2-parent - 0.31-SNAPSHOT + 0.31-SNAPSHOT oltu-oauth2-authzserver diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 84554e92..25edb871 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -19,8 +19,8 @@ 4.0.0 - oltu-oauth2-parent org.apache.oltu.oauth2 + oltu-oauth2-parent 0.31-SNAPSHOT From f153671c0717ea451abaf568033522d829ed7d3b Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 25 Mar 2013 15:41:23 +0000 Subject: [PATCH 234/583] [OLTU-88] Extract the parent pom from the reactor one git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1460720 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/pom.xml | 5 +- parent/pom.xml | 899 +++++++++++++++++++++++++++++++++++++++ parent/src/site/site.xml | 57 +++ pom.xml | 865 +------------------------------------ 4 files changed, 966 insertions(+), 860 deletions(-) create mode 100644 parent/pom.xml create mode 100644 parent/src/site/site.xml diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index fad4a629..205aa6cb 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -20,12 +20,13 @@ org.apache.oltu - oltu-parent - 0.31-SNAPSHOT + org.apache.oltu.parent + 1-SNAPSHOT org.apache.oltu.oauth2 oltu-oauth2-parent + 0.31-SNAPSHOT pom Apache Oltu: OAuth 2.0 Implementation - Parent diff --git a/parent/pom.xml b/parent/pom.xml new file mode 100644 index 00000000..d1b056f6 --- /dev/null +++ b/parent/pom.xml @@ -0,0 +1,899 @@ + + + + 4.0.0 + + + org.apache + apache + 10 + + + org.apache.oltu + org.apache.oltu.parent + 1-SNAPSHOT + pom + + Apache Oltu - Parent + https://oltu.apache.org/ + 2010 + + + + asanso + Antonio Sanso + asanso@apache.org + Adobe + http://www.day.com + + Chair + PMC Member + Committer + + +1 + + + + lmoren + Lukasz Moren + lmoren@apache.org + + PMC Member + Committer + + 0 + + + + mmachulak + Maciej Machulak + mmachulak@apache.org + + PMC Member + Committer + + 0 + + + + pidster + Stuart "Pid" Williams + pidster@apache.org + + PMC Member + Committer + + +1 + + + + rfeng + Raymond Zhaohui Feng + rfeng@apache.org + + PMC Member + Committer + + + + + simonetripodi + Simone Tripodi + simonetripodi@apache.org + + PMC Member + Committer + + +1 + + + + tommaso + Tommaso Teofili + tommaso@apache.org + + PMC Member + Committer + + +1 + + + + brianm + Brian McCallister + brianm@apache.org + + Mentor + PMC Member + Committer + Emeritus + + + + + djencks + David Jencks + djencks@apache.org + + Mentor + PMC Member + Committer + Emeritus + + + + + gianugo + Gianugo Rabellino + gianugo@apache.org + + Mentor + PMC Member + Committer + Emeritus + + + + + henning + Henning Schmiedehausen + henning@apache.org + + Mentor + PMC Member + Committer + Emeritus + + + + + jfclere + Jean-Frederic Clere + jfclere@apache.org + + Mentor + PMC Member + Committer + Emeritus + + + + + lindner + Paul Lindner + lindner@apache.org + + PMC Member + Committer + Emeritus + + +1 + + + + pablo + Pablo Fernandez + pablo@apache.org + + PMC Member + Committer + Emeritus + + +1 + + + + recordond + David Recordon + recordond@apache.org + + PMC Member + Committer + Emeritus + + +1 + + + + simoneg + Simone Gianni + simoneg@apache.org + Semeru S.r.l. + http://www.semeru.it/ + + PMC Member + Committer + Emeritus + + +1 + + + + stein + Stein Welberg + stein@apache.org + Innovation District + http://www.innovation-district.com + + Committer + + +1 + + + + + + Markus Sabadello + + + + + + - + + + + + Ben Noordhuis + + + + + + - + + + + + + + Dev Mailing List + dev@oltu.apache.org + dev-subscribe@oltu.apache.org + dev-unsubscribe@oltu.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-oltu-dev/ + + + + User Mailing List + user@oltu.apache.org + user-subscribe@oltu.apache.org + user-unsubscribe@oltu.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-oltu-user/ + + + + Commits Mailing List + commits@oltu.apache.org + commits-subscribe@oltu.apache.org + commits-unsubscribe@oltu.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-oltu-commits/ + + + + + scm:svn:https://svn.apache.org/repos/asf/oltu/trunk/parent + scm:svn:https://svn.apache.org/repos/asf/oltu/trunk/parent + https://svn.apache.org/repos/asf/oltu/trunk/parent + + + JIRA + https://issues.apache.org/jira/browse/OLTU + + + Jenkins + https://builds.apache.org/job/Oltu/ + + + mail + true + true + false + false +
      dev@oltu.apache.org
       +       +       +       + + + UTF-8 + UTF-8 + UTF-8 + 1.6 + 1.6 + yyyy-MM-dd HH:mm:ssZ + ${scmBranch}@r${buildNumber} + + 2.9 + + ${user.home}/oltu-site/ + file://${site.siteFilePath} + ${user.home}/oltu-site-content/ + false + + ${project.groupId}*;version=${project.version} + * + + + + + + + + + commons-logging + commons-logging + 1.1.1 + compile + + + + log4j + log4j + 1.2.15 + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + javax.jms + jms + + + javax.mail + mail + + + junit + junit + + + oro + oro + + + + + + + + + junit + junit + 4.10 + test + + + + + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.8 + + + + org.apache.maven.plugins + maven-war-plugin + 2.2 + + + + maven-clean-plugin + 2.4.1 + + + + maven-deploy-plugin + 2.5 + + + + maven-install-plugin + 2.3.1 + + + + maven-resources-plugin + 2.5 + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.5.1 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12 + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + + + assembly + package + + single + + + + + true + false + ${assembly.skip} + gnu + + + + + org.apache.maven.plugins + maven-release-plugin + 2.3.1 + + forked-path + false + clean install + true + -Prelease,apache + https://svn.apache.org/repos/asf/oltu/tags + + + + + org.apache.maven.plugins + maven-scm-publish-plugin + 1.0-beta-2 + + true + ${site.scmPubCheckoutDirectory} + scm:svn:https://svn.apache.org/repos/asf/oltu/site + Apache Oltu site deployment + ${site.siteFilePath} + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0 + + + enforce-java + validate + + enforce + + + + + [1.6,) + [ERROR] The currently supported version of Java is 1.6 or higher + + + [2.2.0,) + [ERROR] The currently supported version of Maven is 2.2.0 or higher + + + Best Practice is to always define plugin versions! + true + true + true + [ERROR] clean,deploy,site + + + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0 + + + validate + + create + + + + + false + false + + true + + ?????? + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + ${javac.src.version} + ${javac.target.version} + true + true + true + + + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + + + + true + + true + ${project.build.directory}/osgi + + + <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME + ${project.groupId}.${project.artifactId} + ${project.artifactId} + ${project.description} + ${osgi.export} + ${osgi.private} + ${osgi.import} + ${osgi.dynamicImport} + ${project.url} + J2SE-${javac.target.version} + ${osgi.activator} + + + + + bundle-manifest + process-classes + + manifest + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + ${project.build.directory}/osgi/MANIFEST.MF + + true + true + + + ${implementation.build} + ${maven.build.timestamp} + ${javac.src.version} + ${javac.target.version} + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.2 + + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0-beta-2 + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.1 + + true + target/findbugs-reports + target/findbugs-reports + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.12 + + + + org.apache.maven.plugins + maven-pmd-plugin + 2.5 + + true + 100 + 1.6 + + + + + + + + release + + + + org.apache.rat + apache-rat-plugin + 0.7 + + + rat-verify + test + + check + + + + CHANGES + DISCLAIMER + **/NOTICE* + .idea/** + .classpath + .project + .settings + maven-eclipse.xml + .externalToolBuilders/** + **/*.json + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + + jar-no-fork + + + + + true + true + + + ${implementation.build} + ${maven.build.timestamp} + ${javac.src.version} + ${javac.target.version} + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.version} + + + attach-javadocs + + jar + + + true + + + true + true + + + ${implementation.build} + ${maven.build.timestamp} + ${javac.src.version} + ${javac.target.version} + + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.4 + + + sign-artifacts + verify + + sign + + + + + + + + + + site + + + + any23.website + Apache Any23 website + ${site.deploymentBaseUrl} + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.version} + + true + ${sun.boot.class.path} + com.google.doclava.Doclava + false + -J-Xmx1024m + + com.google.doclava + doclava + 1.0.5 + + + -quiet + -federate JDK http://download.oracle.com/javase/6/docs/api/index.html? + -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml + -hdf project.name "Apache Oltu" + -apiversion "${project.version}" + -d ${project.reporting.outputDirectory}/apidocs + + + + + aggregate + site + + aggregate + + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.2 + + en + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.6 + + false + false + + + + + index + mailing-list + project-team + scm + cim + issue-tracking + license + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${javadoc.version} + + + default + + javadoc + + + + aggregate + + aggregate + + + + + + + + + +       diff --git a/parent/src/site/site.xml b/parent/src/site/site.xml new file mode 100644 index 00000000..bcec66cd --- /dev/null +++ b/parent/src/site/site.xml @@ -0,0 +1,57 @@ + + + + + + Apache Oltu OAuth reference implementation + images/oltu_head.png + ${project.url}/index.html + + + + The Apache Software Foundation + http://www.apache.org/images/asf_logo.gif + http://www.apache.org/ + + + + org.apache.maven.skins + maven-fluido-skin + 1.3.0 + + + + + + + + + + + + + +
      +
      Apache Oltu, Apache, the Apache feather logo, and the Apache Oltu project logos are trademarks of The Apache Software Foundation. + All other marks mentioned may be trademarks or registered trademarks of their respective owners.
      +
      + + +       diff --git a/pom.xml b/pom.xml index 303798be..e8034363 100644 --- a/pom.xml +++ b/pom.xml @@ -25,879 +25,28 @@ org.apache.oltu - oltu-parent - 0.31-SNAPSHOT + org.apache.oltu.reactor + 1-SNAPSHOT pom - Apache Oltu - https://oltu.apache.org/ - 2010 - - - - asanso - Antonio Sanso - asanso@apache.org - Adobe - http://www.day.com - - Chair - PMC Member - Committer - - +1 - - - - lmoren - Lukasz Moren - lmoren@apache.org - - PMC Member - Committer - - 0 - - - - mmachulak - Maciej Machulak - mmachulak@apache.org - - PMC Member - Committer - - 0 - - - - pidster - Stuart "Pid" Williams - pidster@apache.org - - PMC Member - Committer - - +1 - - - - rfeng - Raymond Zhaohui Feng - rfeng@apache.org - - PMC Member - Committer - - - - - simonetripodi - Simone Tripodi - simonetripodi@apache.org - - PMC Member - Committer - - +1 - - - - tommaso - Tommaso Teofili - tommaso@apache.org - - PMC Member - Committer - - +1 - - - - brianm - Brian McCallister - brianm@apache.org - - Mentor - PMC Member - Committer - Emeritus - - - - - djencks - David Jencks - djencks@apache.org - - Mentor - PMC Member - Committer - Emeritus - - - - - gianugo - Gianugo Rabellino - gianugo@apache.org - - Mentor - PMC Member - Committer - Emeritus - - - - - henning - Henning Schmiedehausen - henning@apache.org - - Mentor - PMC Member - Committer - Emeritus - - - - - jfclere - Jean-Frederic Clere - jfclere@apache.org - - Mentor - PMC Member - Committer - Emeritus - - - - - lindner - Paul Lindner - lindner@apache.org - - PMC Member - Committer - Emeritus - - +1 - - - - pablo - Pablo Fernandez - pablo@apache.org - - PMC Member - Committer - Emeritus - - +1 - - - - recordond - David Recordon - recordond@apache.org - - PMC Member - Committer - Emeritus - - +1 - - - - simoneg - Simone Gianni - simoneg@apache.org - Semeru S.r.l. - http://www.semeru.it/ - - PMC Member - Committer - Emeritus - - +1 - - - - stein - Stein Welberg - stein@apache.org - Innovation District - http://www.innovation-district.com - - Committer - - +1 - - - - - - Markus Sabadello - - - - - - - - - - - - Ben Noordhuis - - - - - - - - - - - - - - Dev Mailing List - dev@oltu.apache.org - dev-subscribe@oltu.apache.org - dev-unsubscribe@oltu.apache.org - http://mail-archives.apache.org/mod_mbox/incubator-oltu-dev/ - - - - User Mailing List - user@oltu.apache.org - user-subscribe@oltu.apache.org - user-unsubscribe@oltu.apache.org - http://mail-archives.apache.org/mod_mbox/incubator-oltu-user/ - - - - Commits Mailing List - commits@oltu.apache.org - commits-subscribe@oltu.apache.org - commits-unsubscribe@oltu.apache.org - http://mail-archives.apache.org/mod_mbox/incubator-oltu-commits/ - - + Apache Oltu - Reactor + parent oauth-2.0 - sources-dist - - scm:svn:https://svn.apache.org/repos/asf/oltu/trunk - scm:svn:https://svn.apache.org/repos/asf/oltu/trunk - https://svn.apache.org/repos/asf/oltu/trunk - - - JIRA - https://issues.apache.org/jira/browse/OLTU - - - Jenkins - https://builds.apache.org/job/Oltu/ - - - mail - true - true - false - false -
      dev@oltu.apache.org
       -       -       -       - - - UTF-8 - UTF-8 - UTF-8 - 1.6 - 1.6 - yyyy-MM-dd HH:mm:ssZ - ${scmBranch}@r${buildNumber} - - 2.9 - - ${user.home}/oltu-site/ - file://${site.siteFilePath} - ${user.home}/oltu-site-content/ - false - - ${project.groupId}*;version=${project.version} - * - - - - - - - - - commons-logging - commons-logging - 1.1.1 - compile - - - - log4j - log4j - 1.2.15 - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - javax.jms - jms - - - javax.mail - mail - - - junit - junit - - - oro - oro - - - - - - - - - junit - junit - 4.10 - test - - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - - - org.apache.maven.plugins - maven-war-plugin - 2.2 - - - - maven-clean-plugin - 2.4.1 - - - - maven-deploy-plugin - 2.5 - - - - maven-install-plugin - 2.3.1 - - - - maven-resources-plugin - 2.5 - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.5.1 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.3 - - - assembly - package - - single - - - - - true - false - ${assembly.skip} - gnu - - - - - org.apache.maven.plugins - maven-release-plugin - 2.3.1 - - forked-path - false - true - oltu-@{project.version} - -Prelease,apache - - - - - org.apache.maven.plugins - maven-scm-publish-plugin - 1.0-beta-2 - - true - ${site.scmPubCheckoutDirectory} - scm:svn:https://svn.apache.org/repos/asf/oltu/site - Apache Oltu site deployment - ${site.siteFilePath} - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0 - - - enforce-java - validate - - enforce - - - - - [1.6,) - [ERROR] The currently supported version of Java is 1.6 or higher - - - [2.2.0,) - [ERROR] The currently supported version of Maven is 2.2.0 or higher - - - Best Practice is to always define plugin versions! - true - true - true - [ERROR] clean,deploy,site - - - - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.0 - - - validate - - create - - - - - false - false - - true - - ?????? - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 + maven-deploy-plugin + false - ${javac.src.version} - ${javac.target.version} - true - true - true + true - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - - - - true - - true - ${project.build.directory}/osgi - - - <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME - ${project.groupId}.${project.artifactId} - ${project.artifactId} - ${project.description} - ${osgi.export} - ${osgi.private} - ${osgi.import} - ${osgi.dynamicImport} - ${project.url} - J2SE-${javac.target.version} - ${osgi.activator} - - - - - bundle-manifest - process-classes - - manifest - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - ${project.build.directory}/osgi/MANIFEST.MF - - true - true - - - ${implementation.build} - ${maven.build.timestamp} - ${javac.src.version} - ${javac.target.version} - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.2 - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - true - target/findbugs-reports - target/findbugs-reports - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.12 - - - - org.apache.maven.plugins - maven-pmd-plugin - 2.5 - - true - 100 - 1.6 - - - - - - - - release - - - - org.apache.rat - apache-rat-plugin - 0.7 - - - rat-verify - test - - check - - - - CHANGES - DISCLAIMER - **/NOTICE* - .idea/** - .classpath - .project - .settings - maven-eclipse.xml - .externalToolBuilders/** - **/*.json - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - - jar-no-fork - - - - - true - true - - - ${implementation.build} - ${maven.build.timestamp} - ${javac.src.version} - ${javac.target.version} - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${javadoc.version} - - - attach-javadocs - - jar - - - true - - - true - true - - - ${implementation.build} - ${maven.build.timestamp} - ${javac.src.version} - ${javac.target.version} - - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - sign-artifacts - verify - - sign - - - - - - - - - - site - - - - any23.website - Apache Any23 website - ${site.deploymentBaseUrl} - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${javadoc.version} - - true - ${sun.boot.class.path} - com.google.doclava.Doclava - false - -J-Xmx1024m - - com.google.doclava - doclava - 1.0.5 - - - -quiet - -federate JDK http://download.oracle.com/javase/6/docs/api/index.html? - -federationxml JDK http://doclava.googlecode.com/svn/static/api/openjdk-6.xml - -hdf project.name "Apache Oltu" - -apiversion "${project.version}" - -d ${project.reporting.outputDirectory}/apidocs - - - - - aggregate - site - - aggregate - - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.2 - - en - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.6 - - false - false - - - - - index - mailing-list - project-team - scm - cim - issue-tracking - license - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${javadoc.version} - - - default - - javadoc - - - - aggregate - - aggregate - - - - - - - - - From aa513ed6fb3b6b2c24e4116f22181e5e61d5cf9f Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 25 Mar 2013 15:41:57 +0000 Subject: [PATCH 235/583] trivial: updated ignore list git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1460721 13f79535-47bb-0310-9956-ffa450edef68 From 0c2992aefe032ad67407a9d0fb39048606dd00de Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 25 Mar 2013 15:47:31 +0000 Subject: [PATCH 236/583] [OLTU-89] move artifactId to OSGi-alike taxonomy git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1460727 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/authzserver/pom.xml | 6 +++--- oauth-2.0/client-demo/pom.xml | 10 +++++----- oauth-2.0/client/pom.xml | 6 +++--- oauth-2.0/common/pom.xml | 4 ++-- oauth-2.0/dynamicreg-client/pom.xml | 10 +++++----- oauth-2.0/dynamicreg-common/pom.xml | 6 +++--- oauth-2.0/dynamicreg-server/pom.xml | 12 ++++++------ oauth-2.0/httpclient4/pom.xml | 6 +++--- oauth-2.0/integration-tests/pom.xml | 18 +++++++++--------- oauth-2.0/pom.xml | 2 +- oauth-2.0/resourceserver-filter/pom.xml | 8 ++++---- oauth-2.0/resourceserver/pom.xml | 6 +++--- oauth-2.0/test-utils/pom.xml | 4 ++-- parent/pom.xml | 2 +- 14 files changed, 50 insertions(+), 50 deletions(-) diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index 7339a6f2..0d5b6eb9 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -20,18 +20,18 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-authzserver + org.apache.oltu.oauth2.authzserver Apache Oltu: OAuth 2.0 Implementation - Authorization Server org.apache.oltu.oauth2 - oltu-oauth2-common + org.apache.oltu.oauth2.common ${project.version} diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index df52f3f9..6fc8bc13 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -20,11 +20,11 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-client-demo + org.apache.oltu.oauth2.client-demo war Apache Oltu: OAuth 2.0 Implementation - Demo Application @@ -38,7 +38,7 @@ - oltu-oauth2-common + org.apache.oltu.oauth2.common org.apache.oltu.oauth2 ${project.version} @@ -46,13 +46,13 @@ - oltu-oauth2-dynamicreg-common + org.apache.oltu.oauth2.dynamicreg-common org.apache.oltu.oauth2 ${project.version} - oltu-oauth2-dynamicreg-client + org.apache.oltu.oauth2.dynamicreg-client org.apache.oltu.oauth2 ${project.version} diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 25edb871..1cad4225 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -20,18 +20,18 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-client + org.apache.oltu.oauth2.client Apache Oltu: OAuth 2.0 Implementation - Client org.apache.oltu.oauth2 - oltu-oauth2-common + org.apache.oltu.oauth2.common ${project.version} diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index d381aaa4..b5646832 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -20,11 +20,11 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-common + org.apache.oltu.oauth2.common Apache Oltu: OAuth 2.0 Implementation - Common OAuth 2.0 library - Common diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index e7f8c252..3f825f15 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -20,30 +20,30 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-dynamicreg-client + org.apache.oltu.oauth2.dynamicreg-client Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Client org.apache.oltu.oauth2 - oltu-oauth2-common + org.apache.oltu.oauth2.common ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-client + org.apache.oltu.oauth2.client ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-dynamicreg-common + org.apache.oltu.oauth2.dynamicreg-common ${project.version} diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index b66b57fd..a70271ec 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -20,18 +20,18 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-dynamicreg-common + org.apache.oltu.oauth2.dynamicreg-common Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Common org.apache.oltu.oauth2 - oltu-oauth2-common + org.apache.oltu.oauth2.common ${project.version} diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index 41af1c93..dc2eb5f6 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -20,30 +20,30 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-dynamicreg-server + org.apache.oltu.oauth2.dynamicreg-server Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Server org.apache.oltu.oauth2 - oltu-oauth2-common + org.apache.oltu.oauth2.common ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-authzserver + org.apache.oltu.oauth2.authzserver ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-dynamicreg-common + org.apache.oltu.oauth2.dynamicreg-common ${project.version} @@ -61,7 +61,7 @@ org.apache.oltu.oauth2 - oltu-oauth2-test-utils + org.apache.oltu.oauth2.test-utils ${project.version} test diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index bf63b7c8..da57161f 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -19,18 +19,18 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-httpclient4 + org.apache.oltu.oauth2.httpclient4 Apache Oltu: OAuth 2.0 Implementation - HttpClient org.apache.oltu.oauth2 - oltu-oauth2-client + org.apache.oltu.oauth2.client ${project.version} diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index 98b20e50..c19403ee 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -20,54 +20,54 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT Apache Oltu: OAuth 2.0 Implementation - Integration Tests - oltu-oauth2-integration-tests + org.apache.oltu.oauth2.integration-tests org.apache.oltu.oauth2 - oltu-oauth2-common + org.apache.oltu.oauth2.common ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-client + org.apache.oltu.oauth2.client ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-authzserver + org.apache.oltu.oauth2.authzserver ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-httpclient4 + org.apache.oltu.oauth2.httpclient4 ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-resourceserver + org.apache.oltu.oauth2.resourceserver ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-dynamicreg-client + org.apache.oltu.oauth2.dynamicreg-client ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-dynamicreg-server + org.apache.oltu.oauth2.dynamicreg-server ${project.version} diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 205aa6cb..82c184e6 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -25,7 +25,7 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT pom diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index c50f3ec2..7b682aa3 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -20,24 +20,24 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-resourceserver-filter + org.apache.oltu.oauth2.resourceserver-filter Apache Oltu: OAuth 2.0 Implementation - Resource Server Filter org.apache.oltu.oauth2 - oltu-oauth2-resourceserver + org.apache.oltu.oauth2.resourceserver ${project.version} org.apache.oltu.oauth2 - oltu-oauth2-common + org.apache.oltu.oauth2.common ${project.version} diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index fa75e5fa..cfcc5f19 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -20,18 +20,18 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-resourceserver + org.apache.oltu.oauth2.resourceserver Apache Oltu: OAuth 2.0 Implementation - Resource Server org.apache.oltu.oauth2 - oltu-oauth2-common + org.apache.oltu.oauth2.common ${project.version} diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index 1b2dc34e..587986d6 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -20,11 +20,11 @@ org.apache.oltu.oauth2 - oltu-oauth2-parent + org.apache.oltu.oauth2.parent 0.31-SNAPSHOT - oltu-oauth2-test-utils + org.apache.oltu.oauth2.test-utils Apache Oltu: OAuth 2.0 Implementation - Test Utils diff --git a/parent/pom.xml b/parent/pom.xml index d1b056f6..5fbb7572 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -584,7 +584,7 @@ | Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd --> <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME - ${project.groupId}.${project.artifactId} + ${project.artifactId} ${project.artifactId} ${project.description} ${osgi.export} From f7efd4f9f26d1cc0b9744abed1a0bc97fbac4f73 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Mon, 25 Mar 2013 15:59:27 +0000 Subject: [PATCH 237/583] [OLTU-89] move artifactId to OSGi-alike taxonomy git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1460739 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/authzserver/pom.xml | 2 +- oauth-2.0/client-demo/pom.xml | 2 +- oauth-2.0/client/pom.xml | 2 +- oauth-2.0/common/pom.xml | 2 +- oauth-2.0/dynamicreg-client/pom.xml | 6 +++--- oauth-2.0/dynamicreg-common/pom.xml | 4 ++-- oauth-2.0/dynamicreg-server/pom.xml | 6 +++--- oauth-2.0/httpclient4/pom.xml | 2 +- oauth-2.0/integration-tests/pom.xml | 2 +- oauth-2.0/pom.xml | 2 +- oauth-2.0/resourceserver-filter/pom.xml | 2 +- oauth-2.0/resourceserver/pom.xml | 2 +- oauth-2.0/test-utils/pom.xml | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/oauth-2.0/authzserver/pom.xml b/oauth-2.0/authzserver/pom.xml index 0d5b6eb9..a6e38f4d 100644 --- a/oauth-2.0/authzserver/pom.xml +++ b/oauth-2.0/authzserver/pom.xml @@ -26,7 +26,7 @@ org.apache.oltu.oauth2.authzserver - Apache Oltu: OAuth 2.0 Implementation - Authorization Server + Apache Oltu - OAuth 2.0 - Authorization Server diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index 6fc8bc13..feb42166 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -27,7 +27,7 @@ org.apache.oltu.oauth2.client-demo war - Apache Oltu: OAuth 2.0 Implementation - Demo Application + Apache Oltu - OAuth 2.0 - Demo Application diff --git a/oauth-2.0/client/pom.xml b/oauth-2.0/client/pom.xml index 1cad4225..7917e522 100644 --- a/oauth-2.0/client/pom.xml +++ b/oauth-2.0/client/pom.xml @@ -26,7 +26,7 @@ org.apache.oltu.oauth2.client - Apache Oltu: OAuth 2.0 Implementation - Client + Apache Oltu - OAuth 2.0 - Client diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index b5646832..8eb4d8a5 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -26,7 +26,7 @@ org.apache.oltu.oauth2.common - Apache Oltu: OAuth 2.0 Implementation - Common + Apache Oltu - OAuth 2.0 - Common OAuth 2.0 library - Common diff --git a/oauth-2.0/dynamicreg-client/pom.xml b/oauth-2.0/dynamicreg-client/pom.xml index 3f825f15..a8ae46fa 100644 --- a/oauth-2.0/dynamicreg-client/pom.xml +++ b/oauth-2.0/dynamicreg-client/pom.xml @@ -24,9 +24,9 @@ 0.31-SNAPSHOT - org.apache.oltu.oauth2.dynamicreg-client + org.apache.oltu.oauth2.dynamicreg.client - Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Client + Apache Oltu - OAuth 2.0 - Dynamic Registration Client @@ -43,7 +43,7 @@ org.apache.oltu.oauth2 - org.apache.oltu.oauth2.dynamicreg-common + org.apache.oltu.oauth2.dynamicreg.common ${project.version} diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index a70271ec..d15171d6 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -24,9 +24,9 @@ 0.31-SNAPSHOT - org.apache.oltu.oauth2.dynamicreg-common + org.apache.oltu.oauth2.dynamicreg.common - Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Common + Apache Oltu - OAuth 2.0 - Dynamic Registration Common diff --git a/oauth-2.0/dynamicreg-server/pom.xml b/oauth-2.0/dynamicreg-server/pom.xml index dc2eb5f6..c2a3e7a1 100644 --- a/oauth-2.0/dynamicreg-server/pom.xml +++ b/oauth-2.0/dynamicreg-server/pom.xml @@ -24,9 +24,9 @@ 0.31-SNAPSHOT - org.apache.oltu.oauth2.dynamicreg-server + org.apache.oltu.oauth2.dynamicreg.server - Apache Oltu: OAuth 2.0 Implementation - Dynamic Registration Server + Apache Oltu - OAuth 2.0 - Dynamic Registration Server @@ -43,7 +43,7 @@ org.apache.oltu.oauth2 - org.apache.oltu.oauth2.dynamicreg-common + org.apache.oltu.oauth2.dynamicreg.common ${project.version} diff --git a/oauth-2.0/httpclient4/pom.xml b/oauth-2.0/httpclient4/pom.xml index da57161f..10f6b556 100644 --- a/oauth-2.0/httpclient4/pom.xml +++ b/oauth-2.0/httpclient4/pom.xml @@ -25,7 +25,7 @@ org.apache.oltu.oauth2.httpclient4 - Apache Oltu: OAuth 2.0 Implementation - HttpClient + Apache Oltu - OAuth 2.0 - HttpClient diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index c19403ee..69f02afa 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -24,7 +24,7 @@ 0.31-SNAPSHOT - Apache Oltu: OAuth 2.0 Implementation - Integration Tests + Apache Oltu - OAuth 2.0 - Integration Tests org.apache.oltu.oauth2.integration-tests diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 82c184e6..fa95af2e 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -29,7 +29,7 @@ 0.31-SNAPSHOT pom - Apache Oltu: OAuth 2.0 Implementation - Parent + Apache Oltu - OAuth 2.0 - Parent common diff --git a/oauth-2.0/resourceserver-filter/pom.xml b/oauth-2.0/resourceserver-filter/pom.xml index 7b682aa3..32543ce0 100644 --- a/oauth-2.0/resourceserver-filter/pom.xml +++ b/oauth-2.0/resourceserver-filter/pom.xml @@ -26,7 +26,7 @@ org.apache.oltu.oauth2.resourceserver-filter - Apache Oltu: OAuth 2.0 Implementation - Resource Server Filter + Apache Oltu - OAuth 2.0 - Resource Server Filter diff --git a/oauth-2.0/resourceserver/pom.xml b/oauth-2.0/resourceserver/pom.xml index cfcc5f19..97a0b54e 100644 --- a/oauth-2.0/resourceserver/pom.xml +++ b/oauth-2.0/resourceserver/pom.xml @@ -26,7 +26,7 @@ org.apache.oltu.oauth2.resourceserver - Apache Oltu: OAuth 2.0 Implementation - Resource Server + Apache Oltu - OAuth 2.0 - Resource Server diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index 587986d6..684ca65b 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -26,7 +26,7 @@ org.apache.oltu.oauth2.test-utils - Apache Oltu: OAuth 2.0 Implementation - Test Utils + Apache Oltu - OAuth 2.0 - Test Utils From 05ae9f1b098ab92f8f51f957f52c9a94275bbeb8 Mon Sep 17 00:00:00 2001 From: Stein Welberg Date: Mon, 25 Mar 2013 19:56:53 +0000 Subject: [PATCH 238/583] Remove default IntelliJ comments git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1460865 13f79535-47bb-0310-9956-ffa450edef68 --- .../oauth2/common/exception/OAuthSystemException.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthSystemException.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthSystemException.java index 68ec2fcb..76916db4 100644 --- a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthSystemException.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthSystemException.java @@ -28,18 +28,18 @@ public class OAuthSystemException extends Exception { public OAuthSystemException() { - super(); //To change body of overridden methods use File | Settings | File Templates. + super(); } public OAuthSystemException(String s) { - super(s); //To change body of overridden methods use File | Settings | File Templates. + super(s); } public OAuthSystemException(Throwable throwable) { - super(throwable); //To change body of overridden methods use File | Settings | File Templates. + super(throwable); } public OAuthSystemException(String s, Throwable throwable) { - super(s, throwable); //To change body of overridden methods use File | Settings | File Templates. + super(s, throwable); } } From 90bb115e46d719709c61787dfaf852d8f7aa1640 Mon Sep 17 00:00:00 2001 From: Stein Welberg Date: Mon, 25 Mar 2013 20:00:02 +0000 Subject: [PATCH 239/583] Add all fields to toString method. use StringBuilder instead of StringBuffer for speed. git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1460867 13f79535-47bb-0310-9956-ffa450edef68 --- .../exception/OAuthProblemException.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthProblemException.java b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthProblemException.java index ad09fdd4..cfc2a569 100644 --- a/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthProblemException.java +++ b/oauth-2.0/common/src/main/java/org/apache/oltu/oauth2/common/exception/OAuthProblemException.java @@ -135,7 +135,7 @@ public void setRedirectUri(String redirectUri) { @Override public String getMessage() { - StringBuffer b = new StringBuffer(); + StringBuilder b = new StringBuilder(); if (!OAuthUtils.isEmpty(error)) { b.append(error); } @@ -163,12 +163,15 @@ public String getMessage() { @Override public String toString() { - return "OAuthProblemException{" - + "description='" + description + '\'' - + ", error='" + error + '\'' - + ", uri='" + uri + '\'' - + ", state='" + state + '\'' - + ", scope='" + scope + '\'' - + '}'; + return "OAuthProblemException{" + + "error='" + error + '\'' + + ", description='" + description + '\'' + + ", uri='" + uri + '\'' + + ", state='" + state + '\'' + + ", scope='" + scope + '\'' + + ", redirectUri='" + redirectUri + '\'' + + ", responseStatus=" + responseStatus + + ", parameters=" + parameters + + '}'; } } From 1e71c6aa5b5f2233dc8dc7133a06349733831c27 Mon Sep 17 00:00:00 2001 From: Stein Welberg Date: Mon, 25 Mar 2013 20:06:47 +0000 Subject: [PATCH 240/583] Add IntelliJ ignore git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1460869 13f79535-47bb-0310-9956-ffa450edef68 From a499379c67711e53a9fd5cdcf69c1a4bc6271c0e Mon Sep 17 00:00:00 2001 From: Stein Welberg Date: Mon, 25 Mar 2013 21:14:36 +0000 Subject: [PATCH 241/583] Fix build. git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1460896 13f79535-47bb-0310-9956-ffa450edef68 --- oauth-2.0/client-demo/pom.xml | 10 ++++++++-- oauth-2.0/common/pom.xml | 5 +++++ oauth-2.0/dynamicreg-common/pom.xml | 2 +- oauth-2.0/integration-tests/pom.xml | 4 ++-- oauth-2.0/pom.xml | 6 ++++-- parent/pom.xml | 6 ------ 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/oauth-2.0/client-demo/pom.xml b/oauth-2.0/client-demo/pom.xml index feb42166..be4899b6 100644 --- a/oauth-2.0/client-demo/pom.xml +++ b/oauth-2.0/client-demo/pom.xml @@ -43,17 +43,23 @@ ${project.version} + + org.apache.oltu.oauth2 + org.apache.oltu.oauth2.client + ${project.version} + + - org.apache.oltu.oauth2.dynamicreg-common org.apache.oltu.oauth2 + org.apache.oltu.oauth2.dynamicreg.client ${project.version} - org.apache.oltu.oauth2.dynamicreg-client org.apache.oltu.oauth2 + org.apache.oltu.oauth2.dynamicreg.common ${project.version} diff --git a/oauth-2.0/common/pom.xml b/oauth-2.0/common/pom.xml index 8eb4d8a5..0aabf991 100644 --- a/oauth-2.0/common/pom.xml +++ b/oauth-2.0/common/pom.xml @@ -41,6 +41,11 @@ + + commons-codec + commons-codec + ${commons-codec.version} + diff --git a/oauth-2.0/dynamicreg-common/pom.xml b/oauth-2.0/dynamicreg-common/pom.xml index d15171d6..ce4b54c2 100644 --- a/oauth-2.0/dynamicreg-common/pom.xml +++ b/oauth-2.0/dynamicreg-common/pom.xml @@ -21,7 +21,7 @@ org.apache.oltu.oauth2 org.apache.oltu.oauth2.parent - 0.31-SNAPSHOT + 0.31-SNAPSHOT org.apache.oltu.oauth2.dynamicreg.common diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index 69f02afa..43b56157 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -61,13 +61,13 @@ org.apache.oltu.oauth2 - org.apache.oltu.oauth2.dynamicreg-client + org.apache.oltu.oauth2.dynamicreg.client ${project.version} org.apache.oltu.oauth2 - org.apache.oltu.oauth2.dynamicreg-server + org.apache.oltu.oauth2.dynamicreg.server ${project.version} diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index fa95af2e..d6eb552a 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -22,6 +22,7 @@ org.apache.oltu org.apache.oltu.parent 1-SNAPSHOT + ../parent org.apache.oltu.oauth2 @@ -35,7 +36,6 @@ common client httpclient4 - client-demo dynamicreg-client dynamicreg-common authzserver @@ -43,6 +43,7 @@ resourceserver-filter dynamicreg-server test-utils + client-demo integration-tests @@ -56,12 +57,13 @@ true false false -
      dev@oltu.apache.org
       +
      dev@oltu.apache.org
       + 1.7 2.2.10 3.0.3.RELEASE 2.0.8 diff --git a/parent/pom.xml b/parent/pom.xml index 5fbb7572..ed81fa0d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -18,12 +18,6 @@ 4.0.0 - - org.apache - apache - 10 - - org.apache.oltu org.apache.oltu.parent 1-SNAPSHOT From 097e87efc6b5a0d33bec72ac217a8d3f0333196f Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 28 Mar 2013 10:44:52 +0000 Subject: [PATCH 242/583] trivial: added missing description git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1462025 13f79535-47bb-0310-9956-ffa450edef68 --- parent/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/parent/pom.xml b/parent/pom.xml index ed81fa0d..aeee87ab 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -24,6 +24,7 @@ pom Apache Oltu - Parent + Apache Oltu is an OAuth protocol implementation in Java. https://oltu.apache.org/ 2010 From 0102cdeb642d19e000ad6b08f88c0b142d9a67f5 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 28 Mar 2013 11:03:24 +0000 Subject: [PATCH 243/583] [OLTU-90] #comment plugged the doap-plugin to attach DOAP descriptors in each component #resolve git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1462030 13f79535-47bb-0310-9956-ffa450edef68 --- parent/pom.xml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/parent/pom.xml b/parent/pom.xml index aeee87ab..5bafe403 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -627,6 +627,31 @@ org.apache.maven.plugins maven-surefire-plugin       + + + org.apache.maven.plugins + maven-doap-plugin + 1.1 + + + site + site + + generate + + + + + doap.rdf + + ${project.inceptionYear} + + + ${project.description} + Antonio Sanso + + + From e713b191251eda8730768bd696d6b57b4d29af1b Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 28 Mar 2013 11:24:45 +0000 Subject: [PATCH 244/583] releng: added missing apache parent reference in main oltu parent git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1462045 13f79535-47bb-0310-9956-ffa450edef68 --- parent/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/parent/pom.xml b/parent/pom.xml index 5bafe403..b6810651 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -18,6 +18,12 @@ 4.0.0 + + org.apache + apache + 10 + + org.apache.oltu org.apache.oltu.parent 1-SNAPSHOT From 6a9ccb86eacaea2ba5f64676e75a3380dc64a206 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 28 Mar 2013 11:27:39 +0000 Subject: [PATCH 245/583] [OLTU-90] #comment The parameter should be in YYYY-MM-DD. git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1462049 13f79535-47bb-0310-9956-ffa450edef68 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b6810651..f6a7e9ee 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -650,7 +650,7 @@ doap.rdf - ${project.inceptionYear} + ${project.inceptionYear}-05-09 ${project.description} From daf7914248b2851c2df1f0bba211cc0a14f04dcc Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 28 Mar 2013 12:03:04 +0000 Subject: [PATCH 246/583] [OLTU-90] #comment A parameter is required by ASF. git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1462061 13f79535-47bb-0310-9956-ffa450edef68 --- parent/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/parent/pom.xml b/parent/pom.xml index f6a7e9ee..a97527a5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -310,6 +310,9 @@ + + http://oltu.apache.org/download.html + UTF-8 From 11f900695c5873c0b729750a86282a851a7c23d6 Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 28 Mar 2013 12:12:50 +0000 Subject: [PATCH 247/583] releng: dropped incorrect and no longer needed distributionManagement for site git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1462066 13f79535-47bb-0310-9956-ffa450edef68 --- parent/pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index a97527a5..d241a48b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -820,14 +820,6 @@ site - - - any23.website - Apache Any23 website - ${site.deploymentBaseUrl} - - - From afc5f50e20780b68103185b2063b5584c83e834e Mon Sep 17 00:00:00 2001 From: Simone Tripodi Date: Thu, 28 Mar 2013 12:14:23 +0000 Subject: [PATCH 248/583] [OLTU-91] #comment main site moved as a separate module #resolve git-svn-id: https://svn.apache.org/repos/asf/oltu/trunk@1462067 13f79535-47bb-0310-9956-ffa450edef68 --- site/deploySite.sh | 22 +++ site/pom.xml | 171 ++++++++++++++++++ .../src}/site/resources/images/oltu_head.png | Bin {src => site/src}/site/site.xml | 12 +- {src => site/src}/site/xdoc/download.xml.vm | 0 {src => site/src}/site/xdoc/index.xml | 0 {src => site/src}/site/xdoc/release-howto.xml | 0 {src => site/src}/site/xdoc/stats.xml | 0 8 files changed, 197 insertions(+), 8 deletions(-) create mode 100755 site/deploySite.sh create mode 100644 site/pom.xml rename {src => site/src}/site/resources/images/oltu_head.png (100%) rename {src => site/src}/site/site.xml (84%) rename {src => site/src}/site/xdoc/download.xml.vm (100%) rename {src => site/src}/site/xdoc/index.xml (100%) rename {src => site/src}/site/xdoc/release-howto.xml (100%) rename {src => site/src}/site/xdoc/stats.xml (100%) diff --git a/site/deploySite.sh b/site/deploySite.sh new file mode 100755 index 00000000..83a83b54 --- /dev/null +++ b/site/deploySite.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +mvn clean site-deploy -Dusername=$1 -Dpassword=$2 diff --git a/site/pom.xml b/site/pom.xml new file mode 100644 index 00000000..52c67fe2 --- /dev/null +++ b/site/pom.xml @@ -0,0 +1,171 @@ + + + + + 4.0.0 + + + org.apache.oltu + org.apache.oltu.parent + 1-SNAPSHOT + + + org.apache.oltu.site + 1-SNAPSHOT + pom + + Apache Oltu + + + https://svn.apache.org/repos/asf/oltu/site/ + site-publish + + + + + apache.website.svnpub + scm:svn:${svnUrl} + + + + + + + org.apache.maven.plugins + maven-doap-plugin + + + ${project.parent.groupId} + ${project.parent.artifactId} + ${project.parent.version} + + + + + + org.apache.maven.plugins + maven-site-plugin + + en + true + + + + attach-descriptor + + attach-descriptor + + + + stage-for-scm-publish + post-site + + stage + + + false + + + + + + + org.apache.maven.plugins + maven-scm-publish-plugin + false + + Oltu main site deployment + + oauth2** + + ${checkoutDirectory} + + + + scm-publish + site-deploy + + publish-scm + + + + + + + + + + apache.snapshots + Apache Snapshot Repository + http://repository.apache.org/snapshots + + false + + + + + + + setup-checkout + + + site-publish + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + prepare-checkout + pre-site + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/site/resources/images/oltu_head.png b/site/src/site/resources/images/oltu_head.png similarity index 100% rename from src/site/resources/images/oltu_head.png rename to site/src/site/resources/images/oltu_head.png diff --git a/src/site/site.xml b/site/src/site/site.xml similarity index 84% rename from src/site/site.xml rename to site/src/site/site.xml index eb953b0f..c9f1d3e1 100644 --- a/src/site/site.xml +++ b/site/src/site/site.xml @@ -40,6 +40,10 @@ + + + + @@ -59,14 +63,6 @@ - - - - - - - -