[jboss-cvs] JBossAS SVN: r63976 - in trunk/ejb3/src: test/org/jboss/ejb3/test/clusteredentity and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 11 12:51:26 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-07-11 12:51:26 -0400 (Wed, 11 Jul 2007)
New Revision: 63976
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java
Log:
[EJBTHREE-1008] Convert to the notification API introduced in 2.0.0.CR3
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java 2007-07-11 16:49:09 UTC (rev 63975)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java 2007-07-11 16:51:26 UTC (rev 63976)
@@ -33,17 +33,21 @@
import org.jboss.annotation.ejb.cache.tree.CacheConfig;
import org.jboss.aop.Advisor;
-import org.jboss.cache.AbstractCacheListener;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheException;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
import org.jboss.cache.InvocationContext;
import org.jboss.cache.Region;
+import org.jboss.cache.config.EvictionPolicyConfig;
import org.jboss.cache.config.Option;
-import org.jboss.cache.eviction.EvictionPolicyConfig;
import org.jboss.cache.eviction.LRUConfiguration;
import org.jboss.cache.jmx.CacheJmxWrapperMBean;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.NodeActivated;
+import org.jboss.cache.notifications.annotation.NodePassivated;
+import org.jboss.cache.notifications.event.NodeActivatedEvent;
+import org.jboss.cache.notifications.event.NodePassivatedEvent;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Pool;
@@ -442,14 +446,17 @@
* A CacheListener that allows us to get notifications of passivations and
* activations and thus notify the cached StatefulBeanContext.
*/
- public class ClusteredStatefulCacheListener extends AbstractCacheListener
+ @CacheListener
+ public class ClusteredStatefulCacheListener
{
- @Override
- public void nodeActivated(Fqn fqn, boolean pre, Map nodeData)
+ @NodeActivated
+ public void nodeActivated(NodeActivatedEvent event)
{
// Ignore everything but "post" events for nodes in our region
- if(pre) return;
+ if(event.isPre()) return;
+ Map nodeData = event.getData();
if (nodeData == null) return;
+ Fqn fqn = event.getFqn();
if(fqn.size() != FQN_SIZE) return;
if(!fqn.isChildOrEquals(cacheNode)) return;
@@ -493,11 +500,12 @@
}
- @Override
- public void nodePassivated(Fqn fqn, boolean pre, Map<Object, Object> data)
+ @NodePassivated
+ public void nodePassivated(NodePassivatedEvent event)
{
// Ignore everything but "pre" events for nodes in our region
- if(!pre) return;
+ if(!event.isPre()) return;
+ Fqn fqn = event.getFqn();
if(fqn.size() != FQN_SIZE) return;
if(!fqn.isChildOrEquals(cacheNode)) return;
@@ -507,7 +515,7 @@
try
{
localActivity.set(Boolean.TRUE);
- bean = (StatefulBeanContext) data.get("bean");
+ bean = (StatefulBeanContext) event.getData().get("bean");
if (bean != null)
{
ClassLoader cl = classloader.get();
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java 2007-07-11 16:49:09 UTC (rev 63975)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java 2007-07-11 16:51:26 UTC (rev 63976)
@@ -34,10 +34,12 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.jboss.cache.AbstractCacheListener;
+import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
-import org.jboss.cache.Cache;
import org.jboss.cache.jmx.CacheJmxWrapperMBean;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.NodeVisited;
+import org.jboss.cache.notifications.event.NodeVisitedEvent;
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.mx.util.MBeanServerLocator;
@@ -229,20 +231,22 @@
return cache;
}
- class MyListener extends AbstractCacheListener
+ @CacheListener
+ public class MyListener
{
- HashSet visited = new HashSet();
+ HashSet<String> visited = new HashSet<String>();
public void clear()
{
visited.clear();
}
- @Override
- public void nodeVisited(Fqn fqn, boolean pre)
+ @NodeVisited
+ public void nodeVisited(NodeVisitedEvent event)
{
- if (!pre)
+ if (!event.isPre())
{
+ Fqn fqn = event.getFqn();
System.out.println("MyListener - Visiting node " + fqn.toString());
String name = fqn.toString();
String token = ".clusteredentity.";
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java 2007-07-11 16:49:09 UTC (rev 63975)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/classloader/EntityQueryTestBean.java 2007-07-11 16:51:26 UTC (rev 63976)
@@ -24,7 +24,6 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.annotation.PreDestroy;
@@ -37,10 +36,16 @@
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
-import org.jboss.cache.AbstractCacheListener;
+import org.jboss.cache.Cache;
import org.jboss.cache.Fqn;
-import org.jboss.cache.Cache;
import org.jboss.cache.jmx.CacheJmxWrapperMBean;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.NodeCreated;
+import org.jboss.cache.notifications.annotation.NodeModified;
+import org.jboss.cache.notifications.annotation.NodeVisited;
+import org.jboss.cache.notifications.event.NodeCreatedEvent;
+import org.jboss.cache.notifications.event.NodeModifiedEvent;
+import org.jboss.cache.notifications.event.NodeVisitedEvent;
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.mx.util.MBeanServerLocator;
@@ -224,13 +229,13 @@
return getSawRegion(regionName, listener.accessed);
}
- private boolean getSawRegion(String regionName, Set sawEvent)
+ private boolean getSawRegion(String regionName, Set<Fqn<String>> sawEvent)
{
boolean saw = false;
- Fqn fqn = Fqn.fromString(regionName);
- for (Iterator it = sawEvent.iterator(); it.hasNext();)
+ Fqn<String> fqn = Fqn.fromString(regionName);
+ for (Iterator<Fqn<String>> it = sawEvent.iterator(); it.hasNext();)
{
- Fqn modified = (Fqn) it.next();
+ Fqn<String> modified = (Fqn<String>) it.next();
if (modified.isChildOf(fqn))
{
it.remove();
@@ -301,10 +306,11 @@
return cache;
}
- class MyListener extends AbstractCacheListener
+ @CacheListener
+ public class MyListener
{
- HashSet modified = new HashSet();
- HashSet accessed = new HashSet();
+ HashSet<Fqn<String>> modified = new HashSet<Fqn<String>>();
+ HashSet<Fqn<String>> accessed = new HashSet<Fqn<String>>();
public void clear()
{
@@ -312,32 +318,37 @@
accessed.clear();
}
- @Override
- public void nodeModified(Fqn fqn, boolean pre, boolean isLocal,
- ModificationType type, Map mods)
+ @NodeModified
+ public void nodeModified(NodeModifiedEvent event)
{
- if (!pre)
+ if (!event.isPre())
{
+ Fqn<String> fqn = event.getFqn();
System.out.println("MyListener - Modified node " + fqn.toString());
modified.add(fqn);
}
}
- @Override
- public void nodeCreated(Fqn fqn, boolean pre, boolean isLocal)
+ @NodeCreated
+ public void nodeCreated(NodeCreatedEvent event)
{
- if (!pre)
+ if (!event.isPre())
{
+ Fqn<String> fqn = event.getFqn();
System.out.println("MyListener - Created node " + fqn.toString());
modified.add(fqn);
}
}
- @Override
- public void nodeVisited(Fqn fqn, boolean pre)
- {
- System.out.println("MyListener - Visited node " + fqn.toString());
- accessed.add(fqn);
+ @NodeVisited
+ public void nodeVisited(NodeVisitedEvent event)
+ {
+ if (!event.isPre())
+ {
+ Fqn<String> fqn = event.getFqn();
+ System.out.println("MyListener - Visited node " + fqn.toString());
+ accessed.add(fqn);
+ }
}
}
More information about the jboss-cvs-commits
mailing list