[jbosscache-commits] JBoss Cache SVN: r5722 - in core/trunk/src: main/java/org/jboss/cache/commands/read and 10 other directories.

Author: manik.surtani(a)jboss.com Date: 2008-04-28 10:31:25 -0400 (Mon, 28 Apr 2008) New Revision: 5722 Modified: core/trunk/src/main/java/org/jboss/cache/LifecycleManager.java core/trunk/src/main/java/org/jboss/cache/commands/read/AbstractDataCommand.java core/trunk/src/main/java/org/jboss/cache/commands/read/GetChildrenNamesCommand.java core/trunk/src/main/java/org/jboss/cache/commands/read/GetDataMapCommand.java core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeyValueCommand.java core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeysCommand.java core/trunk/src/main/java/org/jboss/cache/commands/read/GetNodeCommand.java core/trunk/src/main/java/org/jboss/cache/commands/read/GravitateDataCommand.java core/trunk/src/main/java/org/jboss/cache/commands/read/RemoteExistsCommand.java core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java core/trunk/src/main/java/org/jboss/cache/commands/write/CreateNodeCommand.java core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java core/trunk/src/main/java/org/jboss/cache/commands/write/InvalidateCommand.java core/trunk/src/main/java/org/jboss/cache/commands/write/MoveCommand.java core/trunk/src/main/java/org/jboss/cache/commands/write/PutDataMapCommand.java core/trunk/src/main/java/org/jboss/cache/commands/write/PutKeyValueCommand.java core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveDataCommand.java core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveKeyCommand.java core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveNodeCommand.java core/trunk/src/main/java/org/jboss/cache/factories/CommandsFactory.java core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java Log: Renamed Modified: core/trunk/src/main/java/org/jboss/cache/LifecycleManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/LifecycleManager.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/LifecycleManager.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -32,7 +32,7 @@ private Notifier notifier; private RegionManager regionManager; private NodeFactory nodeFactory; - private DataContainer cacheData; + private DataContainer dataContainer; private BuddyManager buddyManager; private RPCManager rpcManager; private ComponentRegistry componentRegistry; @@ -49,7 +49,7 @@ this.nodeFactory = nodeFactory; this.buddyManager = buddyManager; this.rpcManager = rpcManager; - this.cacheData = cacheData; + this.dataContainer = cacheData; this.componentRegistry = componentRegistry; } @@ -197,7 +197,7 @@ // this will recreate any missing components based on the current config componentRegistry.updateDependencies(); - componentRegistry.wireDependencies(cacheData.getRoot()); + componentRegistry.wireDependencies(dataContainer.getRoot()); cacheStatus = CacheStatus.STARTING; @@ -349,8 +349,8 @@ // unset transaction manager reference cacheStatus = CacheStatus.STOPPED; // empty in-memory state - cacheData.getRoot().clearDataDirect(); - cacheData.getRoot().removeChildrenDirect(); + dataContainer.getRoot().clearDataDirect(); + dataContainer.getRoot().removeChildrenDirect(); } //todo - this should reather be implemented as follows: @@ -377,10 +377,10 @@ // if we don't already have a root or the new (temp) root is of a different class (optimistic vs pessimistic) to // the current root, then we use the new one. - Class currentRootType = cacheData.getRoot() == null ? null : ((NodeInvocationDelegate) cacheData.getRoot()).getDelegationTarget().getClass(); + Class currentRootType = dataContainer.getRoot() == null ? null : ((NodeInvocationDelegate) dataContainer.getRoot()).getDelegationTarget().getClass(); Class tempRootType = ((NodeInvocationDelegate) tempRoot).getDelegationTarget().getClass(); - if (!tempRootType.equals(currentRootType)) cacheData.setRoot(tempRoot); + if (!tempRootType.equals(currentRootType)) dataContainer.setRoot(tempRoot); } /** @@ -427,7 +427,7 @@ buddyManager.init(); if (buddyManager.isEnabled()) { - cacheData.registerInternalFqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN); + dataContainer.registerInternalFqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN); } } } Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/AbstractDataCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/read/AbstractDataCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/read/AbstractDataCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -14,12 +14,12 @@ public abstract class AbstractDataCommand implements DataCommand { protected Fqn fqn; - protected DataContainer cacheData; + protected DataContainer dataContainer; @Inject - public void initialize(DataContainer cacheData) + public void initialize(DataContainer dataContainer) { - this.cacheData = cacheData; + this.dataContainer = dataContainer; } public Fqn getFqn() @@ -63,4 +63,13 @@ result = 31 * result + getClass().hashCode(); return result; } + + @Override + public String toString() + { + return getClass().getSimpleName() + + "{" + + "fqn=" + fqn + + '}'; + } } Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/GetChildrenNamesCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/read/GetChildrenNamesCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/read/GetChildrenNamesCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -30,7 +30,7 @@ public Object perform(InvocationContext ctx) { - NodeSPI n = cacheData.findNode(fqn); + NodeSPI n = dataContainer.findNode(fqn); if (n == null) return null; Set childNames = new HashSet(); Map childrenMap = n.getChildrenMapDirect(); @@ -59,12 +59,4 @@ { return METHOD_ID; } - - @Override - public String toString() - { - return "GetChildrenNamesCommand{" + - "fqn=" + fqn + - "}"; - } } Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/GetDataMapCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/read/GetDataMapCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/read/GetDataMapCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -28,7 +28,7 @@ public Object perform(InvocationContext ctx) { - NodeSPI n = cacheData.findNode(fqn); + NodeSPI n = dataContainer.findNode(fqn); if (n == null) return null; return Collections.unmodifiableMap(n.getDataDirect()); } @@ -42,13 +42,4 @@ { return METHOD_ID; } - - @Override - public String toString() - { - return "GetDataMapCommand{" + - "cacheData=" + cacheData + - ", fqn=" + fqn + - '}'; - } } Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeyValueCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeyValueCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeyValueCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -52,7 +52,7 @@ append(sendNodeEvent).append("\")")); } if (sendNodeEvent) notifier.notifyNodeVisited(fqn, true, ctx); - NodeSPI n = cacheData.findNode(fqn); + NodeSPI n = dataContainer.findNode(fqn); if (n == null) { log.trace("node not found"); Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeysCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeysCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/read/GetKeysCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -29,7 +29,7 @@ public Object perform(InvocationContext ctx) { - NodeSPI n = cacheData.findNode(fqn); + NodeSPI n = dataContainer.findNode(fqn); if (n == null) { return null; @@ -47,12 +47,4 @@ { return METHOD_ID; } - - @Override - public String toString() - { - return "GetKeysCommand{" + - "fqn=" + fqn + - "}"; - } } Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/GetNodeCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/read/GetNodeCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/read/GetNodeCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -25,7 +25,7 @@ public Object perform(InvocationContext ctx) { - return cacheData.findNode(fqn); + return dataContainer.findNode(fqn); } public Object acceptVisitor(InvocationContext ctx, Visitor visitor) throws Throwable @@ -37,12 +37,4 @@ { return METHOD_ID; } - - @Override - public String toString() - { - return "GetNodeCommand{" + - "fqn=" + fqn + - "}"; - } } Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/GravitateDataCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/read/GravitateDataCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/read/GravitateDataCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -77,7 +77,7 @@ if (actualNode == null && searchSubtrees) { log.trace("Looking at backup trees."); - NodeSPI backupSubtree = cacheData.findNode(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN); + NodeSPI backupSubtree = dataContainer.findNode(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN); if (backupSubtree != null) { // need to loop through backupSubtree's children @@ -144,7 +144,7 @@ backupNodeFqn = BuddyFqnTransformer.getBackupFqn(BuddyFqnTransformer.getGroupNameFromAddress(rpcManager.getLocalAddress()), fqn); } - List<NodeData> list = cacheData.getNodeData(new LinkedList<NodeData>(), (NodeSPI) actualNode); + List<NodeData> list = dataContainer.getNodeData(new LinkedList<NodeData>(), (NodeSPI) actualNode); return GravitateResult.subtreeResult(list, backupNodeFqn); } @@ -213,7 +213,7 @@ public String toString() { return "GravitateDataCommand{" + - "rpcManager=" + rpcManager + + "fqn=" + fqn + ", searchSubtrees=" + searchSubtrees + '}'; } Modified: core/trunk/src/main/java/org/jboss/cache/commands/read/RemoteExistsCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/read/RemoteExistsCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/read/RemoteExistsCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -32,7 +32,7 @@ public Object perform(InvocationContext ctx) { - Node n = cacheData.peek(fqn, false); + Node n = dataContainer.peek(fqn, false); return n != null; } @@ -45,10 +45,4 @@ { return METHOD_ID; } - - @Override - public String toString() - { - return "RemoteExistsNodeCommand{}"; - } } Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -23,9 +23,9 @@ { public static final int METHOD_ID = 22; - private DataCommand cacheDataComand; + private DataCommand dataCommand; private Boolean searchBackupSubtrees; - private DataContainer cacheData; + private DataContainer dataContainer; private InterceptorChain interceptorChain; private static final Log log = LogFactory.getLog(ClusteredGetCommand.class); @@ -36,17 +36,17 @@ trace = log.isTraceEnabled(); } - public ClusteredGetCommand(Boolean searchBackupSubtrees, DataCommand cacheDataComand) + public ClusteredGetCommand(Boolean searchBackupSubtrees, DataCommand dataCommand) { this(); this.searchBackupSubtrees = searchBackupSubtrees; - this.cacheDataComand = cacheDataComand; + this.dataCommand = dataCommand; } @Inject - public void initialize(DataContainer cacheData, InterceptorChain interceptorChain) + public void initialize(DataContainer dataContainer, InterceptorChain interceptorChain) { - this.cacheData = cacheData; + this.dataContainer = dataContainer; this.interceptorChain = interceptorChain; } @@ -59,16 +59,16 @@ public Object perform(InvocationContext context) throws Throwable { if (trace) - log.trace("Clustered Get called with params: " + cacheDataComand + ", " + searchBackupSubtrees); + log.trace("Clustered Get called with params: " + dataCommand + ", " + searchBackupSubtrees); Object callResults = null; try { - if (trace) log.trace("Clustered get: invoking call with Fqn " + cacheDataComand.getFqn()); + if (trace) log.trace("Clustered get: invoking call with Fqn " + dataCommand.getFqn()); InvocationContext ctx = interceptorChain.getInvocationContext(); ctx.setOriginLocal(false); // very hacky to be calling this command directly. - callResults = cacheDataComand.perform(ctx); + callResults = dataCommand.perform(ctx); boolean found = validResult(callResults); if (trace) log.trace("Got result " + callResults + ", found=" + found); if (found && callResults == null) callResults = createEmptyResults(); @@ -102,11 +102,11 @@ */ private boolean validResult(Object callResults) { - if (cacheDataComand instanceof GetDataMapCommand || cacheDataComand instanceof GetChildrenNamesCommand) + if (dataCommand instanceof GetDataMapCommand || dataCommand instanceof GetChildrenNamesCommand) { - return callResults != null && cacheData.exists(cacheDataComand.getFqn()); + return callResults != null && dataContainer.exists(dataCommand.getFqn()); } - return cacheDataComand instanceof RemoteExistsCommand && (Boolean) callResults; + return dataCommand instanceof RemoteExistsCommand && (Boolean) callResults; } /** @@ -114,7 +114,7 @@ */ private Object createEmptyResults() { - if (cacheDataComand instanceof GetDataMapCommand || cacheDataComand instanceof GetChildrenNamesCommand) + if (dataCommand instanceof GetDataMapCommand || dataCommand instanceof GetChildrenNamesCommand) { return Collections.emptyMap(); } @@ -126,19 +126,19 @@ return searchBackupSubtrees; } - public DataCommand getCacheDataComand() + public DataCommand getDataCommand() { - return cacheDataComand; + return dataCommand; } public Object[] getParameters() { - return new Object[]{cacheDataComand, searchBackupSubtrees}; //To change body of implemented methods use File | Settings | File Templates. + return new Object[]{dataCommand, searchBackupSubtrees}; //To change body of implemented methods use File | Settings | File Templates. } public void setParameters(int commandId, Object[] args) { - cacheDataComand = (DataCommand) args[0]; + dataCommand = (DataCommand) args[0]; searchBackupSubtrees = (Boolean) args[1]; } @@ -150,7 +150,7 @@ ClusteredGetCommand that = (ClusteredGetCommand) o; - if (cacheDataComand != null ? !cacheDataComand.equals(that.cacheDataComand) : that.cacheDataComand != null) + if (dataCommand != null ? !dataCommand.equals(that.dataCommand) : that.dataCommand != null) return false; if (searchBackupSubtrees != null ? !searchBackupSubtrees.equals(that.searchBackupSubtrees) : that.searchBackupSubtrees != null) return false; @@ -162,7 +162,7 @@ public int hashCode() { int result; - result = (cacheDataComand != null ? cacheDataComand.hashCode() : 0); + result = (dataCommand != null ? dataCommand.hashCode() : 0); result = 31 * result + (searchBackupSubtrees != null ? searchBackupSubtrees.hashCode() : 0); return result; } @@ -171,9 +171,9 @@ public String toString() { return "ClusteredGetCommand{" + - "cacheDataComand=" + cacheDataComand + + "dataCommand=" + dataCommand + ", searchBackupSubtrees=" + searchBackupSubtrees + - ", cacheData=" + cacheData + + ", cacheData=" + dataContainer + ", interceptorChain=" + interceptorChain + '}'; } Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -33,7 +33,7 @@ private GlobalTransactionContainer transactionHelper; private InterceptorChain invoker; private CommandsFactory commandsFactory; - private DataContainer cacheData; + private DataContainer dataContainer; private static final Log log = LogFactory.getLog(DataGravitationCleanupCommand.class); private static boolean trace; @@ -58,13 +58,13 @@ @Inject public void initialize(BuddyManager buddyManager, InterceptorChain invoker, GlobalTransactionContainer transactionHelper, - CommandsFactory commandsFactory, DataContainer cacheData) + CommandsFactory commandsFactory, DataContainer dataContainer) { this.buddyManager = buddyManager; this.invoker = invoker; this.transactionHelper = transactionHelper; this.commandsFactory = commandsFactory; - this.cacheData = cacheData; + this.dataContainer = dataContainer; } public Object perform(InvocationContext ctx) throws Throwable @@ -84,14 +84,14 @@ // if this is a DIRECT child of a DEAD buddy backup region, then remove the empty dead region structural node. if (BuddyFqnTransformer.isDeadBackupFqn(backup) && BuddyFqnTransformer.isDeadBackupRoot(backup.getParent().getParent())) { - NodeSPI deadBackupRoot = cacheData.peek(backup.getParent(), false); + NodeSPI deadBackupRoot = dataContainer.peek(backup.getParent(), false); if (deadBackupRoot.getChildrenMapDirect().isEmpty()) { if (trace) log.trace("Removing dead backup region " + deadBackupRoot.getFqn()); executeRemove(gtx, deadBackupRoot.getFqn()); // now check the grand parent and see if we are free of versions - deadBackupRoot = cacheData.peek(deadBackupRoot.getFqn().getParent(), false); + deadBackupRoot = dataContainer.peek(deadBackupRoot.getFqn().getParent(), false); if (deadBackupRoot.getChildrenMapDirect().isEmpty()) { if (trace) log.trace("Removing dead backup region " + deadBackupRoot.getFqn()); @@ -137,9 +137,9 @@ private void evictNode(Fqn fqn) throws Throwable { - if (cacheData.exists(fqn)) + if (dataContainer.exists(fqn)) { - List<Fqn> toEvict = cacheData.getNodesForEviction(fqn, true); + List<Fqn> toEvict = dataContainer.getNodesForEviction(fqn, true); for (Fqn aFqn : toEvict) { EvictCommand evictFqnCommand = commandsFactory.buildEvictFqnCommand(aFqn); Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/CreateNodeCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/write/CreateNodeCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/write/CreateNodeCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -49,7 +49,7 @@ public Object perform(InvocationContext ctx) throws Throwable { - Object[] results = cacheData.createNodes(fqn); + Object[] results = dataContainer.createNodes(fqn); List<NodeSPI> created = (List<NodeSPI>) results[0]; boolean foundFqn = false; @@ -75,7 +75,7 @@ { if (newlyCreated != null) { - for (Fqn f : newlyCreated) cacheData.realRemove(f, true); + for (Fqn f : newlyCreated) dataContainer.realRemove(f, true); } } Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/write/EvictCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -29,7 +29,7 @@ if (recursive) { - List<Fqn> nodesToEvict = cacheData.getNodesForEviction(fqn, true); + List<Fqn> nodesToEvict = dataContainer.getNodesForEviction(fqn, true); for (Fqn aFqn : nodesToEvict) { @@ -46,7 +46,7 @@ void evictNode(Fqn fqn, InvocationContext ctx) { notifier.notifyNodeEvicted(fqn, true, ctx); - cacheData.evict(fqn); + dataContainer.evict(fqn); notifier.notifyNodeEvicted(fqn, false, ctx); } Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/InvalidateCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/write/InvalidateCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/write/InvalidateCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -76,7 +76,7 @@ if (!isOptimisticLocking) return null; // check if a tombstone already exists - NodeSPI nodeSPI = cacheData.peek(fqn, false, true); + NodeSPI nodeSPI = dataContainer.peek(fqn, false, true); if (nodeSPI == null) { if (dataVersion == null) @@ -110,7 +110,7 @@ { log.error("Unable to create tombstone!", e); } - nodeSPI = (NodeSPI) cacheData.getRoot().getChild(fqn); + nodeSPI = (NodeSPI) dataContainer.getRoot().getChild(fqn); } node = nodeSPI; } @@ -126,7 +126,7 @@ if (dataVersion != null) { - NodeSPI n = cacheData.peek(fqn, false, true); + NodeSPI n = dataContainer.peek(fqn, false, true); n.setVersion(dataVersion); } return null; @@ -137,7 +137,7 @@ { // Find the node. This will lock it (if <tt>locking</tt> is true) and // add the temporarily created parent nodes to the TX's node list if tx != null) - NodeSPI n = cacheData.findNode(fqn, dataVersion); + NodeSPI n = dataContainer.findNode(fqn, dataVersion); if (n == null) { log.warn("node " + fqn + " not found"); Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/MoveCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/write/MoveCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/write/MoveCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -78,14 +78,14 @@ public void _move(Fqn nodeToMoveFqn, Fqn newParentFqn, boolean skipNotifications, InvocationContext ctx) { // the actual move algorithm. - NodeSPI newParent = cacheData.findNode(newParentFqn); + NodeSPI newParent = dataContainer.findNode(newParentFqn); if (newParent == null) { throw new NodeNotExistsException("New parent node " + newParentFqn + " does not exist when attempting to move node!!"); } - NodeSPI node = cacheData.findNode(nodeToMoveFqn); + NodeSPI node = dataContainer.findNode(nodeToMoveFqn); if (node == null) { Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/PutDataMapCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/write/PutDataMapCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/write/PutDataMapCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -57,7 +57,7 @@ { log.trace("perform(" + globalTransaction + ", \"" + fqn + "\", " + data + " undo=" + createUndoOps + " erase=" + eraseContents + ")"); } - NodeSPI nodeSPI = cacheData.findNodeCheck(globalTransaction, fqn, false); + NodeSPI nodeSPI = dataContainer.findNodeCheck(globalTransaction, fqn, false); Map dataDirect = nodeSPI.getDataDirect(); if (!dataDirect.isEmpty()) { @@ -76,7 +76,7 @@ { if (trace) log.trace("rollback(" + globalTransaction + ", " + fqn + ", " + data + ")"); - NodeSPI n = cacheData.findNode(fqn, null, true); + NodeSPI n = dataContainer.findNode(fqn, null, true); if (n != null) { n.clearDataDirect(); Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/PutKeyValueCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/write/PutKeyValueCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/write/PutKeyValueCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -63,7 +63,7 @@ // if this is a rollback then don't fire notifications. boolean isRollback = false; - NodeSPI n = cacheData.findNodeCheck(globalTransaction, fqn, isRollback); + NodeSPI n = dataContainer.findNodeCheck(globalTransaction, fqn, isRollback); Map rawData = n.getDataDirect(); notifier.notifyNodeModified(fqn, true, NodeModifiedEvent.ModificationType.PUT_DATA, rawData, ctx); oldValue = n.putDirect(key, value); @@ -77,14 +77,14 @@ { if (this.oldValue == null) { - NodeSPI n = cacheData.findNode(fqn); + NodeSPI n = dataContainer.findNode(fqn); if (n == null) throw new CacheException("node " + fqn + " not found for rollback!"); n.removeDirect(key); } else { log.trace("Rolling back, setting the old value : " + oldValue); - NodeSPI n = cacheData.findNodeCheck(globalTransaction, fqn, false); + NodeSPI n = dataContainer.findNodeCheck(globalTransaction, fqn, false); n.putDirect(key, oldValue); } } Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveDataCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveDataCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveDataCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -51,7 +51,7 @@ public Object perform(InvocationContext ctx) { if (trace) log.trace("perform(" + globalTransaction + ", \"" + fqn + "\")"); - NodeSPI targetNode = cacheData.findNode(fqn, dataVersion); + NodeSPI targetNode = dataContainer.findNode(fqn, dataVersion); if (targetNode == null) { log.warn("node " + fqn + " not found"); @@ -114,7 +114,7 @@ { if (trace) log.trace("rollback(" + globalTransaction + ", \"" + fqn + "\", " + originalData + ")"); boolean isRollback = true; - NodeSPI nodeSPI = cacheData.findNodeCheck(globalTransaction, fqn, isRollback); + NodeSPI nodeSPI = dataContainer.findNodeCheck(globalTransaction, fqn, isRollback); nodeSPI.putAllDirect(originalData); } Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveKeyCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveKeyCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveKeyCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -50,7 +50,7 @@ { if (trace) log.trace("perform(" + globalTransaction + ", \"" + fqn + "\", key=" + key + ")"); - NodeSPI n = cacheData.findNode(fqn); + NodeSPI n = dataContainer.findNode(fqn); if (n == null) { log.warn("node " + fqn + " not found"); @@ -67,7 +67,7 @@ public void rollback() { - NodeSPI targetNode = cacheData.findNodeCheck(globalTransaction, fqn, true); + NodeSPI targetNode = dataContainer.findNodeCheck(globalTransaction, fqn, true); targetNode.putDirect(key, oldValue); } Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveNodeCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveNodeCommand.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/commands/write/RemoveNodeCommand.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -55,7 +55,7 @@ log.trace("perform(" + globalTransaction + ", \"" + fqn + "\", undo=" + createUndoOps + ")"); // Find the node. This will add the temporarily created parent nodes to the TX's node list if globalTransaction != null) - targetNode = cacheData.findNode(fqn, dataVersion, true); + targetNode = dataContainer.findNode(fqn, dataVersion, true); if (targetNode == null) { if (trace) log.trace("node " + fqn + " not found"); @@ -145,7 +145,7 @@ log.error("parent fqn or childName or childNode was null"); return; } - NodeSPI parentNode = cacheData.findNode(parentFqn); + NodeSPI parentNode = dataContainer.findNode(parentFqn); if (parentNode == null) { log.warn("node " + parentFqn + " not found"); Modified: core/trunk/src/main/java/org/jboss/cache/factories/CommandsFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/factories/CommandsFactory.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/factories/CommandsFactory.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -269,9 +269,9 @@ return command; } - public ClusteredGetCommand buildClusteredGetCommand(Boolean searchBackupSubtrees, DataCommand cacheDataComand) + public ClusteredGetCommand buildClusteredGetCommand(Boolean searchBackupSubtrees, DataCommand dataCommand) { - ClusteredGetCommand command = new ClusteredGetCommand(searchBackupSubtrees, cacheDataComand); + ClusteredGetCommand command = new ClusteredGetCommand(searchBackupSubtrees, dataCommand); registry.wireDependencies(command); return command; } Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -632,7 +632,7 @@ Component spi = componentLookup.get(CacheSPI.class.getName()); Component interceptorChain = componentLookup.get(InterceptorChain.class.getName()); Component lifeCycleManager = componentLookup.get(LifecycleManager.class.getName()); - Component cacheData = componentLookup.get(DataContainer.class.getName()); + Component dataContainer = componentLookup.get(DataContainer.class.getName()); Component conf = componentLookup.get(Configuration.class.getName()); Component cr = componentLookup.get(ComponentRegistry.class.getName()); @@ -647,12 +647,12 @@ spi.changeState(CONSTRUCTED); interceptorChain.changeState(CONSTRUCTED); lifeCycleManager.changeState(CONSTRUCTED); - cacheData.changeState(CONSTRUCTED); + dataContainer.changeState(CONSTRUCTED); conf.changeState(CONSTRUCTED); cr.changeState(CONSTRUCTED); bootstrap = new Bootstrap((ClassLoader) deployerClassLoader.instance, (InterceptorChain) interceptorChain.instance, - (LifecycleManager) lifeCycleManager.instance, (DataContainer) cacheData.instance, (CacheSPI) spi.instance, + (LifecycleManager) lifeCycleManager.instance, (DataContainer) dataContainer.instance, (CacheSPI) spi.instance, (ComponentRegistry) cr.instance, (Configuration) conf.instance); overallState = null; @@ -970,18 +970,18 @@ { final InterceptorChain interceptorChain; final LifecycleManager lifecycleManager; - final DataContainer cacheData; + final DataContainer dataContainer; final CacheSPI cacheSPI; final ComponentRegistry componentRegistry; final Configuration configuration; private final ClassLoader deployerClassLoader; Bootstrap(ClassLoader deployerClassLoader, InterceptorChain interceptorChain, LifecycleManager lifecycleManager, - DataContainer cacheData, CacheSPI cacheSPI, ComponentRegistry componentRegistry, Configuration configuration) + DataContainer dataContainer, CacheSPI cacheSPI, ComponentRegistry componentRegistry, Configuration configuration) { this.deployerClassLoader = deployerClassLoader; this.lifecycleManager = lifecycleManager; - this.cacheData = cacheData; + this.dataContainer = dataContainer; this.interceptorChain = interceptorChain; this.cacheSPI = cacheSPI; this.componentRegistry = componentRegistry; @@ -1007,7 +1007,7 @@ registerComponent(ComponentRegistry.class.getName(), componentRegistry, ComponentRegistry.class); registerComponent(InterceptorChain.class.getName(), interceptorChain, InterceptorChain.class); registerComponent(LifecycleManager.class.getName(), lifecycleManager, LifecycleManager.class); - registerComponent(DataContainer.class.getName(), cacheData, DataContainer.class); + registerComponent(DataContainer.class.getName(), dataContainer, DataContainer.class); registerComponent(CacheSPI.class.getName(), cacheSPI, CacheSPI.class); } } Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -150,12 +150,12 @@ private void removeNodeFromCacheLoader(InvocationContext ctx, Fqn fqn) throws Throwable { NodeSPI n; - if (((n = cacheData.peek(fqn, true, false)) != null) && n.isDataLoaded() && loader.exists(fqn)) + if (((n = dataContainer.peek(fqn, true, false)) != null) && n.isDataLoaded() && loader.exists(fqn)) { // node not null and attributes have been loaded? if (!n.getChildrenDirect().isEmpty()) { - boolean result = cacheData.allInitialized(n); + boolean result = dataContainer.allInitialized(n); if (result) { log.debug("children all initialized"); @@ -258,7 +258,7 @@ throw new Exception("entry for transaction " + gtx + " not found in transaction table"); } List<Modification> cacheLoaderModifications = new ArrayList<Modification>(); - ActivationModificationsBuilder builder = new ActivationModificationsBuilder(cacheData, loader, notifier); + ActivationModificationsBuilder builder = new ActivationModificationsBuilder(dataContainer, loader, notifier); builder.visitCollection(null, entry.getCacheLoaderModifications()); if (cacheLoaderModifications.size() > 0) { @@ -270,14 +270,14 @@ { private List<Modification> cacheLoaderModifications = new ArrayList<Modification>(); - private DataContainer cacheData; + private DataContainer dataContainer; private CacheLoader loader; private Notifier notifier; private int txActs = 0; - public ActivationModificationsBuilder(DataContainer cacheData, CacheLoader loader, Notifier notifier) + public ActivationModificationsBuilder(DataContainer dataContainer, CacheLoader loader, Notifier notifier) { - this.cacheData = cacheData; + this.dataContainer = dataContainer; this.loader = loader; this.notifier = notifier; } @@ -306,14 +306,14 @@ private void handlePutCommand(InvocationContext ctx, Fqn fqn) throws Exception { - if (fqn != null && cacheData.peek(fqn, false, false) != null && loader.exists(fqn)) + if (fqn != null && dataContainer.peek(fqn, false, false) != null && loader.exists(fqn)) { - NodeSPI n = cacheData.peek(fqn, true, false);// don't load + NodeSPI n = dataContainer.peek(fqn, true, false);// don't load // node not null and attributes have been loaded? if (n != null && n.isDataLoaded()) { // has children? - boolean result = cacheData.allInitialized(n); + boolean result = dataContainer.allInitialized(n); if (!n.getChildrenDirect().isEmpty() && result) { // children have been loaded, remove the node Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -54,7 +54,7 @@ protected TransactionTable txTable = null; protected Configuration config; protected CacheLoader loader; - protected DataContainer cacheData; + protected DataContainer dataContainer; protected Notifier notifier; protected boolean isActivation = false; @@ -70,13 +70,13 @@ @Inject protected void injectDependencies(TransactionTable txTable, CacheLoaderManager clm, Configuration configuration, - DataContainer cacheData, Configuration config, LockManager lockManager, Notifier notifier) + DataContainer dataContainer, Configuration config, LockManager lockManager, Notifier notifier) { this.txTable = txTable; this.clm = clm; CacheMode mode = configuration.getCacheMode(); usingOptimisticInvalidation = configuration.isNodeLockingOptimistic() && mode.isInvalidation(); - this.cacheData = cacheData; + this.dataContainer = dataContainer; this.config = config; this.lockManager = lockManager; this.notifier = notifier; @@ -150,7 +150,7 @@ if (fqn != null) { loadIfNeeded(ctx, fqn, null, false, false, false, txTable.get(ctx.getGlobalTransaction()), false, false, true); - NodeSPI n = cacheData.peek(fqn, true, true); + NodeSPI n = dataContainer.peek(fqn, true, true); loadChildren(fqn, n, false, false, ctx); } return invokeNextInterceptor(ctx, command); @@ -193,7 +193,7 @@ Fqn fqn = (Fqn) i.previous(); try { - cacheData.evict(fqn, false); + dataContainer.evict(fqn, false); } catch (CacheException e) { @@ -237,7 +237,7 @@ private void loadIfNeeded(InvocationContext ctx, Fqn fqn, Object key, boolean allKeys, boolean initNode, boolean acquireLock, TransactionEntry entry, boolean recursive, boolean isMove, boolean bypassLoadingData) throws Throwable { - NodeSPI n = cacheData.peek(fqn, true, true); + NodeSPI n = dataContainer.peek(fqn, true, true); boolean mustLoad = mustLoad(n, key, allKeys); if (trace) @@ -428,7 +428,7 @@ lockManager.acquireLocksWithTimeout(ctx, fqn, lockType, false, false, false, false, null, false); if (recursive) { - NodeSPI node = cacheData.peek(fqn, false, false); + NodeSPI node = dataContainer.peek(fqn, false, false); lockManager.acquireLocksOnChildren(node, lockType, ctx); } } @@ -505,7 +505,7 @@ @SuppressWarnings("unchecked") private NodeSPI createNodes(Fqn fqn, TransactionEntry entry) throws Exception { - Object[] results = cacheData.createNodes(fqn); + Object[] results = dataContainer.createNodes(fqn); List<NodeSPI> createdNodes = (List<NodeSPI>) results[0]; NodeSPI lastCreated = null; Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheMgmtInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -51,12 +51,12 @@ private long m_start = System.currentTimeMillis(); private long m_reset = m_start; - private DataContainer cacheData; + private DataContainer dataContainer; @Inject - public void setDependencies(DataContainer cacheData) + public void setDependencies(DataContainer dataContainer) { - this.cacheData = cacheData; + this.dataContainer = dataContainer; } @Override @@ -166,12 +166,12 @@ public int getNumberOfAttributes() { - return cacheData.getNumberOfAttributes(); + return dataContainer.getNumberOfAttributes(); } public int getNumberOfNodes() { - return cacheData.getNumberOfNodes(); + return dataContainer.getNumberOfNodes(); } public long getElapsedTime() @@ -192,8 +192,8 @@ retval.put("Misses", m_misses); retval.put("Stores", m_stores); retval.put("Evictions", m_evictions); - retval.put("NumberOfAttributes", cacheData.getNumberOfAttributes()); - retval.put("NumberOfNodes", cacheData.getNumberOfNodes()); + retval.put("NumberOfAttributes", dataContainer.getNumberOfAttributes()); + retval.put("NumberOfNodes", dataContainer.getNumberOfNodes()); retval.put("ElapsedTime", getElapsedTime()); retval.put("TimeSinceReset", getTimeSinceReset()); retval.put("AverageReadTime", getAverageReadTime()); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -56,7 +56,7 @@ private long cacheStores = 0; private CacheLoader loader; private Configuration configuration; - private DataContainer cacheData; + private DataContainer dataContainer; private CacheLoaderManager loaderManager; public CacheStoreInterceptor() @@ -66,7 +66,7 @@ } @Inject - protected void init(DataContainer cacheData, CacheLoaderManager loaderManager, TransactionManager txManager, TransactionTable txTable, CacheLoaderConfig clConfig, Configuration configuration) + protected void init(DataContainer dataContainer, CacheLoaderManager loaderManager, TransactionManager txManager, TransactionTable txTable, CacheLoaderConfig clConfig, Configuration configuration) { // never inject a CacheLoader at this stage - only a CacheLoaderManager, since the CacheLoaderManager only creates a CacheLoader instance when it @Starts. this.loaderManager = loaderManager; @@ -74,7 +74,7 @@ txMgr = txManager; this.txTable = txTable; this.configuration = configuration; - this.cacheData = cacheData; + this.dataContainer = dataContainer; } @Start @@ -233,7 +233,7 @@ { loader.removeData(command.getFqn()); // we need to mark this node as data loaded - NodeSPI n = cacheData.peek(command.getFqn(), false, false); + NodeSPI n = dataContainer.peek(command.getFqn(), false, false); if (n != null) { n.setDataLoaded(true); @@ -268,7 +268,7 @@ { loader.removeData(command.getFqn()); // if we are erasing all the data then consider this node loaded - NodeSPI n = cacheData.peek(command.getFqn(), false, false);//cache.peek(fqn, false); + NodeSPI n = dataContainer.peek(command.getFqn(), false, false);//cache.peek(fqn, false); n.setDataLoaded(true); return returnValue; } @@ -313,7 +313,7 @@ for (Fqn f : affectedFqns) { // NOT going to store tombstones!! - NodeSPI n = cacheData.peek(f, false, false); + NodeSPI n = dataContainer.peek(f, false, false); if (n != null) { Map internalState = n.getInternalState(true); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -73,16 +73,16 @@ * cleanup commands corresponding to all gravitate calls made during the course of the transaction in question. */ private Map<GlobalTransaction, List<ReplicableCommand>> cleanupCommands = new ConcurrentHashMap<GlobalTransaction, List<ReplicableCommand>>(); - private DataContainer cacheData; + private DataContainer dataContainer; private Configuration config; private CommandsFactory commandsFactory; private CacheSPI cacheSPI; @Inject - public void injectComponents(BuddyManager buddyManager, Configuration config, DataContainer cacheData, CommandsFactory commandsFactory, CacheSPI cacheSPI) + public void injectComponents(BuddyManager buddyManager, Configuration config, DataContainer dataContainer, CommandsFactory commandsFactory, CacheSPI cacheSPI) { this.buddyManager = buddyManager; - this.cacheData = cacheData; + this.dataContainer = dataContainer; this.commandsFactory = commandsFactory; this.cacheSPI = cacheSPI; this.config = config; @@ -170,7 +170,7 @@ } else { - if (cacheData.peek(command.getFqn(), false, false) == null) + if (dataContainer.peek(command.getFqn(), false, false) == null) { // gravitation is necessary. Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/EvictionInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -40,12 +40,12 @@ { protected RegionManager regionManager; - private DataContainer cacheData; + private DataContainer dataContainer; @Inject - public void initialize(DataContainer cacheData) + public void initialize(DataContainer dataContainer) { - this.cacheData = cacheData; + this.dataContainer = dataContainer; } /** @@ -231,7 +231,7 @@ return; } - NodeSPI<?, ?> nodeSPI = cacheData.peek(event.getFqn(), false, false);//cache.peek(event.getFqn(), false); + NodeSPI<?, ?> nodeSPI = dataContainer.peek(event.getFqn(), false, false);//cache.peek(event.getFqn(), false); //we do not trigger eviction events for resident nodes if (nodeSPI != null && nodeSPI.isResident()) { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -44,17 +44,17 @@ */ private NodeFactory nodeFactory; - private DataContainer cacheData; + private DataContainer dataContainer; private CacheSPI cache; private long lockAcquisitionTimeout; @Inject - private void injectDependencies(NodeFactory nodeFactory, DataContainer cacheData, CacheSPI cacheSPI) + private void injectDependencies(NodeFactory nodeFactory, DataContainer dataContainer, CacheSPI cacheSPI) { this.nodeFactory = nodeFactory; - this.cacheData = cacheData; + this.dataContainer = dataContainer; this.cache = cacheSPI; this.lockAcquisitionTimeout = cacheSPI.getConfiguration().getLockAcquisitionTimeout(); } @@ -79,7 +79,7 @@ List<Fqn> fqns = new ArrayList<Fqn>(); fqns.add(command.getTo()); // peek into Node and get a hold of all child fqns as these need to be in the workspace. - NodeSPI node = cacheData.peek(command.getFqn(), true, true); + NodeSPI node = dataContainer.peek(command.getFqn(), true, true); greedyGetFqns(fqns, node, command.getTo()); if (trace) log.trace("Adding Fqns " + fqns + " for a move() operation."); for (Fqn f : fqns) @@ -98,7 +98,7 @@ private void createNode(InvocationContext ctx, Fqn targetFqn, boolean suppressNotification) throws CacheException { // if (cache.peek(targetFqn, false) != null) return; - if (cacheData.peek(targetFqn, false, false) != null) return; + if (dataContainer.peek(targetFqn, false, false) != null) return; // we do nothing if targetFqn is null if (targetFqn == null) return; @@ -125,7 +125,7 @@ // we do not have the root in the workspace! Put it into thr workspace now. if (workspaceNode == null) { - NodeSPI node = cacheData.getRoot(); + NodeSPI node = dataContainer.getRoot(); workspaceNode = lockAndCreateWorkspaceNode(nodeFactory, node, workspace, gtx, lockAcquisitionTimeout); workspace.addNode(workspaceNode); log.debug("Created root node in workspace."); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -58,17 +58,17 @@ private NodeFactory nodeFactory; private Notifier notifier; private CacheLoaderManager cacheLoaderManager; - private DataContainer cacheData; + private DataContainer dataContainer; private long lockAcquisitionTimeout; @Inject protected void injectDependencies(Notifier notifier, NodeFactory nodeFactory, CacheLoaderManager cacheLoaderManager, - DataContainer cacheData, Configuration configuration) + DataContainer dataContainer, Configuration configuration) { this.notifier = notifier; this.nodeFactory = nodeFactory; this.cacheLoaderManager = cacheLoaderManager; - this.cacheData = cacheData; + this.dataContainer = dataContainer; this.lockAcquisitionTimeout = configuration.getLockAcquisitionTimeout(); } @@ -556,7 +556,7 @@ // if we do not have the node then we need to add it to the workspace if (workspaceNode == null) { - NodeSPI node = cacheData.peek(fqn, true, includeInvalidNodes); + NodeSPI node = dataContainer.peek(fqn, true, includeInvalidNodes); if (node == null) return null; GlobalTransaction gtx = ctx.getGlobalTransaction(); workspaceNode = lockAndCreateWorkspaceNode(nodeFactory, node, workspace, gtx, lockAcquisitionTimeout); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -51,12 +51,12 @@ { private boolean useTombstones; - private DataContainer cacheData; + private DataContainer dataContainer; @Inject - public void initialize(CacheSPI cache, DataContainer cacheData) + public void initialize(CacheSPI cache, DataContainer dataContainer) { - this.cacheData = cacheData; + this.dataContainer = dataContainer; CacheMode mode = cache.getConfiguration().getCacheMode(); useTombstones = (mode == CacheMode.INVALIDATION_ASYNC) || (mode == CacheMode.INVALIDATION_SYNC); } @@ -79,7 +79,7 @@ if (trace) log.trace("Validating version for node [" + fqn + "]"); NodeSPI underlyingNode; - underlyingNode = cacheData.peek(fqn, true, true); + underlyingNode = dataContainer.peek(fqn, true, true); // if this is a newly created node then we expect the underlying node to be null. // also, if the node has been deleted in the WS and the underlying node is null, this *may* be ok ... will test again later when comparing versions Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -32,14 +32,14 @@ protected CacheLoader loader; private Notifier notifier; private Configuration configuration; - private DataContainer cacheData; + private DataContainer dataContainer; @Inject - public void setDependencies(Notifier notifier, Configuration configuration, DataContainer cacheData, CacheLoaderManager loaderManager) + public void setDependencies(Notifier notifier, Configuration configuration, DataContainer dataContainer, CacheLoaderManager loaderManager) { this.notifier = notifier; this.configuration = configuration; - this.cacheData = cacheData; + this.dataContainer = dataContainer; this.loader = loaderManager.getCacheLoader(); } @@ -105,7 +105,7 @@ { throw new NodeNotLoadedException(); } - NodeSPI n = cacheData.peek(fqn, true, false); + NodeSPI n = dataContainer.peek(fqn, true, false); if (n != null) { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -58,16 +58,16 @@ public class PessimisticLockInterceptor extends PostProcessingChainedInterceptor { private TransactionTable txTable; - private DataContainer cacheData; + private DataContainer dataContainer; private LockManager lockManager; private Configuration configuration; private long lockAcquisitionTimeout; @Inject - public void injectDependencies(Configuration configuration, DataContainer cacheImpl, TransactionTable txTable, LockManager lockManager) + public void injectDependencies(Configuration configuration, DataContainer dataContainer, TransactionTable txTable, LockManager lockManager) { lockAcquisitionTimeout = configuration.getLockAcquisitionTimeout(); - this.cacheData = cacheImpl; + this.dataContainer = dataContainer; this.txTable = txTable; this.lockManager = lockManager; this.configuration = configuration; @@ -92,7 +92,7 @@ { if (trace) log.trace("Suppressing locking, creating nodes if necessary"); int treeNodeSize = command.getFqn().size(); - NodeSPI n = cacheData.getRoot(); + NodeSPI n = dataContainer.getRoot(); for (int i = 0; i < treeNodeSize; i++) { Object childName = command.getFqn().get(i); @@ -150,7 +150,7 @@ { for (Fqn fqn : entry.getRemovedNodes()) { - cacheData.realRemove(fqn, false); + dataContainer.realRemove(fqn, false); } // 1. Revert the modifications by running the undo-op list in reverse. This *cannot* throw any exceptions ! entry.undoOperations(); @@ -178,18 +178,18 @@ { txTable.get(ctx.getGlobalTransaction()).addRemovedNode(command.getFqn()); } - lockManager.acquireLocksOnChildren(cacheData.peek(command.getFqn(), true, false), NodeLock.LockType.WRITE, ctx); + lockManager.acquireLocksOnChildren(dataContainer.peek(command.getFqn(), true, false), NodeLock.LockType.WRITE, ctx); } if (command.getTo() != null && !(configuration.getIsolationLevel() == IsolationLevel.NONE)) { //now for an RL for the new parent. if (trace) log.trace("Attempting to get RL on new parent [" + command.getTo() + "]"); lockManager.lock(ctx, command.getTo(), NodeLock.LockType.READ, false, timeout, false, false, null, false); - lockManager.acquireLocksOnChildren(cacheData.peek(command.getTo(), true, false), NodeLock.LockType.READ, ctx); + lockManager.acquireLocksOnChildren(dataContainer.peek(command.getTo(), true, false), NodeLock.LockType.READ, ctx); } Object retValue = invokeNextInterceptor(ctx, command); // do a REAL remove here. - NodeSPI n = cacheData.peek(command.getFqn(), true, false); + NodeSPI n = dataContainer.peek(command.getFqn(), true, false); if (n != null) { n.getLock().releaseAll(Thread.currentThread()); @@ -217,7 +217,7 @@ nodeSPI.markAsDeleted(true); } } - lockManager.acquireLocksOnChildren(cacheData.peek(command.getFqn(), false, false), NodeLock.LockType.WRITE, ctx, entry, true); + lockManager.acquireLocksOnChildren(dataContainer.peek(command.getFqn(), false, false), NodeLock.LockType.WRITE, ctx, entry, true); if (!createdNodes.isEmpty()) { @@ -232,11 +232,11 @@ //todo [mmarkus] this logic should be moved within moveNodeCommand, as it is plain removal logic if (ctx.getGlobalTransaction() == null) { - for (NodeSPI nodeSPI : createdNodes) cacheData.realRemove(nodeSPI.getFqn(), true); - cacheData.realRemove(command.getFqn(), true); + for (NodeSPI nodeSPI : createdNodes) dataContainer.realRemove(nodeSPI.getFqn(), true); + dataContainer.realRemove(command.getFqn(), true); //todo end of the logic that needs to be moved - NodeSPI n = cacheData.peek(command.getFqn(), true, false); + NodeSPI n = dataContainer.peek(command.getFqn(), true, false); if (n != null) { n.getLock().releaseAll(Thread.currentThread()); @@ -316,7 +316,7 @@ // first remove nodes that should be deleted. for (Fqn fqn : entry.getRemovedNodes()) { - cacheData.realRemove(fqn, false); + dataContainer.realRemove(fqn, false); } } } Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -58,7 +58,7 @@ private RPCManager rpcManager; private RegionManager regionManager; private Marshaller marshaller; - private DataContainer cacheData; + private DataContainer dataContainer; private CommandsFactory commandsFactory;// tu be built here and imjected within any CacheCommand instance. Also pass this to the interceptor chain private GlobalTransactionContainer transactionHelper; @@ -66,7 +66,7 @@ public void initialize(StateTransferManager stateTransferManager, CacheLoaderManager cacheLoaderManager, Notifier notifier, TransactionManager transactionManager, BuddyManager buddyManager, TransactionTable transactionTable, RPCManager rpcManager, RegionManager regionManager, Marshaller marshaller, - GlobalTransactionContainer transactionHelper, CommandsFactory commandsFactory, DataContainer cacheData) + GlobalTransactionContainer transactionHelper, CommandsFactory commandsFactory, DataContainer dataContainer) { this.stateTransferManager = stateTransferManager; this.cacheLoaderManager = cacheLoaderManager; @@ -77,7 +77,7 @@ this.rpcManager = rpcManager; this.regionManager = regionManager; this.marshaller = marshaller; - this.cacheData = cacheData; + this.dataContainer = dataContainer; this.commandsFactory = commandsFactory; this.transactionHelper = transactionHelper; } @@ -91,14 +91,14 @@ this.transactionTable = null; this.rpcManager = null; this.marshaller = null; - this.cacheData = null; + this.dataContainer = null; this.commandsFactory = null; } @Override public String toString() { - return cacheData == null ? super.toString() : cacheData.toString(); + return dataContainer == null ? super.toString() : dataContainer.toString(); } public Configuration getConfiguration() @@ -108,7 +108,7 @@ public NodeSPI<K, V> getRoot() { - return (NodeSPI<K, V>) cacheData.getRoot(); + return (NodeSPI<K, V>) dataContainer.getRoot(); } public TransactionManager getTransactionManager() @@ -173,12 +173,12 @@ public int getNumberOfAttributes() { - return cacheData.getNumberOfAttributes(); + return dataContainer.getNumberOfAttributes(); } public int getNumberOfNodes() { - return cacheData.getNumberOfNodes(); + return dataContainer.getNumberOfNodes(); } public RegionManager getRegionManager() @@ -198,12 +198,12 @@ public Set<Fqn> getInternalFqns() { - return cacheData.getInternalFqns(); + return dataContainer.getInternalFqns(); } public int getNumberOfLocksHeld() { - return cacheData.getNumberOfLocksHeld(); + return dataContainer.getNumberOfLocksHeld(); } public boolean exists(String fqn) @@ -236,12 +236,12 @@ public NodeSPI<K, V> peek(Fqn fqn, boolean includeDeletedNodes, boolean includeInvalidNodes) { - return (NodeSPI<K, V>) cacheData.peek(fqn, includeDeletedNodes, includeInvalidNodes); + return (NodeSPI<K, V>) dataContainer.peek(fqn, includeDeletedNodes, includeInvalidNodes); } public NodeSPI<K, V> peek(Fqn fqn, boolean includeDeletedNodes) { - return (NodeSPI<K, V>) cacheData.peek(fqn, includeDeletedNodes); + return (NodeSPI<K, V>) dataContainer.peek(fqn, includeDeletedNodes); } public void addCacheListener(Object listener) @@ -576,9 +576,9 @@ return getChildrenNames(Fqn.fromString(fqn)); } - public DataContainer getCacheData() + public DataContainer getDataContainer() { - return cacheData; + return dataContainer; } protected void cacheStatusCheck(InvocationContext ctx) Modified: core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/lock/LockManager.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -30,19 +30,19 @@ private Configuration configuration; private long lockAcquisitionTimeout; - private DataContainer cacheData; + private DataContainer dataContainer; private NodeSPI rootNode; private TransactionTable txTable; private CommandsFactory commandsFactory; @Inject - public void inject(Configuration configuration, DataContainer cacheData, TransactionTable txTable, + public void inject(Configuration configuration, DataContainer dataContainer, TransactionTable txTable, CommandsFactory commandsFactory) { this.configuration = configuration; lockAcquisitionTimeout = configuration.getLockAcquisitionTimeout(); - this.cacheData = cacheData; - rootNode = cacheData.getRoot(); + this.dataContainer = dataContainer; + rootNode = dataContainer.getRoot(); this.txTable = txTable; this.commandsFactory = commandsFactory; } @@ -71,7 +71,7 @@ created = lock(ctx, fqn, lockType, createIfNotExists, timeout, acquireLockOnParent, reverseRemoveCheck, createdNodes, skipNotification); firstTry = false; } - while (createIfNotExists && (cacheData.peek(fqn, false, false) == null));// keep trying until we have the lock (fixes concurrent remove()) + while (createIfNotExists && (dataContainer.peek(fqn, false, false) == null));// keep trying until we have the lock (fixes concurrent remove()) return created; } @@ -147,7 +147,7 @@ manageReverseRemove(gtx, currentNode, reverseRemoveCheck, createdNodes); // make sure the lock we acquired isn't on a deleted node/is an orphan!! // look into invalidated nodes as well - NodeSPI repeek = cacheData.peek(currentNodeFqn, true, true); + NodeSPI repeek = dataContainer.peek(currentNodeFqn, true, true); if (currentNode != repeek) { if (log.isTraceEnabled()) @@ -156,7 +156,7 @@ // check if the parent exists!! // look into invalidated nodes as well currentNode.getLock().releaseAll(owner); - if (parent == null || cacheData.peek(parent.getFqn(), true, true) == null) + if (parent == null || dataContainer.peek(parent.getFqn(), true, true) == null) { // crap! if (log.isTraceEnabled()) @@ -221,7 +221,7 @@ { return true;// we're doing a remove and we've reached the PARENT node of the target to be removed. } - if (!isTargetNode && cacheData.peek(targetFqn.getAncestor(currentNodeIndex + 2), false, false) == null) + if (!isTargetNode && dataContainer.peek(targetFqn.getAncestor(currentNodeIndex + 2), false, false) == null) //if (!isTargetNode && cache.peek(targetFqn.getAncestor(currentNodeIndex + 2), false) == null) //if (!isTargetNode && cache.peek(new Fqn(currentNode.getFqn(), targetFqn.get(currentNodeIndex + 1)), false) == null) { Modified: core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -171,7 +171,7 @@ fqn = extractFqn(((ReplicateCommand) cmd).getModifications().get(0)); break; case ClusteredGetCommand.METHOD_ID: - fqn = ((ClusteredGetCommand) cmd).getCacheDataComand().getFqn(); + fqn = ((ClusteredGetCommand) cmd).getDataCommand().getFqn(); break; default: if (cmd instanceof DataCommand) Modified: core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/main/java/org/jboss/cache/util/CachePrinter.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -23,7 +23,7 @@ public static String printCacheDetails(Cache c) { // internal cast - DataContainer ci = ((CacheInvocationDelegate) c).getCacheData(); + DataContainer ci = ((CacheInvocationDelegate) c).getDataContainer(); return ci.printDetails(); } @@ -36,7 +36,7 @@ public static String printCacheLockingInfo(Cache c) { // internal cast - DataContainer cd = ((CacheInvocationDelegate) c).getCacheData(); + DataContainer cd = ((CacheInvocationDelegate) c).getDataContainer(); return cd.printLockInfo(); } Modified: core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -14,7 +14,6 @@ import org.jboss.cache.Cache; import org.jboss.cache.Fqn; import org.jboss.cache.Node; -import org.jboss.cache.invocation.CacheInvocationDelegate; import org.jboss.cache.lock.TimeoutException; import org.jboss.cache.notifications.annotation.CacheListener; import org.jboss.cache.notifications.annotation.NodeCreated; @@ -26,6 +25,7 @@ import org.jboss.cache.notifications.event.NodeEvent; import org.jboss.cache.notifications.event.NodeModifiedEvent; import org.jboss.cache.notifications.event.ViewChangedEvent; +import org.jboss.cache.util.CachePrinter; import org.jgroups.Address; import javax.swing.*; @@ -1064,7 +1064,7 @@ public void actionPerformed(ActionEvent e) { - System.out.println("\n*** lock information ****\n" + ((CacheInvocationDelegate) cache).getCacheData().printLockInfo()); + System.out.println("\n*** lock information ****\n" + CachePrinter.printCacheLockingInfo(cache)); } } Modified: core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java 2008-04-28 14:03:57 UTC (rev 5721) +++ core/trunk/src/test/java/org/jboss/cache/loader/BdbjeCacheLoaderTest.java 2008-04-28 14:31:25 UTC (rev 5722) @@ -1,9 +1,9 @@ package org.jboss.cache.loader; -import static org.testng.AssertJUnit.assertEquals; - import org.jboss.cache.Fqn; import org.jboss.cache.misc.TestingUtil; +import static org.testng.AssertJUnit.assertEquals; +import org.testng.annotations.Test; /** * Runs the same tests as {@link FileCacheLoaderTest}, but with Berkeley DB instead of a file-based CacheLoader @@ -11,6 +11,7 @@ * @author Bela Ban * @version $Id$ */ +@Test(groups = "functional") public class BdbjeCacheLoaderTest extends CacheLoaderTestsBase { protected void configureCache() throws Exception