Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 25582 invoked from network); 21 Mar 2011 13:18:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Mar 2011 13:18:51 -0000 Received: (qmail 91711 invoked by uid 500); 21 Mar 2011 13:18:51 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 91666 invoked by uid 500); 21 Mar 2011 13:18:51 -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 91659 invoked by uid 99); 21 Mar 2011 13:18:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2011 13:18:51 +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; Mon, 21 Mar 2011 13:18:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CECD723889D7; Mon, 21 Mar 2011 13:18:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1083772 - in /cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main: java/interop/client/ resources/etc/ Date: Mon, 21 Mar 2011 13:18:18 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110321131818.CECD723889D7@eris.apache.org> Author: coheigea Date: Mon Mar 21 13:18:18 2011 New Revision: 1083772 URL: http://svn.apache.org/viewvc?rev=1083772&view=rev Log: All WS-Trust 1.3 tests are now passing. Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java?rev=1083772&r1=1083771&r2=1083772&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java (original) +++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java Mon Mar 21 13:18:18 2011 @@ -55,11 +55,6 @@ public class UTPasswordCallback implemen return; } } - - // - // Password not found - // - throw new IOException(); } /** Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties?rev=1083772&r1=1083771&r2=1083772&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties (original) +++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties Mon Mar 21 13:18:18 2011 @@ -17,4 +17,4 @@ org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin org.apache.ws.security.crypto.merlin.keystore.type=PKCS12 org.apache.ws.security.crypto.merlin.keystore.password=password -org.apache.ws.security.crypto.merlin.file=certs/alice.pfx +org.apache.ws.security.crypto.merlin.keystore.file=certs/alice.pfx Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties?rev=1083772&r1=1083771&r2=1083772&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties (original) +++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties Mon Mar 21 13:18:18 2011 @@ -19,4 +19,4 @@ org.apache.ws.security.crypto.merlin.key org.apache.ws.security.crypto.merlin.keystore.password=password # for some reason, bouncycastle has issues with bob.pfx org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE -org.apache.ws.security.crypto.merlin.file=certs/bob.pfx +org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.pfx Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml?rev=1083772&r1=1083771&r2=1083772&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml (original) +++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml Mon Mar 21 13:18:18 2011 @@ -53,6 +53,7 @@ + @@ -73,7 +74,8 @@ - + + @@ -97,7 +99,8 @@ - + + @@ -122,7 +125,9 @@ - + + + @@ -149,6 +154,7 @@ + @@ -164,7 +170,9 @@ - + + + Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties?rev=1083772&r1=1083771&r2=1083772&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties (original) +++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties Mon Mar 21 13:18:18 2011 @@ -19,4 +19,4 @@ org.apache.ws.security.crypto.merlin.key org.apache.ws.security.crypto.merlin.keystore.password=password # for some reason, bouncycastle has issues with WssIP.pfx org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE -org.apache.ws.security.crypto.merlin.file=certs/WssIP.pfx +org.apache.ws.security.crypto.merlin.keystore.file=certs/WssIP.pfx