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 to...@apache.org on 2017/05/02 12:38:49 UTC
svn commit: r1793482 [2/2] - in /jackrabbit/oak/trunk: ./ oak-benchmarks/
oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/
oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/
oak-commons/src/test/java/org/apache/jackrabbit/...
Copied: jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountInfoProviderService.java (from r1793439, jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderService.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountInfoProviderService.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountInfoProviderService.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderService.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountInfoProviderService.java Tue May 2 12:38:48 2017
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import java.util.ArrayList;
import java.util.List;
Copied: jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountedNodeStore.java (from r1793439, jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MountedNodeStore.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountedNodeStore.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountedNodeStore.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MountedNodeStore.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MountedNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountedNodeStore.java Tue May 2 12:38:48 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import org.apache.jackrabbit.oak.spi.mount.Mount;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
Copied: jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProvider.java (from r1793439, jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProvider.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProvider.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProvider.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProvider.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProvider.java Tue May 2 12:38:48 2017
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import org.apache.felix.scr.annotations.*;
import org.apache.jackrabbit.oak.api.CommitFailedException;
Copied: jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/package-info.java (from r1793439, jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/package-info.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/package-info.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/package-info.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/package-info.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/package-info.java Tue May 2 12:38:48 2017
@@ -15,27 +15,27 @@
* limitations under the License.
*/
/**
- * <h1>Multiplexing support</h1>
+ * <h1>Federation support</h1>
*
- * <p>This package contains support classes for implementing a multiplexed persistence at the {@linkplain org.apache.jackrabbit.oak.spi.state.NodeStore} level.</p>
+ * <p>This package contains support classes for implementing a federated persistence at the {@linkplain org.apache.jackrabbit.oak.spi.state.NodeStore} level.</p>
*
* <h2>Design goals</h2>
* <ol>
- * <li>Transparency of the multiplexing setup. Neither the NodeStores nor the code using a multiplexed
+ * <li>Transparency of the federation setup. Neither the NodeStores nor the code using a federated
* NodeStore should be aware of the specific implementation being used.</li>
- * <li>Persistence-agnosticity. The multiplexing support should be applicable to any conformant
+ * <li>Persistence-agnosticity. The federation support should be applicable to any conformant
* NodeStore implementation.</li>
- * <li>Negligible performance impact. Multiplexing should not add a significat performance overhead.</li>
+ * <li>Negligible performance impact. Federation should not add a significat performance overhead.</li>
* </ol>
*
* <h2>Implementation</h2>
*
- * <p>The main entry point is the {@link org.apache.jackrabbit.oak.plugins.multiplex.MultiplexingNodeStore},
- * which wraps one or more NodeStore instances. Also of interest are the {@link org.apache.jackrabbit.oak.plugins.multiplex.MultiplexingNodeState} and {@link org.apache.jackrabbit.oak.plugins.multiplex.MultiplexingNodeBuilder}.
+ * <p>The main entry point is the {@link org.apache.jackrabbit.oak.federated.FederatedNodeStore},
+ * which wraps one or more NodeStore instances. Also of interest are the {@link org.apache.jackrabbit.oak.federated.FederatedNodeState} and {@link org.apache.jackrabbit.oak.federated.FederatedNodeBuilder}.
*
* <p>These classes maintain internal mappings of the 'native' objects. For instance, if the
- * multiplexing NodeStore holds two MemoryNodeStore instances, then a call to {@linkplain org.apache.jackrabbit.oak.spi.state.NodeStore#getRoot()}
- * will return a multiplexing NodeState backed by two MemoryNodeState instances. Similarly, a call to {@linkplain org.apache.jackrabbit.oak.spi.state.NodeState#builder()} will return a multiplexing
+ * federated NodeStore holds two MemoryNodeStore instances, then a call to {@linkplain org.apache.jackrabbit.oak.spi.state.NodeStore#getRoot()}
+ * will return a federated NodeState backed by two MemoryNodeState instances. Similarly, a call to {@linkplain org.apache.jackrabbit.oak.spi.state.NodeState#builder()} will return a federated
* NodeBuilder backed by two MemoryNodeState instances.
*
* <p>Using this approach allows us to always keep related NodeStore, NodeState and NodeBuilder
@@ -53,7 +53,7 @@
*
* <p>The current implementation naively queries all stores whenever the child node list is prepared.
* This is obviously correct but may be slow.
- * {@link org.apache.jackrabbit.oak.plugins.multiplex.MultiplexingContext#getContributingStores(java.lang.String, com.google.common.base.Function)}
+ * {@link org.apache.jackrabbit.oak.federated.FederationContext#getContributingStores(java.lang.String, com.google.common.base.Function)}
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
Copied: jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedChildrenCountTest.java (from r1793439, jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingChildrenCountTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedChildrenCountTest.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedChildrenCountTest.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingChildrenCountTest.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingChildrenCountTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedChildrenCountTest.java Tue May 2 12:38:48 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
@@ -52,15 +52,15 @@ import static java.util.Collections.empt
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.junit.Assert.assertEquals;
-public class MultiplexingChildrenCountTest {
+public class FederatedChildrenCountTest {
@Test
public void singleContributingStore() {
MountInfoProvider mip = Mounts.newBuilder().build();
NodeStore globalStore = new MemoryNodeStore();
- MultiplexingNodeStore multiplexingNodeStore = new MultiplexingNodeStore.Builder(mip, globalStore).build();
+ FederatedNodeStore federatedNodeStore = new FederatedNodeStore.Builder(mip, globalStore).build();
- MultiplexingNodeStateBuilder b = new MultiplexingNodeStateBuilder(multiplexingNodeStore.ctx);
+ FederatedNodeStoreBuilder b = new FederatedNodeStoreBuilder(federatedNodeStore.ctx);
b.configureMount("/", MAX_VALUE);
assertEquals(MAX_VALUE, b.getNodeState().getChildNodeCount(123));
@@ -76,13 +76,13 @@ public class MultiplexingChildrenCountTe
List<MountedNodeStore> mounts = Lists.newArrayList();
mounts.add(new MountedNodeStore(mip.getMountByName("libs"), libsStore));
- MultiplexingNodeStore multiplexingNodeStore = new MultiplexingNodeStore(mip, globalStore, mounts);
+ FederatedNodeStore federatedNodeStore = new FederatedNodeStore(mip, globalStore, mounts);
- MultiplexingNodeStateBuilder b = new MultiplexingNodeStateBuilder(multiplexingNodeStore.ctx);
+ FederatedNodeStoreBuilder b = new FederatedNodeStoreBuilder(federatedNodeStore.ctx);
TestingNodeState globalTestingNS = b.configureMount("/", 5);
TestingNodeState libsTestingNS = b.configureMount("/libs", "libs", "libs1", "libs2");
- MultiplexingNodeState mns = b.getNodeState();
+ FederatedNodeState mns = b.getNodeState();
assertEquals(8, mns.getChildNodeCount(9));
assertEquals(5, globalTestingNS.fetchedChildren);
@@ -127,13 +127,13 @@ public class MultiplexingChildrenCountTe
List<MountedNodeStore> mounts = Lists.newArrayList();
mounts.add(new MountedNodeStore(mip.getMountByName("libs"), libsStore));
- MultiplexingNodeStore multiplexingNodeStore = new MultiplexingNodeStore(mip, globalStore, mounts);
+ FederatedNodeStore federatedNodeStore = new FederatedNodeStore(mip, globalStore, mounts);
- MultiplexingNodeStateBuilder b = new MultiplexingNodeStateBuilder(multiplexingNodeStore.ctx);
+ FederatedNodeStoreBuilder b = new FederatedNodeStoreBuilder(federatedNodeStore.ctx);
TestingNodeState globalTestingNS = b.configureMount("/", 5);
TestingNodeState libsTestingNS = b.configureMount("/libs", MAX_VALUE);
- MultiplexingNodeState mns = b.getNodeState();
+ FederatedNodeState mns = b.getNodeState();
assertEquals(MAX_VALUE, mns.getChildNodeCount(100));
assertEquals(5, globalTestingNS.fetchedChildren);
@@ -146,13 +146,13 @@ public class MultiplexingChildrenCountTe
assertEquals(0, libsTestingNS.fetchedChildren);
}
- private static class MultiplexingNodeStateBuilder {
+ private static class FederatedNodeStoreBuilder {
private final Map<MountedNodeStore, NodeState> rootStates = newHashMap();
- private final MultiplexingContext ctx;
+ private final FederationContext ctx;
- public MultiplexingNodeStateBuilder(MultiplexingContext ctx) {
+ public FederatedNodeStoreBuilder(FederationContext ctx) {
this.ctx = ctx;
}
@@ -168,11 +168,11 @@ public class MultiplexingChildrenCountTe
return nodeState;
}
- public MultiplexingNodeState getNodeState() {
- return new MultiplexingNodeState("/", rootStates, ctx);
+ public FederatedNodeState getNodeState() {
+ return new FederatedNodeState("/", rootStates, ctx);
}
- public MultiplexingNodeStateBuilder clear() {
+ public FederatedNodeStoreBuilder clear() {
rootStates.clear();
return this;
}
Copied: jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedCompareTest.java (from r1793439, jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingCompareTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedCompareTest.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedCompareTest.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingCompareTest.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingCompareTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedCompareTest.java Tue May 2 12:38:48 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
@@ -42,7 +42,7 @@ import static com.google.common.collect.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class MultiplexingCompareTest {
+public class FederatedCompareTest {
@Test
public void reportedNodesAreWrapped() {
@@ -51,11 +51,11 @@ public class MultiplexingCompareTest {
MountInfoProvider mip = mipBuilder.build();
NodeStore globalStore = new MemoryNodeStore();
- MultiplexingNodeStore.Builder nsBuilder = new MultiplexingNodeStore.Builder(mip, globalStore);
+ FederatedNodeStore.Builder nsBuilder = new FederatedNodeStore.Builder(mip, globalStore);
nsBuilder.addMount("libs", new MemoryNodeStore());
- MultiplexingNodeStore multiplexingNodeStore = nsBuilder.build();
+ FederatedNodeStore federatedNodeStore = nsBuilder.build();
- NodeBuilder builder = multiplexingNodeStore.getRoot().builder();
+ NodeBuilder builder = federatedNodeStore.getRoot().builder();
builder.child("changed");
builder.child("deleted");
NodeState base = builder.getNodeState();
@@ -69,7 +69,7 @@ public class MultiplexingCompareTest {
modified.compareAgainstBaseState(base, new DefaultNodeStateDiff() {
@Override
public boolean childNodeAdded(String name, NodeState after) {
- assertTrue(after instanceof MultiplexingNodeState);
+ assertTrue(after instanceof FederatedNodeState);
assertEquals(name, "added");
modifiedNodes.add(name);
return true;
@@ -77,8 +77,8 @@ public class MultiplexingCompareTest {
@Override
public boolean childNodeChanged(String name, NodeState before, NodeState after) {
- assertTrue(before instanceof MultiplexingNodeState);
- assertTrue(after instanceof MultiplexingNodeState);
+ assertTrue(before instanceof FederatedNodeState);
+ assertTrue(after instanceof FederatedNodeState);
assertEquals(name, "changed");
modifiedNodes.add(name);
return true;
@@ -86,7 +86,7 @@ public class MultiplexingCompareTest {
@Override
public boolean childNodeDeleted(String name, NodeState before) {
- assertTrue(before instanceof MultiplexingNodeState);
+ assertTrue(before instanceof FederatedNodeState);
assertEquals(name, "deleted");
modifiedNodes.add(name);
return true;
@@ -103,9 +103,9 @@ public class MultiplexingCompareTest {
List<MountedNodeStore> mounts = Lists.newArrayList();
mounts.add(new MountedNodeStore(mip.getMountByName("libs"), libsStore));
- MultiplexingNodeStore multiplexingNodeStore = new MultiplexingNodeStore(mip, globalStore, mounts);
+ FederatedNodeStore federatedNodeStore = new FederatedNodeStore(mip, globalStore, mounts);
- NodeState empty = multiplexingNodeStore.getRoot();
+ NodeState empty = federatedNodeStore.getRoot();
NodeBuilder builder = globalStore.getRoot().builder();
builder.setProperty("global-prop-1", "val");
@@ -117,7 +117,7 @@ public class MultiplexingCompareTest {
libsBuilder.setProperty("libs-prop-2", "val");
libsStore.merge(libsBuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- NodeState modified = multiplexingNodeStore.getRoot();
+ NodeState modified = federatedNodeStore.getRoot();
final Set<String> addedProperties = newHashSet();
modified.compareAgainstBaseState(empty, new DefaultNodeStateDiff() {
@@ -138,9 +138,9 @@ public class MultiplexingCompareTest {
List<MountedNodeStore> mounts = Lists.newArrayList();
mounts.add(new MountedNodeStore(mip.getMountByName("libs"), libsStore));
- MultiplexingNodeStore multiplexingNodeStore = new MultiplexingNodeStore(mip, globalStore, mounts);
+ FederatedNodeStore federatedNodeStore = new FederatedNodeStore(mip, globalStore, mounts);
- NodeState empty = multiplexingNodeStore.getRoot();
+ NodeState empty = federatedNodeStore.getRoot();
NodeBuilder builder = globalStore.getRoot().builder();
builder.child("global-child-1");
@@ -153,7 +153,7 @@ public class MultiplexingCompareTest {
libsBuilder.child("libs-child-2");
libsStore.merge(libsBuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- NodeState modified = multiplexingNodeStore.getRoot();
+ NodeState modified = federatedNodeStore.getRoot();
final Set<String> addedChildren = newHashSet();
modified.compareAgainstBaseState(empty, new DefaultNodeStateDiff() {
Copied: jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiffTest.java (from r1793439, jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/ModifiedPathDiffTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiffTest.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiffTest.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/ModifiedPathDiffTest.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/ModifiedPathDiffTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiffTest.java Tue May 2 12:38:48 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
@@ -27,7 +27,6 @@ import org.junit.Test;
import java.util.Set;
import static com.google.common.collect.Sets.newHashSet;
-import static org.apache.jackrabbit.oak.plugins.multiplex.ModifiedPathDiff.getModifiedPaths;
import static org.junit.Assert.assertEquals;
public class ModifiedPathDiffTest {
@@ -48,7 +47,7 @@ public class ModifiedPathDiffTest {
NodeBuilder builder = base.builder();
builder.getChildNode("a").child("xyz");
builder.getChildNode("c").getChildNode("d").child("abc");
- Set<String> paths = getModifiedPaths(base, builder.getNodeState());
+ Set<String> paths = ModifiedPathDiff.getModifiedPaths(base, builder.getNodeState());
assertEquals(newHashSet("/a/xyz", "/c/d/abc"), paths);
}
@@ -57,7 +56,7 @@ public class ModifiedPathDiffTest {
NodeBuilder builder = base.builder();
builder.getChildNode("a").remove();
builder.getChildNode("c").getChildNode("d").remove();
- Set<String> paths = getModifiedPaths(base, builder.getNodeState());
+ Set<String> paths = ModifiedPathDiff.getModifiedPaths(base, builder.getNodeState());
assertEquals(newHashSet("/a", "/c/d"), paths);
}
@@ -66,7 +65,7 @@ public class ModifiedPathDiffTest {
NodeBuilder builder = base.builder();
builder.getChildNode("a").setProperty("x", 1l, Type.LONG);
builder.getChildNode("c").getChildNode("d").setProperty("x", 1l, Type.LONG);
- Set<String> paths = getModifiedPaths(base, builder.getNodeState());
+ Set<String> paths = ModifiedPathDiff.getModifiedPaths(base, builder.getNodeState());
assertEquals(newHashSet("/a", "/c/d"), paths);
}
}
Copied: jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java (from r1793439, jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderServiceTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderServiceTest.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderServiceTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java Tue May 2 12:38:48 2017
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import java.util.Collections;
Modified: jackrabbit/oak/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1793482&r1=1793481&r2=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Tue May 2 12:38:48 2017
@@ -41,6 +41,7 @@
<module>oak-api</module>
<module>oak-core-spi</module>
<module>oak-store-spi</module>
+ <module>oak-store-federated</module>
<module>oak-blob-plugins</module>
<module>oak-blob</module>
@@ -50,7 +51,6 @@
<module>oak-jcr</module>
<module>oak-upgrade</module>
- <module>oak-multiplex</module>
<module>oak-http</module>
<module>oak-lucene</module>
<module>oak-solr-core</module>