[jboss-svn-commits] JBL Code SVN: r32150 - in labs/jbosstm/trunk/XTS: WS-C and 3 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2010-03-19 12:11:02 -0400 (Fri, 19 Mar 2010)
New Revision: 32150

Modified:
   labs/jbosstm/trunk/XTS/WS-C/build.xml
   labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_application.xml
   labs/jbosstm/trunk/XTS/WS-T/build.xml
   labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml
   labs/jbosstm/trunk/XTS/build.xml
Log:
fixed problems building tests when only 11 code is included

Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml	2010-03-19 15:56:49 UTC (rev 32149)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml	2010-03-19 16:11:02 UTC (rev 32150)
@@ -298,12 +298,16 @@
         <jar jarfile="${tests.build.lib.dir}/xts-test-servlet.jar">
             <fileset dir="${tests.build.classes.dir}" includes="com/arjuna/qa/junit/*.class"/>
         </jar>
+        <jar jarfile="${tests.build.lib.dir}/ws-c11-tests.jar">
+            <fileset dir="${tests.build.classes.dir}" />
+        </jar>
         <war warfile="${tests.build.webapps.dir}/ws-c11-tests.war" webxml="${tests.build.dd.dir}/web-app11.xml">
             <classes dir="${tests.build.classes.dir}"  excludes="com/arjuna/qa/junit/**/*.class"/>
         </war>
         <ear earfile="${tests.build.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c11-tests_application.xml">
             <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
             <fileset dir="${tests.build.webapps.dir}" includes="ws-c11-tests.war"/>
+            <fileset dir="${tests.build.lib.dir}" includes="ws-c11-tests.jar"/>
             <fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
         </ear>
     </target>

Modified: labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_application.xml	2010-03-19 15:56:49 UTC (rev 32149)
+++ labs/jbosstm/trunk/XTS/WS-C/tests/dd/ws-c11-tests_application.xml	2010-03-19 16:11:02 UTC (rev 32150)
@@ -35,7 +35,7 @@
     </module>
 
     <module>
-        <java>ws-c-tests.jar</java>
+        <java>ws-c11-tests.jar</java>
     </module>
 
     <module>

Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml	2010-03-19 15:56:49 UTC (rev 32149)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml	2010-03-19 16:11:02 UTC (rev 32150)
@@ -402,7 +402,7 @@
     </target>
 
     <target name="tests-webapps11" depends="tests-compile11">
-        <jar jarfile="${tests.build.lib.dir}/ws-t-tests.jar">
+        <jar jarfile="${tests.build.lib.dir}/ws-t11-tests.jar">
             <fileset dir="${tests.build.classes.dir}"/>
         </jar>
         <copy file="${tests.dd.dir}/ws-t11-tests_web-app.xml" tofile="${tests.build.dd.dir}/web-app11.xml">
@@ -412,7 +412,7 @@
         <ear earfile="${tests.build.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t11-tests_application.xml">
             <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
             <fileset dir="${tests.build.webapps.dir}" includes="ws-t11-tests.war"/>
-            <fileset dir="${tests.build.lib.dir}" includes="ws-t-tests.jar"/>
+            <fileset dir="${tests.build.lib.dir}" includes="ws-t11-tests.jar"/>
             <fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
         </ear>
     </target>

Modified: labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml	2010-03-19 15:56:49 UTC (rev 32149)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_application.xml	2010-03-19 16:11:02 UTC (rev 32150)
@@ -35,7 +35,7 @@
     </module>
 
     <module>
-        <java>ws-t-tests.jar</java>
+        <java>ws-t11-tests.jar</java>
     </module>
 
     <module>

Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml	2010-03-19 15:56:49 UTC (rev 32149)
+++ labs/jbosstm/trunk/XTS/build.xml	2010-03-19 16:11:02 UTC (rev 32150)
@@ -274,7 +274,12 @@
         <ant dir="${sar.dir}" target="${sartype}"/>
     </target>
 
-    <target name="tests.build">
+    <target name="test.settype">
+        <condition property="testtype" value="tests-11">
+            <equals arg1="${sartype}" arg2="sar-11"/>
+        </condition>
+    </target>
+    <target name="tests.build" depends="test.settype">
         <!-- by default we build 1.0 and 1.1 for ease of testing,
             but release bundles should use -Dtesttype=tests-11 so that
             thay contain only the supported version. -->