Author: sergiykarpenko Date: 2010-08-17 05:14:41 -0400 (Tue, 17 Aug 2010) New Revision: 2920 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java Log: EXOJCR-898: fixed Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java 2010-08-17 06:50:57 UTC (rev 2919) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java 2010-08-17 09:14:41 UTC (rev 2920) @@ -33,7 +33,6 @@ import org.exoplatform.services.jcr.datamodel.ItemData; import org.exoplatform.services.jcr.datamodel.NodeData; import org.exoplatform.services.jcr.datamodel.PropertyData; -import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.datamodel.QPathEntry; import org.exoplatform.services.jcr.datamodel.ValueData; import org.exoplatform.services.jcr.impl.Constants; @@ -43,7 +42,6 @@ import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; import org.exoplatform.services.jcr.impl.dataflow.ValueDataConvertor; import org.exoplatform.services.jcr.impl.util.NodeDataReader; -import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -345,16 +343,17 @@ private void initStorage(NodeData nsSystem, boolean addACL) throws RepositoryException { PlainChangesLog changesLog = new PlainChangesLogImpl(); - TransientNodeData exoNamespaces = - new TransientNodeData(QPath.makeChildPath(nsSystem.getQPath(), Constants.EXO_NAMESPACES), IdGenerator - .generate(), -1, Constants.NT_UNSTRUCTURED, new InternalQName[0], 0, nsSystem.getIdentifier(), nsSystem - .getACL()); + TransientNodeData exoNamespaces; if (addACL) { - AccessControlList acl = exoNamespaces.getACL(); InternalQName[] mixins = new InternalQName[]{Constants.EXO_OWNEABLE, Constants.EXO_PRIVILEGEABLE}; + exoNamespaces = + TransientNodeData.createNodeData(nsSystem, Constants.EXO_NAMESPACES, Constants.NT_UNSTRUCTURED, mixins); + + AccessControlList acl = exoNamespaces.getACL(); + TransientPropertyData primaryType = TransientPropertyData.createPropertyData(exoNamespaces, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, new TransientValueData(exoNamespaces.getPrimaryTypeName())); @@ -391,6 +390,9 @@ } else { + exoNamespaces = + TransientNodeData.createNodeData(nsSystem, Constants.EXO_NAMESPACES, Constants.NT_UNSTRUCTURED); + TransientPropertyData primaryType = TransientPropertyData.createPropertyData(exoNamespaces, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, new TransientValueData(exoNamespaces.getPrimaryTypeName())); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2010-08-17 06:50:57 UTC (rev 2919) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2010-08-17 09:14:41 UTC (rev 2920) @@ -76,6 +76,8 @@ private final String accessControlType; + // private final NamespaceDataPersister nsPersister; + private final String rootPermissions; private final InternalQName rootNodeType; @@ -264,16 +266,18 @@ boolean addACL = !accessControlType.equals(AccessControlPolicy.DISABLE); PlainChangesLog changesLog = new PlainChangesLogImpl(); + TransientNodeData jcrSystem; - TransientNodeData jcrSystem = - new TransientNodeData(QPath.makeChildPath(root.getQPath(), Constants.JCR_SYSTEM), Constants.SYSTEM_UUID, -1, - Constants.NT_UNSTRUCTURED, new InternalQName[0], 0, root.getIdentifier(), root.getACL()); - if (addACL) { - AccessControlList acl = jcrSystem.getACL(); InternalQName[] mixins = new InternalQName[]{Constants.EXO_OWNEABLE, Constants.EXO_PRIVILEGEABLE}; + jcrSystem = + TransientNodeData.createNodeData(root, Constants.JCR_SYSTEM, Constants.NT_UNSTRUCTURED, mixins, + Constants.SYSTEM_UUID); + + AccessControlList acl = jcrSystem.getACL(); + TransientPropertyData primaryType = TransientPropertyData.createPropertyData(jcrSystem, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, new TransientValueData(jcrSystem.getPrimaryTypeName())); @@ -310,6 +314,10 @@ } else { + jcrSystem = + TransientNodeData.createNodeData(root, Constants.JCR_SYSTEM, Constants.NT_UNSTRUCTURED, + Constants.SYSTEM_UUID); + TransientPropertyData primaryType = TransientPropertyData.createPropertyData(jcrSystem, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, new TransientValueData(jcrSystem.getPrimaryTypeName())); 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-08-17 06:50:57 UTC (rev 2919) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java 2010-08-17 09:14:41 UTC (rev 2920) @@ -38,7 +38,6 @@ import org.exoplatform.services.jcr.datamodel.InternalQName; import org.exoplatform.services.jcr.datamodel.ItemData; import org.exoplatform.services.jcr.datamodel.NodeData; -import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.datamodel.QPathEntry; import org.exoplatform.services.jcr.datamodel.ValueData; import org.exoplatform.services.jcr.impl.Constants; @@ -148,17 +147,20 @@ public NodeData initNodetypesRoot(NodeData nsSystem, boolean addACL) throws RepositoryException { PlainChangesLog changesLog = new PlainChangesLogImpl(); - TransientNodeData jcrNodetypes = - new TransientNodeData(QPath.makeChildPath(nsSystem.getQPath(), Constants.JCR_NODETYPES), - Constants.NODETYPESROOT_UUID, -1, Constants.NT_UNSTRUCTURED, new InternalQName[0], 0, nsSystem - .getIdentifier(), nsSystem.getACL()); + TransientNodeData jcrNodetypes; + long start = System.currentTimeMillis(); if (addACL) { - AccessControlList acl = jcrNodetypes.getACL(); InternalQName[] mixins = new InternalQName[]{Constants.EXO_OWNEABLE, Constants.EXO_PRIVILEGEABLE}; + jcrNodetypes = + TransientNodeData.createNodeData(nsSystem, Constants.JCR_NODETYPES, Constants.NT_UNSTRUCTURED, mixins, + Constants.NODETYPESROOT_UUID); + + AccessControlList acl = jcrNodetypes.getACL(); + TransientPropertyData primaryType = TransientPropertyData.createPropertyData(jcrNodetypes, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, new TransientValueData(jcrNodetypes.getPrimaryTypeName())); @@ -195,6 +197,10 @@ } else { + jcrNodetypes = + TransientNodeData.createNodeData(nsSystem, Constants.JCR_NODETYPES, Constants.NT_UNSTRUCTURED, + Constants.NODETYPESROOT_UUID); + TransientPropertyData primaryType = TransientPropertyData.createPropertyData(jcrNodetypes, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, new TransientValueData(jcrNodetypes.getPrimaryTypeName()));