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 al...@apache.org on 2014/04/16 16:55:37 UTC
svn commit: r1587934 - in /jackrabbit/oak/branches/1.0/oak-core: ./
src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
Author: alexparvulescu
Date: Wed Apr 16 14:55:36 2014
New Revision: 1587934
URL: http://svn.apache.org/r1587934
Log:
OAK-1734 UserInitializer#initialize runs a query without any indexes
- merged to branch 1.0
Modified:
jackrabbit/oak/branches/1.0/oak-core/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
Propchange: jackrabbit/oak/branches/1.0/oak-core/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-core:r1587933
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java?rev=1587934&r1=1587933&r2=1587934&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java Wed Apr 16 14:55:36 2014
@@ -28,6 +28,8 @@ import org.apache.jackrabbit.oak.core.Sy
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
+import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
+import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
@@ -90,9 +92,10 @@ class UserInitializer implements Workspa
NodeState base = builder.getNodeState();
MemoryNodeStore store = new MemoryNodeStore(base);
- Root root = new SystemRoot(
- store, EmptyHook.INSTANCE, workspaceName, securityProvider,
- new QueryEngineSettings(), new CompositeQueryIndexProvider());
+ Root root = new SystemRoot(store, EmptyHook.INSTANCE, workspaceName,
+ securityProvider, new QueryEngineSettings(),
+ new CompositeQueryIndexProvider(new PropertyIndexProvider(),
+ new NodeTypeIndexProvider()));
UserConfiguration userConfiguration = securityProvider.getConfiguration(UserConfiguration.class);
UserManager userManager = userConfiguration.getUserManager(root, NamePathMapper.DEFAULT);