Author: mircea.markus Date: 2008-09-30 03:43:42 -0400 (Tue, 30 Sep 2008) New Revision: 6815 Added: benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.5.0/ehcache-1.5.0.iml Modified: benchmarks/benchmark-fwk/trunk/TODO benchmarks/benchmark-fwk/trunk/build.xml benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java Log: updated stuff Modified: benchmarks/benchmark-fwk/trunk/TODO =================================================================== --- benchmarks/benchmark-fwk/trunk/TODO 2008-09-30 07:33:29 UTC (rev 6814) +++ benchmarks/benchmark-fwk/trunk/TODO 2008-09-30 07:43:42 UTC (rev 6815) @@ -1,4 +1,4 @@ -1. JBoss Cache 1.4.1 breaks during warmup -2. ReplicationOccursTest doesn't always work - reports false errors. - - it relies on cache.getReplicatedData(); most likely that is the cause of the problem, refere to javadoc -3. Replace cluster.sh, runNode.sh, killNode.sh and cache-product/product-x.y.z/config.sh with Ant scripts to make them cross-platform. +1. Replace cluster.sh, runNode.sh, killNode.sh and cache-product/product-x.y.z/config.sh with Ant scripts to make them cross-platform. +2. status email notifications - will allow one not to tail logs all the time/from time to time to look for issues +3. move scripts to an bin dir, as there are too many of them arround +4. warmup should only be performed if session replication passes \ No newline at end of file Modified: benchmarks/benchmark-fwk/trunk/build.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/build.xml 2008-09-30 07:33:29 UTC (rev 6814) +++ benchmarks/benchmark-fwk/trunk/build.xml 2008-09-30 07:43:42 UTC (rev 6815) @@ -86,7 +86,7 @@ </javac> </target> - <target name="compile.module.ehcache141" depends="compile.module.framework" + <target name="compile.module.ehcache159" depends="compile.module.framework" 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}" @@ -190,6 +190,20 @@ </javac> </target> + <target name="compile.module.pojocache220" depends="compile.module.framework" + description="Compile module pojocache-2.2.0; production classes"> + <mkdir dir="./classes/production/pojocache-2.2.0"/> + <javac destdir="./classes/production/pojocache-2.2.0" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <fileset dir="./cache-products/pojocache-2.2.0/lib" includes="*.jar"/> + <pathelement location="./lib/commons-logging.jar"/> + <pathelement location="${framework.output.dir}"/> + </classpath> + <src path="./cache-products/pojocache-2.2.0/src"/> + </javac> + </target> + <target name="compile.module.whirlycache101" depends="compile.module.framework" description="Compile module whirlycache-1.0.1; production classes"> <mkdir dir="./classes/production/whirlycache-1.0.1"/> @@ -223,7 +237,7 @@ </target> <target name="all" - depends="clean, compile.module.framework, compile.module.jbosscache140, compile.module.jbosscache200, compile.module.jbosscache210, compile.module.jbosscache220, compile.module.terracotta250, compile.module.ehcache141, compile.module.whirlycache101, compile.module.jbosscache300, compile.module.coherence331" + depends="clean, compile.module.framework, compile.module.jbosscache140, compile.module.jbosscache200, compile.module.pojocache220, compile.module.jbosscache210, compile.module.jbosscache220, compile.module.terracotta250, compile.module.ehcache159, compile.module.whirlycache101, compile.module.jbosscache300, compile.module.coherence331" description="build all"/> <target name="checkClusterAddresses" depends="compile.module.framework" Added: benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.5.0/ehcache-1.5.0.iml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.5.0/ehcache-1.5.0.iml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/ehcache-1.5.0/ehcache-1.5.0.iml 2008-09-30 07:43:42 UTC (rev 6815) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module relativePaths="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="CacheBenchmarkFwk" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/commons-logging.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/ehcache.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="file://$MODULE_DIR$/../../../products/ehcache-1.5.0/javadocs" /> + </JAVADOC> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/lib/backport-util-concurrent-3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + <javadoc-paths> + <root url="jar://$MODULE_DIR$/../../../products/ehcache-1.5.0/ehcache-1.5.0-javadoc.zip!/" /> + </javadoc-paths> + </component> +</module> + Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java 2008-09-30 07:33:29 UTC (rev 6814) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/PutGetCacheWarmup.java 2008-09-30 07:43:42 UTC (rev 6815) @@ -30,7 +30,7 @@ } catch (Throwable e) { - log.warn("Exception on cache warmup", e); + log.trace("Exception on cache warmup", e); } }