svn commit: r1459200 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: plugins/nodetype/DefaultTypeEditor.java security/authorization/permission/PermissionHook.java

[mreutegg]

Author: mreutegg
Date: Thu Mar 21 09:22:22 2013
New Revision: 1459200

URL: http://svn.apache.org/r1459200
Log:
OAK-712: jcr:primaryType created as String property

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/DefaultTypeEditor.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/DefaultTypeEditor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/DefaultTypeEditor.java?rev=1459200&r1=1459199&r2=1459200&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/DefaultTypeEditor.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/DefaultTypeEditor.java
 Thu Mar 21 09:22:22 2013
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.oak.plugins.nodetype;
 
 import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.spi.commit.CommitHook;
 import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
 import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff;
@@ -55,7 +56,7 @@ public class DefaultTypeEditor implement
             if (!NodeStateUtils.isHidden(name)) {
                 NodeBuilder childBuilder = builder.child(name);
                 if (after.getProperty("jcr:primaryType") == null) {
-                    childBuilder.setProperty("jcr:primaryType", defaultType);
+                    childBuilder.setProperty("jcr:primaryType", defaultType, 
Type.NAME);
                 }
                 DefaultTypeDiff childDiff =
                         new DefaultTypeDiff(childBuilder, defaultType);

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java?rev=1459200&r1=1459199&r2=1459200&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
 Thu Mar 21 09:22:22 2013
@@ -95,7 +95,7 @@ public class PermissionHook implements P
         NodeBuilder permissionRoot;
         if (!permissionStore.hasChildNode(workspaceName)) {
             permissionRoot = permissionStore.child(workspaceName)
-                    .setProperty(JcrConstants.JCR_PRIMARYTYPE, 
NT_REP_PERMISSION_STORE);
+                    .setProperty(JcrConstants.JCR_PRIMARYTYPE, 
NT_REP_PERMISSION_STORE, Type.NAME);
         } else {
             permissionRoot = permissionStore.child(workspaceName);
         }