[jboss-svn-commits] JBL Code SVN: r20591 - 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 10:56:06 EDT 2008
Author: adinn
Date: 2008-06-18 10:56:06 -0400 (Wed, 18 Jun 2008)
New Revision: 20591
Modified:
labs/jbosstm/trunk/XTS/WSTX/config/wstx.xml
labs/jbosstm/trunk/XTS/WSTX/config/wstx11.xml
labs/jbosstm/trunk/XTS/sar/build.xml
Log:
modified sar build script so that a remote JBoss 1.0/1.1 coordinator can be specified on the ant command line using -Dcoordinator.hostname=... and -Dcoordinator.port=... -- default is to use values configured by -Dhostname=... and -Dport=... which themselves default to localhost and 8080. fix for JBTM-374
Modified: labs/jbosstm/trunk/XTS/WSTX/config/wstx.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/config/wstx.xml 2008-06-18 14:32:49 UTC (rev 20590)
+++ labs/jbosstm/trunk/XTS/WSTX/config/wstx.xml 2008-06-18 14:56:06 UTC (rev 20591)
@@ -56,5 +56,25 @@
name="com.arjuna.mw.wst.coordinatorURL"
value="http://@hostname@:@port@/ws-c10/soap/ActivationCoordinator"/>
-->
+ <!-- this property can be used to define a remote WSCOOR 1.0
+ activation coordinator. substitute coordinator.hostname
+ and coordinator.port to specify an XTS remote activation
+ coordinator deployed in another JBoss AS or provide an
+ alternative URL if you are using some other coordinator
+ service.
+
+ n.b. if you leave this line as is the build script in the
+ sar directory which builds the jbossxts service archive
+ (jbossxts.sar) will substitute the local hostname and
+ port into this property which means that the local
+ coordinator will be used to service coordination
+ requests. you can override these settings by editing the
+ build script or by supplying values on the ant command
+ line using -Dcoordinator.hostname=<hostname> and
+ -coordinator.port=<port>.
+ -->
+ <property
+ name="com.arjuna.mw.wst11.coordinatorURL"
+ value="http://@coordinator.hostname@:@coordinator.port@/ws-c10/soap/ActivationCoordinator"/>
</properties>
</wstx-config>
Modified: labs/jbosstm/trunk/XTS/WSTX/config/wstx11.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/config/wstx11.xml 2008-06-18 14:32:49 UTC (rev 20590)
+++ labs/jbosstm/trunk/XTS/WSTX/config/wstx11.xml 2008-06-18 14:56:06 UTC (rev 20591)
@@ -47,12 +47,25 @@
name="com.arjuna.ats.arjuna.recovery.recoveryExtension1"
value="com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule"/>
- <!-- include this property to employ a remote WS-COOR 1.0 activation coordinator
- substitute host and port to use an XTS remote activation coordinator deployed in another JBoss AS
- or provide an alternative URL if you are using some other coordinator service
+ <!-- this property can be used to define a remote WSCOOR 1.1
+ activation coordinator. substitute coordinator.hostname
+ and coordinator.port to specify an XTS remote activation
+ coordinator deployed in another JBoss AS or provide an
+ alternative URL if you are using some other coordinator
+ service.
+
+ n.b. if you leave this line as is the build script in the
+ sar directory which builds the jbossxts service archive
+ (jbossxts.sar) will substitute the local hostname and
+ port into this property ehich means that the local
+ coordinator will be used to service coordination
+ requests. you can override these settings by editing the
+ build script or by supplying values on the ant command
+ line using -Dcoordinator.hostname=<hostname> and
+ -coordinator.port=<port>.
+ -->
<property
- name="com.arjuna.mw.wst11.coordinatorURL"
- value="http://@hostname@:@port@/ws-c11/ActivationService"/>
- -->
+ name="com.arjuna.mw.wst11.coordinatorURL"
+ value="http://@coordinator.hostname@:@coordinator.port@/ws-c11/ActivationService"/>
</properties>
</wstx-config>
Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml 2008-06-18 14:32:49 UTC (rev 20590)
+++ labs/jbosstm/trunk/XTS/sar/build.xml 2008-06-18 14:56:06 UTC (rev 20591)
@@ -27,6 +27,8 @@
<!-- The properties to override are the following: -->
<!-- hostname (defaults to localhost) -->
<!-- port (defaults to 8080 for jboss) -->
+ <!-- coordinator.hostname (defaults to ${hostname}) -->
+ <!-- coordinator.port (defaults to ${port}) -->
<!-- xts.home The installation directory for XTS -->
<!-- server deployment directory (set via env var JBOSS_HOME) -->
<!-- ================================================================== -->
@@ -42,6 +44,12 @@
<!-- the name of the port used by the JBoss web listener -->
<property name="port" value="8080"/>
+ <!-- the name of the host where the coordinator resides -->
+ <property name="coordinator.hostname" value="${hostname}"/>
+
+ <!-- the name of the port the coordinator is listening on -->
+ <property name="coordinator.port" value="8080"/>
+
<!-- the directory in which your installed app server resides -->
<property environment="env"/>
@@ -63,6 +71,7 @@
<property name="build.dir" value="build"/>
<property name="build.webinf.dir" value="${build.dir}/WEB-INF"/>
<property name="build.metainf.dir" value="${build.dir}/META-INF"/>
+ <property name="build.conf.dir" location="${build.dir}/conf"/>
<!-- enable debugging of XTS service code -->
@@ -74,6 +83,7 @@
<mkdir dir="${build.dir}/tmp"/>
<mkdir dir="${build.webinf.dir}"/>
<mkdir dir="${build.metainf.dir}"/>
+ <mkdir dir="${build.conf.dir}"/>
</target>
<!-- TODO are the xts engine and its WS stack conceptually separate deployments? at what level do they integrate? spi or jax-ws?-->
@@ -105,8 +115,13 @@
</javac>
<!-- create config jar containing conf files for 1.0 and 1.1 -->
+ <filter token="coordinator.hostname" value="${coordinator.hostname}"/>
+ <filter token="coordinator.port" value="${coordinator.port}"/>
+ <copy todir="${build.conf.dir}" filtering="true">
+ <fileset dir="${conf.dir}" includes="*.xml"/>
+ </copy>
<jar jarfile="${build.dir}/config.jar">
- <fileset dir="${conf.dir}" includes="*.xml"/>
+ <fileset dir="${build.conf.dir}"/>
</jar>
<!-- copy 11 and 1.0 application.xml to build dir -->
@@ -159,8 +174,13 @@
</javac>
<!-- create config jar containing conf files for 1.1 -->
+ <filter token="coordinator.hostname" value="${coordinator.hostname}"/>
+ <filter token="coordinator.port" value="${coordinator.port}"/>
+ <copy todir="${build.conf.dir}" filtering="true">
+ <fileset dir="${conf.dir}" includes="*11.xml"/>
+ </copy>
<jar jarfile="${build.dir}/config.jar">
- <fileset dir="${conf.dir}" includes="*11.xml"/>
+ <fileset dir="${build.conf.dir}"/>
</jar>
<!-- copy 11 application.xml to build dir -->
@@ -213,8 +233,13 @@
</javac>
<!-- create config jar containing conf files for 1.0 -->
+ <filter token="coordinator.hostname" value="${coordinator.hostname}"/>
+ <filter token="coordinator.port" value="${coordinator.port}"/>
+ <copy todir="${build.conf.dir}" filtering="true">
+ <fileset dir="${conf.dir}" includes="*.xml" excludes="*11.xml"/>
+ </copy>
<jar jarfile="${build.dir}/config.jar">
- <fileset dir="${conf.dir}" includes="*.xml" excludes="*11.xml"/>
+ <fileset dir="${build.conf.dir}"/>
</jar>
<!-- copy 10 application.xml to build dir -->
More information about the jboss-svn-commits
mailing list