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

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

Author: whitingjr
Date: 2010-07-09 06:57:17 -0400 (Fri, 09 Jul 2010)
New Revision: 33794

Modified:
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
Log:
Changed directory, fixed validation of the files.

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-09 10:51:03 UTC (rev 33793)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-09 10:57:17 UTC (rev 33794)
@@ -36,12 +36,12 @@
       <includesfile name="verbose-gc-stats.txt"/>
    </fileset>
    
-   <fileset id="collected-log-files" dir="${spec.install.dir}/output/${org.spec.internal.runId}">
+   <!--fileset id="collected-log-files" dir="${spec.install.dir}/output/${org.spec.internal.runId}">
       <includesfile name="run.conf"/>
       <includesfile name="jstat-hornetq.txt"/>
       <includesfile name="verbose-gc.txt"/>
       <includesfile name="verbose-gc-stats.txt"/>
-   </fileset>
+   </fileset-->
 
    <target name="clean">
       <echo>Removing prior run collected data.</echo>
@@ -118,16 +118,14 @@
    
    <target name="verify-log-collection">
       <echo>Verifying all the collected files are present.</echo>
-      <available property="log-collection.isValid">
-         <condition>
-            <and>
-               <available file="${spec.install.dir}/output/${org.spec.internal.runId}/run.conf"/>
-               <available file="${spec.install.dir}/output/${org.spec.internal.runId}/jstat-hornetq.txt"/>
-               <available file="${spec.install.dir}/output/${org.spec.internal.runId}/verbose-gc.txt"/>
-               <available file="${spec.install.dir}/output/${org.spec.internal.runId}/verbose-gc-stats.txt"/>
-            </and>
-         </condition>
-      </available>
+      <condition property="log-collection.isValid">
+         <and>
+            <available file="${spec.install.dir}/output/${org.spec.internal.runId}/run.conf"/>
+            <available file="${spec.install.dir}/output/${org.spec.internal.runId}/jstat-hornetq.txt"/>
+            <available file="${spec.install.dir}/output/${org.spec.internal.runId}/verbose-gc.txt"/>
+            <available file="${spec.install.dir}/output/${org.spec.internal.runId}/verbose-gc-stats.txt"/>
+         </and>
+      </condition>
       <echo>Status of check is: ${log-collection.isValid}</echo>
    </target>