jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1511818 - /jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd
Date Thu, 08 Aug 2013 14:52:14 GMT
Author: angela
Date: Thu Aug  8 14:52:14 2013
New Revision: 1511818

URL: http://svn.apache.org/r1511818
Log:
OAK-527: permissions (commenting node type definitions)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd

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=1511818&r1=1511817&r2=1511818&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 Aug  8 14:52:14 2013
@@ -425,6 +425,9 @@
   + jcr:propertyDefinition (nt:propertyDefinition) = nt:propertyDefinition protected sns
   + jcr:childNodeDefinition (nt:childNodeDefinition) = nt:childNodeDefinition protected sns
 
+/**
+ * @since oak 1.0
+ */
 [oak:nodeType] > nt:nodeType
   - oak:supertypes (NAME) protected multiple autocreated
   - oak:primarySubtypes (NAME) protected multiple autocreated
@@ -441,15 +444,24 @@
   + oak:namedChildNodeDefinitions (oak:namedChildNodeDefinitions) = oak:namedChildNodeDefinitions
protected mandatory
   + oak:residualChildNodeDefinitions (oak:childNodeDefinitions) = oak:childNodeDefinitions
protected mandatory
 
+/**
+ * @since oak 1.0
+ */
 [oak:namedPropertyDefinitions]
   + * (oak:propertyDefinitions) = oak:propertyDefinitions protected
 
+/**
+ * @since oak 1.0
+ */
 [oak:propertyDefinitions]
   + * (nt:propertyDefinition) = nt:propertyDefinition protected
 
 [oak:namedChildNodeDefinitions]
   + * (oak:childNodeDefinitions) = oak:childNodeDefinitions protected
 
+/**
+ * @since oak 1.0
+ */
 [oak:childNodeDefinitions]
   + * (nt:childNodeDefinition) = nt:childNodeDefinition protected
 
@@ -639,6 +651,20 @@
   - * (UNDEFINED) protected
   - * (UNDEFINED) protected multiple
 
+// -----------------------------------------------------------------------------
+// Principal based AC
+// -----------------------------------------------------------------------------
+
+[rep:AccessControl]
+  + * (rep:AccessControl) protected IGNORE
+  + * (rep:PrincipalAccessControl) protected IGNORE
+
+[rep:PrincipalAccessControl] > rep:AccessControl
+  + rep:policy (rep:Policy) protected IGNORE
+
+// -----------------------------------------------------------------------------
+// Permissions
+// -----------------------------------------------------------------------------
 /**
  * @since oak 1.0
  */
@@ -656,17 +682,6 @@
   + * (rep:Permissions) = rep:Permissions protected IGNORE
 
 // -----------------------------------------------------------------------------
-// Principal based AC
-// -----------------------------------------------------------------------------
-
-[rep:AccessControl]
-  + * (rep:AccessControl) protected IGNORE
-  + * (rep:PrincipalAccessControl) protected IGNORE
-
-[rep:PrincipalAccessControl] > rep:AccessControl
-  + rep:policy (rep:Policy) protected IGNORE
-
-// -----------------------------------------------------------------------------
 // User Management 
 // -----------------------------------------------------------------------------
 



Mime
View raw message