[jbosscache-commits] JBoss Cache SVN: r5091 - benchmarks/benchmark-fwk.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-01-08 15:29:49 -0500 (Tue, 08 Jan 2008)
New Revision: 5091

Modified:
   benchmarks/benchmark-fwk/build.xml
Log:



Modified: benchmarks/benchmark-fwk/build.xml
===================================================================
--- benchmarks/benchmark-fwk/build.xml	2008-01-08 20:15:40 UTC (rev 5090)
+++ benchmarks/benchmark-fwk/build.xml	2008-01-08 20:29:49 UTC (rev 5091)
@@ -147,12 +147,7 @@
   
   <target name="compile.module.framework.tests" depends="compile.module.framework.production" description="compile module Framework; test classes" unless="skip.tests"/>
   
-  <target name="clean.module.framework" description="cleanup module">
-    <delete dir="${framework.output.dir}"/>
-    <delete dir="${framework.testoutput.dir}"/>
-  </target>
-  
-  
+
   <!-- Module ehcache-1.2.4 -->
   
   <dirname property="module.ehcache124-plugin.basedir" file="${ant.file}"/>
@@ -214,13 +209,8 @@
   
   <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}"/>
-    <delete dir="${ehcache124-plugin.testoutput.dir}"/>
-  </target>
 
 
-
    <!-- Module coherence-3.2.2 -->
 
   <dirname property="module.coherence322-plugin.basedir" file="${ant.file}"/>
@@ -414,21 +404,17 @@
   
   <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}"/>
-    <delete dir="${jbosscache140-plugin.testoutput.dir}"/>
-  </target>
-  
-  
   <!-- Module jbosscache-2.0.0 -->
   
   <dirname property="module.jbosscache200-plugin.basedir" file="${ant.file}"/>
+  <dirname property="module.jbosscache210CR2-plugin.basedir" file="${ant.file}"/>
+
   
   
-  
   <property name="compiler.args.jbosscache200-plugin" value="${compiler.args}"/>
   
   <property name="jbosscache200-plugin.output.dir" value="${module.jbosscache200-plugin.basedir}/classes/production/jbosscache-2.0.0"/>
+  <property name="jbosscache210CR2-plugin.output.dir" value="${module.jbosscache210CR2-plugin.basedir}/classes/production/jbosscache-2.1.0CR2"/>
   <property name="jbosscache200-plugin.testoutput.dir" value="${module.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/>
   
   <path id="jbosscache200-plugin.module.bootclasspath">
@@ -438,10 +424,19 @@
   <path id="jbosscache200-plugin.module.classpath">
     <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="${module.framework.basedir}/lib/commons-logging.jar"/>
     <pathelement location="${framework.output.dir}"/>
     <pathelement location="${framework.testoutput.dir}"/>
     <pathelement location="${jbosscache200-plugin.output.dir}" />
   </path>
+
+  <path id="jbosscache210CR2-plugin.module.classpath">
+    <fileset dir="${module.jbosscache210CR2-plugin.basedir}/cache-products/jbosscache-2.1.0CR2/lib" includes="*.jar" />
+    <pathelement location="${module.framework.basedir}/lib/commons-logging.jar"/>
+    <pathelement location="${framework.output.dir}"/>
+    <pathelement location="${framework.testoutput.dir}"/>
+    <pathelement location="${jbosscache210CR2-plugin.output.dir}" />
+  </path>
   
   
   <patternset id="excluded.from.module.jbosscache200-plugin">
@@ -460,11 +455,11 @@
   
   
   <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 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}"/>
+      <compilerarg line="${compiler.args}"/>
       <bootclasspath refid="jbosscache200-plugin.module.bootclasspath"/>
       <classpath refid="jbosscache200-plugin.module.classpath"/>
       <src refid="jbosscache200-plugin.module.sourcepath"/>
@@ -478,21 +473,28 @@
       </fileset>
     </copy>
   </target>
-  
+
+  <target name="compile.module.jbosscache210CR2-plugin.production" depends="compile.module.framework" description="Compile module jbosscache-2.1.0CR2; production classes">
+    <mkdir dir="${jbosscache210CR2-plugin.output.dir}"/>
+    <javac destdir="${jbosscache210CR2-plugin.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
+      <compilerarg line="${compiler.args}"/>
+      <classpath refid="jbosscache210CR2-plugin.module.classpath"/>
+      <src path="${module.jbosscache210CR2-plugin.basedir}/cache-products/jbosscache-2.1.0CR2"/>
+    </javac>
+  </target>
+
   <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}"/>
-    <delete dir="${jbosscache200-plugin.testoutput.dir}"/>
-  </target>
-  
+
   <target name="init" description="Build initialization">
     <!-- Perform any build initialization in this target -->
   </target>
   
-  <target name="clean" depends="clean.module.framework, clean.module.ehcache124-plugin, clean.module.jbosscache140-plugin, clean.module.jbosscache200-plugin" description="cleanup all"/>
+  <target name="clean" description="cleanup all">
+     <delete dir="${module.framework.basedir}/classes"/>
+  </target>
   
-  <target name="all" depends="init, clean, compile.module.framework, compile.module.ehcache124-plugin, compile.module.coherence322-plugin,compile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.module.terracotta-plugin" description="build all"/>
+  <target name="all" depends="init, clean, compile.module.framework, compile.module.ehcache124-plugin, compile.module.coherence322-plugin,compile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.module.jbosscache210CR2-plugin.production, compile.module.terracotta-plugin" description="build all"/>
 
    <target name="checkClusterAddresses" depends="compile.module.framework.production"
            description="Check whether the cluster config is a valid one">