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 fr...@apache.org on 2016/05/19 14:25:33 UTC
svn commit: r1744590 - in
/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run:
BackupCommand.java RestoreCommand.java
Author: frm
Date: Thu May 19 14:25:33 2016
New Revision: 1744590
URL: http://svn.apache.org/viewvc?rev=1744590&view=rev
Log:
OAK-4246 - Simplify the '--segment-tar' option in the backup and restore commands
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java?rev=1744590&r1=1744589&r2=1744590&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/BackupCommand.java Thu May 19 14:25:33 2016
@@ -28,28 +28,18 @@ class BackupCommand implements Command {
@Override
public void execute(String... args) throws Exception {
OptionParser parser = new OptionParser();
-
- OptionSpec<File> folders = parser
- .nonOptions("source and target folders")
- .ofType(File.class);
-
- OptionSpec<Boolean> segmentTar = parser
- .accepts("segment-tar", "use new segment store implementation")
- .withOptionalArg()
- .ofType(Boolean.class)
- .defaultsTo(false);
-
+ OptionSpec segmentTar = parser.accepts("segment-tar", "Use new segment store implementation");
OptionSet options = parser.parse(args);
- if (folders.values(options).size() < 2) {
- parser.printHelpOn(System.err);
+ if (options.nonOptionArguments().size() < 2) {
+ System.err.println("This command requires a source and a target folder");
System.exit(1);
}
- File source = folders.values(options).get(0);
- File target = folders.values(options).get(1);
+ File source = new File(options.nonOptionArguments().get(0).toString());
+ File target = new File(options.nonOptionArguments().get(1).toString());
- if (segmentTar.value(options) == Boolean.TRUE) {
+ if (options.has(segmentTar)) {
SegmentTarUtils.backup(source, target);
} else {
SegmentUtils.backup(source, target);
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java?rev=1744590&r1=1744589&r2=1744590&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/RestoreCommand.java Thu May 19 14:25:33 2016
@@ -29,28 +29,18 @@ class RestoreCommand implements Command
@Override
public void execute(String... args) throws Exception {
OptionParser parser = new OptionParser();
-
- OptionSpec<File> folders = parser
- .nonOptions("target and source folders")
- .ofType(File.class);
-
- OptionSpec<Boolean> segmentTar = parser
- .accepts("segment-tar", "use new segment store implementation")
- .withOptionalArg()
- .ofType(Boolean.class)
- .defaultsTo(false);
-
+ OptionSpec segmentTar = parser.accepts("segment-tar", "Use new segment store implementation");
OptionSet options = parser.parse(args);
- if (folders.values(options).size() < 2) {
- parser.printHelpOn(System.err);
+ if (options.nonOptionArguments().size() < 2) {
+ System.err.println("This command requires a target and a source folder");
System.exit(1);
}
- File target = folders.values(options).get(0);
- File source = folders.values(options).get(1);
+ File target = new File(options.nonOptionArguments().get(0).toString());
+ File source = new File(options.nonOptionArguments().get(1).toString());
- if (segmentTar.value(options) == Boolean.TRUE) {
+ if (options.has(segmentTar)) {
SegmentTarUtils.restore(source, target);
} else {
SegmentUtils.restore(source, target);