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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun Jul 18 03:36:54 EDT 2010


Author: whitingjr
Date: 2010-07-18 03:36:53 -0400 (Sun, 18 Jul 2010)
New Revision: 33997

Modified:
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
Log:
Corrected file name.

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-07-18 06:55:02 UTC (rev 33996)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-18 07:36:53 UTC (rev 33997)
@@ -189,9 +189,9 @@
       
       <condition property="replacement.file.exists" else="false">
          <and>
-            <isset property="replacement.runconf.source.name"/>
-            <isset property="replacement.runconf.target.name"/>
-            <available file="${replacement.runconf.file}"/>
+            <isset property="replacement.file.source.name"/>
+            <isset property="replacement.file.target.name"/>
+            <available file="${replacement.file.source.name}"/>
          </and>
       </condition>
       
@@ -205,8 +205,8 @@
       <if>
          <equals arg1="true" arg2="${replacement.file.exists}"/>
          <then>
-            <echo>Replacing file ${replacement.runconf.file} </echo>
-            <scp localFile="${replacement.runconf.source.name}" remoteTofile="root at hornetq:${replacement.runconf.target.name}"  failonerror="true" password="${r_p}" />
+            <echo>Replacing file ${replacement.file.source.name} </echo>
+            <scp localFile="${replacement.file.source.name}" remoteTofile="root at hornetq:${replacement.file.target.name}"  failonerror="true" password="${r_p}" />
          </then>
          <else>
             <echo>No replacement of remote file.</echo>
@@ -273,7 +273,7 @@
    
    <target name="deploy-payload">
       <echo>Checking the payload directory [${payload.dir}] is present.</echo>
-      <condition property="payload.directory.isAvailable" else="false">
+      <condition property="payload.directory.isAvailable" else="false" value="true">
       	<and>
 	         <isset property="payload.dir"/>
 	         <available file="${payload.dir}"/>
@@ -287,55 +287,60 @@
       <if>
          <equals arg1="true" arg2="${payload.directory.isAvailable}"/>
          <then>
+            <echo>Deploying files.</echo>
             <touch>
                <fileset dir="${payload.dir}"/>
             </touch>
             
-            <condition property="payload.run-conf.isPresent" else="false">
+            <condition property="payload.run-conf.isPresent" else="false" value="true">
                <available file="${payload.dir}/run.conf"/>
             </condition>
             <if>
-               <equals arg1="true" arg2="payload.run-conf.isPresent"/>
+               <equals arg1="true" arg2="${payload.run-conf.isPresent}"/>
                <then>
-                  <antcall target="replace-remote-file">
-                     <param name="replacement.runconf.source.name" value= "${payload.dir}/run.conf"/>
-                     <param name="replacement.runconf.target.name" value= "${server.deployment.dir}/bin/run.conf"/>
+               <echo>Deploying run.conf</echo>
+                  <antcall target="substitute-remote-config">
+                     <param name="replacement.file.source.name" value= "${payload.dir}/run.conf"/>
+                     <param name="replacement.file.target.name" value= "${server.deployment.dir}/bin/run.conf"/>
                   </antcall>
                </then>
             </if>
                
-            <condition property="payload.libHornetQAIO64-so.isPresent" else="false">
+            <condition property="payload.libHornetQAIO64-so.isPresent" else="false" value="true">
                <available file="${payload.dir}/libHornetQAIO64.so"/>
             </condition>
             <if>
-               <equals arg1="true" arg2="payload.libHornetQAIO64-so.isPresent"/>
+               <equals arg1="true" arg2="${payload.libHornetQAIO64-so.isPresent}"/>
                <then>
-                  <antcall target="replace-remote-file">
-                     <param name="replacement.runconf.source.name" value= "${payload.dir}/libHornetQAIO64.so"/>
-                     <param name="replacement.runconf.target.name" value= "${server.deployment.dir}/native/lib64/libHornetQAIO64.so"/>
+                  <echo>Deploying libHornetQAIO64.so</echo>
+                  <antcall target="substitute-remote-config">
+                     <param name="replacement.file.source.name" value= "${payload.dir}/libHornetQAIO64.so"/>
+                     <param name="replacement.file.target.name" value= "${server.deployment.dir}/native/lib64/libHornetQAIO64.so"/>
                   </antcall>
                </then>
             </if>
             
-            <condition property="payload.build-command-properties.isPresent" else="false">
-               <available file="${payload.dir}/build-command.properties"/>
+            <condition property="payload.build-commands-properties.isPresent" else="false" value="true">
+               <available file="${payload.dir}/build-commands.properties"/>
             </condition>
             <if>
-               <equals arg1="true" arg2="payload.build-command-properties.isPresent"/>
+               <equals arg1="true" arg2="${payload.build-commands-properties.isPresent}"/>
                <then>
+                  <echo>Deploying build-commands.properties</echo>
                   <antcall target="substitute-local-config">
-                     <param name="replacement.file.source.name" value= "${payload.dir}/build-command.properties"/>
-                     <param name="replacement.file.target.name" value= "/root/java/batch-execution-SPEC-jms2007/scripts/build-command.properties"/>
+                     <param name="replacement.file.source.name" value= "${payload.dir}/build-commands.properties"/>
+                     <param name="replacement.file.target.name" value= "/root/java/batch-execution-SPEC-jms2007/scripts/build-commands.properties"/>
                   </antcall>
                </then>
             </if>
 
-            <condition property="payload.run-properties.isPresent" else="false">
+            <condition property="payload.run-properties.isPresent" else="false" value="true">
                <available file="${payload.dir}/run.properties"/>
             </condition>
             <if>
-               <equals arg1="true" arg2="payload.run-properties.isPresent"/>
+               <equals arg1="true" arg2="${payload.run-properties.isPresent}"/>
                <then>
+                  <echo>Deploying run.properties</echo>
                   <antcall target="substitute-local-config">
                      <param name="replacement.file.source.name" value= "${payload.dir}/run.properties"/>
                      <param name="replacement.file.target.name" value= "${spec.install.dir}/config/run.properties"/>
@@ -343,12 +348,13 @@
                </then>
             </if>
                      
-            <condition property="payload.horizontal-properties.isPresent" else="false">
+            <condition property="payload.horizontal-properties.isPresent" else="false" value="true">
                <available file="${payload.dir}/horizontal.properties"/>
             </condition>
             <if>
-               <equals arg1="true" arg2="payload.horizontal-properties.isPresent"/>
+               <equals arg1="true" arg2="${payload.horizontal-properties.isPresent}"/>
                <then>
+                  <echo>Deploying horizontal.properties</echo>
                   <antcall target="substitute-local-config">
                      <param name="replacement.file.source.name" value= "${payload.dir}/horizontal.properties"/>
                      <param name="replacement.file.target.name" value= "${spec.install.dir}/config/horizontal.properties"/>
@@ -356,12 +362,13 @@
                </then>
             </if>
             
-            <condition property="payload.vertical-properties.isPresent" else="false">
+            <condition property="payload.vertical-properties.isPresent" else="false" value="true">
                <available file="${payload.dir}/vertical.properties"/>
             </condition>
             <if>
-               <equals arg1="true" arg2="payload.vertical-properties.isPresent"/>
+               <equals arg1="true" arg2="${payload.vertical-properties.isPresent}"/>
                <then>
+                  <echo>Deploying vertical.properties</echo>
                   <antcall target="substitute-local-config">
                      <param name="replacement.file.source.name" value= "${payload.dir}/vertical.properties"/>
                      <param name="replacement.file.target.name" value= "${spec.install.dir}/config/vertical.properties"/>



More information about the jboss-svn-commits mailing list