Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 1931 invoked from network); 31 Jul 2006 15:48:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 31 Jul 2006 15:48:33 -0000 Received: (qmail 96160 invoked by uid 500); 31 Jul 2006 15:48:33 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 96078 invoked by uid 500); 31 Jul 2006 15:48:33 -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 96068 invoked by uid 99); 31 Jul 2006 15:48:33 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jul 2006 08:48:33 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jul 2006 08:48:32 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 40B521A981A; Mon, 31 Jul 2006 08:48:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r427148 - in /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core: HierarchyManager.java HierarchyManagerImpl.java WorkspaceImpl.java state/SessionItemStateManager.java Date: Mon, 31 Jul 2006 15:48:11 -0000 To: commits@jackrabbit.apache.org From: stefan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060731154812.40B521A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: stefan Date: Mon Jul 31 08:48:10 2006 New Revision: 427148 URL: http://svn.apache.org/viewvc?rev=427148&view=rev Log: reverting changes of r425397 Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java?rev=427148&r1=427147&r2=427148&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java (original) +++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java Mon Jul 31 08:48:10 2006 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.core; -import org.apache.jackrabbit.core.state.ItemState; import org.apache.jackrabbit.name.Path; import org.apache.jackrabbit.name.QName; @@ -105,22 +104,4 @@ */ boolean isAncestor(NodeId nodeId, ItemId itemId) throws ItemNotFoundException, RepositoryException; - - /** - * Returns the id of the root node of this hierarchy. - * @return the root node id. - */ - NodeId getRootNodeId(); - - /** - * The hierarchy manager is notified when a state is overlaid - * @param state - */ - void stateOverlaid(ItemState state); - - /** - * The hierarchy manager is notified when a state is uncovered. - * @param state - */ - void stateUncovered(ItemState state); } Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java?rev=427148&r1=427147&r2=427148&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java Mon Jul 31 08:48:10 2006 @@ -510,19 +510,5 @@ throw new RepositoryException(msg, ise); } } - - /** - * {@inheritDoc} - */ - public void stateOverlaid(ItemState state) { - // ignore - } - - /** - * {@inheritDoc} - */ - public void stateUncovered(ItemState state) { - // ignore - } } Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java?rev=427148&r1=427147&r2=427148&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java (original) +++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java Mon Jul 31 08:48:10 2006 @@ -95,7 +95,7 @@ * (i.e. that is isolated from transient changes made through * the session). */ - protected final HierarchyManager hierMgr; + protected final HierarchyManagerImpl hierMgr; /** * The ObservationManager instance for this session. Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?rev=427148&r1=427147&r2=427148&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java (original) +++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java Mon Jul 31 08:48:10 2006 @@ -59,12 +59,7 @@ /** * Hierarchy manager */ - private final HierarchyManager hierMgr; - - /** - * the namespace resolver used by this session - */ - private final NamespaceResolver nsResolver; + private CachingHierarchyManager hierMgr; /** * Creates a new SessionItemStateManager instance. @@ -78,7 +73,6 @@ NamespaceResolver nsResolver) { this.persistentStateMgr = persistentStateMgr; - this.nsResolver = nsResolver; // create transient item state manager transientStateMgr = new TransientItemStateManager(); // create hierarchy manager that uses both transient and persistent state @@ -413,7 +407,7 @@ new ZombieHierarchyManager(hierMgr.getRootNodeId(), this, transientStateMgr.getAttic(), - nsResolver); + hierMgr.getNamespaceResolver()); // use an array of lists to group the descendants by relative depth; // the depth is used as array index