Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 819867c54 -> 24c65ee57
Removing warnings Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/24c65ee5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/24c65ee5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/24c65ee5 Branch: refs/heads/3.0.x-fixes Commit: 24c65ee574a29bb89b97b948ff2b683d31014a99 Parents: 819867c Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Tue Apr 28 15:32:18 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Tue Apr 28 15:32:18 2015 +0100 ---------------------------------------------------------------------- .../cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler.java | 2 -- .../systest/jaxrs/security/oauth2/SamlCallbackHandler2.java | 2 -- .../cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java | 6 +++--- 3 files changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/24c65ee5/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler.java index 17ebbc1..c105523 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler.java @@ -44,7 +44,6 @@ import org.apache.wss4j.common.saml.bean.ConditionsBean; import org.apache.wss4j.common.saml.bean.SubjectBean; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.joda.time.DateTime; -import org.opensaml.common.SAMLVersion; /** * A CallbackHandler instance that is used by the STS to mock up a SAML Attribute Assertion. @@ -66,7 +65,6 @@ public class SamlCallbackHandler implements CallbackHandler { for (int i = 0; i < callbacks.length; i++) { if (callbacks[i] instanceof SAMLCallback) { SAMLCallback callback = (SAMLCallback) callbacks[i]; - callback.setSamlVersion(SAMLVersion.VERSION_20); callback.setIssuer("resourceOwner"); String subjectName = m != null ? (String)m.getContextualProperty("saml.subject.name") : null; http://git-wip-us.apache.org/repos/asf/cxf/blob/24c65ee5/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler2.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler2.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler2.java index b7c00dd..06f3043 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler2.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/SamlCallbackHandler2.java @@ -47,7 +47,6 @@ import org.apache.wss4j.common.saml.bean.ConditionsBean; import org.apache.wss4j.common.saml.bean.SubjectBean; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.joda.time.DateTime; -import org.opensaml.common.SAMLVersion; /** * A CallbackHandler instance that is used by the STS to mock up a SAML Attribute Assertion. @@ -69,7 +68,6 @@ public class SamlCallbackHandler2 implements CallbackHandler { for (int i = 0; i < callbacks.length; i++) { if (callbacks[i] instanceof SAMLCallback) { SAMLCallback callback = (SAMLCallback) callbacks[i]; - callback.setSamlVersion(SAMLVersion.VERSION_20); callback.setIssuer("alice"); String subjectName = m != null ? (String)m.getContextualProperty("saml.subject.name") : null; http://git-wip-us.apache.org/repos/asf/cxf/blob/24c65ee5/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java index 657e416..2cc75f2 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java @@ -48,10 +48,10 @@ import org.apache.wss4j.common.saml.bean.AuthenticationStatementBean; import org.apache.wss4j.common.saml.bean.ConditionsBean; import org.apache.wss4j.common.saml.bean.KeyInfoBean; import org.apache.wss4j.common.saml.bean.SubjectBean; +import org.apache.wss4j.common.saml.bean.Version; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.joda.time.DateTime; -import org.opensaml.common.SAMLVersion; /** * A CallbackHandler instance that is used by the STS to mock up a SAML Attribute Assertion. @@ -79,9 +79,9 @@ public class SamlCallbackHandler implements CallbackHandler { if (callbacks[i] instanceof SAMLCallback) { SAMLCallback callback = (SAMLCallback) callbacks[i]; if (saml2) { - callback.setSamlVersion(SAMLVersion.VERSION_20); + callback.setSamlVersion(Version.SAML_20); } else { - callback.setSamlVersion(SAMLVersion.VERSION_11); + callback.setSamlVersion(Version.SAML_11); } callback.setIssuer("https://idp.example.org/SAML2";);
