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

[Manik Surtani]

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

  Modified:    src/org/jboss/cache/loader/tcp   TcpCacheServer.java
                        TcpCacheServerMBean.java
  Log:
  cleaned up jmx interfaces, fixed tx and gtx allocation problems
  
  Revision  Changes    Path
  1.18      +16 -12    JBossCache/src/org/jboss/cache/loader/tcp/TcpCacheServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TcpCacheServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/tcp/TcpCacheServer.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- TcpCacheServer.java	6 Sep 2006 15:30:55 -0000	1.17
  +++ TcpCacheServer.java	7 Sep 2006 13:52:28 -0000	1.18
  @@ -8,10 +8,11 @@
   import org.jboss.cache.Modification;
   import org.jboss.cache.TreeCache;
   import org.jboss.cache.factories.XmlConfigurationParser;
  +import org.jboss.cache.jmx.JmxUtil;
   import org.jboss.cache.loader.DelegatingCacheLoader;
   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.io.IOException;
  @@ -33,9 +34,9 @@
    * TCP-IP based CacheServer, configure TcpDelegatingCacheLoader with host and port of this server
    *
    * @author Bela Ban
  - * @version $Id: TcpCacheServer.java,v 1.17 2006/09/06 15:30:55 msurtani Exp $
  + * @version $Id: TcpCacheServer.java,v 1.18 2006/09/07 13:52:28 msurtani Exp $
    */
  -public class TcpCacheServer extends ServiceMBeanSupport implements TcpCacheServerMBean
  +public class TcpCacheServer implements TcpCacheServerMBean
   {
      ServerSocket srv_sock;
      InetAddress bind_addr = null;
  @@ -117,18 +118,14 @@
         this.cache_name = new ObjectName(cache_name);
      }
   
  -   public void createService() throws Exception
  -   {
  -      super.createService();
  -   }
  -
  -   public void startService() throws Exception
  +   public void start() throws Exception
      {
         Socket client_sock;
         Connection conn;
   
         if (cache == null)
         {
  +         MBeanServer server = JmxUtil.getMBeanServer();
            // 1. check whether we have an object name, pointing to the cache MBean
            if (cache_name != null && server != null)
            {
  @@ -197,9 +194,16 @@
      }
   
   
  +   public void create()
  +   {
  +   }
  +
  +   public void stop()
  +   {
  +   }
  +
      public void destroy()
      {
  -      super.destroy();
      }
   
   
  @@ -459,8 +463,8 @@
         server.setBindAddress(bind_addr);
         server.setPort(port);
         server.setConfig(config);
  -      server.createService();
  -      server.startService();
  +      server.create();
  +      server.start();
      }
   
   
  
  
  
  1.4       +6 -5      JBossCache/src/org/jboss/cache/loader/tcp/TcpCacheServerMBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TcpCacheServerMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/tcp/TcpCacheServerMBean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- TcpCacheServerMBean.java	19 Jul 2006 21:34:44 -0000	1.3
  +++ TcpCacheServerMBean.java	7 Sep 2006 13:52:28 -0000	1.4
  @@ -1,16 +1,17 @@
   package org.jboss.cache.loader.tcp;
   
   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 Bela Ban
  - * @version $Id: TcpCacheServerMBean.java,v 1.3 2006/07/19 21:34:44 msurtani Exp $
  + * @version $Id: TcpCacheServerMBean.java,v 1.4 2006/09/07 13:52:28 msurtani Exp $
    */
  -public interface TcpCacheServerMBean extends ServiceMBean {
  +public interface TcpCacheServerMBean extends LifeCycle
  +{
      String getBindAddress();
   
      void setBindAddress(String bind_addr) throws UnknownHostException;