[jboss-svn-commits] JBL Code SVN: r18926 - in labs/jbosstm/trunk/XTS/sar: WEB-INF and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2008-03-13 11:33:43 -0400 (Thu, 13 Mar 2008)
New Revision: 18926

Modified:
   labs/jbosstm/trunk/XTS/sar/WEB-INF/web.xml
   labs/jbosstm/trunk/XTS/sar/build.xml
Log:
corrected build script to ensure hostanme and port are installed as per settings in build.xml

Modified: labs/jbosstm/trunk/XTS/sar/WEB-INF/web.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/WEB-INF/web.xml	2008-03-13 15:31:52 UTC (rev 18925)
+++ labs/jbosstm/trunk/XTS/sar/WEB-INF/web.xml	2008-03-13 15:33:43 UTC (rev 18926)
@@ -12,12 +12,12 @@
      -->
     <init-param>
         <param-name>BaseHttpURI</param-name>
-        <param-value>http://localhost:8080/jbossxts/soap/</param-value>
+        <param-value>http://@hostname@:@port@/jbossxts/soap/</param-value>
     </init-param>
     <!--
     <init-param>
         <param-name>BaseHttpsURI</param-name>
-        <param-value>https://localhost:8080/xts/soap/</param-value>
+        <param-value>https://@hostname@:@port@/xts/soap/</param-value>
     </init-param>
     <init-param>
         <param-name>LogPackets</param-name>

Modified: labs/jbosstm/trunk/XTS/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/build.xml	2008-03-13 15:31:52 UTC (rev 18925)
+++ labs/jbosstm/trunk/XTS/sar/build.xml	2008-03-13 15:33:43 UTC (rev 18926)
@@ -22,19 +22,26 @@
 <project name="sar" default="sar" basedir=".">
 
     <!-- ================================================================== -->
+    <!-- build and install the XTS component as a service archive           -->
 
     <!-- The properties to override are the following:                      -->
     <!--    hostname (defaults to localhost)                                -->
     <!--    port (defaults to 8080 for jboss)                               -->
-
-    <!--    deploy.dir The deployment directory for the ear                 -->
-    <!--    xts.home The installation directory for AXTS                   -->
+    <!--    xts.home The installation directory for XTS                     -->
+    <!--    server deployment directory (set via env var JBOSS_HOME)        -->
     <!-- ================================================================== -->
 
+    <!-- devs: run 'ant jta; cd XTS; ant install' after svn checkout -->
+
     <!-- the directory in which XTS resides -->
-    <!-- devs: run 'ant jta; cd XTS; ant install' after svn checkout -->
     <property name="xts.home" value="../xts-install"/>
 
+    <!-- the name of the host running JBOSS -->
+    <property name="hostname" value="localhost"/>
+
+    <!-- the name of the port used by the JBoss web listener -->
+    <property name="port" value="8080"/>
+
     <!-- the directory in which your installed app server resides -->
     <property environment="env"/>
 
@@ -49,11 +56,14 @@
     <property name="lib.dir" location="${xts.home}/lib"/>
     <property name="ext.dir" location="${lib.dir}/ext"/>
 
+    <property name="webinf.dir"         value="WEB-INF"/>
     <property name="build.dir"         value="build"/>
+    <property name="build.webinf.dir"       value="${build.dir}/WEB-INF"/>
 
     <target name="init">
         <delete dir="${build.dir}"/>
         <mkdir dir="${build.dir}"/>
+        <mkdir dir="${build.dd.dir}"/>
     </target>
 
     <!-- TODO are the xts engine and its WS stack conceptually separate deployments? at what level do they integrate? spi or jax-ws?-->
@@ -90,10 +100,15 @@
             </classpath>
         </javac>
 
-        <!-- TODO: how to enforce startup ordering? -->
+	<!-- substitute host and port in deployment descriptor -->
+        <filter token="hostname" value="${hostname}"/>
+        <filter token="port" value="${port}"/>
+	<copy file="${webinf.dir}/web.xml" tofile="${build.webinf.dir}/web.xml" filtering="true"/>
 
+	<!-- build the war containing the XTS HTTP multiplexor -->
+
         <jar jarfile="${build.dir}/jbossxts.war">
-            <fileset dir="." includes="WEB-INF/web.xml"/>
+            <fileset dir="." includes="${build.webinf.dir}/web.xml"/>
         </jar>
 
         <jar jarfile="${build.dir}/jbossxts.sar">