Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 6521 invoked from network); 20 Jan 2009 21:58:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Jan 2009 21:58:06 -0000 Received: (qmail 51182 invoked by uid 500); 20 Jan 2009 21:58:06 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 51077 invoked by uid 500); 20 Jan 2009 21:58:06 -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 51068 invoked by uid 99); 20 Jan 2009 21:58:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jan 2009 13:58:06 -0800 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT 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, 20 Jan 2009 21:57:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0D0AF238896F; Tue, 20 Jan 2009 13:57:39 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r736126 - in /cxf/sandbox/interopfest/wssec11/src/main: java/interop/client/Client.java java/interop/client/KeystorePasswordCallback.java java/interop/client/UTPasswordCallback.java java/interop/server/Server.java resources/etc/client.xml Date: Tue, 20 Jan 2009 21:57:38 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090120215739.0D0AF238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Jan 20 13:57:38 2009 New Revision: 736126 URL: http://svn.apache.org/viewvc?rev=736126&view=rev Log: Get ALL the WSSec11 tests working. Yea! Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java?rev=736126&r1=736125&r2=736126&view=diff ============================================================================== --- cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java (original) +++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java Tue Jan 20 13:57:38 2009 @@ -57,11 +57,11 @@ "AD", "A-ES", "AD-ES", - //"UX", //NOT WORKING YET - //"UX-NoTimestamp", //NOT WORKING YET - //"UXD", //NOT WORKING YET - //"UX-SEES", //NOT WORKING YET - //"UXD-SEES", //NOT WORKING YET + "UX", + "UX-NoTimestamp", + "UXD", + "UX-SEES", + "UXD-SEES", "X", "X-NoTimestamp", "X-AES128", @@ -72,6 +72,7 @@ "XD-SEES", }; } + //argv = new String[] {argv[10]}; new SpringBusFactory().createBus("etc/client.xml"); List results = new ArrayList(); Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java?rev=736126&r1=736125&r2=736126&view=diff ============================================================================== --- cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java (original) +++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java Tue Jan 20 13:57:38 2009 @@ -27,6 +27,7 @@ passwords.put("alice", "abcd!1234"); passwords.put("Bob", "abcd!1234"); passwords.put("bob", "abcd!1234"); + passwords.put("abcd", "dcba"); } /** Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java?rev=736126&r1=736125&r2=736126&view=diff ============================================================================== --- cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java (original) +++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java Tue Jan 20 13:57:38 2009 @@ -26,6 +26,7 @@ public UTPasswordCallback() { passwords.put("Alice", "ecilA"); passwords.put("Frank", "invalid-password"); + passwords.put("abcd", "dcba"); } /** Modified: cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java?rev=736126&r1=736125&r2=736126&view=diff ============================================================================== --- cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java (original) +++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java Tue Jan 20 13:57:38 2009 @@ -45,7 +45,7 @@ */ // Scenario 4.2 - addProperties(Endpoint.publish("http://localhost:9001/UXPingService", + addProperties(Endpoint.publish("http://home.mesa2.com:9001/UXPingService", new UXPingService())); //argv = new String[] {"A-ES"}; //NOT WORKING YET @@ -109,7 +109,7 @@ serviceName = "PingService11", portName = "UX_IPingService", endpointInterface = "interopbaseaddress.interop.IPingService", - wsdlLocation = "wsdl/WsSecurity11.wsdl") + wsdlLocation = "target/wsdl2/WsSecurity11.wsdl") public static class UXPingService extends PingService { } } Modified: cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml?rev=736126&r1=736125&r2=736126&view=diff ============================================================================== --- cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml (original) +++ cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml Tue Jan 20 13:57:38 2009 @@ -60,35 +60,35 @@ - + - + - + - + - +