[jbosscache-commits] JBoss Cache SVN: r8026 - in benchmarks/benchmark-fwk/branches/mavenized: caches and 38 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Apr 30 07:20:46 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-04-30 07:20:46 -0400 (Thu, 30 Apr 2009)
New Revision: 8026
Added:
benchmarks/benchmark-fwk/branches/mavenized/caches/
benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/
benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/
benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/
benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/java/
benchmarks/benchmark-fwk/branches/mavenized/caches/coherence34/src/main/resources/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/resources/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheTest.java
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/java/
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache16/src/main/resources/
benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/
benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/
benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/
benchmarks/benchmark-fwk/branches/mavenized/caches/hazelcast15/src/main/java/
benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/
benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/
benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/main/
benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/main/java/
benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/main/java/org/
benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/main/resources/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/java/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/java/org/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/resources/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/java/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/java/org/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/resources/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/java/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/java/org/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/resources/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/java/
benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache31/src/main/resources/
Removed:
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheTest.java
Modified:
benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java
Log:
Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/src/org)
Deleted: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheReplicationTest.java 2009-04-29 22:08:39 UTC (rev 8024)
+++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java 2009-04-30 11:20:46 UTC (rev 8026)
@@ -1,102 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.cachebench.cachewrappers;
-
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeMethod;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Element;
-import net.sf.ehcache.Ehcache;
-
-/**
- * @author Mircea.Markus at jboss.com
- */
- at Test
-public class EHCacheReplicationTest
-{
-
- @BeforeMethod
- public void setUp()
- {
- System.setProperty("bind.address","127.0.0.1");//bind address referenced from config file
- }
-
-
- public void testSyncReplication() throws Exception
- {
- Ehcache cache1;
- Ehcache cache2;
-
- CacheManager c1 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-repl-sync.xml");
- CacheManager c2 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-repl-sync.xml");
-
-
- cache1 = c1.getCache("cache");
- cache2 = c2.getCache("cache");
-
- Thread.sleep(5000);
-
- System.out.println("c1 members: " + c1.getCachePeerListener("RMI").getBoundCachePeers());
- System.out.println("c2 members" + c2.getCachePeerListener("RMI").getBoundCachePeers());
- assert c1.getCachePeerListener("RMI").getBoundCachePeers().size() == 1;
- assert c2.getCachePeerListener("RMI").getBoundCachePeers().size() == 1;
-
- for (int i = 0; i < 100; i++)
- {
- cache1.put(new Element("key" + i, "value" + i));
- assert cache2.get("key" + i).getValue().equals("value" + i);
- }
- System.out.println(cache1.getKeys());
- System.out.println(cache2.getKeys());
-
- c1.shutdown();
- c2.shutdown();
- }
-
-
- public void testInvalidation() throws Exception
- {
- Ehcache cache1;
- Ehcache cache2;
-
- CacheManager c1 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-invalidate-sync.xml");
- CacheManager c2 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-invalidate-sync.xml");
-
- cache1 = c1.getCache("cache");
- cache2 = c2.getCache("cache");
-
- Thread.sleep(5000);
-
- System.out.println("c1 members: " + c1.getCachePeerListener("RMI").getBoundCachePeers());
- System.out.println("c2 members" + c2.getCachePeerListener("RMI").getBoundCachePeers());
- assert c1.getCachePeerListener("RMI").getBoundCachePeers().size() == 1;
- assert c2.getCachePeerListener("RMI").getBoundCachePeers().size() == 1;
-
- cache1.put(new Element("key","value"));
- assert cache2.get("key").getValue().equals("value");
- cache2.put(new Element("key","newValue"));
- assert cache1.get("key") == null;
-
- c1.shutdown();
- c2.shutdown();
- }
-}
Deleted: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheTest.java
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheTest.java 2009-04-29 22:08:39 UTC (rev 8024)
+++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheTest.java 2009-04-30 11:20:46 UTC (rev 8026)
@@ -1,53 +0,0 @@
-package org.cachebench.cachewrappers;
-
-import net.sf.ehcache.Ehcache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Element;
-
-import java.net.URL;
-import java.io.File;
-import java.util.Properties;
-
-import org.cachebench.CacheWrapper;
-
-/**
- * // TODO: Add Javadocs
- *
- * @author <a href="mailto:manik at jboss.org">Manik Surtani</a>
- * @since 2.0.0
- */
-public class EHCacheTest
-{
-
- public static void main(String[] args) throws Exception
- {
-
-
- CacheWrapper w = new EHCacheWrapper();
- Properties p = new Properties();
- p.setProperty("config", "ehcache-repl-sync.xml");
- w.init(p);
-
- Ehcache cache;
- URL url = new URL("file:///Users/manik/Code/CacheBenchFwk/cache-products/ehcache-1.2.4/conf/ehcache-repl-sync.xml");
-
- System.out.println("URL " + url);
-
- System.out.println("FIle: " + url.getFile());
- CacheManager m = CacheManager.create(url);
-
- System.out.println("Caches:");
- for (String s : m.getCacheNames()) System.out.println(" " + s);
-
- cache = m.getCache("cache");
-
- for (int i=0; i<100; i++) cache.put(new Element("key" + i, "value" + i));
-
- System.out.println(cache.getKeys());
-
- System.out.println("members: " + m.getCachePeerListener("RMI").getBoundCachePeers());
-
- m.shutdown();
-
- }
-}
Modified: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/cache-products/ehcache-1.6.0/src/org/cachebench/cachewrappers/EHCacheWrapper.java 2009-04-29 22:08:39 UTC (rev 8024)
+++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/main/java/org/cachebench/cachewrappers/EHCacheWrapper.java 2009-04-30 11:20:46 UTC (rev 8026)
@@ -60,8 +60,8 @@
log.info("Using named cache " + cache);
if (!localmode)
{
- log.info("Bounded peers: " + manager.getCachePeerListener("RMI").getBoundCachePeers());
- log.info("Remote peers: " + manager.getCacheManagerPeerProvider("RMI").listRemoteCachePeers(cache));
+ log.info("Bounded peers: " + manager.getCachePeerListener().getBoundCachePeers());
+ log.info("Remote peers: " + manager.getCacheManagerPeerProvider().listRemoteCachePeers(cache));
}
}
@@ -118,13 +118,12 @@
public int getNumMembers()
{
-
- return localmode ? 0 : manager.getCacheManagerPeerProvider("RMI").listRemoteCachePeers(cache).size();
+ return localmode ? 0 : manager.getCacheManagerPeerProvider().listRemoteCachePeers(cache).size();
}
public String getInfo()
{
- return cache.getKeys().toString() + (localmode ? "" : (" remote peers: " + manager.getCachePeerListener("RMI").getBoundCachePeers()));
+ return cache.getKeys().toString() + (localmode ? "" : (" remote peers: " + manager.getCachePeerListener().getBoundCachePeers()));
}
public Object getReplicatedData(List<String> path, String key) throws Exception
Added: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheReplicationTest.java 2009-04-30 11:20:46 UTC (rev 8026)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.cachebench.cachewrappers;
+
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeMethod;
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.Element;
+import net.sf.ehcache.Ehcache;
+
+/**
+ * @author Mircea.Markus at jboss.com
+ */
+ at Test (enabled = false)
+public class EHCacheReplicationTest
+{
+
+ @BeforeMethod
+ public void setUp()
+ {
+ System.setProperty("bind.address","127.0.0.1");//bind address referenced from config file
+ }
+
+
+ public void testSyncReplication() throws Exception
+ {
+ Ehcache cache1;
+ Ehcache cache2;
+
+ CacheManager c1 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-repl-sync.xml");
+ CacheManager c2 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-repl-sync.xml");
+
+
+ cache1 = c1.getCache("cache");
+ cache2 = c2.getCache("cache");
+
+ Thread.sleep(5000);
+
+ System.out.println("c1 members: " + c1.getCachePeerListener().getBoundCachePeers());
+ System.out.println("c2 members" + c2.getCachePeerListener().getBoundCachePeers());
+ assert c1.getCachePeerListener().getBoundCachePeers().size() == 1;
+ assert c2.getCachePeerListener().getBoundCachePeers().size() == 1;
+
+ for (int i = 0; i < 100; i++)
+ {
+ cache1.put(new Element("key" + i, "value" + i));
+ assert cache2.get("key" + i).getValue().equals("value" + i);
+ }
+ System.out.println(cache1.getKeys());
+ System.out.println(cache2.getKeys());
+
+ c1.shutdown();
+ c2.shutdown();
+ }
+
+
+ public void testInvalidation() throws Exception
+ {
+ Ehcache cache1;
+ Ehcache cache2;
+
+ CacheManager c1 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-invalidate-sync.xml");
+ CacheManager c2 = new CacheManager("C:\\jboss\\benchmarks\\CacheBenchmarkFwk\\cache-products\\ehcache-1.5.0\\conf\\ehcache-invalidate-sync.xml");
+
+ cache1 = c1.getCache("cache");
+ cache2 = c2.getCache("cache");
+
+ Thread.sleep(5000);
+
+ System.out.println("c1 members: " + c1.getCachePeerListener().getBoundCachePeers());
+ System.out.println("c2 members" + c2.getCachePeerListener().getBoundCachePeers());
+ assert c1.getCachePeerListener().getBoundCachePeers().size() == 1;
+ assert c2.getCachePeerListener().getBoundCachePeers().size() == 1;
+
+ cache1.put(new Element("key","value"));
+ assert cache2.get("key").getValue().equals("value");
+ cache2.put(new Element("key","newValue"));
+ assert cache1.get("key") == null;
+
+ c1.shutdown();
+ c2.shutdown();
+ }
+}
Added: benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheTest.java
===================================================================
--- benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheTest.java (rev 0)
+++ benchmarks/benchmark-fwk/branches/mavenized/caches/ehcache15/src/test/java/org/cachebench/cachewrappers/EHCacheTest.java 2009-04-30 11:20:46 UTC (rev 8026)
@@ -0,0 +1,47 @@
+package org.cachebench.cachewrappers;
+
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.Ehcache;
+import net.sf.ehcache.Element;
+import org.cachebench.CacheWrapper;
+import org.testng.annotations.Test;
+
+import java.net.URL;
+import java.util.Properties;
+
+ at Test(enabled = false)
+public class EHCacheTest
+{
+
+ public static void main(String[] args) throws Exception
+ {
+
+
+ CacheWrapper w = new EHCacheWrapper();
+ Properties p = new Properties();
+ p.setProperty("config", "ehcache-repl-sync.xml");
+ w.init(p);
+
+ Ehcache cache;
+ URL url = new URL("file:///Users/manik/Code/CacheBenchFwk/cache-products/ehcache-1.2.4/conf/ehcache-repl-sync.xml");
+
+ System.out.println("URL " + url);
+
+ System.out.println("FIle: " + url.getFile());
+ CacheManager m = CacheManager.create(url);
+
+ System.out.println("Caches:");
+ for (String s : m.getCacheNames()) System.out.println(" " + s);
+
+ cache = m.getCache("cache");
+
+ for (int i=0; i<100; i++) cache.put(new Element("key" + i, "value" + i));
+
+ System.out.println(cache.getKeys());
+
+ System.out.println("members: " + m.getCachePeerListener().getBoundCachePeers());
+
+ m.shutdown();
+
+ }
+}
Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/infinispan/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cache-products/infinispan-4.0.0/src/org)
Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache21/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.1.0/src/org)
Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache22/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-2.2.0/src/org)
Copied: benchmarks/benchmark-fwk/branches/mavenized/caches/jbosscache30/src/main/java/org (from rev 8024, benchmarks/benchmark-fwk/branches/mavenized/cache-products/jbosscache-3.0.0/src/org)
More information about the jbosscache-commits
mailing list