Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 6492 invoked from network); 14 Mar 2009 02:18:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Mar 2009 02:18:56 -0000 Received: (qmail 98699 invoked by uid 500); 14 Mar 2009 02:18:55 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 98664 invoked by uid 500); 14 Mar 2009 02:18: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 98655 invoked by uid 99); 14 Mar 2009 02:18:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Mar 2009 19:18:55 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sat, 14 Mar 2009 02:18:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B7AF123888F1; Sat, 14 Mar 2009 02:18:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r753586 - in /cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest: wssc/src/main/java/interop/client/Client.java wssec10/build.xml wssec10/download_wsdl.xml wssec10/pom.xml wssec10/src/main/java/interop/client/Client.java Date: Sat, 14 Mar 2009 02:18:34 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090314021834.B7AF123888F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Sat Mar 14 02:18:33 2009 New Revision: 753586 URL: http://svn.apache.org/viewvc?rev=753586&view=rev Log: Command line version for wssec10 Added: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/download_wsdl.xml - copied unchanged from r753480, cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/build.xml Removed: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/build.xml Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/Client.java cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/Client.java Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/Client.java URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/Client.java?rev=753586&r1=753585&r2=753586&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/Client.java (original) +++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssc/src/main/java/interop/client/Client.java Sat Mar 14 02:18:33 2009 @@ -62,7 +62,6 @@ System.arraycopy(argv, 1, tmp, 0, tmp.length); argv = tmp; } - System.out.println(argv[0] + " " + local); if (argv.length < 1 || "".equals(argv[0]) || argv[0] == null || "ALL".equals(argv[0])) { Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml?rev=753586&r1=753585&r2=753586&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml (original) +++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml Sat Mar 14 02:18:33 2009 @@ -24,7 +24,8 @@ 1.0 [2,) - MutualCertificate10SignEncryptRsa15TripleDes + MS + ALL @@ -62,7 +63,7 @@ - + @@ -124,7 +125,8 @@ java - demo.hw.server.Server + test + interop.server.Server @@ -150,6 +152,7 @@ test interop.client.Client + ${test.server} ${test.method} Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/Client.java URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/Client.java?rev=753586&r1=753585&r2=753586&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/Client.java (original) +++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wssec10/src/main/java/interop/client/Client.java Sat Mar 14 02:18:33 2009 @@ -47,7 +47,20 @@ */ public static void main(String argv[]) throws Exception { - if (argv.length < 1) { + + boolean local = false; + + if (argv.length > 0 && "local".equalsIgnoreCase(argv[0])) { + local = true; + } + if (argv.length > 0 && "local".equalsIgnoreCase(argv[0]) + || "ms".equalsIgnoreCase(argv[0])) { + String tmp[] = new String[argv.length - 1]; + System.arraycopy(argv, 1, tmp, 0, tmp.length); + argv = tmp; + } + + if (argv.length < 1 || "ALL".equalsIgnoreCase(argv[0])) { argv = new String[] { "UserNameOverTransport", "MutualCertificate10SignEncrypt", @@ -62,8 +75,7 @@ for (String portPrefix : argv) { try { PingService10 svc = null; - boolean isLocal = false; - if (isLocal) { + if (local) { wsdlLocation = getWsdlLocation(portPrefix); svc = new PingService10(wsdlLocation); } else {