[jboss-cvs] JBossAS SVN: r107228 - in projects/jboss-jca/branches/performance: servers and 1 other directory.

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

Author: jeff.zhang
Date: 2010-07-30 05:57:29 -0400 (Fri, 30 Jul 2010)
New Revision: 107228

Modified:
   projects/jboss-jca/branches/performance/extensions/build.xml
   projects/jboss-jca/branches/performance/servers/build.xml
Log:
[JBJCA-386] do benchmark on 2 jbjca server

Modified: projects/jboss-jca/branches/performance/extensions/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/extensions/build.xml	2010-07-30 09:55:06 UTC (rev 107227)
+++ projects/jboss-jca/branches/performance/extensions/build.xml	2010-07-30 09:57:29 UTC (rev 107228)
@@ -76,7 +76,7 @@
     <copy todir="${jbjca.home}/config/bootstrap" overwrite="true">
       <fileset dir="src/main/resources/" includes="stdio.xml"/>
           <filterset>
-          	<filter token="JBJCA_DATA" value="${root.dir}/runs/jbjca-daily/raw/${run.number}/data.txt"/>
+          	<filter token="JBJCA_DATA" value="${root.dir}/runs/${jbjca.version}/raw/${run.number}/data.txt"/>
           </filterset>
     </copy>
     <copy todir="${jbjca.home}/lib" overwrite="true">

Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml	2010-07-30 09:55:06 UTC (rev 107227)
+++ projects/jboss-jca/branches/performance/servers/build.xml	2010-07-30 09:57:29 UTC (rev 107228)
@@ -32,6 +32,7 @@
   <property name="jbossas.5.version" value="5.1.0.GA" />
   <property name="jbossas.4.version" value="4.2.3.GA" />
   <property name="ironjacamar.version" value="1.0.0.Beta1" />
+  <property name="ironjacamar.daily" value="daily" />
 
   <property name="snapshot.location" value="${build.dir}/snapshots" />
   <property name="jboss.profiler" value="jboss-profiler-2.0.0.Beta5" />
@@ -372,7 +373,7 @@
       <fileset dir="${lib.dir}/sjc" includes="fungal*.jar"/>
     </copy>
 
-    <copy todir="${root.dir}/configuration/jbjca-daily">
+    <copy todir="${root.dir}/configuration/${jbjca.version}">
       <fileset dir="src/main/resources" includes="run_number.properties"/>
     </copy>
     <copy todir="${jbjca.home}/bin" overwrite="true">
@@ -381,16 +382,19 @@
     </copy>
     <chmod file="${jbjca.home}/bin/*_profiler.sh" perm="775"/>
 
-    <propertyfile file="${root.dir}/configuration/jbjca-daily/run_number.properties">
-       <entry key="run.number" type="int" operation="+" value="1"/>
-    </propertyfile>
-    <property file="${root.dir}/configuration/jbjca-daily/run_number.properties"/>
-    <mkdir dir="${root.dir}/runs/jbjca-daily/raw/${run.number}"/>
-    <ant dir="../extensions" inheritRefs="true" target="benchmark-prepare"/>
   </target>
 
   <target name="doBenchmark">
+    <property name="jbjca.version" value="jbjca-${jbjca.kit}"/>
+    <property name="jbjca.home" value="${root.dir}/servers/${jbjca.version}/ironjacamar-${jbjca.kit}"/>
+    <antcall target="benchmark-prepare"/>
 
+    <propertyfile file="${root.dir}/configuration/${jbjca.version}/run_number.properties">
+       <entry key="run.number" type="int" operation="+" value="1"/>
+    </propertyfile>
+    <property file="${root.dir}/configuration/${jbjca.version}/run_number.properties"/>
+    <mkdir dir="${root.dir}/runs/${jbjca.version}/raw/${run.number}"/>
+    <ant dir="../extensions" inheritRefs="true" target="benchmark-prepare"/>
 
     <echo message="Starting server..."/>
     <exec dir="${jbjca.home}/bin" executable="${exec}" spawn="true">
@@ -421,11 +425,12 @@
   </target>
 
   <target name="benchmark" depends="os-check">
-    <antcall target="benchmark-prepare">
-      <param name="jbjca.home" value="${root.dir}/servers/jbjca-daily/ironjacamar-daily"/>
+    <antcall target="doBenchmark">
+      <param name="jbjca.kit" value="${ironjacamar.daily}"/>
     </antcall>
+
     <antcall target="doBenchmark">
-      <param name="jbjca.home" value="${root.dir}/servers/jbjca-daily/ironjacamar-daily"/>
+      <param name="jbjca.kit" value="${ironjacamar.version}"/>
     </antcall>
   </target>