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 md...@apache.org on 2016/05/09 14:23:16 UTC
svn commit: r1742956 - in /jackrabbit/oak/trunk:
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/
oak-it/src/test/java/org/apache/jackrabbit/oak/
oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/
oak-segment-tar/src/test/java/org/ap...
Author: mduerig
Date: Mon May 9 14:23:15 2016
New Revision: 1742956
URL: http://svn.apache.org/viewvc?rev=1742956&view=rev
Log:
OAK-4245: Decide on a final name for oak-segment-next
Rename some segment-next leftovers to segment-tar
Added:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/fixture/SegmentTarFixture.java
- copied, changed from r1742916, jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/fixture/SegmentNextFixture.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java
- copied, changed from r1742916, jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentNextFactory.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToSegmentTarTest.java
- copied, changed from r1742916, jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToSegmentNextTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java
- copied, changed from r1742916, jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNextNodeStoreContainer.java
Removed:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/fixture/SegmentNextFixture.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentNextFactory.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToSegmentNextTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNextNodeStoreContainer.java
Modified:
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java
jackrabbit/oak/trunk/oak-upgrade/src/main/resources/upgrade_usage.txt
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyReferencesTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToFbsTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToFdsTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToS3Test.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FdsToFbsTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToFbsTest.java
Modified: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java?rev=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java Mon May 9 14:23:15 2016
@@ -43,7 +43,7 @@ public final class FixturesHelper {
* default fixtures when no {@code nsfixtures} is provided
*/
public enum Fixture {
- DOCUMENT_NS, SEGMENT_MK, DOCUMENT_RDB, MEMORY_NS, DOCUMENT_MEM, SEGMENT_NEXT
+ DOCUMENT_NS, SEGMENT_MK, DOCUMENT_RDB, MEMORY_NS, DOCUMENT_MEM, SEGMENT_TAR
}
private static final Set<Fixture> FIXTURES;
Modified: 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=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java Mon May 9 14:23:15 2016
@@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.fixture
import org.apache.jackrabbit.oak.fixture.MemoryFixture;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.plugins.segment.fixture.SegmentFixture;
-import org.apache.jackrabbit.oak.segment.fixture.SegmentNextFixture;
+import org.apache.jackrabbit.oak.segment.fixture.SegmentTarFixture;
public class NodeStoreFixtures {
@@ -37,7 +37,7 @@ public class NodeStoreFixtures {
public static final NodeStoreFixture SEGMENT_MK = new SegmentFixture();
- public static final NodeStoreFixture SEGMENT_NEXT = new SegmentNextFixture();
+ public static final NodeStoreFixture SEGMENT_TAR = new SegmentTarFixture();
public static final NodeStoreFixture DOCUMENT_NS = new DocumentMongoFixture();
@@ -62,8 +62,8 @@ public class NodeStoreFixtures {
if (fixtures.contains(FixturesHelper.Fixture.DOCUMENT_MEM)) {
configuredFixtures.add(DOCUMENT_MEM);
}
- if (fixtures.contains(FixturesHelper.Fixture.SEGMENT_NEXT)) {
- configuredFixtures.add(SEGMENT_NEXT);
+ if (fixtures.contains(FixturesHelper.Fixture.SEGMENT_TAR)) {
+ configuredFixtures.add(SEGMENT_TAR);
}
Collection<Object[]> result = new ArrayList<Object[]>();
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=1742956&r1=1742955&r2=1742956&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 Mon May 9 14:23:15 2016
@@ -451,7 +451,7 @@ public class NodeStoreTest extends OakBa
public void moveToDescendant() {
NodeBuilder test = store.getRoot().builder().getChildNode("test");
NodeBuilder x = test.getChildNode("x");
- if (fixture == NodeStoreFixtures.SEGMENT_NEXT || fixture == NodeStoreFixtures.SEGMENT_MK || fixture == NodeStoreFixtures.MEMORY_NS) {
+ if (fixture == NodeStoreFixtures.SEGMENT_TAR || fixture == NodeStoreFixtures.SEGMENT_MK || fixture == NodeStoreFixtures.MEMORY_NS) {
assertTrue(x.moveTo(x, "xx"));
assertFalse(x.exists());
assertFalse(test.hasChildNode("x"));
Copied: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/fixture/SegmentTarFixture.java (from r1742916, jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/fixture/SegmentNextFixture.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/fixture/SegmentTarFixture.java?p2=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/fixture/SegmentTarFixture.java&p1=jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/fixture/SegmentNextFixture.java&r1=1742916&r2=1742956&rev=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/fixture/SegmentNextFixture.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/fixture/SegmentTarFixture.java Mon May 9 14:23:15 2016
@@ -27,15 +27,15 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-public class SegmentNextFixture extends NodeStoreFixture {
+public class SegmentTarFixture extends NodeStoreFixture {
private final SegmentStore store;
- public SegmentNextFixture() {
+ public SegmentTarFixture() {
this(null);
}
- public SegmentNextFixture(SegmentStore store) {
+ public SegmentTarFixture(SegmentStore store) {
this.store = store;
}
@@ -54,6 +54,6 @@ public class SegmentNextFixture extends
@Override
public String toString() {
- return "SegmentNext";
+ return "SegmentTar";
}
}
\ No newline at end of file
Copied: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java (from r1742916, jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentNextFactory.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java?p2=jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java&p1=jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentNextFactory.java&r1=1742916&r2=1742956&rev=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentNextFactory.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java Mon May 9 14:23:15 2016
@@ -16,23 +16,23 @@
*/
package org.apache.jackrabbit.oak.upgrade.cli.node;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+
import com.google.common.io.Closer;
import org.apache.jackrabbit.oak.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-
-public class SegmentNextFactory implements NodeStoreFactory {
+public class SegmentTarFactory implements NodeStoreFactory {
private final File dir;
private final boolean mmap;
- public SegmentNextFactory(String directory, boolean mmap) {
+ public SegmentTarFactory(String directory, boolean mmap) {
this.dir = new File(directory);
this.mmap = mmap;
if (!dir.isDirectory()) {
@@ -67,6 +67,6 @@ public class SegmentNextFactory implemen
@Override
public String toString() {
- return String.format("SegmentNextNodeStore[%s]", dir);
+ return String.format("SegmentTarNodeStore[%s]", dir);
}
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java?rev=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/StoreType.java Mon May 9 14:23:15 2016
@@ -25,7 +25,7 @@ import org.apache.jackrabbit.oak.upgrade
import org.apache.jackrabbit.oak.upgrade.cli.node.JdbcFactory;
import org.apache.jackrabbit.oak.upgrade.cli.node.MongoFactory;
import org.apache.jackrabbit.oak.upgrade.cli.node.SegmentFactory;
-import org.apache.jackrabbit.oak.upgrade.cli.node.SegmentNextFactory;
+import org.apache.jackrabbit.oak.upgrade.cli.node.SegmentTarFactory;
import org.apache.jackrabbit.oak.upgrade.cli.node.StoreFactory;
import org.apache.jackrabbit.oak.upgrade.cli.parser.StoreArguments.MigrationDirection;
@@ -106,7 +106,7 @@ enum StoreType {
return new StoreFactory(new SegmentFactory(path, arguments.getOptions().isMmap()));
}
},
- SEGMENT_NEXT {
+ SEGMENT_TAR {
@Override
public boolean matches(String argument) {
return true;
@@ -114,7 +114,7 @@ enum StoreType {
@Override
public StoreFactory createFactory(String[] paths, MigrationDirection direction, MigrationCliArguments arguments) {
- return new StoreFactory(new SegmentNextFactory(paths[0], arguments.getOptions().isMmap()));
+ return new StoreFactory(new SegmentTarFactory(paths[0], arguments.getOptions().isMmap()));
}
};
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/resources/upgrade_usage.txt
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/resources/upgrade_usage.txt?rev=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/resources/upgrade_usage.txt (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/resources/upgrade_usage.txt Mon May 9 14:23:15 2016
@@ -34,7 +34,7 @@ in-place. Old files will be moved to the
An descriptor of the Oak node store. Possible options:
- * path to the segment-next store
+ * path to the segment-tar store
* segment-old:/path/to/classic/segment
* jdbc:... (requires passing username and password as separate parameters)
* mongodb://host:port/database
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java?rev=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java Mon May 9 14:23:15 2016
@@ -36,7 +36,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.upgrade.RepositorySidegrade;
import org.apache.jackrabbit.oak.upgrade.cli.container.NodeStoreContainer;
-import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNextNodeStoreContainer;
+import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -50,7 +50,7 @@ public abstract class AbstractOak2OakTes
private static final Logger log = LoggerFactory.getLogger(AbstractOak2OakTest.class);
- protected static SegmentNextNodeStoreContainer testContent;
+ protected static SegmentTarNodeStoreContainer testContent;
private NodeStore destination;
@@ -70,7 +70,7 @@ public abstract class AbstractOak2OakTes
if (!tempDir.isDirectory()) {
Util.unzip(AbstractOak2OakTest.class.getResourceAsStream("/segmentstore.zip"), tempDir);
}
- testContent = new SegmentNextNodeStoreContainer(tempDir);
+ testContent = new SegmentTarNodeStoreContainer(tempDir);
}
@Before
Copied: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToSegmentTarTest.java (from r1742916, jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToSegmentNextTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToSegmentTarTest.java?p2=jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToSegmentTarTest.java&p1=jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToSegmentNextTest.java&r1=1742916&r2=1742956&rev=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToSegmentNextTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/SegmentToSegmentTarTest.java Mon May 9 14:23:15 2016
@@ -17,18 +17,18 @@
package org.apache.jackrabbit.oak.upgrade.cli;
import org.apache.jackrabbit.oak.upgrade.cli.container.NodeStoreContainer;
-import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNextNodeStoreContainer;
+import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNodeStoreContainer;
-public class SegmentToSegmentNextTest extends AbstractOak2OakTest {
+public class SegmentToSegmentTarTest extends AbstractOak2OakTest {
private final NodeStoreContainer source;
private final NodeStoreContainer destination;
- public SegmentToSegmentNextTest() {
+ public SegmentToSegmentTarTest() {
source = new SegmentNodeStoreContainer();
- destination = new SegmentNextNodeStoreContainer();
+ destination = new SegmentTarNodeStoreContainer();
}
@Override
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyReferencesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyReferencesTest.java?rev=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyReferencesTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyReferencesTest.java Mon May 9 14:23:15 2016
@@ -20,7 +20,7 @@ import org.apache.jackrabbit.oak.upgrade
import org.apache.jackrabbit.oak.upgrade.cli.container.BlobStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.FileDataStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.NodeStoreContainer;
-import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNextNodeStoreContainer;
+import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer;
public class CopyReferencesTest extends AbstractOak2OakTest {
@@ -32,8 +32,8 @@ public class CopyReferencesTest extends
public CopyReferencesTest() {
sourceBlob = new FileDataStoreContainer();
- source = new SegmentNextNodeStoreContainer(sourceBlob);
- destination = new SegmentNextNodeStoreContainer(sourceBlob);
+ source = new SegmentTarNodeStoreContainer(sourceBlob);
+ destination = new SegmentTarNodeStoreContainer(sourceBlob);
}
@Override
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToFbsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToFbsTest.java?rev=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToFbsTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToFbsTest.java Mon May 9 14:23:15 2016
@@ -20,7 +20,7 @@ import org.apache.jackrabbit.oak.upgrade
import org.apache.jackrabbit.oak.upgrade.cli.container.BlobStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.FileBlobStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.NodeStoreContainer;
-import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNextNodeStoreContainer;
+import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer;
public class FbsToFbsTest extends AbstractOak2OakTest {
@@ -35,8 +35,8 @@ public class FbsToFbsTest extends Abstra
public FbsToFbsTest() {
sourceBlob = new FileBlobStoreContainer();
destinationBlob = new FileBlobStoreContainer();
- source = new SegmentNextNodeStoreContainer(sourceBlob);
- destination = new SegmentNextNodeStoreContainer(destinationBlob);
+ source = new SegmentTarNodeStoreContainer(sourceBlob);
+ destination = new SegmentTarNodeStoreContainer(destinationBlob);
}
@Override
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToFdsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToFdsTest.java?rev=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToFdsTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToFdsTest.java Mon May 9 14:23:15 2016
@@ -21,7 +21,7 @@ import org.apache.jackrabbit.oak.upgrade
import org.apache.jackrabbit.oak.upgrade.cli.container.FileBlobStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.FileDataStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.NodeStoreContainer;
-import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNextNodeStoreContainer;
+import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer;
public class FbsToFdsTest extends AbstractOak2OakTest {
@@ -36,8 +36,8 @@ public class FbsToFdsTest extends Abstra
public FbsToFdsTest() {
sourceBlob = new FileBlobStoreContainer();
destinationBlob = new FileDataStoreContainer();
- source = new SegmentNextNodeStoreContainer(sourceBlob);
- destination = new SegmentNextNodeStoreContainer(destinationBlob);
+ source = new SegmentTarNodeStoreContainer(sourceBlob);
+ destination = new SegmentTarNodeStoreContainer(destinationBlob);
}
@Override
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToS3Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToS3Test.java?rev=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToS3Test.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FbsToS3Test.java Mon May 9 14:23:15 2016
@@ -23,7 +23,7 @@ import org.apache.jackrabbit.oak.upgrade
import org.apache.jackrabbit.oak.upgrade.cli.container.FileBlobStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.NodeStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.S3DataStoreContainer;
-import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNextNodeStoreContainer;
+import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer;
import org.junit.Assume;
public class FbsToS3Test extends AbstractOak2OakTest {
@@ -42,8 +42,8 @@ public class FbsToS3Test extends Abstrac
Assume.assumeTrue(S3_PROPERTIES != null);
sourceBlob = new FileBlobStoreContainer();
destinationBlob = new S3DataStoreContainer(S3_PROPERTIES);
- source = new SegmentNextNodeStoreContainer(sourceBlob);
- destination = new SegmentNextNodeStoreContainer(destinationBlob);
+ source = new SegmentTarNodeStoreContainer(sourceBlob);
+ destination = new SegmentTarNodeStoreContainer(destinationBlob);
}
@Override
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FdsToFbsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FdsToFbsTest.java?rev=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FdsToFbsTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/FdsToFbsTest.java Mon May 9 14:23:15 2016
@@ -21,7 +21,7 @@ import org.apache.jackrabbit.oak.upgrade
import org.apache.jackrabbit.oak.upgrade.cli.container.FileBlobStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.FileDataStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.NodeStoreContainer;
-import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNextNodeStoreContainer;
+import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer;
public class FdsToFbsTest extends AbstractOak2OakTest {
@@ -36,8 +36,8 @@ public class FdsToFbsTest extends Abstra
public FdsToFbsTest() {
sourceBlob = new FileDataStoreContainer();
destinationBlob = new FileBlobStoreContainer();
- source = new SegmentNextNodeStoreContainer(sourceBlob);
- destination = new SegmentNextNodeStoreContainer(destinationBlob);
+ source = new SegmentTarNodeStoreContainer(sourceBlob);
+ destination = new SegmentTarNodeStoreContainer(destinationBlob);
}
@Override
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToFbsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToFbsTest.java?rev=1742956&r1=1742955&r2=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToFbsTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3ToFbsTest.java Mon May 9 14:23:15 2016
@@ -23,7 +23,7 @@ import org.apache.jackrabbit.oak.upgrade
import org.apache.jackrabbit.oak.upgrade.cli.container.FileBlobStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.NodeStoreContainer;
import org.apache.jackrabbit.oak.upgrade.cli.container.S3DataStoreContainer;
-import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNextNodeStoreContainer;
+import org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer;
import org.junit.Assume;
public class S3ToFbsTest extends AbstractOak2OakTest {
@@ -42,8 +42,8 @@ public class S3ToFbsTest extends Abstrac
Assume.assumeTrue(S3_PROPERTIES != null);
sourceBlob = new S3DataStoreContainer(S3_PROPERTIES);
destinationBlob = new FileBlobStoreContainer();
- source = new SegmentNextNodeStoreContainer(sourceBlob);
- destination = new SegmentNextNodeStoreContainer(destinationBlob);
+ source = new SegmentTarNodeStoreContainer(sourceBlob);
+ destination = new SegmentTarNodeStoreContainer(destinationBlob);
}
@Override
Copied: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java (from r1742916, jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNextNodeStoreContainer.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java?p2=jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java&p1=jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNextNodeStoreContainer.java&r1=1742916&r2=1742956&rev=1742956&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentNextNodeStoreContainer.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java Mon May 9 14:23:15 2016
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.oak.upgrade.cli.container;
+import java.io.File;
+import java.io.IOException;
+
import com.google.common.io.Files;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import java.io.File;
-import java.io.IOException;
-
-public class SegmentNextNodeStoreContainer implements NodeStoreContainer {
+public class SegmentTarNodeStoreContainer implements NodeStoreContainer {
private final File directory;
@@ -33,16 +33,16 @@ public class SegmentNextNodeStoreContain
private FileStore fs;
- public SegmentNextNodeStoreContainer() {
+ public SegmentTarNodeStoreContainer() {
this(Files.createTempDir());
}
- public SegmentNextNodeStoreContainer(File directory) {
+ public SegmentTarNodeStoreContainer(File directory) {
this.blob = null;
this.directory = directory;
}
- public SegmentNextNodeStoreContainer(BlobStoreContainer blob) {
+ public SegmentTarNodeStoreContainer(BlobStoreContainer blob) {
this.blob = blob;
this.directory = Files.createTempDir();
}