You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/08/15 13:16:56 UTC
svn commit: r1514235 - in /cxf/branches/2.6.x-fixes: ./
rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/
rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/
Author: sergeyb
Date: Thu Aug 15 11:16:56 2013
New Revision: 1514235
URL: http://svn.apache.org/r1514235
Log:
Merged revisions 1514233 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1514233 | sergeyb | 2013-08-15 14:07:35 +0300 (Thu, 15 Aug 2013) | 13 lines
Merged revisions 1514198,1514201 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1514198 | sergeyb | 2013-08-15 11:35:01 +0300 (Thu, 15 Aug 2013) | 1 line
[CXF-5180] Adding a simple RefreshToken implementation, patch on behalf of Thorsten Hoeger applied
........
r1514201 | sergeyb | 2013-08-15 11:46:31 +0300 (Thu, 15 Aug 2013) | 1 line
[CXF-5180] Replacing Set with List to avoid some possible marshalling issues, etc
........
................
Added:
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/
- copied from r1514233, cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/RefreshToken.java
- copied unchanged from r1514233, cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/RefreshToken.java
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.7.x-fixes:r1514233
Merged /cxf/trunk:r1514198-1514201
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java?rev=1514235&r1=1514234&r2=1514235&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java (original)
+++ cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java Thu Aug 15 11:16:56 2013
@@ -32,6 +32,8 @@ public final class OAuthConstants {
public static final String ACCESS_TOKEN = "access_token";
public static final String ACCESS_TOKEN_TYPE = "token_type";
public static final String ACCESS_TOKEN_EXPIRES_IN = "expires_in";
+ // CXF-Specific
+ public static final String ACCESS_TOKEN_ISSUED_AT = "issued_at";
public static final String GRANT_TYPE = "grant_type";
public static final String RESPONSE_TYPE = "response_type";
public static final String TOKEN_RESPONSE_TYPE = "token";
@@ -47,7 +49,9 @@ public final class OAuthConstants {
// Well-known token types
public static final String BEARER_TOKEN_TYPE = "bearer";
public static final String MAC_TOKEN_TYPE = "mac";
-
+ // CXF-specific
+ public static final String REFRESH_TOKEN_TYPE = "refresh";
+
// MAC token parameters
// Set by Access Token Service
public static final String MAC_TOKEN_KEY = "mac_key";
@@ -98,11 +102,6 @@ public final class OAuthConstants {
public static final String INVALID_SCOPE = "invalid_scope";
public static final String ACCESS_DENIED = "access_denied";
- // CXF-Specific parameters
- public static final String ACCESS_TOKEN_ISSUED_AT = "issued_at";
- // End Of CXF-Specific
-
-
private OAuthConstants() {
}