You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2013/04/19 20:08:46 UTC
svn commit: r1469976 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
Author: burn
Date: Fri Apr 19 18:08:46 2013
New Revision: 1469976
URL: http://svn.apache.org/r1469976
Log:
UIMA-2792 Make callback even simpler by writing the log files in the cli
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ConsoleListener.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DefaultCallback.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationMonitor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IDuccCallback.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java?rev=1469976&r1=1469975&r2=1469976&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java Fri Apr 19 18:08:46 2013
@@ -24,10 +24,8 @@ import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
@@ -35,7 +33,6 @@ import org.apache.commons.cli.CommandLin
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;
import org.apache.uima.ducc.common.IDucc;
@@ -61,7 +58,6 @@ public abstract class CliBase
protected Options options;
protected CommandLineParser parser;
protected CommandLine commandLine;
- protected Map<String, UiOption> reverseOptions = new HashMap<String, UiOption>(); // for lookup by string-name
protected long friendlyId = -1;
protected int returnCode = 1000;
@@ -207,25 +203,15 @@ public abstract class CliBase
{
Options opts = new Options();
for ( UiOption opt : optlist ) {
- OptionBuilder.withDescription(opt.makeDesc());
- OptionBuilder.withLongOpt (opt.pname());
-
- if ( opt.argname() == null ) {
- OptionBuilder.hasOptionalArg(); // permissive, these are booleans or inferred and we'll just ignore
- // spurious true, false, or other values
- } else {
- OptionBuilder.withArgName(opt.argname());
- if ( opt.multiargs() ) {
- OptionBuilder.hasArgs();
- } else {
- OptionBuilder.hasArgs(1);
- }
+ String arg = opt.argname();
+ Option o = new Option(null, opt.pname(), (arg != null), opt.makeDesc());
+ o.setArgName(arg);
+ o.setRequired(strict && opt.required());
+ if (opt.multiargs()) {
+ o.setArgs(Option.UNLIMITED_VALUES); // (Untested as we have no multiarg options)
}
-
- if ( strict && opt.required() ) OptionBuilder.isRequired();
-
- Option o = OptionBuilder.create();
opts.addOption(o);
+ // Note: avoid OptionBuilder as is not thread-safe
}
return opts;
}
@@ -236,9 +222,11 @@ public abstract class CliBase
for ( Object o : props.keySet() ) {
String k = (String) o;
String v = props.getStringProperty(k, "");
-
arglist.add("--" + k);
- arglist.add(v);
+ // Assume an empty value indicates a boolean option
+ if (v.length() > 0) {
+ arglist.add(v);
+ }
}
return arglist.toArray(new String[arglist.size()]);
}
@@ -252,7 +240,7 @@ public abstract class CliBase
}
String k = o.getLongOpt().trim();
String v = o.getValue();
- if ( v == null ) v = "";
+ if ( v == null ) v = ""; // Boolean options have an empty value
v = v.trim();
cli_props.put(k, v);
@@ -272,7 +260,8 @@ public abstract class CliBase
/**
* Use this init if you you need a console callback and use the default log location.
*/
- protected synchronized void init(String myClassName, UiOption[] opts, String[] args, DuccProperties cli_props, String host_s, String port_s, String servlet, IDuccCallback consoleCb)
+ protected synchronized void init(String myClassName, UiOption[] opts, String[] args, DuccProperties cli_props,
+ String host_s, String port_s, String servlet, IDuccCallback consoleCb)
throws Exception
{
this.init(myClassName, opts, args, cli_props, host_s, port_s, servlet, consoleCb, null);
@@ -282,7 +271,8 @@ public abstract class CliBase
ducc_home = Utils.findDuccHome();
}
- protected synchronized void init(String myClassName, UiOption[] opts, String[] args, DuccProperties cli_props, String host_s, String port_s, String servlet, IDuccCallback consoleCb, String logExtension)
+ protected synchronized void init(String myClassName, UiOption[] opts, String[] args, DuccProperties cli_props,
+ String host_s, String port_s, String servlet, IDuccCallback consoleCb, String logExtension)
throws Exception
{
if ( init_done ) return;
@@ -566,9 +556,9 @@ public abstract class CliBase
sb.append(' ');
}
sb.append(e[i]);
- consoleCb.duccout(sb.toString());
+ consoleCb.status(sb.toString());
} else {
- consoleCb.duccout(e[0]);
+ consoleCb.status(e[0]);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ConsoleListener.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ConsoleListener.java?rev=1469976&r1=1469975&r2=1469976&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ConsoleListener.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ConsoleListener.java Fri Apr 19 18:08:46 2013
@@ -19,9 +19,11 @@
*/
package org.apache.uima.ducc.cli;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.PrintWriter;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
@@ -43,11 +45,13 @@ class ConsoleListener
private boolean in_shutdown = false;
private boolean start_stdin = false;
-
+ private int numConnected = 0;
+
private IDuccCallback consoleCb;
// private int callers; // number of remote processes we expect to listen for
boolean debug = false;
+
ConsoleListener(CliBase submit, IDuccCallback consoleCb)
throws Exception
{
@@ -60,7 +64,6 @@ class ConsoleListener
this.console_host_address = ni.getIp();
debug = submit.isDebug();
- // this.callers = 1; // assume we'll get at least one listener, else we would not have been called.
}
String getConsoleHostAddress()
@@ -73,34 +76,6 @@ class ConsoleListener
return console_listener_port;
}
-// /**
-// * The caller knows there may be more than one remote process calling us but
-// * we've no clue when or if they will show up. We assume here they do, and
-// * rely on some external influence to correct us if not.
-// */
-// synchronized void incrementCallers()
-// {
-// callers++;
-// }
-
-// synchronized void waitForCompletion()
-// {
-// try {
-// while ( (callers > 0) && ( !in_shutdown) ) {
-// wait();
-// }
-// } catch (InterruptedException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-// }
-
-// private synchronized void releaseWait()
-// {
-// callers--;
-// notify();
-// }
-
synchronized boolean isShutdown()
{
return in_shutdown;
@@ -128,12 +103,12 @@ class ConsoleListener
Pair<StdioReader, StdioWriter> listener = listeners.remove(port);
if ( listener != null ) {
try {
- listener.first().shutdown();
- listener.second().shutdown();
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ listener.first().shutdown();
+ listener.second().shutdown();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
count = listeners.size();
}
@@ -156,11 +131,12 @@ class ConsoleListener
while ( true ) {
try {
Socket s = sock.accept();
- StdioReader sr = new StdioReader(s, this);
+ StdioReader sr = new StdioReader(s);
StdioWriter sw = new StdioWriter(s);
int p = s.getPort();
synchronized(this) {
listeners.put(p, new Pair<StdioReader, StdioWriter>(sr, sw));
+ sr.idNum = ++numConnected;
}
Thread t = new Thread(sr, "STDOUT");
@@ -188,19 +164,18 @@ class ConsoleListener
boolean shutdown = false;
ConsoleListener cl;
String remote_host;
+ private PrintWriter logout = null;
static final String console_tag = "1002 CONSOLE_REDIRECT ";
int tag_len = 0;
+ private int idNum;
-
- StdioReader(Socket sock, ConsoleListener cl)
+ StdioReader(Socket sock)
{
this.sock = sock;
- this.cl = cl;
InetAddress ia = sock.getInetAddress();
remote_host = ia.getHostName();
- consoleCb.host(remote_host);
tag_len = console_tag.length();
if ( debug ) System.out.println("===== Listener starting: " + remote_host + ":" + sock.getPort());
@@ -213,26 +188,36 @@ class ConsoleListener
if ( debug ) System.out.println("===== Listener completing: " + remote_host + ":" + sock.getPort());
shutdown = true;
is.close();
- cl.delete(sock.getPort());
+ if (logout != null) {
+ logout.close();
+ }
+ // Tell the ConsoleListener that it should shutdown all listeners on this port (self included!)
+ delete(sock.getPort());
}
boolean do_console_out = false;
+
void doWrite(String line)
{
if ( line.startsWith(console_tag) ) {
String logfile = line.substring(tag_len);
- consoleCb.logfile(logfile);
- return; // don't echo this
+ try {
+ logout = new PrintWriter(logfile);
+ return;
+ } catch (FileNotFoundException e) {
+ consoleCb.status("Failed to create log file: " + logfile);
+ e.printStackTrace();
+ }
+ }
+ if (logout != null) {
+ logout.println(line);
}
-
if ( do_console_out ) {
- consoleCb.consout(line);
+ consoleCb.console(idNum, line);
} else {
- consoleCb.duccout(line);
- }
-
- if ( line.startsWith("1001 Command launching...")) {
- do_console_out = true;
+ if ( line.startsWith("1001 Command launching...")) {
+ do_console_out = true;
+ }
}
}
@@ -337,15 +322,15 @@ class ConsoleListener
if ( out != null ) {
out.close();
}
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
public void run()
{
- if ( debug ) System.out.println("STDIN LISTENER STARTS *******");
+ if ( debug ) System.out.println("STDIN LISTENER STARTS *******");
try {
out = sock.getOutputStream();
} catch (Exception e) {
@@ -357,7 +342,7 @@ class ConsoleListener
byte[] buf = new byte[4096];
int dbg = 0;
try {
- while ( true ) {
+ while ( true ) {
int cnt = System.in.available();
if ( cnt > 0 ) {
while ( cnt > 0) {
@@ -380,9 +365,9 @@ class ConsoleListener
}
}
}
- } catch (IOException e) {
+ } catch (IOException e) {
System.out.println("Error in process stdin redirection - redirection ended. " + e.toString());
- } finally {
+ } finally {
close();
}
if ( debug ) System.out.println("***********STDIN returns");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DefaultCallback.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DefaultCallback.java?rev=1469976&r1=1469975&r2=1469976&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DefaultCallback.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DefaultCallback.java Fri Apr 19 18:08:46 2013
@@ -15,35 +15,21 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.ducc.cli;
-
public class DefaultCallback implements IDuccCallback {
- private String host;
-
- public void duccout(String s)
- {
- if ( host == null ) {
- System.out.println( s);
- } else {
- System.out.println("[" + host + "] " + s);
- }
- }
-
- public void consout(String s)
- {
- System.out.println("[" + host + "] " + s);
- }
-
- @Override
- public void host(String name) {
- host = name;
- }
-
- @Override
- public void logfile(String name) {
- }
+
+ @Override
+ public void console(int pnum, String msg) {
+ System.out.println("[" + pnum + "] " + msg);
+ }
+
+ @Override
+ public void status(String msg) {
+ System.out.println(msg);
+ }
+
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java?rev=1469976&r1=1469975&r2=1469976&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java Fri Apr 19 18:08:46 2013
@@ -85,7 +85,7 @@ public class DuccJobMonitor extends Ducc
boolean retVal = jobCancel.execute();
debug("cancel rc:"+retVal);
} catch (Exception e) {
- messageProcessor.duccout(e.toString());
+ messageProcessor.status(e.toString());
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java?rev=1469976&r1=1469975&r2=1469976&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java Fri Apr 19 18:08:46 2013
@@ -546,7 +546,7 @@ public class DuccJobSubmit
}
}
catch(Exception e) {
- System.out.println("Cannot initialize: " + e.getMessage());
+ System.out.println("Cannot initialize: " + e);
System.exit(1);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationMonitor.java?rev=1469976&r1=1469975&r2=1469976&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationMonitor.java Fri Apr 19 18:08:46 2013
@@ -74,7 +74,7 @@ public class DuccManagedReservationMonit
boolean retVal = managedReservationCancel.execute();
debug("cancel rc:"+retVal);
} catch (Exception e) {
- messageProcessor.duccout(e.toString());
+ messageProcessor.status(e.toString());
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java?rev=1469976&r1=1469975&r2=1469976&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java Fri Apr 19 18:08:46 2013
@@ -213,31 +213,31 @@ public abstract class DuccMonitor {
protected void trace(String message) {
if(flag_trace.get()) {
- messageProcessor.duccout(timestamp(message));
+ messageProcessor.status(timestamp(message));
}
}
protected void debug(String message) {
if(flag_debug.get()) {
- messageProcessor.duccout(timestamp(message));
+ messageProcessor.status(timestamp(message));
}
}
protected void debug(Exception e) {
if(flag_debug.get()) {
- messageProcessor.duccout(e.toString());
+ messageProcessor.status(e.toString());
}
}
private void info(String message) {
if(flag_info.get()) {
- messageProcessor.duccout(timestamp(message));
+ messageProcessor.status(timestamp(message));
}
}
private void error(String message) {
if(flag_error.get()) {
- messageProcessor.duccout(timestamp(message));
+ messageProcessor.status(timestamp(message));
}
}
@@ -288,7 +288,7 @@ public abstract class DuccMonitor {
// DUCC_HOME
String ducc_home = Utils.findDuccHome();
if(ducc_home == null) {
- messageProcessor.duccout("Missing required environment variable: DUCC_HOME");
+ messageProcessor.status("Missing required environment variable: DUCC_HOME");
return RC_FAILURE;
}
// Ingest ducc.properties
@@ -536,7 +536,7 @@ public abstract class DuccMonitor {
code = runInternal(args);
}
catch (Exception e) {
- messageProcessor.duccout(e.toString());
+ messageProcessor.status(e.toString());
}
debug("rc="+code);
return code;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java?rev=1469976&r1=1469975&r2=1469976&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java Fri Apr 19 18:08:46 2013
@@ -615,7 +615,7 @@ public class DuccServiceApi
UiOption.Unregister
};
List<UiOption> check = new ArrayList<UiOption>();
- UiOption reply = null; ;
+ UiOption reply = UiOption.Help;
for ( String s : args ) {
if ( ! s.startsWith("--") ) continue;
@@ -636,7 +636,7 @@ public class DuccServiceApi
for ( UiOption o : check ) {
msg = msg + " " + o;
}
- throw new IllegalArgumentException("Duplicate service actions " + msg + ": not allowed.");
+ throw new IllegalArgumentException("Duplicate service actions: " + msg );
}
return reply;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IDuccCallback.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IDuccCallback.java?rev=1469976&r1=1469975&r2=1469976&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IDuccCallback.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IDuccCallback.java Fri Apr 19 18:08:46 2013
@@ -1,38 +1,26 @@
package org.apache.uima.ducc.cli;
-public interface IDuccCallback
-{
- /**
- * This method is called by relevant parts of the API with messages generated by DUCC,
- * including console messages generated by ducc_ling, prior to it exec-ing into
- * it's process.
- *
- * @param msg This is the logged message.
- */
- public void duccout(String msg);
+public interface IDuccCallback {
+ /**
+ * This method is called by relevant parts of the API with messages redirected from the remote
+ * process.
+ *
+ * @param pnum
+ * This is the callback number for the remote process e.g. 1 is assigned to the first
+ * process to call back
+ * @param msg
+ * This is the logged message.
+ */
+ public void console(int pnum, String msg);
+
+ /**
+ * This method is called by relevant parts of the API with messages related to the status of the
+ * submitted request.
+ *
+ * @param msg
+ * This is the logged message.
+ */
+ public void status(String msg);
- /**
- * This method is called by relevant parts of the API with messages redirected
- * from the remote process.
- *
- * @param msg This is the logged message.
- */
- public void consout(String msg);
-
- /**
- * This method is called when the name of the host generating the messages is known.
- *
- * @param name The name of the host that generated the message.
- */
- public void host(String name);
-
- /**
- * This method is called with the name of the logfile that would have been written
- * if the console had not been redirected to the consout method.
- * It is not called if the console is not redirected.
- *
- * @param name The name of the logfile that would have been created.
- */
- public void logfile(String name);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java?rev=1469976&r1=1469975&r2=1469976&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java Fri Apr 19 18:08:46 2013
@@ -225,8 +225,8 @@ public interface IUiOptions
DriverEnvironment {
public String pname() { return JobSpecificationProperties.key_driver_environment; }
public String argname() { return "env vars"; }
- public String description() { return "Blank-delimeted list of environment variables."; }
- public String example() { return "\"TERM=xterm DISPLAY=me.org.net:1.0\""; }
+ public String description() { return "Blank-delimited list of environment variables."; }
+ public String example() { return "TERM=xterm DISPLAY=me.org.net:1.0"; }
public String deflt() { return null; }
public String label() { return "DriverEnvironment"; }
public boolean multiargs() { return false; }
@@ -247,7 +247,7 @@ public interface IUiOptions
DriverJvmArgs {
public String pname() { return JobSpecificationProperties.key_driver_jvm_args; }
public String argname() { return "jvm arguments"; }
- public String description() { return "Blank-delimeted list of JVM Arguments passed to the job driver."; }
+ public String description() { return "Blank-delimited list of JVM Arguments passed to the job driver."; }
public String example() { return "-Xmx100M -DMYVAR=foo"; }
public String deflt() { return null; }
public String label() { return "DriverJvmArgs"; }
@@ -258,8 +258,8 @@ public interface IUiOptions
Environment {
public String pname() { return JobSpecificationProperties.key_environment; }
public String argname() { return "env vars"; }
- public String description() { return "Blank-delimeted list of environment variables."; }
- public String example() { return "\"TERM=xterm DISPLAY=me.org.net:1.0\""; }
+ public String description() { return "Blank-delimited list of environment variables."; }
+ public String example() { return "TERM=xterm DISPLAY=me.org.net:1.0"; }
public String deflt() { return null; }
public String label() { return "Environment"; }
public boolean multiargs() { return false; }
@@ -280,7 +280,7 @@ public interface IUiOptions
Instances {
public String pname() { return "instances"; }
public String argname() { return "integer"; }
- public String description() { return "Number of service instances to start or stop."; }
+ public String description() { return "Number of service processes."; }
public String example() { return null; }
public String deflt() { return "1"; }
public String label() { return name(); }
@@ -302,7 +302,7 @@ public interface IUiOptions
JvmArgs {
public String pname() { return JobSpecificationProperties.key_jvm_args; }
public String argname() { return "jvm arguments"; }
- public String description() { return "Blank-delimeted list of JVM Arguments passed to the job driver."; }
+ public String description() { return "Blank-delimited list of JVM Arguments passed to the job driver."; }
public String example() { return "-Xmx100M -DMYVAR=foo"; }
public String deflt() { return null; }
public String label() { return "JvmArgs"; }
@@ -356,7 +356,7 @@ public interface IUiOptions
Modify {
public String pname() { return "modify"; }
- public String argname() { return "modify-parameters" ; }
+ public String argname() { return "service-id-or-endpoint" ; }
public String description() { return "Modify meta properties for a registered service." ; }
public String example() { return null; }
public String deflt() { return null; }
@@ -500,7 +500,7 @@ public interface IUiOptions
Stop {
public String pname() { return "stop"; }
public String description() { return "Stop a registered service." ; }
- public String argname() { return "service-id-or-endpoint [--instances number-to-stop]" ; }
+ public String argname() { return "service-id-or-endpoint" ; }
public String example() { return null; }
public String deflt() { return null; }
public String label() { return null; }
@@ -644,7 +644,7 @@ public interface IUiOptions
ProcessEnvironment {
public String pname() { return JobSpecificationProperties.key_process_environment; }
public String argname() { return "environment-var-list"; }
- public String description() { return "Blank delimeted list of Environment variables."; }
+ public String description() { return "Blank delimited list of Environment variables."; }
public String example() { return "A=B MYENV=foo"; }
public String deflt() { return null; }
public String label() { return "ProcessEnvironment"; }
@@ -710,7 +710,7 @@ public interface IUiOptions
ProcessJvmArgs {
public String pname() { return JobSpecificationProperties.key_process_jvm_args; }
public String argname() { return "jvm arguments"; }
- public String description() { return "Blank-delimeted list of JVM Arguments passed to each process"; }
+ public String description() { return "Blank-delimited list of JVM Arguments passed to each process"; }
public String example() { return "-Xmx100M -DMYVAR=foo"; }
public String deflt() { return null; }
public String label() { return "ProcessJvmArgs"; }