Author: sergeyb
Date: Tue Dec 4 12:18:01 2012
New Revision: 1416910
URL: http://svn.apache.org/viewvc?rev=1416910&view=rev
Log:
Merged revisions 1416906 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1416906 | sergeyb | 2012-12-04 12:05:59 +0000 (Tue, 04 Dec 2012) | 1 line
[CXF-4679] Updating Client to have a list of extra properties
........
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/Client.java
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:r1416906
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/Client.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/Client.java?rev=1416910&r1=1416909&r2=1416910&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
(original)
+++
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
Tue Dec 4 12:18:01 2012
@@ -19,6 +19,7 @@
package org.apache.cxf.rs.security.oauth2.common;
import java.util.Collections;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -39,7 +40,7 @@ public class Client {
private boolean isConfidential;
private List<String> allowedGrantTypes = Collections.emptyList();
-
+ private List<Property> properties = new LinkedList<Property>();
private UserSubject subject;
public Client(String clientId, String clientSecret, boolean
isConfidential) {
@@ -214,4 +215,20 @@ public class Client {
public UserSubject getSubject() {
return subject;
}
+
+ /**
+ * Get the list of additional client properties
+ * @return the list of properties
+ */
+ public List<Property> getProperties() {
+ return properties;
+ }
+
+ /**
+ * Set the list of additional client properties
+ * @param properties the properties
+ */
+ public void setProperties(List<Property> properties) {
+ this.properties = properties;
+ }
}
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=1416910&r1=1416909&r2=1416910&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
Tue Dec 4 12:18:01 2012
@@ -32,7 +32,7 @@ public class UserSubject {
private String login;
private List<String> roles = new LinkedList<String>();
- private List<Property> properties = new LinkedList<Property>();;
+ private List<Property> properties = new LinkedList<Property>();
public UserSubject() {
