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 0396C9B30 for ; Thu, 26 Apr 2012 12:26:17 +0000 (UTC) Received: (qmail 12934 invoked by uid 500); 26 Apr 2012 12:26:17 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 12909 invoked by uid 500); 26 Apr 2012 12:26:16 -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 12899 invoked by uid 99); 26 Apr 2012 12:26:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Apr 2012 12:26:16 +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, 26 Apr 2012 12:26:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 94C712388865; Thu, 26 Apr 2012 12:25:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1330809 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java Date: Thu, 26 Apr 2012 12:25:53 -0000 To: oak-commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120426122553.94C712388865@eris.apache.org> Author: reschke Date: Thu Apr 26 12:25:53 2012 New Revision: 1330809 URL: http://svn.apache.org/viewvc?rev=1330809&view=rev Log: OAK-6: add a stub for getNodeDefinition so that the test cleanup in AbstractJCRTest can happen Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java 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=1330809&r1=1330808&r2=1330809&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 Apr 26 12:25:53 2012 @@ -41,6 +41,7 @@ import javax.jcr.lock.Lock; import javax.jcr.nodetype.NodeDefinition; import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.NodeTypeManager; +import javax.jcr.version.OnParentVersionAction; import javax.jcr.version.Version; import javax.jcr.version.VersionHistory; @@ -627,7 +628,67 @@ public class NodeImpl extends ItemImpl i @Override public NodeDefinition getDefinition() throws RepositoryException { checkStatus(); - throw new UnsupportedRepositoryOperationException("TODO: Node.getDefinition"); + + // TODO + return new NodeDefinition() { + + // This is a workaround to make AbstractJCRTest.cleanup happy + + @Override + public boolean isProtected() { + return false; + } + + @Override + public boolean isMandatory() { + return false; + } + + @Override + public boolean isAutoCreated() { + return false; + } + + @Override + public int getOnParentVersion() { + return OnParentVersionAction.COPY; + } + + @Override + public String getName() { + return "default"; + } + + @Override + public NodeType getDeclaringNodeType() { + return null; + } + + @Override + public NodeType[] getRequiredPrimaryTypes() { + return null; + } + + @Override + public String[] getRequiredPrimaryTypeNames() { + return null; + } + + @Override + public String getDefaultPrimaryTypeName() { + return null; + } + + @Override + public NodeType getDefaultPrimaryType() { + return null; + } + + @Override + public boolean allowsSameNameSiblings() { + return false; + } + }; }