[jboss-svn-commits] JBL Code SVN: r31900 - in labs/jbosstm/trunk/XTS: WS-T and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Mar 2 08:33:01 EST 2010
Author: adinn
Date: 2010-03-02 08:33:01 -0500 (Tue, 02 Mar 2010)
New Revision: 31900
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WSAS/build.xml
labs/jbosstm/trunk/XTS/WSCF/build.xml
labs/jbosstm/trunk/XTS/WSTX/build.xml
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
labs/jbosstm/trunk/XTS/localjunit/build.xml
labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml
labs/jbosstm/trunk/XTS/localjunit/run-tests.xml
Log:
ensured junit jar is obtained from correct place -- fixes for JBTM-706
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-03-02 09:45:23 UTC (rev 31899)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-03-02 13:33:01 UTC (rev 31900)
@@ -32,11 +32,11 @@
<!-- ================================================================== -->
- <import file="../sharedbuild.xml"/>
-
<!-- Set module name -->
<property name="modulename" value="ws-c"/>
+ <import file="../sharedbuild.xml"/>
+
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
@@ -69,12 +69,10 @@
<!-- we had to delete the JaxRPC handlers so we export the bist needed to allow clients to create them -->
<property name="ws-c10.api.classes" value="com/arjuna/webservices/wscoor/CoordinationConstants.class"/>
- <property name="xts.ext.dir" location="../ext"/>
-
<property name="tests.libs" value="junit.jar"/>
<path id="tests.lib.path">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
</path>
<property name="javac.debug" value="on"/>
@@ -274,7 +272,7 @@
<war warfile="${build.tests.webapps.dir}/ws-c11-tests.war" webxml="${build.tests.dd.dir}/web-app11.xml">
</war>
<ear earfile="${build.tests.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c-tests_application.xml">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${build.tests.webapps.dir}" includes="ws-c-tests.war"/>
<fileset dir="${build.tests.webapps.dir}" includes="ws-c11-tests.war"/>
<fileset dir="${build.tests.lib.dir}" includes="ws-c-tests.jar"/>
@@ -292,7 +290,7 @@
<classes dir="${build.tests.classes.dir}" excludes="com/arjuna/qa/junit/**/*.class"/>
</war>
<ear earfile="${build.tests.webapps.dir}/ws-c-tests.ear" appxml="${tests.dd.dir}/ws-c11-tests_application.xml">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${build.tests.webapps.dir}" includes="ws-c11-tests.war"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-03-02 09:45:23 UTC (rev 31899)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-03-02 13:33:01 UTC (rev 31900)
@@ -33,11 +33,11 @@
<!-- ================================================================== -->
- <import file="../sharedbuild.xml"/>
-
<!-- Set module name -->
<property name="modulename" value="ws-t"/>
+ <import file="../sharedbuild.xml"/>
+
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
@@ -124,7 +124,7 @@
<property name="tests.libs" value="junit.jar"/>
<path id="tests.lib.path">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
</path>
<property name="javac.debug" value="on"/>
@@ -383,7 +383,7 @@
<war warfile="${build.tests.webapps.dir}/ws-t11-tests.war" webxml="${build.tests.dd.dir}/web-app11.xml">
</war>
<ear earfile="${build.tests.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t-tests_application.xml">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${build.tests.webapps.dir}" includes="ws-t-tests.war ws-t11-tests.war"/>
<fileset dir="${build.tests.lib.dir}" includes="ws-t-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
@@ -399,7 +399,7 @@
<war warfile="${build.tests.webapps.dir}/ws-t11-tests.war" webxml="${build.tests.dd.dir}/web-app11.xml">
</war>
<ear earfile="${build.tests.webapps.dir}/ws-t-tests.ear" appxml="${tests.dd.dir}/ws-t11-tests_application.xml">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${build.tests.webapps.dir}" includes="ws-t11-tests.war"/>
<fileset dir="${build.tests.lib.dir}" includes="ws-t-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-03-02 09:45:23 UTC (rev 31899)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-03-02 13:33:01 UTC (rev 31900)
@@ -21,11 +21,11 @@
-->
<project name="WSAS" default="wsas.jar" basedir=".">
+ <!-- Set module name -->
+ <property name="modulename" value="wsas"/>
+
<import file="../sharedbuild.xml"/>
- <!-- Set module name -->
- <property name="modulename" value="wsas"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
@@ -58,7 +58,7 @@
<property name="tests.depend.libs" value="${tests.libs} ${modulename}.jar"/>
<path id="wsas.tests.lib.path">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
</path>
<!-- Initialisation -->
@@ -176,7 +176,7 @@
code is deployed as a sar and the TS code is deployed
in the server lib
-->
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${wsas.tests.webapps.dest}" includes="wsas-tests.war"/>
<fileset dir="${wsas.tests.jar.dest}" includes="wsas-tests.jar"/>
<fileset dir="${wsas.tests.jar.dest}" includes="xts-test-servlet.jar"/>
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-03-02 09:45:23 UTC (rev 31899)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-03-02 13:33:01 UTC (rev 31900)
@@ -21,11 +21,11 @@
-->
<project name="WSCF" default="wscf.war" basedir=".">
- <import file="../sharedbuild.xml"/>
-
<!-- Set module name -->
<property name="modulename" value="wscf"/>
+ <import file="../sharedbuild.xml"/>
+
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
@@ -82,7 +82,7 @@
<property name="tests.depend.libs" value="${tests.libs} ${modulename}.jar"/>
<path id="wscf.tests.lib.path">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<path refid="wscf.lib.classpath"/>
</path>
@@ -307,7 +307,7 @@
code is deployed as a sar and the TS code is deployed
in the server lib
-->
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${wscf.tests.webapps.dest}" includes="wscf-tests.war wscf11-tests.war wscf-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
@@ -326,7 +326,7 @@
code is deployed as a sar and the TS code is deployed
in the server lib
-->
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${wscf.tests.webapps.dest}" includes="wscf11-tests.war wscf-tests.jar"/>
<fileset dir="${wsas.tests.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-03-02 09:45:23 UTC (rev 31899)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-03-02 13:33:01 UTC (rev 31900)
@@ -21,11 +21,11 @@
-->
<project name="WSTX" default="wstx.war" basedir=".">
+ <!-- Set module name -->
+ <property name="modulename" value="wstx"/>
+
<import file="../sharedbuild.xml"/>
- <!-- Set module name -->
- <property name="modulename" value="wstx"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
@@ -107,7 +107,7 @@
<property name="tests.libs" value="junit.jar"/>
<path id="tests.lib.path">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
</path>
<property name="tests.all.libs" value="${wsas.libs} ${wsc.all.libs} ${wscf.all.libs} ${wst.all.libs} ${wstx.all.libs} ${tests.libs}"/>
@@ -116,7 +116,7 @@
<property name="javac.optimize" value="off"/>
<path id="com.arjuna.mwlabs.wstx.tests.lib.path">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<path refid="build.classpath"/>
</path>
@@ -378,7 +378,7 @@
</war>
<war warfile="${wstx.tests.webapps.dest}/wstx11-tests.war" webxml="${wstx.tests.dd.dest}/web-app11.xml"/>
<ear earfile="${wstx.tests.webapps.dest}/wstx-tests.ear" appxml="${wstx.tests.dd}/wstx-tests_application.xml">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${wstx.tests.webapps.dest}" includes="wstx-tests.war wstx11-tests.war wstx-tests.jar"/>
<fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
@@ -392,7 +392,7 @@
</jar>
<war warfile="${wstx.tests.webapps.dest}/wstx11-tests.war" webxml="${wstx.tests.dd.dest}/web-app11.xml"/>
<ear earfile="${wstx.tests.webapps.dest}/wstx-tests.ear" appxml="${wstx.tests.dd}/wstx11-tests_application.xml">
- <fileset dir="${xts.ext.dir}" includes="${tests.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${tests.libs}"/>
<fileset dir="${wstx.tests.webapps.dest}" includes="wstx11-tests.war wstx-tests.jar"/>
<fileset dir="${wsas.test.build.lib.dir}" includes="xts-test-servlet.jar"/>
</ear>
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-03-02 09:45:23 UTC (rev 31899)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-03-02 13:33:01 UTC (rev 31900)
@@ -24,11 +24,11 @@
JBoss Transactions WS-Addressing interop test
</description>
- <import file="../../sharedbuild.xml"/>
-
<!-- Set module name -->
<property name="modulename" value="wstf-sc007-interop"/>
+ <import file="../../sharedbuild.xml"/>
+
<!-- the directory in which XTS resides -->
<property name="xts.home" value="../../xts-install"/>
@@ -86,7 +86,7 @@
<classpath>
<path refid="build.classpath"/>
<fileset dir="${xts.lib.dir}" includes="${xts.libs}"/>
- <fileset dir="${xts.ext.dir}" includes="${xts.ext.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${xts.ext.libs}"/>
</classpath>
</javac>
</target>
@@ -111,7 +111,7 @@
<classes dir="${build.classes.dir}"/>
<classes dir="${src.dir}" excludes="**/*.java"/>
<!-- need to stop using this at some point soon -->
- <lib dir="${xts.ext.dir}" includes = "${xts.ext.libs}"/>
+ <lib dir="${jbossts.build.extlib.dir}" includes = "${xts.ext.libs}"/>
<webinf dir="${dd.dir}/sc007" includes="wsdl/sc007.wsdl"/>
<fileset dir="${web.dir}"/>
</war>
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-03-02 09:45:23 UTC (rev 31899)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-03-02 13:33:01 UTC (rev 31900)
@@ -24,11 +24,11 @@
JBoss Transactions WS-Addressing interop test
</description>
- <import file="../../sharedbuild.xml"/>
-
<!-- Set module name -->
<property name="modulename" value="wstx11-interop"/>
+ <import file="../../sharedbuild.xml"/>
+
<!-- the directory in which XTS resides -->
<property name="xts.home" value="../../xts-install"/>
@@ -83,7 +83,7 @@
<javac destdir="${build.classes.dir}" srcdir="${src.dir}" debug="${compile.debug}">
<classpath>
<fileset dir="${xts.home}/lib" includes="${xts.libs}"/>
- <fileset dir="${xts.ext.dir}" includes="${xts.ext.libs}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${xts.ext.libs}"/>
<path refid="build.classpath"/>
</classpath>
</javac>
@@ -123,7 +123,7 @@
<webinf dir="${dd.dir}/interop11" includes="wsdl/*.wsdl"/>
<fileset dir="${web.dir}"/>
<!-- need to stop using this at some point soon -->
- <lib dir="${xts.ext.dir}" includes = "${xts.ext.libs}"/>
+ <lib dir="${jbossts.build.extlib.dir}" includes = "${xts.ext.libs}"/>
</war>
</target>
Modified: labs/jbosstm/trunk/XTS/localjunit/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/build.xml 2010-03-02 09:45:23 UTC (rev 31899)
+++ labs/jbosstm/trunk/XTS/localjunit/build.xml 2010-03-02 13:33:01 UTC (rev 31900)
@@ -14,7 +14,7 @@
<pathelement location="${jbossts.build.extlib.dir}/commons-httpclient.jar"/>
<pathelement location="${jbossts.build.extlib.dir}/commons-logging.jar"/>
<pathelement location="${jbossts.build.extlib.dir}/commons-codec.jar"/>
- <pathelement location="../ext/junit.jar"/>
+ <pathelement location="${jbossts.build.extlib.dir}/junit.jar"/>
</path>
<target name="all" depends="init,jar">
Modified: labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml 2010-03-02 09:45:23 UTC (rev 31899)
+++ labs/jbosstm/trunk/XTS/localjunit/run-interop-tests.xml 2010-03-02 13:33:01 UTC (rev 31900)
@@ -21,6 +21,8 @@
<project name="Local JUnit Test for basic XTS testsuite" default="interop-tests" basedir=".">
+ <import file="../sharedbuild.xml"/>
+
<property environment="env"/>
<property name="server.hostname" value="${env.MYTESTIP_1}"/>
<property name="base.url" value="http://${server.hostname}:8080"/>
@@ -29,15 +31,12 @@
<property name="testtype" value="tests-both" />
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.extlib.dir" location="../../build/extlib"/>
-
<path id="tests.classpath">
<pathelement location="${localjunit.lib.dir}/localjunit.jar"/>
<pathelement location="${jbossts.build.extlib.dir}/commons-httpclient.jar"/>
<pathelement location="${jbossts.build.extlib.dir}/commons-logging.jar"/>
<pathelement location="${jbossts.build.extlib.dir}/commons-codec.jar"/>
- <pathelement location="../ext/junit.jar"/>
+ <pathelement location="${jbossts.build.extlib.dir}/junit.jar"/>
</path>
<target name="interop-tests" depends="wstf-interop-tests,wstx11-interop-tests"/>
Modified: labs/jbosstm/trunk/XTS/localjunit/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/run-tests.xml 2010-03-02 09:45:23 UTC (rev 31899)
+++ labs/jbosstm/trunk/XTS/localjunit/run-tests.xml 2010-03-02 13:33:01 UTC (rev 31900)
@@ -21,21 +21,20 @@
<project name="Local JUnit Test for basic XTS testsuite" default="tests-both" basedir=".">
+ <import file="../sharedbuild.xml"/>
+
<property environment="env"/>
<property name="server.hostname" value="${env.MYTESTIP_1}"/>
<property name="base.url" value="http://${server.hostname}:8080"/>
<property name="reports.dir" value="reports"/>
<property name="localjunit.lib.dir" value="build" />
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.extlib.dir" location="../../build/extlib"/>
-
<path id="tests.classpath">
<pathelement location="${localjunit.lib.dir}/localjunit.jar"/>
<pathelement location="${jbossts.build.extlib.dir}/commons-httpclient.jar"/>
<pathelement location="${jbossts.build.extlib.dir}/commons-logging.jar"/>
<pathelement location="${jbossts.build.extlib.dir}/commons-codec.jar"/>
- <pathelement location="../ext/junit.jar"/>
+ <pathelement location="${jbossts.build.extlib.dir}/junit.jar"/>
</path>
More information about the jboss-svn-commits
mailing list