[jboss-svn-commits] JBL Code SVN: r26238 - in labs/jbosstm/trunk: XTS and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Apr 24 05:13:30 EDT 2009
Author: istudens at redhat.com
Date: 2009-04-24 05:13:30 -0400 (Fri, 24 Apr 2009)
New Revision: 26238
Added:
labs/jbosstm/trunk/XTS/interop/
labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/
labs/jbosstm/trunk/XTS/interop/WSTX11-interop/
Modified:
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/run-tests.xml
labs/jbosstm/trunk/build-release-pkgs.xml
Log:
XTS interop tests copied from workspace and prepared for deploy to the maven repo. JBQA-2067
Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml 2009-04-24 07:13:25 UTC (rev 26237)
+++ labs/jbosstm/trunk/XTS/build.xml 2009-04-24 09:13:30 UTC (rev 26238)
@@ -167,6 +167,10 @@
</target>
+ <target name="build-interop-tests" depends="install-projects, com.arjuna.mwlabs.xts.interop-tests.build">
+
+ </target>
+
<target name="htdocs" depends="com.arjuna.mwlabs.xts.init">
<echo message="Building htdocs "/>
<mkdir dir="${com.arjuna.mwlabs.xts.htdocs.dest}"/>
@@ -288,13 +292,29 @@
</zip>
</target>
+ <target name="install-interop-tests" depends="build-interop-tests">
+ <echo message="Installing service tests"/>
+ <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/interop-tests"/>
+ <copy todir="${com.arjuna.mwlabs.installationdirectory}/interop-tests">
+ <!-- wars providing test servlets -->
+ <fileset dir="interop/WSTFSC07-interop/build/lib" includes="sc007.war"/>
+ <fileset dir="interop/WSTX11-interop/build/lib" includes="interop11.war"/>
+ <!-- ant script and client jar used to exercise servlets-->
+ <fileset dir="localjunit/build/" includes="localjunit.jar"/>
+ <fileset dir="localjunit" includes="run-interop-tests.xml"/>
+ </copy>
+ <zip destfile="${com.arjuna.mwlabs.installationdirectory}/interop-tests/jbossxts-interop-tests.zip">
+ <fileset dir="${com.arjuna.mwlabs.installationdirectory}/interop-tests" includes="*.war *.jar *.xml"/>
+ </zip>
+ </target>
+
<!-- build target just builds the main projects but not the sar since
the latter cannot be built until after the projects have been installed -->
<target name="build" depends="build-projects"/>
<!-- install target builds and installs the main projects
then builds and installs the sar then installs the demo -->
- <target name="install" depends="install-sar, install-tests, install-demo"/>
+ <target name="install" depends="install-sar, install-tests, install-interop-tests, install-demo"/>
<target name="clean" depends="com.arjuna.mwlabs.xts.init,
com.arjuna.mwlabs.xts.wsas.clean,
@@ -302,7 +322,8 @@
com.arjuna.mwlabs.xts.wscf.clean,
com.arjuna.mwlabs.xts.ws-t.clean,
com.arjuna.mwlabs.xts.wstx.clean,
- com.arjuna.mwlabs.xts.sar.clean">
+ com.arjuna.mwlabs.xts.sar.clean,
+ com.arjuna.mwlabs.xts.interop-tests.clean">
<delete dir="${com.arjuna.mwlabs.xts.htdocs.dest}"/>
<delete dir="${com.arjuna.mwlabs.xts.jar.dest}"/>
@@ -357,6 +378,19 @@
<ant dir="localjunit" target="all"/>
</target>
+ <target name="com.arjuna.mwlabs.xts.interop-tests.build">
+ <property name="xts.home" location="${com.arjuna.mw.installationdirectory}"/>
+ <ant dir="interop/WSTFSC07-interop" target="war"/>
+ <ant dir="interop/WSTX11-interop" target="war"/>
+ <ant dir="localjunit" target="all"/>
+ </target>
+
+ <target name="com.arjuna.mwlabs.xts.interop-tests.clean">
+ <property name="xts.home" location="${com.arjuna.mw.installationdirectory}"/>
+ <ant dir="interop/WSTFSC07-interop" target="clean"/>
+ <ant dir="interop/WSTX11-interop" target="clean"/>
+ </target>
+
<target name="com.arjuna.mwlabs.xts.wsas.clean">
<ant dir="WSAS" target="clean"/>
</target>
Copied: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop (from rev 26223, labs/jbosstm/workspace/interop/WSTFSC07-interop)
Modified: labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml
===================================================================
--- labs/jbosstm/workspace/interop/WSTFSC07-interop/build.xml 2009-04-23 09:51:02 UTC (rev 26223)
+++ labs/jbosstm/trunk/XTS/interop/WSTFSC07-interop/build.xml 2009-04-24 09:13:30 UTC (rev 26238)
@@ -28,15 +28,19 @@
<property name="jboss.lib.dir" location="${jboss.dir}/lib"/>
<property name="jboss.common.lib.dir" location="${jboss.dir}/common/lib"/>
<!-- export XTS_HOME=/home/adinn/jboss/jbossts/trunk/XTS/xts-install -->
- <property name="xts.lib.dir" location="${env.XTS_HOME}/lib"/>
+ <property name="xts.home" location="${env.XTS_HOME}"/>
+ <property name="xts.lib.dir" location="${xts.home}/lib"/>
<property name="xts.ext.lib.dir" location="${xts.lib.dir}/ext"/>
+ <echo>jboss.dir = ${jboss.dir}</echo>
+ <echo>xts.home = ${xts.home}</echo>
+
<!--
<property name="dist.compile.libs" value="ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar jbossjta.jar jbossts-common.jar stax-api-1.0.jar junit-3.8.1.jar saxon8.jar"/>
-->
- <property name="xts11.compile.libs" value="ws-c11.jar ws-t11.jar wscf11.jar wstx11.jar"/>
- <property name="xts.compile.libs" value="jbossxts-api.jar ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar"/>
- <property name="xts.ext.compile.libs" value="jbossjta.jar"/>
+ <property name="xts11.compile.libs" value="ws-c11.jar ws-t11.jar wscf11.jar wstx11.jar"/>
+ <property name="xts.compile.libs" value="jbossxts-api.jar ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar"/>
+ <property name="xts.ext.compile.libs" value="jbossjta.jar jbossjts.jar"/>
<property name="jboss.compile.client.libs" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar"/>
Copied: labs/jbosstm/trunk/XTS/interop/WSTX11-interop (from rev 26223, labs/jbosstm/workspace/interop/WSTX11-interop)
Modified: labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml
===================================================================
--- labs/jbosstm/workspace/interop/WSTX11-interop/build.xml 2009-04-23 09:51:02 UTC (rev 26223)
+++ labs/jbosstm/trunk/XTS/interop/WSTX11-interop/build.xml 2009-04-24 09:13:30 UTC (rev 26238)
@@ -28,15 +28,19 @@
<property name="jboss.lib.dir" location="${jboss.dir}/lib"/>
<property name="jboss.common.lib.dir" location="${jboss.dir}/common/lib"/>
<!-- export XTS_HOME=/home/adinn/jboss/jbossts/trunk/XTS/xts-install -->
- <property name="xts.lib.dir" location="${env.XTS_HOME}/lib"/>
+ <property name="xts.home" location="${env.XTS_HOME}"/>
+ <property name="xts.lib.dir" location="${xts.home}/lib"/>
<property name="xts.ext.lib.dir" location="${xts.lib.dir}/ext"/>
+ <echo>jboss.dir = ${jboss.dir}</echo>
+ <echo>xts.home = ${xts.home}</echo>
+
<!--
<property name="dist.compile.libs" value="ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar jbossjta.jar jbossts-common.jar stax-api-1.0.jar junit-3.8.1.jar saxon8.jar"/>
-->
- <property name="xts11.compile.libs" value="ws-c11.jar ws-t11.jar wscf11.jar wstx11.jar"/>
- <property name="xts.compile.libs" value="jbossxts-api.jar ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar"/>
- <property name="xts.ext.compile.libs" value="jbossjta.jar"/>
+ <property name="xts11.compile.libs" value="ws-c11.jar ws-t11.jar wscf11.jar wstx11.jar"/>
+ <property name="xts.compile.libs" value="jbossxts-api.jar ws-c.jar ws-t.jar wscf.jar wstx.jar wsas.jar"/>
+ <property name="xts.ext.compile.libs" value="jbossjta.jar jbossjts.jar"/>
<property name="jboss.compile.client.libs" value="jaxb-api.jar jboss-javaee.jar jbossws-native-jaxrpc.jar
jbossws-native-jaxws.jar jbossws-client.jar stax-api.jar jbossws-native-saaj.jar
jbossws-native-jaxws-ext.jar jbossws-native-core.jar jbossws-common.jar"/>
Modified: labs/jbosstm/trunk/XTS/localjunit/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/run-tests.xml 2009-04-24 07:13:25 UTC (rev 26237)
+++ labs/jbosstm/trunk/XTS/localjunit/run-tests.xml 2009-04-24 09:13:30 UTC (rev 26238)
@@ -30,7 +30,6 @@
<property name="apache.logging.lib.dir" value="ext" />
<property name="apache.codec.lib.dir" value="ext" />
<property name="junit.lib.dir" value="../ext" />
- <property name="testtype" value="tests-both" />
<path id="tests.classpath">
<pathelement location="${localjunit.lib.dir}/localjunit.jar"/>
Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml 2009-04-24 07:13:25 UTC (rev 26237)
+++ labs/jbosstm/trunk/build-release-pkgs.xml 2009-04-24 09:13:30 UTC (rev 26238)
@@ -294,6 +294,18 @@
<arg value="-DgeneratePom=true"/>
</exec>
+ <exec executable="mvn" dir="${workdir}">
+ <arg value="deploy:deploy-file"/>
+ <arg value="-Dfile=${workdir}/build/${tag}/xts/tests/jbossxts-interop-tests.zip"/>
+ <arg value="-Dpackaging=zip"/>
+ <arg value="-Durl=${mvn.url}"/>
+ <arg value="-DrepositoryId=${mvn.repositoryId}"/>
+ <arg value="-DgroupId=jboss.jbossts"/>
+ <arg value="-DartifactId=jbossxts-interop-tests"/>
+ <arg value="-Dversion=${filename}"/>
+ <arg value="-DgeneratePom=true"/>
+ </exec>
+
</target>
</project>
More information about the jboss-svn-commits
mailing list