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

[Manik Surtani]

  User: msurtani
  Date: 06/07/19 17:34:44

  Modified:    src/org/jboss/cache/loader/rmi    RemoteTreeCacheImpl.java
                        RmiCacheServer.java RmiCacheServerMBean.java
  Log:
  JBCACHE-657
  JBCACHE-594
  
  Revision  Changes    Path
  1.9       +6 -4      JBossCache/src/org/jboss/cache/loader/rmi/RemoteTreeCacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RemoteTreeCacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/rmi/RemoteTreeCacheImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- RemoteTreeCacheImpl.java	21 Jun 2006 11:10:58 -0000	1.8
  +++ RemoteTreeCacheImpl.java	19 Jul 2006 21:34:44 -0000	1.9
  @@ -9,7 +9,7 @@
   import org.jboss.cache.Fqn;
   import org.jboss.cache.Modification;
   import org.jboss.cache.NodeImpl;
  -import org.jboss.cache.TreeCacheMBean;
  +import org.jboss.cache.TreeCache;
   
   import java.rmi.RemoteException;
   import java.rmi.server.UnicastRemoteObject;
  @@ -22,18 +22,20 @@
    * Implementation of the {@link org.jboss.cache.TreeCache}'s remote interface.
    * 
    * @author Daniel Gredler
  - * @version $Id: RemoteTreeCacheImpl.java,v 1.8 2006/06/21 11:10:58 msurtani Exp $
  + * @version $Id: RemoteTreeCacheImpl.java,v 1.9 2006/07/19 21:34:44 msurtani Exp $
    */
   public class RemoteTreeCacheImpl extends UnicastRemoteObject implements RemoteTreeCache {
   
      private static final long serialVersionUID = 3096209368650710385L;
      
  -   private TreeCacheMBean cache;
  +   //private TreeCacheMBean cache;
  +    private TreeCache cache;
   
      /**
       * @throws RemoteException
       */
  -   public RemoteTreeCacheImpl(TreeCacheMBean cache) throws RemoteException {
  +   //public RemoteTreeCacheImpl(TreeCacheMBean cache) throws RemoteException {
  +    public RemoteTreeCacheImpl(TreeCache cache) throws RemoteException {
         this.cache=cache;
      }
   
  
  
  
  1.3       +9 -5      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- RmiCacheServer.java	3 Feb 2006 16:37:10 -0000	1.2
  +++ RmiCacheServer.java	19 Jul 2006 21:34:44 -0000	1.3
  @@ -15,11 +15,12 @@
    * delegate to this TreeCache
    *
    * @author Bela Ban
  - * @version $Id: RmiCacheServer.java,v 1.2 2006/02/03 16:37:10 msurtani Exp $
  + * @version $Id: RmiCacheServer.java,v 1.3 2006/07/19 21:34:44 msurtani Exp $
    */
   public class RmiCacheServer extends ServiceMBeanSupport implements RmiCacheServerMBean
   {
  -    TreeCacheMBean cache;
  +    //TreeCacheMBean cache;
  +    TreeCache cache;
       RemoteTreeCacheImpl remoteObj;
       String bindAddress;
       String mbeanServerName;
  @@ -68,12 +69,14 @@
           configFile = config;
       }
   
  -    public TreeCacheMBean getCache()
  +    //public TreeCacheMBean getCache()
  +    public TreeCache getCache()
       {
           return cache;
       }
   
  -    public void setCache(TreeCacheMBean cache)
  +    //public void setCache(TreeCacheMBean cache)
  +    public void setCache(TreeCache cache)
       {
           this.cache = cache;
       }
  @@ -118,7 +121,8 @@
               // 1. check whether we have an object name, pointing to the cache MBean
               if (cacheName != null && server != null)
               {
  -                cache = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, cacheName, server);
  +                //cache = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, cacheName, server);
  +                cache = (TreeCache) MBeanProxyExt.create(TreeCache.class, cacheName, server);
               }
           }
   
  
  
  
  1.2       +6 -4      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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- RmiCacheServerMBean.java	3 Feb 2006 16:37:10 -0000	1.1
  +++ RmiCacheServerMBean.java	19 Jul 2006 21:34:44 -0000	1.2
  @@ -1,6 +1,6 @@
   package org.jboss.cache.loader.rmi;
   
  -import org.jboss.cache.TreeCacheMBean;
  +import org.jboss.cache.TreeCache;
   import org.jboss.system.ServiceMBean;
   
   import javax.management.MalformedObjectNameException;
  @@ -8,7 +8,7 @@
   
   /**
    * @author Manik Surtani
  - * @version $Id: RmiCacheServerMBean.java,v 1.1 2006/02/03 16:37:10 msurtani Exp $
  + * @version $Id: RmiCacheServerMBean.java,v 1.2 2006/07/19 21:34:44 msurtani Exp $
    */
   public interface RmiCacheServerMBean extends ServiceMBean {
      String getBindAddress();
  @@ -27,9 +27,11 @@
   
      void setConfig(String config);
   
  -   TreeCacheMBean getCache();
  +   //TreeCacheMBean getCache();
  +    TreeCache getCache();
   
  -   void setCache(TreeCacheMBean cache);
  +   //void setCache(TreeCacheMBean cache);
  +    void setCache(TreeCache cache);
   
      String getCacheName();