You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2012/09/13 23:16:42 UTC
svn commit: r1384535 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeTemplateImpl.java oak-jcr/pom.xml

Author: mduerig
Date: Thu Sep 13 21:16:41 2012
New Revision: 1384535

URL: http://svn.apache.org/viewvc?rev=1384535&view=rev
Log:
OAK-66: JCR Node Type Management
Fix copying of Property and NodeDefinitions

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeTemplateImpl.java
    jackrabbit/oak/trunk/oak-jcr/pom.xml

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeTemplateImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeTemplateImpl.java?rev=1384535&r1=1384534&r2=1384535&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeTemplateImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeTemplateImpl.java Thu Sep 13 21:16:41 2012
@@ -74,7 +74,7 @@ class NodeTypeTemplateImpl
         setPrimaryItemName(ntd.getPrimaryItemName());
         setDeclaredSuperTypeNames(ntd.getDeclaredSupertypeNames());
 
-        for (PropertyDefinition pd : getDeclaredPropertyDefinitions()) {
+        for (PropertyDefinition pd : ntd.getDeclaredPropertyDefinitions()) {
             PropertyDefinitionTemplateImpl pdt = newPropertyDefinitionBuilder();
             pdt.setDeclaringNodeType(pd.getDeclaringNodeType().getName());
             pdt.setName(pd.getName());
@@ -92,7 +92,7 @@ class NodeTypeTemplateImpl
             pdt.build();
         }
 
-        for (NodeDefinition nd : getDeclaredChildNodeDefinitions()) {
+        for (NodeDefinition nd : ntd.getDeclaredChildNodeDefinitions()) {
             NodeDefinitionTemplateImpl ndt = newNodeDefinitionBuilder();
             ndt.setDeclaringNodeType(nd.getDeclaringNodeType().getName());
             ndt.setName(nd.getName());

Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1384535&r1=1384534&r2=1384535&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Thu Sep 13 21:16:41 2012
@@ -70,7 +70,6 @@ org.apache.jackrabbit.test.api.nodetype.
 org.apache.jackrabbit.test.api.nodetype.CanSetPropertyNameTest#testConversions            <!-- OAK-66 -->
 org.apache.jackrabbit.test.api.nodetype.CanSetPropertyNameTest#testConversionsMultiple    <!-- OAK-66 -->
 org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testEmptyNodeTypeTemplate    <!-- OAK-66 -->
-org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testNonEmptyNodeTypeTemplate <!-- OAK-66 -->
 org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testNewNodeTypeTemplate      <!-- OAK-66 -->
 org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testEmptyPropertyDefinitionTemplate  <!-- OAK-66 -->
 org.apache.jackrabbit.test.api.nodetype.NodeTypeCreationTest#testPropertyDefinitionTemplate       <!-- OAK-66 -->