svn commit: r1394101 - in /jackrabbit/oak/trunk/oak-core/src/main: java/org/apache/jackrabbit/oak/plugins/type/InitialContent.java resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd

[al...@apache.org]

Author: alexparvulescu
Date: Thu Oct  4 14:52:52 2012
New Revision: 1394101

URL: http://svn.apache.org/viewvc?rev=1394101&view=rev
Log:
OAK-365 Add Query Index definition node type
 - changed from nt: to oak:

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/InitialContent.java
    jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/InitialContent.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/InitialContent.java?rev=1394101&r1=1394100&r2=1394101&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/InitialContent.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/InitialContent.java Thu Oct  4 14:52:52 2012
@@ -54,7 +54,7 @@ public class InitialContent extends Defa
         if (!root.hasChildNode("oak:index")) {
             // FIXME: user-mgt related unique properties (rep:authorizableId, rep:principalName) are implementation detail and not generic for repo
             // FIXME: rep:principalName only needs to be unique if defined with user/group nodes -> add defining nt-info to uniqueness constraint otherwise ac-editing will fail.
-            mk.commit("/", "+\"oak:index\":{\"jcr:uuid\":{\"jcr:primaryType\":\"nam:nt:queryIndexDefinition\", \"type\":\"property\", \"unique\":true},\"rep:authorizableId\":{\"jcr:primaryType\":\"nam:nt:queryIndexDefinition\", \"type\":\"property\",\"unique\":true},\"rep:principalName\":{\"jcr:primaryType\":\"nam:nt:queryIndexDefinition\", \"type\":\"property\",\"unique\":true}}", null, null);
+            mk.commit("/", "+\"oak:index\":{\"jcr:uuid\":{\"jcr:primaryType\":\"nam:oak:queryIndexDefinition\", \"type\":\"property\", \"unique\":true},\"rep:authorizableId\":{\"jcr:primaryType\":\"nam:oak:queryIndexDefinition\", \"type\":\"property\",\"unique\":true},\"rep:principalName\":{\"jcr:primaryType\":\"nam:oak:queryIndexDefinition\", \"type\":\"property\",\"unique\":true}}", null, null);
         }
 
         BuiltInNodeTypes.register(createRoot(mk));

Modified: jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd?rev=1394101&r1=1394100&r2=1394101&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/type/builtin_nodetypes.cnd Thu Oct  4 14:52:52 2012
@@ -19,6 +19,7 @@
 <jcr='http://www.jcp.org/jcr/1.0'>
 <nt='http://www.jcp.org/jcr/nt/1.0'>
 <mix='http://www.jcp.org/jcr/mix/1.0'>
+<oak='http://jackrabbit.apache.org/oak/ns/1.0'>
 
 //------------------------------------------------------------------------------
 // B A S E  T Y P E
@@ -469,7 +470,7 @@
  *
  * @since oak 0.6
  */
-[nt:queryIndexDefinition] > nt:unstructured
+[oak:queryIndexDefinition] > nt:unstructured
   - type (STRING) mandatory
   + reindex (BOOLEAN)