[jbosscache-commits] JBoss Cache SVN: r4954 - in cache-bench-fwk/trunk: cache-products/terracotta-2.5.0 and 1 other directories.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-01-03 01:51:03 -0500 (Thu, 03 Jan 2008)
New Revision: 4954

Modified:
   cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
   cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/src/org/cachebench/cachewrappers/TerracottaWrapper.java
   cache-bench-fwk/trunk/runNode.sh
Log:
enhanced - added a new test that checks that caches that replications occurs as expected  + refactorings

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-03 02:27:56 UTC (rev 4953)
+++ cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/config.sh	2008-01-03 06:51:03 UTC (rev 4954)
@@ -3,7 +3,7 @@
 TC_HOME="/cygdrive/c/java/terracotta-2.5.0"
 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"
+#export START_NODE_COMMAND="$TC_HOME/bin/dso-java.sh -cp $CLASSPATH $SYS_PROPS org.cachebench.CacheBenchmarkRunner"
 
 
 export START_NODE_COMMAND="java -Dtc.install-root=${TC_HOME} -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-boot-hotspot_win32_150_14.jar $SYS_PROPS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner"
\ No newline at end of file

Modified: cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/src/org/cachebench/cachewrappers/TerracottaWrapper.java
===================================================================
--- cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/src/org/cachebench/cachewrappers/TerracottaWrapper.java	2008-01-03 02:27:56 UTC (rev 4953)
+++ cache-bench-fwk/trunk/cache-products/terracotta-2.5.0/src/org/cachebench/cachewrappers/TerracottaWrapper.java	2008-01-03 06:51:03 UTC (rev 4954)
@@ -2,7 +2,6 @@
 
 import org.cachebench.CacheWrapper;
 
-import java.util.Properties;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -18,10 +17,15 @@
    // Since terracotta 
    private final Map cache = new HashMap();
 
-   public void init(Properties parameters) throws Exception
+   public void init(Map parameters) throws Exception
    {
    }
 
+   public Object getReplicatedData(String key) throws Exception
+   {
+      return get(key);
+   }
+
    public void setUp() throws Exception
    {
    }
@@ -70,4 +74,5 @@
          return "There are " + cache.size() + " objects in cache";
       }
    }
+
 }

Modified: cache-bench-fwk/trunk/runNode.sh
===================================================================
--- cache-bench-fwk/trunk/runNode.sh	2008-01-03 02:27:56 UTC (rev 4953)
+++ cache-bench-fwk/trunk/runNode.sh	2008-01-03 06:51:03 UTC (rev 4954)
@@ -7,7 +7,7 @@
 CACHE_DEBUG=true
 preferIPv4Stack=true
 
-if [ -z $1]
+if [ -z $1 ]
 then
    echo "Usage:"
    echo "     ./runNode.sh currentNodeIndex testConfig [other params]"