You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2017/05/22 09:15:23 UTC
svn commit: r1795780 - in
/jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade:
./ cli/ cli/container/
Author: tomekr
Date: Mon May 22 09:15:23 2017
New Revision: 1795780
URL: http://svn.apache.org/viewvc?rev=1795780&view=rev
Log:
OAK-6132: Backport oak-upgrade to 1.0 and 1.2
Don't use the JDK 1.7 API.
Modified:
jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/SameNodeSiblingsTest.java
jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/Util.java
jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileBlobStoreContainer.java
jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileDataStoreContainer.java
jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java
jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/S3DataStoreContainer.java
Modified: jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/SameNodeSiblingsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/SameNodeSiblingsTest.java?rev=1795780&r1=1795779&r2=1795780&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/SameNodeSiblingsTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/SameNodeSiblingsTest.java Mon May 22 09:15:23 2017
@@ -20,12 +20,11 @@ package org.apache.jackrabbit.oak.upgrad
import static com.google.common.collect.ImmutableSet.of;
import static com.google.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.oak.upgrade.cli.Util.createTempDir;
import static org.junit.Assert.assertEquals;
import java.io.File;
import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.Set;
import javax.jcr.Credentials;
@@ -53,7 +52,7 @@ public class SameNodeSiblingsTest {
@Before
public void createCrx2RepoDir() throws IOException {
- crx2RepoDir = Files.createTempDirectory(Paths.get("target"), "repo-crx2").toFile();
+ this.crx2RepoDir = createTempDir("repo-crx2");
}
@After
Modified: jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/Util.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/Util.java?rev=1795780&r1=1795779&r2=1795780&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/Util.java (original)
+++ jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/Util.java Mon May 22 09:15:23 2017
@@ -63,4 +63,11 @@ public final class Util {
log.info("Unzip took {} msec", delta);
}
}
+
+ public static File createTempDir(String prefix) throws IOException {
+ File tempDir = File.createTempFile(prefix, "", new File("target"));
+ tempDir.delete();
+ tempDir.mkdir();
+ return tempDir;
+ }
}
Modified: jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileBlobStoreContainer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileBlobStoreContainer.java?rev=1795780&r1=1795779&r2=1795780&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileBlobStoreContainer.java (original)
+++ jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileBlobStoreContainer.java Mon May 22 09:15:23 2017
@@ -18,19 +18,19 @@ package org.apache.jackrabbit.oak.upgrad
import java.io.File;
import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.FileBlobStore;
+import static org.apache.jackrabbit.oak.upgrade.cli.Util.createTempDir;
+
public class FileBlobStoreContainer implements BlobStoreContainer {
private final File directory;
public FileBlobStoreContainer() throws IOException {
- this.directory = Files.createTempDirectory(Paths.get("target"), "repo-fbs").toFile();
+ this.directory = createTempDir("repo-fbs");
}
@Override
Modified: jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileDataStoreContainer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileDataStoreContainer.java?rev=1795780&r1=1795779&r2=1795780&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileDataStoreContainer.java (original)
+++ jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/FileDataStoreContainer.java Mon May 22 09:15:23 2017
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.upgrad
import java.io.File;
import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
@@ -27,6 +25,8 @@ import org.apache.jackrabbit.oak.upgrade
import com.google.common.io.Closer;
+import static org.apache.jackrabbit.oak.upgrade.cli.Util.createTempDir;
+
public class FileDataStoreContainer implements BlobStoreContainer {
private final File directory;
@@ -34,7 +34,7 @@ public class FileDataStoreContainer impl
private final Closer closer;
public FileDataStoreContainer() throws IOException {
- this.directory = Files.createTempDirectory(Paths.get("target"), "repo-fds").toFile();
+ this.directory = createTempDir("repo-fds");
this.closer = Closer.create();
}
Modified: jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java?rev=1795780&r1=1795779&r2=1795780&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java (original)
+++ jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/JdbcNodeStoreContainer.java Mon May 22 09:15:23 2017
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.upgrad
import java.io.File;
import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -29,6 +27,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.io.Closer;
+import static org.apache.jackrabbit.oak.upgrade.cli.Util.createTempDir;
+
public class JdbcNodeStoreContainer implements NodeStoreContainer {
private static final Logger LOG = LoggerFactory.getLogger(JdbcNodeStoreContainer.class);
@@ -49,7 +49,7 @@ public class JdbcNodeStoreContainer impl
public JdbcNodeStoreContainer(BlobStoreContainer blob) throws IOException {
this.blob = blob;
- this.h2Dir = Files.createTempDirectory(Paths.get("target"), "repo-h2").toFile();
+ this.h2Dir = createTempDir("repo-h2");
this.jdbcUri = String.format("jdbc:h2:%s", h2Dir.getAbsolutePath() + "/JdbcNodeStoreContainer");
this.jdbcFactory = new JdbcFactory(jdbcUri, 2, "sa", "sa", false);
}
Modified: jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/S3DataStoreContainer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/S3DataStoreContainer.java?rev=1795780&r1=1795779&r2=1795780&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/S3DataStoreContainer.java (original)
+++ jackrabbit/oak/branches/1.2/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/S3DataStoreContainer.java Mon May 22 09:15:23 2017
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.upgrad
import java.io.File;
import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
@@ -29,6 +27,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.io.Closer;
+import static org.apache.jackrabbit.oak.upgrade.cli.Util.createTempDir;
+
public class S3DataStoreContainer implements BlobStoreContainer {
private static final Logger log = LoggerFactory.getLogger(S3DataStoreContainer.class);
@@ -40,7 +40,7 @@ public class S3DataStoreContainer implem
private final Closer closer;
public S3DataStoreContainer(String configFile) throws IOException {
- this.directory = Files.createTempDirectory(Paths.get("target"), "repo-s3").toFile();
+ this.directory = createTempDir("repo-s3");
this.factory = new S3DataStoreFactory(configFile, directory.getPath(), false);
this.closer = Closer.create();
}