[exo-jcr-commits] exo-jcr SVN: r293 - in jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr: impl/core/nodetype and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Oct 19 04:23:55 EDT 2009
Author: skabashnyuk
Date: 2009-10-19 04:23:55 -0400 (Mon, 19 Oct 2009)
New Revision: 293
Modified:
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/core/nodetype/NodeTypeDataManager.java
jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java
Log:
EXOJCR-191 : codestyle improvements
Modified: jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/core/nodetype/NodeTypeDataManager.java
===================================================================
--- jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/core/nodetype/NodeTypeDataManager.java 2009-10-19 07:03:07 UTC (rev 292)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/core/nodetype/NodeTypeDataManager.java 2009-10-19 08:23:55 UTC (rev 293)
@@ -116,15 +116,6 @@
List<ItemDefinitionData> getManadatoryItemDefs(InternalQName primaryNodeType, InternalQName[] mixinTypes)
throws RepositoryException;
- // /**
- // * @param nodeName
- // * @param nodeTypeName
- // * @param parentTypeName
- // * @return
- // */
- // NodeDefinitionData getChildNodeDefinition(InternalQName nodeName, InternalQName nodeTypeName,
- // InternalQName parentTypeName) throws RepositoryException;
-
/**
* @param typeName
* @return
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-19 07:03:07 UTC (rev 292)
+++ jcr/trunk/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2009-10-19 08:23:55 UTC (rev 293)
@@ -125,7 +125,6 @@
this.accessControlPolicy = config.getAccessControl();
this.nodeTypeRepository = new InmemoryNodeTypeRepository(persister);
- //this.nodeTypeRepository = new PersistedNodeTypeRepository(persister);
this.listeners = Collections.synchronizedMap(new WeakHashMap<NodeTypeManagerListener, NodeTypeManagerListener>());
this.buildInNodeTypesNames = new HashSet<InternalQName>();
}
@@ -144,9 +143,6 @@
{
this.namespaceRegistry = namespaceRegistry;
-
- //this.persister = persister;
-
this.locationFactory = locationFactory;
this.dataManager = dataManager;
this.indexSearcherHolder = indexSearcherHolder;
@@ -425,7 +421,6 @@
public boolean isChildNodePrimaryTypeAllowed(final InternalQName childNodeTypeName,
final InternalQName parentNodeType, final InternalQName[] parentMixinNames) throws RepositoryException
{
- // NodeTypeData childDef = findNodeType(childNodeTypeName);
final Set<InternalQName> testSuperTypesNames = this.nodeTypeRepository.getSupertypes(childNodeTypeName);
NodeDefinitionData[] allChildNodeDefinitions = getAllChildNodeDefinitions(parentNodeType);
for (final NodeDefinitionData cnd : allChildNodeDefinitions)
@@ -570,7 +565,6 @@
// validate
nodeTypeDataValidator.validateNodeType(nodeTypes);
- //registerNodeType(nodeTypes, alreadyExistsBehaviour);
nodeTypeRepository.registerNodeType(nodeTypes, this, accessControlPolicy, alreadyExistsBehaviour);
return nodeTypes;
}
@@ -590,7 +584,6 @@
// validate
nodeTypeDataValidator.validateNodeType(nodeTypes);
- //registerNodeType(nodeTypes, alreadyExistsBehaviour);
nodeTypeRepository.registerNodeType(nodeTypes, this, accessControlPolicy, alreadyExistsBehaviour);
return nodeTypes;
@@ -698,64 +691,54 @@
return changesLog;
}
+ /**
+ *
+ * @see org.picocontainer.Startable#start()
+ */
public void start()
-
{
if (!started)
{
try
{
- final InputStream xml = NodeTypeManagerImpl.class.getResourceAsStream(NODETYPES_FILE);
- if (xml != null)
+ // check if default node type saved
+ if (!nodeTypeRepository.isStorageFilled())
{
+ final InputStream xml = NodeTypeManagerImpl.class.getResourceAsStream(NODETYPES_FILE);
- final NodeTypeConverter nodeTypeConverter =
- new NodeTypeConverter(this.locationFactory, this.accessControlPolicy);
- final NodeTypeDataValidator nodeTypeDataValidator = new NodeTypeDataValidator(this.nodeTypeRepository);
- final NodeTypeDataPersister serializer = new XmlNodeTypeDataPersister(nodeTypeConverter, xml);
-
- final List<NodeTypeData> defaultNodeTypes = serializer.getAllNodeTypes();
-
- // validate
- nodeTypeDataValidator.validateNodeType(defaultNodeTypes);
-
- // check if default node type saved
- if (!nodeTypeRepository.isStorageFilled())
+ if (xml != null)
{
-
- //registerNodeType(defaultNodeTypes, ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
- nodeTypeRepository.registerNodeType(defaultNodeTypes, this, accessControlPolicy,
- ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
- }
- else
- {
- final List<NodeTypeData> allNodeTypes = nodeTypeRepository.getAllNodeTypes();
- // register nodetypes in runtime
- final Map<InternalQName, NodeTypeData> volatileNodeTypes = new HashMap<InternalQName, NodeTypeData>();
-
- for (final NodeTypeData nodeTypeData : allNodeTypes)
+ List<NodeTypeData> registerNodeTypes =
+ registerNodeTypes(xml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS, TEXT_XML);
+ for (NodeTypeData nodeTypeData : registerNodeTypes)
{
- volatileNodeTypes.put(nodeTypeData.getName(), nodeTypeData);
+ buildInNodeTypesNames.add(nodeTypeData.getName());
}
-
- for (final NodeTypeData nodeTypeData : allNodeTypes)
- {
- this.nodeTypeRepository.addNodeType(nodeTypeData, volatileNodeTypes);
- }
}
- // fill default node types map
- for (final NodeTypeData nodeTypeData : defaultNodeTypes)
+ else
{
- this.buildInNodeTypesNames.add(nodeTypeData.getName());
+ throw new RuntimeException("Resource file '" + NODETYPES_FILE
+ + "' with NodeTypes configuration does not found. Can not create node type manager");
}
-
}
else
{
- throw new RuntimeException("Resource file '" + NODETYPES_FILE
- + "' with NodeTypes configuration does not found. Can not create node type manager");
+ final List<NodeTypeData> allNodeTypes = nodeTypeRepository.getAllNodeTypes();
+ // register nodetypes in runtime
+ final Map<InternalQName, NodeTypeData> volatileNodeTypes = new HashMap<InternalQName, NodeTypeData>();
+ //create map from list
+ for (final NodeTypeData nodeTypeData : allNodeTypes)
+ {
+ volatileNodeTypes.put(nodeTypeData.getName(), nodeTypeData);
+ }
+
+ for (final NodeTypeData nodeTypeData : allNodeTypes)
+ {
+ this.nodeTypeRepository.addNodeType(nodeTypeData, volatileNodeTypes);
+ }
}
+
}
catch (final RepositoryException e)
{
@@ -765,6 +748,10 @@
}
}
+ /**
+ *
+ * @see org.picocontainer.Startable#stop()
+ */
public void stop()
{
}
@@ -981,42 +968,4 @@
return changesLog;
}
-
- protected void initDefault() throws RepositoryException
- {
- long start = System.currentTimeMillis();
- try
- {
- InputStream xml = NodeTypeManagerImpl.class.getResourceAsStream(NODETYPES_FILE);
- if (xml != null)
- {
- List<NodeTypeData> registerNodeTypes =
- registerNodeTypes(xml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS, TEXT_XML);
- for (NodeTypeData nodeTypeData : registerNodeTypes)
- {
- buildInNodeTypesNames.add(nodeTypeData.getName());
- }
- }
- else
- {
- String msg =
- "Resource file '" + NODETYPES_FILE
- + "' with NodeTypes configuration does not found. Can not create node type manager";
- log.error(msg);
- throw new RepositoryException(msg);
- }
- }
- catch (RepositoryException e)
- {
- String msg =
- "Error of initialization default types. Resource file with NodeTypes configuration '" + NODETYPES_FILE
- + "'. " + e;
- log.error(msg);
- throw new RepositoryException(msg, e);
- }
- finally
- {
- log.info("Initialization of default nodetypes done. " + (System.currentTimeMillis() - start) + " ms.");
- }
- }
}
More information about the exo-jcr-commits
mailing list