svn commit: r1799542 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak: plugins/tika/TextExtractorMain.java run/cli/Options.java

[chetanm]

Author: chetanm
Date: Thu Jun 22 06:55:32 2017
New Revision: 1799542

URL: http://svn.apache.org/viewvc?rev=1799542&view=rev
Log:
OAK-6377 - Text extraction with oak-run and tika requires fake string in the 
command to work

Modified:
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java?rev=1799542&r1=1799541&r2=1799542&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/TextExtractorMain.java
 Thu Jun 22 06:55:32 2017
@@ -54,10 +54,17 @@ public class TextExtractorMain {
         opts.setSummary("Provides text extraction related operations");
         opts.setConnectionString(CommonOptions.DEFAULT_CONNECTION_STRING);
         opts.registerOptionsFactory(TikaCommandOptions.FACTORY);
-        opts.parseAndConfigure(parser, args);
+
+        //NodeStore is only required for generate command. So make it optional
+        opts.parseAndConfigure(parser, args, false);
 
         TikaCommandOptions tikaOpts = 
opts.getOptionBean(TikaCommandOptions.class);
 
+        //If generate then check that NodeStore is specified
+        if (tikaOpts.generate()) {
+            opts.checkNonOptions();
+        }
+
         try (Closer closer = Closer.create()) {
             boolean report = tikaOpts.report();
             boolean extract = tikaOpts.extract();

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java?rev=1799542&r1=1799541&r2=1799542&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
 Thu Jun 22 06:55:32 2017
@@ -77,7 +77,7 @@ public class Options {
         configure(optionSet);
         checkForHelp(parser);
         if (checkNonOptions) {
-            checkNonOptions(parser);
+            checkNonOptions();
         }
         return optionSet;
     }
@@ -140,11 +140,11 @@ public class Options {
         }
     }
 
-    private void checkNonOptions(OptionParser parser) throws IOException {
+    public void checkNonOptions() throws IOException {
         //Some non option should be provided to enable
         if (optionBeans.containsKey(CommonOptions.class)
                 && getCommonOpts().getNonOptions().isEmpty()){
-            parser.printHelpOn(System.out);
+            System.out.println("NodeStore details not provided");
             systemExit(1);
         }
     }