Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceConstants.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceConstants.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceConstants.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceConstants.java Thu Sep 21 15:00:40 2017 @@ -16,65 +16,8 @@ */ package org.apache.jackrabbit.oak.plugins.name; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import javax.jcr.NamespaceRegistry; - -import org.apache.jackrabbit.JcrConstants; - /** - * TODO document + * @deprecated Use {@link org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants} instead. */ -public interface NamespaceConstants { - - String REP_NAMESPACES = "rep:namespaces"; - - String NAMESPACES_PATH = '/' + JcrConstants.JCR_SYSTEM + '/' + REP_NAMESPACES; - - // TODO: see http://java.net/jira/browse/JSR_333-50) - String PREFIX_SV = "sv"; - String NAMESPACE_SV = "http://www.jcp.org/jcr/sv/1.0";; - - String PREFIX_REP = "rep"; - String NAMESPACE_REP = "internal"; // TODO: see OAK-74 - - // additional XML namespace - String PREFIX_XMLNS = "xmlns"; - String NAMESPACE_XMLNS = "http://www.w3.org/2000/xmlns/";; - - /** - * Reserved namespace prefixes as defined in jackrabbit 2 - */ - Collection<String> RESERVED_PREFIXES = Collections.unmodifiableList(Arrays.asList( - NamespaceRegistry.PREFIX_XML, - NamespaceRegistry.PREFIX_JCR, - NamespaceRegistry.PREFIX_NT, - NamespaceRegistry.PREFIX_MIX, - PREFIX_XMLNS, - PREFIX_REP, - PREFIX_SV - )); - - /** - * Reserved namespace URIs as defined in jackrabbit 2 - */ - Collection<String> RESERVED_URIS = Collections.unmodifiableList(Arrays.asList( - NamespaceRegistry.NAMESPACE_XML, - NamespaceRegistry.NAMESPACE_JCR, - NamespaceRegistry.NAMESPACE_NT, - NamespaceRegistry.NAMESPACE_MIX, - NAMESPACE_XMLNS, - NAMESPACE_REP, - NAMESPACE_SV - )); - - // index nodes for faster lookup - - String REP_NSDATA = "rep:nsdata"; - - String REP_URIS = "rep:uris"; - - String REP_PREFIXES = "rep:prefixes"; - -} +public interface NamespaceConstants extends org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants { +} \ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceEditor.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceEditor.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceEditor.java Thu Sep 21 15:00:40 2017 @@ -22,9 +22,9 @@ import static javax.jcr.NamespaceRegistr import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; import static org.apache.jackrabbit.oak.api.Type.STRING; -import static org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.REP_NAMESPACES; -import static org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.REP_NSDATA; -import static org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.REP_URIS; +import static org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants.REP_NAMESPACES; +import static org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants.REP_NSDATA; +import static org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants.REP_URIS; import static org.apache.jackrabbit.oak.plugins.name.Namespaces.isValidPrefix; import static org.apache.jackrabbit.oak.plugins.name.Namespaces.safeGet; @@ -37,6 +37,7 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.plugins.tree.TreeFactory; import org.apache.jackrabbit.oak.spi.commit.DefaultEditor; import org.apache.jackrabbit.oak.spi.commit.Editor; +import org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceEditorProvider.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceEditorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NamespaceEditorProvider.java Thu Sep 21 15:00:40 2017 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.plugins.name; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; -import static org.apache.jackrabbit.oak.plugins.name.NamespaceConstants.REP_NAMESPACES; +import static org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants.REP_NAMESPACES; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Service; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/Namespaces.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/Namespaces.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/Namespaces.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/Namespaces.java Thu Sep 21 15:00:40 2017 @@ -27,7 +27,8 @@ import com.google.common.collect.Sets; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; +import org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import static com.google.common.base.Preconditions.checkState; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java Thu Sep 21 15:00:40 2017 @@ -30,6 +30,7 @@ import javax.jcr.UnsupportedRepositoryOp 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.spi.namespace.NamespaceConstants; /** * Read-only namespace registry. Used mostly internally when access to the Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/DefinitionProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/DefinitionProvider.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/DefinitionProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/DefinitionProvider.java Thu Sep 21 15:00:40 2017 @@ -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.spi.nodetype; import javax.annotation.Nonnull; import javax.jcr.RepositoryException; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeType.java Thu Sep 21 15:00:40 2017 @@ -39,6 +39,7 @@ import javax.jcr.nodetype.PropertyDefini import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; +import org.apache.jackrabbit.oak.spi.nodetype.EffectiveNodeType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,9 +51,9 @@ import com.google.common.collect.Maps; /** * EffectiveNodeType... TODO */ -public class EffectiveNodeType { +class EffectiveNodeTypeImpl implements org.apache.jackrabbit.oak.spi.nodetype.EffectiveNodeType { - private static final Logger log = LoggerFactory.getLogger(EffectiveNodeType.class); + private static final Logger log = LoggerFactory.getLogger(EffectiveNodeTypeImpl.class); private static final NodeTypeImpl[] NO_MIXINS = new NodeTypeImpl[0]; @@ -60,7 +61,7 @@ public class EffectiveNodeType { private final ReadOnlyNodeTypeManager ntMgr; - EffectiveNodeType( + EffectiveNodeTypeImpl( NodeTypeImpl primary, NodeTypeImpl[] mixins, ReadOnlyNodeTypeManager ntMgr) { this.ntMgr = ntMgr; @@ -80,7 +81,7 @@ public class EffectiveNodeType { } } - EffectiveNodeType(NodeTypeImpl primary, ReadOnlyNodeTypeManager ntMgr) { + EffectiveNodeTypeImpl(NodeTypeImpl primary, ReadOnlyNodeTypeManager ntMgr) { this(primary, NO_MIXINS, ntMgr); } @@ -102,6 +103,7 @@ public class EffectiveNodeType { * @param nodeTypeName name of node type * @return {@code true} if the given node type is included, otherwise {@code false}. */ + @Override public boolean includesNodeType(String nodeTypeName) { return nodeTypes.containsKey(nodeTypeName); } @@ -115,6 +117,7 @@ public class EffectiveNodeType { * @return {@code true} if all of the given node types are included, * otherwise {@code false} */ + @Override public boolean includesNodeTypes(String[] nodeTypeNames) { for (String ntName : nodeTypeNames) { if (!includesNodeType(ntName)) { @@ -130,6 +133,7 @@ public class EffectiveNodeType { * @param mixin name of mixin type * @return {@code true} if the mixin type is supported, otherwise {@code false} */ + @Override public boolean supportsMixin(String mixin) { if (includesNodeType(mixin)) { return true; @@ -148,6 +152,7 @@ public class EffectiveNodeType { return true; } + @Override public Iterable<NodeDefinition> getNodeDefinitions() { List<NodeDefinition> definitions = new ArrayList<NodeDefinition>(); for (NodeType nt : nodeTypes.values()) { @@ -156,6 +161,7 @@ public class EffectiveNodeType { return definitions; } + @Override public Iterable<PropertyDefinition> getPropertyDefinitions() { List<PropertyDefinition> definitions = new ArrayList<PropertyDefinition>(); for (NodeType nt : nodeTypes.values()) { @@ -164,6 +170,7 @@ public class EffectiveNodeType { return definitions; } + @Override public Iterable<NodeDefinition> getAutoCreateNodeDefinitions() { return Iterables.filter(getNodeDefinitions(), new Predicate<NodeDefinition>() { @Override @@ -173,6 +180,7 @@ public class EffectiveNodeType { }); } + @Override public Iterable<PropertyDefinition> getAutoCreatePropertyDefinitions() { return Iterables.filter(getPropertyDefinitions(), new Predicate<PropertyDefinition>() { @Override @@ -182,6 +190,7 @@ public class EffectiveNodeType { }); } + @Override public Iterable<NodeDefinition> getMandatoryNodeDefinitions() { return Iterables.filter(getNodeDefinitions(), new Predicate<NodeDefinition>() { @Override @@ -191,6 +200,7 @@ public class EffectiveNodeType { }); } + @Override public Iterable<PropertyDefinition> getMandatoryPropertyDefinitions() { return Iterables.filter(getPropertyDefinitions(), new Predicate<PropertyDefinition>() { @Override @@ -206,6 +216,7 @@ public class EffectiveNodeType { * @param oakName An internal oak name. * @return All node definitions that match the given internal oak name. */ + @Override @Nonnull public Iterable<NodeDefinition> getNamedNodeDefinitions( final String oakName) { @@ -225,6 +236,7 @@ public class EffectiveNodeType { * @param oakName An internal oak name. * @return All property definitions that match the given internal oak name. */ + @Override @Nonnull public Iterable<PropertyDefinition> getNamedPropertyDefinitions( String oakName) { @@ -240,6 +252,7 @@ public class EffectiveNodeType { * * @return All residual node definitions. */ + @Override @Nonnull public Iterable<NodeDefinition> getResidualNodeDefinitions() { List<NodeDefinition> definitions = newArrayList(); @@ -254,6 +267,7 @@ public class EffectiveNodeType { * * @return All residual property definitions. */ + @Override @Nonnull public Iterable<PropertyDefinition> getResidualPropertyDefinitions() { List<PropertyDefinition> definitions = newArrayList(); @@ -263,6 +277,7 @@ public class EffectiveNodeType { return definitions; } + @Override public void checkSetProperty(PropertyState property) throws RepositoryException { PropertyDefinition definition = getDefinition(property); if (definition.isProtected()) { @@ -283,6 +298,7 @@ public class EffectiveNodeType { } } + @Override public void checkRemoveProperty(PropertyState property) throws RepositoryException { PropertyDefinition definition = getDefinition(property); if (definition.isProtected()) { @@ -294,6 +310,7 @@ public class EffectiveNodeType { } } + @Override public void checkMandatoryItems(Tree tree) throws ConstraintViolationException { for (NodeType nodeType : nodeTypes.values()) { for (PropertyDefinition pd : nodeType.getPropertyDefinitions()) { @@ -313,6 +330,7 @@ public class EffectiveNodeType { } } + @Override public void checkOrderableChildNodes() throws UnsupportedRepositoryOperationException { for (NodeType nt : nodeTypes.values()) { if (nt.hasOrderableChildNodes()) { @@ -336,6 +354,7 @@ public class EffectiveNodeType { * @return the applicable definition for the target property. * @throws ConstraintViolationException If no matching definition can be found. */ + @Override public PropertyDefinition getPropertyDefinition( String propertyName, boolean isMultiple, int type, boolean exactTypeMatch) @@ -371,6 +390,7 @@ public class EffectiveNodeType { * @param unknownMultiple {@code true} if the target property has an unknown type, {@code false} if it is known to be a multi-valued property. * @return the applicable definition for the target property or {@code null} if no matching definition can be found. */ + @Override public PropertyDefinition getPropertyDefinition(String name, int type, boolean unknownMultiple) { // TODO check multivalue handling Iterable<PropertyDefinition> definitions = getNamedPropertyDefinitions(name); @@ -407,6 +427,7 @@ public class EffectiveNodeType { * @return the node definition * @throws ConstraintViolationException */ + @Override public NodeDefinition getNodeDefinition( String childName, EffectiveNodeType childEffective) throws ConstraintViolationException { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeProvider.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeProvider.java Thu Sep 21 15:00:40 2017 @@ -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.spi.nodetype; import java.util.Iterator; import javax.annotation.Nonnull; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java Thu Sep 21 15:00:40 2017 @@ -23,6 +23,7 @@ import javax.annotation.Nonnull; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; @@ -42,13 +43,13 @@ import static org.apache.jackrabbit.JcrC import static org.apache.jackrabbit.oak.api.Type.UNDEFINED; import static org.apache.jackrabbit.oak.api.Type.UNDEFINEDS; import static org.apache.jackrabbit.oak.commons.PathUtils.dropIndexFromName; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_MANDATORY_CHILD_NODES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_MANDATORY_PROPERTIES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_NAMED_CHILD_NODE_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_NAMED_PROPERTY_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_RESIDUAL_CHILD_NODE_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_RESIDUAL_PROPERTY_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_SUPERTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_MANDATORY_CHILD_NODES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_MANDATORY_PROPERTIES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_NAMED_CHILD_NODE_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_NAMED_PROPERTY_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_RESIDUAL_CHILD_NODE_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_RESIDUAL_PROPERTY_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_SUPERTYPES; class EffectiveType { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionImpl.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/ItemDefinitionImpl.java Thu Sep 21 15:00:40 2017 @@ -23,6 +23,7 @@ import javax.jcr.version.OnParentVersion import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.namepath.NamePathMapper; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import static com.google.common.base.Preconditions.checkNotNull; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionImpl.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionImpl.java Thu Sep 21 15:00:40 2017 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.plugins.nodetype; import static com.google.common.base.Preconditions.checkState; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_NODE_TYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_NODE_TYPES; import javax.jcr.nodetype.NodeDefinition; import javax.jcr.nodetype.NodeType; 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=1809170&r1=1809169&r2=1809170&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 Thu Sep 21 15:00:40 2017 @@ -16,93 +16,8 @@ */ package org.apache.jackrabbit.oak.plugins.nodetype; -import org.apache.jackrabbit.JcrConstants; - /** - * NodeTypeConstants... TODO + * @deprecated Use {@link org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants} instead */ -public interface NodeTypeConstants extends JcrConstants { - - String JCR_NODE_TYPES = "jcr:nodeTypes"; - String NODE_TYPES_PATH = '/' + JcrConstants.JCR_SYSTEM + '/' + JCR_NODE_TYPES; - - String JCR_IS_ABSTRACT = "jcr:isAbstract"; - String JCR_IS_QUERYABLE = "jcr:isQueryable"; - String JCR_IS_FULLTEXT_SEARCHABLE = "jcr:isFullTextSearchable"; - String JCR_IS_QUERY_ORDERABLE = "jcr:isQueryOrderable"; - String JCR_AVAILABLE_QUERY_OPERATORS = "jcr:availableQueryOperators"; - - /** - * Constants for built-in repository defined node type names - */ - String NT_REP_ROOT = "rep:root"; - String NT_REP_SYSTEM = "rep:system"; - String NT_REP_NODE_TYPES = "rep:nodeTypes"; - /** - * @since oak 1.0 - */ - String NT_REP_UNSTRUCTURED = "rep:Unstructured"; - /** - * @since oak 1.0 - */ - String NT_OAK_UNSTRUCTURED = "oak:Unstructured"; - /** - * @since oak 1.5.7 - */ - String NT_OAK_RESOURCE = "oak:Resource"; - - String NT_REP_NODE_TYPE = "rep:NodeType"; - String NT_REP_NAMED_PROPERTY_DEFINITIONS = "rep:NamedPropertyDefinitions"; - String NT_REP_PROPERTY_DEFINITIONS = "rep:PropertyDefinitions"; - String NT_REP_PROPERTY_DEFINITION = "rep:PropertyDefinition"; - String NT_REP_NAMED_CHILD_NODE_DEFINITIONS = "rep:NamedChildNodeDefinitions"; - String NT_REP_CHILD_NODE_DEFINITIONS = "rep:ChildNodeDefinitions"; - String NT_REP_CHILD_NODE_DEFINITION = "rep:ChildNodeDefinition"; - - /** - * Additional name constants not present in JcrConstants - */ - String JCR_CREATEDBY = "jcr:createdBy"; - String JCR_LASTMODIFIEDBY = "jcr:lastModifiedBy"; - String MIX_CREATED = "mix:created"; - String MIX_LASTMODIFIED = "mix:lastModified"; - - /** - * Merge conflict handling - */ - String MIX_REP_MERGE_CONFLICT = "rep:MergeConflict"; - String REP_OURS = "rep:ours"; - - String RESIDUAL_NAME = "*"; - - // Pre-compiled Oak type information fields - String REP_SUPERTYPES = "rep:supertypes"; - String REP_PRIMARY_SUBTYPES = "rep:primarySubtypes"; - String REP_MIXIN_SUBTYPES = "rep:mixinSubtypes"; - String REP_MANDATORY_PROPERTIES = "rep:mandatoryProperties"; - String REP_MANDATORY_CHILD_NODES = "rep:mandatoryChildNodes"; - String REP_PROTECTED_PROPERTIES = "rep:protectedProperties"; - String REP_PROTECTED_CHILD_NODES = "rep:protectedChildNodes"; - String REP_HAS_PROTECTED_RESIDUAL_PROPERTIES = "rep:hasProtectedResidualProperties"; - String REP_HAS_PROTECTED_RESIDUAL_CHILD_NODES = "rep:hasProtectedResidualChildNodes"; - String REP_NAMED_SINGLE_VALUED_PROPERTIES = "rep:namedSingleValuedProperties"; - String REP_RESIDUAL_CHILD_NODE_DEFINITIONS = "rep:residualChildNodeDefinitions"; - String REP_NAMED_CHILD_NODE_DEFINITIONS = "rep:namedChildNodeDefinitions"; - String REP_RESIDUAL_PROPERTY_DEFINITIONS = "rep:residualPropertyDefinitions"; - String REP_NAMED_PROPERTY_DEFINITIONS = "rep:namedPropertyDefinitions"; - String REP_DECLARING_NODE_TYPE = "rep:declaringNodeType"; - String REP_PRIMARY_TYPE = "rep:primaryType"; - String REP_MIXIN_TYPES = "rep:mixinTypes"; - String REP_UUID = "rep:uuid"; - - /** - * mixin to enable the AtomicCounterEditor. - */ - String MIX_ATOMIC_COUNTER = "mix:atomicCounter"; - - /** - * adding such mixin will allow the {@link JcrConstants#NT_UNSTRUCTURED} type under restricting - * nodes such {@link JcrConstants#NT_FOLDER} - */ - String MIX_INDEXABLE = "mix:indexable"; -} +public interface NodeTypeConstants extends org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants { +} \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java Thu Sep 21 15:00:40 2017 @@ -30,17 +30,17 @@ import static org.apache.jackrabbit.JcrC import static org.apache.jackrabbit.JcrConstants.JCR_UUID; import static org.apache.jackrabbit.JcrConstants.NT_CHILDNODEDEFINITION; import static org.apache.jackrabbit.JcrConstants.NT_PROPERTYDEFINITION; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_IS_QUERYABLE; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_DECLARING_NODE_TYPE; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_MIXIN_TYPES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_NAMED_CHILD_NODE_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_NAMED_PROPERTY_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_PRIMARY_TYPE; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_RESIDUAL_CHILD_NODE_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_RESIDUAL_PROPERTY_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_UUID; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.RESIDUAL_NAME; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_QUERYABLE; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_DECLARING_NODE_TYPE; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_MIXIN_TYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_NAMED_CHILD_NODE_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_NAMED_PROPERTY_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_PRIMARY_TYPE; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_RESIDUAL_CHILD_NODE_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_RESIDUAL_PROPERTY_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_UUID; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.RESIDUAL_NAME; import java.io.IOException; import java.io.StringWriter; @@ -332,8 +332,8 @@ class NodeTypeImpl extends AbstractTypeD } try { - EffectiveNodeType effective = - new EffectiveNodeType(this, getManager()); + EffectiveNodeTypeImpl effective = + new EffectiveNodeTypeImpl(this, getManager()); PropertyDefinition def = effective.getPropertyDefinition( propertyName, false, value.getType(), false); return !def.isProtected() && @@ -353,8 +353,8 @@ class NodeTypeImpl extends AbstractTypeD try { int type = (values.length == 0) ? PropertyType.STRING : values[0].getType(); - EffectiveNodeType effective = - new EffectiveNodeType(this, getManager()); + EffectiveNodeTypeImpl effective = + new EffectiveNodeTypeImpl(this, getManager()); PropertyDefinition def = effective.getPropertyDefinition( propertyName, true, type, false); return !def.isProtected() && Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java Thu Sep 21 15:00:40 2017 @@ -31,6 +31,7 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; /** * <pre> 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=1809170&r1=1809169&r2=1809170&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 Sep 21 15:00:40 2017 @@ -22,8 +22,8 @@ import static org.apache.jackrabbit.JcrC import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; import static org.apache.jackrabbit.oak.api.Type.STRING; import static org.apache.jackrabbit.oak.commons.PathUtils.dropIndexFromName; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.NODE_TYPES_PATH; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_SUPERTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NODE_TYPES_PATH; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_SUPERTYPES; import java.util.Iterator; import java.util.List; @@ -55,6 +55,10 @@ import org.apache.jackrabbit.oak.api.Typ 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.spi.nodetype.DefinitionProvider; +import org.apache.jackrabbit.oak.spi.nodetype.EffectiveNodeType; +import org.apache.jackrabbit.oak.spi.nodetype.EffectiveNodeTypeProvider; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; /** * Base implementation of a {@link NodeTypeManager} with support for reading @@ -335,7 +339,7 @@ public abstract class ReadOnlyNodeTypeMa for (int i = 0; i < mixins.length; i++) { mixinImpls[i] = (NodeTypeImpl) mixins[i]; // FIXME } - return new EffectiveNodeType(primary, mixinImpls, this); + return new EffectiveNodeTypeImpl(primary, mixinImpls, this); } @Override @@ -351,13 +355,13 @@ public abstract class ReadOnlyNodeTypeMa PropertyState jcrMixinType = tree.getProperty(JCR_MIXINTYPES); if (jcrMixinType == null) { - return new EffectiveNodeType(primaryType, this); + return new EffectiveNodeTypeImpl(primaryType, this); } else { NodeTypeImpl[] mixinTypes = new NodeTypeImpl[jcrMixinType.count()]; for (int i = 0; i < mixinTypes.length; i++) { mixinTypes[i] = internalGetNodeType(jcrMixinType.getValue(Type.NAME, i)); } - return new EffectiveNodeType(primaryType, mixinTypes, this); + return new EffectiveNodeTypeImpl(primaryType, mixinTypes, this); } } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java Thu Sep 21 15:00:40 2017 @@ -33,7 +33,7 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager.isValidUUID; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT; import static org.apache.jackrabbit.oak.plugins.nodetype.constraint.Constraints.valueConstraint; import java.util.Collections; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorProvider.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorProvider.java Thu Sep 21 15:00:40 2017 @@ -20,7 +20,7 @@ import static org.apache.jackrabbit.JcrC import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_NODE_TYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_NODE_TYPES; import java.util.Set; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java Thu Sep 21 15:00:40 2017 @@ -40,9 +40,9 @@ import static org.apache.jackrabbit.JcrC 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.oak.plugins.nodetype.NodeTypeConstants.JCR_NODE_TYPES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_MIXIN_SUBTYPES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_PRIMARY_SUBTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_NODE_TYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_MIXIN_SUBTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_PRIMARY_SUBTYPES; /** * Inheritance-aware node type predicate for {@link NodeState node states}. Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java Thu Sep 21 15:00:40 2017 @@ -44,25 +44,25 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.api.Type.NAME; import static org.apache.jackrabbit.oak.api.Type.NAMES; import static org.apache.jackrabbit.oak.api.Type.STRING; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_NODE_TYPES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_DECLARING_NODE_TYPE; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_HAS_PROTECTED_RESIDUAL_CHILD_NODES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_HAS_PROTECTED_RESIDUAL_PROPERTIES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_MANDATORY_CHILD_NODES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_MANDATORY_PROPERTIES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_MIXIN_SUBTYPES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_MIXIN_TYPES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_NAMED_CHILD_NODE_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_NAMED_PROPERTY_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_NAMED_SINGLE_VALUED_PROPERTIES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_PRIMARY_SUBTYPES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_PRIMARY_TYPE; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_PROTECTED_CHILD_NODES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_PROTECTED_PROPERTIES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_RESIDUAL_CHILD_NODE_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_RESIDUAL_PROPERTY_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_SUPERTYPES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_UUID; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_NODE_TYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_DECLARING_NODE_TYPE; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_HAS_PROTECTED_RESIDUAL_CHILD_NODES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_HAS_PROTECTED_RESIDUAL_PROPERTIES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_MANDATORY_CHILD_NODES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_MANDATORY_PROPERTIES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_MIXIN_SUBTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_MIXIN_TYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_NAMED_CHILD_NODE_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_NAMED_PROPERTY_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_NAMED_SINGLE_VALUED_PROPERTIES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_PRIMARY_SUBTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_PRIMARY_TYPE; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_PROTECTED_CHILD_NODES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_PROTECTED_PROPERTIES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_RESIDUAL_CHILD_NODE_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_RESIDUAL_PROPERTY_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_SUPERTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_UUID; import java.util.Collections; import java.util.LinkedHashSet; @@ -71,6 +71,7 @@ import java.util.Set; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ItemDefinitionTemplate.java Thu Sep 21 15:00:40 2017 @@ -33,7 +33,7 @@ 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; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; /** * Base class for the node and property definition template implementations Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/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?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeDefinitionTemplateImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeDefinitionTemplateImpl.java Thu Sep 21 15:00:40 2017 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.plugin import static org.apache.jackrabbit.JcrConstants.JCR_DEFAULTPRIMARYTYPE; import static org.apache.jackrabbit.JcrConstants.JCR_REQUIREDPRIMARYTYPES; import static org.apache.jackrabbit.JcrConstants.JCR_SAMENAMESIBLINGS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.RESIDUAL_NAME; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.RESIDUAL_NAME; import java.util.Arrays; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistry.java Thu Sep 21 15:00:40 2017 @@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.namepat import org.apache.jackrabbit.oak.plugins.name.ReadWriteNamespaceRegistry; import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.NODE_TYPES_PATH; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NODE_TYPES_PATH; /** * {@code BuiltInNodeTypes} is a utility class that registers the built-in Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/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?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java Thu Sep 21 15:00:40 2017 @@ -29,8 +29,8 @@ import static org.apache.jackrabbit.JcrC import static org.apache.jackrabbit.JcrConstants.NT_NODETYPE; import static org.apache.jackrabbit.JcrConstants.NT_PROPERTYDEFINITION; import static org.apache.jackrabbit.oak.api.Type.NAME; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_IS_QUERYABLE; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_QUERYABLE; import java.util.Arrays; import java.util.List; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/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?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/PropertyDefinitionTemplateImpl.java Thu Sep 21 15:00:40 2017 @@ -21,10 +21,10 @@ import static org.apache.jackrabbit.JcrC import static org.apache.jackrabbit.JcrConstants.JCR_MULTIPLE; import static org.apache.jackrabbit.JcrConstants.JCR_REQUIREDTYPE; import static org.apache.jackrabbit.JcrConstants.JCR_VALUECONSTRAINTS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_AVAILABLE_QUERY_OPERATORS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_IS_FULLTEXT_SEARCHABLE; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_IS_QUERY_ORDERABLE; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.RESIDUAL_NAME; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_AVAILABLE_QUERY_OPERATORS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_FULLTEXT_SEARCHABLE; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_QUERY_ORDERABLE; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.RESIDUAL_NAME; import java.util.Arrays; import java.util.Locale; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/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?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/ReadWriteNodeTypeManager.java Thu Sep 21 15:00:40 2017 @@ -17,8 +17,8 @@ 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 static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_NODE_TYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NODE_TYPES_PATH; import java.util.ArrayList; import java.util.List; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java Thu Sep 21 15:00:40 2017 @@ -21,8 +21,9 @@ import javax.annotation.Nonnull; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree; -import org.apache.jackrabbit.oak.plugins.version.VersionConstants; +import org.apache.jackrabbit.oak.spi.version.VersionConstants; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.apache.jackrabbit.oak.spi.version.VersionConstants; public final class TreeTypeProvider { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java Thu Sep 21 15:00:40 2017 @@ -40,7 +40,7 @@ import org.apache.jackrabbit.oak.api.Typ import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; -import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree; import org.apache.jackrabbit.util.ISO8601; @@ -67,13 +67,13 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.api.Type.STRING; import static org.apache.jackrabbit.oak.api.Type.STRINGS; import static org.apache.jackrabbit.oak.commons.PathUtils.dropIndexFromName; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_CREATEDBY; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_LASTMODIFIEDBY; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_NAMED_CHILD_NODE_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_NAMED_PROPERTY_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_RESIDUAL_CHILD_NODE_DEFINITIONS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_SUPERTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_CREATEDBY; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_LASTMODIFIEDBY; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_NAMED_CHILD_NODE_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_NAMED_PROPERTY_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_RESIDUAL_CHILD_NODE_DEFINITIONS; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_SUPERTYPES; /** * Utility providing common operations for the {@code Tree} that are not provided Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/DateVersionSelector.java Thu Sep 21 15:00:40 2017 @@ -46,7 +46,7 @@ import org.apache.jackrabbit.util.ISO860 * new DateVersionSelector(null, true).select() -> V1.2 * </pre> */ -public class DateVersionSelector implements VersionSelector { +class DateVersionSelector implements VersionSelector { /** * a version date hint Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadOnlyVersionManager.java Thu Sep 21 15:00:40 2017 @@ -35,6 +35,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.tree.TreeFactory; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; +import org.apache.jackrabbit.oak.spi.version.VersionConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java Thu Sep 21 15:00:40 2017 @@ -69,9 +69,9 @@ import static org.apache.jackrabbit.JcrC import static org.apache.jackrabbit.JcrConstants.NT_VERSIONHISTORY; import static org.apache.jackrabbit.JcrConstants.NT_VERSIONLABELS; import static org.apache.jackrabbit.oak.plugins.version.Utils.uuidFromNode; -import static org.apache.jackrabbit.oak.plugins.version.VersionConstants.JCR_COPIED_FROM; -import static org.apache.jackrabbit.oak.plugins.version.VersionConstants.REP_VERSIONSTORAGE; -import static org.apache.jackrabbit.oak.plugins.version.VersionConstants.VERSION_STORE_PATH; +import static org.apache.jackrabbit.oak.spi.version.VersionConstants.JCR_COPIED_FROM; +import static org.apache.jackrabbit.oak.spi.version.VersionConstants.REP_VERSIONSTORAGE; +import static org.apache.jackrabbit.oak.spi.version.VersionConstants.VERSION_STORE_PATH; /** * Extends the {@link ReadOnlyVersionManager} with methods to modify the Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/Utils.java Thu Sep 21 15:00:40 2017 @@ -34,7 +34,7 @@ import org.apache.jackrabbit.oak.spi.sta /** * {@code Utils} provide some utility methods. */ -public final class Utils { +final class Utils { private Utils() { } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionConstants.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionConstants.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionConstants.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionConstants.java Thu Sep 21 15:00:40 2017 @@ -16,138 +16,8 @@ */ package org.apache.jackrabbit.oak.plugins.version; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; - -import com.google.common.collect.ImmutableSet; -import org.apache.jackrabbit.JcrConstants; - /** - * VersionConstants... TODO + * @deprecated Use {@link org.apache.jackrabbit.oak.spi.version.VersionConstants} instead */ -public interface VersionConstants extends JcrConstants { - - // version storage - String REP_VERSIONSTORAGE = "rep:versionStorage"; - - // activities - String JCR_ACTIVITY = "jcr:activity"; - String JCR_ACTIVITIES = "jcr:activities"; - String JCR_ACTIVITY_TITLE = "jcr:activityTitle"; - String NT_ACTIVITY = "nt:activity"; - String REP_ACTIVITIES = "rep:Activities"; - - // configurations - String JCR_CONFIGURATION = "jcr:configuration"; - String JCR_CONFIGURATIONS = "jcr:configurations"; - String JCR_ROOT = "jcr:root"; // TODO: possible collisions? - String NT_CONFIGURATION = "nt:configuration"; - String REP_CONFIGURATIONS = "rep:Configurations"; - - // nt:versionHistory - String JCR_COPIED_FROM = "jcr:copiedFrom"; - - // nt:versionedChild - String JCR_CHILD_VERSION_HISTORY = "jcr:childVersionHistory"; - - /** - * @since OAK 1.0 - */ - String MIX_REP_VERSIONABLE_PATHS = "rep:VersionablePaths"; - - /** - * Prefix of the jcr:baseVersion value for a restore. - */ - String RESTORE_PREFIX = "restore-"; - - /** - * Quote from JSR 283 Section "15.12.3 Activity Storage"<p> - * <p> - * Activities are persisted as nodes of type nt:activity under system-generated - * node names in activity storage below /jcr:system/jcr:activities.<br> - * Similar to the /jcr:system/jcr:versionStorage subgraph, the activity storage - * is a single repository wide store, but is reflected into each workspace. - */ - String ACTIVITIES_PATH = '/' + JCR_SYSTEM + '/' + JCR_ACTIVITIES; - - /** - * Quote from JSR 283 Section "15.13.2 Configuration Proxy Nodes"<p> - * <p> - * Each configuration in a given workspace is represented by a distinct proxy - * node of type nt:configuration located in configuration storage within the - * same workspace under /jcr:system/jcr:configurations/. The configuration - * storage in a particular workspace is specific to that workspace. It is - * not a common repository-wide store mirrored into each workspace, as is - * the case with version storage. - */ - String CONFIGURATIONS_PATH = '/' + JCR_SYSTEM + '/' + JCR_CONFIGURATIONS; - - /** - * Quote from JSR 283 Section "3.13.8 Version Storage"<p> - * <p> - * Version histories are stored in a single, repository-wide version storage - * mutable and readable through the versioning API. - * Under full versioning the version storage data must, additionally, be - * reflected in each workspace as a protected subgraph [...] located below - * /jcr:system/jcr:versionStorage. - */ - String VERSION_STORE_PATH = '/' + JCR_SYSTEM + '/' + JCR_VERSIONSTORAGE; - - Collection<String> SYSTEM_PATHS = Collections.unmodifiableList(Arrays.asList( - ACTIVITIES_PATH, - CONFIGURATIONS_PATH, - VERSION_STORE_PATH - )); - - Collection<String> VERSION_PROPERTY_NAMES = Collections.unmodifiableList(Arrays.asList( - JCR_ACTIVITY, - JCR_ACTIVITY_TITLE, - JCR_BASEVERSION, - JCR_CHILD_VERSION_HISTORY, - JCR_CONFIGURATION, - JCR_COPIED_FROM, - JCR_FROZENMIXINTYPES, - JCR_FROZENPRIMARYTYPE, - JCR_FROZENUUID, - JCR_ISCHECKEDOUT, - JCR_MERGEFAILED, - JCR_PREDECESSORS, - JCR_ROOT, - JCR_SUCCESSORS, - JCR_VERSIONABLEUUID, - JCR_VERSIONHISTORY - )); - - Collection<String> VERSION_NODE_NAMES = Collections.unmodifiableList(Arrays.asList( - JCR_ACTIVITIES, - JCR_CONFIGURATIONS, - JCR_FROZENNODE, - JCR_ROOTVERSION, - JCR_VERSIONLABELS - )); - - Collection<String> VERSION_NODE_TYPE_NAMES = Collections.unmodifiableList(Arrays.asList( - NT_ACTIVITY, - NT_CONFIGURATION, - NT_FROZENNODE, - NT_VERSION, - NT_VERSIONEDCHILD, - NT_VERSIONHISTORY, - NT_VERSIONLABELS, - REP_ACTIVITIES, - REP_CONFIGURATIONS - )); - - Set<String> VERSION_STORE_ROOT_NAMES = ImmutableSet.of( - JcrConstants.JCR_VERSIONSTORAGE, - VersionConstants.JCR_CONFIGURATIONS, - VersionConstants.JCR_ACTIVITIES); - - Set<String> VERSION_STORE_NT_NAMES = ImmutableSet.of( - VersionConstants.REP_VERSIONSTORAGE, - VersionConstants.REP_ACTIVITIES, - VersionConstants.REP_CONFIGURATIONS - ); +public interface VersionConstants extends org.apache.jackrabbit.oak.spi.version.VersionConstants { } \ No newline at end of file Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditor.java Thu Sep 21 15:00:40 2017 @@ -23,7 +23,7 @@ import static org.apache.jackrabbit.JcrC import static org.apache.jackrabbit.JcrConstants.JCR_ISCHECKEDOUT; import static org.apache.jackrabbit.JcrConstants.JCR_UUID; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE; -import static org.apache.jackrabbit.oak.plugins.version.VersionConstants.RESTORE_PREFIX; +import static org.apache.jackrabbit.oak.spi.version.VersionConstants.RESTORE_PREFIX; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -40,6 +40,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.Editor; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.jackrabbit.oak.spi.version.VersionConstants; /** * TODO document Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditorProvider.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionEditorProvider.java Thu Sep 21 15:00:40 2017 @@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.spi.sta import org.apache.jackrabbit.oak.spi.state.NodeState; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_VERSIONSTORAGE; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_VERSIONSTORAGE; /** * A provider creating two editors: {@link VersionEditor} Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionExceptionCode.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionExceptionCode.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionExceptionCode.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionExceptionCode.java Thu Sep 21 15:00:40 2017 @@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.plugin * {@code VersionExceptionCode} contains the codes for version related * commit failures. */ -public enum VersionExceptionCode { +enum VersionExceptionCode { UNEXPECTED_REPOSITORY_EXCEPTION("Unexpected RepositoryException"), NODE_CHECKED_IN("Node is checked in"), Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionSelector.java Thu Sep 21 15:00:40 2017 @@ -45,7 +45,7 @@ import org.apache.jackrabbit.oak.spi.sta * @see DateVersionSelector * @see javax.jcr.version.VersionManager#restore */ -public interface VersionSelector { +interface VersionSelector { /** * Selects a version of the given version history. If this VersionSelector Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionStorageEditor.java Thu Sep 21 15:00:40 2017 @@ -31,9 +31,9 @@ import static org.apache.jackrabbit.JcrC import static org.apache.jackrabbit.oak.commons.PathUtils.concat; import static org.apache.jackrabbit.oak.commons.PathUtils.getDepth; import static org.apache.jackrabbit.oak.commons.PathUtils.relativize; -import static org.apache.jackrabbit.oak.plugins.version.VersionConstants.VERSION_NODE_TYPE_NAMES; -import static org.apache.jackrabbit.oak.plugins.version.VersionConstants.VERSION_STORE_NT_NAMES; -import static org.apache.jackrabbit.oak.plugins.version.VersionConstants.VERSION_STORE_PATH; +import static org.apache.jackrabbit.oak.spi.version.VersionConstants.VERSION_NODE_TYPE_NAMES; +import static org.apache.jackrabbit.oak.spi.version.VersionConstants.VERSION_STORE_NT_NAMES; +import static org.apache.jackrabbit.oak.spi.version.VersionConstants.VERSION_STORE_PATH; /** * Validates changes on the version store. Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionablePathHook.java Thu Sep 21 15:00:40 2017 @@ -31,13 +31,14 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree; -import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.spi.commit.CommitHook; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; +import org.apache.jackrabbit.oak.spi.version.VersionConstants; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/NodeStateNodeTypeInfoProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/NodeStateNodeTypeInfoProvider.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/NodeStateNodeTypeInfoProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/NodeStateNodeTypeInfoProvider.java Thu Sep 21 15:00:40 2017 @@ -20,11 +20,11 @@ import static com.google.common.collect. import static org.apache.jackrabbit.JcrConstants.JCR_ISMIXIN; import static org.apache.jackrabbit.JcrConstants.JCR_NODETYPENAME; 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.REP_MIXIN_SUBTYPES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_NAMED_SINGLE_VALUED_PROPERTIES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_PRIMARY_SUBTYPES; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.REP_SUPERTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_NODE_TYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_MIXIN_SUBTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_NAMED_SINGLE_VALUED_PROPERTIES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_PRIMARY_SUBTYPES; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_SUPERTYPES; import java.util.Set; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConstants.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConstants.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConstants.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConstants.java Thu Sep 21 15:00:40 2017 @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.securi import java.util.Set; import com.google.common.collect.ImmutableSet; -import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; interface TokenConstants { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java Thu Sep 21 15:00:40 2017 @@ -48,7 +48,7 @@ import org.apache.jackrabbit.oak.api.Roo import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager; -import org.apache.jackrabbit.oak.plugins.name.NamespaceConstants; +import org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.authentication.ImpersonationCredentials; import org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java Thu Sep 21 15:00:40 2017 @@ -35,8 +35,8 @@ import org.apache.felix.scr.annotations. import org.apache.felix.scr.annotations.Service; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.namepath.NamePathMapper; -import org.apache.jackrabbit.oak.plugins.name.NamespaceConstants; -import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; +import org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.plugins.version.VersionablePathHook; import org.apache.jackrabbit.oak.security.authorization.accesscontrol.AccessControlImporter; import org.apache.jackrabbit.oak.security.authorization.accesscontrol.AccessControlManagerImpl; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java Thu Sep 21 15:00:40 2017 @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.api.Tre import org.apache.jackrabbit.oak.plugins.tree.RootFactory; import org.apache.jackrabbit.oak.plugins.tree.TreeLocation; import org.apache.jackrabbit.oak.plugins.tree.TreeType; -import org.apache.jackrabbit.oak.plugins.version.VersionConstants; +import org.apache.jackrabbit.oak.spi.version.VersionConstants; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.Context; import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java Thu Sep 21 15:00:40 2017 @@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.plugins import org.apache.jackrabbit.oak.plugins.lock.LockConstants; import org.apache.jackrabbit.oak.plugins.nodetype.TypePredicate; import org.apache.jackrabbit.oak.plugins.tree.impl.TreeConstants; -import org.apache.jackrabbit.oak.plugins.version.VersionConstants; +import org.apache.jackrabbit.oak.spi.version.VersionConstants; import org.apache.jackrabbit.oak.spi.commit.DefaultValidator; import org.apache.jackrabbit.oak.spi.commit.Validator; import org.apache.jackrabbit.oak.spi.commit.VisibleValidator; @@ -46,8 +46,8 @@ import static com.google.common.base.Pre import static org.apache.jackrabbit.JcrConstants.JCR_CREATED; import static org.apache.jackrabbit.JcrConstants.MIX_REFERENCEABLE; import static org.apache.jackrabbit.oak.api.CommitFailedException.ACCESS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.JCR_CREATEDBY; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.MIX_CREATED; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_CREATEDBY; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.MIX_CREATED; /** * Validator implementation that checks for sufficient permission for all Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionTreePermission.java Thu Sep 21 15:00:40 2017 @@ -23,7 +23,7 @@ import com.google.common.collect.Immutab import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree; -import org.apache.jackrabbit.oak.plugins.version.VersionConstants; +import org.apache.jackrabbit.oak.spi.version.VersionConstants; import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java Thu Sep 21 15:00:40 2017 @@ -23,7 +23,7 @@ import org.apache.jackrabbit.JcrConstant import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; -import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.plugins.tree.RootFactory; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java Thu Sep 21 15:00:40 2017 @@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.api.Pro import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree; -import org.apache.jackrabbit.oak.plugins.name.NamespaceConstants; +import org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants; import org.apache.jackrabbit.oak.spi.commit.DefaultValidator; import org.apache.jackrabbit.oak.spi.commit.Validator; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java Thu Sep 21 15:00:40 2017 @@ -51,7 +51,7 @@ import org.apache.jackrabbit.oak.api.Typ import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; -import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants; +import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java?rev=1809170&r1=1809169&r2=1809170&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java Thu Sep 21 15:00:40 2017 @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.oak.api.QueryEngine.NO_MAPPINGS; -import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.NODE_TYPES_PATH; +import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.NODE_TYPES_PATH; /** * User provider implementation and manager for group memberships with the
