[jboss-cvs] JBossCache/src/org/jboss/cache/loader/rmi ...
Manik Surtani
msurtani at jboss.com
Sat Dec 30 12:50:00 EST 2006
User: msurtani
Date: 06/12/30 12:50:00
Modified: src/org/jboss/cache/loader/rmi RmiCacheServerMBean.java
RemoteTreeCacheImpl.java RmiCacheServer.java
RemoteTreeCache.java
Log:
Major changes to restructure cache and node object model
Revision Changes Path
1.4 +4 -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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- RmiCacheServerMBean.java 7 Sep 2006 13:52:28 -0000 1.3
+++ RmiCacheServerMBean.java 30 Dec 2006 17:50:00 -0000 1.4
@@ -1,6 +1,6 @@
package org.jboss.cache.loader.rmi;
-import org.jboss.cache.TreeCache;
+import org.jboss.cache.CacheImpl;
import org.jboss.cache.jmx.LifeCycle;
import javax.management.MalformedObjectNameException;
@@ -8,7 +8,7 @@
/**
* @author Manik Surtani
- * @version $Id: RmiCacheServerMBean.java,v 1.3 2006/09/07 13:52:28 msurtani Exp $
+ * @version $Id: RmiCacheServerMBean.java,v 1.4 2006/12/30 17:50:00 msurtani Exp $
*/
public interface RmiCacheServerMBean extends LifeCycle
{
@@ -29,10 +29,10 @@
void setConfig(String config);
//TreeCacheMBean getCache();
- TreeCache getCache();
+ CacheImpl getCache();
//void setCache(TreeCacheMBean cache);
- void setCache(TreeCache cache);
+ void setCache(CacheImpl cache);
String getCacheName();
1.11 +11 -11 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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- RemoteTreeCacheImpl.java 22 Sep 2006 16:27:56 -0000 1.10
+++ RemoteTreeCacheImpl.java 30 Dec 2006 17:50:00 -0000 1.11
@@ -6,9 +6,9 @@
*/
package org.jboss.cache.loader.rmi;
+import org.jboss.cache.CacheImpl;
import org.jboss.cache.Fqn;
-import org.jboss.cache.NodeImpl;
-import org.jboss.cache.TreeCache;
+import org.jboss.cache.Node;
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
@@ -16,10 +16,10 @@
import java.util.Set;
/**
- * Implementation of the {@link org.jboss.cache.TreeCache}'s remote interface.
+ * Implementation of the {@link org.jboss.cache.CacheImpl}'s remote interface.
*
* @author Daniel Gredler
- * @version $Id: RemoteTreeCacheImpl.java,v 1.10 2006/09/22 16:27:56 msurtani Exp $
+ * @version $Id: RemoteTreeCacheImpl.java,v 1.11 2006/12/30 17:50:00 msurtani Exp $
*/
public class RemoteTreeCacheImpl extends UnicastRemoteObject implements RemoteTreeCache
{
@@ -27,13 +27,13 @@
private static final long serialVersionUID = 3096209368650710385L;
//private TreeCacheMBean cache;
- private TreeCache cache;
+ private CacheImpl cache;
/**
* @throws RemoteException
*/
//public RemoteTreeCacheImpl(TreeCacheMBean cache) throws RemoteException {
- public RemoteTreeCacheImpl(TreeCache cache) throws RemoteException
+ public RemoteTreeCacheImpl(CacheImpl cache) throws RemoteException
{
this.cache = cache;
}
@@ -47,7 +47,7 @@
}
/**
- * @see org.jboss.cache.loader.rmi.RemoteTreeCache#get(org.jboss.cache.Fqn, java.lang.Object)
+ * @see org.jboss.cache.loader.rmi.RemoteTreeCache#get(org.jboss.cache.Fqn,java.lang.Object)
*/
public Object get(Fqn name, Object key) throws Exception, RemoteException
{
@@ -57,7 +57,7 @@
/**
* @see org.jboss.cache.loader.rmi.RemoteTreeCache#get(org.jboss.cache.Fqn)
*/
- public NodeImpl get(Fqn name) throws Exception, RemoteException
+ public Node get(Fqn name) throws Exception, RemoteException
{
return this.cache.get(name);
}
@@ -71,7 +71,7 @@
}
/**
- * @see org.jboss.cache.loader.rmi.RemoteTreeCache#put(org.jboss.cache.Fqn, java.lang.Object, java.lang.Object)
+ * @see org.jboss.cache.loader.rmi.RemoteTreeCache#put(org.jboss.cache.Fqn,java.lang.Object,java.lang.Object)
*/
public Object put(Fqn name, Object key, Object value) throws Exception, RemoteException
{
@@ -79,7 +79,7 @@
}
/**
- * @see org.jboss.cache.loader.rmi.RemoteTreeCache#put(org.jboss.cache.Fqn, java.util.Map)
+ * @see org.jboss.cache.loader.rmi.RemoteTreeCache#put(org.jboss.cache.Fqn,java.util.Map)
*/
public void put(Fqn name, Map attributes) throws Exception, RemoteException
{
@@ -87,7 +87,7 @@
}
/**
- * @see org.jboss.cache.loader.rmi.RemoteTreeCache#remove(org.jboss.cache.Fqn, java.lang.Object)
+ * @see org.jboss.cache.loader.rmi.RemoteTreeCache#remove(org.jboss.cache.Fqn,java.lang.Object)
*/
public Object remove(Fqn name, Object key) throws Exception, RemoteException
{
1.9 +10 -10 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- RmiCacheServer.java 25 Oct 2006 12:49:31 -0000 1.8
+++ RmiCacheServer.java 30 Dec 2006 17:50:00 -0000 1.9
@@ -1,6 +1,6 @@
package org.jboss.cache.loader.rmi;
-import org.jboss.cache.TreeCache;
+import org.jboss.cache.CacheImpl;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.jmx.JmxUtil;
@@ -11,16 +11,16 @@
import java.rmi.Naming;
/**
- * Server which exports an RMI stub to the TreeCache. Clients can use the RmiDelegatingCacheLoader to remotely
- * delegate to this TreeCache
+ * Server which exports an RMI stub to the CacheImpl. Clients can use the RmiDelegatingCacheLoader to remotely
+ * delegate to this CacheImpl
*
* @author Bela Ban
- * @version $Id: RmiCacheServer.java,v 1.8 2006/10/25 12:49:31 msurtani Exp $
+ * @version $Id: RmiCacheServer.java,v 1.9 2006/12/30 17:50:00 msurtani Exp $
*/
public class RmiCacheServer implements RmiCacheServerMBean
{
//TreeCacheMBean cache;
- TreeCache cache;
+ CacheImpl cache;
RemoteTreeCacheImpl remoteObj;
String bindAddress;
String mbeanServerName;
@@ -70,13 +70,13 @@
}
//public TreeCacheMBean getCache()
- public TreeCache getCache()
+ public CacheImpl getCache()
{
return cache;
}
//public void setCache(TreeCacheMBean cache)
- public void setCache(TreeCache cache)
+ public void setCache(CacheImpl cache)
{
this.cache = cache;
}
@@ -122,14 +122,14 @@
if (cacheName != null && server != null)
{
//cache = (TreeCacheMBean) MBeanProxyExt.create(TreeCacheMBean.class, cacheName, server);
- cache = (TreeCache) MBeanServerInvocationHandler.newProxyInstance(server, cacheName, TreeCache.class, false);
- //cache = (TreeCache) MBeanProxyExt.create(TreeCache.class, cacheName, server);
+ cache = (CacheImpl) MBeanServerInvocationHandler.newProxyInstance(server, cacheName, CacheImpl.class, false);
+ //cache = (CacheImpl) MBeanProxyExt.create(CacheImpl.class, cacheName, server);
}
}
if (cache == null)
{
- cache = new TreeCache();
+ cache = new CacheImpl();
cache.setConfiguration(new XmlConfigurationParser().parseFile(configFile));
cache.start(); // kick start tree cache
}
1.9 +4 -4 JBossCache/src/org/jboss/cache/loader/rmi/RemoteTreeCache.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RemoteTreeCache.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/rmi/RemoteTreeCache.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- RemoteTreeCache.java 22 Sep 2006 16:27:56 -0000 1.8
+++ RemoteTreeCache.java 30 Dec 2006 17:50:00 -0000 1.9
@@ -7,7 +7,7 @@
package org.jboss.cache.loader.rmi;
import org.jboss.cache.Fqn;
-import org.jboss.cache.NodeImpl;
+import org.jboss.cache.Node;
import java.rmi.Remote;
import java.rmi.RemoteException;
@@ -15,11 +15,11 @@
import java.util.Set;
/**
- * Remote interface to a {@link org.jboss.cache.TreeCache} instance. Used by
+ * Remote interface to a {@link org.jboss.cache.CacheImpl} instance. Used by
* {@link org.jboss.cache.loader.RmiDelegatingCacheLoader}.
*
* @author Daniel Gredler
- * @version $Id: RemoteTreeCache.java,v 1.8 2006/09/22 16:27:56 msurtani Exp $
+ * @version $Id: RemoteTreeCache.java,v 1.9 2006/12/30 17:50:00 msurtani Exp $
*/
public interface RemoteTreeCache extends Remote
{
@@ -27,7 +27,7 @@
public Object get(Fqn name, Object key) throws Exception, RemoteException;
- public NodeImpl get(Fqn name) throws Exception, RemoteException;
+ public Node get(Fqn name) throws Exception, RemoteException;
public boolean exists(Fqn name) throws Exception, RemoteException;
More information about the jboss-cvs-commits
mailing list