[jboss-cvs] JBossAS SVN: r66298 - in trunk/cluster/src: main/org/jboss/cache/invalidation/bridges and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2007-10-19 12:48:30 -0400 (Fri, 19 Oct 2007)
New Revision: 66298

Modified:
   trunk/cluster/src/etc/cluster-beans.xml
   trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridge.java
   trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridgeMBean.java
Log:
[JBAS-4888] Inject InvalidationManagerMBean into JGCacheInvalidationBridge

Modified: trunk/cluster/src/etc/cluster-beans.xml
===================================================================
--- trunk/cluster/src/etc/cluster-beans.xml	2007-10-19 16:48:18 UTC (rev 66297)
+++ trunk/cluster/src/etc/cluster-beans.xml	2007-10-19 16:48:30 UTC (rev 66298)
@@ -264,11 +264,10 @@
    		 
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=InvalidationBridge,type=JavaGroups", exposedInterface=org.jboss.cache.invalidation.bridges.JGCacheInvalidationBridgeMBean.class, registerDirectly=true)</annotation>
       
-      <depends>HAPartition</depends>
-      <depends>jboss.cache:service=InvalidationManager</depends>
+      <depends>HAPartition</depends>      
          
       <property name="HAPartition"><inject bean="HAPartition"/></property>
-      <property name="invalidationManager">jboss.cache:service=InvalidationManager</property>
+      <property name="invalidationManager"><inject bean="jboss.cache:service=InvalidationManager"/></property>
       <property name="bridgeName">DefaultJGBridge</property>
       
    </bean>

Modified: trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridge.java
===================================================================
--- trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridge.java	2007-10-19 16:48:18 UTC (rev 66297)
+++ trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridge.java	2007-10-19 16:48:30 UTC (rev 66298)
@@ -23,18 +23,17 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Vector;
 import java.util.Collection;
+import java.util.Vector;
 
 import org.jboss.cache.invalidation.BatchInvalidation;
-import org.jboss.cache.invalidation.InvalidationManager;
-import org.jboss.cache.invalidation.InvalidationGroup;
-import org.jboss.cache.invalidation.InvalidationManagerMBean;
 import org.jboss.cache.invalidation.BridgeInvalidationSubscription;
 import org.jboss.cache.invalidation.InvalidationBridgeListener;
-import org.jboss.ha.framework.interfaces.HAPartition;
-import org.jboss.ha.framework.interfaces.DistributedState;
+import org.jboss.cache.invalidation.InvalidationGroup;
+import org.jboss.cache.invalidation.InvalidationManagerMBean;
 import org.jboss.ha.framework.interfaces.DistributedReplicantManager;
+import org.jboss.ha.framework.interfaces.DistributedState;
+import org.jboss.ha.framework.interfaces.HAPartition;
 
 /**
  * JGroups implementation of a cache invalidation bridge
@@ -68,7 +67,6 @@
     * The ClusterPartition with which we are associated.
     */
    protected HAPartition partition;
-   protected String invalidationManagerName = InvalidationManager.DEFAULT_JMX_SERVICE_NAME;
    protected String bridgeName = "DefaultJGCacheIB";
    
    protected DistributedState ds = null;
@@ -98,11 +96,6 @@
    // Public --------------------------------------------------------
    
    // JGCacheInvalidationBridgeMBean implementation ----------------------------------------------
-   
-   public String getInvalidationManager ()
-   {
-      return this.invalidationManagerName;
-   }
 
    public HAPartition getHAPartition()
    {
@@ -119,11 +112,6 @@
       return this.partition.getPartitionName();
    }
    
-   public void setInvalidationManager (String objectName)
-   {
-      this.invalidationManagerName = objectName;
-   }
-   
    public String getBridgeName ()
    {
       return this.bridgeName;
@@ -281,6 +269,18 @@
       }
    }
    
+   // Bean configuration properties ---------------------------------------------------
+   
+   public InvalidationManagerMBean getInvalidationManager ()
+   {
+      return this.invalMgr;
+   }
+   
+   public void setInvalidationManager (InvalidationManagerMBean manager)
+   {
+      this.invalMgr = manager;
+   }
+   
    // ServiceMBeanSupport overrides ---------------------------------------------------
    
    public void startService () throws Exception
@@ -302,11 +302,8 @@
       partition.registerRPCHandler(RPC_HANDLER_NAME, this);   
       
       // we now publish the list of caches we have access to
-      //
-      this.invalMgr = (org.jboss.cache.invalidation.InvalidationManagerMBean)
-         org.jboss.system.Registry.lookup (this.invalidationManagerName);
       if( invalMgr == null )
-         throw new IllegalStateException("Failed to find: "+invalidationManagerName+", check dependency");
+         throw new IllegalStateException("Failed to find an InvalidationManagerMBean, ensure one is injected");
 
       publishLocalInvalidationGroups ();      
       this.updatedBridgedInvalidationGroupsInfo ();
@@ -328,8 +325,8 @@
                   
          this.ds.remove (this.RPC_HANDLER_NAME, this.nodeName, true);
          
-         this.invalMgr = null;
-         partition = null;
+//         this.invalMgr = null;
+//         partition = null;
          this.drm = null;
          this.ds = null;
          this.invalidationSubscription = null;

Modified: trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridgeMBean.java
===================================================================
--- trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridgeMBean.java	2007-10-19 16:48:18 UTC (rev 66297)
+++ trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridgeMBean.java	2007-10-19 16:48:30 UTC (rev 66298)
@@ -77,21 +77,6 @@
    void setHAPartition(HAPartition clusterPartition);
    
    /**
-    * Get the invalidation manager name.
-    * 
-    * @return the name of the invalidation manager
-    */
-   public String getInvalidationManager();
-   
-   /**
-    * Set the invalidation manager name.  If not set, the default name of
-    * InvalidationManager.DEFAULT_JMX_SERVICE_NAME is used.
-    * 
-    * @param objectName the name of the invalidation manager
-    */
-   public void setInvalidationManager(String objectName);
-   
-   /**
     * Get the invalidation bridge name.
     * 
     * @return the invalidation bridge name