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/06/07 07:32:12 UTC
svn commit: r1747159 [2/2] - in /jackrabbit/oak/trunk:
oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/
oak-run/src/main/java/org/apache/jackrabbit/oak/console/
oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/
oak-run/src/main/java/...
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/migration/SegmentToExternalMigrationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/migration/SegmentToExternalMigrationTest.java?rev=1747159&r1=1747158&r2=1747159&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/migration/SegmentToExternalMigrationTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/migration/SegmentToExternalMigrationTest.java Tue Jun 7 07:32:11 2016
@@ -19,12 +19,15 @@
package org.apache.jackrabbit.oak.segment.migration;
+import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+
import java.io.File;
import java.io.IOException;
import org.apache.jackrabbit.oak.plugins.blob.migration.AbstractMigratorTest;
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.state.NodeStore;
@@ -36,7 +39,7 @@ public class SegmentToExternalMigrationT
@Override
protected NodeStore createNodeStore(BlobStore blobStore, File repository) throws IOException {
File segmentDir = new File(repository, "segmentstore");
- FileStore.Builder builder = FileStore.builder(segmentDir);
+ FileStoreBuilder builder = fileStoreBuilder(segmentDir);
if (blobStore != null) {
builder.withBlobStore(blobStore);
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java?rev=1747159&r1=1747158&r2=1747159&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java Tue Jun 7 07:32:11 2016
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.upgrade.cli.node;
+import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
@@ -23,6 +25,7 @@ import java.io.IOException;
import com.google.common.io.Closer;
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.state.NodeStore;
@@ -42,7 +45,7 @@ public class SegmentTarFactory implement
@Override
public NodeStore create(BlobStore blobStore, Closer closer) throws IOException {
- FileStore.Builder builder = FileStore.builder(new File(dir, "segmentstore"));
+ FileStoreBuilder builder = fileStoreBuilder(new File(dir, "segmentstore"));
if (blobStore != null) {
builder.withBlobStore(blobStore);
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java?rev=1747159&r1=1747158&r2=1747159&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IncludeExcludeSidegradeTest.java Tue Jun 7 07:32:11 2016
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.upgrade;
+import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+
import java.io.File;
import java.io.IOException;
@@ -39,7 +41,7 @@ public class IncludeExcludeSidegradeTest
File directory = getTestDirectory();
File source = new File(directory, "source");
source.mkdirs();
- FileStore fileStore = FileStore.builder(source).build();
+ FileStore fileStore = fileStoreBuilder(source).build();
SegmentNodeStore segmentNodeStore = SegmentNodeStoreBuilders.builder(fileStore).build();
RepositoryImpl repository = (RepositoryImpl) new Jcr(new Oak(segmentNodeStore)).createRepository();
Session session = repository.login(CREDENTIALS);
@@ -59,7 +61,7 @@ public class IncludeExcludeSidegradeTest
@Override
protected void doUpgradeRepository(File source, NodeStore target) throws RepositoryException, IOException {
- FileStore fileStore = FileStore.builder(source).build();
+ FileStore fileStore = fileStoreBuilder(source).build();
SegmentNodeStore segmentNodeStore = SegmentNodeStoreBuilders.builder(fileStore).build();
try {
final RepositorySidegrade sidegrade = new RepositorySidegrade(segmentNodeStore, target);
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java?rev=1747159&r1=1747158&r2=1747159&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositorySidegradeTest.java Tue Jun 7 07:32:11 2016
@@ -18,6 +18,8 @@
*/
package org.apache.jackrabbit.oak.upgrade;
+import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+
import java.io.File;
import java.io.IOException;
@@ -45,7 +47,7 @@ public class RepeatedRepositorySidegrade
sourceDir.mkdirs();
- FileStore fileStore = FileStore.builder(sourceDir).build();
+ FileStore fileStore = fileStoreBuilder(sourceDir).build();
SegmentNodeStore segmentNodeStore = SegmentNodeStoreBuilders.builder(fileStore).build();
RepositoryImpl repository = (RepositoryImpl) new Jcr(new Oak(segmentNodeStore)).createRepository();
Session session = repository.login(CREDENTIALS);
@@ -62,7 +64,7 @@ public class RepeatedRepositorySidegrade
doUpgradeRepository(sourceDir, target, false);
fileStore.flush();
- fileStore = FileStore.builder(sourceDir).build();
+ fileStore = fileStoreBuilder(sourceDir).build();
segmentNodeStore = SegmentNodeStoreBuilders.builder(fileStore).build();
repository = (RepositoryImpl) new Jcr(new Oak(segmentNodeStore)).createRepository();
session = repository.login(CREDENTIALS);
@@ -84,7 +86,7 @@ public class RepeatedRepositorySidegrade
@Override
protected void doUpgradeRepository(File source, NodeStore target, boolean skipInit) throws RepositoryException, IOException {
- FileStore fileStore = FileStore.builder(source).build();
+ FileStore fileStore = fileStoreBuilder(source).build();
SegmentNodeStore segmentNodeStore = SegmentNodeStoreBuilders.builder(fileStore).build();
try {
final RepositorySidegrade repositoryUpgrade = new RepositorySidegrade(segmentNodeStore, target);
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java?rev=1747159&r1=1747158&r2=1747159&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepeatedRepositoryUpgradeTest.java Tue Jun 7 07:32:11 2016
@@ -18,6 +18,8 @@
*/
package org.apache.jackrabbit.oak.upgrade;
+import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+
import java.io.File;
import java.io.IOException;
@@ -67,7 +69,7 @@ public class RepeatedRepositoryUpgradeTe
final File dir = new File(getTestDirectory(), "segments");
dir.mkdirs();
try {
- fileStore = FileStore.builder(dir).withMaxFileSize(128).build();
+ fileStore = fileStoreBuilder(dir).withMaxFileSize(128).build();
upgradeComplete = false;
} catch (IOException e) {
throw new RuntimeException(e);
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeFromTwoSourcesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeFromTwoSourcesTest.java?rev=1747159&r1=1747158&r2=1747159&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeFromTwoSourcesTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeFromTwoSourcesTest.java Tue Jun 7 07:32:11 2016
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.upgrade;
+import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+
import java.io.File;
import java.io.IOException;
@@ -53,7 +55,7 @@ public class UpgradeFromTwoSourcesTest e
final File dir = new File(getTestDirectory(), "segments");
dir.mkdirs();
try {
- fileStore = FileStore.builder(dir).withMaxFileSize(128).build();
+ fileStore = fileStoreBuilder(dir).withMaxFileSize(128).build();
upgradeComplete = false;
} catch (IOException e) {
throw new RuntimeException(e);
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java?rev=1747159&r1=1747158&r2=1747159&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/UpgradeOldSegmentTest.java Tue Jun 7 07:32:11 2016
@@ -18,6 +18,7 @@
*/
package org.apache.jackrabbit.oak.upgrade;
+import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -62,7 +63,7 @@ public class UpgradeOldSegmentTest {
OakUpgrade.main("segment-old:" + oldRepo.getPath(), newRepo.getPath());
- FileStore store = FileStore.builder(new File(newRepo, "segmentstore")).build();
+ FileStore store = fileStoreBuilder(new File(newRepo, "segmentstore")).build();
Repository repo = new Jcr(SegmentNodeStoreBuilders.builder(store).build()).createRepository();
Session s = repo.login(new SimpleCredentials("admin", "admin".toCharArray()));
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java?rev=1747159&r1=1747158&r2=1747159&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/SegmentTarNodeStoreContainer.java Tue Jun 7 07:32:11 2016
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.upgrade.cli.container;
+import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+
import java.io.File;
import java.io.IOException;
@@ -23,6 +25,7 @@ import com.google.common.io.Files;
import org.apache.commons.io.FileUtils;
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.state.NodeStore;
public class SegmentTarNodeStoreContainer implements NodeStoreContainer {
@@ -49,7 +52,7 @@ public class SegmentTarNodeStoreContaine
@Override
public NodeStore open() throws IOException {
- FileStore.Builder builder = FileStore.builder(new File(directory, "segmentstore"));
+ FileStoreBuilder builder = fileStoreBuilder(new File(directory, "segmentstore"));
if (blob != null) {
builder.withBlobStore(blob.open());
}