svn commit: r1412103 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/clientcred/ rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code...

[sergeyb]

Author: sergeyb
Date: Wed Nov 21 13:58:55 2012
New Revision: 1412103

URL: http://svn.apache.org/viewvc?rev=1412103&view=rev
Log:
Merged revisions 1412091 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1412091 | sergeyb | 2012-11-21 13:38:31 +0000 (Wed, 21 Nov 2012) | 1 line
  
  Adding few simple grant beans
........

Added:
    
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/clientcred/ClientCredentialsGrant.java
      - copied unchanged from r1412091, 
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/clientcred/ClientCredentialsGrant.java
    
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrant.java
      - copied unchanged from r1412091, 
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/owner/ResourceOwnerGrant.java
    
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/refresh/RefreshTokenGrant.java
      - copied unchanged from r1412091, 
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/refresh/RefreshTokenGrant.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/grants/code/AuthorizationCodeGrant.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1412091

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/grants/code/AuthorizationCodeGrant.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/grants/code/AuthorizationCodeGrant.java?rev=1412103&r1=1412102&r2=1412103&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant.java
 Wed Nov 21 13:58:55 2012
@@ -82,10 +82,10 @@ public class AuthorizationCodeGrant impl
      */
     public MultivaluedMap<String, String> toMap() {
         MultivaluedMap<String, String> map = new MetadataMap<String, String>();
-        map.putSingle("grant_type", OAuthConstants.AUTHORIZATION_CODE_GRANT);
-        map.putSingle("code", code);
+        map.putSingle(OAuthConstants.GRANT_TYPE, 
OAuthConstants.AUTHORIZATION_CODE_GRANT);
+        map.putSingle(OAuthConstants.AUTHORIZATION_CODE_VALUE, code);
         if (redirectUri != null) {
-            map.putSingle("redirect_uri", redirectUri);
+            map.putSingle(OAuthConstants.REDIRECT_URI, redirectUri);
         }
         return map;
     }