svn commit: r1242361 - in /cxf/branches/2.5.x-fixes: ./ rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/ rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/

[sergeyb]

Author: sergeyb
Date: Thu Feb  9 15:34:29 2012
New Revision: 1242361

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

........
  r1242359 | sergeyb | 2012-02-09 15:31:32 +0000 (Thu, 09 Feb 2012) | 1 line
  
  Changing relativeLogoPath to logoUri in Client
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java
    
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/OAuthAuthorizationData.java
    
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 15:34:29 2012
@@ -1 +1 @@
-/cxf/trunk:1236720,1241934,1242263
+/cxf/trunk:1236720,1241934,1242263,1242359

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.5.x-fixes/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/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java?rev=1242361&r1=1242360&r2=1242361&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java
 Thu Feb  9 15:34:29 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/branches/2.5.x-fixes/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/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/OAuthAuthorizationData.java?rev=1242361&r1=1242360&r2=1242361&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/OAuthAuthorizationData.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/OAuthAuthorizationData.java
 Thu Feb  9 15:34:29 2012
@@ -36,7 +36,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;
     
@@ -103,11 +103,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/branches/2.5.x-fixes/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/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java?rev=1242361&r1=1242360&r2=1242361&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
 Thu Feb  9 15:34:29 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;