[jbossws-commits] JBossWS SVN: r15878 - shared-testsuite/trunk/testsuite/src/test/ant-import.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-03-06 07:04:53 -0500 (Tue, 06 Mar 2012)
New Revision: 15878

Modified:
   shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
Set proper (different) default jbossws-native-core version in bin-dist client classpath + reorder as per previous Richard's patch in maven based testsuite


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-06 10:09:35 UTC (rev 15877)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml	2012-03-06 12:04:53 UTC (rev 15878)
@@ -119,6 +119,14 @@
       <isset property="jboss.home"/>
     </condition>
     
+    <!-- JBossWS Native Core version -->
+    <condition property="jbossws-native-core.default-filename" value="4.0.1.GA">
+      <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
+    </condition>
+    <condition property="jbossws-native-core.default-filename" value="4.0.2.GA">
+      <equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
+    </condition>
+
     <echo/>
     <echo message="-----------------------------------------------"/>
     <echo message="jboss.home   = ${jboss.home}"/>
@@ -398,13 +406,13 @@
         <include name="jbossxb-*.jar"/>
       </fileset>
       <fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
-        <include name="jbossws-native-core-4.0.1.GA.jar"/>
+        <include name="jbossws-native-core-${jbossws-native-core.filename}.jar"/>
       </fileset>
       <fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
         <include name="jbossws-native-core.jar"/>
       </fileset>
       <fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
-        <include name="jbossws-native-core-${jbossws-native-core.filename}.jar"/>
+        <include name="jbossws-native-core-${jbossws-native-core.default-filename}.jar"/>
       </fileset>
       <!-- END ## jaxrpc tests ## -->
       <fileset dir="${jboss.home}/modules/org/apache/xalan/main/">