[jbosscache-commits] JBoss Cache SVN: r6371 - in benchmarks/benchmark-fwk/trunk: cache-products/ehcache-1.4.1 and 1 other directories.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-07-22 21:31:41 -0400 (Tue, 22 Jul 2008)
New Revision: 6371

Modified:
   benchmarks/benchmark-fwk/trunk/build.xml
   benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.4.1/config.sh
   benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.4.1/lib/ehcache.jar
   benchmarks/benchmark-fwk/trunk/runAllLocal.sh
Log:
Upgraded EHCache to 1.5.0

Modified: benchmarks/benchmark-fwk/trunk/build.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/build.xml	2008-07-23 01:25:27 UTC (rev 6370)
+++ benchmarks/benchmark-fwk/trunk/build.xml	2008-07-23 01:31:41 UTC (rev 6371)
@@ -80,17 +80,17 @@
    </target>
 
    <target name="compile.module.ehcache141" depends="compile.module.framework"
-           description="Compile module ehcache-1.4.1; production classes">
-      <mkdir dir="./classes/production/ehcache-1.4.1"/>
-      <javac destdir="./classes/production/ehcache-1.4.1" debug="${compiler.debug}"
+           description="Compile module ehcache-1.5.0; production classes">
+      <mkdir dir="./classes/production/ehcache-1.5.0"/>
+      <javac destdir="./classes/production/ehcache-1.5.0" debug="${compiler.debug}"
              nowarn="${compiler.generate.no.warnings}" fork="true">
          <classpath>
-            <fileset dir="./cache-products/ehcache-1.4.1/lib" includes="*.jar"/>
-            <pathelement location="./cache-products/ehcache-1.4.1/conf"/>
+            <fileset dir="./cache-products/ehcache-1.5.0/lib" includes="*.jar"/>
+            <pathelement location="./cache-products/ehcache-1.5.0/conf"/>
             <pathelement location="${framework.output.dir}"/>
-            <pathelement location="./classes/production/ehcache-1.4.1"/>
+            <pathelement location="./classes/production/ehcache-1.5.0"/>
          </classpath>
-         <src path="./cache-products/ehcache-1.4.1/src"/>
+         <src path="./cache-products/ehcache-1.5.0/src"/>
       </javac>
    </target>
 

Modified: benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.4.1/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.4.1/config.sh	2008-07-23 01:25:27 UTC (rev 6370)
+++ benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.4.1/config.sh	2008-07-23 01:31:41 UTC (rev 6371)
@@ -2,7 +2,7 @@
 
 #see "$CACHE_ROOT/cache-products/cache.sh" for details
 
-THIS_DIR="./cache-products/ehcache-1.4.1"
+THIS_DIR="./cache-products/ehcache-1.5.0"
 
 #setting up classpath
 for JAR in $THIS_DIR/lib/*
@@ -10,7 +10,7 @@
    CLASSPATH=$CLASSPATH:$JAR
 done
 
-CLASSPATH="$CLASSPATH:./classes/production/ehcache-1.4.1"
+CLASSPATH="$CLASSPATH:./classes/production/ehcache-1.5.0"
 CLASSPATH="$CLASSPATH:$THIS_DIR/conf"
 #--classpath was set
 

Modified: benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.4.1/lib/ehcache.jar
===================================================================
(Binary files differ)

Modified: benchmarks/benchmark-fwk/trunk/runAllLocal.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/runAllLocal.sh	2008-07-23 01:25:27 UTC (rev 6370)
+++ benchmarks/benchmark-fwk/trunk/runAllLocal.sh	2008-07-23 01:31:41 UTC (rev 6371)
@@ -6,7 +6,7 @@
 ./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR.xml
 ./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml
 ./runLocalNode.sh jbosscache-3.0.0 pess-local-NONE.xml
-./runLocalNode.sh ehcache-1.4.1 ehcache-local.xml
+./runLocalNode.sh ehcache-1.5.0 ehcache-local.xml
 
 mkdir output
 mv data* ./output