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 fr...@apache.org on 2016/01/21 19:21:57 UTC
svn commit: r1726048 - in /jackrabbit/oak/trunk: ./ oak-core/
oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/
oak-core/src/main/java/org/apache/jackrabbit/oak/management/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/backup/ oak-co...
Author: frm
Date: Thu Jan 21 18:21:56 2016
New Revision: 1726048
URL: http://svn.apache.org/viewvc?rev=1726048&view=rev
Log:
OAK-3537 - Move the Segment Store into its own bundle
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java
- copied, changed from r1725891, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestoreMBean.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java (with props)
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java
- copied, changed from r1725891, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java
jackrabbit/oak/trunk/oak-segment/ (with props)
jackrabbit/oak/trunk/oak-segment/pom.xml (with props)
jackrabbit/oak/trunk/oak-segment/src/
jackrabbit/oak/trunk/oak-segment/src/main/
jackrabbit/oak/trunk/oak-segment/src/main/java/
jackrabbit/oak/trunk/oak-segment/src/main/java/org/
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/
- copied from r1725891, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/backup/
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/
- copied from r1726046, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/
jackrabbit/oak/trunk/oak-segment/src/main/resources/
jackrabbit/oak/trunk/oak-segment/src/test/
jackrabbit/oak/trunk/oak-segment/src/test/java/
jackrabbit/oak/trunk/oak-segment/src/test/java/org/
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/backup/
- copied from r1725891, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/backup/
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/
- copied from r1725891, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java (with props)
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java
- copied, changed from r1725891, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/SegmentFixture.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/DepthFirstNodeIteratorTest.java
- copied unchanged from r1725891, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/DepthFirstNodeIteratorTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/ExternalToExternalMigrationTest.java
- copied unchanged from r1725891, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/ExternalToExternalMigrationTest.java
jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/migration/SegmentToExternalMigrationTest.java
- copied unchanged from r1725891, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/SegmentToExternalMigrationTest.java
jackrabbit/oak/trunk/oak-segment/src/test/resources/
jackrabbit/oak/trunk/oak-segment/src/test/resources/aws.properties
- copied unchanged from r1725891, jackrabbit/oak/trunk/oak-core/src/test/resources/aws.properties
jackrabbit/oak/trunk/oak-segment/src/test/resources/logback-test.xml
- copied unchanged from r1725891, jackrabbit/oak/trunk/oak-core/src/test/resources/logback-test.xml
jackrabbit/oak/trunk/oak-segment/src/test/resources/logging.properties
- copied unchanged from r1725891, jackrabbit/oak/trunk/oak-core/src/test/resources/logging.properties
jackrabbit/oak/trunk/oak-segment/src/test/resources/org/
jackrabbit/oak/trunk/oak-segment/src/test/resources/org/apache/
jackrabbit/oak/trunk/oak-segment/src/test/resources/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-segment/src/test/resources/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-segment/src/test/resources/org/apache/jackrabbit/oak/plugins/
jackrabbit/oak/trunk/oak-segment/src/test/resources/org/apache/jackrabbit/oak/plugins/segment/
- copied from r1725891, jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/plugins/segment/
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/backup/
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/SegmentFixture.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/backup/
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/DepthFirstNodeIteratorTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/ExternalToExternalMigrationTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/migration/SegmentToExternalMigrationTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/
jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/plugins/
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestoreMBean.java
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/NodeStoreFixture.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/InitializerTest.java
jackrabbit/oak/trunk/oak-http/pom.xml
jackrabbit/oak/trunk/oak-it-osgi/pom.xml
jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml
jackrabbit/oak/trunk/oak-it/pom.xml
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/ManyChildrenTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java
jackrabbit/oak/trunk/oak-remote/pom.xml
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestore.java
jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml
jackrabbit/oak/trunk/oak-upgrade/pom.xml
jackrabbit/oak/trunk/pom.xml
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Thu Jan 21 18:21:56 2016
@@ -42,6 +42,7 @@
org.apache.jackrabbit.oak,
org.apache.jackrabbit.oak.api,
org.apache.jackrabbit.oak.api.jmx,
+ org.apache.jackrabbit.oak.cache,
org.apache.jackrabbit.oak.stats,
org.apache.jackrabbit.oak.json,
org.apache.jackrabbit.oak.management,
@@ -49,7 +50,8 @@
org.apache.jackrabbit.oak.namepath,
org.apache.jackrabbit.oak.osgi,
org.apache.jackrabbit.oak.plugins.atomic,
- org.apache.jackrabbit.oak.plugins.backup,
+ org.apache.jackrabbit.oak.plugins.blob,
+ org.apache.jackrabbit.oak.plugins.blob.datastore,
org.apache.jackrabbit.oak.plugins.commit,
org.apache.jackrabbit.oak.plugins.identifier,
org.apache.jackrabbit.oak.plugins.index,
@@ -68,9 +70,6 @@
org.apache.jackrabbit.oak.plugins.nodetype.write,
org.apache.jackrabbit.oak.plugins.observation,
org.apache.jackrabbit.oak.plugins.observation.filter,
- org.apache.jackrabbit.oak.plugins.segment,
- org.apache.jackrabbit.oak.plugins.segment.http,
- org.apache.jackrabbit.oak.plugins.segment.file,
org.apache.jackrabbit.oak.plugins.tree,
org.apache.jackrabbit.oak.plugins.value,
org.apache.jackrabbit.oak.plugins.version,
@@ -94,10 +93,12 @@
org.apache.jackrabbit.oak.spi.state,
org.apache.jackrabbit.oak.spi.whiteboard,
org.apache.jackrabbit.oak.spi.xml,
+ org.apache.jackrabbit.oak.stats,
org.apache.jackrabbit.oak.query,
org.apache.jackrabbit.oak.query.fulltext,
org.apache.jackrabbit.oak.query.facet,
- org.apache.jackrabbit.oak.security
+ org.apache.jackrabbit.oak.security,
+ org.apache.jackrabbit.oak.util,
</Export-Package>
<Jaas-ModuleClass>
org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule,
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java (from r1725891, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestoreMBean.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestoreMBean.java&r1=1725891&r2=1726048&rev=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestoreMBean.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/FileStoreBackupRestoreMBean.java Thu Jan 21 18:21:56 2016
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.backup;
+package org.apache.jackrabbit.oak.api.jmx;
import javax.annotation.Nonnull;
import javax.management.openmbean.CompositeData;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java Thu Jan 21 18:21:56 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("3.0.0")
+@Version("3.1.0")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.api.jmx;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java Thu Jan 21 18:21:56 2016
@@ -35,10 +35,10 @@ import javax.management.openmbean.Compos
import javax.management.openmbean.TabularData;
import com.google.common.base.Function;
+import org.apache.jackrabbit.oak.api.jmx.FileStoreBackupRestoreMBean;
import org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean;
import org.apache.jackrabbit.oak.api.jmx.SessionMBean;
import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
-import org.apache.jackrabbit.oak.plugins.backup.FileStoreBackupRestoreMBean;
import org.apache.jackrabbit.oak.plugins.blob.BlobGCMBean;
import org.apache.jackrabbit.oak.plugins.index.property.jmx.PropertyIndexAsyncReindexMBean;
import org.apache.jackrabbit.oak.spi.state.RevisionGCMBean;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/NodeStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/NodeStoreFixture.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/NodeStoreFixture.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/NodeStoreFixture.java Thu Jan 21 18:21:56 2016
@@ -32,14 +32,6 @@ import org.apache.jackrabbit.oak.spi.sta
*/
public abstract class NodeStoreFixture {
- public static final NodeStoreFixture MEMORY_NS = new MemoryFixture();
-
- public static final NodeStoreFixture SEGMENT_MK = new SegmentFixture();
-
- public static final NodeStoreFixture DOCUMENT_NS = new DocumentMongoFixture();
-
- public static final NodeStoreFixture DOCUMENT_RDB = new DocumentRdbFixture();
-
/**
* Creates a new empty {@link NodeStore} instance. An implementation must
* ensure the returned node store is indeed empty and is independent from
@@ -66,27 +58,4 @@ public abstract class NodeStoreFixture {
return true;
}
- public static Collection<Object[]> asJunitParameters(Set<Fixture> fixtures) {
- List<NodeStoreFixture> configuredFixtures = new ArrayList<NodeStoreFixture>();
- if (fixtures.contains(Fixture.DOCUMENT_NS)) {
- configuredFixtures.add(DOCUMENT_NS);
- }
- if (fixtures.contains(Fixture.SEGMENT_MK)) {
- configuredFixtures.add(SEGMENT_MK);
- }
- if (fixtures.contains(Fixture.MEMORY_NS)) {
- configuredFixtures.add(MEMORY_NS);
- }
- if (fixtures.contains(Fixture.DOCUMENT_RDB)) {
- configuredFixtures.add(DOCUMENT_RDB);
- }
-
- Collection<Object[]> result = new ArrayList<Object[]>();
- for (NodeStoreFixture f : configuredFixtures) {
- if (f.isAvailable()) {
- result.add(new Object[]{f});
- }
- }
- return result;
- }
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorTest.java Thu Jan 21 18:21:56 2016
@@ -50,10 +50,14 @@ import java.util.concurrent.TimeoutExcep
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import com.amazonaws.services.sqs.model.UnsupportedOperationException;
+import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.plugins.memory.LongPropertyState;
+import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -70,11 +74,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.amazonaws.services.sqs.model.UnsupportedOperationException;
-import com.google.common.base.Supplier;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
public class AtomicCounterEditorTest {
/**
* convenience class to ease construction during tests
@@ -328,7 +327,7 @@ public class AtomicCounterEditorTest {
@Test
public void singleNodeAsync() throws CommitFailedException, InterruptedException, ExecutionException {
- NodeStore store = NodeStoreFixture.MEMORY_NS.createNodeStore();
+ NodeStore store = new MemoryNodeStore();
MyExecutor exec1 = new MyExecutor();
Whiteboard board = new DefaultWhiteboard();
EditorHook hook1 = new EditorHook(new TestableACEProvider(CLUSTER_1, exec1, store, board));
@@ -370,7 +369,7 @@ public class AtomicCounterEditorTest {
@Test
public void noHookInWhiteboard() throws CommitFailedException, InterruptedException, ExecutionException {
- NodeStore store = NodeStoreFixture.MEMORY_NS.createNodeStore();
+ NodeStore store = new MemoryNodeStore();
MyExecutor exec1 = new MyExecutor();
Whiteboard board = new DefaultWhiteboard();
EditorHook hook1 = new EditorHook(new TestableACEProvider(CLUSTER_1, exec1, store, board));
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/InitializerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/InitializerTest.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/InitializerTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/InitializerTest.java Thu Jan 21 18:21:56 2016
@@ -16,21 +16,15 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import java.io.IOException;
-
import com.google.common.collect.ImmutableMap;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
-import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.Test;
public class InitializerTest extends AbstractMongoConnectionTest {
@@ -41,25 +35,6 @@ public class InitializerTest extends Abs
new InitialContent().initialize(builder);
SecurityProviderImpl provider = new SecurityProviderImpl(
- ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME,
- ConfigurationParameters.of(ImmutableMap.of("anonymousId", "anonymous",
- "adminId", "admin",
- "usersPath", "/home/users",
- "groupsPath", "/home/groups",
- "defaultDepth", "1")))));
- provider.getConfiguration(UserConfiguration.class).getWorkspaceInitializer().initialize(
- builder, "default");
- builder.getNodeState();
- }
-
- @Test
- public void testInitializerSegment() throws CommitFailedException, IOException {
- NodeStore store = new SegmentNodeStore(new MemoryStore());
-
- NodeBuilder builder = store.getRoot().builder();
- new InitialContent().initialize(builder);
-
- SecurityProviderImpl provider = new SecurityProviderImpl(
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME,
ConfigurationParameters.of(ImmutableMap.of("anonymousId", "anonymous",
"adminId", "admin",
Modified: jackrabbit/oak/trunk/oak-http/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-http/pom.xml?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-http/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-http/pom.xml Thu Jan 21 18:21:56 2016
@@ -66,6 +66,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>1.1</version>
Modified: jackrabbit/oak/trunk/oak-it-osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/pom.xml?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it-osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it-osgi/pom.xml Thu Jan 21 18:21:56 2016
@@ -83,6 +83,12 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jcr</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified: jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml (original)
+++ jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml Thu Jan 21 18:21:56 2016
@@ -36,6 +36,7 @@
<include>org.apache.jackrabbit:jackrabbit-jcr-commons</include>
<include>org.apache.jackrabbit:oak-commons</include>
<include>org.apache.jackrabbit:oak-core</include>
+ <include>org.apache.jackrabbit:oak-segment</include>
<include>org.apache.jackrabbit:oak-jcr</include>
<include>org.apache.jackrabbit:oak-lucene</include>
<include>org.apache.tika:tika-core</include>
Modified: jackrabbit/oak/trunk/oak-it/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/pom.xml?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/pom.xml Thu Jan 21 18:21:56 2016
@@ -55,6 +55,12 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -62,6 +68,13 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-commons</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -89,5 +102,22 @@
<optional>true</optional>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>7.0.64</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Added: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java?rev=1726048&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java (added)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java Thu Jan 21 18:21:56 2016
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jackrabbit.oak;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.jackrabbit.oak.commons.FixturesHelper;
+import org.apache.jackrabbit.oak.fixture.DocumentMongoFixture;
+import org.apache.jackrabbit.oak.fixture.DocumentRdbFixture;
+import org.apache.jackrabbit.oak.fixture.MemoryFixture;
+import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
+import org.apache.jackrabbit.oak.plugins.segment.fixture.SegmentFixture;
+
+public class NodeStoreFixtures {
+
+ public static final NodeStoreFixture MEMORY_NS = new MemoryFixture();
+
+ public static final NodeStoreFixture SEGMENT_MK = new SegmentFixture();
+
+ public static final NodeStoreFixture DOCUMENT_NS = new DocumentMongoFixture();
+
+ public static final NodeStoreFixture DOCUMENT_RDB = new DocumentRdbFixture();
+
+ public static Collection<Object[]> asJunitParameters(Set<FixturesHelper.Fixture> fixtures) {
+ List<NodeStoreFixture> configuredFixtures = new ArrayList<NodeStoreFixture>();
+ if (fixtures.contains(FixturesHelper.Fixture.DOCUMENT_NS)) {
+ configuredFixtures.add(DOCUMENT_NS);
+ }
+ if (fixtures.contains(FixturesHelper.Fixture.SEGMENT_MK)) {
+ configuredFixtures.add(SEGMENT_MK);
+ }
+ if (fixtures.contains(FixturesHelper.Fixture.MEMORY_NS)) {
+ configuredFixtures.add(MEMORY_NS);
+ }
+ if (fixtures.contains(FixturesHelper.Fixture.DOCUMENT_RDB)) {
+ configuredFixtures.add(DOCUMENT_RDB);
+ }
+
+ Collection<Object[]> result = new ArrayList<Object[]>();
+ for (NodeStoreFixture f : configuredFixtures) {
+ if (f.isAvailable()) {
+ result.add(new Object[]{f});
+ }
+ }
+ return result;
+ }
+
+}
Propchange: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java Thu Jan 21 18:21:56 2016
@@ -42,7 +42,7 @@ public abstract class OakBaseTest {
@Parameterized.Parameters(name="{0}")
public static Collection<Object[]> fixtures() {
- return NodeStoreFixture.asJunitParameters(FIXTURES);
+ return NodeStoreFixtures.asJunitParameters(FIXTURES);
}
protected final NodeStoreFixture fixture;
Copied: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java (from r1725891, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java&r1=1725891&r2=1726048&rev=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java Thu Jan 21 18:21:56 2016
@@ -31,6 +31,7 @@ import java.util.EnumSet;
import java.util.Iterator;
import java.util.Random;
+import org.apache.jackrabbit.oak.NodeStoreFixtures;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
@@ -60,7 +61,7 @@ public class RootFuzzIT {
@Parameters
public static Collection<Object[]> fixtures() {
- return NodeStoreFixture.asJunitParameters(EnumSet.of(Fixture.DOCUMENT_NS, Fixture.SEGMENT_MK));
+ return NodeStoreFixtures.asJunitParameters(EnumSet.of(Fixture.DOCUMENT_NS, Fixture.SEGMENT_MK));
}
private static final int OP_COUNT = 5000;
Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java Thu Jan 21 18:21:56 2016
@@ -39,6 +39,7 @@ import java.util.concurrent.atomic.Atomi
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.apache.jackrabbit.oak.NodeStoreFixtures;
import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -100,8 +101,8 @@ public class NodeStoreTest extends OakBa
@Test
public void addExistingNode() throws CommitFailedException {
// FIXME OAK-1550 Incorrect handling of addExistingNode conflict in NodeStore
- assumeTrue(fixture != NodeStoreFixture.DOCUMENT_NS);
- assumeTrue(fixture != NodeStoreFixture.DOCUMENT_RDB);
+ assumeTrue(fixture != NodeStoreFixtures.DOCUMENT_NS);
+ assumeTrue(fixture != NodeStoreFixtures.DOCUMENT_RDB);
CommitHook hook = new CompositeHook(
new ConflictHook(JcrConflictHandler.createJcrConflictHandler()),
@@ -449,7 +450,7 @@ public class NodeStoreTest extends OakBa
public void moveToDescendant() {
NodeBuilder test = store.getRoot().builder().getChildNode("test");
NodeBuilder x = test.getChildNode("x");
- if (fixture == NodeStoreFixture.SEGMENT_MK || fixture == NodeStoreFixture.MEMORY_NS) {
+ if (fixture == NodeStoreFixtures.SEGMENT_MK || fixture == NodeStoreFixtures.MEMORY_NS) {
assertTrue(x.moveTo(x, "xx"));
assertFalse(x.exists());
assertFalse(test.hasChildNode("x"));
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Thu Jan 21 18:21:56 2016
@@ -229,6 +229,11 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
@@ -245,6 +250,20 @@
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-it</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java Thu Jan 21 18:21:56 2016
@@ -28,6 +28,7 @@ import javax.jcr.security.Privilege;
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
+import org.apache.jackrabbit.oak.NodeStoreFixtures;
import org.apache.jackrabbit.oak.commons.FixturesHelper;
import org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
@@ -70,7 +71,7 @@ public abstract class AbstractRepository
@Parameterized.Parameters(name="{0}")
public static Collection<Object[]> fixtures() {
- return NodeStoreFixture.asJunitParameters(FIXTURES);
+ return NodeStoreFixtures.asJunitParameters(FIXTURES);
}
@After
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AtomicCounterIT.java Thu Jan 21 18:21:56 2016
@@ -35,16 +35,16 @@ import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFutureTask;
+import org.apache.jackrabbit.oak.NodeStoreFixtures;
import org.apache.jackrabbit.oak.commons.FixturesHelper;
import org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFutureTask;
-
public class AtomicCounterIT extends AbstractRepositoryTest {
private static final Set<Fixture> FIXTURES = FixturesHelper.getFixtures();
@@ -61,7 +61,7 @@ public class AtomicCounterIT extends Abs
public void concurrentSegmentIncrements() throws RepositoryException, InterruptedException,
ExecutionException {
// ensuring the run only on allowed fix
- assumeTrue(NodeStoreFixture.SEGMENT_MK.equals(fixture));
+ assumeTrue(NodeStoreFixtures.SEGMENT_MK.equals(fixture));
// setting-up
Session session = getAdminSession();
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java Thu Jan 21 18:21:56 2016
@@ -63,11 +63,11 @@ import org.apache.commons.math3.exceptio
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.apache.jackrabbit.oak.fixture.DocumentMongoFixture;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
-import org.apache.jackrabbit.oak.fixture.SegmentFixture;
import org.apache.jackrabbit.oak.jcr.session.RefreshStrategy;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.fixture.SegmentFixture;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.After;
import org.junit.Before;
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java Thu Jan 21 18:21:56 2016
@@ -42,11 +42,11 @@ import org.apache.jackrabbit.commons.jac
import org.apache.jackrabbit.core.data.RandomInputStream;
import org.apache.jackrabbit.oak.fixture.DocumentMongoFixture;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
-import org.apache.jackrabbit.oak.fixture.SegmentFixture;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.OakFileDataStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.fixture.SegmentFixture;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.FileBlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.java Thu Jan 21 18:21:56 2016
@@ -22,6 +22,7 @@ import javax.jcr.Property;
import javax.jcr.Repository;
import org.apache.jackrabbit.api.JackrabbitRepository;
+import org.apache.jackrabbit.oak.NodeStoreFixtures;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.test.AbstractJCRTest;
@@ -117,7 +118,7 @@ public class SameNamePropertyNodeTest ex
*/
@Test
public void testNodeStoreSupport() throws Exception {
- NodeStore nodeStore = NodeStoreFixture.SEGMENT_MK.createNodeStore();
+ NodeStore nodeStore = NodeStoreFixtures.SEGMENT_MK.createNodeStore();
JackrabbitRepository repository = (JackrabbitRepository) new Jcr(nodeStore).createRepository();
try {
assertTrue(repository.getDescriptorValue(Repository.OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED).getBoolean());
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java Thu Jan 21 18:21:56 2016
@@ -26,6 +26,7 @@ import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import junit.framework.Assert;
+import org.apache.jackrabbit.oak.NodeStoreFixtures;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
@@ -44,7 +45,7 @@ public class AbstractClusterTest {
protected Session s1, s2;
protected NodeStoreFixture getFixture() {
- return NodeStoreFixture.DOCUMENT_NS;
+ return NodeStoreFixtures.DOCUMENT_NS;
}
@After
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/ManyChildrenTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/ManyChildrenTest.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/ManyChildrenTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/ManyChildrenTest.java Thu Jan 21 18:21:56 2016
@@ -25,6 +25,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
+import org.apache.jackrabbit.oak.NodeStoreFixtures;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
@@ -39,7 +40,7 @@ import org.junit.Test;
*/
public class ManyChildrenTest {
- NodeStoreFixture fixture = NodeStoreFixture.DOCUMENT_NS;
+ NodeStoreFixture fixture = NodeStoreFixtures.DOCUMENT_NS;
// NodeStoreFixture fixture = NodeStoreFixture.SEGMENT_MK;
Repository repository;
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java Thu Jan 21 18:21:56 2016
@@ -31,6 +31,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
+import org.apache.jackrabbit.oak.NodeStoreFixtures;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
@@ -83,7 +84,7 @@ public class RandomOpCompare {
// @Before
public void login() throws RepositoryException {
- f1 = NodeStoreFixture.SEGMENT_MK;
+ f1 = NodeStoreFixtures.SEGMENT_MK;
f2 = getMongo();
ns1 = f1.createNodeStore();
Modified: jackrabbit/oak/trunk/oak-remote/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/pom.xml?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-remote/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-remote/pom.xml Thu Jan 21 18:21:56 2016
@@ -84,6 +84,13 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>${jackrabbit.version}</version>
<scope>provided</scope>
Propchange: jackrabbit/oak/trunk/oak-segment/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 21 18:21:56 2016
@@ -0,0 +1,6 @@
+target
+.*
+*.iml
+*.ipr
+*.iws
+
Added: jackrabbit/oak/trunk/oak-segment/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/pom.xml?rev=1726048&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/pom.xml (added)
+++ jackrabbit/oak/trunk/oak-segment/pom.xml Thu Jan 21 18:21:56 2016
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-parent</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../oak-parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>oak-segment</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Oak Segment</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.jackrabbit.oak.plugins.backup,
+ org.apache.jackrabbit.oak.plugins.segment,
+ org.apache.jackrabbit.oak.plugins.segment.http,
+ org.apache.jackrabbit.oak.plugins.segment.file,
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <!-- Dependencies on Oak modules -->
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-commons</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-blob</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-blob-cloud</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Dependencies on Jackrabbit modules -->
+
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>${jackrabbit.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-api</artifactId>
+ <version>${jackrabbit.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-data</artifactId>
+ <version>${jackrabbit.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Other dependencies -->
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bndlib</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Dependencies on Oak testing modules -->
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-commons</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Testing dependencies -->
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Propchange: jackrabbit/oak/trunk/oak-segment/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestore.java?rev=1726048&r1=1725891&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestore.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/backup/FileStoreBackupRestore.java Thu Jan 21 18:21:56 2016
@@ -34,6 +34,7 @@ import java.util.concurrent.Executor;
import javax.annotation.Nonnull;
import javax.management.openmbean.CompositeData;
+import org.apache.jackrabbit.oak.api.jmx.FileStoreBackupRestoreMBean;
import org.apache.jackrabbit.oak.management.ManagementOperation;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.slf4j.Logger;
Added: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java?rev=1726048&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java (added)
+++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java Thu Jan 21 18:21:56 2016
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jackrabbit.oak.plugins.segment;
+
+import java.io.IOException;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
+import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
+import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
+import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
+import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.junit.Test;
+
+public class InitializerTest {
+
+ @Test
+ public void testInitializerSegment() throws CommitFailedException, IOException {
+ NodeStore store = new SegmentNodeStore(new MemoryStore());
+
+ NodeBuilder builder = store.getRoot().builder();
+ new InitialContent().initialize(builder);
+
+ SecurityProviderImpl provider = new SecurityProviderImpl(
+ ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME,
+ ConfigurationParameters.of(ImmutableMap.of("anonymousId", "anonymous",
+ "adminId", "admin",
+ "usersPath", "/home/users",
+ "groupsPath", "/home/groups",
+ "defaultDepth", "1")))));
+ provider.getConfiguration(UserConfiguration.class).getWorkspaceInitializer().initialize(
+ builder, "default");
+ builder.getNodeState();
+ }
+
+}
Propchange: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/InitializerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java (from r1725891, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/SegmentFixture.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java?p2=jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/SegmentFixture.java&r1=1725891&r2=1726048&rev=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/fixture/SegmentFixture.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/test/java/org/apache/jackrabbit/oak/plugins/segment/fixture/SegmentFixture.java Thu Jan 21 18:21:56 2016
@@ -17,10 +17,11 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.fixture;
+package org.apache.jackrabbit.oak.plugins.segment.fixture;
import java.io.IOException;
+import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml Thu Jan 21 18:21:56 2016
@@ -150,6 +150,12 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-blob</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
Modified: jackrabbit/oak/trunk/oak-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/pom.xml?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-upgrade/pom.xml Thu Jan 21 18:21:56 2016
@@ -86,6 +86,11 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-segment</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
<version>${jackrabbit.version}</version>
</dependency>
Modified: jackrabbit/oak/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1726048&r1=1726047&r2=1726048&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Thu Jan 21 18:21:56 2016
@@ -58,6 +58,7 @@
<module>oak-exercise</module>
<module>oak-examples</module>
<module>oak-it</module>
+ <module>oak-segment</module>
</modules>
<scm>