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

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-05-07 07:16:34 -0400 (Wed, 07 May 2008)
New Revision: 5799

Modified:
   benchmarks/benchmark-fwk/trunk/build.xml
Log:
Updated EHCache version

Modified: benchmarks/benchmark-fwk/trunk/build.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/build.xml	2008-05-07 11:15:07 UTC (rev 5798)
+++ benchmarks/benchmark-fwk/trunk/build.xml	2008-05-07 11:16:34 UTC (rev 5799)
@@ -147,72 +147,72 @@
            description="compile module Framework; test classes" unless="skip.tests"/>
 
 
-   <!-- Module ehcache-1.2.4 -->
+   <!-- Module ehcache-1.4.1 -->
 
-   <dirname property="module.ehcache124-plugin.basedir" file="${ant.file}"/>
+   <dirname property="module.ehcache141-plugin.basedir" file="${ant.file}"/>
 
 
-   <property name="compiler.args.ehcache124-plugin" value="${compiler.args}"/>
+   <property name="compiler.args.ehcache141-plugin" value="${compiler.args}"/>
 
-   <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"/>
+   <property name="ehcache141-plugin.output.dir"
+             value="${module.ehcache141-plugin.basedir}/classes/production/ehcache-1.4.1"/>
+   <property name="ehcache141-plugin.testoutput.dir"
+             value="${module.ehcache141-plugin.basedir}/classes/test/ehcache-1.4.1"/>
 
-   <path id="ehcache124-plugin.module.bootclasspath">
+   <path id="ehcache141-plugin.module.bootclasspath">
       <!-- Paths to be included in compilation bootclasspath -->
    </path>
 
-   <path id="ehcache124-plugin.module.classpath">
-      <fileset dir="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/lib" includes="*.jar"/>
-      <pathelement location="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/conf"/>
+   <path id="ehcache141-plugin.module.classpath">
+      <fileset dir="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1/lib" includes="*.jar"/>
+      <pathelement location="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1/conf"/>
       <pathelement location="${framework.output.dir}"/>
       <pathelement location="${framework.testoutput.dir}"/>
-      <pathelement location="${ehcache124-plugin.output.dir}"/>
+      <pathelement location="${ehcache141-plugin.output.dir}"/>
    </path>
 
 
-   <patternset id="excluded.from.module.ehcache124-plugin">
+   <patternset id="excluded.from.module.ehcache141-plugin">
       <patternset refid="ignored.files"/>
    </patternset>
 
-   <patternset id="excluded.from.compilation.ehcache124-plugin">
-      <patternset refid="excluded.from.module.ehcache124-plugin"/>
+   <patternset id="excluded.from.compilation.ehcache141-plugin">
+      <patternset refid="excluded.from.module.ehcache141-plugin"/>
    </patternset>
 
-   <path id="ehcache124-plugin.module.sourcepath">
-      <dirset dir="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4">
+   <path id="ehcache141-plugin.module.sourcepath">
+      <dirset dir="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1">
          <include name="src"/>
       </dirset>
    </path>
 
 
-   <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.ehcache141-plugin"
+           depends="compile.module.ehcache141-plugin.production,compile.module.ehcache141-plugin.tests"
+           description="Compile module ehcache-1.4.1"/>
 
-   <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}"
+   <target name="compile.module.ehcache141-plugin.production" depends="compile.module.framework"
+           description="Compile module ehcache-1.4.1; production classes">
+      <mkdir dir="${ehcache141-plugin.output.dir}"/>
+      <javac destdir="${ehcache141-plugin.output.dir}" debug="${compiler.debug}"
              nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
-         <compilerarg line="${compiler.args.ehcache124-plugin}"/>
-         <bootclasspath refid="ehcache124-plugin.module.bootclasspath"/>
-         <classpath refid="ehcache124-plugin.module.classpath"/>
-         <src refid="ehcache124-plugin.module.sourcepath"/>
-         <patternset refid="excluded.from.compilation.ehcache124-plugin"/>
+         <compilerarg line="${compiler.args.ehcache141-plugin}"/>
+         <bootclasspath refid="ehcache141-plugin.module.bootclasspath"/>
+         <classpath refid="ehcache141-plugin.module.classpath"/>
+         <src refid="ehcache141-plugin.module.sourcepath"/>
+         <patternset refid="excluded.from.compilation.ehcache141-plugin"/>
       </javac>
 
-      <copy todir="${ehcache124-plugin.output.dir}">
-         <fileset dir="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/src">
+      <copy todir="${ehcache141-plugin.output.dir}">
+         <fileset dir="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1/src">
             <patternset refid="compiler.resources"/>
             <type type="file"/>
          </fileset>
       </copy>
    </target>
 
-   <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="compile.module.ehcache141-plugin.tests" depends="compile.module.ehcache141-plugin.production"
+           description="compile module ehcache-1.4.1; test classes" unless="skip.tests"/>
 
 
    <!-- Module coherence-3.2.2 -->
@@ -249,7 +249,7 @@
    </patternset>
 
    <path id="coherence322-plugin.module.sourcepath">
-      <dirset dir="${module.ehcache124-plugin.basedir}/cache-products/coherence-3.2.2">
+      <dirset dir="${module.ehcache141-plugin.basedir}/cache-products/coherence-3.2.2">
          <include name="src"/>
       </dirset>
    </path>
@@ -464,7 +464,7 @@
       <pathelement location="${framework.testoutput.dir}"/>
       <pathelement location="${jbosscache210-plugin.output.dir}"/>
    </path>
-   
+
    <path id="jbosscache220-plugin.module.classpath">
       <fileset dir="${module.jbosscache220-plugin.basedir}/cache-products/jbosscache-2.2.0/lib" includes="*.jar"/>
       <pathelement location="${module.framework.basedir}/lib/commons-logging.jar"/>