[jboss-svn-commits] JBL Code SVN: r31848 - in labs/jbosstm/trunk/XTS: WS-C and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 26 04:41:36 EST 2010
Author: adinn
Date: 2010-02-26 04:41:34 -0500 (Fri, 26 Feb 2010)
New Revision: 31848
Added:
labs/jbosstm/trunk/XTS/sharedbuild.xml
Modified:
labs/jbosstm/trunk/XTS/WS-C/build.xml
labs/jbosstm/trunk/XTS/WS-T/build.xml
labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml
labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.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/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/recovery/build.xml
labs/jbosstm/trunk/XTS/sar/build.xml
Log:
factored common build functions into a shared build script
Modified: labs/jbosstm/trunk/XTS/WS-C/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/WS-C/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -32,64 +32,11 @@
<!-- ================================================================== -->
+ <import file="../sharedbuild.xml"/>
+
<!-- Set module name -->
<property name="modulename" value="ws-c"/>
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../.."/>
-
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
- <!-- JBossTS products are in parent install/lib -->
- <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
- <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
-
- <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
- <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
- <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
-
- <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
-
- <property name="xts.ext.dir" location="../ext"/>
-
- <!-- required JBossTS product jars -->
- <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
-
- <!-- external jars also used by JBossTS -->
- <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
-
- <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
- <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
-
- <!-- external jars used by XTS for CXF enabled builds -->
- <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
-
- <!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
- jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
-
- <!-- paths internal to build -->
-
- <path id="build.classpath">
- <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
- <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
- </path>
-
- <path id="doclet.classpath">
- <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
- </path>
-
- <property name="build.classpath" refid="build.classpath"/>
-
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
Modified: labs/jbosstm/trunk/XTS/WS-T/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/WS-T/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -33,64 +33,11 @@
<!-- ================================================================== -->
+ <import file="../sharedbuild.xml"/>
+
<!-- Set module name -->
<property name="modulename" value="ws-t"/>
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../.."/>
-
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
- <!-- JBossTS products are in parent install/lib -->
- <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
- <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
-
- <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
- <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
- <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
-
- <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
-
- <property name="xts.ext.dir" location="../ext"/>
-
- <!-- required JBossTS product jars -->
- <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
-
- <!-- external jars also used by JBossTS -->
- <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
-
- <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
- <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
-
- <!-- external jars used by XTS for CXF enabled builds -->
- <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
-
- <!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
- jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
-
- <!-- paths internal to build -->
-
- <path id="build.classpath">
- <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
- <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
- </path>
-
- <path id="doclet.classpath">
- <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
- </path>
-
- <property name="build.classpath" refid="build.classpath"/>
-
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t-tests_web-app.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -34,7 +34,7 @@
<servlet>
<servlet-name>JUnitTestsServlet</servlet-name>
- <servlet-class>com.arjuna.qa.junit.WSCTestRunnerServlet</servlet-class>
+ <servlet-class>com.arjuna.qa.junit.WSTTestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
<param-value>com.arjuna.wst.tests.junit.TestSuite</param-value>
Modified: labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/WS-T/tests/dd/ws-t11-tests_web-app.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -34,7 +34,7 @@
<servlet>
<servlet-name>JUnitTestsServlet</servlet-name>
- <servlet-class>com.arjuna.qa.junit.WSCTestRunnerServlet</servlet-class>
+ <servlet-class>com.arjuna.qa.junit.WSTTestRunnerServlet</servlet-class>
<init-param>
<param-name>TestSuiteClassName</param-name>
<param-value>com.arjuna.wst11.tests.junit.TestSuite</param-value>
Modified: labs/jbosstm/trunk/XTS/WSAS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/WSAS/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -21,64 +21,11 @@
-->
<project name="WSAS" default="wsas.jar" basedir=".">
+ <import file="../sharedbuild.xml"/>
+
<!-- Set module name -->
<property name="modulename" value="wsas"/>
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../.."/>
-
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
- <!-- JBossTS products are in parent install/lib -->
- <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
- <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
-
- <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
- <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
- <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
-
- <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
-
- <property name="xts.ext.dir" location="../ext"/>
-
- <!-- required JBossTS product jars -->
- <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
-
- <!-- external jars also used by JBossTS -->
- <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
-
- <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
- <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
-
- <!-- external jars used by XTS for CXF enabled builds -->
- <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
-
- <!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
- jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
-
- <!-- paths internal to build -->
-
- <path id="build.classpath">
- <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
- <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
- </path>
-
- <path id="doclet.classpath">
- <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
- </path>
-
- <property name="build.classpath" refid="build.classpath"/>
-
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
Modified: labs/jbosstm/trunk/XTS/WSCF/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/WSCF/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -20,64 +20,12 @@
@author JBoss Inc.
-->
<project name="WSCF" default="wscf.war" basedir=".">
+
+ <import file="../sharedbuild.xml"/>
+
<!-- Set module name -->
<property name="modulename" value="wscf"/>
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../.."/>
-
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
- <!-- JBossTS products are in parent install/lib -->
- <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
- <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
-
- <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
- <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
- <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
-
- <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
-
- <property name="xts.ext.dir" location="../ext"/>
-
- <!-- required JBossTS product jars -->
- <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
-
- <!-- external jars also used by JBossTS -->
- <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
-
- <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
- <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
-
- <!-- external jars used by XTS for CXF enabled builds -->
- <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
-
- <!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
- jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
-
- <!-- paths internal to build -->
-
- <path id="build.classpath">
- <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
- <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
- </path>
-
- <path id="doclet.classpath">
- <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
- </path>
-
- <property name="build.classpath" refid="build.classpath"/>
-
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
Modified: labs/jbosstm/trunk/XTS/WSTX/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/WSTX/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -20,64 +20,12 @@
@author JBoss Inc.
-->
<project name="WSTX" default="wstx.war" basedir=".">
+
+ <import file="../sharedbuild.xml"/>
+
<!-- Set module name -->
<property name="modulename" value="wstx"/>
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../.."/>
-
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
- <!-- JBossTS products are in parent install/lib -->
- <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
- <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
-
- <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
- <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
- <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
-
- <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
-
- <property name="xts.ext.dir" location="../ext"/>
-
- <!-- required JBossTS product jars -->
- <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
-
- <!-- external jars also used by JBossTS -->
- <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
-
- <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
- <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
-
- <!-- external jars used by XTS for CXF enabled builds -->
- <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
-
- <!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
- jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
-
- <!-- paths internal to build -->
-
- <path id="build.classpath">
- <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
- <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
- </path>
-
- <path id="doclet.classpath">
- <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
- </path>
-
- <property name="build.classpath" refid="build.classpath"/>
-
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -21,65 +21,8 @@
-->
<project name="XTS" default="build" basedir=".">
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location=".."/>
+ <import file="sharedbuild.xml"/>
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
- <!-- JBossTS products are in parent install/lib -->
- <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
- <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
-
- <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
- <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
- <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
-
- <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
-
- <property name="xts.ext.dir" location="ext"/>
-
- <!-- required JBossTS product jars -->
- <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
-
- <!-- external jars also used by JBossTS -->
- <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
-
- <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
- <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
-
- <!-- external jars used by XTS for CXF enabled builds -->
- <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
-
- <!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
- jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
-
- <!-- paths internal to build -->
-
- <property name="xts.htdocs.dest" location="htdocs"/>
-
- <property name="xts.demo.dir" value="demo"/>
-
- <path id="build.classpath">
- <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
- <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
- </path>
-
- <path id="doclet.classpath">
- <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
- </path>
-
- <property name="build.classpath" refid="build.classpath"/>
-
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
<!-- Initialisation -->
<target name="init">
<!-- Define default build properties -->
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -24,6 +24,8 @@
JBoss Transactions WS-Addressing interop test
</description>
+ <import file="../../sharedbuild.xml"/>
+
<!-- Set module name -->
<property name="modulename" value="wstf-sc007-interop"/>
@@ -40,61 +42,6 @@
jboss web service HTTP listener port employed when jboss is started -->
<property name="coordinator.port" value="jboss.web.bind.port"/>
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../../.."/>
-
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
- <!-- JBossTS products are in parent install/lib -->
- <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
- <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
-
- <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
- <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
- <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
-
- <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
-
- <property name="xts.ext.dir" location="../../ext"/>
-
- <!-- required JBossTS product jars -->
- <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
-
- <!-- external jars also used by JBossTS -->
- <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
-
- <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
- <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
-
- <!-- external jars used by XTS for CXF enabled builds -->
- <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
-
- <!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
- jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
-
- <!-- paths internal to build -->
-
- <path id="build.classpath">
- <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
- <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
- </path>
-
- <path id="doclet.classpath">
- <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
- </path>
-
- <property name="build.classpath" refid="build.classpath"/>
-
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -24,6 +24,8 @@
JBoss Transactions WS-Addressing interop test
</description>
+ <import file="../../sharedbuild.xml"/>
+
<!-- Set module name -->
<property name="modulename" value="wstx11-interop"/>
@@ -40,61 +42,6 @@
jboss web service HTTP listener port employed when jboss is started -->
<property name="coordinator.port" value="jboss.web.bind.port"/>
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../../.."/>
-
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
- <!-- JBossTS products are in parent install/lib -->
- <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
- <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
-
- <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
- <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
- <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
-
- <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
-
- <property name="xts.ext.dir" location="../../ext"/>
-
- <!-- required JBossTS product jars -->
- <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
-
- <!-- external jars also used by JBossTS -->
- <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
-
- <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
- <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
-
- <!-- external jars used by XTS for CXF enabled builds -->
- <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
-
- <!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
- jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
-
- <!-- paths internal to build -->
-
- <path id="build.classpath">
- <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
- <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
- </path>
-
- <path id="doclet.classpath">
- <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
- </path>
-
- <property name="build.classpath" refid="build.classpath"/>
-
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
Modified: labs/jbosstm/trunk/XTS/localjunit/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/localjunit/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="localjunit" default="all">
+ <import file="../sharedbuild.xml"/>
+
<property name="build.dir" value="build"/>
<property name="build.dir.classes" value="${build.dir}/classes"/>
<property name="src.dir" value="src"/>
@@ -8,13 +10,6 @@
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../.."/>
-
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
<path id="tests.classpath">
<pathelement location="${jbossts.build.extlib.dir}/commons-httpclient.jar"/>
<pathelement location="${jbossts.build.extlib.dir}/commons-logging.jar"/>
Modified: labs/jbosstm/trunk/XTS/recovery/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/recovery/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -20,64 +20,12 @@
@author JBoss Inc.
-->
<project name="recovery" default="jar" basedir=".">
+
+ <import file="../sharedbuild.xml"/>
+
<!-- Set module name -->
<property name="modulename" value="recovery"/>
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../.."/>
-
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
- <!-- JBossTS products are in parent install/lib -->
- <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
- <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
-
- <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
- <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
- <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
-
- <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
-
- <property name="xts.ext.dir" location="../ext"/>
-
- <!-- required JBossTS product jars -->
- <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
-
- <!-- external jars also used by JBossTS -->
- <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
-
- <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
- <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
-
- <!-- external jars used by XTS for CXF enabled builds -->
- <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
-
- <!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
- jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
-
- <!-- paths internal to build -->
-
- <path id="build.classpath">
- <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
- <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
- </path>
-
- <path id="doclet.classpath">
- <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
- </path>
-
- <property name="build.classpath" refid="build.classpath"/>
-
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2010-02-26 09:22:47 UTC (rev 31847)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -33,6 +33,8 @@
<!-- devs: run 'ant jta; cd XTS; ant install' after svn checkout -->
+ <import file="../sharedbuild.xml"/>
+
<!-- Set module name -->
<property name="modulename" value="recovery"/>
@@ -49,61 +51,6 @@
jboss web service HTTP listener port employed when jboss is started -->
<property name="coordinator.port" value="jboss.web.bind.port"/>
- <!-- location of JBossTS parent tree -->
- <property name="jbossts.dir" location="../.."/>
-
- <!-- all libraries external to JBossTS should be found in parent build/extlib -->
- <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
- <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
-
- <!-- JBossTS products are in parent install/lib -->
- <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
- <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
-
- <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
- <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
- <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
-
- <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
-
- <property name="xts.ext.dir" location="../ext"/>
-
- <!-- required JBossTS product jars -->
- <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
-
- <!-- external jars also used by JBossTS -->
- <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
-
- <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
- <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
-
- <!-- external jars used by XTS for CXF enabled builds -->
- <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
- geronimo-ws-metadata_2.0_spec.jar">
- <isset property="cxf.build"/>
- </condition>
-
- <!-- external jars used by XTS for all builds -->
- <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
- jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
- jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
-
- <!-- paths internal to build -->
-
- <path id="build.classpath">
- <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
- <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
- </path>
-
- <path id="doclet.classpath">
- <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
- </path>
-
- <property name="build.classpath" refid="build.classpath"/>
-
- <property name="doclet.classpath" refid="doclet.classpath"/>
-
<!-- use $JBOSS_HOME to locate directory for deploy and undeploy -->
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
Added: labs/jbosstm/trunk/XTS/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sharedbuild.xml (rev 0)
+++ labs/jbosstm/trunk/XTS/sharedbuild.xml 2010-02-26 09:41:34 UTC (rev 31848)
@@ -0,0 +1,83 @@
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a full listing
+ of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ You should have received a copy of the GNU Lesser General Public License,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+
+ (C) 2005-2006,
+ @author JBoss Inc.
+-->
+<project name="sharedbuild">
+
+ <!-- location of JBossTS parent tree -->
+ <property name="jbossts.dir" location=".."/>
+
+ <!-- all libraries external to JBossTS should be found in parent build/extlib -->
+ <property name="jbossts.build.dir" location="${jbossts.dir}/build"/>
+ <property name="jbossts.build.extlib.dir" location="${jbossts.build.dir}/extlib"/>
+
+ <!-- JBossTS products are in parent install/lib -->
+ <property name="jbossts.install.dir" location="${jbossts.dir}/install"/>
+ <property name="jbossts.install.lib.dir" location="${jbossts.install.dir}/lib"/>
+
+ <!-- JBossTS resource bundle doclet code is in parent antbuildsystem build tree -->
+ <property name="jbossts.buildsystem.build.dir" location="${jbossts.dir}/antbuildsystem/build"/>
+ <property name="jbossts.buildsystem.build.lib.dir" location="${jbossts.buildsystem.build.dir}/lib"/>
+
+ <!-- TODO ok, I lied. stop using the old junit from our own ext lib and use the new one in the parent build/extlib -->
+
+ <property name="xts.ext.dir" location="ext"/>
+
+ <!-- required JBossTS product jars -->
+ <property name="jbossts.install.lib.jars" value="jbossjta.jar jbossjts.jar"/>
+
+ <!-- external jars also used by JBossTS -->
+ <property name="jbossts.build.extlib.jars" value="jbossts-common.jar commons-logging-1.1.jar"/>
+
+ <!-- buildsystem jar from JBossTS containg resource bundle doclet for messages -->
+ <property name="jbossts.buildsystem.jars" value="buildsystem.jar"/>
+
+ <!-- external jars used by XTS for CXF enabled builds -->
+ <condition property="cxf.build.extlib.jars" value="cxf-api.jar saaj-api.jar jaxrpc-api.jar jaxws-api.jar
+ geronimo-ws-metadata_2.0_spec.jar">
+ <isset property="cxf.build"/>
+ </condition>
+
+ <!-- external jars used by XTS for all builds -->
+ <property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
+ jbossws-client.jar stax-api.jar
+ jbossws-native-core.jar jbossws-common.jar jboss-logging-spi.jar
+ jta.jar servlet-api.jar dom4j.jar ${cxf.build.extlib.jars}"/>
+
+ <!-- paths internal to build -->
+
+ <property name="xts.htdocs.dest" location="htdocs"/>
+
+ <property name="xts.demo.dir" value="demo"/>
+
+ <path id="build.classpath">
+ <fileset dir="${jbossts.install.lib.dir}" includes="${jbossts.install.lib.jars}"/>
+ <fileset dir="${jbossts.build.extlib.dir}" includes="${jbossts.build.extlib.jars} ${xts.build.extlib.jars}"/>
+ </path>
+
+ <path id="doclet.classpath">
+ <fileset dir="${jbossts.buildsystem.build.lib.dir}" includes="${jbossts.buildsystem.jars}"/>
+ </path>
+
+ <property name="build.classpath" refid="build.classpath"/>
+
+ <property name="doclet.classpath" refid="doclet.classpath"/>
+
+</project>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list