Author: tomekr
Date: Tue Sep 27 09:04:41 2016
New Revision: 1762413
URL: http://svn.apache.org/viewvc?rev=1762413&view=rev
Log:
OAK-4847: Support any types of node builders in the initializers
-restored the squeeze() method, use only shallow wrap in the MemoryNodeStore
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
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/MemoryNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java?rev=1762413&r1=1762412&r2=1762413&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
Tue Sep 27 09:04:41 2016
@@ -186,7 +186,7 @@ class MemoryNodeState extends AbstractNo
Map<String, NodeState> nodes = newHashMap();
for (ChildNodeEntry child : state.getChildNodeEntries()) {
- nodes.put(child.getName(), wrap(child.getNodeState()));
+ nodes.put(child.getName(), child.getNodeState());
}
return new MemoryNodeState(properties, nodes);
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=1762413&r1=1762412&r2=1762413&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
Tue Sep 27 09:04:41 2016
@@ -66,7 +66,6 @@ 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=1762413&r1=1762412&r2=1762413&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
Tue Sep 27 09:04:41 2016
@@ -114,7 +114,8 @@ public class InitialContent implements R
"to decide whether traversing or using an index is
faster.");
}
- NodeState base = builder.getNodeState();
+ // squeeze node state before it is passed to store (OAK-2411)
+ NodeState base = squeeze(builder.getNodeState());
NodeStore store = new MemoryNodeStore(base);
NodeTypeRegistry.registerBuiltIn(RootFactory.createSystemRoot(
store, new EditorHook(new CompositeEditorProvider(
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=1762413&r1=1762412&r2=1762413&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
Tue Sep 27 09:04:41 2016
@@ -34,6 +34,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static
org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.squeeze;
+
/**
* {@code RepositoryInitializer} that asserts the existence and node type of
* the /jcr:system/jcr:privileges node that is used to store privilege
definitions.
@@ -53,7 +55,8 @@ class PrivilegeInitializer implements Re
NodeBuilder privileges = system.child(REP_PRIVILEGES);
privileges.setProperty(JcrConstants.JCR_PRIMARYTYPE,
NT_REP_PRIVILEGES, Type.NAME);
- NodeState base = builder.getNodeState();
+ // squeeze node state before it is passed to store (OAK-2411)
+ NodeState base = squeeze(builder.getNodeState());
NodeStore store = new MemoryNodeStore(base);
try {
Root systemRoot = RootFactory.createSystemRoot(store, null,
null, null, null, null);
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=1762413&r1=1762412&r2=1762413&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
Tue Sep 27 09:04:41 2016
@@ -47,6 +47,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkNotNull;
+import static
org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.squeeze;
/**
* Creates initial set of users to be present in a given workspace. This
@@ -89,7 +90,8 @@ class UserInitializer implements Workspa
@Override
public void initialize(NodeBuilder builder, String workspaceName) {
- NodeState base = builder.getNodeState();
+ // squeeze node state before it is passed to store (OAK-2411)
+ NodeState base = squeeze(builder.getNodeState());
MemoryNodeStore store = new MemoryNodeStore(base);
Root root = RootFactory.createSystemRoot(store, EmptyHook.INSTANCE,
workspaceName,
