Author: mircea.markus Date: 2008-01-08 14:13:37 -0500 (Tue, 08 Jan 2008) New Revision: 5076 Added: cache-bench-fwk/trunk/cache-products/config.sh Removed: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/jbosscache-2.0.0.iml cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/lib/jbosscache-core-2.1.0.CR2.jar Modified: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebench/cachewrappers/JBossCache200Wrapper.java cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh Log: Added: cache-bench-fwk/trunk/cache-products/config.sh =================================================================== --- cache-bench-fwk/trunk/cache-products/config.sh (rev 0) +++ cache-bench-fwk/trunk/cache-products/config.sh 2008-01-08 19:13:37 UTC (rev 5076) @@ -0,0 +1,42 @@ +#!/bin/bash + +#this is a template file. Implementation of this should be present in each benchmark directory, +#e.g. ./jbosscache-2.0.0/config.sh +# This file will be called by FWK_ROOT/runNode.sh, and is intended for adding specific config params +# to the benchmark runner. + +#Uncomment and append values to the variables below, as needed by a specific product + +#CLASSPATH=$CLASSPATH:<some other needed values> +#JVM_OPTIONS=JVM_OPTIONS:-DsomeSysProp=value1:-Xprop=value2 + +java -DcurrentIndex=0 -DclusterSize=3 -Xmx1024m -DpreferIPv4Stack=true -cp :./lib/commons-beanutils.jar: +./lib/commons-digester.jar:./lib/commons-logging.jar:./lib/commons-math-1.0.jar: +./lib/log4j.jar:./lib/smartfrog-3.12.014.jar:./conf:./classes/production/Framework: +./cache-products/jbosscache-2.1.0CR2/lib/jboss-common-core-2.0.4.GA.jar: +./cache-products/jbosscache-2.1.0CR2/lib/jboss-javaee-5.0.0.Beta3.jar: +./cache-products/jbosscache-2.1.0CR2/lib/jbosscache-core.jar: +./cache-products/jbosscache-2.1.0CR2/lib/jcip-annotations-1.0.jar: +./cache-products/jbosscache-2.1.0CR2/lib/jgroups-2.6.0.GA.jar: +./classes/production/jbosscache-2.1.0CR2: +./cache-products/jbosscache-2.1.0CR2/conf +org.cachebench.CacheBenchmarkRunner + +org.cachebench.cachewrappers.JBossCache210Cr2Wrapper +org.cachebench.cachewrappers.JBossCache210Cr2Wrapper +org.cachebench.cachewrappers.JBossCache210Cr2Wrapper + +java -DcurrentIndex=0 -DclusterSize=3 -Xmx1024m -DpreferIPv4Stack=true -cp :./lib/commons-beanutils.jar: +./lib/commons-digester.jar:./lib/commons-logging.jar:./lib/commons-math-1.0.jar: +./lib/log4j.jar:./lib/smartfrog-3.12.014.jar:./conf:./classes/production/Framework: +./cache-products/jbosscache-2.0.0/lib/concurrent.jar: +./cache-products/jbosscache-2.0.0/lib/jboss-common-core.jar: +./cache-products/jbosscache-2.0.0/lib/jboss-j2ee.jar: +./cache-products/jbosscache-2.0.0/lib/jbosscache.jar: +./cache-products/jbosscache-2.0.0/lib/jcip-annotations.jar: +./cache-products/jbosscache-2.0.0/lib/jgroups-2.6.1.jar: +./cache-products/jbosscache-2.0.0/lib/jgroups.jar: +./cache-products/jbosscache-2.0.0/lib/trove.jar: +./classes/production/jbosscache-2.0.0: +./cache-products/jbosscache-2.0.0/conf +org.cachebench.CacheBenchmarkRunner Modified: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh =================================================================== --- cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh 2008-01-08 19:13:03 UTC (rev 5075) +++ cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/config.sh 2008-01-08 19:13:37 UTC (rev 5076) @@ -1,12 +1,18 @@ #!/bin/bash +#see "$CACHE_ROOT/cache-products/cache.sh" for details + THIS_DIR="./cache-products/jbosscache-2.0.0" -#adding lib files to classpath +#setting up classpath for JAR in $THIS_DIR/lib/* do CLASSPATH=$CLASSPATH:$JAR done CLASSPATH=$CLASSPATH:./classes/production/jbosscache-2.0.0 CLASSPATH=$CLASSPATH:$THIS_DIR/conf +#--classpath was set +#additional JVM options +JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=true" + Deleted: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/jbosscache-2.0.0.iml =================================================================== --- cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/jbosscache-2.0.0.iml 2008-01-08 19:13:03 UTC (rev 5075) +++ cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/jbosscache-2.0.0.iml 2008-01-08 19:13:37 UTC (rev 5076) @@ -1,185 +0,0 @@ -<?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-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/commons-logging.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jgroups.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-cache.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-system.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-j2ee.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-aop.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-minimal.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-serialization.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/concurrent.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-jmx.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/trove.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../jbosscache-1.4.1/lib/jboss-common.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jboss-j2ee.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jcip-annotations.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jboss-common-core.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/concurrent.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jbosscache.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/trove.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jgroups.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module" module-name="Trunk" /> - <orderEntryProperties /> - </component> -</module> - Deleted: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/lib/jbosscache-core-2.1.0.CR2.jar =================================================================== (Binary files differ) Modified: cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebench/cachewrappers/JBossCache200Wrapper.java =================================================================== --- cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebench/cachewrappers/JBossCache200Wrapper.java 2008-01-08 19:13:03 UTC (rev 5075) +++ cache-bench-fwk/trunk/cache-products/jbosscache-2.0.0/src/org/cachebench/cachewrappers/JBossCache200Wrapper.java 2008-01-08 19:13:37 UTC (rev 5076) @@ -21,8 +21,8 @@ { log.info("Creating cache with the following configuration: " + parameters); cache = DefaultCacheFactory.getInstance().createCache((String)parameters.get("config")); - log.info("Running cache with following config:" + cache.getConfiguration()); - } + log.info("Running follwing JBossCacheVersion: " + org.jboss.cache.Version.version); + log.info("Running follwing JBossCacheCodeName: " + org.jboss.cache.Version.codename); } public void setUp() throws Exception { @@ -74,5 +74,4 @@ NodeData nodeData = result.getNodeData().get(0); return nodeData.getAttributes().get(key); } - } Modified: cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh =================================================================== --- cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh 2008-01-08 19:13:03 UTC (rev 5075) +++ cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh 2008-01-08 19:13:37 UTC (rev 5076) @@ -1,16 +1,14 @@ #!/bin/bash + +#see "$CACHE_ROOT/cache-products/cache.sh" for details + THIS_DIR=./cache-products/terracotta-2.5.0 TC_HOME="/cygdrive/c/java/terracotta-2.5.0" + +#addint terracotta wrapper class to classpath CLASSPATH=$CLASSPATH:./classes/production/terracotta-2.5.0 -SYS_PROPS="$SYS_PROPS -Dtc.config=$THIS_DIR/tc-client-config.xml" -#export START_NODE_COMMAND="$TC_HOME/bin/dso-java.sh -cp $CLASSPATH $SYS_PROPS org.cachebench.CacheBenchmarkRunner" +#other specific JVM options +JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=true -Dtc.config=$THIS_DIR/tc-client-config.xml -Dtc.install-root=${TC_HOME}" +JVM_OPTIONS="$JVM_OPTIONS -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-boot-hotspot_win32_150_14.jar" -export START_NODE_COMMAND="java $JVM_ARGS -Dtc.install-root=${TC_HOME} -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-boot-hotspot_win32_150_14.jar $SYS_PROPS -cp $CLASSPATH $OTHER_SYS_ARGS org.cachebench.CacheBenchmarkRunner" - -#${JAVA_HOME}/bin/java -Dtc.install-root=${TC_HOME} -Xbootclasspath/p:<dso-boot-jar-path> -Dtc.config=<tc-config-path> <startup-classname> -#executing command java -Xmx1024m -Dtc.install-root=/cygdrive/c/java/terracotta-2 -#.5.0 -Xbootclasspath/p:/cygdrive/c/java/terracotta-2.5.0/lib/dso-boot/dso-boot-h -#otspot_win32_150_14.jar -DcurrentIndex=0 -Dorg.cachebench.debug=true -Djava.net.preferIPv4Stack=true -Dtc.config=./cache-products/terracotta-2.5.0/tc-client-con -#fig.xml -cp :./lib/commons-beanutils.jar:./lib/commons-digester.jar:./lib/commons-logging.jar:./lib/commons-math-1.0.jar:./lib/log4j.jar:./lib/smartfrog-3.12.014.jar:./conf:./classes/production/Framework::./classes/production/terracotta-2.5.0 org.cachebench.CacheBenchmarkRunner -#java -Dtc.install-root=c:\java\terracotta-2.5.0 -DcurrentIndex=0 -Dorg.cachebench.debug=true -Djava.net.preferIPv4Stack=true -Xbootclasspath/p:"c:\java\terracotta-2.5.0\lib\dso-boot\dso-boot-hotspot_win32_150_14.jar" -Dtc.config=C:\projects\jboss\cache\benchmark\cache-bench-fwk\cache-products\terracotta-2.5.0\tc-client-config.xml -cp ./lib/commons-beanutils.jar;./lib/commons-digester.jar;./lib/commons-logging.jar;./lib/commons-math-1.0.jar;./lib/log4j.jar;./conf;./classes/production/Framework;./classes/production/terracotta-2.5.0 org.cachebench.CacheBenchmarkRunner \ No newline at end of file