[jboss-cvs] JBossAS SVN: r107226 - in projects/jboss-jca/branches/performance: extensions and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 30 03:45:31 EDT 2010
Author: jeff.zhang
Date: 2010-07-30 03:45:30 -0400 (Fri, 30 Jul 2010)
New Revision: 107226
Modified:
projects/jboss-jca/branches/performance/build.xml
projects/jboss-jca/branches/performance/extensions/build.xml
projects/jboss-jca/branches/performance/servers/build.xml
Log:
[JBJCA-386] add download/unzip servers target, dir layout
Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/build.xml 2010-07-30 06:21:45 UTC (rev 107225)
+++ projects/jboss-jca/branches/performance/build.xml 2010-07-30 07:45:30 UTC (rev 107226)
@@ -39,7 +39,7 @@
<!-- =================================
Ivy
================================= -->
- <property name="ivy.version" value="2.1.0"/>
+ <property name="ivy.version" value="2.2.0-rc1"/>
<property name="ivy.dir" value="${user.home}/.ivy2/cache/org.apache.ivy/jars"/>
<property name="ivy.jar.name" value="ivy-${ivy.version}.jar"/>
@@ -165,6 +165,14 @@
</target>
<!-- =================================
+ Target: download-servers
+ ================================= -->
+ <target name="download-servers" depends="init">
+ <ant dir="servers" inheritRefs="true" target="download-servers"/>
+ <ant dir="servers" inheritRefs="true" target="unzip-servers"/>
+ </target>
+
+ <!-- =================================
Target: benchmark
================================= -->
<target name="benchmark" depends="jars">
Modified: projects/jboss-jca/branches/performance/extensions/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/extensions/build.xml 2010-07-30 06:21:45 UTC (rev 107225)
+++ projects/jboss-jca/branches/performance/extensions/build.xml 2010-07-30 07:45:30 UTC (rev 107226)
@@ -67,11 +67,16 @@
<attribute name="Implementation-Vendor-Id" value="org.jboss"/>
</manifest>
</jar>
+ </target>
+ <!-- =================================
+ Target: benchmark-prepare
+ ================================= -->
+ <target name="benchmark-prepare">
<copy todir="${jbjca.home}/config/bootstrap" overwrite="true">
<fileset dir="src/main/resources/" includes="stdio.xml"/>
<filterset>
- <filter token="JBJCA_DATA" value="${root.dir}/jbjca.txt"/>
+ <filter token="JBJCA_DATA" value="${root.dir}/runs/jbjca-daily/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 06:21:45 UTC (rev 107225)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-07-30 07:45:30 UTC (rev 107226)
@@ -27,6 +27,12 @@
<!-- =================================
Properties
================================= -->
+ <property name="jbossas.6.version" value="6.0.0.M4" />
+ <property name="jbossas.6.file" value="6.0.0.20100721-M4" />
+ <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="snapshot.location" value="${build.dir}/snapshots" />
<property name="jboss.profiler" value="jboss-profiler-2.0.0.Beta5" />
<property name="jboss.profiler.file" value="${build.dir}/${jboss.profiler}.zip" />
@@ -59,6 +65,66 @@
</target>
<!-- =================================
+ Target: download-servers
+ ================================= -->
+ <target name="download-servers">
+ <mkdir dir="${root.dir}/down"/>
+ <get src="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.6.version}/jboss-as-distribution-${jbossas.6.file}.zip/download"
+ dest="${root.dir}/down/jboss-${jbossas.6.version}.zip" skipexisting="true"/>
+ <get src="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.5.version}/jboss-${jbossas.5.version}.zip/download"
+ dest="${root.dir}/down/jboss-${jbossas.5.version}.zip" skipexisting="true"/>
+ <get src="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.4.version}/jboss-${jbossas.4.version}.zip/download"
+ dest="${root.dir}/down/jboss-${jbossas.4.version}.zip" skipexisting="true"/>
+
+ <get src="http://sourceforge.net/projects/jboss/files/IronJacamar/${ironjacamar.version}/ironjacamar-${ironjacamar.version}.zip/download"
+ dest="${root.dir}/down/ironjacamar-${ironjacamar.version}.zip" skipexisting="true"/>
+ </target>
+
+ <target name="exist-servers">
+ <available file="${root.dir}/servers/jbas-${jbossas.6.version}/jboss-${jbossas.6.file}/bin" type="dir" property="exist.as6" value="true"/>
+ <available file="${root.dir}/servers/jbas-${jbossas.5.version}/jboss-${jbossas.5.version}/bin" type="dir" property="exist.as5" value="true"/>
+ <available file="${root.dir}/servers/jbas-${jbossas.4.version}/jboss-${jbossas.4.version}/bin" type="dir" property="exist.as4" value="true"/>
+
+ <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"/>
+ </target>
+
+ <target name="unzip-as6" depends="exist-servers" unless="exist.as6">
+ <unzip src="${root.dir}/down/jboss-${jbossas.6.version}.zip" dest="${root.dir}/servers/jbas-${jbossas.6.version}"/>
+ </target>
+
+ <target name="unzip-as5" depends="exist-servers" unless="exist.as5">
+ <unzip src="${root.dir}/down/jboss-${jbossas.5.version}.zip" dest="${root.dir}/servers/jbas-${jbossas.5.version}"/>
+ </target>
+
+ <target name="unzip-as4" depends="exist-servers" unless="exist.as4">
+ <unzip src="${root.dir}/down/jboss-${jbossas.4.version}.zip" dest="${root.dir}/servers/jbas-${jbossas.4.version}"/>
+ </target>
+
+ <target name="unzip-jbjca" depends="exist-servers" unless="exist.jca.1">
+ <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"/>
+ <copy todir="${root.dir}/servers/jbjca-daily/ironjacamar-daily">
+ <fileset dir="${root.dir}/../../../trunk/target/sjc"/>
+ </copy>
+ </target>
+
+ <target name="unzip-servers">
+ <mkdir dir="${root.dir}/servers"/>
+
+ <antcall target="unzip-as6"/>
+ <antcall target="unzip-as5"/>
+ <antcall target="unzip-as4"/>
+
+ <antcall target="unzip-jbjca"/>
+ <antcall target="copy-jbjca-daily"/>
+ </target>
+
+ <!-- =================================
Target: profiler check
================================= -->
<target name="profiler-check">
@@ -301,7 +367,31 @@
<!-- =================================
Target: benchmark
================================= -->
- <target name="benchmark" depends="os-check, profiler-prepare">
+ <target name="benchmark-prepare">
+ <copy todir="${jbjca.home}/lib/profiler">
+ <fileset dir="${lib.dir}/sjc" includes="fungal*.jar"/>
+ </copy>
+
+ <copy todir="${root.dir}/configuration/jbjca-daily">
+ <fileset dir="src/main/resources" includes="run_number.properties"/>
+ </copy>
+ <copy todir="${jbjca.home}/bin" overwrite="true">
+ <fileset dir="src/main/resources/jbjca" includes="shutdown*.sh"/>
+ <fileset dir="src/main/resources/jbjca" includes="shutdown*.bat"/>
+ </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">
+
+
<echo message="Starting server..."/>
<exec dir="${jbjca.home}/bin" executable="${exec}" spawn="true">
<arg line="run.${ext}"/>
@@ -330,4 +420,13 @@
</target>
+ <target name="benchmark" depends="os-check">
+ <antcall target="benchmark-prepare">
+ <param name="jbjca.home" value="${root.dir}/servers/jbjca-daily/ironjacamar-daily"/>
+ </antcall>
+ <antcall target="doBenchmark">
+ <param name="jbjca.home" value="${root.dir}/servers/jbjca-daily/ironjacamar-daily"/>
+ </antcall>
+ </target>
+
</project>
More information about the jboss-cvs-commits
mailing list