Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/184a85ff Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/184a85ff Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/184a85ff Branch: refs/heads/3.0.x-fixes Commit: 184a85ff16f61bc558edfad1180f6c21fb1057a7 Parents: cca2a91 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Jul 30 18:02:00 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Jul 30 18:02:00 2015 +0100 ---------------------------------------------------------------------- .../cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java | 2 +- .../apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/184a85ff/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java index 3e47c60..5e75b9d 100644 --- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java +++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java @@ -92,7 +92,7 @@ public class SAMLSSOResponseValidator { } // Validate Assertions - org.opensaml.saml.saml2.core.Assertion validAssertion = null; + org.opensaml.saml2.core.Assertion validAssertion = null; Date sessionNotOnOrAfter = null; for (org.opensaml.saml2.core.Assertion assertion : samlResponse.getAssertions()) { // Check the Issuer http://git-wip-us.apache.org/repos/asf/cxf/blob/184a85ff/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java index 53aed3e..5893af8 100644 --- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java +++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java @@ -43,9 +43,9 @@ import org.apache.wss4j.common.util.Loader; import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.WSSConfig; import org.joda.time.DateTime; -import org.opensaml.saml.common.xml.SAMLConstants; -import org.opensaml.saml.saml2.core.Response; -import org.opensaml.saml.saml2.core.Status; +import org.opensaml.common.xml.SAMLConstants; +import org.opensaml.saml2.core.Response; +import org.opensaml.saml2.core.Status; /** * Some unit tests for the SAMLProtocolResponseValidator and the SAMLSSOResponseValidator
