Author: baedke Date: Fri Mar 18 17:02:41 2016 New Revision: 1735645 URL: http://svn.apache.org/viewvc?rev=1735645&view=rev Log: AK-4128: RepositorySidegrade doesn't copy root node properties
Patch provided by Tomek Rekawek (tom...@apache.org). Modified: jackrabbit/oak/branches/1.4/ (props changed) jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java jackrabbit/oak/branches/1.4/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java Propchange: jackrabbit/oak/branches/1.4/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 18 17:02:41 2016 @@ -1,3 +1,3 @@ /jackrabbit/oak/branches/1.0:1665962 -/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735588,1735622 +/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052,1735405,1735484,1735588,1735622,1735638 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1735645&r1=1735644&r2=1735645&view=diff ============================================================================== --- jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java (original) +++ jackrabbit/oak/branches/1.4/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java Fri Mar 18 17:02:41 2016 @@ -52,6 +52,7 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_INCLUDE_PATHS; import static org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.DEFAULT_MERGE_PATHS; import static org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade.calculateEffectiveIncludePaths; +import static org.apache.jackrabbit.oak.upgrade.nodestate.NodeStateCopier.copyProperties; import static org.apache.jackrabbit.oak.upgrade.version.VersionCopier.copyVersionStorage; public class RepositorySidegrade { @@ -272,5 +273,9 @@ public class RepositorySidegrade { .exclude(excludes) .merge(merges) .copy(sourceRoot, targetRoot); + + if (includePaths.contains("/")) { + copyProperties(sourceRoot, targetRoot); + } } } \ No newline at end of file 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=1735645&r1=1735644&r2=1735645&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 17:02:41 2016 @@ -31,6 +31,7 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants.JCR_ALL; import static org.apache.jackrabbit.oak.upgrade.nodestate.FilteringNodeState.ALL; import static org.apache.jackrabbit.oak.upgrade.nodestate.FilteringNodeState.NONE; +import static org.apache.jackrabbit.oak.upgrade.nodestate.NodeStateCopier.copyProperties; import java.io.File; import java.io.IOException; @@ -870,6 +871,10 @@ public class RepositoryUpgrade { .merge(merges) .copy(sourceRoot, targetRoot); + if (includePaths.contains("/")) { + copyProperties(sourceRoot, targetRoot); + } + return workspaceName; } Modified: jackrabbit/oak/branches/1.4/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java?rev=1735645&r1=1735644&r2=1735645&view=diff ============================================================================== --- jackrabbit/oak/branches/1.4/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java (original) +++ jackrabbit/oak/branches/1.4/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java Fri Mar 18 17:02:41 2016 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.upgrade.cli; -import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertEquals; import java.io.File; @@ -116,6 +115,12 @@ public abstract class AbstractOak2OakTes } static void verifyContent(Session session) throws RepositoryException { + Node root = session.getRootNode(); + assertEquals("rep:root", root.getPrimaryNodeType().getName()); + assertEquals(1, root.getMixinNodeTypes().length); + assertEquals("rep:AccessControllable", root.getMixinNodeTypes()[0].getName()); + assertEquals("sling:redirect", root.getProperty("sling:resourceType").getString()); + Node allow = session.getNode("/apps"); assertEquals("sling:Folder", allow.getProperty("jcr:primaryType").getString()); assertEquals("admin", allow.getProperty("jcr:createdBy").getString());