svn commit: r1762043 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: plugins/memory/ plugins/nodetype/write/ security/privilege/ security/user/

[tomekr]

Author: tomekr
Date: Fri Sep 23 10:15:09 2016
New Revision: 1762043

URL: http://svn.apache.org/viewvc?rev=1762043&view=rev
Log:
OAK-4847: Support any types of node builders in the initializers

-moved the comment about the squeezing to the MemoryNodeStore

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java?rev=1762043&r1=1762042&r2=1762043&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
 Fri Sep 23 10:15:09 2016
@@ -66,6 +66,7 @@ public class MemoryNodeStore implements
     private final AtomicInteger checkpointCounter = new AtomicInteger();
 
     public MemoryNodeStore(NodeState state) {
+        // squeeze node state before it is passed to store (OAK-2411)
         this.root = new 
AtomicReference<NodeState>(MemoryNodeState.wrap(state));
     }
 

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java?rev=1762043&r1=1762042&r2=1762043&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
 Fri Sep 23 10:15:09 2016
@@ -114,7 +114,6 @@ public class InitialContent implements R
                             "to decide whether traversing or using an index is 
faster.");
         }
 
-        // squeeze node state before it is passed to store (OAK-2411)
         NodeState base = builder.getNodeState();
         NodeStore store = new MemoryNodeStore(base);
         NodeTypeRegistry.registerBuiltIn(RootFactory.createSystemRoot(

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java?rev=1762043&r1=1762042&r2=1762043&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeInitializer.java
 Fri Sep 23 10:15:09 2016
@@ -53,7 +53,6 @@ class PrivilegeInitializer implements Re
             NodeBuilder privileges = system.child(REP_PRIVILEGES);
             privileges.setProperty(JcrConstants.JCR_PRIMARYTYPE, 
NT_REP_PRIVILEGES, Type.NAME);
 
-            // squeeze node state before it is passed to store (OAK-2411)
             NodeState base = builder.getNodeState();
             NodeStore store = new MemoryNodeStore(base);
             try {

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java?rev=1762043&r1=1762042&r2=1762043&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserInitializer.java
 Fri Sep 23 10:15:09 2016
@@ -89,7 +89,6 @@ class UserInitializer implements Workspa
 
     @Override
     public void initialize(NodeBuilder builder, String workspaceName) {
-        // squeeze node state before it is passed to store (OAK-2411)
         NodeState base = builder.getNodeState();
         MemoryNodeStore store = new MemoryNodeStore(base);