You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ba...@apache.org on 2016/03/18 17:04:28 UTC
svn commit: r1735628 - in /jackrabbit/oak/branches/1.4: ./
oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/
oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/
Author: baedke
Date: Fri Mar 18 16:04:22 2016
New Revision: 1735628
URL: http://svn.apache.org/viewvc?rev=1735628&view=rev
Log:
OAK-3846: Add parameter to skip SNS nodes
Added CommitHook to rename illegal sns during repo migration. Patch provided by Tomek Rekawek (tomekr@apache.org).
Added:
jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/SameNameSiblingsEditor.java
- copied unchanged from r1735622, jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/SameNameSiblingsEditor.java
jackrabbit/oak/branches/1.4/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/SameNodeSiblingsTest.java
- copied unchanged from r1735622, jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/SameNodeSiblingsTest.java
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 16:04:22 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735588
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735588,1735622
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1735628&r1=1735627&r2=1735628&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java (original)
+++ jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java Fri Mar 18 16:04:22 2016
@@ -465,7 +465,8 @@ public class RepositoryUpgrade {
new RestrictionEditorProvider(),
new GroupEditorProvider(groupsPath),
// copy referenced version histories
- new VersionableEditor.Provider(sourceRoot, workspaceName, versionCopyConfiguration)
+ new VersionableEditor.Provider(sourceRoot, workspaceName, versionCopyConfiguration),
+ new SameNameSiblingsEditor.Provider()
)));
// security-related hooks