Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 38759E625 for ; Tue, 4 Dec 2012 12:06:24 +0000 (UTC) Received: (qmail 64487 invoked by uid 500); 4 Dec 2012 12:06:23 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 64358 invoked by uid 500); 4 Dec 2012 12:06:23 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 64340 invoked by uid 99); 4 Dec 2012 12:06:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 12:06:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 12:06:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3BCA5238897F; Tue, 4 Dec 2012 12:06:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1416906 - in /cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common: Client.java UserSubject.java Date: Tue, 04 Dec 2012 12:06:00 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121204120601.3BCA5238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Tue Dec 4 12:05:59 2012 New Revision: 1416906 URL: http://svn.apache.org/viewvc?rev=1416906&view=rev Log: [CXF-4679] Updating Client to have a list of extra properties Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java Modified: cxf/trunk/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/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java?rev=1416906&r1=1416905&r2=1416906&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java Tue Dec 4 12:05:59 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 allowedGrantTypes = Collections.emptyList(); - + private List properties = new LinkedList(); 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 getProperties() { + return properties; + } + + /** + * Set the list of additional client properties + * @param properties the properties + */ + public void setProperties(List properties) { + this.properties = properties; + } } Modified: cxf/trunk/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/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java?rev=1416906&r1=1416905&r2=1416906&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java Tue Dec 4 12:05:59 2012 @@ -32,7 +32,7 @@ public class UserSubject { private String login; private List roles = new LinkedList(); - private List properties = new LinkedList();; + private List properties = new LinkedList(); public UserSubject() {