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 112B2107C3 for ; Fri, 3 May 2013 12:29:29 +0000 (UTC) Received: (qmail 47913 invoked by uid 500); 3 May 2013 12:29:29 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 47754 invoked by uid 500); 3 May 2013 12:29:25 -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-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 47589 invoked by uid 99); 3 May 2013 12:29:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 May 2013 12:29:23 +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, 03 May 2013 12:29:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6FE452388994; Fri, 3 May 2013 12:28:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1478755 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype: NodeTypeConstants.java write/InitialContent.java Date: Fri, 03 May 2013 12:28:58 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130503122858.6FE452388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Fri May 3 12:28:58 2013 New Revision: 1478755 URL: http://svn.apache.org/r1478755 Log: minor improvement Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java?rev=1478755&r1=1478754&r2=1478755&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java Fri May 3 12:28:58 2013 @@ -37,6 +37,7 @@ public interface NodeTypeConstants exten */ String NT_REP_ROOT = "rep:root"; String NT_REP_SYSTEM = "rep:system"; + String NT_REP_NODE_TYPES = "rep:nodeTypes"; /** * Additional name constants not present in JcrConstants Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java?rev=1478755&r1=1478754&r2=1478755&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java Fri May 3 12:28:58 2013 @@ -16,6 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.nodetype.write; +import com.google.common.collect.ImmutableList; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Service; import org.apache.jackrabbit.oak.api.CommitFailedException; @@ -24,7 +25,9 @@ import org.apache.jackrabbit.oak.core.Ro import org.apache.jackrabbit.oak.plugins.index.IndexConstants; import org.apache.jackrabbit.oak.plugins.index.IndexUtils; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; +import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.plugins.nodetype.RegistrationEditorProvider; +import org.apache.jackrabbit.oak.plugins.version.VersionConstants; import org.apache.jackrabbit.oak.spi.commit.EditorHook; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; @@ -33,37 +36,29 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeStore; import org.apache.jackrabbit.oak.spi.state.NodeStoreBranch; -import com.google.common.collect.ImmutableList; - -import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES; -import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; -import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; -import static org.apache.jackrabbit.JcrConstants.JCR_UUID; -import static org.apache.jackrabbit.JcrConstants.JCR_VERSIONSTORAGE; - /** * {@code InitialContent} implements a {@link RepositoryInitializer} and * registers built-in node types when the micro kernel becomes available. */ @Component @Service(RepositoryInitializer.class) -public class InitialContent implements RepositoryInitializer { +public class InitialContent implements RepositoryInitializer, NodeTypeConstants { @Override public NodeState initialize(NodeState state) { NodeBuilder root = state.builder(); - root.setProperty(JCR_PRIMARYTYPE, "rep:root", Type.NAME); + root.setProperty(JCR_PRIMARYTYPE, NT_REP_ROOT, Type.NAME); if (!root.hasChildNode(JCR_SYSTEM)) { NodeBuilder system = root.child(JCR_SYSTEM); - system.setProperty(JCR_PRIMARYTYPE, "rep:system", Type.NAME); + system.setProperty(JCR_PRIMARYTYPE, NT_REP_SYSTEM, Type.NAME); system.child(JCR_VERSIONSTORAGE) - .setProperty(JCR_PRIMARYTYPE, "rep:versionStorage", Type.NAME); - system.child("jcr:nodeTypes") - .setProperty(JCR_PRIMARYTYPE, "rep:nodeTypes", Type.NAME); - system.child("jcr:activities") - .setProperty(JCR_PRIMARYTYPE, "rep:Activities", Type.NAME); + .setProperty(JCR_PRIMARYTYPE, VersionConstants.REP_VERSIONSTORAGE, Type.NAME); + system.child(JCR_NODE_TYPES) + .setProperty(JCR_PRIMARYTYPE, NT_REP_NODE_TYPES, Type.NAME); + system.child(VersionConstants.JCR_ACTIVITIES) + .setProperty(JCR_PRIMARYTYPE, VersionConstants.REP_ACTIVITIES, Type.NAME); } if (!root.hasChildNode(IndexConstants.INDEX_DEFINITIONS_NAME)) {