jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r469123 - in /jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core: NodeImpl.java RepositoryImpl.java
Date Mon, 30 Oct 2006 11:18:07 GMT
Author: mreutegg
Date: Mon Oct 30 03:18:05 2006
New Revision: 469123

URL: http://svn.apache.org/viewvc?view=rev&rev=469123
Log:
JCR-605: Error when registering node types on virgin repository

Modified:
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
    jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java?view=diff&rev=469123&r1=469122&r2=469123
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/NodeImpl.java Mon
Oct 30 03:18:05 2006
@@ -809,6 +809,94 @@
         return createChildNode(nodeName, def, nodeType, id);
     }
 
+    /**
+     * Adds a child node entry for a virtual node state to this node. E.g. the
+     * node <code>/jcr:system/jcr:versionStorage</code>.
+     *
+     * @param nodeName the name of the virtual child node.
+     * @param nodeType the node type of the virtual child node.
+     * @param id       the id of the virtual node state.
+     * @return the <code>NodeImpl</code> for the virtual node state with
+     *         <code>id</code>.
+     * @throws ItemExistsException          if there already exists a child node
+     *                                      entry with the given <code>nodeName</code>.
+     * @throws ConstraintViolationException if this node does not allow a child
+     *                                      node with the specified <code>nodeType</code>
+     *                                      and <code>nodeName</code>.
+     * @throws RepositoryException          if there is no virtual node state
+     *                                      with <code>id</code>.
+     */
+    protected NodeImpl internalAddVirtualChildNode(QName nodeName,
+                                                   NodeTypeImpl nodeType,
+                                                   NodeId id)
+            throws ItemExistsException, ConstraintViolationException, RepositoryException
{
+        Path nodePath;
+        try {
+            nodePath = Path.create(getPrimaryPath(), nodeName, true);
+        } catch (MalformedPathException e) {
+            // should never happen
+            String msg = "internal error: invalid path " + safeGetJCRPath();
+            log.debug(msg);
+            throw new RepositoryException(msg, e);
+        }
+
+        NodeDefinitionImpl def;
+        try {
+            QName nodeTypeName = null;
+            if (nodeType != null) {
+                nodeTypeName = nodeType.getQName();
+            }
+            def = getApplicableChildNodeDefinition(nodeName, nodeTypeName);
+        } catch (RepositoryException re) {
+            String msg = "no definition found in parent node's node type for new node";
+            log.debug(msg);
+            throw new ConstraintViolationException(msg, re);
+        }
+
+        // check for name collisions
+        NodeState thisState = (NodeState) state;
+        if (thisState.hasPropertyName(nodeName)) {
+            // there's already a property with that name
+            throw new ItemExistsException(itemMgr.safeGetJCRPath(nodePath));
+        }
+        NodeState.ChildNodeEntry cne = thisState.getChildNodeEntry(nodeName, 1);
+        if (cne != null) {
+            // there's already a child node entry with that name;
+            // check same-name sibling setting of new node
+            if (!def.allowsSameNameSiblings()) {
+                throw new ItemExistsException(itemMgr.safeGetJCRPath(nodePath));
+            }
+            // check same-name sibling setting of existing node
+            NodeId newId = cne.getId();
+            if (!((NodeImpl) itemMgr.getItem(newId)).getDefinition().allowsSameNameSiblings())
{
+                throw new ItemExistsException(itemMgr.safeGetJCRPath(nodePath));
+            }
+        }
+
+        // get virtual node state
+        NodeState nodeState;
+        try {
+            nodeState = (NodeState) stateMgr.getItemState(id);
+        } catch (ItemStateException e) {
+            String msg = "failed to get virtual child node " + nodeName + " of "
+                    + safeGetJCRPath();
+            log.debug(msg);
+            throw new RepositoryException(msg, e);
+        }
+
+        // create Node instance wrapping virtual state
+        NodeImpl node = itemMgr.createNodeInstance(nodeState, def);
+
+        // touch the virtual node, otherwise save will complain that the
+        // virtual node needs to be saved as well.
+        node.getOrCreateTransientItemState();
+
+        // add new child node entry
+        thisState.addChildNodeEntry(nodeName, id);
+
+        return node;
+    }
+
     private void setMixinTypesProperty(Set mixinNames) throws RepositoryException {
         NodeState thisState = (NodeState) state;
         // get or create jcr:mixinTypes property

Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?view=diff&rev=469123&r1=469122&r2=469123
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
Mon Oct 30 03:18:05 2006
@@ -541,10 +541,10 @@
             NodeImpl sysRoot = rootNode.internalAddChildNode(QName.JCR_SYSTEM, nt, SYSTEM_ROOT_NODE_ID);
             // add version storage
             nt = sysSession.getNodeTypeManager().getNodeType(QName.REP_VERSIONSTORAGE);
-            sysRoot.internalAddChildNode(QName.JCR_VERSIONSTORAGE, nt, VERSION_STORAGE_NODE_ID);
+            sysRoot.internalAddVirtualChildNode(QName.JCR_VERSIONSTORAGE, nt, VERSION_STORAGE_NODE_ID);
             // add node types
             nt = sysSession.getNodeTypeManager().getNodeType(QName.REP_NODETYPES);
-            sysRoot.internalAddChildNode(QName.JCR_NODETYPES, nt, NODETYPES_NODE_ID);
+            sysRoot.internalAddVirtualChildNode(QName.JCR_NODETYPES, nt, NODETYPES_NODE_ID);
             rootNode.save();
         }
 



Mime
View raw message