You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2006/06/16 16:54:11 UTC
svn commit: r414843 [3/3] - in
/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core: ./
nodetype/ nodetype/virtual/ version/ virtual/
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java?rev=414843&r1=414842&r2=414843&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java Fri Jun 16 07:54:10 2006
@@ -73,7 +73,7 @@
*/
protected VirtualNodeState createRootNodeState() throws RepositoryException {
VirtualNodeState root = new VirtualNodeState(this, parentId, rootNodeId, QName.REP_NODETYPES, null);
- NodeDefId id = ntReg.getEffectiveNodeType(QName.REP_SYSTEM).getApplicableChildNodeDef(QName.JCR_NODETYPES, QName.REP_NODETYPES).getId();
+ NodeDefId id = ntReg.getEffectiveNodeType(QName.REP_SYSTEM).getApplicableChildNodeDef(QName.JCR_NODETYPES, QName.REP_NODETYPES, ntReg).getId();
root.setDefinitionId(id);
QName[] ntNames = ntReg.getRegisteredNodeTypes();
for (int i = 0; i < ntNames.length; i++) {
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java?rev=414843&r1=414842&r2=414843&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java Fri Jun 16 07:54:10 2006
@@ -454,7 +454,8 @@
}
NodeState state = stateMgr.createNew(id, nodeTypeName, parentId);
- NodeDef cnd = getEffectiveNodeType().getApplicableChildNodeDef(name, nodeTypeName);
+ NodeDef cnd =
+ getEffectiveNodeType().getApplicableChildNodeDef(name, nodeTypeName, ntReg);
state.setDefinitionId(cnd.getId());
// create Node instance wrapping new node state
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java?rev=414843&r1=414842&r2=414843&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java Fri Jun 16 07:54:10 2006
@@ -137,7 +137,7 @@
NodeState root = pMgr.createNew(rootId);
root.setParentId(rootParentId);
root.setDefinitionId(ntReg.getEffectiveNodeType(QName.REP_SYSTEM).getApplicableChildNodeDef(
- QName.JCR_VERSIONSTORAGE, QName.REP_VERSIONSTORAGE).getId());
+ QName.JCR_VERSIONSTORAGE, QName.REP_VERSIONSTORAGE, ntReg).getId());
root.setNodeTypeName(QName.REP_VERSIONSTORAGE);
PropertyState pt = pMgr.createNew(new PropertyId(rootId, QName.JCR_PRIMARYTYPE));
pt.setDefinitionId(ntReg.getEffectiveNodeType(QName.REP_SYSTEM).getApplicablePropertyDef(
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java?rev=414843&r1=414842&r2=414843&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java Fri Jun 16 07:54:10 2006
@@ -270,7 +270,7 @@
// hack, use nt:unstructured as parent
NodeTypeRegistry ntReg = getNodeTypeRegistry();
EffectiveNodeType ent = ntReg.getEffectiveNodeType(QName.NT_UNSTRUCTURED);
- NodeDef cnd = ent.getApplicableChildNodeDef(name, nodeTypeName);
+ NodeDef cnd = ent.getApplicableChildNodeDef(name, nodeTypeName, ntReg);
ntReg.getNodeDef(cnd.getId());
def = cnd.getId();
}
@@ -366,7 +366,8 @@
*/
protected NodeDef getApplicableChildNodeDef(NodeState parent, QName nodeName, QName nodeTypeName)
throws RepositoryException {
- return getEffectiveNodeType(parent).getApplicableChildNodeDef(nodeName, nodeTypeName);
+ return getEffectiveNodeType(parent).getApplicableChildNodeDef(
+ nodeName, nodeTypeName, getNodeTypeRegistry());
}
/**