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 233DFE486 for ; Thu, 17 Jan 2013 12:26:43 +0000 (UTC) Received: (qmail 25256 invoked by uid 500); 17 Jan 2013 12:26:43 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 25144 invoked by uid 500); 17 Jan 2013 12:26:39 -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 25113 invoked by uid 99); 17 Jan 2013 12:26:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2013 12:26:38 +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, 17 Jan 2013 12:26:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5E87823889BB; Thu, 17 Jan 2013 12:26:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1434640 - in /jackrabbit/oak/trunk: oak-core/ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ oak-core/src/main/resources/org/apache/jackrabbit/oak... Date: Thu, 17 Jan 2013 12:26:15 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130117122616.5E87823889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Thu Jan 17 12:26:13 2013 New Revision: 1434640 URL: http://svn.apache.org/viewvc?rev=1434640&view=rev Log: OAK-562: Clean up duplicate name conversion in plugins/nodetype Move classes related to node type registration to an o.a.j.o.plugins.nodetype.write subpackage to better encapsulate the functionality. Only the ReadWriteNodeTypeManager and InitialContent classes need to be public. Also replace ValidatingNodeTypeManager with a factory method in ReadOnlyNodeTypeManager to reduce the number of separate classes. Added: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/BuiltInNodeTypes.java - copied, changed from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/BuiltInNodeTypes.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java - copied, changed from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/InitialContent.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java - copied, changed from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionTemplateImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NamedTemplate.java - copied, changed from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractNamedTemplate.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeDefinitionTemplateImpl.java - copied, changed from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionTemplateImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java - copied, changed from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeTemplateImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java - copied, changed from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionTemplateImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java - copied, changed from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadWriteNodeTypeManager.java jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/ jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd - copied, changed from r1434626, jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/builtin_nodetypes.cnd Removed: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractNamedTemplate.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/BuiltInNodeTypes.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/InitialContent.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionTemplateImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionTemplateImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeTemplateImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionTemplateImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadWriteNodeTypeManager.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ValidatingNodeTypeManager.java jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/builtin_nodetypes.cnd Modified: jackrabbit/oak/trunk/oak-core/pom.xml jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RegistrationValidatorProvider.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeValidatorProvider.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/UniquePropertyTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexQueryTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Modified: jackrabbit/oak/trunk/oak-core/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/pom.xml (original) +++ jackrabbit/oak/trunk/oak-core/pom.xml Thu Jan 17 12:26:13 2013 @@ -55,6 +55,7 @@ org.apache.jackrabbit.oak.plugins.memory, org.apache.jackrabbit.oak.plugins.name, org.apache.jackrabbit.oak.plugins.nodetype, + org.apache.jackrabbit.oak.plugins.nodetype.write, org.apache.jackrabbit.oak.plugins.observation, org.apache.jackrabbit.oak.plugins.version, org.apache.jackrabbit.oak.spi.query, Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadOnlyNodeTypeManager.java Thu Jan 17 12:26:13 2013 @@ -49,9 +49,13 @@ import org.apache.jackrabbit.commons.ite import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; +import org.apache.jackrabbit.oak.commons.PathUtils; +import org.apache.jackrabbit.oak.core.ReadOnlyTree; import org.apache.jackrabbit.oak.namepath.NameMapper; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.namepath.NamePathMapperImpl; +import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState; +import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.util.NodeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -118,6 +122,7 @@ public abstract class ReadOnlyNodeTypeMa } //-------------------------------------------------------------------------- + /** * Return a new instance of {@code ReadOnlyNodeTypeManager} that reads node * type information from the tree at {@link NodeTypeConstants#NODE_TYPES_PATH}. @@ -142,6 +147,34 @@ public abstract class ReadOnlyNodeTypeMa }; } + /** + * Returns a read-only node type manager based on the types stored within + * the content tree starting at the given root node state. + * + * @param root root node state + * @return read-only node type manager + */ + @Nonnull + public static ReadOnlyNodeTypeManager getInstance(NodeState root) { + Tree tree = new ReadOnlyTree(root); + for (String name : PathUtils.elements(NODE_TYPES_PATH)) { + tree = tree.getChild(name); + if (tree == null) { + // No node types in content, so use an empty node + tree = new ReadOnlyTree(MemoryNodeState.EMPTY_NODE); + break; + } + } + + final Tree types = tree; + return new ReadOnlyNodeTypeManager() { + @Override + protected Tree getTypes() { + return types; + } + }; + } + //----------------------------------------------------< NodeTypeManager >--- @Override @@ -196,24 +229,27 @@ public abstract class ReadOnlyNodeTypeMa } @Override - public NodeTypeTemplate createNodeTypeTemplate() { - return new NodeTypeTemplateImpl(getNamePathMapper()); + public NodeTypeTemplate createNodeTypeTemplate() + throws RepositoryException { + throw new UnsupportedRepositoryOperationException(); } @Override public NodeTypeTemplate createNodeTypeTemplate(NodeTypeDefinition ntd) - throws ConstraintViolationException { - return new NodeTypeTemplateImpl(getNamePathMapper(), ntd); + throws RepositoryException { + throw new UnsupportedRepositoryOperationException(); } @Override - public NodeDefinitionTemplate createNodeDefinitionTemplate() { - return new NodeDefinitionTemplateImpl(getNamePathMapper()); + public NodeDefinitionTemplate createNodeDefinitionTemplate() + throws RepositoryException { + throw new UnsupportedRepositoryOperationException(); } @Override - public PropertyDefinitionTemplate createPropertyDefinitionTemplate() { - return new PropertyDefinitionTemplateImpl(getNamePathMapper()); + public PropertyDefinitionTemplate createPropertyDefinitionTemplate() + throws RepositoryException { + throw new UnsupportedRepositoryOperationException(); } /** Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RegistrationValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RegistrationValidatorProvider.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RegistrationValidatorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RegistrationValidatorProvider.java Thu Jan 17 12:26:13 2013 @@ -36,8 +36,9 @@ public class RegistrationValidatorProvid @Nonnull @Override public Validator getRootValidator(NodeState before, NodeState after) { - Validator validator = new RegistrationValidator(new ValidatingNodeTypeManager(before), - new ValidatingNodeTypeManager(after), + Validator validator = new RegistrationValidator( + ReadOnlyNodeTypeManager.getInstance(before), + ReadOnlyNodeTypeManager.getInstance(after), new ReadOnlyTree(before), new ReadOnlyTree(after)); return new SubtreeValidator(validator, JcrConstants.JCR_SYSTEM, NodeTypeConstants.JCR_NODE_TYPES); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeValidatorProvider.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeValidatorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeValidatorProvider.java Thu Jan 17 12:26:13 2013 @@ -35,7 +35,8 @@ public class TypeValidatorProvider imple @Override public Validator getRootValidator(NodeState before, final NodeState after) { - ReadOnlyNodeTypeManager ntm = new ValidatingNodeTypeManager(after); + ReadOnlyNodeTypeManager ntm = + ReadOnlyNodeTypeManager.getInstance(after); final ReadOnlyTree root = new ReadOnlyTree(after); NamePathMapper mapper = new NamePathMapperImpl(new GlobalNameMapper() { @Override Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/BuiltInNodeTypes.java (from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/BuiltInNodeTypes.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/BuiltInNodeTypes.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/BuiltInNodeTypes.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/BuiltInNodeTypes.java&r1=1434626&r2=1434640&rev=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/BuiltInNodeTypes.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/BuiltInNodeTypes.java Thu Jan 17 12:26:13 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.nodetype; +package org.apache.jackrabbit.oak.plugins.nodetype.write; import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.NODE_TYPES_PATH; @@ -45,7 +45,7 @@ import com.google.common.base.Charsets; * BuiltInNodeTypes is a utility class that registers the built-in * node types required for a JCR repository running on Oak. */ -public class BuiltInNodeTypes { +class BuiltInNodeTypes { private final NodeTypeManager ntMgr; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java (from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/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?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/InitialContent.java&r1=1434626&r2=1434640&rev=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/InitialContent.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java Thu Jan 17 12:26:13 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.nodetype; +package org.apache.jackrabbit.oak.plugins.nodetype.write; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Service; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java (from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionTemplateImpl.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionTemplateImpl.java&r1=1434626&r2=1434640&rev=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionTemplateImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java Thu Jan 17 12:26:13 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.nodetype; +package org.apache.jackrabbit.oak.plugins.nodetype.write; import static org.apache.jackrabbit.JcrConstants.JCR_AUTOCREATED; import static org.apache.jackrabbit.JcrConstants.JCR_MANDATORY; @@ -33,13 +33,14 @@ import javax.jcr.version.OnParentVersion import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NameMapper; +import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; /** * Base class for the node and property definition template implementations * in this package. Takes care of the shared item definition attributes and * manages mappings between JCR and Oak names. */ -abstract class ItemDefinitionTemplateImpl extends AbstractNamedTemplate +abstract class ItemDefinitionTemplate extends NamedTemplate implements ItemDefinition { private boolean residual = false; @@ -52,11 +53,11 @@ abstract class ItemDefinitionTemplateImp protected boolean isMandatory = false; - protected ItemDefinitionTemplateImpl(NameMapper mapper) { + protected ItemDefinitionTemplate(NameMapper mapper) { super(mapper); } - protected ItemDefinitionTemplateImpl( + protected ItemDefinitionTemplate( NameMapper mapper, ItemDefinition definition) throws ConstraintViolationException { super(mapper, definition.getName()); Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NamedTemplate.java (from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractNamedTemplate.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NamedTemplate.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NamedTemplate.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractNamedTemplate.java&r1=1434626&r2=1434640&rev=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/AbstractNamedTemplate.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NamedTemplate.java Thu Jan 17 12:26:13 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.nodetype; +package org.apache.jackrabbit.oak.plugins.nodetype.write; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; @@ -28,17 +28,17 @@ import org.apache.jackrabbit.oak.namepat * Keeps track of the Oak name of this template and provides utility methods * for mapping between JCR and Oak names. */ -abstract class AbstractNamedTemplate { +abstract class NamedTemplate { private final NameMapper mapper; private String oakName = null; // not defined by default - protected AbstractNamedTemplate(NameMapper mapper) { + protected NamedTemplate(NameMapper mapper) { this.mapper = mapper; } - protected AbstractNamedTemplate(NameMapper mapper, String jcrName) + protected NamedTemplate(NameMapper mapper, String jcrName) throws ConstraintViolationException { this(mapper); if (jcrName != null) { @@ -57,6 +57,8 @@ abstract class AbstractNamedTemplate { return oakName; } + //------------------------------------------------------------< public >-- + /** * Returns the JCR name of this template, or {@code null} if the name * has not yet been set. @@ -79,6 +81,8 @@ abstract class AbstractNamedTemplate { this.oakName = getOakNameOrThrowConstraintViolation(jcrName); } + //-------------------------------------------< name handling utilities >-- + /** * Like {@link NameMapper#getJcrName(String)}, but allows the given Oak * name to be {@code null}, in which case the return value is also Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeDefinitionTemplateImpl.java (from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionTemplateImpl.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeDefinitionTemplateImpl.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeDefinitionTemplateImpl.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionTemplateImpl.java&r1=1434626&r2=1434640&rev=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionTemplateImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeDefinitionTemplateImpl.java Thu Jan 17 12:26:13 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.nodetype; +package org.apache.jackrabbit.oak.plugins.nodetype.write; import static org.apache.jackrabbit.JcrConstants.JCR_DEFAULTPRIMARYTYPE; import static org.apache.jackrabbit.JcrConstants.JCR_REQUIREDPRIMARYTYPES; @@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NameMapper; -class NodeDefinitionTemplateImpl extends ItemDefinitionTemplateImpl +class NodeDefinitionTemplateImpl extends ItemDefinitionTemplate implements NodeDefinitionTemplate { private boolean allowSameNameSiblings = false; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java (from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeTemplateImpl.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeTemplateImpl.java&r1=1434626&r2=1434640&rev=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeTemplateImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java Thu Jan 17 12:26:13 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.nodetype; +package org.apache.jackrabbit.oak.plugins.nodetype.write; import static org.apache.jackrabbit.JcrConstants.JCR_CHILDNODEDEFINITION; import static org.apache.jackrabbit.JcrConstants.JCR_HASORDERABLECHILDNODES; @@ -50,7 +50,7 @@ import org.apache.jackrabbit.oak.namepat import com.google.common.collect.Lists; -class NodeTypeTemplateImpl extends AbstractNamedTemplate +class NodeTypeTemplateImpl extends NamedTemplate implements NodeTypeTemplate { private static final PropertyDefinition[] EMPTY_PROPERTY_DEFINITION_ARRAY = Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java (from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionTemplateImpl.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionTemplateImpl.java&r1=1434626&r2=1434640&rev=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionTemplateImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java Thu Jan 17 12:26:13 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.nodetype; +package org.apache.jackrabbit.oak.plugins.nodetype.write; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.JcrConstants.JCR_DEFAULTVALUES; @@ -40,7 +40,7 @@ import org.apache.jackrabbit.oak.api.Typ import org.apache.jackrabbit.oak.namepath.NameMapper; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; -class PropertyDefinitionTemplateImpl extends ItemDefinitionTemplateImpl +class PropertyDefinitionTemplateImpl extends ItemDefinitionTemplate implements PropertyDefinitionTemplate { private static final String[] ALL_OPERATORS = new String[]{ Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java (from r1434626, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadWriteNodeTypeManager.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadWriteNodeTypeManager.java&r1=1434626&r2=1434640&rev=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ReadWriteNodeTypeManager.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java Thu Jan 17 12:26:13 2013 @@ -14,38 +14,41 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.plugins.nodetype; +package org.apache.jackrabbit.oak.plugins.nodetype.write; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_NODE_TYPES; import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.NODE_TYPES_PATH; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; import javax.annotation.Nonnull; import javax.jcr.RepositoryException; +import javax.jcr.nodetype.ConstraintViolationException; import javax.jcr.nodetype.NoSuchNodeTypeException; +import javax.jcr.nodetype.NodeDefinitionTemplate; import javax.jcr.nodetype.NodeType; import javax.jcr.nodetype.NodeTypeDefinition; import javax.jcr.nodetype.NodeTypeIterator; +import javax.jcr.nodetype.NodeTypeTemplate; +import javax.jcr.nodetype.PropertyDefinitionTemplate; import org.apache.jackrabbit.commons.iterator.NodeTypeIteratorAdapter; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; -import org.apache.jackrabbit.oak.util.NodeUtil; - -import com.google.common.collect.Lists; +import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager; /** * {@code ReadWriteNodeTypeManager} extends the {@link ReadOnlyNodeTypeManager} - * and add support for operations that modify node types: + * with support for operations that modify node types. *
    *
  • {@link #registerNodeType(NodeTypeDefinition, boolean)}
    • *
  • {@link #registerNodeTypes(NodeTypeDefinition[], boolean)}
    • *
  • {@link #unregisterNodeType(String)}
    • *
  • {@link #unregisterNodeTypes(String[])}
    • + *
  • plus related template factory methods
    • *
* Calling any of the above methods will result in a {@link #refresh()} callback * to e.g. inform an associated session that it should refresh to make the @@ -94,62 +97,67 @@ public abstract class ReadWriteNodeTypeM //----------------------------------------------------< NodeTypeManager >--- @Override - public NodeType registerNodeType(NodeTypeDefinition ntd, boolean allowUpdate) throws RepositoryException { - // TODO proper node type registration... (OAK-66, OAK-411) - Root root = getWriteRoot(); - Tree types = getOrCreateNodeTypes(root); - try { - NodeType type = internalRegister(types, ntd, allowUpdate); - root.commit(); - refresh(); - return type; - } catch (CommitFailedException e) { - throw new RepositoryException(e); - } + public NodeTypeTemplate createNodeTypeTemplate() { + return new NodeTypeTemplateImpl(getNamePathMapper()); + } + + @Override + public NodeTypeTemplate createNodeTypeTemplate(NodeTypeDefinition ntd) + throws ConstraintViolationException { + return new NodeTypeTemplateImpl(getNamePathMapper(), ntd); + } + + @Override + public NodeDefinitionTemplate createNodeDefinitionTemplate() { + return new NodeDefinitionTemplateImpl(getNamePathMapper()); + } + + @Override + public PropertyDefinitionTemplate createPropertyDefinitionTemplate() { + return new PropertyDefinitionTemplateImpl(getNamePathMapper()); + } + + @Override + public NodeType registerNodeType( + NodeTypeDefinition ntd, boolean allowUpdate) + throws RepositoryException { + return registerNodeTypes( + new NodeTypeDefinition[] { ntd }, allowUpdate).nextNodeType(); } @Override - public final NodeTypeIterator registerNodeTypes(NodeTypeDefinition[] ntds, boolean allowUpdate) + public final NodeTypeIterator registerNodeTypes( + NodeTypeDefinition[] ntds, boolean allowUpdate) throws RepositoryException { + // TODO proper node type registration... (OAK-66, OAK-411) // TODO handle inter-type dependencies (OAK-66, OAK-411) Root root = getWriteRoot(); try { - List list = internalRegister( - root, Arrays.asList(ntds), allowUpdate); + Tree tree = getOrCreateNodeTypes(root); + for (NodeTypeDefinition ntd : ntds) { + NodeTypeTemplateImpl template; + if (ntd instanceof NodeTypeTemplateImpl) { + template = (NodeTypeTemplateImpl) ntd; + } else { + // some external template implementation, copy before proceeding + template = new NodeTypeTemplateImpl(getNamePathMapper(), ntd); + } + template.writeTo(tree, allowUpdate); + } root.commit(); + refresh(); - return new NodeTypeIteratorAdapter(list); + + List types = new ArrayList(ntds.length); + for (NodeTypeDefinition ntd : ntds) { + types.add(getNodeType(ntd.getName())); + } + return new NodeTypeIteratorAdapter(types); } catch (CommitFailedException e) { throw new RepositoryException(e); } } - private List internalRegister( - Root root, Iterable ntds, - boolean allowUpdate) throws RepositoryException { - Tree types = getOrCreateNodeTypes(root); - List list = Lists.newArrayList(); - for (NodeTypeDefinition ntd : ntds) { - list.add(internalRegister(types, ntd, allowUpdate)); - } - return list; - } - - private NodeType internalRegister( - Tree types, NodeTypeDefinition ntd, boolean allowUpdate) - throws RepositoryException { - NodeTypeTemplateImpl template; - if (ntd instanceof NodeTypeTemplateImpl) { - template = (NodeTypeTemplateImpl) ntd; - } else { - // some external template implementation, copy before proceeding - template = new NodeTypeTemplateImpl(getNamePathMapper(), ntd); - } - Tree type = template.writeTo(types, allowUpdate); - NodeUtil node = new NodeUtil(type, getNamePathMapper()); - return new NodeTypeImpl(this, getValueFactory(), node); - } - private static Tree getOrCreateNodeTypes(Root root) { Tree types = root.getTree(NODE_TYPES_PATH); if (types == null) { Copied: jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd (from r1434626, jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/builtin_nodetypes.cnd) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd?p2=jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd&p1=jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/builtin_nodetypes.cnd&r1=1434626&r2=1434640&rev=1434640&view=diff ============================================================================== (empty) Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java Thu Jan 17 12:26:13 2013 @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.api.Con import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.namepath.NamePathMapper; -import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; +import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.security.OakConfiguration; import org.apache.jackrabbit.oak.security.SecurityProviderImpl; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/UniquePropertyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/UniquePropertyTest.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/UniquePropertyTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/UniquePropertyTest.java Thu Jan 17 12:26:13 2013 @@ -21,7 +21,7 @@ import java.util.UUID; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.plugins.index.p2.Property2IndexHookProvider; -import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; +import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.util.NodeUtil; import org.junit.Test; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java Thu Jan 17 12:26:13 2013 @@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.api.Typ import org.apache.jackrabbit.oak.kernel.KernelNodeStore; import org.apache.jackrabbit.oak.plugins.index.IndexHookManager; import org.apache.jackrabbit.oak.plugins.index.p2.Property2IndexHookProvider; -import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; +import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.query.index.FilterImpl; import org.apache.jackrabbit.oak.spi.query.Cursor; import org.apache.jackrabbit.oak.spi.query.Cursors; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java Thu Jan 17 12:26:13 2013 @@ -19,7 +19,7 @@ import org.apache.jackrabbit.mk.core.Mic import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; import org.apache.jackrabbit.oak.plugins.index.old.mk.IndexWrapper; -import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; +import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.query.AbstractQueryTest; import org.apache.jackrabbit.oak.spi.commit.CommitHook; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexQueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexQueryTest.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexQueryTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexQueryTest.java Thu Jan 17 12:26:13 2013 @@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugin import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; -import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; +import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.query.AbstractQueryTest; import org.junit.Test; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java Thu Jan 17 12:26:13 2013 @@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; +import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.query.AbstractQueryTest; import org.junit.Ignore; import org.junit.Test; Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java Thu Jan 17 12:26:13 2013 @@ -15,7 +15,7 @@ package org.apache.jackrabbit.oak.query. import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; -import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; +import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.query.AbstractQueryTest; /** Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java Thu Jan 17 12:26:13 2013 @@ -25,7 +25,7 @@ import org.apache.jackrabbit.oak.api.Com import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.plugins.index.p2.Property2IndexHookProvider; -import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; +import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; import org.apache.jackrabbit.util.Text; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java Thu Jan 17 12:26:13 2013 @@ -32,9 +32,9 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.name.NameValidatorProvider; import org.apache.jackrabbit.oak.plugins.name.NamespaceValidatorProvider; import org.apache.jackrabbit.oak.plugins.nodetype.DefaultTypeEditor; -import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; import org.apache.jackrabbit.oak.plugins.nodetype.RegistrationValidatorProvider; import org.apache.jackrabbit.oak.plugins.nodetype.TypeValidatorProvider; +import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.plugins.version.VersionHook; import org.apache.jackrabbit.oak.security.SecurityProviderImpl; import org.apache.jackrabbit.oak.spi.commit.CommitHook; Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java Thu Jan 17 12:26:13 2013 @@ -42,7 +42,7 @@ import org.apache.jackrabbit.oak.jcr.que import org.apache.jackrabbit.oak.jcr.version.VersionManagerImpl; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.name.ReadWriteNamespaceRegistry; -import org.apache.jackrabbit.oak.plugins.nodetype.ReadWriteNodeTypeManager; +import org.apache.jackrabbit.oak.plugins.nodetype.write.ReadWriteNodeTypeManager; import org.apache.jackrabbit.util.Text; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java?rev=1434640&r1=1434639&r2=1434640&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Thu Jan 17 12:26:13 2013 @@ -25,7 +25,7 @@ import java.util.Iterator; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; import org.apache.jackrabbit.oak.api.Tree; -import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent; +import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent; import org.apache.jackrabbit.oak.query.AbstractQueryTest; import org.apache.jackrabbit.oak.query.JsopUtil; import org.junit.Ignore;