jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1556767 - in /jackrabbit/oak/trunk/oak-core/src/main: java/org/apache/jackrabbit/oak/plugins/nodetype/ java/org/apache/jackrabbit/oak/security/authentication/token/ resources/org/apache/jackrabbit/oak/plugins/nodetype/write/
Date Thu, 09 Jan 2014 09:42:32 GMT
Author: angela
Date: Thu Jan  9 09:42:32 2014
New Revision: 1556767

URL: http://svn.apache.org/r1556767
Log:
OAK-1214 Create rep:Unstructured node type for repo internal content

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
    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/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java?rev=1556767&r1=1556766&r2=1556767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeConstants.java
Thu Jan  9 09:42:32 2014
@@ -38,6 +38,10 @@ public interface NodeTypeConstants exten
     String NT_REP_ROOT = "rep:root";
     String NT_REP_SYSTEM = "rep:system";
     String NT_REP_NODE_TYPES = "rep:nodeTypes";
+    /**
+     * @since oak 1.0
+     */
+    String NT_REP_UNSTRUCTURED = "rep:Unstructured";
 
     /**
      * Additional name constants not present in JcrConstants

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java?rev=1556767&r1=1556766&r2=1556767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
Thu Jan  9 09:42:32 2014
@@ -48,6 +48,7 @@ import org.apache.jackrabbit.oak.api.Tre
 import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 import org.apache.jackrabbit.oak.plugins.name.NamespaceConstants;
+import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.authentication.ImpersonationCredentials;
 import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenInfo;
@@ -75,9 +76,11 @@ import static org.apache.jackrabbit.oak.
  * For security reasons the nodes storing the token information now have a
  * dedicated node type (rep:Token) which has the following definition:
  * <pre>
- *     [rep:Token] > nt:unstructured, mix:referenceable
- *     - rep:token.key (STRING) protected mandatory
- *     - rep:token.exp (STRING) protected mandatory
+ *     [rep:Token] > mix:referenceable
+ *      - rep:token.key (STRING) protected mandatory
+ *      - rep:token.exp (DATE) protected mandatory
+ *      - * (UNDEFINED) protected
+ *      - * (UNDEFINED) multiple protected
  * </pre>
  * Consequently the hash of the token and the expiration time of tokens generated
  * by this provider can no longer be manipulated using regular JCR item
@@ -101,7 +104,7 @@ class TokenProviderImpl implements Token
     private static final String TOKEN_ATTRIBUTE_EXPIRY = "rep:token.exp";
     private static final String TOKEN_ATTRIBUTE_KEY = "rep:token.key";
     private static final String TOKENS_NODE_NAME = ".tokens";
-    private static final String TOKENS_NT_NAME = JcrConstants.NT_UNSTRUCTURED;
+    private static final String TOKENS_NT_NAME = NodeTypeConstants.NT_REP_UNSTRUCTURED;
     private static final String TOKEN_NT_NAME = "rep:Token";
 
     /**

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=1556767&r1=1556766&r2=1556767&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 Jan  9 09:42:32 2014
@@ -268,6 +268,17 @@
  - * (UNDEFINED)
  + * (nt:base) = oak:unstructured VERSION
 
+/**
+ * Unstructured base node type for repository internal information that must not
+ * be copied to the version store OPV
+ *
+ * @since oak 1.0
+ */
+[rep:Unstructured]
+ - * (UNDEFINED) multiple IGNORE
+ - * (UNDEFINED) IGNORE
+ + * (nt:base) = rep:Unstructured IGNORE
+
 //------------------------------------------------------------------------------
 // R E F E R E N C E A B L E
 //------------------------------------------------------------------------------
@@ -666,9 +677,9 @@
  * @since oak 1.0
  */
 [rep:PermissionStore]
-  - rep:accessControlledPath (STRING) protected
-  - rep:numPermissions (LONG) protected
-  - rep:timestamp (LONG) protected
+  - rep:accessControlledPath (STRING) protected IGNORE
+  - rep:numPermissions (LONG) protected IGNORE
+  - rep:timestamp (LONG) protected IGNORE
   + * (rep:PermissionStore) = rep:PermissionStore protected IGNORE
   + * (rep:Permissions) = rep:Permissions protected IGNORE
 
@@ -676,8 +687,8 @@
  * @since oak 1.0
  */
 [rep:Permissions]
-  - * (UNDEFINED) protected
-  - * (UNDEFINED) protected multiple
+  - * (UNDEFINED) protected IGNORE
+  - * (UNDEFINED) protected multiple IGNORE
   + * (rep:Permissions) = rep:Permissions protected IGNORE
 
 // -----------------------------------------------------------------------------



Mime
View raw message