svn commit: r1514233 - in /cxf/branches/2.7.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/

[sergeyb]

Author: sergeyb
Date: Thu Aug 15 11:07:35 2013
New Revision: 1514233

URL: http://svn.apache.org/r1514233
Log:
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.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/
      - copied from r1514201, 
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/refresh/
Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
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
   (contents, props changed)
    
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1514198-1514201

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
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
URL: 
http://svn.apache.org/viewvc/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?rev=1514233&r1=1514201&r2=1514233&view=diff
==============================================================================
    (empty)

Modified: 
cxf/branches/2.7.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.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java?rev=1514233&r1=1514232&r2=1514233&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthConstants.java
 Thu Aug 15 11:07:35 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() {
     }