svn commit: r1242359 - in /cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth: data/Client.java data/OAuthAuthorizationData.java services/AuthorizationRequestHandler.java

[sergeyb]

Author: sergeyb
Date: Thu Feb  9 15:31:32 2012
New Revision: 1242359

URL: http://svn.apache.org/viewvc?rev=1242359&view=rev
Log:
Changing relativeLogoPath to logoUri in Client

Modified:
    
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java
    
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/OAuthAuthorizationData.java
    
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java

Modified: 
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java?rev=1242359&r1=1242358&r2=1242359&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java
 (original)
+++ 
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java
 Thu Feb  9 15:31:32 2012
@@ -27,7 +27,7 @@ public class Client {
     private String applicationURI;
     private String applicationName;
     private String applicationDescription;
-    private String relativeLogoPath;
+    private String logoUri;
     
     private String loginName;
         
@@ -113,12 +113,17 @@ public class Client {
         return applicationDescription;
     }
     
-    public void setRelativeLogoPath(String relativeLogoPath) {
-        this.relativeLogoPath = relativeLogoPath;
+    /**
+     * Sets the uri pointing to a client logo image.
+     * At the moment it must be a relative URI
+     * @param logoPath
+     */
+    public void setLogoUri(String logoPath) {
+        this.logoUri = logoPath;
     }
 
-    public String getRelativeLogoPath() {
-        return relativeLogoPath;
+    public String getLogoUri() {
+        return logoUri;
     }
 
     /**

Modified: 
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/OAuthAuthorizationData.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/OAuthAuthorizationData.java?rev=1242359&r1=1242358&r2=1242359&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/OAuthAuthorizationData.java
 (original)
+++ 
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/OAuthAuthorizationData.java
 Thu Feb  9 15:31:32 2012
@@ -37,7 +37,7 @@ public class OAuthAuthorizationData impl
     private String applicationName;
     private String applicationURI;
     private String applicationDescription;
-    private String relativeLogoPath;
+    private String logoUri;
     private String replyTo;
     private List<? extends Permission> permissions;
     
@@ -104,11 +104,11 @@ public class OAuthAuthorizationData impl
         return applicationDescription;
     }
 
-    public void setRelativeLogoPath(String relativeLogoPath) {
-        this.relativeLogoPath = relativeLogoPath;
+    public void setLogoUri(String logoPath) {
+        this.logoUri = logoPath;
     }
 
-    public String getRelativeLogoPath() {
-        return relativeLogoPath;
+    public String getLogoUri() {
+        return logoUri;
     }
 }

Modified: 
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java?rev=1242359&r1=1242358&r2=1242359&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
 (original)
+++ 
cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
 Thu Feb  9 15:31:32 2012
@@ -156,7 +156,7 @@ public class AuthorizationRequestHandler
         secData.setApplicationName(token.getClient().getApplicationName()); 
         secData.setApplicationURI(token.getClient().getApplicationURI());
         
secData.setApplicationDescription(token.getClient().getApplicationDescription());
-        secData.setRelativeLogoPath(token.getClient().getRelativeLogoPath());
+        secData.setLogoUri(token.getClient().getLogoUri());
         secData.setPermissions(token.getScopes());
         
         return secData;