svn commit: r1415627 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/

[sergeyb]

Author: sergeyb
Date: Fri Nov 30 13:32:27 2012
New Revision: 1415627

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

........
  r1415623 | sergeyb | 2012-11-30 13:30:00 +0000 (Fri, 30 Nov 2012) | 1 line
  
  [CXF-4656] UserSubject should be able to keep the list of custom properties
........

Added:
    
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Property.java
      - copied unchanged from r1415623, 
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Property.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/common/UserSubject.java

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

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/common/UserSubject.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/common/UserSubject.java?rev=1415627&r1=1415626&r2=1415627&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
 Fri Nov 30 13:32:27 2012
@@ -32,6 +32,7 @@ public class UserSubject {
     
     private String login;
     private List<String> roles = new LinkedList<String>();
+    private List<Property> properties = new LinkedList<Property>();;
     
     public UserSubject() {
         
@@ -79,6 +80,22 @@ public class UserSubject {
     public void setRoles(List<String> roles) {
         this.roles = roles;
     }
+
+    /**
+     * Get the list of additional user subject properties
+     * @return the list of properties
+     */
+    public List<Property> getProperties() {
+        return properties;
+    }
+
+    /**
+     * Set the list of additional user subject properties
+     * @param properties the properties
+     */
+    public void setProperties(List<Property> properties) {
+        this.properties = properties;
+    }
     
 
 }