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 B2DA972F4 for ; Thu, 29 Dec 2011 14:19:11 +0000 (UTC) Received: (qmail 41843 invoked by uid 500); 29 Dec 2011 14:19:11 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 41805 invoked by uid 500); 29 Dec 2011 14:19:11 -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 41798 invoked by uid 99); 29 Dec 2011 14:19:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Dec 2011 14:19:11 +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, 29 Dec 2011 14:19:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 40BFA2388980; Thu, 29 Dec 2011 14:18:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1225539 - in /jackrabbit/sandbox/jackrabbit-microkernel/src: main/java/org/apache/jackrabbit/SessionImpl.java main/java/org/apache/jackrabbit/state/NodeState.java test/java/org/apache/jackrabbit/RepositoryTest.java Date: Thu, 29 Dec 2011 14:18:47 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111229141847.40BFA2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Thu Dec 29 14:18:46 2011 New Revision: 1225539 URL: http://svn.apache.org/viewvc?rev=1225539&view=rev Log: Microkernel based prototype of JCR implementation (WIP) - implement transient move Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/SessionImpl.java jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/NodeState.java jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/RepositoryTest.java Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/SessionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/SessionImpl.java?rev=1225539&r1=1225538&r2=1225539&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/SessionImpl.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/SessionImpl.java Thu Dec 29 14:18:46 2011 @@ -22,6 +22,7 @@ package org.apache.jackrabbit; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.security.Authenticator; import org.apache.jackrabbit.security.CredentialsInfo; +import org.apache.jackrabbit.state.NodeState; import org.apache.jackrabbit.state.TransientSpace; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; @@ -243,8 +244,14 @@ public class SessionImpl implements Sess @Override public void move(String srcAbsPath, String destAbsPath) throws RepositoryException { checkLive(); - // todo implement move - throw new UnsupportedRepositoryOperationException("move"); + + Path sourcePath = Path.create(workspaceName, srcAbsPath); + NodeState sourceParent = NodeState.getNodeState(sessionContext, sourcePath.getParent()); + if (sourceParent == null) { + throw new PathNotFoundException(srcAbsPath); + } + + sourceParent.move(sourcePath.getName(), Path.create(workspaceName, destAbsPath)); } @Override Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/NodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/NodeState.java?rev=1225539&r1=1225538&r2=1225539&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/NodeState.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/NodeState.java Thu Dec 29 14:18:46 2011 @@ -33,6 +33,7 @@ import org.apache.jackrabbit.state.Chang import javax.jcr.ItemExistsException; import javax.jcr.ItemNotFoundException; +import javax.jcr.PathNotFoundException; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; @@ -78,6 +79,12 @@ public class NodeState { nodeDelta.remove(); } + public void move(String name, Path destination) throws ItemExistsException, PathNotFoundException, + ItemNotFoundException { + + nodeDelta.moveNode(name, destination); + } + public void setProperty(String name, JsonValue value) { nodeDelta.setValue(name, value); } Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/RepositoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/RepositoryTest.java?rev=1225539&r1=1225538&r2=1225539&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/RepositoryTest.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/RepositoryTest.java Thu Dec 29 14:18:46 2011 @@ -1194,6 +1194,28 @@ public class RepositoryTest { } @Test + public void move() throws RepositoryException { + Session session = getSession(); + + Node node = getNode(TEST_PATH); + node.addNode("source").addNode("node"); + node.addNode("target"); + session.save(); + + session.move(TEST_PATH + "/source/node", TEST_PATH + "/target/moved"); + + assertFalse(node.hasNode("source/node")); + assertTrue(node.hasNode("source")); + assertTrue(node.hasNode("target/moved")); + + session.save(); + + assertFalse(node.hasNode("source/node")); + assertTrue(node.hasNode("source")); + assertTrue(node.hasNode("target/moved")); + } + + @Test @Ignore // todo implement node type support public void setPrimaryType() throws RepositoryException { Node testNode = getNode(TEST_PATH);