Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 95189 invoked from network); 3 Oct 2008 09:38:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Oct 2008 09:38:42 -0000 Received: (qmail 27669 invoked by uid 500); 3 Oct 2008 09:38:41 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 27634 invoked by uid 500); 3 Oct 2008 09:38:40 -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 27625 invoked by uid 99); 3 Oct 2008 09:38:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Oct 2008 02:38:40 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 03 Oct 2008 09:37:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2BA8B2388873; Fri, 3 Oct 2008 02:38:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r701339 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version: AbstractVersionManager.java InternalVersionHistoryImpl.java Date: Fri, 03 Oct 2008 09:38:12 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081003093813.2BA8B2388873@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Fri Oct 3 02:38:12 2008 New Revision: 701339 URL: http://svn.apache.org/viewvc?rev=701339&view=rev Log: JCR-1775: Transaction-safe versioning Hide the generation of the version history id inside InternalVersionHistoryImpl. Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java?rev=701339&r1=701338&r2=701339&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java Fri Oct 3 02:38:12 2008 @@ -26,7 +26,6 @@ import org.apache.jackrabbit.core.state.LocalItemStateManager; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.uuid.UUID; import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl; import org.slf4j.Logger; @@ -333,7 +332,7 @@ // create new history node in the persistent state InternalVersionHistoryImpl hist = InternalVersionHistoryImpl.create( - this, root, new NodeId(UUID.randomUUID()), historyNodeName, node); + this, root, historyNodeName, node); // end update operation.save(); Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java?rev=701339&r1=701338&r2=701339&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java Fri Oct 3 02:38:12 2008 @@ -518,11 +518,12 @@ */ static InternalVersionHistoryImpl create(AbstractVersionManager vMgr, NodeStateEx parent, - NodeId historyId, Name name, + Name name, NodeState nodeState) throws RepositoryException { // create history node + NodeId historyId = new NodeId(UUID.randomUUID()); NodeStateEx pNode = parent.addNode(name, NameConstants.NT_VERSIONHISTORY, historyId, true); // set the versionable uuid