cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [2/2] cxf git commit: Making the context manager property name consistent
Date Tue, 24 Nov 2015 15:17:14 GMT
Making the context manager property name consistent


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

Branch: refs/heads/3.1.x-fixes
Commit: ede8089e0548bd4dd675414840b644dd99316323
Parents: 9f808d2
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Tue Nov 24 15:14:15 2015 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Tue Nov 24 15:16:59 2015 +0000

----------------------------------------------------------------------
 .../big_query/src/main/webapp/WEB-INF/applicationContext.xml     | 4 ++--
 .../cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java      | 4 ++--
 .../cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ede8089e/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
b/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
index 08e0d23..7171797 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/webapp/WEB-INF/applicationContext.xml
@@ -72,7 +72,7 @@
               This state manager is shared between this filter and the RP endpoint, 
               the RP endpoint sets an OIDC context on it and this filter checks the context
is available 
          -->
-         <property name="stateManager" ref="stateManager"/>
+         <property name="clientTokenContextManager" ref="stateManager"/>
          
          <!-- The address to redirect to if no OIDC context is available -->
          <property name="redirectUri" value="/forms/simpleLogin.jsp"/>    
@@ -102,7 +102,7 @@
          <!-- This state manager is shared between this RP endpoint and the oidcRpFilter
which protects
               the application endpoint, the RP endpoint sets an OIDC context on it and the
filter checks 
               the context is available -->
-         <property name="stateManager" ref="stateManager"/>
+         <property name="clientTokenContextManager" ref="stateManager"/>
          <!-- Where to redirect to once the authentication is complete -->
          <property name="defaultLocation" value="/service/search/start"/>
      </bean>

http://git-wip-us.apache.org/repos/asf/cxf/blob/ede8089e/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
index de4cad0..e2534ba 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationFilter.java
@@ -95,7 +95,7 @@ public class OidcRpAuthenticationFilter implements ContainerRequestFilter
{
     public void setRedirectUri(String redirectUri) {
         this.redirectUri = redirectUri;
     }
-    public void setStateManager(ClientTokenContextManager stateManager) {
-        this.stateManager = stateManager;
+    public void setClientTokenContextManager(ClientTokenContextManager manager) {
+        this.stateManager = manager;
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/ede8089e/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
index 7c4e66d..93fdd1c 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcRpAuthenticationService.java
@@ -75,8 +75,8 @@ public class OidcRpAuthenticationService {
         this.defaultLocation = defaultLocation;
     }
 
-    public void setStateManager(ClientTokenContextManager stateManager) {
-        this.stateManager = stateManager;
+    public void setClientTokenContextManager(ClientTokenContextManager manager) {
+        this.stateManager = manager;
     }
 
 }


Mime
View raw message