jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1556800 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/...
Date Thu, 09 Jan 2014 13:18:01 GMT
Author: angela
Date: Thu Jan  9 13:18:00 2014
New Revision: 1556800

URL: http://svn.apache.org/r1556800
Log:
OAK-1180 : oak nodetypes should have capital names

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RegistrationEditor.java
    jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd
    jackrabbit/oak/trunk/oak-doc/src/site/markdown/query.md
    jackrabbit/oak/trunk/oak-http/README.md
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/ManyChildrenTest.java
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
    jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java
    jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
Thu Jan  9 13:18:00 2014
@@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.plugin
  */
 public interface IndexConstants {
 
-    String INDEX_DEFINITIONS_NODE_TYPE = "oak:queryIndexDefinition";
+    String INDEX_DEFINITIONS_NODE_TYPE = "oak:QueryIndexDefinition";
 
     String INDEX_DEFINITIONS_NAME = "oak:index";
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndex.java
Thu Jan  9 13:18:00 2014
@@ -36,13 +36,13 @@ import com.google.common.collect.Iterabl
 
 /**
  * Provides a QueryIndex that does lookups against a property index
- * 
+ *
  * <p>
  * To define a property index on a subtree you have to add an <code>oak:index</code>
node.
  * <br>
  * Next (as a child node) follows the index definition node that:
  * <ul>
- * <li>must be of type <code>oak:queryIndexDefinition</code></li>
+ * <li>must be of type <code>oak:QueryIndexDefinition</code></li>
  * <li>must have the <code>type</code> property set to <b><code>property</code></b></li>
  * <li>contains the <code>propertyNames</code> property that indicates
what property will be stored in the index</li>
  * </ul>
@@ -67,7 +67,7 @@ import com.google.common.collect.Iterabl
  * {
  *     NodeBuilder index = root.child("oak:index");
  *     index.child("uuid")
- *         .setProperty("jcr:primaryType", "oak:queryIndexDefinition", Type.NAME)
+ *         .setProperty("jcr:primaryType", "oak:QueryIndexDefinition", Type.NAME)
  *         .setProperty("type", "property")
  *         .setProperty("propertyNames", "jcr:uuid")
  *         .setProperty("declaringNodeTypes", "mix:referenceable")

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=1556800&r1=1556799&r2=1556800&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 Jan  9 13:18:00 2014
@@ -42,6 +42,13 @@ public interface NodeTypeConstants exten
      * @since oak 1.0
      */
     String NT_REP_UNSTRUCTURED = "rep:Unstructured";
+    String NT_OAK_NODE_TYPE = "oak:NodeType";
+    String NT_OAK_NAMED_PROPERTY_DEFINITIONS = "oak:NamedPropertyDefinitions";
+    String NT_OAK_PROPERTY_DEFINITIONS = "oak:PropertyDefinitions";
+    String NT_OAK_PROPERTY_DEFINITION = "oak:PropertyDefinition";
+    String NT_OAK_NAMED_CHILD_NODE_DEFINITIONS = "oak:NamedChildNodeDefinitions";
+    String NT_OAK_CHILD_NODE_DEFINITIONS = "oak:ChildNodeDefinitions";
+    String NT_OAK_CHILD_NODE_DEFINITION = "oak:ChildNodeDefinition";
 
     /**
      * Additional name constants not present in JcrConstants

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RegistrationEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RegistrationEditor.java?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RegistrationEditor.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/RegistrationEditor.java
Thu Jan  9 13:18:00 2014
@@ -16,6 +16,19 @@
  */
 package org.apache.jackrabbit.oak.plugins.nodetype;
 
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.google.common.collect.Iterables;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
+import org.apache.jackrabbit.oak.spi.commit.Validator;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.collect.Iterables.contains;
 import static com.google.common.collect.Lists.newArrayList;
@@ -54,8 +67,9 @@ import static org.apache.jackrabbit.oak.
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_MIXIN_SUBTYPES;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_MIXIN_TYPES;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_NAMED_CHILD_NODE_DEFINITIONS;
-import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_NAMED_SINGLE_VALUED_PROPERTIES;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_NAMED_PROPERTY_DEFINITIONS;
+import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_NAMED_SINGLE_VALUED_PROPERTIES;
+import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_PRIMARY_SUBTYPES;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_PRIMARY_TYPE;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_PROPERTY_DEFINITION;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_PROPERTY_DEFINITIONS;
@@ -63,28 +77,13 @@ import static org.apache.jackrabbit.oak.
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_PROTECTED_PROPERTIES;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_RESIDUAL_CHILD_NODE_DEFINITIONS;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_RESIDUAL_PROPERTY_DEFINITIONS;
-import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_PRIMARY_SUBTYPES;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_SUPERTYPES;
 import static org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants.OAK_UUID;
 
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
-import org.apache.jackrabbit.oak.spi.commit.Validator;
-import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import org.apache.jackrabbit.oak.spi.state.NodeState;
-
-import com.google.common.collect.Iterables;
-
 /**
  * Editor that validates the consistency of the in-content node type registry
  * under {@code /jcr:system/jcr:nodeTypes} and maintains the access-optimized
- * versions of node type information as defined in {@code oak:nodeType}.
+ * versions of node type information as defined in {@code oak:NodeType}.
  *
  * <ul>
  *     <li>validate new definitions</li>
@@ -236,9 +235,9 @@ class RegistrationEditor extends Default
                     "Unexpected " + JCR_NODETYPENAME + " in type " + name);
         }
 
-        // Prepare the type node pre-compilation of the oak:nodeType info
+        // Prepare the type node pre-compilation of the oak:NodeType info
         Iterable<String> empty = emptyList();
-        type.setProperty(JCR_PRIMARYTYPE, "oak:nodeType", NAME);
+        type.setProperty(JCR_PRIMARYTYPE, NodeTypeConstants.NT_OAK_NODE_TYPE, NAME);
         type.removeProperty(OAK_SUPERTYPES);
         type.setProperty(OAK_PRIMARY_SUBTYPES, empty, NAMES);
         type.setProperty(OAK_MANDATORY_PROPERTIES, empty, NAMES);
@@ -295,7 +294,7 @@ class RegistrationEditor extends Default
             }
             definitions = type.child(OAK_NAMED_PROPERTY_DEFINITIONS);
             definitions.setProperty(
-                    JCR_PRIMARYTYPE, OAK_NAMED_PROPERTY_DEFINITIONS, NAME);
+                    JCR_PRIMARYTYPE, NodeTypeConstants.NT_OAK_NAMED_PROPERTY_DEFINITIONS,
NAME);
             definitions = definitions.child(escapedName);
 
             // - jcr:mandatory (BOOLEAN) protected mandatory
@@ -315,7 +314,7 @@ class RegistrationEditor extends Default
             }
         }
         definitions.setProperty(
-                JCR_PRIMARYTYPE, OAK_PROPERTY_DEFINITIONS, NAME);
+                JCR_PRIMARYTYPE, NodeTypeConstants.NT_OAK_PROPERTY_DEFINITIONS, NAME);
 
         // - jcr:requiredType (STRING) protected mandatory
         // < 'STRING', 'URI', 'BINARY', 'LONG', 'DOUBLE',
@@ -339,7 +338,7 @@ class RegistrationEditor extends Default
         }
 
         definitions.setChildNode(key, definition)
-            .setProperty(JCR_PRIMARYTYPE, OAK_PROPERTY_DEFINITION, NAME)
+            .setProperty(JCR_PRIMARYTYPE, NodeTypeConstants.NT_OAK_PROPERTY_DEFINITION, NAME)
             .setProperty(OAK_DECLARING_NODE_TYPE, typeName, NAME);
     }
 
@@ -352,8 +351,7 @@ class RegistrationEditor extends Default
         if (name != null) {
             String childNodeName = name.getValue(NAME);
             definitions = type.child(OAK_NAMED_CHILD_NODE_DEFINITIONS);
-            definitions.setProperty(
-                    JCR_PRIMARYTYPE, OAK_NAMED_CHILD_NODE_DEFINITIONS, NAME);
+            definitions.setProperty(JCR_PRIMARYTYPE, NodeTypeConstants.NT_OAK_NAMED_CHILD_NODE_DEFINITIONS,
NAME);
             definitions = definitions.child(childNodeName);
 
             // - jcr:mandatory (BOOLEAN) protected mandatory
@@ -373,7 +371,7 @@ class RegistrationEditor extends Default
             }
         }
         definitions.setProperty(
-                JCR_PRIMARYTYPE, OAK_CHILD_NODE_DEFINITIONS, NAME);
+                JCR_PRIMARYTYPE, NodeTypeConstants.NT_OAK_CHILD_NODE_DEFINITIONS, NAME);
 
         // - jcr:requiredPrimaryTypes (NAME)
         //   = 'nt:base' protected mandatory multiple
@@ -387,7 +385,7 @@ class RegistrationEditor extends Default
                             "Unknown required primary type " + key);
                 } else if (!definitions.hasChildNode(key)) {
                     definitions.setChildNode(key, definition)
-                        .setProperty(JCR_PRIMARYTYPE, OAK_CHILD_NODE_DEFINITION, NAME)
+                        .setProperty(JCR_PRIMARYTYPE, NodeTypeConstants.NT_OAK_CHILD_NODE_DEFINITION,
NAME)
                         .setProperty(OAK_DECLARING_NODE_TYPE, typeName, NAME);
                 }
             }

Modified: jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/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?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd
Thu Jan  9 13:18:00 2014
@@ -263,10 +263,10 @@
   - * (UNDEFINED)
   + * (nt:base) = nt:unstructured sns VERSION
 
-[oak:unstructured]
+[oak:Unstructured]
  - * (UNDEFINED) multiple
  - * (UNDEFINED)
- + * (nt:base) = oak:unstructured VERSION
+ + * (nt:base) = oak:Unstructured VERSION
 
 /**
  * Unstructured base node type for repository internal information that must not
@@ -439,7 +439,7 @@
 /**
  * @since oak 1.0
  */
-[oak:nodeType] > nt:nodeType
+[oak:NodeType] > nt:nodeType
   - oak:supertypes (NAME) protected multiple autocreated
   - oak:primarySubtypes (NAME) protected multiple autocreated
   - oak:mixinSubtypes (NAME) protected multiple autocreated
@@ -450,27 +450,27 @@
   - oak:hasProtectedResidualProperties (BOOLEAN) protected autocreated
   - oak:hasProtectedResidualChildNodes (BOOLEAN) protected autocreated
   - oak:namedSingleValuedProperties (NAME) protected multiple autocreated
-  + oak:namedPropertyDefinitions (oak:namedPropertyDefinitions) = oak:namedPropertyDefinitions
protected mandatory
-  + oak:residualPropertyDefinitions (oak:propertyDefinitions) = oak:propertyDefinitions protected
mandatory
-  + oak:namedChildNodeDefinitions (oak:namedChildNodeDefinitions) = oak:namedChildNodeDefinitions
protected mandatory
-  + oak:residualChildNodeDefinitions (oak:childNodeDefinitions) = oak:childNodeDefinitions
protected mandatory
+  + oak:namedPropertyDefinitions (oak:NamedPropertyDefinitions) = oak:NamedPropertyDefinitions
protected mandatory
+  + oak:residualPropertyDefinitions (oak:PropertyDefinitions) = oak:PropertyDefinitions protected
mandatory
+  + oak:namedChildNodeDefinitions (oak:NamedChildNodeDefinitions) = oak:NamedChildNodeDefinitions
protected mandatory
+  + oak:residualChildNodeDefinitions (oak:ChildNodeDefinitions) = oak:ChildNodeDefinitions
protected mandatory
 
-[oak:namedPropertyDefinitions]
-  + * (oak:propertyDefinitions) = oak:propertyDefinitions protected
+[oak:NamedPropertyDefinitions]
+  + * (oak:PropertyDefinitions) = oak:PropertyDefinitions protected
 
-[oak:propertyDefinitions]
-  + * (oak:propertyDefinition) = oak:propertyDefinition protected
+[oak:PropertyDefinitions]
+  + * (oak:PropertyDefinition) = oak:PropertyDefinition protected
 
-[oak:propertyDefinition] > nt:propertyDefinition
+[oak:PropertyDefinition] > nt:propertyDefinition
   - oak:declaringNodeType (NAME) protected mandatory
 
-[oak:namedChildNodeDefinitions]
-  + * (oak:childNodeDefinitions) = oak:childNodeDefinitions protected
+[oak:NamedChildNodeDefinitions]
+  + * (oak:ChildNodeDefinitions) = oak:ChildNodeDefinitions protected
 
-[oak:childNodeDefinitions]
-  + * (oak:childNodeDefinition) = oak:childNodeDefinition protected
+[oak:ChildNodeDefinitions]
+  + * (oak:ChildNodeDefinition) = oak:ChildNodeDefinition protected
 
-[oak:childNodeDefinition] > nt:childNodeDefinition
+[oak:ChildNodeDefinition] > nt:childNodeDefinition
   - oak:declaringNodeType (NAME) protected mandatory
 
 /**
@@ -530,7 +530,7 @@
  *
  * @since oak 0.6
  */
-[oak:queryIndexDefinition] > nt:unstructured
+[oak:QueryIndexDefinition] > nt:unstructured
   - type (STRING) mandatory
   - async (STRING)
   - reindex (BOOLEAN) mandatory IGNORE

Modified: jackrabbit/oak/trunk/oak-doc/src/site/markdown/query.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/query.md?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/markdown/query.md (original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/markdown/query.md Thu Jan  9 13:18:00 2014
@@ -84,7 +84,7 @@ Is useful whenever there is a query with
 
 To define a property index on a subtree you have to add an index definition node that:
 
-* must be of type `oak:queryIndexDefinition`
+* must be of type `oak:QueryIndexDefinition`
 * must have the `type` property set to __`property`__
 * contains the `propertyNames` property that indicates what properties will be stored in
the index.
   `propertyNames` can be a list of properties, and it is optional.in case it is missing,
the node name will be used as a property name reference value
@@ -100,7 +100,7 @@ Example:
     {
       NodeBuilder index = root.child("oak:index");
       index.child("uuid")
-        .setProperty("jcr:primaryType", "oak:queryIndexDefinition", Type.NAME)
+        .setProperty("jcr:primaryType", "oak:QueryIndexDefinition", Type.NAME)
         .setProperty("type", "property")
         .setProperty("propertyNames", "jcr:uuid")
         .setProperty("declaringNodeTypes", "mix:referenceable")
@@ -133,7 +133,7 @@ TODO Node aggregation [OAK-828](https://
 
 The index definition node for a lucene-based full-text index:
 
-* must be of type `oak:queryIndexDefinition`
+* must be of type `oak:QueryIndexDefinition`
 * must have the `type` property set to __`lucene`__
 * must contain the `async` property set to the value `async`, this is what sends the index
update process to a background thread
 
@@ -148,7 +148,7 @@ Example:
     {
       NodeBuilder index = root.child("oak:index");
       index.child("lucene")
-        .setProperty("jcr:primaryType", "oak:queryIndexDefinition", Type.NAME)
+        .setProperty("jcr:primaryType", "oak:QueryIndexDefinition", Type.NAME)
         .setProperty("type", "lucene")
         .setProperty("async", "async")
         .setProperty(PropertyStates.createProperty("includePropertyTypes", ImmutableSet.of(

Modified: jackrabbit/oak/trunk/oak-http/README.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-http/README.md?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-http/README.md (original)
+++ jackrabbit/oak/trunk/oak-http/README.md Thu Jan  9 13:18:00 2014
@@ -26,11 +26,11 @@ in the `~/.netrc` file so they are not i
 You can add or modify content by posting JSON:
 
     $ http -j -b localhost:8080/test \
-          jcr\\:primaryType=oak:unstructured foo=abc bar:=123
+          jcr\\:primaryType=oak:Unstructured foo=abc bar:=123
     {
         "bar": "123",
         "foo": "abc",
-        "jcr:primaryType": "oak:unstructured"
+        "jcr:primaryType": "oak:Unstructured"
     }
 
 The `jcr:primaryType` property needs to currently be included to avoid
@@ -54,13 +54,13 @@ The posted content is stored in the repo
     {
         "bar": "123",
         "foo": "abc",
-        "jcr:primaryType": "oak:unstructured"
+        "jcr:primaryType": "oak:Unstructured"
     }
 
 You can modify the content by posting more data to the same URL:
 
     $ http -j -b localhost:8080/test \
-          foo=xyz child:='{"jcr:primaryType": "oak:unstructured"}'
+          foo=xyz child:='{"jcr:primaryType": "oak:Unstructured"}'
     {
         "bar": "123",
         "child": {},
@@ -70,7 +70,7 @@ You can modify the content by posting mo
 
     $ http -j -b localhost:8080/test/child
     {
-        "jcr:primaryType": "oak:unstructured"
+        "jcr:primaryType": "oak:Unstructured"
     }
 
 Finally, content can be removed either by posting a null value to it

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/ManyChildrenTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/ManyChildrenTest.java?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/ManyChildrenTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/ManyChildrenTest.java
Thu Jan  9 13:18:00 2014
@@ -16,8 +16,6 @@
  */
 package org.apache.jackrabbit.oak.jcr.cluster;
 
-import static org.junit.Assert.assertEquals;
-
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -32,6 +30,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * A simple, temporary benchmark for many child nodes.
  */
@@ -82,7 +82,7 @@ public class ManyChildrenTest {
         int count = 10;
         
         Profiler prof = null;
-        String nodeType = "oak:unstructured";
+        String nodeType = "oak:Unstructured";
         if (session.getRootNode().hasNode("many")) {
             session.getRootNode().getNode("many").remove();
             session.save();

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
(original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
Thu Jan  9 13:18:00 2014
@@ -104,7 +104,7 @@ import org.slf4j.LoggerFactory;
  * 
  * Under it follows the index definition node that:
  * <ul>
- * <li>must be of type <code>oak:queryIndexDefinition</code></li>
+ * <li>must be of type <code>oak:QueryIndexDefinition</code></li>
  * <li>must have the <code>type</code> property set to <b><code>lucene</code></b></li>
  * <li>must have the <code>async</code> property set to <b><code>async</code></b></li>
  * </b></li>
@@ -123,7 +123,7 @@ import org.slf4j.LoggerFactory;
  * {
  *     NodeBuilder index = root.child("oak:index");
  *     index.child("lucene")
- *         .setProperty("jcr:primaryType", "oak:queryIndexDefinition", Type.NAME)
+ *         .setProperty("jcr:primaryType", "oak:QueryIndexDefinition", Type.NAME)
  *         .setProperty("type", "lucene")
  *         .setProperty("async", "async")
  *         .setProperty("reindex", "true");

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
(original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakIndexUtils.java
Thu Jan  9 13:18:00 2014
@@ -94,7 +94,7 @@ public class OakIndexUtils {
          */
         public void create(Session session) throws RepositoryException {
             if (!session.getWorkspace().getNodeTypeManager().hasNodeType(
-                        "oak:queryIndexDefinition")) {
+                        "oak:QueryIndexDefinition")) {
                 // not an Oak repository
                 return;
             }

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
(original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
Thu Jan  9 13:18:00 2014
@@ -89,7 +89,7 @@ public class WikipediaImport extends Ben
 
         System.out.format("Importing %s...%n", dump);
         Node wikipedia = session.getRootNode().addNode(
-                "wikipedia", "oak:unstructured");
+                "wikipedia", "oak:Unstructured");
 
         String title = null;
         String text = null;

Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java
(original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java
Thu Jan  9 13:18:00 2014
@@ -47,7 +47,7 @@ public class SolrIndexHookIT extends Sol
 
         NodeBuilder builder = root.builder();
         builder.child("oak:index").child("solr")
-                .setProperty(JCR_PRIMARYTYPE, "oak:queryIndexDefinition")
+                .setProperty(JCR_PRIMARYTYPE, "oak:QueryIndexDefinition")
                 .setProperty("type", "solr");
 
         NodeState before = builder.getNodeState();
@@ -76,7 +76,7 @@ public class SolrIndexHookIT extends Sol
 
         NodeBuilder builder = root.builder();
         builder.child("oak:index").child("solr")
-                .setProperty(JCR_PRIMARYTYPE, "oak:queryIndexDefinition")
+                .setProperty(JCR_PRIMARYTYPE, "oak:QueryIndexDefinition")
                 .setProperty("type", "solr");
 
         NodeState before = builder.getNodeState();
@@ -106,7 +106,7 @@ public class SolrIndexHookIT extends Sol
 
         NodeBuilder builder = root.builder();
         builder.child("oak:index").child("solr")
-                .setProperty(JCR_PRIMARYTYPE, "oak:queryIndexDefinition")
+                .setProperty(JCR_PRIMARYTYPE, "oak:QueryIndexDefinition")
                 .setProperty("type", "solr");
 
         NodeState before = builder.getNodeState();

Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1556800&r1=1556799&r2=1556800&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
(original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
Thu Jan  9 13:18:00 2014
@@ -163,15 +163,15 @@ public class RepositoryUpgrade {
             "nt:versionHistory",
             "nt:versionLabels",
             "nt:versionedChild",
-            "oak:childNodeDefinition",
-            "oak:childNodeDefinitions",
-            "oak:namedChildNodeDefinitions",
-            "oak:namedPropertyDefinitions",
-            "oak:nodeType",
-            "oak:propertyDefinition",
-            "oak:propertyDefinitions",
-            "oak:queryIndexDefinition",
-            "oak:unstructured",
+            "oak:ChildNodeDefinition",
+            "oak:ChildNodeDefinitions",
+            "oak:NamedChildNodeDefinitions",
+            "oak:NamedPropertyDefinitions",
+            "oak:NodeType",
+            "oak:PropertyDefinition",
+            "oak:PropertyDefinitions",
+            "oak:QueryIndexDefinition",
+            "oak:Unstructured",
             "rep:ACE",
             "rep:ACL",
             "rep:AccessControl",



Mime
View raw message