Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java Wed Mar 6 17:02:43 2013 @@ -41,9 +41,9 @@ import org.apache.cxf.message.ExchangeIm import org.apache.cxf.message.MessageImpl; import org.apache.cxf.phase.PhaseInterceptor; import org.apache.cxf.staxutils.StaxUtils; -import org.apache.ws.security.WSSecurityEngineResult; -import org.apache.ws.security.handler.WSHandlerConstants; -import org.apache.ws.security.handler.WSHandlerResult; +import org.apache.wss4j.dom.WSSecurityEngineResult; +import org.apache.wss4j.dom.handler.WSHandlerConstants; +import org.apache.wss4j.dom.handler.WSHandlerResult; /**
Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java Wed Mar 6 17:02:43 2013 @@ -26,7 +26,7 @@ import javax.security.auth.callback.Call import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; public class TestPwdCallback implements CallbackHandler { Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/UserNameTokenAuthorizationTest.java Wed Mar 6 17:02:43 2013 @@ -35,8 +35,8 @@ import org.apache.cxf.jaxws.JaxWsServerF import org.apache.cxf.service.Service; import org.apache.cxf.transport.local.LocalConduit; import org.apache.cxf.transport.local.LocalTransportFactory; -import org.apache.ws.security.WSConstants; -import org.apache.ws.security.handler.WSHandlerConstants; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.junit.Test; Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JFaultCodeTest.java Wed Mar 6 17:02:43 2013 @@ -41,8 +41,8 @@ import org.apache.cxf.message.ExchangeIm import org.apache.cxf.message.MessageImpl; import org.apache.cxf.phase.PhaseInterceptor; import org.apache.cxf.staxutils.StaxUtils; -import org.apache.ws.security.WSConstants; -import org.apache.ws.security.handler.WSHandlerConstants; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.junit.Test; Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java Wed Mar 6 17:02:43 2013 @@ -56,13 +56,13 @@ import org.apache.cxf.phase.Phase; import org.apache.cxf.phase.PhaseInterceptor; import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.staxutils.StaxUtils; -import org.apache.ws.security.WSConstants; -import org.apache.ws.security.WSDataRef; -import org.apache.ws.security.WSSecurityEngineResult; -import org.apache.ws.security.WSUsernameTokenPrincipal; -import org.apache.ws.security.handler.WSHandlerConstants; -import org.apache.ws.security.handler.WSHandlerResult; -import org.apache.ws.security.util.WSSecurityUtil; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.WSDataRef; +import org.apache.wss4j.dom.WSSecurityEngineResult; +import org.apache.wss4j.dom.WSUsernameTokenPrincipal; +import org.apache.wss4j.dom.handler.WSHandlerConstants; +import org.apache.wss4j.dom.handler.WSHandlerResult; +import org.apache.wss4j.dom.util.WSSecurityUtil; import org.junit.Test; Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java Wed Mar 6 17:02:43 2013 @@ -32,12 +32,12 @@ import org.apache.cxf.message.Exchange; import org.apache.cxf.message.ExchangeImpl; import org.apache.cxf.message.MessageImpl; import org.apache.cxf.phase.PhaseInterceptor; -import org.apache.ws.security.WSConstants; -import org.apache.ws.security.WSSecurityException; -import org.apache.ws.security.action.UsernameTokenAction; -import org.apache.ws.security.handler.RequestData; -import org.apache.ws.security.handler.WSHandler; -import org.apache.ws.security.handler.WSHandlerConstants; +import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.action.UsernameTokenAction; +import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.dom.handler.WSHandler; +import org.apache.wss4j.dom.handler.WSHandlerConstants; import org.junit.Test; Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/AbstractSAMLCallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/AbstractSAMLCallbackHandler.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/AbstractSAMLCallbackHandler.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/AbstractSAMLCallbackHandler.java Wed Mar 6 17:02:43 2013 @@ -30,17 +30,17 @@ import javax.xml.parsers.DocumentBuilder import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.ws.security.WSConstants; -import org.apache.ws.security.message.WSSecEncryptedKey; -import org.apache.ws.security.saml.ext.SAMLCallback; -import org.apache.ws.security.saml.ext.bean.ActionBean; -import org.apache.ws.security.saml.ext.bean.AttributeBean; -import org.apache.ws.security.saml.ext.bean.AttributeStatementBean; -import org.apache.ws.security.saml.ext.bean.AuthDecisionStatementBean; -import org.apache.ws.security.saml.ext.bean.AuthenticationStatementBean; -import org.apache.ws.security.saml.ext.bean.KeyInfoBean; -import org.apache.ws.security.saml.ext.bean.KeyInfoBean.CERT_IDENTIFIER; -import org.apache.ws.security.saml.ext.bean.SubjectBean; +import org.apache.wss4j.common.saml.SAMLCallback; +import org.apache.wss4j.common.saml.bean.ActionBean; +import org.apache.wss4j.common.saml.bean.AttributeBean; +import org.apache.wss4j.common.saml.bean.AttributeStatementBean; +import org.apache.wss4j.common.saml.bean.AuthDecisionStatementBean; +import org.apache.wss4j.common.saml.bean.AuthenticationStatementBean; +import org.apache.wss4j.common.saml.bean.KeyInfoBean; +import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER; +import org.apache.wss4j.common.saml.bean.SubjectBean; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.message.WSSecEncryptedKey; /** * A base implementation of a Callback Handler for a SAML assertion. By default it creates an Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomSamlValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomSamlValidator.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomSamlValidator.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/CustomSamlValidator.java Wed Mar 6 17:02:43 2013 @@ -19,12 +19,12 @@ package org.apache.cxf.ws.security.wss4j.saml; -import org.apache.ws.security.WSSecurityException; -import org.apache.ws.security.handler.RequestData; -import org.apache.ws.security.saml.ext.AssertionWrapper; -import org.apache.ws.security.saml.ext.OpenSAMLUtil; -import org.apache.ws.security.validate.Credential; -import org.apache.ws.security.validate.SamlAssertionValidator; +import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.saml.OpenSAMLUtil; +import org.apache.wss4j.common.saml.SamlAssertionWrapper; +import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.dom.validate.SamlAssertionValidator; /** * A trivial custom Validator for a SAML Assertion. It makes sure that the issuer is @@ -51,26 +51,26 @@ public class CustomSamlValidator extends // // Do some custom validation on the assertion // - AssertionWrapper assertion = credential.getAssertion(); + SamlAssertionWrapper assertion = credential.getSamlAssertion(); if (!"www.example.com".equals(assertion.getIssuerString())) { - throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity"); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } if (requireSAML1Assertion && assertion.getSaml1() == null) { - throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity"); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } else if (!requireSAML1Assertion && assertion.getSaml2() == null) { - throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity"); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } String confirmationMethod = assertion.getConfirmationMethods().get(0); if (confirmationMethod == null) { - throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity"); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } if (requireSenderVouches && !OpenSAMLUtil.isMethodSenderVouches(confirmationMethod)) { - throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity"); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } else if (!requireSenderVouches && !OpenSAMLUtil.isMethodHolderOfKey(confirmationMethod)) { - throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity"); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } return returnedCredential; Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML1CallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML1CallbackHandler.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML1CallbackHandler.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML1CallbackHandler.java Wed Mar 6 17:02:43 2013 @@ -24,13 +24,13 @@ import java.io.IOException; import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.components.crypto.Crypto; -import org.apache.ws.security.components.crypto.CryptoFactory; -import org.apache.ws.security.components.crypto.CryptoType; -import org.apache.ws.security.saml.ext.SAMLCallback; -import org.apache.ws.security.saml.ext.bean.KeyInfoBean; -import org.apache.ws.security.saml.ext.bean.SubjectBean; -import org.apache.ws.security.saml.ext.builder.SAML1Constants; +import org.apache.wss4j.common.crypto.Crypto; +import org.apache.wss4j.common.crypto.CryptoFactory; +import org.apache.wss4j.common.crypto.CryptoType; +import org.apache.wss4j.common.saml.SAMLCallback; +import org.apache.wss4j.common.saml.bean.KeyInfoBean; +import org.apache.wss4j.common.saml.bean.SubjectBean; +import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.opensaml.common.SAMLVersion; /** Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML2CallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML2CallbackHandler.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML2CallbackHandler.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SAML2CallbackHandler.java Wed Mar 6 17:02:43 2013 @@ -24,13 +24,13 @@ import java.io.IOException; import javax.security.auth.callback.Callback; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.components.crypto.Crypto; -import org.apache.ws.security.components.crypto.CryptoFactory; -import org.apache.ws.security.components.crypto.CryptoType; -import org.apache.ws.security.saml.ext.SAMLCallback; -import org.apache.ws.security.saml.ext.bean.KeyInfoBean; -import org.apache.ws.security.saml.ext.bean.SubjectBean; -import org.apache.ws.security.saml.ext.builder.SAML2Constants; +import org.apache.wss4j.common.crypto.Crypto; +import org.apache.wss4j.common.crypto.CryptoFactory; +import org.apache.wss4j.common.crypto.CryptoType; +import org.apache.wss4j.common.saml.SAMLCallback; +import org.apache.wss4j.common.saml.bean.KeyInfoBean; +import org.apache.wss4j.common.saml.bean.SubjectBean; +import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.opensaml.common.SAMLVersion; /** Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java?rev=1453426&r1=1453425&r2=1453426&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java Wed Mar 6 17:02:43 2013 @@ -55,15 +55,15 @@ import org.apache.cxf.ws.security.wss4j. import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; import org.apache.cxf.ws.security.wss4j.saml.AbstractSAMLCallbackHandler.Statement; -import org.apache.ws.security.WSConstants; -import org.apache.ws.security.WSSecurityEngine; -import org.apache.ws.security.WSSecurityEngineResult; -import org.apache.ws.security.handler.WSHandlerConstants; -import org.apache.ws.security.handler.WSHandlerResult; -import org.apache.ws.security.saml.ext.AssertionWrapper; -import org.apache.ws.security.saml.ext.builder.SAML1Constants; -import org.apache.ws.security.saml.ext.builder.SAML2Constants; -import org.apache.ws.security.util.WSSecurityUtil; +import org.apache.wss4j.common.saml.SamlAssertionWrapper; +import org.apache.wss4j.common.saml.builder.SAML1Constants; +import org.apache.wss4j.common.saml.builder.SAML2Constants; +import org.apache.wss4j.dom.WSConstants; +import org.apache.wss4j.dom.WSSecurityEngine; +import org.apache.wss4j.dom.WSSecurityEngineResult; +import org.apache.wss4j.dom.handler.WSHandlerConstants; +import org.apache.wss4j.dom.handler.WSHandlerResult; +import org.apache.wss4j.dom.util.WSSecurityUtil; import org.junit.Test; @@ -109,8 +109,8 @@ public class SamlTokenTest extends Abstr WSSecurityEngineResult actionResult = WSSecurityUtil.fetchActionResult(handlerResults.get(0).getResults(), WSConstants.ST_UNSIGNED); - AssertionWrapper receivedAssertion = - (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); + SamlAssertionWrapper receivedAssertion = + (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); assertTrue(receivedAssertion != null && receivedAssertion.getSaml1() != null); assert !receivedAssertion.isSigned(); } @@ -150,8 +150,8 @@ public class SamlTokenTest extends Abstr WSSecurityEngineResult actionResult = WSSecurityUtil.fetchActionResult(handlerResults.get(0).getResults(), WSConstants.ST_UNSIGNED); - AssertionWrapper receivedAssertion = - (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); + SamlAssertionWrapper receivedAssertion = + (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); assertTrue(receivedAssertion != null && receivedAssertion.getSaml2() != null); assert !receivedAssertion.isSigned(); } @@ -194,8 +194,8 @@ public class SamlTokenTest extends Abstr WSSecurityEngineResult actionResult = WSSecurityUtil.fetchActionResult(handlerResults.get(0).getResults(), WSConstants.ST_UNSIGNED); - AssertionWrapper receivedAssertion = - (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); + SamlAssertionWrapper receivedAssertion = + (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); assertTrue(receivedAssertion != null && receivedAssertion.getSaml1() != null); assert !receivedAssertion.isSigned(); @@ -243,8 +243,8 @@ public class SamlTokenTest extends Abstr WSSecurityEngineResult actionResult = WSSecurityUtil.fetchActionResult(handlerResults.get(0).getResults(), WSConstants.ST_UNSIGNED); - AssertionWrapper receivedAssertion = - (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); + SamlAssertionWrapper receivedAssertion = + (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); assertTrue(receivedAssertion != null && receivedAssertion.getSaml2() != null); assert !receivedAssertion.isSigned(); @@ -303,8 +303,8 @@ public class SamlTokenTest extends Abstr WSSecurityEngineResult actionResult = WSSecurityUtil.fetchActionResult(handlerResults.get(0).getResults(), WSConstants.ST_SIGNED); - AssertionWrapper receivedAssertion = - (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); + SamlAssertionWrapper receivedAssertion = + (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); assertTrue(receivedAssertion != null && receivedAssertion.getSaml1() != null); assert receivedAssertion.isSigned(); @@ -370,8 +370,8 @@ public class SamlTokenTest extends Abstr WSSecurityEngineResult actionResult = WSSecurityUtil.fetchActionResult(handlerResults.get(0).getResults(), WSConstants.ST_SIGNED); - AssertionWrapper receivedAssertion = - (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); + SamlAssertionWrapper receivedAssertion = + (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); assertTrue(receivedAssertion != null && receivedAssertion.getSaml2() != null); assert receivedAssertion.isSigned(); @@ -424,8 +424,8 @@ public class SamlTokenTest extends Abstr WSSecurityEngineResult actionResult = WSSecurityUtil.fetchActionResult(handlerResults.get(0).getResults(), WSConstants.ST_UNSIGNED); - AssertionWrapper receivedAssertion = - (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); + SamlAssertionWrapper receivedAssertion = + (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); assertTrue(receivedAssertion != null && receivedAssertion.getSaml2() != null); assert !receivedAssertion.isSigned(); } @@ -474,8 +474,8 @@ public class SamlTokenTest extends Abstr WSSecurityEngineResult actionResult = WSSecurityUtil.fetchActionResult(handlerResults.get(0).getResults(), WSConstants.ST_UNSIGNED); - AssertionWrapper receivedAssertion = - (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); + SamlAssertionWrapper receivedAssertion = + (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); assertTrue(receivedAssertion != null && receivedAssertion.getSaml2() != null); assert !receivedAssertion.isSigned(); } @@ -523,8 +523,8 @@ public class SamlTokenTest extends Abstr WSSecurityEngineResult actionResult = WSSecurityUtil.fetchActionResult(handlerResults.get(0).getResults(), WSConstants.ST_UNSIGNED); - AssertionWrapper receivedAssertion = - (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); + SamlAssertionWrapper receivedAssertion = + (SamlAssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION); assertTrue(receivedAssertion != null && receivedAssertion.getSaml1() != null); assert !receivedAssertion.isSigned(); }
