Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A05B2943A for ; Thu, 13 Oct 2011 21:57:56 +0000 (UTC) Received: (qmail 91840 invoked by uid 500); 13 Oct 2011 21:57:56 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 91810 invoked by uid 500); 13 Oct 2011 21:57:56 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 91795 invoked by uid 99); 13 Oct 2011 21:57:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 21:57:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 21:57:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5241F2388ABB; Thu, 13 Oct 2011 21:57:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1183127 - in /jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi: ./ hierarchy/ lock/ operation/ state/ version/ Date: Thu, 13 Oct 2011 21:57:24 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111013215726.5241F2388ABB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Thu Oct 13 21:57:23 2011 New Revision: 1183127 URL: http://svn.apache.org/viewvc?rev=1183127&view=rev Log: Microkernel based Jackrabbit prototype (WIP) consolidate and cleanup getId, getNodeId and getWorkspaceId methods Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/UniqueIdResolver.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockStateManagerImpl.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRelease.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ResolveMergeConflict.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java Thu Oct 13 21:57:23 2011 @@ -806,7 +806,7 @@ public class NodeImpl extends ItemImpl throw if (l == null) { - throw new LockException("Node with id '" + nodeState.getNodeId() + "' is not locked."); + throw new LockException("Node with id '" + nodeState.getId() + "' is not locked."); } // a lock exists either on the given node state or as deep lock inherited @@ -275,7 +275,7 @@ public class LockStateManagerImpl implem * given state nor any of its ancestors is locked. */ private static NodeState getLockHoldingState(NodeState nodeState) { - NodeEntry entry = nodeState.getNodeEntry(); + NodeEntry entry = nodeState.getHierarchyEntry(); while (!entry.hasPropertyEntry(NameConstants.JCR_LOCKISDEEP)) { NodeEntry parent = entry.getParent(); if (parent == null) { @@ -297,7 +297,7 @@ public class LockStateManagerImpl implem } private LockState buildLockState(NodeState nodeState) throws RepositoryException { - NodeId nId = nodeState.getNodeId(); + NodeId nId = nodeState.getId(); NodeState lockHoldingState; LockInfo lockInfo = wspManager.getLockInfo(nId); if (lockInfo == null) { @@ -484,7 +484,7 @@ public class LockStateManagerImpl implem * @throws RepositoryException */ private void reloadLockInfo() throws RepositoryException { - NodeId nId = lockHoldingState.getNodeEntry().getWorkspaceId(); + NodeId nId = lockHoldingState.getWorkspaceId(); lockInfo = wspManager.getLockInfo(nId); if (lockInfo == null) { // lock has been released on the server Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java Thu Oct 13 21:57:23 2011 @@ -81,11 +81,11 @@ public abstract class AbstractCopy exten } public NodeId getNodeId() throws RepositoryException { - return srcState.getNodeId(); + return srcState.getId(); } public NodeId getDestinationParentId() throws RepositoryException { - return destParentState.getNodeId(); + return destParentState.getId(); } public Name getDestinationName() { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java Thu Oct 13 21:57:23 2011 @@ -102,7 +102,7 @@ public abstract class AbstractOperation * @throws RepositoryException */ protected static void loadChildNodeEntries(NodeState parentState) throws RepositoryException { - parentState.getNodeEntry().getNodeEntries(); + parentState.getHierarchyEntry().getNodeEntries(); } protected final void assertStatus(Status status) { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java Thu Oct 13 21:57:23 2011 @@ -92,11 +92,11 @@ public class AddLabel extends AbstractOp //----------------------------------------< Access Operation Parameters >--- public NodeId getVersionHistoryId() throws RepositoryException { - return versionHistoryState.getNodeEntry().getWorkspaceId(); + return versionHistoryState.getWorkspaceId(); } public NodeId getVersionId() throws RepositoryException { - return versionState.getNodeEntry().getWorkspaceId(); + return versionState.getWorkspaceId(); } public Name getLabel() { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java Thu Oct 13 21:57:23 2011 @@ -41,7 +41,7 @@ public class AddNode extends TransientOp throws RepositoryException { super(options); - parentId = parentState.getNodeId(); + parentId = parentState.getId(); this.parentState = parentState; this.nodeName = nodeName; this.nodeTypeName = nodeTypeName; Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java Thu Oct 13 21:57:23 2011 @@ -40,7 +40,7 @@ public class AddProperty extends Transie QValue[] values, int options) throws RepositoryException { super(options); - parentId = parentState.getNodeId(); + parentId = parentState.getId(); this.parentState = parentState; this.propertyName = propertyName; this.propertyType = propertyType; Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java Thu Oct 13 21:57:23 2011 @@ -81,7 +81,7 @@ public class Checkin extends AbstractOpe * @return The {@code NodeId} of the nodeState to be checked in. */ public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeEntry().getWorkspaceId(); + return nodeState.getWorkspaceId(); } public void setNewVersionId(NodeId newVersionId) { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java Thu Oct 13 21:57:23 2011 @@ -92,7 +92,7 @@ public class Checkout extends AbstractOp * @return */ public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeEntry().getWorkspaceId(); + return nodeState.getWorkspaceId(); } /** Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java Thu Oct 13 21:57:23 2011 @@ -96,7 +96,7 @@ public class Checkpoint extends Abstract * @return */ public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeEntry().getWorkspaceId(); + return nodeState.getWorkspaceId(); } /** Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java Thu Oct 13 21:57:23 2011 @@ -62,7 +62,7 @@ public class CreateConfiguration extends * @throws RepositoryException */ public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeEntry().getWorkspaceId(); + return nodeState.getWorkspaceId(); } public void setNewConfigurationId(NodeId newConfigurationId) { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java Thu Oct 13 21:57:23 2011 @@ -71,7 +71,7 @@ public class LockOperation extends Abstr //----------------------------------------< Access Operation Parameters >--- public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeId(); + return nodeState.getId(); } public boolean isDeep() { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java Thu Oct 13 21:57:23 2011 @@ -50,7 +50,7 @@ public class LockRefresh extends Abstrac //----------------------------------------< Access Operation Parameters >--- public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeId(); + return nodeState.getId(); } //------------------------------------------------------------< Factory >--- Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRelease.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRelease.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRelease.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRelease.java Thu Oct 13 21:57:23 2011 @@ -52,7 +52,7 @@ public class LockRelease extends Abstrac assertStatus(Status.PENDING); status = Status.PERSISTED; // non-recursive invalidation but including all properties - NodeEntry nodeEntry = nodeState.getNodeEntry(); + NodeEntry nodeEntry = nodeState.getHierarchyEntry(); Iterator entries = nodeEntry.getPropertyEntries(); while (entries.hasNext()) { PropertyEntry pe = entries.next(); @@ -64,7 +64,7 @@ public class LockRelease extends Abstrac //----------------------------------------< Access Operation Parameters >--- public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeId(); + return nodeState.getId(); } //------------------------------------------------------------< Factory >--- Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java Thu Oct 13 21:57:23 2011 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.jcr2spi.operation; -import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry; import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry; import org.apache.jackrabbit.jcr2spi.state.NodeState; import org.apache.jackrabbit.jcr2spi.version.VersionStateManager; @@ -68,7 +67,7 @@ public class Merge extends AbstractOpera if (isActivityMerge()) { // TODO be more specific about what needs to be invalidated // look for the root entry and invalidate the complete tree - HierarchyEntry entry = nodeState.getNodeEntry(); + NodeEntry entry = nodeState.getHierarchyEntry(); while (entry.getParent() != null) { entry = entry.getParent(); } @@ -89,7 +88,7 @@ public class Merge extends AbstractOpera //----------------------------------------< Access Operation Parameters >--- public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeEntry().getWorkspaceId(); + return nodeState.getWorkspaceId(); } public String getSourceWorkspaceName() { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java Thu Oct 13 21:57:23 2011 @@ -59,7 +59,7 @@ public class Move extends TransientOpera super(sessionMove ? MOVE_OPTIONS : ItemStateValidator.CHECK_NONE); srcId = srcNodeState.getId(); - destParentId = destParentState.getNodeId(); + destParentId = destParentState.getId(); this.destName = destName; srcState = srcNodeState; @@ -94,11 +94,11 @@ public class Move extends TransientOpera assertStatus(Status.PENDING); status = Status.PERSISTED; if (sessionMove) { - srcState.getNodeEntry().complete(this); + srcState.getHierarchyEntry().complete(this); } else { // non-recursive invalidation try { - srcState.getNodeEntry().move(destName, destParentState.getNodeEntry(), false); + srcState.getHierarchyEntry().move(destName, destParentState.getHierarchyEntry(), false); // TODO: moved state ev. got a new definition. } catch (RepositoryException e) { // should not occur Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java Thu Oct 13 21:57:23 2011 @@ -64,7 +64,7 @@ public class RemoveActivity extends Abst } // invalidate the activities parent - parent.getNodeEntry().invalidate(false); + parent.getHierarchyEntry().invalidate(false); } //------------------------------------------------------------< Factory >--- Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java Thu Oct 13 21:57:23 2011 @@ -90,11 +90,11 @@ public class RemoveLabel extends Abstrac //----------------------------------------< Access Operation Parameters >--- public NodeId getVersionHistoryId() throws RepositoryException { - return versionHistoryState.getNodeEntry().getWorkspaceId(); + return versionHistoryState.getWorkspaceId(); } public NodeId getVersionId() throws RepositoryException { - return versionState.getNodeEntry().getWorkspaceId(); + return versionState.getWorkspaceId(); } public Name getLabel() { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java Thu Oct 13 21:57:23 2011 @@ -70,7 +70,7 @@ public class RemoveVersion extends Abstr // invalidate the version history entry and all its children // in order to have the v-graph recalculated - parent.getNodeEntry().invalidate(true); + parent.getHierarchyEntry().invalidate(true); } //------------------------------------------------------------< Factory >--- Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java Thu Oct 13 21:57:23 2011 @@ -42,9 +42,9 @@ public class ReorderNodes extends Transi this.insert = insert; this.before = before; - parentId = parentState.getNodeId(); - insertId = insert.getNodeId(); - beforeId = before == null ? null : before.getNodeId(); + parentId = parentState.getId(); + insertId = insert.getId(); + beforeId = before == null ? null : before.getId(); addAffectedItemState(parentState); } Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ResolveMergeConflict.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ResolveMergeConflict.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ResolveMergeConflict.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ResolveMergeConflict.java Thu Oct 13 21:57:23 2011 @@ -67,7 +67,7 @@ public class ResolveMergeConflict extend //----------------------------------------< Access Operation Parameters >--- public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeEntry().getWorkspaceId(); + return nodeState.getWorkspaceId(); } public NodeId[] getMergeFailedIds() { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java Thu Oct 13 21:57:23 2011 @@ -67,12 +67,12 @@ public class Restore extends AbstractOpe // invalidate the complete tree // -> start searching root-entry from any version-entry or // from the given node state - entry = nodeState == null ? versionStates[0].getNodeEntry() : nodeState.getNodeEntry(); + entry = nodeState == null ? versionStates[0].getHierarchyEntry() : nodeState.getHierarchyEntry(); while (entry.getParent() != null) { entry = entry.getParent(); } } else { - entry = nodeState.getNodeEntry(); + entry = nodeState.getHierarchyEntry(); } entry.invalidate(true); } @@ -86,7 +86,7 @@ public class Restore extends AbstractOpe * @return */ public NodeId getNodeId() throws RepositoryException { - return nodeState == null ? null : nodeState.getNodeEntry().getWorkspaceId(); + return nodeState == null ? null : nodeState.getWorkspaceId(); } /** @@ -103,7 +103,7 @@ public class Restore extends AbstractOpe public NodeId[] getVersionIds() throws RepositoryException { NodeId[] versionIds = new NodeId[versionStates.length]; for (int i = 0; i < versionStates.length; i++) { - versionIds[i] = versionStates[i].getNodeEntry().getWorkspaceId(); + versionIds[i] = versionStates[i].getWorkspaceId(); } return versionIds; } Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java Thu Oct 13 21:57:23 2011 @@ -42,7 +42,7 @@ public class SetMixin extends TransientO private SetMixin(NodeState nodeState, Name[] mixinNames, int options) throws RepositoryException { super(options); this.nodeState = nodeState; - nodeId = nodeState.getNodeId(); + nodeId = nodeState.getId(); this.mixinNames = mixinNames; // remember node state as affected state Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java Thu Oct 13 21:57:23 2011 @@ -46,7 +46,7 @@ public class SetPrimaryType extends Tran private SetPrimaryType(NodeState nodeState, Name primaryTypeName, int options) throws RepositoryException { super(options); this.nodeState = nodeState; - nodeId = nodeState.getNodeId(); + nodeId = nodeState.getId(); this.primaryTypeName = primaryTypeName; // remember node state as affected state Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java Thu Oct 13 21:57:23 2011 @@ -56,7 +56,7 @@ public class Update extends AbstractOper //----------------------------------------< Access Operation Parameters >--- public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeEntry().getWorkspaceId(); + return nodeState.getWorkspaceId(); } public String getSourceWorkspaceName() { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java Thu Oct 13 21:57:23 2011 @@ -68,7 +68,7 @@ public class WorkspaceImport extends Abs if (uuidBehaviour == ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING || uuidBehaviour == ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING) { // invalidate the complete tree - entry = nodeState.getNodeEntry(); + entry = nodeState.getHierarchyEntry(); while (entry.getParent() != null) { entry = entry.getParent(); } @@ -76,14 +76,14 @@ public class WorkspaceImport extends Abs } else { // import only added new items below the import target. therefore // recursive invalidation is not required. // TODO correct? - nodeState.getNodeEntry().invalidate(false); + nodeState.getHierarchyEntry().invalidate(false); } } //----------------------------------------< Access Operation Parameters >--- public NodeId getNodeId() throws RepositoryException { - return nodeState.getNodeId(); + return nodeState.getId(); } public InputStream getXmlStream() { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java Thu Oct 13 21:57:23 2011 @@ -169,27 +169,11 @@ public class NodeState extends ItemState //----------------------------------------------------------< NodeState >--- /** - * @return The {@code NodeEntry} associated with this state. - */ - public NodeEntry getNodeEntry() { - return getHierarchyEntry(); - } - - /** - * Returns the id of this node state. - * - * @return the id of this node state. - */ - public NodeId getNodeId() throws RepositoryException { - return getNodeEntry().getId(); - } - - /** * @return the unique ID of this node state or {@code null} if this * node cannot be identified with a unique ID. */ public String getUniqueID() { - return getNodeEntry().getUniqueID(); + return getHierarchyEntry().getUniqueID(); } /** @@ -262,7 +246,7 @@ public class NodeState extends ItemState Name primaryType = getNodeTypeName(); allNtNames = new Name[] { primaryType }; // default try { - PropertyEntry pe = getNodeEntry().getPropertyEntry(NameConstants.JCR_MIXINTYPES); + PropertyEntry pe = getHierarchyEntry().getPropertyEntry(NameConstants.JCR_MIXINTYPES); if (pe != null) { PropertyState mixins = pe.getPropertyState(); QValue[] values = mixins.getValues(); @@ -328,7 +312,7 @@ public class NodeState extends ItemState * the specified {@code name} and {@code index}. */ public boolean hasChildNodeEntry(Name name, int index) { - return getNodeEntry().hasNodeEntry(name, index); + return getHierarchyEntry().hasNodeEntry(name, index); } /** @@ -344,7 +328,7 @@ public class NodeState extends ItemState * @throws RepositoryException */ public NodeState getChildNodeState(Name nodeName, int index) throws RepositoryException { - NodeEntry ne = getNodeEntry().getNodeEntry(nodeName, index, true); + NodeEntry ne = getHierarchyEntry().getNodeEntry(nodeName, index, true); if (ne != null) { return ne.getNodeState(); } else { @@ -361,7 +345,7 @@ public class NodeState extends ItemState * specified {@code Name}. */ public boolean hasPropertyName(Name propName) { - return getNodeEntry().hasPropertyEntry(propName); + return getHierarchyEntry().hasPropertyEntry(propName); } /** @@ -379,7 +363,7 @@ public class NodeState extends ItemState * @see PropertyEntry#getPropertyState() */ public PropertyState getPropertyState(Name propertyName) throws RepositoryException { - PropertyEntry pe = getNodeEntry().getPropertyEntry(propertyName); + PropertyEntry pe = getHierarchyEntry().getPropertyEntry(propertyName); if (pe != null) { return pe.getPropertyState(); } else { @@ -403,8 +387,8 @@ public class NodeState extends ItemState synchronized void reorderChildNodeEntries(NodeState insertNode, NodeState beforeNode) throws RepositoryException { - NodeEntry before = beforeNode == null ? null : beforeNode.getNodeEntry(); - insertNode.getNodeEntry().orderBefore(before); + NodeEntry before = beforeNode == null ? null : beforeNode.getHierarchyEntry(); + insertNode.getHierarchyEntry().orderBefore(before); // mark this state as modified markModified(); @@ -426,7 +410,7 @@ public class NodeState extends ItemState throws RepositoryException { // move child entry - childState.getNodeEntry().move(newName, newParent.getNodeEntry(), true); + childState.getHierarchyEntry().move(newName, newParent.getHierarchyEntry(), true); childState.definition = newDefinition; // mark both this and newParent modified @@ -438,7 +422,7 @@ public class NodeState extends ItemState //------------------------------------------< private >--- private boolean isMoved() { - return !isRoot() && getNodeEntry().isTransientlyMoved(); + return !isRoot() && getHierarchyEntry().isTransientlyMoved(); } private QNodeDefinition retrieveDefinition() throws RepositoryException { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java Thu Oct 13 21:57:23 2011 @@ -212,7 +212,7 @@ public class PropertyState extends ItemS // before. The effective NT must be evaluated as if it had been // evaluated upon creating the workspace state. definition = definitionProvider.getQPropertyDefinition(getParent().getNodeTypeNames(), getName(), getType(), - multiValued, getHierarchyEntry().getWorkspaceId()); + multiValued, getWorkspaceId()); } return definition; } Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java Thu Oct 13 21:57:23 2011 @@ -283,7 +283,7 @@ public class SessionItemStateManager ext // NOTE: node state is only modified upon save of the changes! Name[] mixinNames = operation.getMixinNames(); NodeState nState = operation.getNodeState(); - NodeEntry nEntry = nState.getNodeEntry(); + NodeEntry nEntry = nState.getHierarchyEntry(); // assert the existence of the property entry and set the array of // mixinNames to be set on the corresponding property state @@ -320,7 +320,7 @@ public class SessionItemStateManager ext // NOTE: node state is only modified upon save of the changes! Name primaryName = operation.getPrimaryTypeName(); NodeState nState = operation.getNodeState(); - NodeEntry nEntry = nState.getNodeEntry(); + NodeEntry nEntry = nState.getHierarchyEntry(); // detect obvious node type conflicts Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java Thu Oct 13 21:57:23 2011 @@ -163,7 +163,7 @@ public class WorkspaceItemStateFactory e @Override public Iterator getNodeReferences(NodeState nodeState, Name propertyName, boolean weak) { - NodeEntry entry = nodeState.getNodeEntry(); + NodeEntry entry = nodeState.getHierarchyEntry(); // Shortcut if (entry.getUniqueID() == null || !entry.hasPropertyEntry(NameConstants.JCR_UUID)) { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java?rev=1183127&r1=1183126&r2=1183127&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionStateManagerImpl.java Thu Oct 13 21:57:23 2011 @@ -103,7 +103,7 @@ public class VersionStateManagerImpl imp return true; } - NodeEntry nodeEntry = nodeState.getNodeEntry(); + NodeEntry nodeEntry = nodeState.getHierarchyEntry(); try { // NOTE: since the hierarchy might not be completely loaded or some // entry might even not be accessible, the check may not detect @@ -186,7 +186,7 @@ public class VersionStateManagerImpl imp @Override public void resolveMergeConflict(NodeState nodeState, NodeState versionState, boolean done) throws RepositoryException { - NodeId vId = versionState.getNodeId(); + NodeId vId = versionState.getId(); PropertyState mergeFailedState = nodeState.getPropertyState(NameConstants.JCR_MERGEFAILED); QValue[] vs = mergeFailedState.getValues(); @@ -264,4 +264,4 @@ public class VersionStateManagerImpl imp NodeId vhId = workspaceManager.getIdFactory().createNodeId(uniqueID); return workspaceManager.getHierarchyManager().getNodeEntry(vhId); } -} \ No newline at end of file +}