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 AA943959C for ; Fri, 4 May 2012 15:18:58 +0000 (UTC) Received: (qmail 99128 invoked by uid 500); 4 May 2012 15:18:56 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 99108 invoked by uid 500); 4 May 2012 15:18:56 -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 99059 invoked by uid 99); 4 May 2012 15:18:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2012 15:18:56 +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; Fri, 04 May 2012 15:18:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5B4AD238890B; Fri, 4 May 2012 15:18:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1334025 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceMappings.java oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java Date: Fri, 04 May 2012 15:18:35 -0000 To: oak-commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120504151835.5B4AD238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Fri May 4 15:18:34 2012 New Revision: 1334025 URL: http://svn.apache.org/viewvc?rev=1334025&view=rev Log: create jcr:system with type, enhance diagnostics Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceMappings.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceMappings.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceMappings.java?rev=1334025&r1=1334024&r2=1334025&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceMappings.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceMappings.java Fri May 4 15:18:34 2012 @@ -16,12 +16,14 @@ */ package org.apache.jackrabbit.oak.plugins.name; +import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; +import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import java.util.Arrays; import java.util.HashMap; @@ -190,7 +192,7 @@ public class NamespaceMappings { root.commit(); } - private static Tree getNamespaces(Root root, boolean create) { + private Tree getNamespaces(Root root, boolean create) { Tree tree = root.getTree("/"); Tree system = tree.getChild("jcr:system"); if (system == null) { @@ -203,6 +205,7 @@ public class NamespaceMappings { Tree namespaces = system.getChild("jcr:namespaces"); if (namespaces == null && create) { namespaces = system.addChild("jcr:namespaces"); + namespaces.setProperty("jcr:primaryType", this.session.getCoreValueFactory().createValue("rep:system", PropertyType.NAME)); } return namespaces; } 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=1334025&r1=1334024&r2=1334025&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 Fri May 4 15:18:34 2012 @@ -401,7 +401,7 @@ public class NodeImpl extends ItemImpl i Property property = getPropertyOrNull(relPath); if (property == null) { - throw new PathNotFoundException(relPath); + throw new PathNotFoundException(relPath + " not found on " + getPath()); } else { return property; }