Modified: jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java?rev=1756639&r1=1756638&r2=1756639&view=diff ============================================================================== --- jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java (original) +++ jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java Wed Aug 17 14:21:07 2016 @@ -128,11 +128,11 @@ public class UserImportWithActionsTest e doImport(USERPATH, xml); - Authorizable a = userMgr.getAuthorizable("t"); + Authorizable a = getUserManager().getAuthorizable("t"); assertNotNull(a); assertFalse(a.isGroup()); - AccessControlManager acMgr = adminSession.getAccessControlManager(); + AccessControlManager acMgr = getImportSession().getAccessControlManager(); AccessControlPolicy[] policies = acMgr.getPolicies(a.getPath()); assertNotNull(policies); assertEquals(1, policies.length); @@ -159,11 +159,11 @@ public class UserImportWithActionsTest e doImport(USERPATH, xml); - Authorizable a = userMgr.getAuthorizable("t"); + Authorizable a = getUserManager().getAuthorizable("t"); assertNotNull(a); assertFalse(a.isGroup()); - AccessControlManager acMgr = adminSession.getAccessControlManager(); + AccessControlManager acMgr = getImportSession().getAccessControlManager(); AccessControlPolicy[] policies = acMgr.getPolicies(a.getPath()); assertNotNull(policies); assertEquals(1, policies.length); @@ -189,11 +189,11 @@ public class UserImportWithActionsTest e doImport(GROUPPATH, xml); - Authorizable a = userMgr.getAuthorizable("g"); + Authorizable a = getUserManager().getAuthorizable("g"); assertNotNull(a); assertTrue(a.isGroup()); - AccessControlManager acMgr = adminSession.getAccessControlManager(); + AccessControlManager acMgr = getImportSession().getAccessControlManager(); AccessControlPolicy[] policies = acMgr.getPolicies(a.getPath()); assertNotNull(policies); assertEquals(1, policies.length);
Modified: jackrabbit/oak/branches/1.2/oak-parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-parent/pom.xml?rev=1756639&r1=1756638&r2=1756639&view=diff ============================================================================== --- jackrabbit/oak/branches/1.2/oak-parent/pom.xml (original) +++ jackrabbit/oak/branches/1.2/oak-parent/pom.xml Wed Aug 17 14:21:07 2016 @@ -42,7 +42,7 @@ <project.reporting.outputEncoding> ${project.build.sourceEncoding} </project.reporting.outputEncoding> - <jackrabbit.version>2.10.3</jackrabbit.version> + <jackrabbit.version>2.11.0</jackrabbit.version> <mongo.host>127.0.0.1</mongo.host> <mongo.port>27017</mongo.port> <mongo.db>MongoMKDB</mongo.db> Modified: jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java?rev=1756639&r1=1756638&r2=1756639&view=diff ============================================================================== --- jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java (original) +++ jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractLoginTest.java Wed Aug 17 14:21:07 2016 @@ -78,7 +78,7 @@ abstract class AbstractLoginTest extends try { AccessControlUtils.addAccessControlEntry(s, "/", EveryonePrincipal.getInstance(), new String[]{Privilege.JCR_READ}, true); if (USER.equals(runAsUser)) { - User user = ((JackrabbitSession) s).getUserManager().createUser(USER, USER); + ((JackrabbitSession) s).getUserManager().createUser(USER, USER); } } finally { s.save(); Modified: jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1756639&r1=1756638&r2=1756639&view=diff ============================================================================== --- jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java (original) +++ jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java Wed Aug 17 14:21:07 2016 @@ -276,6 +276,9 @@ public class BenchmarkRunner { new GetPrincipalTest( numberOfUsers.value(options), flatStructure.value(options)), + new GetGroupPrincipalsTest( + numberOfGroups.value(options), + nestedGroups.value(options)), new FullTextSearchTest( wikipedia.value(options), flatStructure.value(options),
