You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2010/03/11 14:47:35 UTC
svn commit: r921846 - in /jackrabbit/trunk: jackrabbit-jcr2dav/pom.xml
jackrabbit-spi2dav/pom.xml
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
Author: angela
Date: Thu Mar 11 13:47:35 2010
New Revision: 921846
URL: http://svn.apache.org/viewvc?rev=921846&view=rev
Log:
JCR-2562: spi2davex: uri-lookup not cleared after reordering referenceable same-name-siblings
Modified:
jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml
jackrabbit/trunk/jackrabbit-spi2dav/pom.xml
jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
Modified: jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml?rev=921846&r1=921845&r2=921846&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr2dav/pom.xml Thu Mar 11 13:47:35 2010
@@ -106,15 +106,10 @@
org.apache.jackrabbit.test.api.version.ActivitiesTest
org.apache.jackrabbit.test.api.version.MergeActivityTest#testMergeActivity
org.apache.jackrabbit.test.api.version.ConfigurationsTest
-
- <!-- known issue!? -->
- org.apache.jackrabbit.jcr2spi.ReorderReferenceableSNSTest#testReorder2
-
<!-- JCR-2560 -->
org.apache.jackrabbit.jcr2spi.IsSameTest#testIsSameProperty3
org.apache.jackrabbit.jcr2spi.IsSameTest#testIsSameProperty4
org.apache.jackrabbit.jcr2spi.IsSameTest#testIsSameNode7
-
<!-- Known, general issue of the Jcr2Spi - SPI setup.
No notification about changes to registered namespace(s) -->
org.apache.jackrabbit.jcr2spi.name.NamespaceRegistryTest#testReRegisteredNamespace
Modified: jackrabbit/trunk/jackrabbit-spi2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/pom.xml?rev=921846&r1=921845&r2=921846&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/pom.xml Thu Mar 11 13:47:35 2010
@@ -104,15 +104,10 @@
org.apache.jackrabbit.test.api.version.ActivitiesTest
org.apache.jackrabbit.test.api.version.MergeActivityTest#testMergeActivity
org.apache.jackrabbit.test.api.version.ConfigurationsTest
-
- <!-- known issue!? -->
- org.apache.jackrabbit.jcr2spi.ReorderReferenceableSNSTest#testReorder2
-
<!-- JCR-2560 -->
org.apache.jackrabbit.jcr2spi.IsSameTest#testIsSameProperty3
org.apache.jackrabbit.jcr2spi.IsSameTest#testIsSameProperty4
org.apache.jackrabbit.jcr2spi.IsSameTest#testIsSameNode7
-
<!-- Known, general issue of the Jcr2Spi - SPI setup.
No notification about changes to registered namespace(s) -->
org.apache.jackrabbit.jcr2spi.name.NamespaceRegistryTest#testReRegisteredNamespace
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java?rev=921846&r1=921845&r2=921846&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/RepositoryServiceImpl.java Thu Mar 11 13:47:35 2010
@@ -606,6 +606,11 @@ public class RepositoryServiceImpl exten
val.append(ORDER_POSITION_LAST);
}
appendDiff(SYMBOL_MOVE, srcPath, val.toString());
+
+ // clear the uri-lookup in case the itemID contains a uniqueID part.
+ if (srcNodeId.getPath() == null || (beforeNodeId != null && beforeNodeId.getPath() == null)) {
+ clear = true;
+ }
}
/**