Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E0E6DD32F for ; Wed, 6 Mar 2013 17:05:16 +0000 (UTC) Received: (qmail 28384 invoked by uid 500); 6 Mar 2013 17:05:16 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 28325 invoked by uid 500); 6 Mar 2013 17:05:16 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 28317 invoked by uid 99); 6 Mar 2013 17:05:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Mar 2013 17:05:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Mar 2013 17:05:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 36C5B238896F; Wed, 6 Mar 2013 17:04:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1453431 - in /cxf/branches/wss4j2.0-port: distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/ distribution/src/main/release/samples/sts/src/m... Date: Wed, 06 Mar 2013 17:04:48 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130306170451.36C5B238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Wed Mar 6 17:04:47 2013 New Revision: 1453431 URL: http://svn.apache.org/r1453431 Log: Everything working bar one failing test in systests Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/ServerCallbackHandler.java cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/saml/SamlOAuthValidator.java cxf/branches/wss4j2.0-port/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java cxf/branches/wss4j2.0-port/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java cxf/branches/wss4j2.0-port/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java cxf/branches/wss4j2.0-port/rt/security/pom.xml cxf/branches/wss4j2.0-port/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/AbstractXACMLAuthorizingInterceptor.java cxf/branches/wss4j2.0-port/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/RequestComponentBuilderTest.java cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/SamlRequestComponentBuilderTest.java cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLAuthorizingInterceptorTest.java cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlElementCallbackHandler.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlRoleCallbackHandler.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/CustomSaml2Validator.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/KeystorePasswordCallback.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/KeystorePasswordCallback.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/UTPasswordCallback.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/KeystorePasswordCallback.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/KeystorePasswordCallback.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java Wed Mar 6 17:04:47 2013 @@ -22,7 +22,7 @@ import java.io.IOException; import javax.security.auth.callback.Callback; 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 ClientCallbackHandler implements CallbackHandler { @@ -31,12 +31,12 @@ public class ClientCallbackHandler imple for (int i = 0; i < callbacks.length; i++) { if (callbacks[i] instanceof WSPasswordCallback) { WSPasswordCallback pc = (WSPasswordCallback) callbacks[i]; - if (pc.getUsage() == WSPasswordCallback.DECRYPT - || pc.getUsage() == WSPasswordCallback.SIGNATURE) { + if (pc.getUsage() == WSPasswordCallback.Usage.DECRYPT + || pc.getUsage() == WSPasswordCallback.Usage.SIGNATURE) { if ("myclientkey".equals(pc.getIdentifier())) { pc.setPassword("ckpass"); } - } else if (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN) { + } else if (pc.getUsage() == WSPasswordCallback.Usage.USERNAME_TOKEN) { if ("alice".equals(pc.getIdentifier())) { pc.setPassword("clarinet"); break; Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/ServerCallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/ServerCallbackHandler.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/ServerCallbackHandler.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/ServerCallbackHandler.java Wed Mar 6 17:04:47 2013 @@ -22,7 +22,7 @@ import java.io.IOException; import javax.security.auth.callback.Callback; 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 ServerCallbackHandler implements CallbackHandler { Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java Wed Mar 6 17:04:47 2013 @@ -22,7 +22,7 @@ import java.io.IOException; import javax.security.auth.callback.Callback; 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 STSCallbackHandler implements CallbackHandler { @@ -31,12 +31,12 @@ public class STSCallbackHandler implemen for (int i = 0; i < callbacks.length; i++) { if (callbacks[i] instanceof WSPasswordCallback) { WSPasswordCallback pc = (WSPasswordCallback) callbacks[i]; - if (pc.getUsage() == WSPasswordCallback.DECRYPT - || pc.getUsage() == WSPasswordCallback.SIGNATURE) { + if (pc.getUsage() == WSPasswordCallback.Usage.DECRYPT + || pc.getUsage() == WSPasswordCallback.Usage.SIGNATURE) { if ("mystskey".equals(pc.getIdentifier())) { pc.setPassword("stskpass"); } - } else if (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN) { + } else if (pc.getUsage() == WSPasswordCallback.Usage.USERNAME_TOKEN) { if ("alice".equals(pc.getIdentifier())) { pc.setPassword("clarinet"); } Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java (original) +++ cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/auth/saml/Saml2BearerAuthHandler.java Wed Mar 6 17:04:47 2013 @@ -41,7 +41,7 @@ import org.apache.cxf.rs.security.oauth2 import org.apache.cxf.rs.security.saml.AbstractSamlInHandler; import org.apache.cxf.rs.security.saml.SAMLUtils; import org.apache.cxf.rs.security.saml.assertion.Subject; -import org.apache.ws.security.saml.ext.AssertionWrapper; +import org.apache.wss4j.common.saml.SamlAssertionWrapper; public class Saml2BearerAuthHandler extends AbstractSamlInHandler { private FormEncodingProvider
provider = new FormEncodingProvider(true); @@ -105,7 +105,7 @@ public class Saml2BearerAuthHandler exte protected void validateToken(Message message, Element element, String clientId) { - AssertionWrapper wrapper = toWrapper(element); + SamlAssertionWrapper wrapper = toWrapper(element); // The common SAML assertion validation: // signature, subject confirmation, etc super.validateToken(message, wrapper); Modified: cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java (original) +++ cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/grants/saml/Saml2BearerGrantHandler.java Wed Mar 6 17:04:47 2013 @@ -58,13 +58,18 @@ import org.apache.cxf.rs.security.saml.a import org.apache.cxf.security.SecurityContext; import org.apache.cxf.security.transport.TLSSessionInfo; import org.apache.cxf.ws.security.SecurityConstants; -import org.apache.ws.security.WSSConfig; -import org.apache.ws.security.handler.RequestData; -import org.apache.ws.security.handler.WSHandlerConstants; -import org.apache.ws.security.saml.ext.AssertionWrapper; -import org.apache.ws.security.validate.Credential; -import org.apache.ws.security.validate.SamlAssertionValidator; -import org.apache.ws.security.validate.Validator; +import org.apache.wss4j.common.saml.SAMLKeyInfo; +import org.apache.wss4j.common.saml.SAMLUtil; +import org.apache.wss4j.common.saml.SamlAssertionWrapper; +import org.apache.wss4j.dom.WSSConfig; +import org.apache.wss4j.dom.handler.RequestData; +import org.apache.wss4j.dom.handler.WSHandlerConstants; +import org.apache.wss4j.dom.validate.Credential; +import org.apache.wss4j.dom.validate.SamlAssertionValidator; +import org.apache.wss4j.dom.validate.Validator; + +import org.opensaml.xml.signature.KeyInfo; +import org.opensaml.xml.signature.Signature; /** * The "SAML2 Bearer" grant handler @@ -117,7 +122,7 @@ public class Saml2BearerGrantHandler ext try { InputStream tokenStream = decodeAssertion(assertion); Element token = readToken(tokenStream); - AssertionWrapper assertionWrapper = new AssertionWrapper(token); + SamlAssertionWrapper assertionWrapper = new SamlAssertionWrapper(token); Message message = PhaseInterceptorChain.getCurrentMessage(); @@ -134,7 +139,7 @@ public class Saml2BearerGrantHandler ext } } - protected UserSubject getGrantSubject(Message message, AssertionWrapper wrapper) { + protected UserSubject getGrantSubject(Message message, SamlAssertionWrapper wrapper) { SecurityContext sc = scProvider.getSecurityContext(message, wrapper); if (sc instanceof JAXRSSAMLSecurityContext) { JAXRSSAMLSecurityContext jaxrsSc = (JAXRSSAMLSecurityContext)sc; @@ -174,7 +179,7 @@ public class Saml2BearerGrantHandler ext } } - protected void validateToken(Message message, AssertionWrapper assertion) { + protected void validateToken(Message message, SamlAssertionWrapper assertion) { try { RequestData data = new RequestData(); if (assertion.isSigned()) { @@ -182,7 +187,7 @@ public class Saml2BearerGrantHandler ext data.setWssConfig(cfg); data.setCallbackHandler(SecurityUtils.getCallbackHandler(message, this.getClass())); try { - data.setSigCrypto(new CryptoLoader().getCrypto(message, + data.setSigVerCrypto(new CryptoLoader().getCrypto(message, SecurityConstants.SIGNATURE_CRYPTO, SecurityConstants.SIGNATURE_PROPERTIES)); } catch (IOException ex) { @@ -190,14 +195,22 @@ public class Saml2BearerGrantHandler ext } data.setEnableRevocation(MessageUtils.isTrue( message.getContextualProperty(WSHandlerConstants.ENABLE_REVOCATION))); - assertion.verifySignature(data, null); + + Signature sig = assertion.getSignature(); + KeyInfo keyInfo = sig.getKeyInfo(); + SAMLKeyInfo samlKeyInfo = + SAMLUtil.getCredentialDirectlyFromKeyInfo( + keyInfo.getDOM(), data.getSigVerCrypto() + ); + assertion.verifySignature(samlKeyInfo); + } else if (getTLSCertificates(message) == null) { throw new OAuthServiceException(OAuthConstants.INVALID_GRANT); } if (samlValidator != null) { Credential credential = new Credential(); - credential.setAssertion(assertion); + credential.setSamlAssertion(assertion); samlValidator.validate(credential, data); } samlOAuthValidator.validate(message, assertion); @@ -211,7 +224,7 @@ public class Saml2BearerGrantHandler ext return tlsInfo != null ? tlsInfo.getPeerCertificates() : null; } - protected void setSecurityContext(Message message, AssertionWrapper wrapper) { + protected void setSecurityContext(Message message, SamlAssertionWrapper wrapper) { if (scProvider != null) { SecurityContext sc = scProvider.getSecurityContext(message, wrapper); message.put(SecurityContext.class, sc); Modified: cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/saml/SamlOAuthValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/saml/SamlOAuthValidator.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/saml/SamlOAuthValidator.java (original) +++ cxf/branches/wss4j2.0-port/rt/rs/security/oauth-parent/oauth2-saml/src/main/java/org/apache/cxf/rs/security/oauth2/saml/SamlOAuthValidator.java Wed Mar 6 17:04:47 2013 @@ -28,8 +28,8 @@ import javax.ws.rs.core.UriBuilder; import org.apache.cxf.jaxrs.impl.UriInfoImpl; import org.apache.cxf.message.Message; import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants; -import org.apache.ws.security.saml.ext.AssertionWrapper; -import org.apache.ws.security.saml.ext.builder.SAML2Constants; +import org.apache.wss4j.common.saml.SamlAssertionWrapper; +import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.opensaml.saml2.core.Audience; import org.opensaml.saml2.core.AudienceRestriction; import org.opensaml.saml2.core.Conditions; @@ -62,7 +62,7 @@ public class SamlOAuthValidator { issuer = value; } - public void validate(Message message, AssertionWrapper wrapper) { + public void validate(Message message, SamlAssertionWrapper wrapper) { Conditions cs = wrapper.getSaml2().getConditions(); validateAudience(message, cs); @@ -80,7 +80,7 @@ public class SamlOAuthValidator { } } - private String getIssuer(AssertionWrapper assertionW) { + private String getIssuer(SamlAssertionWrapper assertionW) { Issuer samlIssuer = assertionW.getSaml2().getIssuer(); return samlIssuer == null ? null : samlIssuer.getValue(); } Modified: cxf/branches/wss4j2.0-port/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java (original) +++ cxf/branches/wss4j2.0-port/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLProtocolResponseValidator.java Wed Mar 6 17:04:47 2013 @@ -335,7 +335,7 @@ public class SAMLProtocolResponseValidat credential.setSamlAssertion(assertion); RequestData requestData = new RequestData(); - requestData.setSigCrypto(sigCrypto); + requestData.setSigVerCrypto(sigCrypto); WSSConfig wssConfig = WSSConfig.getNewInstance(); requestData.setWssConfig(wssConfig); requestData.setCallbackHandler(callbackHandler); Modified: cxf/branches/wss4j2.0-port/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java Wed Mar 6 17:04:47 2013 @@ -40,6 +40,7 @@ import org.apache.wss4j.common.saml.SAML import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.apache.wss4j.common.util.Loader; +import org.apache.wss4j.dom.WSSConfig; import org.opensaml.common.SignableSAMLObject; import org.opensaml.saml2.core.Response; import org.opensaml.saml2.core.Status; @@ -55,6 +56,7 @@ import org.opensaml.xml.signature.Signat public class SAMLResponseValidatorTest extends org.junit.Assert { static { + WSSConfig.init(); OpenSAMLUtil.initSamlEngine(); } Modified: cxf/branches/wss4j2.0-port/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java (original) +++ cxf/branches/wss4j2.0-port/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java Wed Mar 6 17:04:47 2013 @@ -32,7 +32,7 @@ public class TrustValidator { throws WSSecurityException { SignatureTrustValidator validator = new SignatureTrustValidator(); RequestData data = new RequestData(); - data.setSigCrypto(crypto); + data.setSigVerCrypto(crypto); Credential trustCredential = new Credential(); trustCredential.setPublicKey(publicKey); Modified: cxf/branches/wss4j2.0-port/rt/security/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/security/pom.xml?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/security/pom.xml (original) +++ cxf/branches/wss4j2.0-port/rt/security/pom.xml Wed Mar 6 17:04:47 2013 @@ -44,8 +44,8 @@ ${project.version} - org.apache.ws.security - wss4j + org.apache.wss4j + wss4j-ws-security-dom ${cxf.wss4j.version} Modified: cxf/branches/wss4j2.0-port/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/AbstractXACMLAuthorizingInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/AbstractXACMLAuthorizingInterceptor.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/AbstractXACMLAuthorizingInterceptor.java (original) +++ cxf/branches/wss4j2.0-port/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/AbstractXACMLAuthorizingInterceptor.java Wed Mar 6 17:04:47 2013 @@ -34,7 +34,6 @@ import org.apache.cxf.phase.AbstractPhas import org.apache.cxf.phase.Phase; import org.apache.cxf.security.LoginSecurityContext; import org.apache.cxf.security.SecurityContext; -import org.apache.ws.security.saml.ext.OpenSAMLUtil; import org.opensaml.xacml.ctx.DecisionType; import org.opensaml.xacml.ctx.RequestType; import org.opensaml.xacml.ctx.ResponseType; @@ -57,7 +56,7 @@ public abstract class AbstractXACMLAutho public AbstractXACMLAuthorizingInterceptor() { super(Phase.PRE_INVOKE); - OpenSAMLUtil.initSamlEngine(); + org.apache.wss4j.common.saml.OpenSAMLUtil.initSamlEngine(); } public void handleMessage(Message message) throws Fault { Modified: cxf/branches/wss4j2.0-port/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java (original) +++ cxf/branches/wss4j2.0-port/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java Wed Mar 6 17:04:47 2013 @@ -29,8 +29,8 @@ import org.w3c.dom.Element; import org.apache.cxf.interceptor.security.SAMLSecurityContext; import org.apache.cxf.message.Message; import org.apache.cxf.security.SecurityContext; -import org.apache.ws.security.WSSecurityException; -import org.apache.ws.security.saml.ext.AssertionWrapper; +import org.apache.wss4j.common.ext.WSSecurityException; +import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.joda.time.DateTime; import org.opensaml.xacml.ctx.ActionType; import org.opensaml.xacml.ctx.AttributeType; @@ -175,7 +175,7 @@ public class DefaultXACMLRequestBuilder if (sc instanceof SAMLSecurityContext) { Element assertionElement = ((SAMLSecurityContext)sc).getAssertionElement(); if (assertionElement != null) { - AssertionWrapper wrapper = new AssertionWrapper(assertionElement); + SamlAssertionWrapper wrapper = new SamlAssertionWrapper(assertionElement); return wrapper.getIssuerString(); } } Modified: cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/RequestComponentBuilderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/RequestComponentBuilderTest.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/RequestComponentBuilderTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/RequestComponentBuilderTest.java Wed Mar 6 17:04:47 2013 @@ -30,7 +30,7 @@ import javax.xml.parsers.ParserConfigura import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.ws.security.saml.ext.OpenSAMLUtil; +import org.apache.wss4j.common.saml.OpenSAMLUtil; import org.joda.time.DateTime; import org.opensaml.xacml.ctx.ActionType; import org.opensaml.xacml.ctx.AttributeType; Modified: cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/SamlRequestComponentBuilderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/SamlRequestComponentBuilderTest.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/SamlRequestComponentBuilderTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/SamlRequestComponentBuilderTest.java Wed Mar 6 17:04:47 2013 @@ -30,8 +30,7 @@ import javax.xml.parsers.ParserConfigura import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.apache.ws.security.saml.ext.OpenSAMLUtil; - +import org.apache.wss4j.common.saml.OpenSAMLUtil; import org.opensaml.xacml.ctx.ActionType; import org.opensaml.xacml.ctx.AttributeType; import org.opensaml.xacml.ctx.AttributeValueType; Modified: cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLAuthorizingInterceptorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLAuthorizingInterceptorTest.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLAuthorizingInterceptorTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLAuthorizingInterceptorTest.java Wed Mar 6 17:04:47 2013 @@ -29,7 +29,6 @@ import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; import org.apache.cxf.security.LoginSecurityContext; import org.apache.cxf.security.SecurityContext; -import org.apache.ws.security.saml.ext.OpenSAMLUtil; /** @@ -38,7 +37,7 @@ import org.apache.ws.security.saml.ext.O public class XACMLAuthorizingInterceptorTest extends org.junit.Assert { static { - OpenSAMLUtil.initSamlEngine(); + org.apache.wss4j.common.saml.OpenSAMLUtil.initSamlEngine(); } @org.junit.Test Modified: cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java (original) +++ cxf/branches/wss4j2.0-port/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java Wed Mar 6 17:04:47 2013 @@ -24,7 +24,6 @@ import java.util.Collections; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; -import org.apache.ws.security.saml.ext.OpenSAMLUtil; import org.opensaml.xacml.ctx.RequestType; @@ -34,7 +33,7 @@ import org.opensaml.xacml.ctx.RequestTyp public class XACMLRequestBuilderTest extends org.junit.Assert { static { - OpenSAMLUtil.initSamlEngine(); + org.apache.wss4j.common.saml.OpenSAMLUtil.initSamlEngine(); } @org.junit.Test Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java Wed Mar 6 17:04:47 2013 @@ -40,7 +40,7 @@ import org.apache.cxf.jaxws.DispatchImpl import org.apache.cxf.systest.ws.common.SecurityTestUtil; import org.apache.cxf.systest.ws.fault.server.Server; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; -import org.apache.ws.security.WSConstants; +import org.apache.wss4j.dom.WSConstants; import org.example.contract.doubleit.DoubleItPortType; import org.junit.BeforeClass; Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java Wed Mar 6 17:04:47 2013 @@ -46,8 +46,8 @@ import org.apache.cxf.testutil.common.Ab import org.apache.cxf.ws.policy.PolicyConstants; import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; import org.apache.neethi.Constants; -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.BeforeClass; import org.junit.Test; Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java Wed Mar 6 17:04:47 2013 @@ -33,8 +33,8 @@ import org.apache.cxf.systest.ws.saml.cl import org.apache.cxf.systest.ws.saml.client.SamlRoleCallbackHandler; import org.apache.cxf.systest.ws.saml.server.Server; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; -import org.apache.ws.security.saml.ext.bean.KeyInfoBean.CERT_IDENTIFIER; -import org.apache.ws.security.saml.ext.builder.SAML2Constants; +import org.apache.wss4j.common.saml.bean.KeyInfoBean.CERT_IDENTIFIER; +import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.example.contract.doubleit.DoubleItPortType; import org.junit.BeforeClass; Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java Wed Mar 6 17:04:47 2013 @@ -27,17 +27,17 @@ import javax.security.auth.callback.Call import javax.security.auth.callback.CallbackHandler; 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.AttributeBean; -import org.apache.ws.security.saml.ext.bean.AttributeStatementBean; -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.ws.security.saml.ext.builder.SAML1Constants; -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.AttributeBean; +import org.apache.wss4j.common.saml.bean.AttributeStatementBean; +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.common.saml.builder.SAML1Constants; +import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.opensaml.common.SAMLVersion; /** Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlElementCallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlElementCallbackHandler.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlElementCallbackHandler.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlElementCallbackHandler.java Wed Mar 6 17:04:47 2013 @@ -29,9 +29,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.apache.cxf.helpers.DOMUtils; -import org.apache.ws.security.saml.ext.AssertionWrapper; -import org.apache.ws.security.saml.ext.SAMLCallback; -import org.apache.ws.security.saml.ext.SAMLParms; +import org.apache.wss4j.common.saml.SAMLCallback; +import org.apache.wss4j.common.saml.SAMLUtil; +import org.apache.wss4j.common.saml.SamlAssertionWrapper; /** * A CallbackHandler instance that is used by the STS to mock up a SAML Attribute Assertion. This @@ -72,10 +72,9 @@ public class SamlElementCallbackHandler * @throws Exception */ private Element getSAMLAssertion(Document doc) throws Exception { - SAMLParms parms = new SAMLParms(); - SamlCallbackHandler callbackHandler = new SamlCallbackHandler(saml2); - parms.setCallbackHandler(callbackHandler); - AssertionWrapper assertionWrapper = new AssertionWrapper(parms); + SAMLCallback samlCallback = new SAMLCallback(); + SAMLUtil.doSAMLCallback(new SamlCallbackHandler(saml2), samlCallback); + SamlAssertionWrapper assertionWrapper = new SamlAssertionWrapper(samlCallback); return assertionWrapper.toDOM(doc); } Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlRoleCallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlRoleCallbackHandler.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlRoleCallbackHandler.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlRoleCallbackHandler.java Wed Mar 6 17:04:47 2013 @@ -27,17 +27,17 @@ import javax.security.auth.callback.Call import javax.security.auth.callback.CallbackHandler; 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.AttributeBean; -import org.apache.ws.security.saml.ext.bean.AttributeStatementBean; -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.ws.security.saml.ext.builder.SAML1Constants; -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.AttributeBean; +import org.apache.wss4j.common.saml.bean.AttributeStatementBean; +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.common.saml.builder.SAML1Constants; +import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.opensaml.common.SAMLVersion; /** Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/CustomSaml2Validator.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/CustomSaml2Validator.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/CustomSaml2Validator.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/CustomSaml2Validator.java Wed Mar 6 17:04:47 2013 @@ -20,12 +20,12 @@ package org.apache.cxf.systest.ws.saml.s import java.util.List; -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; import org.opensaml.saml2.core.Assertion; import org.opensaml.saml2.core.AttributeStatement; @@ -39,26 +39,26 @@ public class CustomSaml2Validator extend @Override public Credential validate(Credential credential, RequestData data) throws WSSecurityException { Credential validatedCredential = super.validate(credential, data); - AssertionWrapper assertion = validatedCredential.getAssertion(); + SamlAssertionWrapper assertion = validatedCredential.getSamlAssertion(); if (!"sts".equals(assertion.getIssuerString())) { - throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity"); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } String confirmationMethod = assertion.getConfirmationMethods().get(0); if (!(OpenSAMLUtil.isMethodSenderVouches(confirmationMethod) || OpenSAMLUtil.isMethodHolderOfKey(confirmationMethod))) { - throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity"); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } Assertion saml2Assertion = assertion.getSaml2(); if (saml2Assertion == null) { - throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity"); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } List attributeStatements = saml2Assertion.getAttributeStatements(); if (attributeStatements == null || attributeStatements.isEmpty()) { - throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity"); + throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity"); } return validatedCredential; Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/KeystorePasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/SecurityPolicyTest.java Wed Mar 6 17:04:47 2013 @@ -58,7 +58,7 @@ import org.apache.cxf.systest.ws.common. import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.ws.policy.PolicyEngine; import org.apache.cxf.ws.security.SecurityConstants; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; import org.example.contract.doubleit.DoubleItPortType; import org.example.contract.doubleit.DoubleItPortTypeHeader; Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java Wed Mar 6 17:04:47 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 UsernamePasswordCallback implements CallbackHandler { private Map passwords = new HashMap(); Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/SecurityHeaderCacheInterceptor.java Wed Mar 6 17:04:47 2013 @@ -38,7 +38,7 @@ import org.apache.cxf.message.Message; import org.apache.cxf.phase.Phase; import org.apache.cxf.phase.PhaseInterceptor; import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JOutInterceptor; -import org.apache.ws.security.WSConstants; +import org.apache.wss4j.dom.WSConstants; /** * Cache the first security header and then use it instead of all subsequent security headers, until Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/KeystorePasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/KeystorePasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/KeystorePasswordCallback.java Wed Mar 6 17:04:47 2013 @@ -27,7 +27,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; /** */ Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/client/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/KeystorePasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/KeystorePasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/KeystorePasswordCallback.java Wed Mar 6 17:04:47 2013 @@ -25,7 +25,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; /** */ Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/client/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/CustomUsernameTokenInterceptor.java Wed Mar 6 17:04:47 2013 @@ -26,7 +26,7 @@ import org.apache.cxf.common.security.Si import org.apache.cxf.interceptor.Fault; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.wss4j.UsernameTokenInterceptor; -import org.apache.ws.security.message.token.UsernameToken; +import org.apache.wss4j.dom.message.token.UsernameToken; public class CustomUsernameTokenInterceptor extends UsernameTokenInterceptor { Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/KeystorePasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/KeystorePasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/KeystorePasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/UTPasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/KeystorePasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/KeystorePasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/KeystorePasswordCallback.java Wed Mar 6 17:04:47 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; /** */ Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/client/UTPasswordCallback.java Wed Mar 6 17:04:47 2013 @@ -27,7 +27,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; /** */ Modified: cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java?rev=1453431&r1=1453430&r2=1453431&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java (original) +++ cxf/branches/wss4j2.0-port/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/KeystorePasswordCallback.java Wed Mar 6 17:04:47 2013 @@ -27,7 +27,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; /** */