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/12 16:17:06 UTC
svn commit: r1383956 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java
oak-jcr/pom.xml
Author: mduerig
Date: Wed Sep 12 14:17:05 2012
New Revision: 1383956
URL: http://svn.apache.org/viewvc?rev=1383956&view=rev
Log:
OAK-66: JCR Node Type Management
NodeType.canAddChildNode should return false if default primary type is not set
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java
jackrabbit/oak/trunk/oak-jcr/pom.xml
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java?rev=1383956&r1=1383955&r2=1383956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java Wed Sep 12 14:17:05 2012
@@ -344,7 +344,7 @@ class NodeTypeImpl implements NodeType {
String name = definition.getName();
if ((matches(childNodeName, name) && !isProtected(definition))
|| "*".equals(name)) {
- return true;
+ return definition.getDefaultPrimaryType() != null;
}
}
return false;
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1383956&r1=1383955&r2=1383956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Wed Sep 12 14:17:05 2012
@@ -71,8 +71,6 @@ org.apache.jackrabbit.test.api.lock.Lock
org.apache.jackrabbit.test.api.nodetype.PropertyDefTest#testIsMandatory
org.apache.jackrabbit.test.api.nodetype.CanSetPropertyDateTest#testConversions
org.apache.jackrabbit.test.api.nodetype.CanSetPropertyPathTest#testConversions
-org.apache.jackrabbit.test.api.nodetype.CanAddChildNodeCallWithoutNodeTypeTest#testDefinedWithoutDefault <!-- OAK-66 -->
-org.apache.jackrabbit.test.api.nodetype.CanAddChildNodeCallWithoutNodeTypeTest#testResidualWithoutDefault <!-- OAK-66 -->
org.apache.jackrabbit.test.api.LifecycleTest
org.apache.jackrabbit.test.api.query.ElementTest#testElementTestNameTestSomeNTWithSNS<!-- OAK-203 -->
org.apache.jackrabbit.test.api.query.GetPropertyNamesTest#testGetPropertyNames