[jboss-svn-commits] JBL Code SVN: r31382 - labs/jbosstm/workspace/whitingjr/trunk/performance.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Feb 3 10:13:24 EST 2010


Author: whitingjr
Date: 2010-02-03 10:13:24 -0500 (Wed, 03 Feb 2010)
New Revision: 31382

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Added seconds to log directory.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-02-03 15:07:57 UTC (rev 31381)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-02-03 15:13:24 UTC (rev 31382)
@@ -119,10 +119,10 @@
 		<include name="*.xml" />
 		<include name="*.properties" />
 	</fileset>
-	
+
 	<fileset id="configuration.path.2" dir=".">
-      <include name="*.properties" />
-   </fileset>
+		<include name="*.properties" />
+	</fileset>
 
 
 	<taskdef resource="testngtasks" classpathref="test.classpath" />
@@ -265,21 +265,21 @@
 		</copy>
 
 		<condition property="db-vendor-profiling" value="${db-vendor-profiling.A}">
-			<equals arg1="${db-vendor-profiling.A}" arg2="${db-vendor-profiling.B}"/>
+			<equals arg1="${db-vendor-profiling.A}" arg2="${db-vendor-profiling.B}" />
 		</condition>
 		<condition property="db-vendor-profiling" value="${db-vendor-profiling.A},${db-vendor-profiling.B}">
 			<not>
-			   <equals arg1="${db-vendor-profiling.A}" arg2="${db-vendor-profiling.B}"/>
+				<equals arg1="${db-vendor-profiling.A}" arg2="${db-vendor-profiling.B}" />
 			</not>
-      </condition>
-      
-      <condition property="profiling-classes" value="${db-vendor-profiling},${profiling.classes.test.framework}">
-			<equals arg1="${profiled}" arg2="y"/>
 		</condition>
+
+		<condition property="profiling-classes" value="${db-vendor-profiling},${profiling.classes.test.framework}">
+			<equals arg1="${profiled}" arg2="y" />
+		</condition>
 		<condition property="profiling-classes" value="dummy">
-			<equals arg1="${profiled}" arg2="n"/>
-      </condition>
-      
+			<equals arg1="${profiled}" arg2="n" />
+		</condition>
+
 		<copy file="src/main/resources/profile-remote.properties" tofile="build/classes/profile.properties">
 			<filterchain>
 				<expandproperties />
@@ -365,16 +365,18 @@
 		<tstamp />
 		<echo message="db vendor package[${db-vendor-package.xpath}]">
 		</echo>
-		<property name="time-stamp" value="${TSTAMP}" />
-		
+
+		<tstamp>
+			<format property="time-stamp" pattern="kkmmss"  />
+		</tstamp>
 		<mkdir dir="logs/${DSTAMP}" />
 
 		<mkdir dir="logs/${DSTAMP}/${DSTAMP}-${time-stamp}" />
 		<mkdir dir="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/conf" />
 
 		<copy todir="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/conf">
-			<fileset refid="configuration.path.1"/>
-			<fileset refid="configuration.path.2"/>
+			<fileset refid="configuration.path.1" />
+			<fileset refid="configuration.path.2" />
 		</copy>
 
 		<xslt style="src/main/resources/xsl/analyseresults.xsl" in="logs/profiled/DATE-TIME-profile.xml" out="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${time-stamp}-profile-analysis-01.xml">
@@ -427,47 +429,55 @@
 
 	</target>
 	<target name="transform-switch-package">
-		<xslt style="src/main/resources/xsl/package-switch-compactor.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-raw.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-compacted.xml"></xslt>
- 	   <xslt style="src/main/resources/xsl/flatten-frames.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-compacted.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-flattened.xml"></xslt>
-		<xslt style="src/main/resources/xsl/sort-frames.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-flattened.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-sorted.xml"></xslt>
-		<xslt style="src/main/resources/xsl/distinct-classes.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-sorted.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-distinct.xml"></xslt>
-		<xslt style="src/main/resources/xsl/as-csv.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-distinct.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-csv.xml"></xslt>
+		<xslt style="src/main/resources/xsl/package-switch-compactor.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-raw.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-compacted.xml">
+		</xslt>
+		<xslt style="src/main/resources/xsl/flatten-frames.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-compacted.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-flattened.xml">
+		</xslt>
+		<xslt style="src/main/resources/xsl/sort-frames.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-flattened.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-sorted.xml">
+		</xslt>
+		<xslt style="src/main/resources/xsl/distinct-classes.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-sorted.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-distinct.xml">
+		</xslt>
+		<xslt style="src/main/resources/xsl/as-csv.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-distinct.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-csv.xml">
+		</xslt>
 	</target>
-	
+
 	<target name="distinct">
-      <xslt style="src/main/resources/xsl/sort-frames.xsl" in="logs/combined-test-framework-classes.xml" out="logs/combined-test-framework-classes-sorted.xml"></xslt>
-      <xslt style="src/main/resources/xsl/distinct-classes.xsl" in="logs/combined-test-framework-classes-sorted.xml" out="logs/combined-test-framework-classes-distinct.xml"></xslt>
-      <xslt style="src/main/resources/xsl/as-csv.xsl" in="logs/combined-test-framework-classes-distinct.xml" out="logs/combined-test-framework-classes.csv"></xslt>
-   </target>
-	
+		<xslt style="src/main/resources/xsl/sort-frames.xsl" in="logs/combined-test-framework-classes.xml" out="logs/combined-test-framework-classes-sorted.xml">
+		</xslt>
+		<xslt style="src/main/resources/xsl/distinct-classes.xsl" in="logs/combined-test-framework-classes-sorted.xml" out="logs/combined-test-framework-classes-distinct.xml">
+		</xslt>
+		<xslt style="src/main/resources/xsl/as-csv.xsl" in="logs/combined-test-framework-classes-distinct.xml" out="logs/combined-test-framework-classes.csv">
+		</xslt>
+	</target>
+
 	<target name="process-data">
 		<copy file="src/main/resources/xsl/merge-thread-results.xsl" tofile="logs/${date}/${datetime}/merge-thread-results.xsl">
-         <filterchain>
-            <expandproperties />
-         </filterchain>
-      </copy>
-      <xslt style="logs/${date}/${datetime}/merge-thread-results.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-01.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis-02.xml" />
+			<filterchain>
+				<expandproperties />
+			</filterchain>
+		</copy>
+		<xslt style="logs/${date}/${datetime}/merge-thread-results.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-01.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis-02.xml" />
 
-      <copy file="src/main/resources/xsl/average-results.xsl" tofile="logs/${date}/${datetime}/average-results.xsl">
-         <filterchain>
-            <expandproperties />
-         </filterchain>
-      </copy>
-      <xslt style="logs/${date}/${datetime}/average-results.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-02.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis-03.xml" />
+		<copy file="src/main/resources/xsl/average-results.xsl" tofile="logs/${date}/${datetime}/average-results.xsl">
+			<filterchain>
+				<expandproperties />
+			</filterchain>
+		</copy>
+		<xslt style="logs/${date}/${datetime}/average-results.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-02.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis-03.xml" />
 
-      <copy file="src/main/resources/xsl/agregate.xsl" tofile="logs/${date}/${datetime}/agregate.xsl">
-         <filterchain>
-            <expandproperties />
-         </filterchain>
-      </copy>
-      <xslt style="logs/${date}/${datetime}/agregate.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-03.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis-04.xml" />
+		<copy file="src/main/resources/xsl/agregate.xsl" tofile="logs/${date}/${datetime}/agregate.xsl">
+			<filterchain>
+				<expandproperties />
+			</filterchain>
+		</copy>
+		<xslt style="logs/${date}/${datetime}/agregate.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-03.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis-04.xml" />
 
-      <xslt style="src/main/resources/xsl/convert-xml-to-csv.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-04.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis.csv">
-         <param name="db-vendor-package.A" expression="${db-vendor-package.xpath.A}" />
-         <param name="db-vendor-package.B" expression="${db-vendor-package.xpath.B}" />
-      </xslt>
+		<xslt style="src/main/resources/xsl/convert-xml-to-csv.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-04.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis.csv">
+			<param name="db-vendor-package.A" expression="${db-vendor-package.xpath.A}" />
+			<param name="db-vendor-package.B" expression="${db-vendor-package.xpath.B}" />
+		</xslt>
 
-      <copy file="logs/profiled/DATE-TIME-profile.xml" tofile="logs/${date}/${datetime}/${DSTAMP}-${TSTAMP}-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-raw.xml" />
+		<copy file="logs/profiled/DATE-TIME-profile.xml" tofile="logs/${date}/${datetime}/${DSTAMP}-${TSTAMP}-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-raw.xml" />
 
 	</target>
 



More information about the jboss-svn-commits mailing list