[jboss-svn-commits] JBL Code SVN: r35032 - labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts.

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

Author: whitingjr
Date: 2010-09-06 13:13:35 -0400 (Mon, 06 Sep 2010)
New Revision: 35032

Modified:
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
Log:
Moved properties to environment variables.

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-09-06 17:12:19 UTC (rev 35031)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-09-06 17:13:35 UTC (rev 35032)
@@ -22,9 +22,14 @@
    <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy"/>
 
    <import file="common/common-api.xml"/>
-
-   <property file="build-api.properties" />
+   
    <property environment="env"/>
+   <loadproperties srcfile="build-api.properties">
+      <filterchain>
+         <expandproperties />
+      </filterchain>
+   </loadproperties>
+      
    <property name="framework.properties.dir" location="${env.HOME}/.specjms" />
    <property name="framework.file" location="${framework.properties.dir}/specjms.seq" />
    <property file="${framework.file}" />
@@ -45,7 +50,7 @@
       <sshexec host="${eap.server.host}"
          username="${eap.server.username}"
          password="${eap.server.password}"
-         command="${ant.home}/bin/ant -buildfile java/batch-execution-SPEC-jms2007/scripts/server-controller/server-commands.xml start"/>
+         command="${env.ANT_HOME}/bin/ant -buildfile java/batch-execution-SPEC-jms2007/scripts/server-controller/server-commands.xml start"/>
       
       <echo>Waiting ${server.startup.sleep.inMinutes} minutes to allow the server to startup.</echo>
       <!--sleep minutes="${server.startup.sleep.inMinutes}"/-->
@@ -80,7 +85,7 @@
       <sshexec host="${eap.server.host}"
          username="${eap.server.username}"
          password="${eap.server.password}"
-         command="ant -buildfile java/batch-execution-SPEC-jms2007/scripts/server-controller/server-commands.xml stop"/>
+         command="/usr/share/ant/v1.7.1/bin/ant -buildfile java/batch-execution-SPEC-jms2007/scripts/server-controller/server-commands.xml stop"/>
    </target>
    
    <target name="gather-configuration" depends="clean">