jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1482572 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core: TreeTypeProvider.java TreeTypeProviderImpl.java
Date Tue, 14 May 2013 20:35:01 GMT
Author: angela
Date: Tue May 14 20:35:01 2013
New Revision: 1482572

URL: http://svn.apache.org/r1482572
Log:
OAK-527: permissions (remove unused tree type)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProvider.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProviderImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProvider.java?rev=1482572&r1=1482571&r2=1482572&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProvider.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProvider.java
Tue May 14 20:35:01 2013
@@ -29,10 +29,8 @@ public interface TreeTypeProvider {
     int TYPE_VERSION = 2;
     // access control content
     int TYPE_AC = 4;
-    // node type definition content
-    int TYPE_NODE_TYPE = 8;
     // hidden trees
-    int TYPE_HIDDEN = 16;
+    int TYPE_HIDDEN = 8;
 
     TreeTypeProvider EMPTY = new TreeTypeProvider() {
         @Override

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProviderImpl.java?rev=1482572&r1=1482571&r2=1482572&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProviderImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProviderImpl.java
Tue May 14 20:35:01 2013
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.core;
 
 import javax.annotation.Nonnull;
 
-import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
 import org.apache.jackrabbit.oak.plugins.version.VersionConstants;
 import org.apache.jackrabbit.oak.spi.security.Context;
 import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
@@ -46,9 +45,6 @@ public final class TreeTypeProviderImpl 
             case TYPE_HIDDEN:
                 type = TYPE_HIDDEN;
                 break;
-            case TYPE_NODE_TYPE:
-                type = TYPE_NODE_TYPE;
-                break;
             case TYPE_VERSION:
                 type = TYPE_VERSION;
                 break;
@@ -59,8 +55,6 @@ public final class TreeTypeProviderImpl 
                 String name = tree.getName();
                 if (NodeStateUtils.isHidden(name)) {
                     type = TYPE_HIDDEN;
-                } else if (NodeTypeConstants.JCR_NODE_TYPES.equals(name)) {
-                    type = TYPE_NODE_TYPE;
                 } else if (VersionConstants.VERSION_NODE_NAMES.contains(name) ||
                         VersionConstants.VERSION_NODE_TYPE_NAMES.contains(NodeStateUtils.getPrimaryTypeName(tree.state)))
{
                     type = TYPE_VERSION;



Mime
View raw message