svn commit: r1532340 - /hama/trunk/core/src/main/java/org/apache/hama/pipes/Submitter.java

[mi...@apache.org]

Author: millecker
Date: Tue Oct 15 13:58:59 2013
New Revision: 1532340

URL: http://svn.apache.org/r1532340
Log:
HAMA-810: Refactored the Hama Pipes usage message

Modified:
    hama/trunk/core/src/main/java/org/apache/hama/pipes/Submitter.java

Modified: hama/trunk/core/src/main/java/org/apache/hama/pipes/Submitter.java
URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/pipes/Submitter.java?rev=1532340&r1=1532339&r2=1532340&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/pipes/Submitter.java (original)
+++ hama/trunk/core/src/main/java/org/apache/hama/pipes/Submitter.java Tue Oct 15 13:58:59 2013
@@ -327,29 +327,36 @@ public class Submitter implements Tool {
     void printUsage() {
       // The CLI package should do this for us, but I can't figure out how
       // to make it print something reasonable.
-      System.out.println("bin/hama pipes");
-      System.out.println("  [-input <path>] // Input directory");
-      System.out.println("  [-output <path>] // Output directory");
-      System.out.println("  [-jar <jar file> // jar filename");
-      System.out.println("  [-inputformat <class>] // InputFormat class");
-      System.out
-          .println("  [-bspTasks <number>] // Number of bsp tasks to launch");
-      System.out.println("  [-partitioner <class>] // Java Partitioner");
-      System.out.println("  [-combiner <class>] // Java Combiner class");
-      System.out.println("  [-outputformat <class>] // Java RecordWriter");
+      System.out.println("bin/hama pipes [genericOptions] [pipesOptions]");
+      System.out.println();
+
+      // Generic options
+      // GenericOptionsParser.printGenericCommandUsage(System.out);
+      System.out.println("Generic options supported are");
       System.out
-          .println("  [-cachefiles <space separated paths>] // Additional cache files like libs, can be globbed with wildcards");
-      System.out.println("  [-program <executable>] // executable URI");
+          .println(" -conf <configuration file>\tSpecify an application configuration file");
+      System.out.println(" -D <property=value>\tUse value for given property");
+      System.out.println();
+
+      // Pipes options
+      System.out.println("Pipes options supported are");
+      System.out.println(" -input <path>\tInput directory");
+      System.out.println(" -output <path>\tOutput directory");
+      System.out.println(" -jar <jar file>\tJar filename");
+      System.out.println(" -inputformat <class>\tInputFormat class");
+      System.out.println(" -bspTasks <number>\tNumber of bsp tasks to launch");
+      System.out.println(" -partitioner <class>\tJava Partitioner");
+      System.out.println(" -combiner <class>\tJava Combiner class");
+      System.out.println(" -outputformat <class>\tJava RecordWriter");
       System.out
-          .println("  [-programArgs <argument>] // arguments for the program");
+          .println(" -cachefiles <space separated paths>\tAdditional cache files like libs, can be globbed with wildcards");
+      System.out.println(" -program <executable>\tExecutable URI");
+      System.out.println(" -programArgs <argument>\tArguments for the program");
       System.out
-          .println("  [-interpreter <executable>] // interpreter, like python or bash");
+          .println(" -interpreter <executable>\tInterpreter, like python or bash");
       System.out
-          .println("  [-streaming <true|false>] // if supplied, streaming is used instead of pipes");
-      System.out.println("  [-jobname <name>] // sets the name of this job");
-
-      System.out.println();
-      GenericOptionsParser.printGenericCommandUsage(System.out);
+          .println(" -streaming <true|false>\tIf supplied, streaming is used instead of pipes");
+      System.out.println(" -jobname <name>\tSets the name of this job");
     }
   }