[jboss-cvs] CacheBenchFwk ...
Manik Surtani
manik at jboss.org
Thu May 17 03:37:44 EDT 2007
User: msurtani
Date: 07/05/17 03:37:44
Modified: CacheBenchFwk build.xml
Log:
Many changes
Revision Changes Path
1.3 +70 -95 CacheBenchFwk/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/CacheBenchFwk/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- build.xml 16 May 2007 16:59:08 -0000 1.2
+++ build.xml 17 May 2007 07:37:44 -0000 1.3
@@ -100,6 +100,17 @@
output file for reports.
3) '/conf/log4j.xml' for logging settings (make sure these aren't
very verbose as it can skew tests).
+ 4) Provided one of the plugins as a system property. This is
+ necessary since at the moment plugin libs may overlap and
+ cause problems, so are not loaded every time. Specify which
+ plugin you plan to use in your test by using
+
+ -Dorg.cachebench.plugins.jbosscache1=true
+ -Dorg.cachebench.plugins.jbosscache2=true
+ -Dorg.cachebench.pluins.ehcache=true
+ -Dorg.cachebench.plugins.terracotta=true
+
+ when running ant. Note that only one can be set at any time.
</echo>
</target>
@@ -132,7 +143,7 @@
</target>
- <!-- Module EHCache124-plugin -->
+ <!-- Module ehcache-1.2.4 -->
<dirname property="module.ehcache124-plugin.basedir" file="${ant.file}"/>
@@ -140,24 +151,19 @@
<property name="compiler.args.ehcache124-plugin" value="${compiler.args}"/>
- <property name="ehcache124-plugin.output.dir" value="${module.ehcache124-plugin.basedir}/classes/production/EHCache124-plugin"/>
- <property name="ehcache124-plugin.testoutput.dir" value="${module.ehcache124-plugin.basedir}/classes/test/EHCache124-plugin"/>
+ <property name="ehcache124-plugin.output.dir" value="${module.ehcache124-plugin.basedir}/classes/production/ehcache-1.2.4"/>
+ <property name="ehcache124-plugin.testoutput.dir" value="${module.ehcache124-plugin.basedir}/classes/test/ehcache-1.2.4"/>
<path id="ehcache124-plugin.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
</path>
<path id="ehcache124-plugin.module.classpath">
- <pathelement location="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/lib/ehcache.jar"/>
+ <fileset dir="${module.jbosscache200-plugin.basedir}/cache-products/ehcache-1.2.4/lib" includes="*.jar" />
<pathelement location="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/conf"/>
<pathelement location="${framework.output.dir}"/>
<pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${module.ehcache124-plugin.basedir}/lib/commons-logging.jar"/>
- <pathelement location="${module.ehcache124-plugin.basedir}/lib/log4j.jar"/>
- <pathelement location="${module.ehcache124-plugin.basedir}/lib/commons-digester.jar"/>
- <pathelement location="${module.ehcache124-plugin.basedir}/lib/commons-beanutils.jar"/>
- <pathelement location="${module.ehcache124-plugin.basedir}/lib/commons-math-1.0.jar"/>
- <pathelement location="${module.ehcache124-plugin.basedir}/conf"/>
+ <pathelement location="${ehcache124-plugin.output.dir}" />
</path>
@@ -176,9 +182,9 @@
</path>
- <target name="compile.module.ehcache124-plugin" depends="compile.module.ehcache124-plugin.production,compile.module.ehcache124-plugin.tests" description="Compile module EHCache124-plugin"/>
+ <target name="compile.module.ehcache124-plugin" depends="compile.module.ehcache124-plugin.production,compile.module.ehcache124-plugin.tests" description="Compile module ehcache-1.2.4"/>
- <target name="compile.module.ehcache124-plugin.production" depends="compile.module.framework" description="Compile module EHCache124-plugin; production classes">
+ <target name="compile.module.ehcache124-plugin.production" depends="compile.module.framework" description="Compile module ehcache-1.2.4; production classes">
<mkdir dir="${ehcache124-plugin.output.dir}"/>
<javac destdir="${ehcache124-plugin.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
<compilerarg line="${compiler.args.ehcache124-plugin}"/>
@@ -196,7 +202,7 @@
</copy>
</target>
- <target name="compile.module.ehcache124-plugin.tests" depends="compile.module.ehcache124-plugin.production" description="compile module EHCache124-plugin; test classes" unless="skip.tests"/>
+ <target name="compile.module.ehcache124-plugin.tests" depends="compile.module.ehcache124-plugin.production" description="compile module ehcache-1.2.4; test classes" unless="skip.tests"/>
<target name="clean.module.ehcache124-plugin" description="cleanup module">
<delete dir="${ehcache124-plugin.output.dir}"/>
@@ -204,7 +210,7 @@
</target>
- <!-- Module terracotta230-plugin -->
+ <!-- Module terracotta-2.3.0 -->
<dirname property="module.terracotta-plugin.basedir" file="${ant.file}"/>
@@ -212,8 +218,8 @@
<property name="compiler.args.terracotta-plugin" value="${compiler.args}"/>
- <property name="terracotta-plugin.output.dir" value="${module.terracotta-plugin.basedir}/classes/production/terracotta230-plugin"/>
- <property name="terracotta-plugin.testoutput.dir" value="${module.terracotta-plugin.basedir}/classes/test/terracotta230-plugin"/>
+ <property name="terracotta-plugin.output.dir" value="${module.terracotta-plugin.basedir}/classes/production/terracotta-2.3.0"/>
+ <property name="terracotta-plugin.testoutput.dir" value="${module.terracotta-plugin.basedir}/classes/test/terracotta-2.3.0"/>
<path id="terracotta-plugin.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
@@ -224,6 +230,7 @@
<pathelement location="${framework.output.dir}"/>
<pathelement location="${framework.testoutput.dir}"/>
<fileset dir="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.3.0/lib" includes="*.jar" />
+ <pathelement location="${terracotta-plugin.output.dir}" />
</path>
@@ -242,9 +249,9 @@
</path>
- <target name="compile.module.terracotta-plugin" depends="compile.module.terracotta-plugin.production,compile.module.terracotta-plugin.tests" description="Compile module terracotta230-plugin"/>
+ <target name="compile.module.terracotta-plugin" depends="compile.module.terracotta-plugin.production,compile.module.terracotta-plugin.tests" description="Compile module terracotta-2.3.0"/>
- <target name="compile.module.terracotta-plugin.production" depends="compile.module.framework" description="Compile module terracotta230-plugin; production classes">
+ <target name="compile.module.terracotta-plugin.production" depends="compile.module.framework" description="Compile module terracotta-2.3.0; production classes">
<mkdir dir="${terracotta-plugin.output.dir}"/>
<javac destdir="${terracotta-plugin.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
<compilerarg line="${compiler.args.terracotta-plugin}"/>
@@ -262,7 +269,7 @@
</copy>
</target>
- <target name="compile.module.terracotta-plugin.tests" depends="compile.module.terracotta-plugin.production" description="compile module terracotta230-plugin; test classes" unless="skip.tests"/>
+ <target name="compile.module.terracotta-plugin.tests" depends="compile.module.terracotta-plugin.production" description="compile module terracotta-2.3.0; test classes" unless="skip.tests"/>
<target name="clean.module.terracotta-plugin" description="cleanup module">
<delete dir="${terracotta-plugin.output.dir}"/>
@@ -270,7 +277,7 @@
</target>
- <!-- Module JBossCache140-plugin -->
+ <!-- Module jbosscache-1.4.1 -->
<dirname property="module.jbosscache140-plugin.basedir" file="${ant.file}"/>
@@ -278,34 +285,19 @@
<property name="compiler.args.jbosscache140-plugin" value="${compiler.args}"/>
- <property name="jbosscache140-plugin.output.dir" value="${module.jbosscache140-plugin.basedir}/classes/production/JBossCache140-plugin"/>
- <property name="jbosscache140-plugin.testoutput.dir" value="${module.jbosscache140-plugin.basedir}/classes/test/JBossCache140-plugin"/>
+ <property name="jbosscache140-plugin.output.dir" value="${module.jbosscache140-plugin.basedir}/classes/production/jbosscache-1.4.1"/>
+ <property name="jbosscache140-plugin.testoutput.dir" value="${module.jbosscache140-plugin.basedir}/classes/test/jbosscache-1.4.1"/>
<path id="jbosscache140-plugin.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
</path>
<path id="jbosscache140-plugin.module.classpath">
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/jboss-minimal.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/jgroups.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/jboss-common.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/jboss-cache.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/concurrent.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/jboss-jmx.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/jboss-system.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/jboss-aop.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/jboss-j2ee.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/trove.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib/jboss-serialization.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/conf"/>
+ <fileset dir="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib" includes="**/*.jar" />
<pathelement location="${framework.output.dir}"/>
<pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/lib/commons-logging.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/lib/log4j.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/lib/commons-digester.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/lib/commons-beanutils.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/lib/commons-math-1.0.jar"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/conf"/>
+ <pathelement location="${jbosscache140-plugin.output.dir}" />
+ <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/conf" />
</path>
@@ -324,9 +316,9 @@
</path>
- <target name="compile.module.jbosscache140-plugin" depends="compile.module.jbosscache140-plugin.production,compile.module.jbosscache140-plugin.tests" description="Compile module JBossCache140-plugin"/>
+ <target name="compile.module.jbosscache140-plugin" depends="compile.module.jbosscache140-plugin.production,compile.module.jbosscache140-plugin.tests" description="Compile module jbosscache-1.4.1"/>
- <target name="compile.module.jbosscache140-plugin.production" depends="compile.module.framework" description="Compile module JBossCache140-plugin; production classes">
+ <target name="compile.module.jbosscache140-plugin.production" depends="compile.module.framework" description="Compile module jbosscache-1.4.1; production classes">
<mkdir dir="${jbosscache140-plugin.output.dir}"/>
<javac destdir="${jbosscache140-plugin.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
<compilerarg line="${compiler.args.jbosscache140-plugin}"/>
@@ -344,7 +336,7 @@
</copy>
</target>
- <target name="compile.module.jbosscache140-plugin.tests" depends="compile.module.jbosscache140-plugin.production" description="compile module JBossCache140-plugin; test classes" unless="skip.tests"/>
+ <target name="compile.module.jbosscache140-plugin.tests" depends="compile.module.jbosscache140-plugin.production" description="compile module jbosscache-1.4.1; test classes" unless="skip.tests"/>
<target name="clean.module.jbosscache140-plugin" description="cleanup module">
<delete dir="${jbosscache140-plugin.output.dir}"/>
@@ -352,7 +344,7 @@
</target>
- <!-- Module JBossCache200-plugin -->
+ <!-- Module jbosscache-2.0.0 -->
<dirname property="module.jbosscache200-plugin.basedir" file="${ant.file}"/>
@@ -360,30 +352,19 @@
<property name="compiler.args.jbosscache200-plugin" value="${compiler.args}"/>
- <property name="jbosscache200-plugin.output.dir" value="${module.jbosscache200-plugin.basedir}/classes/production/JBossCache200-plugin"/>
- <property name="jbosscache200-plugin.testoutput.dir" value="${module.jbosscache200-plugin.basedir}/classes/test/JBossCache200-plugin"/>
+ <property name="jbosscache200-plugin.output.dir" value="${module.jbosscache200-plugin.basedir}/classes/production/jbosscache-2.0.0"/>
+ <property name="jbosscache200-plugin.testoutput.dir" value="${module.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/>
<path id="jbosscache200-plugin.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
</path>
<path id="jbosscache200-plugin.module.classpath">
- <pathelement location="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/lib/jboss-serialization.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/lib/jcip-annotations.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/lib/trove.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/lib/jboss-common-core.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/lib/jbosscache.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/lib/jgroups.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/lib/jboss-j2ee.jar"/>
+ <fileset dir="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/lib" includes="*.jar" />
<pathelement location="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/conf"/>
<pathelement location="${framework.output.dir}"/>
<pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/lib/commons-logging.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/lib/log4j.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/lib/commons-digester.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/lib/commons-beanutils.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/lib/commons-math-1.0.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/conf"/>
+ <pathelement location="${jbosscache200-plugin.output.dir}" />
</path>
@@ -402,9 +383,9 @@
</path>
- <target name="compile.module.jbosscache200-plugin" depends="compile.module.jbosscache200-plugin.production,compile.module.jbosscache200-plugin.tests" description="Compile module JBossCache200-plugin"/>
+ <target name="compile.module.jbosscache200-plugin" depends="compile.module.jbosscache200-plugin.production,compile.module.jbosscache200-plugin.tests" description="Compile module jbosscache-2.0.0"/>
- <target name="compile.module.jbosscache200-plugin.production" depends="compile.module.framework" description="Compile module JBossCache200-plugin; production classes">
+ <target name="compile.module.jbosscache200-plugin.production" depends="compile.module.framework" description="Compile module jbosscache-2.0.0; production classes">
<mkdir dir="${jbosscache200-plugin.output.dir}"/>
<javac destdir="${jbosscache200-plugin.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
<compilerarg line="${compiler.args.jbosscache200-plugin}"/>
@@ -422,7 +403,7 @@
</copy>
</target>
- <target name="compile.module.jbosscache200-plugin.tests" depends="compile.module.jbosscache200-plugin.production" description="compile module JBossCache200-plugin; test classes" unless="skip.tests"/>
+ <target name="compile.module.jbosscache200-plugin.tests" depends="compile.module.jbosscache200-plugin.production" description="compile module jbosscache-2.0.0; test classes" unless="skip.tests"/>
<target name="clean.module.jbosscache200-plugin" description="cleanup module">
<delete dir="${jbosscache200-plugin.output.dir}"/>
@@ -437,7 +418,24 @@
<target name="all" depends="init, clean, compile.module.framework, compile.module.ehcache124-plugin, compile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin" description="build all"/>
- <target name="run">
+ <target name="setJBossCache140PluginCPRef" if="org.cachebench.plugins.jbosscache1" description="Sets the classpath ref for this plugin only if enabled via system property">
+ <property name="plugin.classpath.ref" value="jbosscache140-plugin.module.classpath" />
+ </target>
+
+ <target name="setJBossCache200PluginCPRef" if="org.cachebench.plugins.jbosscache2" description="Sets the classpath ref for this plugin only if enabled via system property">
+ <property name="plugin.classpath.ref" value="jbosscache200-plugin.module.classpath" />
+ </target>
+
+ <target name="setEHCache124PluginCPRef" if="org.cachebench.plugins.ehcache" description="Sets the classpath ref for this plugin only if enabled via system property">
+ <property name="plugin.classpath.ref" value="ehcache124-plugin.module.classpath" />
+ </target>
+
+ <target name="setTerracotta230PluginCPRef" if="org.cachebench.plugins.terracotta" description="Sets the classpath ref for this plugin only if enabled via system property">
+ <property name="plugin.classpath.ref" value="terracotta-plugin.module.classpath" />
+ </target>
+
+
+ <target name="run" depends="setJBossCache140PluginCPRef, setJBossCache200PluginCPRef, setEHCache124PluginCPRef, setTerracotta230PluginCPRef">
<!-- the classpaths here are a bit arse - you need to MANUALLY specify which plugins to add to the classpath
to prevent JBoss Cache 1.x and 2.x tripping over each other. -->
@@ -448,48 +446,25 @@
org.cachebench.plugins.terracotta
to be set to true if they need to be added to the classpath of the test. -->
- <echo>Running class ${runtime.classname}</echo>
+ <echo>Running class ${runtime.classname} with classpath ref ${plugin.classpath.ref}</echo>
+
<java classname="${runtime.classname}" fork="${jvm.fork}" maxmemory="${jvm.maxmem}">
<sysproperty key="bind.address" value="${bind.address}" />
<sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
<classpath refid="framework.module.classpath" />
- <classpath location="${framework.output.dir}" />
-
- <!-- how can we add these *optionally*? :S -->
-
- <!-- JBoss Cache 1.x plugin -->
- <classpath refid="jbosscache140-plugin.module.classpath"/>
- <classpath location="${jbosscache140-plugin.output.dir}"/>
-
- <!-- JBoss Cache 2.x plugin -->
- <!--<classpath refid="jbosscache200-plugin.module.classpath"/>-->
- <!--<classpath location="${jbosscache200-plugin.output.dir}"/>-->
-
- <!-- EHCache 1.2.x plugin -->
- <!--<classpath refid="ehcache124-plugin.module.classpath"/>-->
- <!--<classpath location="${ehcache124-plugin.output.dir}"/>-->
-
- <!-- Terracotta 2.3.x plugin -->
- <!--<classpath refid="terracotta-plugin.module.classpath"/>-->
- <!--<classpath location="${terracotta-plugin.output.dir}"/>-->
-
-
+ <classpath refid="${plugin.classpath.ref}"/>
</java>
</target>
- <target name="addToCP" if="jbc">
-
- </target>
-
<target name="runSlave">
<antcall target="run">
- <param name="runtime.classname" value="org.cachebench.CacheBenchMarkerSlave" />
+ <param name="runtime.classname" value="org.cachebench.CacheBenchmarkSlave" />
</antcall>
</target>
<target name="runMaster">
<antcall target="run">
- <param name="runtime.classname" value="org.cachebench.CacheBenchMarker" />
+ <param name="runtime.classname" value="org.cachebench.CacheBenchmarkRunner" />
</antcall>
</target>
More information about the jboss-cvs-commits
mailing list