[jboss-cvs] JBossAS SVN: r67962 - branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136.

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

Author: bdecoste
Date: 2007-12-05 16:00:22 -0500 (Wed, 05 Dec 2007)
New Revision: 67962

Modified:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/DoNothingBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/SFSBCacheManipulator.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/SFSBCacheManipulatorMBean.java
Log:
reverted last changes


Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/DoNothingBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/DoNothingBean.java	2007-12-05 20:45:50 UTC (rev 67961)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/DoNothingBean.java	2007-12-05 21:00:22 UTC (rev 67962)
@@ -23,7 +23,7 @@
 
 import javax.ejb.Stateful;
 
-import org.jboss.ejb3.annotation.Clustered;
+import org.jboss.annotation.ejb.Clustered;
 
 /**
  * A meaningless bean, just so we can deploy a clustered SFSB and

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/SFSBCacheManipulator.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/SFSBCacheManipulator.java	2007-12-05 20:45:50 UTC (rev 67961)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/SFSBCacheManipulator.java	2007-12-05 21:00:22 UTC (rev 67962)
@@ -22,10 +22,9 @@
 
 package org.jboss.ejb3.test.ejbthree1136;
 
-import org.jboss.cache.Cache;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
-import org.jboss.cache.TreeCacheViewMBean;
+import org.jboss.cache.TreeCacheMBean;
 import org.jboss.cache.config.Option;
 
 /**
@@ -39,15 +38,15 @@
 {
    public static final String VALUE = "VALUE";
    
-   private Cache clusteredBeanCache;
+   private TreeCacheMBean clusteredBeanCache;
    private String regionRoot;
    
-   public Cache getClusteredBeanCache()
+   public TreeCacheMBean getClusteredBeanCache()
    {
       return clusteredBeanCache;
    }
 
-   public void setClusteredBeanCache(Cache clusteredBeanCache)
+   public void setClusteredBeanCache(TreeCacheMBean clusteredBeanCache)
    {
       this.clusteredBeanCache = clusteredBeanCache;
    }
@@ -73,9 +72,9 @@
       Option opt = new Option();
       opt.setCacheModeLocal(true);
       Fqn fqn = getTestFqn();
-      clusteredBeanCache.put(fqn, "key", opt);
+      clusteredBeanCache.put(fqn, "key", VALUE, opt);
       // "Passivate" the data
-      clusteredBeanCache.evict(fqn, true);
+      clusteredBeanCache.evict(fqn);
    }
    
    public void stop() throws Exception
@@ -90,7 +89,7 @@
       Fqn fqn = getTestFqn();
       Object obj = clusteredBeanCache.get(fqn, "key");
       // "Re-Passivate" the data
-      clusteredBeanCache.evict(fqn, true);
+      clusteredBeanCache.evict(fqn);
       return obj;
    }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/SFSBCacheManipulatorMBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/SFSBCacheManipulatorMBean.java	2007-12-05 20:45:50 UTC (rev 67961)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/ejbthree1136/SFSBCacheManipulatorMBean.java	2007-12-05 21:00:22 UTC (rev 67962)
@@ -22,9 +22,9 @@
 
 package org.jboss.ejb3.test.ejbthree1136;
 
-import org.jboss.cache.Cache;
 import org.jboss.cache.CacheException;
 import org.jboss.cache.Fqn;
+import org.jboss.cache.TreeCacheMBean;
 
 /**
  * MBean that stores a key/value in a cache during start
@@ -35,9 +35,9 @@
  */
 public interface SFSBCacheManipulatorMBean
 {
-   Cache getClusteredBeanCache();
+   TreeCacheMBean getClusteredBeanCache();
 
-   void setClusteredBeanCache(Cache clusteredBeanCache);
+   void setClusteredBeanCache(TreeCacheMBean clusteredBeanCache);
 
    String getRegionRoot();