cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
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 GMT
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 @@
     <version>1.0</version>
     <properties>
         <cxf.version>[2,)</cxf.version>
-        <test.method>MutualCertificate10SignEncryptRsa15TripleDes</test.method>
+        <test.server>MS</test.server>
+        <test.method>ALL</test.method>
     </properties>
     <build>
         <resources>
@@ -62,7 +63,7 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <ant inheritRefs="true" antfile="${basedir}/build.xml">
+                                <ant inheritRefs="true" antfile="${basedir}/download_wsdl.xml">
                                     <property value="${basedir}/target" name="build.dir"
/>
                                     <target name="download" />
                                 </ant>
@@ -124,7 +125,8 @@
                                     <goal>java</goal>
                                 </goals>
                                 <configuration>
-                                    <mainClass>demo.hw.server.Server</mainClass>
+                                    <classpathScope>test</classpathScope>
+                                    <mainClass>interop.server.Server</mainClass>
                                 </configuration>
                             </execution>
                         </executions>
@@ -150,6 +152,7 @@
                                     <classpathScope>test</classpathScope>
                                     <mainClass>interop.client.Client</mainClass>
                                     <arguments>
+                                        <argument>${test.server}</argument>
                                         <argument>${test.method}</argument>
                                     </arguments>
                                 </configuration>

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 {



Mime
View raw message