Index: oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiRepositoryInitializer.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiRepositoryInitializer.java (revision 1436554) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiRepositoryInitializer.java (working copy) @@ -18,8 +18,9 @@ */ package org.apache.jackrabbit.oak.osgi; +import org.apache.jackrabbit.oak.spi.lifecycle.CompositeInitializer; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; -import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.apache.jackrabbit.oak.spi.state.NodeState; import org.osgi.framework.ServiceReference; /** @@ -31,35 +32,33 @@ extends AbstractServiceTracker implements RepositoryInitializer { - /** - * The reference to the micro kernel once available. - */ - private volatile NodeStore store; + private RepositoryInitializerObserver observer; public OsgiRepositoryInitializer() { super(RepositoryInitializer.class); } @Override - public void initialize(NodeStore store) { - this.store = store; - if (store != null) { - for (RepositoryInitializer mki : getServices()) { - mki.initialize(store); - } - } + public NodeState initialize(NodeState state) { + return new CompositeInitializer(getServices()).initialize(state); } @Override public Object addingService(ServiceReference reference) { - RepositoryInitializer mki = - (RepositoryInitializer) super.addingService(reference); - NodeStore store = this.store; - if (store != null) { - //TODO index added content - mki.initialize(store); + RepositoryInitializer ri = (RepositoryInitializer) super + .addingService(reference); + if (observer != null) { + observer.newRepositoryInitializer(ri); } - return mki; + return ri; + } + + public void setObserver(RepositoryInitializerObserver observer) { + this.observer = observer; + } + + interface RepositoryInitializerObserver { + void newRepositoryInitializer(RepositoryInitializer ri); } } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java (revision 1436554) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java (working copy) @@ -16,18 +16,23 @@ */ package org.apache.jackrabbit.oak.osgi; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Properties; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; +import org.apache.jackrabbit.oak.core.ContentRepositoryImpl; import org.apache.jackrabbit.oak.kernel.KernelNodeStore; +import org.apache.jackrabbit.oak.osgi.OsgiRepositoryInitializer.RepositoryInitializerObserver; import org.apache.jackrabbit.oak.plugins.nodetype.DefaultTypeEditor; import org.apache.jackrabbit.oak.spi.commit.CompositeHook; import org.apache.jackrabbit.oak.spi.commit.ValidatingHook; import org.apache.jackrabbit.oak.spi.lifecycle.OakInitializer; +import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -35,7 +40,7 @@ import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; -public class Activator implements BundleActivator, ServiceTrackerCustomizer { +public class Activator implements BundleActivator, ServiceTrackerCustomizer, RepositoryInitializerObserver { private BundleContext context; @@ -47,7 +52,7 @@ private final OsgiValidatorProvider validatorProvider = new OsgiValidatorProvider(); - private final OsgiRepositoryInitializer kernelTracker = new OsgiRepositoryInitializer(); + private final OsgiRepositoryInitializer repositoryInitializerTracker = new OsgiRepositoryInitializer(); private final Map services = new HashMap(); @@ -61,8 +66,8 @@ indexProvider.start(bundleContext); indexHookProvider.start(bundleContext); validatorProvider.start(bundleContext); - kernelTracker.start(bundleContext); - + repositoryInitializerTracker.setObserver(this); + repositoryInitializerTracker.start(bundleContext); tracker = new ServiceTracker( context, MicroKernel.class.getName(), this); tracker.open(); @@ -71,22 +76,19 @@ @Override public void stop(BundleContext bundleContext) throws Exception { tracker.close(); - indexProvider.stop(); indexHookProvider.stop(); validatorProvider.stop(); - kernelTracker.stop(); + repositoryInitializerTracker.stop(); } //-------------------------------------------< ServiceTrackerCustomizer >--- @Override public Object addingService(ServiceReference reference) { - Object service = context.getService(reference); - if (service instanceof MicroKernel) { - MicroKernel kernel = (MicroKernel) service; - OakInitializer.initialize(new KernelNodeStore(kernel), - kernelTracker, indexHookProvider); + MicroKernel kernel = (MicroKernel) context.getService(reference); + OakInitializer.initialize(new KernelNodeStore(kernel), + repositoryInitializerTracker, indexHookProvider); Oak oak = new Oak(kernel) .with(new CompositeHook( // TODO: DefaultTypeEditor is JCR specific and does not belong here @@ -98,11 +100,7 @@ ContentRepository.class.getName(), oak.createContentRepository(), new Properties())); - return service; - } else { - context.ungetService(reference); - return null; - } + return kernel; } @Override @@ -112,9 +110,24 @@ @Override public void removedService(ServiceReference reference, Object service) { - ServiceRegistration registration = services.remove(reference); - registration.unregister(); + services.remove(reference).unregister(); context.ungetService(reference); } + //----------------------------------------< RepositoryInitializerObserver >--- + + @Override + public void newRepositoryInitializer(RepositoryInitializer ri) { + List mkRefs = new ArrayList( + services.keySet()); + for (ServiceReference ref : mkRefs) { + Object service = context.getService(ref); + if (service instanceof ContentRepositoryImpl) { + ContentRepositoryImpl repository = (ContentRepositoryImpl) service; + OakInitializer.initialize(repository.getNodeStore(), ri, + indexHookProvider); + } + } + } + } Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java (revision 1436554) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java (working copy) @@ -18,6 +18,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Set; @@ -27,10 +28,13 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.kernel.KernelNodeStore; +import org.apache.jackrabbit.oak.plugins.index.CompositeIndexHookProvider; import org.apache.jackrabbit.oak.plugins.index.IndexHookManager; +import org.apache.jackrabbit.oak.plugins.index.IndexHookProvider; import org.apache.jackrabbit.oak.plugins.index.p2.Property2IndexHookProvider; import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.query.index.FilterImpl; +import org.apache.jackrabbit.oak.spi.lifecycle.OakInitializer; import org.apache.jackrabbit.oak.spi.query.Cursor; import org.apache.jackrabbit.oak.spi.query.Cursors; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; @@ -56,7 +60,9 @@ store = new KernelNodeStore(mk); store.setHook(IndexHookManager.of(new Property2IndexHookProvider())); // initialize node types & index definitions - new InitialContent().initialize(store); + OakInitializer.initialize(store, new InitialContent(), + CompositeIndexHookProvider + .compose(new ArrayList())); } @Test Index: oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java (revision 1436554) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java (working copy) @@ -23,11 +23,14 @@ import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.core.RootImpl; import org.apache.jackrabbit.oak.namepath.NamePathMapper; +import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; +import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.apache.jackrabbit.oak.spi.state.NodeStoreBranch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -61,13 +64,18 @@ //----------------------------------------------< RepositoryInitializer >--- @Override - public void initialize(NodeStore store) { - Root root = new RootImpl(store); - - UserConfiguration userConfiguration = securityProvider.getUserConfiguration(); - UserManager userManager = userConfiguration.getUserManager(root, NamePathMapper.DEFAULT); + public NodeState initialize(NodeState state) { + NodeStore ns = new MemoryNodeStore(); + NodeStoreBranch branch = ns.branch(); + branch.setRoot(state); try { + branch.merge(); + Root root = new RootImpl(ns); + + UserConfiguration userConfiguration = securityProvider.getUserConfiguration(); + UserManager userManager = userConfiguration.getUserManager(root, NamePathMapper.DEFAULT); + boolean modified = false; String adminId = userConfiguration.getConfigurationParameters().getConfigValue(PARAM_ADMIN_ID, DEFAULT_ADMIN_ID); if (userManager.getAuthorizable(adminId) == null) { @@ -90,5 +98,6 @@ log.error("Failed to initialize user content ", e); throw new RuntimeException(e); } + return ns.getRoot(); } } \ No newline at end of file Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java (revision 1436554) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java (working copy) @@ -17,13 +17,11 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.util; import org.apache.jackrabbit.JcrConstants; -import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; -import org.apache.jackrabbit.oak.spi.state.NodeStore; -import org.apache.jackrabbit.oak.spi.state.NodeStoreBranch; +import org.apache.jackrabbit.oak.spi.state.NodeState; public class LuceneInitializerHelper implements RepositoryInitializer { @@ -34,11 +32,9 @@ } @Override - public void initialize(NodeStore store) { + public NodeState initialize(NodeState state) { boolean dirty = false; - - NodeStoreBranch branch = store.branch(); - NodeBuilder root = branch.getRoot().builder(); + NodeBuilder root = state.builder(); NodeBuilder index = root; for (String p : PathUtils.elements(path)) { @@ -53,13 +49,8 @@ "oak:queryIndexDefinition", Type.NAME).setProperty("type", "lucene"); index.setProperty("reindex", true); - try { - branch.setRoot(root.getNodeState()); - branch.merge(); - } catch (CommitFailedException e) { - throw new RuntimeException(e); - } + return root.getNodeState(); } + return state; } - } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java (revision 1436554) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java (working copy) @@ -94,4 +94,8 @@ nodeStore, conflictHandler, indexProvider); } + public NodeStore getNodeStore() { + return nodeStore; + } + } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java (revision 1436554) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/CompositeInitializer.java (working copy) @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.Collection; +import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; /** @@ -41,9 +42,11 @@ } @Override - public void initialize(NodeStore store) { + public NodeState initialize(NodeState state) { + NodeState newState = state; for (RepositoryInitializer tracker : initializers) { - tracker.initialize(store); + newState = tracker.initialize(newState); } + return newState; } } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/OakInitializer.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/OakInitializer.java (revision 1436554) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/OakInitializer.java (working copy) @@ -21,8 +21,7 @@ import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.plugins.index.IndexHookManager; import org.apache.jackrabbit.oak.plugins.index.IndexHookProvider; -import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState; -import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.spi.state.NodeStoreBranch; @@ -31,18 +30,12 @@ public static void initialize(NodeStore store, RepositoryInitializer initializer, IndexHookProvider indexHook) { - // TODO refactor initializer to be able to first #branch, then - // #initialize, next #index and finally #merge - // This means that the RepositoryInitializer should receive a - // NodeStoreBranch as a param - - initializer.initialize(store); - NodeStoreBranch branch = store.branch(); - NodeBuilder root = branch.getRoot().builder(); + NodeState before = branch.getRoot(); + NodeState after = initializer.initialize(before); try { - branch.setRoot(IndexHookManager.of(indexHook).processCommit( - MemoryNodeState.EMPTY_NODE, root.getNodeState())); + branch.setRoot(IndexHookManager.of(indexHook).processCommit(before, + after)); branch.merge(); } catch (CommitFailedException e) { throw new RuntimeException(e); Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/RepositoryInitializer.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/RepositoryInitializer.java (revision 1436554) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/RepositoryInitializer.java (working copy) @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.spi.lifecycle; -import org.apache.jackrabbit.oak.spi.state.NodeStore; +import org.apache.jackrabbit.oak.spi.state.NodeState; /** * Initializer of repository content. A component that needs to add specific @@ -34,8 +34,8 @@ * have been initialized, so the implementation of this method should * check for that before blindly adding new content. * - * @param store node store of the repository + * @param state the current state of the repository */ - public void initialize(NodeStore store); + NodeState initialize(NodeState state); } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java (revision 1436554) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java (working copy) @@ -16,26 +16,28 @@ */ package org.apache.jackrabbit.oak.plugins.nodetype.write; +import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES; +import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; +import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; +import static org.apache.jackrabbit.JcrConstants.JCR_VERSIONSTORAGE; +import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED; + import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Service; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.core.RootImpl; +import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.spi.state.NodeStoreBranch; import com.google.common.collect.ImmutableList; -import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES; -import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; -import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; -import static org.apache.jackrabbit.JcrConstants.JCR_VERSIONSTORAGE; -import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED; - /** * {@code InitialContent} implements a {@link RepositoryInitializer} and * registers built-in node types when the micro kernel becomes available. @@ -45,10 +47,8 @@ public class InitialContent implements RepositoryInitializer { @Override - public void initialize(NodeStore store) { - NodeStoreBranch branch = store.branch(); - - NodeBuilder root = branch.getRoot().builder(); + public NodeState initialize(NodeState state) { + NodeBuilder root = state.builder(); root.setProperty(JCR_PRIMARYTYPE, "rep:root", Type.NAME); if (!root.hasChildNode(JCR_SYSTEM)) { @@ -100,14 +100,17 @@ .setProperty("propertyNames", UserConstants.REP_MEMBERS) .setProperty("reindex", true); } + + NodeStore ns = new MemoryNodeStore(); + NodeStoreBranch branch = ns.branch(); + branch.setRoot(root.getNodeState()); try { - branch.setRoot(root.getNodeState()); branch.merge(); + BuiltInNodeTypes.register(new RootImpl(ns)); + return ns.getRoot(); } catch (CommitFailedException e) { - throw new RuntimeException(e); // TODO: shouldn't need the wrapper + throw new RuntimeException(e); } - - BuiltInNodeTypes.register(new RootImpl(store)); } } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java (revision 1436554) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java (working copy) @@ -19,22 +19,26 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; + import javax.jcr.RepositoryException; -import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.core.RootImpl; +import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeDefinition; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.spi.state.NodeStoreBranch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.ImmutableMap; + /** * {@code RepositoryInitializer} that asserts the existence and node type of * the /jcr:system/jcr:privileges node that is used to store privilege definitions. @@ -64,10 +68,8 @@ REP_WRITE, new String[] {JCR_WRITE, JCR_NODE_TYPE_MANAGEMENT}); @Override - public void initialize(NodeStore store) { - NodeStoreBranch branch = store.branch(); - - NodeBuilder root = branch.getRoot().builder(); + public NodeState initialize(NodeState state) { + NodeBuilder root = state.builder(); NodeBuilder system = root.child(JcrConstants.JCR_SYSTEM); system.setProperty(JcrConstants.JCR_PRIMARYTYPE, NodeTypeConstants.NT_REP_SYSTEM, Type.NAME); @@ -75,22 +77,23 @@ NodeBuilder privileges = system.child(REP_PRIVILEGES); privileges.setProperty(JcrConstants.JCR_PRIMARYTYPE, NT_REP_PRIVILEGES, Type.NAME); + NodeStore ns = new MemoryNodeStore(); + NodeStoreBranch branch = ns.branch(); + branch.setRoot(root.getNodeState()); try { - branch.setRoot(root.getNodeState()); branch.merge(); - } catch (CommitFailedException e) { - log.error("Failed to initialize privilege content ", e); - throw new RuntimeException(e); - } - - PrivilegeDefinitionWriter writer = new PrivilegeDefinitionWriter(new RootImpl(store)); - try { + PrivilegeDefinitionWriter writer = new PrivilegeDefinitionWriter( + new RootImpl(ns)); writer.writeDefinitions(getBuiltInDefinitions()); } catch (RepositoryException e) { log.error("Failed to register built-in privileges", e); throw new RuntimeException(e); + } catch (CommitFailedException e) { + throw new RuntimeException(e); } + return ns.getRoot(); } + return state; } private Collection getBuiltInDefinitions() {