Author: mreutegg
Date: Tue Aug 13 14:22:32 2013
New Revision: 1513502
URL: http://svn.apache.org/r1513502
Log:
OAK-168: Basic JCR VersionManager support
- Improve removeExisting behavior of restore and enable test
Modified:
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1513502&r1=1513501&r2=1513502&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Tue Aug 13 14:22:32 2013
@@ -210,7 +210,6 @@
org.apache.jackrabbit.test.api.version.VersionHistoryTest#testGetLockJcr2
org.apache.jackrabbit.test.api.version.VersionHistoryTest#testMerge
org.apache.jackrabbit.test.api.version.CopyTest
-
org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreWithUUIDConflict
org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreLabel
org.apache.jackrabbit.test.api.version.RestoreTest#testRestoreLabelJcr2
org.apache.jackrabbit.test.api.version.WorkspaceRestoreTest
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java?rev=1513502&r1=1513501&r2=1513502&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
Tue Aug 13 14:22:32 2013
@@ -425,7 +425,10 @@ public class VersionManagerImpl implemen
if (node.isNodeType(NodeType.NT_FROZEN_NODE)) {
uuids.add(node.getProperty(Property.JCR_FROZEN_UUID).getString());
} else if (node.isNodeType(NodeType.NT_VERSIONED_CHILD)) {
- // TODO: handle?
+ Node history = node.getProperty(
+ Property.JCR_CHILD_VERSION_HISTORY).getNode();
+
uuids.add(history.getProperty(Property.JCR_VERSIONABLE_UUID).getString());
+ // TODO: further traverse versioned children with some
selector (date?)
}
}
});
