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 tr...@apache.org on 2013/11/28 16:42:16 UTC
svn commit: r1546389 - in /jackrabbit/oak/trunk/oak-upgrade/src:
main/java/org/apache/jackrabbit/oak/upgrade/
main/java/org/apache/jackrabbit/oak/upgrade/security/
test/java/org/apache/jackrabbit/oak/upgrade/
Author: tripod
Date: Thu Nov 28 15:42:15 2013
New Revision: 1546389
URL: http://svn.apache.org/r1546389
Log:
OAK-1222 Migration of Group Members stored in tree structure
- ensure that ReferenceEditor is executed after the GroupEditor so that changes from the later are indexed
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryGroupMemberSplitUpgradeTest.java
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1546389&r1=1546388&r2=1546389&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java Thu Nov 28 15:42:15 2013
@@ -278,8 +278,8 @@ public class RepositoryUpgrade {
// TODO: default hooks?
CommitHook hook = new CompositeHook(
new EditorHook(new RegistrationEditorProvider()),
- new EditorHook(new ReferenceEditorProvider()),
- new EditorHook(new GroupEditorProvider())
+ new EditorHook(new GroupEditorProvider()),
+ new EditorHook(new ReferenceEditorProvider())
);
target.merge(builder, hook, null);
} catch (Exception e) {
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java?rev=1546389&r1=1546388&r2=1546389&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditor.java Thu Nov 28 15:42:15 2013
@@ -79,6 +79,7 @@ class GroupEditor extends DefaultEditor
ascend();
}
+ @SuppressWarnings("deprecation")
@Override
public Editor childNodeAdded(String name, NodeState after) throws CommitFailedException {
if (!descend(name)) {
@@ -98,8 +99,7 @@ class GroupEditor extends DefaultEditor
}
currentGroup = new EditorGroup(state.path);
currentGroup.addMembers(after.getProperty(UserConstants.REP_MEMBERS));
- } else //noinspection deprecation
- if (UserConstants.NT_REP_MEMBERS.equals(nt)) {
+ } else if (UserConstants.NT_REP_MEMBERS.equals(nt)) {
if (currentGroup == null) {
log.warn("rep:Members detected outside of a rep:Group. ignoring {}", state.path);
} else {
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryGroupMemberSplitUpgradeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryGroupMemberSplitUpgradeTest.java?rev=1546389&r1=1546388&r2=1546389&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryGroupMemberSplitUpgradeTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositoryGroupMemberSplitUpgradeTest.java Thu Nov 28 15:42:15 2013
@@ -20,9 +20,6 @@ package org.apache.jackrabbit.oak.upgrad
import java.io.InputStream;
-import org.junit.Ignore;
-import org.junit.Test;
-
public class RepositoryGroupMemberSplitUpgradeTest extends RepositoryGroupMemberUpgradeTest {
private static final String REPO_CONFIG = "repository-groupmembersplit.xml";
@@ -37,10 +34,4 @@ public class RepositoryGroupMemberSplitU
return 20;
}
- @Ignore("OAK-1222")
- @Test
- @Override
- public void verifyMemberOf() throws Exception {
- super.verifyMemberOf();
- }
}