cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Fixing a 3.0.x build failure
Date Wed, 08 Apr 2015 15:30:16 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes cd9550eae -> 90bd0ea2c


Fixing a 3.0.x build failure


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/90bd0ea2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/90bd0ea2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/90bd0ea2

Branch: refs/heads/3.0.x-fixes
Commit: 90bd0ea2c3a7a6a25b1928ccd956b30e4f96042d
Parents: cd9550e
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Wed Apr 8 16:29:57 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Apr 8 16:29:57 2015 +0100

----------------------------------------------------------------------
 .../rs/security/oauth2/client/BearerAuthSupplier.java    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/90bd0ea2/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/BearerAuthSupplier.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/BearerAuthSupplier.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/BearerAuthSupplier.java
index 557a825..04c94ab 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/BearerAuthSupplier.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/BearerAuthSupplier.java
@@ -31,7 +31,7 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
 import org.apache.cxf.transport.http.auth.HttpAuthSupplier;
 
 public class BearerAuthSupplier extends AbstractAuthSupplier implements HttpAuthSupplier
{
-    private Consumer consumer; 
+    private OAuthClientUtils.Consumer consumer; 
     private String accessTokenServiceUri;
     private boolean refreshEarly; 
     public BearerAuthSupplier() {
@@ -85,10 +85,10 @@ public class BearerAuthSupplier extends AbstractAuthSupplier implements
HttpAuth
         // and checked if the policy is null. 
         // Client TLS authentication is also fine as an alternative authentication mechanism,
         // how can we check here that a 2-way TLS has been set up ?
-        Consumer theConsumer = consumer;
+        OAuthClientUtils.Consumer theConsumer = consumer;
         if (theConsumer == null 
             && authPolicy != null && authPolicy.getUserName() != null &&
authPolicy.getPassword() != null) {
-            theConsumer = new Consumer(authPolicy.getUserName(), authPolicy.getPassword());
+            theConsumer = new OAuthClientUtils.Consumer(authPolicy.getUserName(), authPolicy.getPassword());
             return false;
         }
         if (theConsumer == null) {
@@ -116,10 +116,7 @@ public class BearerAuthSupplier extends AbstractAuthSupplier implements
HttpAuth
         this.accessTokenServiceUri = uri;
     }
 
-    public Consumer getConsumer() {
-        return consumer;
-    }
-    public void setConsumer(Consumer consumer) {
+    public void setConsumer(OAuthClientUtils.Consumer consumer) {
         this.consumer = consumer;
     }
 


Mime
View raw message