OAK-5834 - Remove the deprecated oak-segment module

Removed oak-segment and oak-tarmk-standby modules
Removed fixtures and ITs pertaining to them

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1785274 13f79535-47bb-0310-9956-ffa450edef68

oak-it-osgi/pom.xml

@@ -83,7 +83,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>oak-segment</artifactId>
+      <artifactId>oak-segment-tar</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

oak-it/pom.xml

@@ -37,12 +37,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </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-segment-tar</artifactId>
@@ -62,13 +56,6 @@
             <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-segment-tar</artifactId>

oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java

@@ -30,16 +30,12 @@
 import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
 import org.apache.jackrabbit.oak.plugins.multiplex.MultiplexingMemoryFixture;
 import org.apache.jackrabbit.oak.plugins.multiplex.MultiplexingSegmentFixture;
-import org.apache.jackrabbit.oak.plugins.segment.fixture.SegmentFixture;
 import org.apache.jackrabbit.oak.segment.fixture.SegmentTarFixture;
 
 public class NodeStoreFixtures {
 
     public static final NodeStoreFixture MEMORY_NS = new MemoryFixture();
 
-    @Deprecated
-    public static final NodeStoreFixture SEGMENT_MK = new SegmentFixture();
-
     public static final NodeStoreFixture SEGMENT_TAR = new SegmentTarFixture();
 
     public static final NodeStoreFixture DOCUMENT_NS = new DocumentMongoFixture();
@@ -57,9 +53,6 @@ public static Collection<Object[]> asJunitParameters(Set<FixturesHelper.Fixture>
         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);
         }
@@ -88,4 +81,4 @@ public static Collection<Object[]> asJunitParameters(Set<FixturesHelper.Fixture>
         return result;
     }
 
-}
+}

oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreTest.java

@@ -35,7 +35,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -46,7 +45,6 @@
 import javax.annotation.Nullable;
 import javax.sql.DataSource;
 
-import com.google.common.base.Predicates;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.oak.api.Blob;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -57,9 +55,11 @@
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
 import org.apache.jackrabbit.oak.plugins.document.util.CountingDiff;
 import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.Segment;
-import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.segment.Segment;
+import org.apache.jackrabbit.oak.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
+import org.apache.jackrabbit.oak.segment.file.FileStore;
+import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
 import org.apache.jackrabbit.oak.spi.blob.FileBlobStore;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -77,6 +77,7 @@
 import org.junit.runners.Parameterized.Parameters;
 
 import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
@@ -844,8 +845,8 @@ public NodeStore get() throws Exception {
 
                         BlobStore blobStore = new FileBlobStore(blobStorePath);
 
-                        store = FileStore.builder(storePath).withBlobStore(blobStore).build();
-                        instance = SegmentNodeStore.builder(store).build();
+                        store = FileStoreBuilder.fileStoreBuilder(storePath).withBlobStore(blobStore).build();
+                        instance = SegmentNodeStoreBuilders.builder(store).build();
 
                         return instance;
                     }

oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingSegmentFixture.java

@@ -21,8 +21,8 @@
 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.memory.MemoryStore;
+import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
+import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
 import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 
@@ -37,8 +37,8 @@ public NodeStore createNodeStore() {
                     .readOnlyMount("temp", MOUNT_PATH)
                     .build();
 
-            NodeStore globalStore = SegmentNodeStore.builder(new MemoryStore()).build();
-            NodeStore tempMount = SegmentNodeStore.builder(new MemoryStore()).build();
+            NodeStore globalStore = SegmentNodeStoreBuilders.builder(new MemoryStore()).build();
+            NodeStore tempMount = SegmentNodeStoreBuilders.builder(new MemoryStore()).build();
 
             return new MultiplexingNodeStore.Builder(mip, globalStore).addMount("temp", tempMount).build();
         } catch (IOException e) {