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 96D989016 for ; Fri, 30 Dec 2011 15:42:52 +0000 (UTC) Received: (qmail 38091 invoked by uid 500); 30 Dec 2011 15:42:52 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 38057 invoked by uid 500); 30 Dec 2011 15:42:52 -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 38050 invoked by uid 99); 30 Dec 2011 15:42:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Dec 2011 15:42:52 +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; Fri, 30 Dec 2011 15:42:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8D04823888FD; Fri, 30 Dec 2011 15:42:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1225850 - in /jackrabbit/sandbox/jackrabbit-microkernel/src: main/java/org/apache/jackrabbit/state/ChangeTree.java test/java/org/apache/jackrabbit/state/TransientSpaceTest.java Date: Fri, 30 Dec 2011 15:42:24 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111230154224.8D04823888FD@eris.apache.org> Author: mduerig Date: Fri Dec 30 15:42:24 2011 New Revision: 1225850 URL: http://svn.apache.org/viewvc?rev=1225850&view=rev Log: Microkernel based prototype of JCR implementation (WIP) - moving an added node to a moved node results in the node disappearing: fixed Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/TransientSpaceTest.java Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java?rev=1225850&r1=1225849&r2=1225850&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java Fri Dec 30 15:42:24 2011 @@ -517,6 +517,13 @@ public class ChangeTree { abstract NodeDelta remove() throws ItemNotFoundException; abstract void moveTo(NodeDelta parent, String name); + NodeDelta addChild(NodeDelta delta) { + childNodes.put(delta.name, delta); + delta.parent = this; + touch(); + return delta; + } + final void clear() { childNodes.clear(); properties.clear(); @@ -534,12 +541,6 @@ public class ChangeTree { return childNodes.containsKey(name); } - final NodeDelta addChild(NodeDelta delta) { - childNodes.put(delta.name, delta); - touch(); - return delta; - } - final NodeDelta removeChild(String name) { NodeDelta delta = childNodes.remove(name); if (delta != null) { @@ -676,7 +677,6 @@ public class ChangeTree { @Override void moveTo(NodeDelta parent, String name) { - this.parent = parent; this.name = name; parent.addChild(this); } @@ -773,6 +773,11 @@ public class ChangeTree { } @Override + NodeDelta addChild(NodeDelta delta) { + return source.addChild(delta); + } + + @Override void moveTo(NodeDelta parent, String name) { parent.addChild(new Moved(parent, name, source)); } Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/TransientSpaceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/TransientSpaceTest.java?rev=1225850&r1=1225849&r2=1225850&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/TransientSpaceTest.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/TransientSpaceTest.java Fri Dec 30 15:42:24 2011 @@ -770,6 +770,30 @@ public class TransientSpaceTest { } @Test + public void moveAddedToMove() throws RepositoryException { + NodeDelta root = transientSpace.getNode(ROOT); + root.addNode("source").addNode("node1"); + transientSpace.save(); + + root.getNode("source").moveNode("node1", ROOT.concat("target")); + root.getNode("source").addNode("node2"); + root.getNode("source").moveNode("node2", ROOT.concat("target/moved")); + dump(root); + + assertNotNull(transientSpace.getNode(ROOT.concat("source"))); + assertNull(transientSpace.getNode(ROOT.concat("source/node1"))); + assertNull(transientSpace.getNode(ROOT.concat("source/node2"))); + assertNotNull(transientSpace.getNode(ROOT.concat("target/moved"))); + + transientSpace.save(); + + assertNotNull(transientSpace.getNode(ROOT.concat("source"))); + assertNull(transientSpace.getNode(ROOT.concat("source/node1"))); + assertNull(transientSpace.getNode(ROOT.concat("source/node2"))); + assertNotNull(transientSpace.getNode(ROOT.concat("target/moved"))); + } + + @Test public void setPropertyTest() throws RepositoryException { // Set property NodeDelta root = transientSpace.getNode(ROOT);