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

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

Author: jeff.zhang
Date: 2010-08-04 03:03:09 -0400 (Wed, 04 Aug 2010)
New Revision: 107368

Modified:
   projects/jboss-jca/branches/performance/build.xml
   projects/jboss-jca/branches/performance/servers/build.xml
Log:
[JBJCA-386] make jbjca daily can run alone and doesn't fail the ant build if sjc kit directory not right

Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/build.xml	2010-08-04 06:28:37 UTC (rev 107367)
+++ projects/jboss-jca/branches/performance/build.xml	2010-08-04 07:03:09 UTC (rev 107368)
@@ -179,12 +179,20 @@
     <ant dir="servers" inheritRefs="true" target="benchmark"/>
   </target>
 
+  <target name="benchmark-daily" depends="jars">
+    <ant dir="servers" inheritRefs="true" target="benchmark-daily"/>
+  </target>
+
   <!-- ================================= 
        Target: profiler
        ================================= -->
   <target name="profiler" depends="jars">
     <ant dir="servers" inheritRefs="true" target="profiler"/>
   </target>
+
+  <target name="profiler-daily" depends="jars">
+    <ant dir="servers" inheritRefs="true" target="profiler-daily"/>
+  </target>
   
   <!-- ================================= 
        Target: regression

Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml	2010-08-04 06:28:37 UTC (rev 107367)
+++ projects/jboss-jca/branches/performance/servers/build.xml	2010-08-04 07:03:09 UTC (rev 107368)
@@ -34,6 +34,8 @@
   <property name="ironjacamar.version" value="1.0.0.Beta1" />
   <property name="ironjacamar.daily" value="daily" />
 
+  <property name="ironjacamar.sjc" value="${root.dir}/../../../trunk/target/sjc" />
+
   <property name="jboss.profiler" value="jboss-profiler-2.0.0.Beta5" />
   <property name="jboss.profiler.file" value="${build.dir}/${jboss.profiler}.zip" />
 
@@ -84,6 +86,7 @@
 
     <available file="${root.dir}/servers/jbjca-${ironjacamar.version}/ironjacamar-${ironjacamar.version}/bin" type="dir" property="exist.jca.1" value="true"/>
     <available file="${root.dir}/servers/jbjca-daily/ironjacamar-daily/bin" type="dir" property="exist.jca.d" value="true"/>
+    <available file="${ironjacamar.sjc}/bin" type="dir" property="exist.jca.sjc" value="true"/>
   </target>
 
   <target name="unzip-as6" depends="exist-servers" unless="exist.as6">
@@ -102,9 +105,7 @@
     <unzip src="${root.dir}/down/ironjacamar-${ironjacamar.version}.zip" dest="${root.dir}/servers/jbjca-${ironjacamar.version}"/>
   </target>
 
-  <target name="copy-jbjca-daily" depends="exist-servers" unless="exist.jca.d">
-    <available file="${root.dir}/../../../trunk/target/sjc/bin" type="dir" property="exist.jca.sjc" value="true"/>
-    <fail message="Please tell me sjc directory by -Dironjacamar.daily= " unless="exist.jca.sjc"/>
+  <target name="copy-jbjca-daily" depends="exist-servers" unless="exist.jca.d" if="exist.jca.sjc">
     <copy todir="${root.dir}/servers/jbjca-daily/ironjacamar-daily">
       <fileset dir="${root.dir}/../../../trunk/target/sjc"/>
     </copy>
@@ -295,9 +296,7 @@
        ================================= -->
   <target name="profiler" depends="os-check">
 
-    <antcall target="profiler-jbjca">
-      <param name="jbjca.kit" value="${ironjacamar.daily}"/>
-    </antcall>
+    <antcall target="profiler-daily"/>
 
     <antcall target="profiler-jbjca">
       <param name="jbjca.kit" value="${ironjacamar.version}"/>
@@ -313,6 +312,12 @@
 
   </target>
 
+  <target name="profiler-daily" depends="os-check, exist-servers" if="exist.jca.d">
+    <antcall target="profiler-jbjca">
+      <param name="jbjca.kit" value="${ironjacamar.daily}"/>
+    </antcall>
+  </target>
+
   <target name="doProfiler">
     <echo message="Start Profiler"/>
     <startprofiler/>
@@ -557,9 +562,7 @@
 
   <target name="benchmark" depends="os-check">
 
-    <antcall target="doBenchmark-jbjca">
-      <param name="jbjca.kit" value="${ironjacamar.daily}"/>
-    </antcall>
+    <antcall target="benchmark-daily"/>
 
     <antcall target="doBenchmark-jbjca">
       <param name="jbjca.kit" value="${ironjacamar.version}"/>
@@ -582,4 +585,10 @@
 -->
   </target>
 
+  <target name="benchmark-daily" depends="os-check, exist-servers" if="exist.jca.d">
+    <antcall target="doBenchmark-jbjca">
+      <param name="jbjca.kit" value="${ironjacamar.daily}"/>
+    </antcall>
+  </target>
+
 </project>