[jbossws-commits] JBossWS SVN: r15918 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: ropalka
Date: 2012-03-12 10:41:15 -0400 (Mon, 12 Mar 2012)
New Revision: 15918

Modified:
   shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-3451] use custom appclient-ws.xml config, do not override provided default one

Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java	2012-03-12 14:02:57 UTC (rev 15917)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java	2012-03-12 14:41:15 UTC (rev 15918)
@@ -157,12 +157,13 @@
          ap.output = new ByteArrayOutputStream();
          if (appclientOS == null)
          {
-            ap.process = new ProcessBuilder().command(appclientScript, appclientFullName, touchFile).start();
+            ap.process = new ProcessBuilder().command(appclientScript, "--appclient-config=appclient-ws.xml", appclientFullName, touchFile).start();
          }
          else
          {
             final List<String> args = new LinkedList<String>();
             args.add(appclientScript);
+            args.add("--appclient-config=appclient-ws.xml");
             args.add(appclientFullName);
             // propagate appclient args
             for (final String appclientArg : appclientArgs)

Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml	2012-03-12 14:02:57 UTC (rev 15917)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml	2012-03-12 14:41:15 UTC (rev 15918)
@@ -49,16 +49,9 @@
 
     <!-- appclient patch -->
     <copy
-      file="${jboss.home}/appclient/configuration/appclient.xml"
-      tofile="${jboss.home}/appclient/configuration/appclient.xml.orig"
+      file="${basedir}/tests/etc/appclient/${jbossws.integration.target}/appclient-ws.xml"
+      tofile="${jboss.home}/appclient/configuration/appclient-ws.xml"
       failonerror="false"
-      overwrite="false"
-      verbose="true"
-    />
-    <copy
-      file="${basedir}/tests/etc/appclient/${jbossws.integration.target}/appclient.xml"
-      tofile="${jboss.home}/appclient/configuration/appclient.xml"
-      failonerror="false"
       overwrite="true"
       verbose="true"
     />