[exo-jcr-commits] exo-jcr SVN: r289 - in jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl: core/nodetype and 1 other directory.

Author: skabashnyuk Date: 2009-10-16 08:46:33 -0400 (Fri, 16 Oct 2009) New Revision: 289 Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java Log: EXOJCR-191 : Save default node types in repository Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java =================================================================== --- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2009-10-16 09:11:03 UTC (rev 288) +++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2009-10-16 12:46:33 UTC (rev 289) @@ -19,8 +19,6 @@ package org.exoplatform.services.jcr.impl; import org.exoplatform.container.ExoContainer; -import org.exoplatform.container.component.ComponentPlugin; -import org.exoplatform.container.configuration.ConfigurationManager; import org.exoplatform.container.jmx.MX4JComponentAdapterFactory; import org.exoplatform.management.annotations.Managed; import org.exoplatform.management.annotations.ManagedDescription; @@ -64,13 +62,10 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; -import java.io.InputStream; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.Map; -import javax.jcr.NamespaceException; import javax.jcr.NamespaceRegistry; import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeTypeManager; @@ -557,21 +552,22 @@ */ private void load() throws RepositoryException { - - JcrNodeTypeDataPersister nodeTypePersister = - (JcrNodeTypeDataPersister)this.getComponentInstanceOfType(JcrNodeTypeDataPersister.class); + //Namespaces first NamespaceDataPersister namespacePersister = (NamespaceDataPersister)this.getComponentInstanceOfType(NamespaceDataPersister.class); + NamespaceRegistryImpl nsRegistry = (NamespaceRegistryImpl)getNamespaceRegistry(); - // Load from persistence - nodeTypePersister.start(); namespacePersister.start(); + nsRegistry.start(); - NamespaceRegistryImpl nsRegistry = (NamespaceRegistryImpl)getNamespaceRegistry(); + //Node types now. + JcrNodeTypeDataPersister nodeTypePersister = + (JcrNodeTypeDataPersister)this.getComponentInstanceOfType(JcrNodeTypeDataPersister.class); + NodeTypeDataManagerImpl ntManager = (NodeTypeDataManagerImpl)this.getComponentInstanceOfType(NodeTypeDataManagerImpl.class); - // initialize internal components. - nsRegistry.start(); + + nodeTypePersister.start(); ntManager.start(); } Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java =================================================================== --- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2009-10-16 09:11:03 UTC (rev 288) +++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2009-10-16 12:46:33 UTC (rev 289) @@ -38,7 +38,6 @@ import org.exoplatform.services.jcr.datamodel.QPathEntry; import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.core.LocationFactory; - import org.exoplatform.services.jcr.impl.core.nodetype.registration.NodeDefinitionComparator; import org.exoplatform.services.jcr.impl.core.nodetype.registration.NodeTypeConverter; import org.exoplatform.services.jcr.impl.core.nodetype.registration.NodeTypeDataPersister; @@ -112,7 +111,8 @@ public NodeTypeDataManagerImpl(final RepositoryEntry config, final LocationFactory locationFactory, final NamespaceRegistry namespaceRegistry, final NodeTypeDataPersister persister, - final ItemDataConsumer dataManager, final RepositoryIndexSearcherHolder indexSearcherHolder) throws RepositoryException + final ItemDataConsumer dataManager, final RepositoryIndexSearcherHolder indexSearcherHolder) + throws RepositoryException { this.namespaceRegistry = namespaceRegistry; @@ -128,7 +128,6 @@ //this.nodeTypeRepository = new PersistedNodeTypeRepository(persister); this.listeners = Collections.synchronizedMap(new WeakHashMap<NodeTypeManagerListener, NodeTypeManagerListener>()); this.buildInNodeTypesNames = new HashSet<InternalQName>(); - initDefault(); } /** @@ -982,6 +981,7 @@ return changesLog; } + protected void initDefault() throws RepositoryException { long start = System.currentTimeMillis(); @@ -990,7 +990,8 @@ InputStream xml = NodeTypeManagerImpl.class.getResourceAsStream(NODETYPES_FILE); if (xml != null) { - List<NodeTypeData> registerNodeTypes = registerNodeTypes(xml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS,TEXT_XML); + List<NodeTypeData> registerNodeTypes = + registerNodeTypes(xml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS, TEXT_XML); for (NodeTypeData nodeTypeData : registerNodeTypes) { buildInNodeTypesNames.add(nodeTypeData.getName());