Author: pnedonosko Date: 2010-05-18 03:58:57 -0400 (Tue, 18 May 2010) New Revision: 2388 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedNodeTypeManager.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java Log: EXOJCR-668 code cleanup Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedNodeTypeManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedNodeTypeManager.java 2010-05-17 14:50:05 UTC (rev 2387) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedNodeTypeManager.java 2010-05-18 07:58:57 UTC (rev 2388) @@ -35,9 +35,8 @@ * * @author <a href="mailto:gennady.azarenkov@exoplatform.com">Gennady * Azarenkov</a> - * @version $Id: ExtendedNodeTypeManager.java 11907 2008-03-13 15:36:21Z ksm $ + * @version $Id$ */ - public interface ExtendedNodeTypeManager extends NodeTypeManager { @@ -65,11 +64,9 @@ * @param alreadyExistsBehaviour a int * @throws RepositoryException */ - @Deprecated + @Deprecated NodeTypeIterator registerNodeTypes(InputStream xml, int alreadyExistsBehaviour) throws RepositoryException; - - /** * Registers all node types using XML binding value objects from xml stream. * Property changes on: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedNodeTypeManager.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2010-05-17 14:50:05 UTC (rev 2387) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2010-05-18 07:58:57 UTC (rev 2388) @@ -264,9 +264,13 @@ { ExoContainer container = null; if (containerContext == null) + { container = PortalContainer.getInstance(); + } else + { container = containerContext.getContainer(); + } init(container); @@ -357,14 +361,6 @@ } } - private void registerNodeTypes() throws RepositoryException - { - for (RepositoryEntry repoConfig : config.getRepositoryConfigurations()) - { - registerNodeTypes(repoConfig.getName()); - } - } - private void registerNodeTypes(String repositoryName) throws RepositoryException { ConfigurationManager configService = @@ -380,7 +376,6 @@ { for (String nodeTypeFilesName : autoNodeTypesFiles) { - InputStream inXml; try { @@ -390,18 +385,23 @@ { throw new RepositoryException(e); } + if (log.isDebugEnabled()) + { log.debug("Trying register node types from xml-file " + nodeTypeFilesName); + } ntManager.registerNodeTypes(inXml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS); if (log.isDebugEnabled()) + { log.debug("Node types is registered from xml-file " + nodeTypeFilesName); + } } + List<String> defaultNodeTypesFiles = plugin.getNodeTypesFiles(repositoryName); if (defaultNodeTypesFiles != null && defaultNodeTypesFiles.size() > 0) { for (String nodeTypeFilesName : defaultNodeTypesFiles) { - InputStream inXml; try { @@ -411,6 +411,7 @@ { throw new RepositoryException(e); } + log.info("Trying register node types (" + repositoryName + ") from xml-file " + nodeTypeFilesName); ntManager.registerNodeTypes(inXml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS); log.info("Node types is registered (" + repositoryName + ") from xml-file " + nodeTypeFilesName); Property changes on: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java ___________________________________________________________________ Name: svn:keywords + Id Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java 2010-05-17 14:50:05 UTC (rev 2387) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java 2010-05-18 07:58:57 UTC (rev 2388) @@ -20,7 +20,7 @@ * Created by The eXo Platform SAS. * * @author <a href="mailto:Sergey.Kabashnyuk@gmail.com">Sergey Kabashnyuk</a> - * @version $Id: $ + * @version $Id$ */ package org.exoplatform.services.jcr.impl.core.nodetype.registration; @@ -59,7 +59,7 @@ * Created by The eXo Platform SAS. * * @author <a href="mailto:Sergey.Kabashnyuk@gmail.com">Sergey Kabashnyuk</a> - * @version $Id: $ + * @version $Id$ */ public class JCRNodeTypeDataPersister implements NodeTypeDataPersister { @@ -208,8 +208,10 @@ } if (log.isDebugEnabled()) + { log.debug("/jcr:system/jcr:nodetypes is created, creation time: " + (System.currentTimeMillis() - start) + " ms"); + } dataManager.save(new TransactionChangesLog(changesLog)); @@ -293,9 +295,13 @@ NodeData jcrNodetypes = (NodeData)dataManager.getItemData(jcrSystem, new QPathEntry(Constants.JCR_NODETYPES, 1)); if (jcrNodetypes == null) + { this.nodeTypeStorageRoot = initNodetypesRoot(jcrSystem, addACL); + } else + { this.nodeTypeStorageRoot = jcrNodetypes; + } } else { @@ -357,7 +363,9 @@ for (NodeData nodeData : nodeTypes) { if (Constants.NT_NODETYPE.equals(nodeData.getPrimaryTypeName())) + { result.add(definitionAccessProvider.read(nodeData)); + } } return result; } @@ -376,9 +384,10 @@ if (observer != null) { if (observer.shouldSkip(nodeTypeData, changesLog)) + { continue; + } observer.beforeUpdate(nodeTypeData, changesLog); - } if (!validatate()) { @@ -398,12 +407,15 @@ // add definitionAccessProvider.write(changesLog, nodeTypeStorageRoot, nodeTypeData); if (observer != null) + { observer.afterUpdate(nodeTypeData, changesLog); + } } //made changes if needed if (changesLog.getSize() > 0) + { dataManager.save(new TransactionChangesLog(changesLog)); - + } } private boolean validatate() Property changes on: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java ___________________________________________________________________ Name: svn:keywords + Id