cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [4/4] cxf git commit: Fixing merge
Date Tue, 06 Sep 2016 10:15:24 GMT
Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: 595c43e2131e3b0d483faa821417450ab4701c1f
Parents: 4766131
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Sep 6 11:15:14 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Sep 6 11:15:14 2016 +0100

----------------------------------------------------------------------
 ...AbstractRequestAssertionConsumerHandler.java | 36 --------------------
 1 file changed, 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/595c43e2/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
index f5c8aae..cbfeab5 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
@@ -70,12 +70,7 @@ public abstract class AbstractRequestAssertionConsumerHandler extends AbstractSS
     private TokenReplayCache<String> replayCache;
 
     private MessageContext messageContext;
-<<<<<<< HEAD
-=======
-    private String applicationURL;
-    private boolean parseApplicationURLFromRelayState;
     private String assertionConsumerServiceAddress;
->>>>>>> dac029e... CXF-7039 - JAX-RS Security SAML web SSO consumer
service can not validate SAML response behind reverse proxy
     
     @Context 
     public void setMessageContext(MessageContext mc) {
@@ -362,40 +357,9 @@ public abstract class AbstractRequestAssertionConsumerHandler extends
AbstractSS
     public void setEnforceResponseSigned(boolean enforceResponseSigned) {
         this.enforceResponseSigned = enforceResponseSigned;
     }
-<<<<<<< HEAD
-=======
-
-    public String getApplicationURL() {
-        return applicationURL;
-    }
-
-    /**
-     * Set the Application URL to forward to, for the unsolicited IdP case.
-     * @param applicationURL
-     */
-    public void setApplicationURL(String applicationURL) {
-        this.applicationURL = applicationURL;
-    }
-
-    public boolean isParseApplicationURLFromRelayState() {
-        return parseApplicationURLFromRelayState;
-    }
-
-    /**
-     * Whether to parse the application URL to forward to from the RelayState, for the unsolicted
IdP case.
-     * @param parseApplicationURLFromRelayState
-     */
-    public void setParseApplicationURLFromRelayState(boolean parseApplicationURLFromRelayState)
{
-        this.parseApplicationURLFromRelayState = parseApplicationURLFromRelayState;
-    }
-
-    public String getAssertionConsumerServiceAddress() {
-        return assertionConsumerServiceAddress;
-    }
 
     public void setAssertionConsumerServiceAddress(String assertionConsumerServiceAddress)
{
         this.assertionConsumerServiceAddress = assertionConsumerServiceAddress;
     }
 
->>>>>>> dac029e... CXF-7039 - JAX-RS Security SAML web SSO consumer
service can not validate SAML response behind reverse proxy
 }


Mime
View raw message