svn commit: r965545 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java test/java/org/apache/jackrabbit/core/MoveAtRootTest.java

[st...@apache.org]

Author: stefan
Date: Mon Jul 19 16:11:52 2010
New Revision: 965545

URL: http://svn.apache.org/viewvc?rev=965545&view=rev
Log:
JCR-2680: Cannot move a first-level node

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveAtRootTest.java
Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java?rev=965545&r1=965544&r2=965545&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/retention/RetentionRegistryImpl.java Mon Jul 19 16:11:52 2010
@@ -287,7 +287,7 @@ public class RetentionRegistryImpl imple
         if (element != null) {
             rp = element.get();
         }
-        if (rp == null && checkParent) {
+        if (rp == null && checkParent && (!nodePath.denotesRoot())) {
             element = retentionMap.map(nodePath.getAncestor(1), true);
             if (element != null) {
                 rp = element.get();

Added: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveAtRootTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveAtRootTest.java?rev=965545&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveAtRootTest.java (added)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/MoveAtRootTest.java Mon Jul 19 16:11:52 2010
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.jackrabbit.core;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+
+public class MoveAtRootTest extends AbstractJCRTest {
+
+    public void testMoveAtRoot() throws RepositoryException {
+        final String pathA = "/" + getClass().getSimpleName() + "_A";
+        final String pathB = "/" + getClass().getSimpleName() + "_B";
+
+        final String testText = "Hello." + Math.random();
+
+        Session s = getHelper().getSuperuserSession();
+        if (s.itemExists(pathA)) {
+            s.removeItem(pathA);
+            s.save();
+        }
+
+        assertFalse(s.itemExists(pathA));
+
+        Node n = s.getRootNode().addNode(pathA.substring(1));
+        n.setProperty("text", testText);
+
+        s.save();
+
+        s.refresh(false);
+
+        assertTrue(s.itemExists(pathA));
+
+        // Move to pathB
+        if (s.itemExists(pathB)) {
+            s.removeItem(pathB);
+            s.save();
+        }
+
+        assertFalse(s.itemExists(pathB));
+
+        s.move(pathA, pathB);
+        s.save();
+
+        s.refresh(false);
+
+        assertFalse(s.itemExists(pathA));
+        assertTrue(s.itemExists(pathB));
+
+        n = (Node) s.getItem(pathB);
+        assertEquals(testText, n.getProperty("text").getString());
+    }
+
+}
\ No newline at end of file