svn commit: r1541840 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: core/TreeTypeProvider.java core/TreeTypeProviderImpl.java security/authorization/permission/CompiledPermissionImpl.java

[angela]

Author: angela
Date: Thu Nov 14 07:45:51 2013
New Revision: 1541840

URL: http://svn.apache.org/r1541840
Log:
OAK-527: rename type "PERMISSION_STORE" to "INTERNAL" to make it extensible 
later on.

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
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.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=1541840&r1=1541839&r2=1541840&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
 Thu Nov 14 07:45:51 2013
@@ -30,8 +30,8 @@ public interface TreeTypeProvider {
     int TYPE_DEFAULT = 1;
     // version store(s) content
     int TYPE_VERSION = 2;
-    // permissions store
-    int TYPE_PERMISSION_STORE = 4;
+    // repository internal content such as e.g. permissions store
+    int TYPE_INTERNAL = 4;
     // access control content
     int TYPE_AC = 8;
     // hidden trees

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=1541840&r1=1541839&r2=1541840&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
 Thu Nov 14 07:45:51 2013
@@ -49,8 +49,8 @@ public final class TreeTypeProviderImpl 
             case TYPE_VERSION:
                 type = TYPE_VERSION;
                 break;
-            case TYPE_PERMISSION_STORE:
-                type = TYPE_PERMISSION_STORE;
+            case TYPE_INTERNAL:
+                type = TYPE_INTERNAL;
                 break;
             case TYPE_AC:
                 type = TYPE_AC;
@@ -62,7 +62,7 @@ public final class TreeTypeProviderImpl 
                 } else if 
(VersionConstants.VERSION_STORE_ROOT_NAMES.contains(name)) {
                     type = TYPE_VERSION;
                 } else if 
(PermissionConstants.REP_PERMISSION_STORE.equals(name)) {
-                    type = TYPE_PERMISSION_STORE;
+                    type = TYPE_INTERNAL;
                 } else if (contextInfo.definesContextRoot(tree)) {
                     type = TYPE_AC;
                 } else {

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java?rev=1541840&r1=1541839&r2=1541840&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
 Thu Nov 14 07:45:51 2013
@@ -180,7 +180,7 @@ final class CompiledPermissionImpl imple
                         return new TreePermissionImpl(versionableTree, 
TreeTypeProvider.TYPE_VERSION, pp);
                     }
                 }
-            case TreeTypeProvider.TYPE_PERMISSION_STORE:
+            case TreeTypeProvider.TYPE_INTERNAL:
                 return TreePermission.EMPTY;
             default:
                 return new TreePermissionImpl(tree, type, parentPermission);
@@ -227,7 +227,7 @@ final class CompiledPermissionImpl imple
                     }
                     return isGranted(path, permissions);
                 }
-            case TreeTypeProvider.TYPE_PERMISSION_STORE:
+            case TreeTypeProvider.TYPE_INTERNAL:
                 return false;
             default:
                 return internalIsGranted(tree, property, permissions);
@@ -339,7 +339,7 @@ final class CompiledPermissionImpl imple
                 }  else {
                     return getPrivilegeBits(versionableTree);
                 }
-            case TreeTypeProvider.TYPE_PERMISSION_STORE:
+            case TreeTypeProvider.TYPE_INTERNAL:
                 return PrivilegeBits.EMPTY;
             default:
                 return getPrivilegeBits(tree);