Author: reschke
Date: Thu May 3 15:28:03 2012
New Revision: 1333502
URL: http://svn.apache.org/viewvc?rev=1333502&view=rev
Log:
OAK-66: let getSupertypes on non-mixins always include nt:base, update test
exclusions
Modified:
jackrabbit/oak/trunk/oak-it/jcr/pom.xml
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java
Modified: jackrabbit/oak/trunk/oak-it/jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/jcr/pom.xml?rev=1333502&r1=1333501&r2=1333502&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/jcr/pom.xml Thu May 3 15:28:03 2012
@@ -97,7 +97,8 @@ org.apache.jackrabbit.test.api.SessionRe
org.apache.jackrabbit.test.api.HasPermissionTest
org.apache.jackrabbit.test.api.WorkspaceTest
org.apache.jackrabbit.test.api.ShareableNodeTest
-org.apache.jackrabbit.test.api.nodetype.NodeTypeTest
+org.apache.jackrabbit.test.api.nodetype.NodeTypeTest#testGetDeclaredSubtypes
+org.apache.jackrabbit.test.api.nodetype.NodeTypeTest#testGetPropertyDefs
org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest
org.apache.jackrabbit.test.api.nodetype.CanAddChildNodeCallWithNodeTypeTest
org.apache.jackrabbit.test.api.nodetype.CanAddChildNodeCallWithoutNodeTypeTest
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java?rev=1333502&r1=1333501&r2=1333502&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java
Thu May 3 15:28:03 2012
@@ -228,6 +228,9 @@ class NodeTypeImpl implements NodeType {
Set<String> added = new HashSet<String>();
Queue<String> queue = new LinkedList<String>(
Arrays.asList(getDeclaredSupertypeNames()));
+ if (!isMixin()) {
+
queue.add(mapper.getJcrName(mapper.getOakName(NodeType.NT_BASE)));
+ }
while (!queue.isEmpty()) {
String name = queue.remove();
if (added.add(name)) {
