[jboss-cvs] JBossAS SVN: r80010 - in branches/Branch_JBoss_Cache_3: testsuite/src/main/org/jboss/test/cluster/testutil and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-10-23 17:05:26 -0400 (Thu, 23 Oct 2008)
New Revision: 80010

Modified:
   branches/Branch_JBoss_Cache_3/component-matrix/pom.xml
   branches/Branch_JBoss_Cache_3/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java
Log:
Move to JBC/PC 3.0.0

Modified: branches/Branch_JBoss_Cache_3/component-matrix/pom.xml
===================================================================
--- branches/Branch_JBoss_Cache_3/component-matrix/pom.xml	2008-10-23 20:35:12 UTC (rev 80009)
+++ branches/Branch_JBoss_Cache_3/component-matrix/pom.xml	2008-10-23 21:05:26 UTC (rev 80010)
@@ -60,8 +60,8 @@
     <version.org.jboss.microcontainer>2.0.0.CR2</version.org.jboss.microcontainer>
     <version.org.jboss.cl>2.0.0.CR3</version.org.jboss.cl>
     <version.org.jboss.deployers>2.0.0.CR2</version.org.jboss.deployers>
-    <version.org.jboss.cache.core>2.2.1.GA</version.org.jboss.cache.core>
-    <version.org.jboss.cache.pojo>2.2.0.GA</version.org.jboss.cache.pojo>
+    <version.org.jboss.cache.core>3.0.0.CR2</version.org.jboss.cache.core>
+    <version.org.jboss.cache.pojo>3.0.0-SNAPSHOT</version.org.jboss.cache.pojo>
     <version.org.jboss.cluster>1.1.0.GA</version.org.jboss.cluster>
     <version.org.jboss.cluster.cache.spi>1.0.0.GA</version.org.jboss.cluster.cache.spi>
     <version.org.jboss.cluster.cache.jbc>1.0.1.CR1</version.org.jboss.cluster.cache.jbc>

Modified: branches/Branch_JBoss_Cache_3/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java
===================================================================
--- branches/Branch_JBoss_Cache_3/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java	2008-10-23 20:35:12 UTC (rev 80009)
+++ branches/Branch_JBoss_Cache_3/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java	2008-10-23 21:05:26 UTC (rev 80010)
@@ -35,6 +35,7 @@
 import org.jboss.cache.NodeNotExistsException;
 import org.jboss.cache.Region;
 import org.jboss.cache.config.Configuration;
+import org.jboss.cache.interceptors.base.CommandInterceptor;
 import org.jgroups.Address;
 
 /**
@@ -44,16 +45,48 @@
  * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  * @version $Revision: 1.1 $
  */
-public class DelegatingMockCache implements Cache
+public class DelegatingMockCache<K, V> implements Cache<K, V>
 {
-   private final Cache delegate;
+
+   private final Cache<K, V> delegate;
    
-   public DelegatingMockCache(Cache delegate) 
+   public DelegatingMockCache(Cache<K, V> delegate) 
    {
       super();
       this.delegate = delegate;
    }
    
+   public void addInterceptor(CommandInterceptor arg0, Class arg1)
+   {
+      delegate.addInterceptor(arg0, arg1);      
+   }
+
+   public void addInterceptor(CommandInterceptor arg0, int arg1)
+   {
+      delegate.addInterceptor(arg0, arg1);      
+   }
+
+   public void removeInterceptor(int arg0)
+   {
+      delegate.removeInterceptor(arg0);      
+   }
+
+   public void startBatch()
+   {
+      delegate.startBatch();    
+   }
+
+   public void endBatch(boolean arg0)
+   {
+      delegate.endBatch(arg0);      
+   }
+
+   public void removeInterceptor(Class arg0)
+   {
+      // TODO Auto-generated method stub
+      
+   }
+   
 //   public void addInterceptor(Interceptor arg0, int arg1)
 //   {
 //      delegate.addInterceptor(arg0, arg1);
@@ -269,12 +302,12 @@
       delegate.evict(arg0, arg1);
    }
 
-   public Object get(Fqn arg0, Object arg1)
+   public V get(Fqn arg0, K arg1)
    {
       return delegate.get(arg0, arg1);
    }
 
-   public Object get(String arg0, Object arg1)
+   public V get(String arg0, K arg1)
    {
       return delegate.get(arg0, arg1);
    }
@@ -369,27 +402,27 @@
       delegate.put(arg0, arg1);
    }
 
-   public Object put(Fqn arg0, Object arg1, Object arg2)
+   public V put(Fqn arg0, K arg1, V arg2)
    {
       return delegate.put(arg0, arg1, arg2);
    }
 
-   public Object put(String arg0, Object arg1, Object arg2)
+   public V put(String arg0, K arg1, V arg2)
    {
       return delegate.put(arg0, arg1, arg2);
    }
 
-   public void putForExternalRead(Fqn arg0, Object arg1, Object arg2)
+   public void putForExternalRead(Fqn arg0, K arg1, V arg2)
    {
       delegate.putForExternalRead(arg0, arg1, arg2);
    }
 
-   public Object remove(Fqn arg0, Object arg1)
+   public V remove(Fqn arg0, K arg1)
    {
       return delegate.remove(arg0, arg1);
    }
 
-   public Object remove(String arg0, Object arg1)
+   public V remove(String arg0, K arg1)
    {
       return delegate.remove(arg0, arg1);
    }