[jboss-cvs] JBossCache/src/org/jboss/cache/loader/rmi ...

[Manik Surtani]

  User: msurtani
  Date: 06/09/07 09:52:28

  Modified:    src/org/jboss/cache/loader/rmi   RmiCacheServer.java
                        RmiCacheServerMBean.java
  Log:
  cleaned up jmx interfaces, fixed tx and gtx allocation problems
  
  Revision  Changes    Path
  1.6       +15 -7     JBossCache/src/org/jboss/cache/loader/rmi/RmiCacheServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RmiCacheServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/rmi/RmiCacheServer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- RmiCacheServer.java	6 Sep 2006 15:30:55 -0000	1.5
  +++ RmiCacheServer.java	7 Sep 2006 13:52:28 -0000	1.6
  @@ -2,9 +2,10 @@
   
   import org.jboss.cache.TreeCache;
   import org.jboss.cache.factories.XmlConfigurationParser;
  +import org.jboss.cache.jmx.JmxUtil;
   import org.jboss.mx.util.MBeanProxyExt;
  -import org.jboss.system.ServiceMBeanSupport;
   
  +import javax.management.MBeanServer;
   import javax.management.MalformedObjectNameException;
   import javax.management.ObjectName;
   import java.rmi.Naming;
  @@ -14,9 +15,9 @@
    * delegate to this TreeCache
    *
    * @author Bela Ban
  - * @version $Id: RmiCacheServer.java,v 1.5 2006/09/06 15:30:55 msurtani Exp $
  + * @version $Id: RmiCacheServer.java,v 1.6 2006/09/07 13:52:28 msurtani Exp $
    */
  -public class RmiCacheServer extends ServiceMBeanSupport implements RmiCacheServerMBean
  +public class RmiCacheServer implements RmiCacheServerMBean
   {
      //TreeCacheMBean cache;
      TreeCache cache;
  @@ -108,15 +109,15 @@
         this.bindName = bindName;
      }
   
  -   public void createService() throws Exception
  +   public void create()
      {
  -      super.createService();
      }
   
  -   public void startService() throws Exception
  +   public void start() throws Exception
      {
         if (cache == null)
         {
  +         MBeanServer server = JmxUtil.getMBeanServer();
            // 1. check whether we have an object name, pointing to the cache MBean
            if (cacheName != null && server != null)
            {
  @@ -136,6 +137,14 @@
         Naming.rebind("//" + bindAddress + ":" + port + "/" + bindName, remoteObj);
      }
   
  +   public void stop()
  +   {
  +   }
  +
  +   public void destroy()
  +   {
  +   }
  +
      public void stopService()
      {
         if (cache != null)
  @@ -159,7 +168,6 @@
   
      public void destroyService() throws Exception
      {
  -      super.destroyService();
      }
   
   
  
  
  
  1.3       +6 -5      JBossCache/src/org/jboss/cache/loader/rmi/RmiCacheServerMBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RmiCacheServerMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/rmi/RmiCacheServerMBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- RmiCacheServerMBean.java	19 Jul 2006 21:34:44 -0000	1.2
  +++ RmiCacheServerMBean.java	7 Sep 2006 13:52:28 -0000	1.3
  @@ -1,16 +1,17 @@
   package org.jboss.cache.loader.rmi;
   
   import org.jboss.cache.TreeCache;
  -import org.jboss.system.ServiceMBean;
  +import org.jboss.cache.jmx.LifeCycle;
   
   import javax.management.MalformedObjectNameException;
   import java.net.UnknownHostException;
   
   /**
    * @author Manik Surtani
  - * @version $Id: RmiCacheServerMBean.java,v 1.2 2006/07/19 21:34:44 msurtani Exp $
  + * @version $Id: RmiCacheServerMBean.java,v 1.3 2006/09/07 13:52:28 msurtani Exp $
    */
  -public interface RmiCacheServerMBean extends ServiceMBean {
  +public interface RmiCacheServerMBean extends LifeCycle
  +{
      String getBindAddress();
   
      void setBindAddress(String bind_addr) throws UnknownHostException;