You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2016/10/24 11:05:38 UTC
svn commit: r1766379 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/
test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/
test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/
Author: chetanm
Date: Mon Oct 24 11:05:38 2016
New Revision: 1766379
URL: http://svn.apache.org/viewvc?rev=1766379&view=rev
Log:
OAK-4975 - Setup a default Bundling config
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContent.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializerTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContentTest.java
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=1766379&r1=1766378&r2=1766379&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 Mon Oct 24 11:05:38 2016
@@ -29,6 +29,7 @@ import com.google.common.collect.Immutab
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
import org.apache.jackrabbit.oak.plugins.index.counter.NodeCounterEditorProvider;
@@ -83,7 +84,9 @@ public class InitialContent implements R
Namespaces.setupNamespaces(system);
}
-
+
+ BundlingConfigInitializer.INSTANCE.initialize(builder);
+
NodeBuilder versionStorage = builder.child(JCR_SYSTEM)
.child(JCR_VERSIONSTORAGE);
if (prePopulateVS && !isInitialized(versionStorage)) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializerTest.java?rev=1766379&r1=1766378&r2=1766379&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializerTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializerTest.java Mon Oct 24 11:05:38 2016
@@ -24,7 +24,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.junit.Test;
-import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent.INITIAL_CONTENT;
import static org.junit.Assert.*;
@@ -52,18 +51,4 @@ public class BundlingConfigInitializerTe
NodeState bundlor = NodeStateUtils.getNode(state, BundlingConfigHandler.CONFIG_PATH);
assertFalse(bundlor.exists());
}
-
- @Test
- public void noInitIfPartialExists() throws Exception{
- NodeBuilder builder = root.builder();
- builder.child(JCR_SYSTEM).child(BundlingConfigHandler.DOCUMENT_NODE_STORE);
-
- BundlingConfigInitializer.INSTANCE.initialize(builder);
- NodeState state = builder.getNodeState();
- NodeState bundlor = NodeStateUtils.getNode(state, BundlingConfigHandler.CONFIG_PATH);
- ///jcr:system/documentstore was already present then
- //no initialization should have happened
- assertFalse(bundlor.exists());
- }
-
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java?rev=1766379&r1=1766378&r2=1766379&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java Mon Oct 24 11:05:38 2016
@@ -41,6 +41,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.TestNodeObserver;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.AbstractNodeState;
@@ -85,8 +86,6 @@ public class DocumentBundlingTest {
.memoryCacheSize(0)
.getNodeStore();
NodeState registryState = BundledTypesRegistry.builder()
- .forType("nt:file", "jcr:content")
- .registry()
.forType("app:Asset")
.include("jcr:content")
.include("jcr:content/metadata")
@@ -95,8 +94,13 @@ public class DocumentBundlingTest {
.build();
NodeBuilder builder = store.getRoot().builder();
- builder.child("jcr:system").child(DOCUMENT_NODE_STORE).setChildNode(BUNDLOR, registryState);
+ new InitialContent().initialize(builder);
+ builder.getChildNode("jcr:system")
+ .getChildNode(DOCUMENT_NODE_STORE)
+ .getChildNode(BUNDLOR)
+ .setChildNode("app:Asset", registryState.getChildNode("app:Asset"));
merge(builder);
+ store.runBackgroundOperations();
}
@Test
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContentTest.java?rev=1766379&r1=1766378&r2=1766379&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContentTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/InitialContentTest.java Mon Oct 24 11:05:38 2016
@@ -21,6 +21,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Test;
+import static org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigHandler.BUNDLOR;
+import static org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigHandler.DOCUMENT_NODE_STORE;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.junit.Assert.assertTrue;
@@ -59,4 +61,11 @@ public class InitialContentTest implemen
assertTrue(vs.child(name).getChildNodeCount(Integer.MAX_VALUE) == 0xff);
}
}
+
+ @Test
+ public void bundlingConfig() throws Exception{
+ NodeState system = InitialContent.INITIAL_CONTENT.getChildNode(JCR_SYSTEM);
+ assertTrue(system.getChildNode(DOCUMENT_NODE_STORE).exists());
+ assertTrue(system.getChildNode(DOCUMENT_NODE_STORE).getChildNode(BUNDLOR).exists());
+ }
}