[jboss-svn-commits] JBL Code SVN: r20594 - in labs/jbosstm/trunk/XTS: sar and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 18 13:24:31 EDT 2008
Author: adinn
Date: 2008-06-18 13:24:31 -0400 (Wed, 18 Jun 2008)
New Revision: 20594
Removed:
labs/jbosstm/trunk/XTS/coordinator/
Modified:
labs/jbosstm/trunk/XTS/build.xml
labs/jbosstm/trunk/XTS/sar/build.xml
Log:
modified XTS and XTS/sar build scripts so that the XTS script builds
the XTS service archive jbossxts.sar and installs it in the
xts-install directory when ant is run with target install.
by default the installed jbossxts.sar oprovides both the 1.0 and 1.1
XTS implementations and uses localhost and 8080 as the host and port
(including the coordinator host and port i.e. it implements a local
coordinator). ant may be supplied flags -Dhostname=... and
-Dport=... to reset the hostname and port to be compatible with the
values specified in the JBoss bind address. In this case the
coordinator URL will also be reset to use these values (i.e. it will
still employ a local corodinator).
to configure a remote JBoss coordinator ant may also be supplied flags
-Dcoordinator.hostname=.. and -Dcoordinator.port=... This will
redirect 1.0 or 1.1 coordinator lookups to the relevant 1.0 or 1.1
JBoss activation coordinator service URL:
for 1.1
http://coordinator.hostname:coordinator.port/ws-c11/ActivationService
for 1.0
http://coordinator.hostname:coordinator.port/ws-c10/soap/ActivationCoordinator
If the remote coordinator is not using XTS then the correct address
must be specified by editing file wstx.xml or wstx11.xml in the WSTX
config directory.
Modified: labs/jbosstm/trunk/XTS/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/build.xml 2008-06-18 15:59:32 UTC (rev 20593)
+++ labs/jbosstm/trunk/XTS/build.xml 2008-06-18 17:24:31 UTC (rev 20594)
@@ -151,11 +151,16 @@
</target>
<!-- Project targets - must add all module names to each target -->
- <target name="build" depends="com.arjuna.mwlabs.xts.init, com.arjuna.mwlabs.xts.wsas.build, com.arjuna.mwlabs.xts.ws-c.build, com.arjuna.mwlabs.xts.wscf.build, com.arjuna.mwlabs.xts.ws-t.build, com.arjuna.mwlabs.xts.wstx.build, htdocs">
+ <target name="build-projects" depends="com.arjuna.mwlabs.xts.init, com.arjuna.mwlabs.xts.wsas.build, com.arjuna.mwlabs.xts.ws-c.build, com.arjuna.mwlabs.xts.wscf.build, com.arjuna.mwlabs.xts.ws-t.build, com.arjuna.mwlabs.xts.wstx.build, htdocs">
+ </target>
+
+ <!-- sar build target - note, requires prior build and *install* of the projects -->
+ <target name="build-sar" depends="install-projects, com.arjuna.mwlabs.xts.sar.build">
+
</target>
- <target name="htdocs" depends="com.arjuna.mwlabs.xts.init">
+ <target name="htdocs" depends="com.arjuna.mwlabs.xts.init">
<echo message="Building htdocs "/>
<mkdir dir="${com.arjuna.mwlabs.xts.htdocs.dest}"/>
@@ -185,7 +190,7 @@
</javadoc>
</target>
- <target name="install" depends="build">
+ <target name="install-projects" depends="build-projects">
<echo message="Installation directory : ${com.arjuna.mwlabs.installationdirectory}"/>
<echo message="Installing jar files"/>
@@ -235,27 +240,43 @@
<echo message="Installing coordinator"/>
<mkdir dir="${com.arjuna.mwlabs.installationdirectory}/coordinator"/>
- <copy todir="${com.arjuna.mwlabs.installationdirectory}/coordinator">
- <fileset dir="${com.arjuna.mwlabs.coordinator.dir}"/>
- </copy>
<copy todir="${com.arjuna.mwlabs.installationdirectory}/coordinator/dd">
<fileset dir="WS-C/dev/dd" includes="ws-c_web-app.xml ws-c11_web-app.xml"/>
<fileset dir="WS-T/dev/dd" includes="ws-t_web-app.xml ws-t11_web-app.xml"/>
</copy>
+ </target>
+
+ <target name="install-demo">
<echo message="Installing demo"/>
<mkdir dir="${com.arjuna.mwlabs.installationdirectory}/demo"/>
<!-- overlay the demo app onto the install -->
<ant dir="${com.arjuna.xts-demo.dir}" target="distribution"/>
-
</target>
- <target name="clean" depends="com.arjuna.mwlabs.xts.init,
+ <target name="install-sar" depends="build-sar">
+ <echo message="Installing service archive"/>
+ <mkdir dir="${com.arjuna.mwlabs.installationdirectory}/sar"/>
+ <copy todir="${com.arjuna.mwlabs.installationdirectory}/sar">
+ <fileset dir="sar/build" includes="jbossxts.sar"/>
+ </copy>
+ </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-demo"/>
+
+ <target name="clean" depends="com.arjuna.mwlabs.xts.init,
com.arjuna.mwlabs.xts.wsas.clean,
com.arjuna.mwlabs.xts.ws-c.clean,
com.arjuna.mwlabs.xts.wscf.clean,
com.arjuna.mwlabs.xts.ws-t.clean,
- com.arjuna.mwlabs.xts.wstx.clean">
+ com.arjuna.mwlabs.xts.wstx.clean,
+ com.arjuna.mwlabs.xts.sar.clean">
<delete dir="${com.arjuna.mwlabs.xts.htdocs.dest}"/>
<delete dir="${com.arjuna.mwlabs.xts.jar.dest}"/>
@@ -289,6 +310,10 @@
<ant dir="WSTX"/>
</target>
+ <target name="com.arjuna.mwlabs.xts.sar.build">
+ <ant dir="sar"/>
+ </target>
+
<target name="com.arjuna.mwlabs.xts.wsas.clean">
<ant dir="WSAS" target="clean"/>
</target>
@@ -309,4 +334,8 @@
<ant dir="WSTX" target="clean"/>
</target>
+ <target name="com.arjuna.mwlabs.xts.sar.clean">
+ <ant dir="sar" target="clean"/>
+ </target>
+
</project>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2008-06-18 15:59:32 UTC (rev 20593)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2008-06-18 17:24:31 UTC (rev 20594)
@@ -19,7 +19,7 @@
@author JBoss Inc.
-->
-<project name="sar" default="sar" basedir=".">
+<project name="sar" default="sar-both" basedir=".">
<!-- ================================================================== -->
<!-- build and install the XTS component as a service archive -->
@@ -245,7 +245,7 @@
<!-- copy 10 application.xml to build dir -->
<copy toFile="${build.metainf.dir}/application.xml" file="${metainf.dir}/application10.xml"/>
- <!-- pack everything in the servcie archive -->
+ <!-- pack everything in the service archive -->
<jar jarfile="${build.dir}/jbossxts.sar">
<!-- include generic and 1.0 jars -->
<fileset dir="${lib.dir}" includes="*.jar" excludes="*11.jar"/>
@@ -321,20 +321,21 @@
<delete dir="${build.dir}"/>
</target>
- <target name="deploy11" depends="undeploy, sar-11">
+ <!-- convenience targets to build and deploy the service archive -->
+ <target name="deploy-11" depends="undeploy, sar-11">
<copy file="${build.dir}/jbossxts.sar" todir="${jbossas.home}/server/default/deploy"/>
</target>
- <target name="deploy10" depends="undeploy, sar-10">
+ <target name="deploy-10" depends="undeploy, sar-10">
<copy file="${build.dir}/jbossxts.sar" todir="${jbossas.home}/server/default/deploy"/>
</target>
- <target name="deployboth" depends="undeploy,sar-both">
+ <target name="deploy-both" depends="undeploy, sar-both">
<copy file="${build.dir}/jbossxts.sar" todir="${jbossas.home}/server/default/deploy"/>
</target>
<!-- by default deploy sar implementing 1.1. WS-C/T protocols -->
- <target name="deploy" depends="deploy11">
+ <target name="deploy" depends="deploy-both">
</target>
<target name="undeploy">
More information about the jboss-svn-commits
mailing list