[jboss-cvs] JBossCache/src/org/jboss/cache/marshall ...
Manik Surtani
msurtani at jboss.com
Sat Dec 30 12:50:05 EST 2006
User: msurtani
Date: 06/12/30 12:50:05
Modified: src/org/jboss/cache/marshall MethodDeclarations.java
TreeCacheMarshaller200.java
Log:
Major changes to restructure cache and node object model
Revision Changes Path
1.28 +51 -51 JBossCache/src/org/jboss/cache/marshall/MethodDeclarations.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MethodDeclarations.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/MethodDeclarations.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- MethodDeclarations.java 20 Dec 2006 22:28:12 -0000 1.27
+++ MethodDeclarations.java 30 Dec 2006 17:50:05 -0000 1.28
@@ -8,10 +8,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.DataNode;
+import org.jboss.cache.CacheImpl;
import org.jboss.cache.Fqn;
import org.jboss.cache.GlobalTransaction;
-import org.jboss.cache.TreeCache;
+import org.jboss.cache.Node;
import org.jboss.cache.buddyreplication.BuddyGroup;
import org.jboss.cache.lock.NodeLock;
import org.jboss.cache.optimistic.DataVersion;
@@ -31,7 +31,7 @@
* allowing lookup operations both ways.
*
* @author <a href="galder.zamarreno at jboss.com">Galder Zamarreno</a>
- * @version $Revision: 1.27 $
+ * @version $Revision: 1.28 $
*/
public class MethodDeclarations
{
@@ -42,7 +42,7 @@
static final Set<Integer> buddyGroupOrganisationMethodIds = new HashSet<Integer>();
static final Set<Integer> putMethodIds = new HashSet<Integer>();
- // maintain a list of method IDs that correspond to Methods in TreeCache
+ // maintain a list of method IDs that correspond to Methods in CacheImpl
static final Map<Integer, Method> methods = new HashMap<Integer, Method>();
// and for reverse lookup
@@ -221,59 +221,59 @@
{
try
{
- getDataMapMethodLocal = TreeCache.class.getDeclaredMethod("_getData", Fqn.class);
- existsMethod = TreeCache.class.getDeclaredMethod("exists", Fqn.class);
- putDataMethodLocal = TreeCache.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class);
- putDataEraseMethodLocal = TreeCache.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class, boolean.class);
- putKeyValMethodLocal = TreeCache.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Object.class, Object.class, boolean.class);
- removeNodeMethodLocal = TreeCache.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, boolean.class);
- removeKeyMethodLocal = TreeCache.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, Object.class, boolean.class);
- removeDataMethodLocal = TreeCache.class.getDeclaredMethod("_removeData", GlobalTransaction.class, Fqn.class, boolean.class);
- evictNodeMethodLocal = TreeCache.class.getDeclaredMethod("_evict", Fqn.class);
- evictVersionedNodeMethodLocal = TreeCache.class.getDeclaredMethod("_evict", Fqn.class, DataVersion.class);
-
- // evictKeyValueMethodLocal=TreeCache.class.getDeclaredMethod("_evict", new Class[]{Fqn.class, Object.class});
- prepareMethod = TreeCache.class.getDeclaredMethod("prepare", GlobalTransaction.class, List.class, Address.class, boolean.class);
- commitMethod = TreeCache.class.getDeclaredMethod("commit", GlobalTransaction.class);
- rollbackMethod = TreeCache.class.getDeclaredMethod("rollback", GlobalTransaction.class);
- addChildMethodLocal = TreeCache.class.getDeclaredMethod("_addChild", GlobalTransaction.class, Fqn.class, Object.class, DataNode.class, boolean.class);
- getKeyValueMethodLocal = TreeCache.class.getDeclaredMethod("_get", Fqn.class, Object.class, boolean.class);
- getNodeMethodLocal = TreeCache.class.getDeclaredMethod("_get", Fqn.class);
- getKeysMethodLocal = TreeCache.class.getDeclaredMethod("_getKeys", Fqn.class);
- getChildrenNamesMethodLocal = TreeCache.class.getDeclaredMethod("_getChildrenNames", Fqn.class);
- replicateMethod = TreeCache.class.getDeclaredMethod("_replicate", MethodCall.class);
- replicateAllMethod = TreeCache.class.getDeclaredMethod("_replicate", List.class);
- releaseAllLocksMethodLocal = TreeCache.class.getDeclaredMethod("_releaseAllLocks", Fqn.class);
- printMethodLocal = TreeCache.class.getDeclaredMethod("_print", Fqn.class);
- lockMethodLocal = TreeCache.class.getDeclaredMethod("_lock", Fqn.class, NodeLock.LockType.class, boolean.class);
+ getDataMapMethodLocal = CacheImpl.class.getDeclaredMethod("_getData", Fqn.class);
+ existsMethod = CacheImpl.class.getDeclaredMethod("exists", Fqn.class);
+ putDataMethodLocal = CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class);
+ putDataEraseMethodLocal = CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class, boolean.class);
+ putKeyValMethodLocal = CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Object.class, Object.class, boolean.class);
+ removeNodeMethodLocal = CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, boolean.class);
+ removeKeyMethodLocal = CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, Object.class, boolean.class);
+ removeDataMethodLocal = CacheImpl.class.getDeclaredMethod("_removeData", GlobalTransaction.class, Fqn.class, boolean.class);
+ evictNodeMethodLocal = CacheImpl.class.getDeclaredMethod("_evict", Fqn.class);
+ evictVersionedNodeMethodLocal = CacheImpl.class.getDeclaredMethod("_evict", Fqn.class, DataVersion.class);
+
+ // evictKeyValueMethodLocal=CacheImpl.class.getDeclaredMethod("_evict", new Class[]{Fqn.class, Object.class});
+ prepareMethod = CacheImpl.class.getDeclaredMethod("prepare", GlobalTransaction.class, List.class, Address.class, boolean.class);
+ commitMethod = CacheImpl.class.getDeclaredMethod("commit", GlobalTransaction.class);
+ rollbackMethod = CacheImpl.class.getDeclaredMethod("rollback", GlobalTransaction.class);
+ addChildMethodLocal = CacheImpl.class.getDeclaredMethod("_addChild", GlobalTransaction.class, Fqn.class, Object.class, Node.class, boolean.class);
+ getKeyValueMethodLocal = CacheImpl.class.getDeclaredMethod("_get", Fqn.class, Object.class, boolean.class);
+ getNodeMethodLocal = CacheImpl.class.getDeclaredMethod("_get", Fqn.class);
+ getKeysMethodLocal = CacheImpl.class.getDeclaredMethod("_getKeys", Fqn.class);
+ getChildrenNamesMethodLocal = CacheImpl.class.getDeclaredMethod("_getChildrenNames", Fqn.class);
+ replicateMethod = CacheImpl.class.getDeclaredMethod("_replicate", MethodCall.class);
+ replicateAllMethod = CacheImpl.class.getDeclaredMethod("_replicate", List.class);
+ releaseAllLocksMethodLocal = CacheImpl.class.getDeclaredMethod("_releaseAllLocks", Fqn.class);
+ printMethodLocal = CacheImpl.class.getDeclaredMethod("_print", Fqn.class);
+ lockMethodLocal = CacheImpl.class.getDeclaredMethod("_lock", Fqn.class, NodeLock.LockType.class, boolean.class);
- optimisticPrepareMethod = TreeCache.class.getDeclaredMethod("optimisticPrepare", GlobalTransaction.class, List.class, Map.class, Address.class, boolean.class);
+ optimisticPrepareMethod = CacheImpl.class.getDeclaredMethod("optimisticPrepare", GlobalTransaction.class, List.class, Map.class, Address.class, boolean.class);
- clusteredGetMethod = TreeCache.class.getDeclaredMethod("_clusteredGet", MethodCall.class, Boolean.class);
+ clusteredGetMethod = CacheImpl.class.getDeclaredMethod("_clusteredGet", MethodCall.class, Boolean.class);
// ------------ buddy replication
- remoteAnnounceBuddyPoolNameMethod = TreeCache.class.getDeclaredMethod("_remoteAnnounceBuddyPoolName", IpAddress.class, String.class);
- remoteRemoveFromBuddyGroupMethod = TreeCache.class.getDeclaredMethod("_remoteRemoveFromBuddyGroup", String.class);
- remoteAssignToBuddyGroupMethod = TreeCache.class.getDeclaredMethod("_remoteAssignToBuddyGroup", BuddyGroup.class, Map.class);
+ remoteAnnounceBuddyPoolNameMethod = CacheImpl.class.getDeclaredMethod("_remoteAnnounceBuddyPoolName", IpAddress.class, String.class);
+ remoteRemoveFromBuddyGroupMethod = CacheImpl.class.getDeclaredMethod("_remoteRemoveFromBuddyGroup", String.class);
+ remoteAssignToBuddyGroupMethod = CacheImpl.class.getDeclaredMethod("_remoteAssignToBuddyGroup", BuddyGroup.class, Map.class);
- dataGravitationCleanupMethod = TreeCache.class.getDeclaredMethod("_dataGravitationCleanup", GlobalTransaction.class, Fqn.class, Fqn.class);
- dataGravitationMethod = TreeCache.class.getDeclaredMethod("_gravitateData", Fqn.class, boolean.class, boolean.class);
+ dataGravitationCleanupMethod = CacheImpl.class.getDeclaredMethod("_dataGravitationCleanup", GlobalTransaction.class, Fqn.class, Fqn.class);
+ dataGravitationMethod = CacheImpl.class.getDeclaredMethod("_gravitateData", Fqn.class, boolean.class, boolean.class);
// ------------ move() api
- moveMethodLocal = TreeCache.class.getDeclaredMethod("_move", Fqn.class, Fqn.class);
+ moveMethodLocal = CacheImpl.class.getDeclaredMethod("_move", Fqn.class, Fqn.class);
// ------------ Channel BLOCK event
- blockChannelLocal = TreeCache.class.getDeclaredMethod("_block");
- unblockChannelLocal = TreeCache.class.getDeclaredMethod("_unblock");
+ blockChannelLocal = CacheImpl.class.getDeclaredMethod("_block");
+ unblockChannelLocal = CacheImpl.class.getDeclaredMethod("_unblock");
// ------------ version-aware methods - see JBCACHE-843
- putDataVersionedMethodLocal = TreeCache.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class, DataVersion.class);
- putDataEraseVersionedMethodLocal = TreeCache.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class, boolean.class, DataVersion.class);
- putKeyValVersionedMethodLocal = TreeCache.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Object.class, Object.class, boolean.class, DataVersion.class);
- removeNodeVersionedMethodLocal = TreeCache.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, boolean.class, DataVersion.class);
- removeKeyVersionedMethodLocal = TreeCache.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, Object.class, boolean.class, DataVersion.class);
- removeDataVersionedMethodLocal = TreeCache.class.getDeclaredMethod("_removeData", GlobalTransaction.class, Fqn.class, boolean.class, DataVersion.class);
+ putDataVersionedMethodLocal = CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class, DataVersion.class);
+ putDataEraseVersionedMethodLocal = CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class, boolean.class, DataVersion.class);
+ putKeyValVersionedMethodLocal = CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Object.class, Object.class, boolean.class, DataVersion.class);
+ removeNodeVersionedMethodLocal = CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, boolean.class, DataVersion.class);
+ removeKeyVersionedMethodLocal = CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, Object.class, boolean.class, DataVersion.class);
+ removeDataVersionedMethodLocal = CacheImpl.class.getDeclaredMethod("_removeData", GlobalTransaction.class, Fqn.class, boolean.class, DataVersion.class);
}
catch (NoSuchMethodException ex)
1.12 +1 -1 JBossCache/src/org/jboss/cache/marshall/TreeCacheMarshaller200.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCacheMarshaller200.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/TreeCacheMarshaller200.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- TreeCacheMarshaller200.java 29 Dec 2006 15:18:20 -0000 1.11
+++ TreeCacheMarshaller200.java 30 Dec 2006 17:50:05 -0000 1.12
@@ -29,7 +29,7 @@
import java.util.Set;
/**
- * An enhanced marshaller for RPC calls between TreeCache instances.
+ * An enhanced marshaller for RPC calls between CacheImpl instances.
*
* @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
*/
More information about the jboss-cvs-commits
mailing list