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 js...@apache.org on 2015/12/09 14:37:15 UTC
svn commit: r1718855 - in
/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli:
CliUtils.java OakUpgrade.java
Author: jsedding
Date: Wed Dec 9 13:37:15 2015
New Revision: 1718855
URL: http://svn.apache.org/viewvc?rev=1718855&view=rev
Log:
OAK-3755 - Remove the special in-place upgrade handling from oak-upgrade
- patch by Tomek Rękawek
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java?rev=1718855&r1=1718854&r2=1718855&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java Wed Dec 9 13:37:15 2015
@@ -16,10 +16,8 @@
*/
package org.apache.jackrabbit.oak.upgrade.cli;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.oak.upgrade.cli.parser.CliArgumentException;
@@ -88,19 +86,4 @@ public class CliUtils {
}
});
}
-
- public static void backupOldJcr2Files(String repositoryDirPath) {
- // backup old jcr2 files when doing an in-place upgrade
- File repositoryDir = new File(repositoryDirPath);
- File crx2 = new File(repositoryDir, "crx2");
- log.info("Moving existing repository under {}", crx2.getAbsolutePath());
- crx2.mkdir();
- Pattern pattern = Pattern.compile("crx2|segmentstore");
- for (File file : repositoryDir.listFiles()) {
- String name = file.getName();
- if (!pattern.matcher(name).matches()) {
- file.renameTo(new File(crx2, name));
- }
- }
- }
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java?rev=1718855&r1=1718854&r2=1718855&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/OakUpgrade.java Wed Dec 9 13:37:15 2015
@@ -59,9 +59,6 @@ public class OakUpgrade {
} finally {
closer.close();
}
- if (stores.isInPlaceUpgrade()) {
- CliUtils.backupOldJcr2Files(stores.getSrcPaths()[0]);
- }
}
private static void upgrade(MigrationFactory migrationFactory) throws IOException, RepositoryException {