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 16A1C10252 for ; Tue, 9 Jul 2013 09:37:59 +0000 (UTC) Received: (qmail 83841 invoked by uid 500); 9 Jul 2013 09:37:57 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 83677 invoked by uid 500); 9 Jul 2013 09:37:55 -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 83640 invoked by uid 99); 9 Jul 2013 09:37:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jul 2013 09:37:54 +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; Tue, 09 Jul 2013 09:37:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E5C7D2388980; Tue, 9 Jul 2013 09:37:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1501164 [1/5] - in /cxf/trunk/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/coverage_checker/ java/org/apache/cxf/systest/ws/fault/ java/org/apache/cxf/systest/ws/httpget/ java/org/apache/cxf/systest/ws/saml/client/ java/or... Date: Tue, 09 Jul 2013 09:37:15 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130709093717.E5C7D2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Tue Jul 9 09:37:13 2013 New Revision: 1501164 URL: http://svn.apache.org/r1501164 Log: Security systests refactor - part III Added: cxf/trunk/systests/ws-security/src/test/resources/alice.properties - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/alice.properties cxf/trunk/systests/ws-security/src/test/resources/bob.properties - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/bob.properties cxf/trunk/systests/ws-security/src/test/resources/certs/ cxf/trunk/systests/ws-security/src/test/resources/certs/alice.jks - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/alice.jks cxf/trunk/systests/ws-security/src/test/resources/certs/bob.jks - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/bob.jks cxf/trunk/systests/ws-security/src/test/resources/certs/client/ cxf/trunk/systests/ws-security/src/test/resources/certs/client/alice.jks - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/certs/alice.jks cxf/trunk/systests/ws-security/src/test/resources/certs/cxfca.jks - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/certs/cxfca.jks cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/ cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/alice.jks - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/bob.jks - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/cxfca.jks - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/cxfca.jks cxf/trunk/systests/ws-security/src/test/resources/cxfca.properties - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/cxfca.properties cxf/trunk/systests/ws-security/src/test/resources/restricted/ cxf/trunk/systests/ws-security/src/test/resources/restricted/alice.properties - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server/alice.properties cxf/trunk/systests/ws-security/src/test/resources/restricted/bob.properties - copied, changed from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server/bob.properties Removed: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/certs/alice.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/certs/alice.p12 cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/certs/bob.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/certs/cxfca.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/alice.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/bob.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server/alice.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server/bob.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/alice.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/bob.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/cxfca.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/cxfca.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/alice.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/bob.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/cxfca.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/alice.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/bob.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/certs/alice.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/certs/bob.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/certs/cxfca.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/certs/restricted/alice.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/certs/restricted/bob.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/certs/restricted/cxfca.jks cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/alice.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/bob.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/restricted/alice.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/restricted/bob.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server/alice.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server/bob.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server/restricted/alice.properties cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/server/restricted/bob.properties Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlRoleCallbackHandler.java cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/stax-server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/client/endorsing-client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/endorsing-server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client-derived.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server-derived.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/client_restricted_unauthorized.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/stax-server_restricted.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec11/client/client_restricted.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/DefaultCryptoCoverageCheckerTest.java Tue Jul 9 09:37:13 2013 @@ -79,8 +79,7 @@ public class DefaultCryptoCoverageChecke Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -122,8 +121,7 @@ public class DefaultCryptoCoverageChecke Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -175,8 +173,7 @@ public class DefaultCryptoCoverageChecke Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -229,8 +226,7 @@ public class DefaultCryptoCoverageChecke Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -272,8 +268,7 @@ public class DefaultCryptoCoverageChecke Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -325,8 +320,7 @@ public class DefaultCryptoCoverageChecke Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -379,10 +373,8 @@ public class DefaultCryptoCoverageChecke Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature Encrypt"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); - outProps.put("encryptionPropFile", - "org/apache/cxf/systest/ws/wssec10/client/bob.properties"); + outProps.put("signaturePropFile", "alice.properties"); + outProps.put("encryptionPropFile", "bob.properties"); outProps.put("user", "alice"); outProps.put("encryptionUser", "bob"); outProps.put("passwordCallbackClass", @@ -425,10 +417,8 @@ public class DefaultCryptoCoverageChecke Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature Encrypt"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); - outProps.put("encryptionPropFile", - "org/apache/cxf/systest/ws/wssec10/client/bob.properties"); + outProps.put("signaturePropFile", "alice.properties"); + outProps.put("encryptionPropFile", "bob.properties"); outProps.put("user", "alice"); outProps.put("encryptionUser", "bob"); outProps.put("passwordCallbackClass", @@ -484,8 +474,7 @@ public class DefaultCryptoCoverageChecke Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxCryptoCoverageCheckerTest.java Tue Jul 9 09:37:13 2013 @@ -79,8 +79,7 @@ public class StaxCryptoCoverageCheckerTe Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -122,8 +121,7 @@ public class StaxCryptoCoverageCheckerTe Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -175,8 +173,7 @@ public class StaxCryptoCoverageCheckerTe Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -229,8 +226,7 @@ public class StaxCryptoCoverageCheckerTe Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -272,8 +268,7 @@ public class StaxCryptoCoverageCheckerTe Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -325,8 +320,7 @@ public class StaxCryptoCoverageCheckerTe Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); @@ -379,10 +373,8 @@ public class StaxCryptoCoverageCheckerTe Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature Encrypt"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); - outProps.put("encryptionPropFile", - "org/apache/cxf/systest/ws/wssec10/client/bob.properties"); + outProps.put("signaturePropFile", "alice.properties"); + outProps.put("encryptionPropFile", "bob.properties"); outProps.put("user", "alice"); outProps.put("encryptionUser", "bob"); outProps.put("passwordCallbackClass", @@ -425,10 +417,8 @@ public class StaxCryptoCoverageCheckerTe Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature Encrypt"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); - outProps.put("encryptionPropFile", - "org/apache/cxf/systest/ws/wssec10/client/bob.properties"); + outProps.put("signaturePropFile", "alice.properties"); + outProps.put("encryptionPropFile", "bob.properties"); outProps.put("user", "alice"); outProps.put("encryptionUser", "bob"); outProps.put("passwordCallbackClass", @@ -484,8 +474,7 @@ public class StaxCryptoCoverageCheckerTe Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java Tue Jul 9 09:37:13 2013 @@ -166,7 +166,7 @@ public class FaultTest extends AbstractB ); client.getRequestContext().put( "ws-security.encryption.properties", - "org/apache/cxf/systest/ws/wssec10/client/bob.properties" + "bob.properties" ); client.getRequestContext().put("ws-security.encryption.username", "bob"); Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java Tue Jul 9 09:37:13 2013 @@ -140,8 +140,7 @@ public class HTTPGetTest extends Abstrac Map outProps = new HashMap(); outProps.put("action", "Timestamp Signature"); - outProps.put("signaturePropFile", - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + outProps.put("signaturePropFile", "alice.properties"); outProps.put("user", "alice"); outProps.put("passwordCallbackClass", "org.apache.cxf.systest.ws.common.KeystorePasswordCallback"); Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlCallbackHandler.java Tue Jul 9 09:37:13 2013 @@ -116,7 +116,7 @@ public class SamlCallbackHandler impleme callback.setAttributeStatementData(Collections.singletonList(attrBean)); try { - String file = "org/apache/cxf/systest/ws/wssec10/client/alice.properties"; + String file = "alice.properties"; Crypto crypto = CryptoFactory.getInstance(file); callback.setIssuerCrypto(crypto); callback.setIssuerKeyName("alice"); @@ -131,7 +131,7 @@ public class SamlCallbackHandler impleme protected KeyInfoBean createKeyInfo() throws Exception { Crypto crypto = - CryptoFactory.getInstance("org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + CryptoFactory.getInstance("alice.properties"); CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS); cryptoType.setAlias("alice"); X509Certificate[] certs = crypto.getX509Certificates(cryptoType); Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlRoleCallbackHandler.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlRoleCallbackHandler.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlRoleCallbackHandler.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/client/SamlRoleCallbackHandler.java Tue Jul 9 09:37:13 2013 @@ -128,7 +128,7 @@ public class SamlRoleCallbackHandler imp protected KeyInfoBean createKeyInfo() throws Exception { Crypto crypto = - CryptoFactory.getInstance("org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + CryptoFactory.getInstance("alice.properties"); CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS); cryptoType.setAlias("alice"); X509Certificate[] certs = crypto.getX509Certificates(cryptoType); Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java Tue Jul 9 09:37:13 2013 @@ -99,18 +99,18 @@ public class Server extends AbstractBusT Endpoint ep = Endpoint.create(obj); ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER + ".sct", new KeystorePasswordCallback()); ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES + ".sct", - "org/apache/cxf/systest/ws/wssec11/server/bob.properties"); + "bob.properties"); if (url.contains("X10_I")) { ep.getProperties().put(SecurityConstants.SIGNATURE_PROPERTIES + ".sct", - "org/apache/cxf/systest/ws/wssec11/server/bob.properties"); + "bob.properties"); ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES + ".sct", - "org/apache/cxf/systest/ws/wssec11/server/alice.properties"); + "alice.properties"); } else if (url.contains("MutualCert")) { ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES + ".sct", - "org/apache/cxf/systest/ws/wssec11/server/bob.properties"); + "bob.properties"); ep.getProperties().put(SecurityConstants.SIGNATURE_PROPERTIES + ".sct", - "org/apache/cxf/systest/ws/wssec11/server/alice.properties"); + "alice.properties"); ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback()); } ep.publish(url); Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/server/AbstractServer.java Tue Jul 9 09:37:13 2013 @@ -54,7 +54,7 @@ abstract class AbstractServer extends Ab Endpoint ep = Endpoint.create(obj); ep.getProperties().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback()); ep.getProperties().put(SecurityConstants.ENCRYPT_PROPERTIES, - "org/apache/cxf/systest/ws/wssec11/server/bob.properties"); + "bob.properties"); ep.publish(url); } Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/DoubleItIntermediaryImpl.java Tue Jul 9 09:37:13 2013 @@ -59,7 +59,7 @@ public class DoubleItIntermediaryImpl ex } ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, - "org/apache/cxf/systest/ws/wssec10/client/bob.properties"); + "bob.properties"); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob"); return x509Port.doubleIt(numberToDouble); Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxX509TokenTest.java Tue Jul 9 09:37:13 2013 @@ -114,7 +114,7 @@ public class StaxX509TokenTest extends A updateAddressPort(x509Port, PORT); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, - "org/apache/cxf/systest/ws/wssec10/client/bob.properties"); + "bob.properties"); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob"); // DOM @@ -686,7 +686,7 @@ public class StaxX509TokenTest extends A updateAddressPort(x509Port, PORT2); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, - "org/apache/cxf/systest/ws/wssec10/client/bob.properties"); + "bob.properties"); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "bob"); try { @@ -697,7 +697,7 @@ public class StaxX509TokenTest extends A } ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + "alice.properties"); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice"); x509Port.doubleIt(25); Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java (original) +++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Tue Jul 9 09:37:13 2013 @@ -121,7 +121,7 @@ public class X509TokenTest extends Abstr updateAddressPort(x509Port, PORT); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, - "org/apache/cxf/systest/ws/wssec10/client/bob.properties"); + "bob.properties"); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob"); // DOM @@ -745,7 +745,7 @@ public class X509TokenTest extends Abstr updateAddressPort(x509Port, PORT2); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, - "org/apache/cxf/systest/ws/wssec10/client/bob.properties"); + "bob.properties"); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "bob"); try { @@ -756,7 +756,7 @@ public class X509TokenTest extends Abstr } ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, - "org/apache/cxf/systest/ws/wssec10/client/alice.properties"); + "alice.properties"); ((BindingProvider)x509Port).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice"); x509Port.doubleIt(25); Copied: cxf/trunk/systests/ws-security/src/test/resources/alice.properties (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/alice.properties) URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/alice.properties?p2=cxf/trunk/systests/ws-security/src/test/resources/alice.properties&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/alice.properties&r1=1500925&r2=1501164&rev=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/alice.properties (original) +++ cxf/trunk/systests/ws-security/src/test/resources/alice.properties Tue Jul 9 09:37:13 2013 @@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=o org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password org.apache.ws.security.crypto.merlin.keystore.alias=alice -org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/wssc/certs/alice.jks +org.apache.ws.security.crypto.merlin.keystore.file=certs/alice.jks Copied: cxf/trunk/systests/ws-security/src/test/resources/bob.properties (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/bob.properties) URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/bob.properties?p2=cxf/trunk/systests/ws-security/src/test/resources/bob.properties&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/bob.properties&r1=1500925&r2=1501164&rev=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/bob.properties (original) +++ cxf/trunk/systests/ws-security/src/test/resources/bob.properties Tue Jul 9 09:37:13 2013 @@ -18,4 +18,4 @@ org.apache.ws.security.crypto.provider=o org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password org.apache.ws.security.crypto.merlin.keystore.alias=bob -org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/wssc/certs/bob.jks +org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.jks Copied: cxf/trunk/systests/ws-security/src/test/resources/certs/alice.jks (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/alice.jks) URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/certs/alice.jks?p2=cxf/trunk/systests/ws-security/src/test/resources/certs/alice.jks&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/alice.jks&r1=1500925&r2=1501164&rev=1501164&view=diff ============================================================================== (empty) Copied: cxf/trunk/systests/ws-security/src/test/resources/certs/bob.jks (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/bob.jks) URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/certs/bob.jks?p2=cxf/trunk/systests/ws-security/src/test/resources/certs/bob.jks&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/bob.jks&r1=1500925&r2=1501164&rev=1501164&view=diff ============================================================================== (empty) Copied: cxf/trunk/systests/ws-security/src/test/resources/certs/client/alice.jks (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/certs/alice.jks) URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/certs/client/alice.jks?p2=cxf/trunk/systests/ws-security/src/test/resources/certs/client/alice.jks&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/certs/alice.jks&r1=1500925&r2=1501164&rev=1501164&view=diff ============================================================================== (empty) Copied: cxf/trunk/systests/ws-security/src/test/resources/certs/cxfca.jks (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/certs/cxfca.jks) URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/certs/cxfca.jks?p2=cxf/trunk/systests/ws-security/src/test/resources/certs/cxfca.jks&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/certs/cxfca.jks&r1=1500925&r2=1501164&rev=1501164&view=diff ============================================================================== (empty) Copied: cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/alice.jks (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks) URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/alice.jks?p2=cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/alice.jks&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/alice.jks&r1=1500925&r2=1501164&rev=1501164&view=diff ============================================================================== (empty) Copied: cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/bob.jks (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks) URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/bob.jks?p2=cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/bob.jks&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/bob.jks&r1=1500925&r2=1501164&rev=1501164&view=diff ============================================================================== (empty) Copied: cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/cxfca.jks (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/cxfca.jks) URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/cxfca.jks?p2=cxf/trunk/systests/ws-security/src/test/resources/certs/restricted/cxfca.jks&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/certs/restricted/cxfca.jks&r1=1500925&r2=1501164&rev=1501164&view=diff ============================================================================== (empty) Copied: cxf/trunk/systests/ws-security/src/test/resources/cxfca.properties (from r1500925, cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/cxfca.properties) URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/cxfca.properties?p2=cxf/trunk/systests/ws-security/src/test/resources/cxfca.properties&p1=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/cxfca.properties&r1=1500925&r2=1501164&rev=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/client/cxfca.properties (original) +++ cxf/trunk/systests/ws-security/src/test/resources/cxfca.properties Tue Jul 9 09:37:13 2013 @@ -18,6 +18,6 @@ org.apache.ws.security.crypto.provider=o org.apache.ws.security.crypto.merlin.keystore.type=jks org.apache.ws.security.crypto.merlin.keystore.password=password org.apache.ws.security.crypto.merlin.keystore.alias=cxfca -org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/wssec10/certs/cxfca.jks +org.apache.ws.security.crypto.merlin.keystore.file=certs/cxfca.jks Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml (original) +++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/client/client.xml Tue Jul 9 09:37:13 2013 @@ -47,8 +47,7 @@ - + @@ -66,8 +65,7 @@ - + @@ -85,8 +83,7 @@ - + @@ -104,8 +101,7 @@ - + @@ -128,8 +124,7 @@ - + @@ -150,8 +145,7 @@ - + @@ -172,8 +166,7 @@ - + - + @@ -216,8 +208,7 @@ - + Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml (original) +++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml Tue Jul 9 09:37:13 2013 @@ -54,8 +54,7 @@ - + @@ -77,8 +76,7 @@ - + @@ -100,8 +98,7 @@ - + @@ -123,8 +120,7 @@ - + @@ -150,8 +146,7 @@ - + - + - + - + @@ -256,8 +248,7 @@ - + Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml (original) +++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml Tue Jul 9 09:37:13 2013 @@ -54,8 +54,7 @@ - + @@ -78,8 +77,7 @@ - + @@ -102,8 +100,7 @@ - + Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml?rev=1501164&r1=1501163&r2=1501164&view=diff ============================================================================== --- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml (original) +++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/client/client.xml Tue Jul 9 09:37:13 2013 @@ -47,11 +47,9 @@ - + - + @@ -69,11 +67,9 @@ - + - + @@ -91,11 +87,9 @@ - + - + @@ -113,11 +107,9 @@ - + - + @@ -135,11 +127,9 @@ - + - + @@ -157,11 +147,9 @@ - + - + @@ -179,11 +167,9 @@ - + - + @@ -201,11 +187,9 @@ - + - + @@ -223,11 +207,9 @@ - + - + @@ -245,11 +227,9 @@ - + - + @@ -267,11 +247,9 @@ - + - + @@ -289,11 +267,9 @@ - + - + @@ -311,11 +287,9 @@ - + - + @@ -333,11 +307,9 @@ - + - + @@ -355,11 +327,9 @@ - + - + @@ -377,11 +347,9 @@ - + - + @@ -399,11 +367,9 @@ - + - + @@ -421,11 +387,9 @@ - + - + @@ -443,11 +407,9 @@ - + - + @@ -465,11 +427,9 @@ - + - +