Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2259FC9EF for ; Thu, 3 May 2012 13:27:43 +0000 (UTC) Received: (qmail 42544 invoked by uid 500); 3 May 2012 13:27:43 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 42526 invoked by uid 500); 3 May 2012 13:27:43 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 42517 invoked by uid 99); 3 May 2012 13:27:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 May 2012 13:27:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 May 2012 13:27:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 09849238896F; Thu, 3 May 2012 13:27:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1333451 - in /jackrabbit/oak/trunk: oak-it/jcr/pom.xml oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/nodetype/NodeTypeImpl.java Date: Thu, 03 May 2012 13:27:18 -0000 To: oak-commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120503132719.09849238896F@eris.apache.org> Author: reschke Date: Thu May 3 13:27:18 2012 New Revision: 1333451 URL: http://svn.apache.org/viewvc?rev=1333451&view=rev Log: OAK-66: fix name mapping in NodeType.isNodeType, wire into Node.isNodeType, update test expectations Modified: jackrabbit/oak/trunk/oak-it/jcr/pom.xml jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java 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=1333451&r1=1333450&r2=1333451&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/jcr/pom.xml (original) +++ jackrabbit/oak/trunk/oak-it/jcr/pom.xml Thu May 3 13:27:18 2012 @@ -44,7 +44,6 @@ known.issues -org.apache.jackrabbit.test.api.NodeDiscoveringNodeTypesTest#testIsNodeType org.apache.jackrabbit.test.api.SessionReadMethodsTest#testGetNodeByUUIDFailure org.apache.jackrabbit.test.api.PathTest org.apache.jackrabbit.test.api.AddNodeTest#testSameNameSiblings Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1333451&r1=1333450&r2=1333451&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java Thu May 3 13:27:18 2012 @@ -602,19 +602,23 @@ public class NodeImpl extends ItemImpl i // TODO: might be expanded, need a better way for this String jcrName = sessionContext.getNamePathMapper().getJcrName(sessionContext.getNamePathMapper().getOakName(nodeTypeName)); - if (hasProperty(Property.JCR_PRIMARY_TYPE) && getProperty(Property.JCR_PRIMARY_TYPE).getString().equals(jcrName)) { + // TODO: figure out the right place for this check + NodeTypeManager ntm = sessionContext.getNodeTypeManager(); + NodeType ntToCheck = ntm.getNodeType(jcrName); // throws on not found + String nameToCheck = ntToCheck.getName(); + + NodeType currentPrimaryType = getPrimaryNodeType(); + if (currentPrimaryType.isNodeType(nameToCheck)) { return true; } - if (hasProperty(Property.JCR_MIXIN_TYPES)) { - Value[] mixins = getProperty(Property.JCR_MIXIN_TYPES).getValues(); - for (Value mixin : mixins) { - if (mixin.getString().equals(jcrName)) { - return true; - } + + for (NodeType mixin : getMixinNodeTypes()) { + if (mixin.isNodeType(nameToCheck)) { + return true; } } + // TODO: END - // TODO evaluate effective node type return false; } 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=1333451&r1=1333450&r2=1333451&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 13:27:18 2012 @@ -229,7 +229,7 @@ class NodeTypeImpl implements NodeType { Queue queue = new LinkedList( Arrays.asList(getDeclaredSupertypeNames())); while (!queue.isEmpty()) { - String name = mapper.getJcrName(queue.remove()); + String name = queue.remove(); if (added.add(name)) { NodeType type = manager.getNodeType(name); types.add(type);