[jboss-cvs] JBossCache/src/org/jboss/cache/jmx ...
Manik Surtani
manik at jboss.org
Thu Jun 28 12:53:37 EDT 2007
User: msurtani
Date: 07/06/28 12:53:37
Modified: src/org/jboss/cache/jmx CacheNotificationListener.java
CacheNotificationBroadcaster.java
Log:
Notification changes
Revision Changes Path
1.7 +99 -91 JBossCache/src/org/jboss/cache/jmx/CacheNotificationListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheNotificationListener.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/jmx/CacheNotificationListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- CacheNotificationListener.java 11 Jun 2007 15:06:07 -0000 1.6
+++ CacheNotificationListener.java 28 Jun 2007 16:53:37 -0000 1.7
@@ -22,24 +22,37 @@
package org.jboss.cache.jmx;
-import org.jboss.cache.CacheListener;
-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.Fqn;
-import org.jgroups.View;
+import org.jboss.cache.notifications.annotation.CacheListener;
+import org.jboss.cache.notifications.annotation.CacheStarted;
+import org.jboss.cache.notifications.annotation.CacheStopped;
+import org.jboss.cache.notifications.annotation.NodeActivated;
+import org.jboss.cache.notifications.annotation.NodeCreated;
+import org.jboss.cache.notifications.annotation.NodeEvicted;
+import org.jboss.cache.notifications.annotation.NodeLoaded;
+import org.jboss.cache.notifications.annotation.NodeModified;
+import org.jboss.cache.notifications.annotation.NodeMoved;
+import org.jboss.cache.notifications.annotation.NodePassivated;
+import org.jboss.cache.notifications.annotation.NodeRemoved;
+import org.jboss.cache.notifications.annotation.NodeVisited;
+import org.jboss.cache.notifications.annotation.ViewChanged;
+import org.jboss.cache.notifications.event.Event;
+import org.jboss.cache.notifications.event.NodeEvent;
+import org.jboss.cache.notifications.event.NodeMovedEvent;
+import org.jboss.cache.notifications.event.ViewChangedEvent;
import javax.management.MBeanNotificationInfo;
import javax.management.Notification;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
/**
- * A {@link CacheListener} that creates JMX notifications from listener
+ * A CacheListener that creates JMX notifications from listener
* events.
*
* @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
-public class CacheNotificationListener implements CacheListener
+ at CacheListener
+public class CacheNotificationListener
{
// Notification Messages
private static final String MSG_CACHE_STARTED = "Cache has been started.";
@@ -96,7 +109,7 @@
CacheNotificationBroadcaster.NOTIF_NODE_PASSIVATED,
CacheNotificationBroadcaster.NOTIF_NODE_REMOVED,
CacheNotificationBroadcaster.NOTIF_NODE_VISITED,
- CacheNotificationBroadcaster.NOTIF_VIEW_CHANGED
+ CacheNotificationBroadcaster.NOTIF_VIEW_CHANGED,
};
MBeanNotificationInfo info = new MBeanNotificationInfo(types, NOTIFICATION_NAME, NOTIFICATION_DESCR);
@@ -105,88 +118,83 @@
// ----------------------------------------------------------- CacheListener
- public void cacheStarted(CacheSPI cache)
+ @CacheStarted
+ @CacheStopped
+ @NodeCreated
+ @NodeEvicted
+ @NodeLoaded
+ @NodeModified
+ @NodeRemoved
+ @NodeMoved
+ @NodeVisited
+ @NodeActivated
+ @NodePassivated
+ @ViewChanged
+ public void broadcast(Event e)
+ {
+ NodeEvent ne;
+ Notification n = null;
+ switch (e.getType())
{
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_CACHE_STARTED, broadcaster, seq(), MSG_CACHE_STARTED);
+ case CACHE_STARTED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_CACHE_STARTED, broadcaster, seq(), MSG_CACHE_STARTED);
n.setUserData(serviceName);
- broadcaster.sendNotification(n);
- }
-
- public void cacheStopped(CacheSPI cache)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_CACHE_STOPPED, broadcaster, seq(), MSG_CACHE_STOPPED);
+ break;
+ case CACHE_STOPPED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_CACHE_STOPPED, broadcaster, seq(), MSG_CACHE_STOPPED);
n.setUserData(serviceName);
- broadcaster.sendNotification(n);
- }
-
- public void nodeCreated(Fqn fqn, boolean pre, boolean isLocal)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_CREATED, broadcaster, seq(), MSG_NODE_CREATED);
- n.setUserData(new Object[]{fqn.toString(), pre, isLocal});
- broadcaster.sendNotification(n);
- }
-
- public void nodeEvicted(Fqn fqn, boolean pre, boolean isLocal)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_EVICTED, broadcaster, seq(), MSG_NODE_EVICTED);
- n.setUserData(new Object[]{fqn.toString(), pre, isLocal});
- broadcaster.sendNotification(n);
- }
-
- public void nodeLoaded(Fqn fqn, boolean pre, Map data)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_LOADED, broadcaster, seq(), MSG_NODE_LOADED);
- n.setUserData(new Object[]{fqn.toString(), pre});
- broadcaster.sendNotification(n);
- }
-
- public void nodeModified(Fqn fqn, boolean pre, boolean isLocal, ModificationType modType, Map data)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_MODIFIED, broadcaster, seq(), MSG_NODE_MODIFIED);
- n.setUserData(new Object[]{fqn.toString(), pre, isLocal});
- broadcaster.sendNotification(n);
-
+ break;
+ case NODE_CREATED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_CREATED, broadcaster, seq(), MSG_NODE_CREATED);
+ ne = (NodeEvent) e;
+ n.setUserData(new Object[]{ne.getFqn().toString(), e.isPre(), ne.isOriginLocal()});
+ break;
+ case NODE_EVICTED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_EVICTED, broadcaster, seq(), MSG_NODE_EVICTED);
+ ne = (NodeEvent) e;
+ n.setUserData(new Object[]{ne.getFqn().toString(), e.isPre(), ne.isOriginLocal()});
+ break;
+ case NODE_LOADED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_LOADED, broadcaster, seq(), MSG_NODE_LOADED);
+ ne = (NodeEvent) e;
+ n.setUserData(new Object[]{ne.getFqn().toString(), e.isPre()});
+ break;
+ case NODE_MODIFIED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_MODIFIED, broadcaster, seq(), MSG_NODE_MODIFIED);
+ ne = (NodeEvent) e;
+ n.setUserData(new Object[]{ne.getFqn().toString(), e.isPre(), ne.isOriginLocal()});
+ break;
+ case NODE_REMOVED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_REMOVED, broadcaster, seq(), MSG_NODE_REMOVED);
+ ne = (NodeEvent) e;
+ n.setUserData(new Object[]{ne.getFqn().toString(), e.isPre(), ne.isOriginLocal()});
+ break;
+ case NODE_MOVED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_MOVED, broadcaster, seq(), MSG_NODE_MOVED);
+ NodeMovedEvent nme = (NodeMovedEvent) e;
+ n.setUserData(new Object[]{nme.getFqn().toString(), nme.getTargetFqn().toString(), e.isPre()});
+ break;
+ case NODE_VISITED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_VISITED, broadcaster, seq(), MSG_NODE_VISITED);
+ ne = (NodeEvent) e;
+ n.setUserData(new Object[]{ne.getFqn().toString(), e.isPre()});
+ break;
+ case NODE_ACTIVATED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_ACTIVATED, broadcaster, seq(), MSG_NODE_ACTIVATED);
+ ne = (NodeEvent) e;
+ n.setUserData(new Object[]{ne.getFqn().toString(), e.isPre()});
+ break;
+ case NODE_PASSIVATED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_PASSIVATED, broadcaster, seq(), MSG_NODE_PASSIVATED);
+ ne = (NodeEvent) e;
+ n.setUserData(new Object[]{ne.getFqn().toString(), e.isPre()});
+ break;
+ case VIEW_CHANGED:
+ n = new Notification(CacheNotificationBroadcaster.NOTIF_VIEW_CHANGED, broadcaster, seq(), MSG_VIEW_CHANGED);
+ n.setUserData(((ViewChangedEvent) e).getNewView().toString());
+ break;
}
- public void nodeRemoved(Fqn fqn, boolean pre, boolean isLocal, Map data)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_REMOVED, broadcaster, seq(), MSG_NODE_REMOVED);
- n.setUserData(new Object[]{fqn.toString(), pre, isLocal});
- broadcaster.sendNotification(n);
- }
-
- public void nodeMoved(Fqn from, Fqn to, boolean pre, boolean isLocal)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_MOVED, broadcaster, seq(), MSG_NODE_MOVED);
- n.setUserData(new Object[]{from.toString(), to.toString(), pre});
- broadcaster.sendNotification(n);
- }
-
- public void nodeVisited(Fqn fqn, boolean pre)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_VISITED, broadcaster, seq(), MSG_NODE_VISITED);
- n.setUserData(new Object[]{fqn.toString(), pre});
- broadcaster.sendNotification(n);
- }
-
- public void viewChange(View view)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_VIEW_CHANGED, broadcaster, seq(), MSG_VIEW_CHANGED);
- n.setUserData(view.toString());
- broadcaster.sendNotification(n);
- }
-
- public void nodeActivated(Fqn fqn, boolean pre, Map data)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_ACTIVATED, broadcaster, seq(), MSG_NODE_ACTIVATED);
- n.setUserData(new Object[]{fqn.toString(), pre});
- broadcaster.sendNotification(n);
- }
-
- public void nodePassivated(Fqn fqn, boolean pre, Map data)
- {
- Notification n = new Notification(CacheNotificationBroadcaster.NOTIF_NODE_PASSIVATED, broadcaster, seq(), MSG_NODE_PASSIVATED);
- n.setUserData(new Object[]{fqn.toString(), pre});
broadcaster.sendNotification(n);
}
1.2 +15 -15 JBossCache/src/org/jboss/cache/jmx/CacheNotificationBroadcaster.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheNotificationBroadcaster.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/jmx/CacheNotificationBroadcaster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
More information about the jboss-cvs-commits
mailing list