svn commit: r1782305 - in /jackrabbit/oak/branches/1.6: oak-doc/src/site/markdown/nodestore/segment/overview.md oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java

[ad...@apache.org]

Author: adulceanu
Date: Thu Feb  9 10:31:50 2017
New Revision: 1782305

URL: http://svn.apache.org/viewvc?rev=1782305&view=rev
Log:
OAK-5275 - The check command should accept the path to the store as a positional argument (merging rev. 1781382)

Modified:
    jackrabbit/oak/branches/1.6/oak-doc/src/site/markdown/nodestore/segment/overview.md
    jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java

Modified: jackrabbit/oak/branches/1.6/oak-doc/src/site/markdown/nodestore/segment/overview.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-doc/src/site/markdown/nodestore/segment/overview.md?rev=1782305&r1=1782304&r2=1782305&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-doc/src/site/markdown/nodestore/segment/overview.md (original)
+++ jackrabbit/oak/branches/1.6/oak-doc/src/site/markdown/nodestore/segment/overview.md Thu Feb  9 10:31:50 2017
@@ -514,7 +514,7 @@ This tool is the counterpart of `backup`
 ### <a name="check"/> Check
 
 ```
-java -jar oak-run.jar check --path PATH [--journal JOURNAL] [--deep] [--notify SECS] [--bin [LENGTH]]
+java -jar oak-run.jar check PATH [--journal JOURNAL] [--deep] [--notify SECS] [--bin [LENGTH]]
 ```
 
 The `check` tool inspects an existing Segment Store at `PATH` for eventual inconsistencies. 

Modified: jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java?rev=1782305&r1=1782304&r2=1782305&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java (original)
+++ jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckCommand.java Thu Feb  9 10:31:50 2017
@@ -31,9 +31,6 @@ class CheckCommand implements Command {
     @Override
     public void execute(String... args) throws Exception {
         OptionParser parser = new OptionParser();
-        ArgumentAcceptingOptionSpec<String> path = parser.accepts(
-                "path", "path to the segment store (required)")
-                .withRequiredArg().ofType(String.class);
         ArgumentAcceptingOptionSpec<String> journal = parser.accepts(
                 "journal", "journal file")
                 .withRequiredArg().ofType(String.class).defaultsTo("journal.log");
@@ -49,13 +46,13 @@ class CheckCommand implements Command {
 
         OptionSet options = parser.parse(args);
 
-        if (!options.has(path)) {
-            System.err.println("usage: check <options>");
+        if (options.nonOptionArguments().size() != 1) {
+            System.err.println("usage: check path/to/segmentstore <options>");
             parser.printHelpOn(System.err);
             System.exit(1);
         }
 
-        File dir = isValidFileStoreOrFail(new File(path.value(options)));
+        File dir = isValidFileStoreOrFail(new File(options.nonOptionArguments().get(0).toString()));
         String journalFileName = journal.value(options);
         boolean fullTraversal = options.has(deep);
         long debugLevel = notify.value(options);