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/08/29 20:42:20 UTC
svn commit: r1518758 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/
uima-ducc-orchestrator/...
Author: burn
Date: Thu Aug 29 18:42:19 2013
New Revision: 1518758
URL: http://svn.apache.org/r1518758
Log:
UIMA-3210 Removed deprecated options but convert to valid values if env var DUCC_ACCEPT_DEPRECATED_OPTIONS is set
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/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/DuccManagedReservationSubmit.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/DuccServiceSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/MonitorListener.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationRequestProperties.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=1518758&r1=1518757&r2=1518758&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 Thu Aug 29 18:42:19 2013
@@ -97,11 +97,12 @@ public abstract class CliBase
*/
public abstract boolean execute() throws Exception;
+ /*
+ * Get log directory or employ default log directory if not specified
+ */
String getLogDirectory()
{
- /*
- * employ default log directory if not specified
- */
+
String log_directory = cli_props.getProperty(UiOption.LogDirectory.pname());
if(log_directory == null) {
// no log directory was specified - default to user's home + "/ducc/logs"
@@ -233,21 +234,6 @@ public abstract class CliBase
return arglist.toArray(new String[arglist.size()]);
}
- private String[] mkArgs(DuccProperties props)
- {
- List<String> arglist = new ArrayList<String>();
- for ( Object o : props.keySet() ) {
- String k = (String) o;
- String v = props.getStringProperty(k, "");
- arglist.add("--" + k);
- // Assume an empty value indicates a boolean option
- if (v.length() > 0) {
- arglist.add(v);
- }
- }
- return arglist.toArray(new String[arglist.size()]);
- }
-
/**
* Standard init for all except the Service calls that are sent to the SM
*/
@@ -266,6 +252,9 @@ public abstract class CliBase
DuccProperties cli_props, IDuccCallback consoleCb, String servlet)
throws Exception
{
+ // Optionally convert deprecated options
+ if (System.getenv("DUCC_ACCEPT_DEPRECATED_OPTIONS") != null) cleanupArgs(args);
+
if ( init_done ) return;
if ( consoleCb == null ) {
@@ -648,9 +637,7 @@ public abstract class CliBase
boolean monitor_attach =
(
cli_props.containsKey(UiOption.WaitForCompletion.pname()) ||
- cli_props.containsKey(UiOption.CancelOnInterrupt.pname()) ||
- cli_props.containsKey(UiOption.CancelJobOnInterrupt.pname()) ||
- cli_props.containsKey(UiOption.CancelManagedReservationOnInterrupt.pname())
+ cli_props.containsKey(UiOption.CancelOnInterrupt.pname())
);
if ( monitor_attach ) {
@@ -691,19 +678,14 @@ public abstract class CliBase
if ( console_attach ) {
console_listener = new ConsoleListener(this, consoleCb);
- String key_pe = UiOption.ProcessEnvironment.pname();
- String key_de = UiOption.DriverEnvironment.pname();
- if ( cli_props.containsKey(UiOption.Environment.pname()) ) {
- key_pe = UiOption.Environment.pname();
- key_de = UiOption.Environment.pname();
- }
+ String key = UiOption.Environment.pname();
if ( cli_props.containsKey(UiOption.ProcessAttachConsole.pname()) ) {
- set_console_port(cli_props, key_pe);
+ set_console_port(cli_props, key);
}
if (cli_props.containsKey(UiOption.DriverAttachConsole.pname()) ) {
- set_console_port(cli_props, key_de);
+ set_console_port(cli_props, key);
}
}
}
@@ -723,7 +705,7 @@ public abstract class CliBase
}
}
- protected void stopListeners()
+ protected synchronized void stopListeners()
{
if ( console_listener != null ) {
console_listener.shutdown();
@@ -808,4 +790,42 @@ public abstract class CliBase
}
return args;
}
+
+ /*
+ * Get specified class path (or the default) and remove any DUCC jars used to submit a request
+ * so they cannot accidentally replace any in the user's classpath.
+ */
+ protected String fixupClasspath(String key_cp) {
+ String classpath = cli_props.getStringProperty(key_cp,
+ System.getProperty("java.class.path"));
+ StringBuilder sb = new StringBuilder();
+ for (String jar : classpath.split(":")) {
+ if (!jar.startsWith(ducc_home)) {
+ sb.append(jar).append(":");
+ }
+ }
+ classpath = sb.toString();
+ cli_props.setProperty(key_cp, classpath);
+ return classpath;
+ }
+
+ /*
+ * Change any deprecated options to their new name. If this produces duplicate specifications then the
+ * commons-cli parser probably chooses the last one.
+ *
+ */
+ private void cleanupArgs(String[] args) {
+ for (int i = 0; i < args.length; ++i) {
+ String arg = args[i];
+ if (arg.equals("--driver_classpath") || arg.equals("--process_classpath")) {
+ args[i] = "--classpath";
+ } else if (arg.equals("--driver_environment") || arg.equals("--process_environment")) {
+ args[i] = "--environment";
+ } else if (arg.equals("--cancel_job_on_interrupt") || arg.equals("--cancel_managed_reservation_on_interrupt")) {
+ args[i] = "--cancel_on_interrupt";
+ } else if (arg.equals("--jvm_args")) {
+ args[i] = "--process_jvm_args";
+ }
+ }
+ }
}
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=1518758&r1=1518757&r2=1518758&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 Thu Aug 29 18:42:19 2013
@@ -37,16 +37,6 @@ public class DuccJobMonitor extends Ducc
super(DuccContext.Job, true, messageProcessor);
}
- @Deprecated
- public DuccJobMonitor(boolean quiet) {
- super(DuccContext.Job, true);
- }
-
- @Deprecated
- public DuccJobMonitor(IDuccCallback messageProcessor, boolean quiet) {
- super(DuccContext.Job, true, messageProcessor);
- }
-
private DuccJobMonitor(String uniqueSignature) {
super(DuccContext.Job, false);
}
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=1518758&r1=1518757&r2=1518758&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 Thu Aug 29 18:42:19 2013
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Properties;
import org.apache.commons.cli.MissingArgumentException;
+import org.apache.uima.ducc.cli.IUiOptions.UiOption;
import org.apache.uima.ducc.cli.aio.AllInOneLauncher;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.DuccSchedulerClasses;
@@ -40,7 +41,7 @@ public class DuccJobSubmit
{
private JobRequestProperties jobRequestProperties = new JobRequestProperties();
- static UiOption[] opts_release = new UiOption[] {
+ public static UiOption[] opts = new UiOption[] {
UiOption.Help,
UiOption.Debug,
UiOption.Timestamp,
@@ -92,66 +93,6 @@ public class DuccJobSubmit
UiOption.ClasspathOrder,
};
- static UiOption[] opts_beta = new UiOption[] {
- UiOption.Help,
- UiOption.Debug,
- UiOption.Timestamp,
-
- UiOption.AllInOne,
-
- UiOption.ProcessDebug,
- UiOption.ProcessAttachConsole,
- UiOption.DriverDebug,
- UiOption.DriverAttachConsole,
-
- UiOption.Description,
- UiOption.SchedulingClass,
-
- UiOption.LogDirectory,
- UiOption.WorkingDirectory,
- UiOption.Jvm,
-
- UiOption.Classpath,
- UiOption.Environment,
-
- UiOption.DriverJvmArgs,
- UiOption.DriverClasspath,
- UiOption.DriverEnvironment,
- UiOption.DriverDescriptorCR,
- UiOption.DriverDescriptorCROverrides,
- UiOption.DriverExceptionHandler,
-
- UiOption.ProcessJvmArgs,
- UiOption.ProcessClasspath,
- UiOption.ProcessMemorySize,
-
- UiOption.ProcessEnvironment,
- UiOption.ProcessDD,
- UiOption.ProcessDescriptorCM,
- UiOption.ProcessDescriptorCMOverrides,
- UiOption.ProcessDescriptorAE,
- UiOption.ProcessDescriptorAEOverrides,
- UiOption.ProcessDescriptorCC,
- UiOption.ProcessDescriptorCCOverrides,
-
- UiOption.ProcessDeploymentsMax,
- UiOption.ProcessInitializationFailuresCap,
- UiOption.ProcessFailuresLimit,
- UiOption.ProcessThreadCount,
- UiOption.ProcessPerItemTimeMax,
- //UiOption.ProcessGetMetaTimeMax,
- UiOption.ProcessInitializationTimeMax,
-
- UiOption.Specification,
- UiOption.WaitForCompletion,
- UiOption.CancelOnInterrupt,
- UiOption.CancelJobOnInterrupt,
- UiOption.ServiceDependency,
- UiOption.ClasspathOrder,
- };
-
- public static UiOption[] opts = opts_release;
-
private AllInOneLauncher allInOneLauncher = null;
/**
@@ -212,9 +153,6 @@ public class DuccJobSubmit
public DuccJobSubmit(String[] args, IDuccCallback consoleCb)
throws Exception
{
- if(DuccUiUtilities.isSupportedBeta()) {
- opts = opts_beta;
- }
init (this.getClass().getName(), opts, args, jobRequestProperties, consoleCb);
if(isAllInOne()) {
allInOneLauncher = new AllInOneLauncher(args, consoleCb);
@@ -233,9 +171,6 @@ public class DuccJobSubmit
public DuccJobSubmit(Properties props, IDuccCallback consoleCb)
throws Exception
{
- if (DuccUiUtilities.isSupportedBeta()) {
- opts = opts_beta;
- }
init (this.getClass().getName(), opts, props, jobRequestProperties, consoleCb);
if(isAllInOne()) {
String[] args = mkArgs(props);
@@ -463,50 +398,12 @@ public class DuccJobSubmit
return false;
}
- boolean cp0 = jobRequestProperties.containsKey(UiOption.Classpath.pname());
- boolean cpd = jobRequestProperties.containsKey(UiOption.DriverClasspath.pname());
- boolean cpp = jobRequestProperties.containsKey(UiOption.ProcessClasspath.pname());
-
- if(cp0 && cpd) {
- throw new IllegalArgumentException("Conflict: cannot specify both "+UiOption.Classpath.pname()+" and "+UiOption.DriverClasspath.pname());
- }
- if(cp0 && cpp) {
- throw new IllegalArgumentException("Conflict: cannot specify both "+UiOption.Classpath.pname()+" and "+UiOption.ProcessClasspath.pname());
- }
- if(cp0) {
- // Nothing to do
- }
- else {
- if(cpd || cpp) {
- /*
- * employ default driver classpath if not specified
- */
- String driver_classpath = jobRequestProperties.getProperty(UiOption.DriverClasspath.pname());
- if(driver_classpath == null) {
- driver_classpath = System.getProperty("java.class.path");
- jobRequestProperties.setProperty(UiOption.DriverClasspath.pname(), driver_classpath);
- }
- /*
- * employ default process classpath if not specified
- */
- String process_classpath = jobRequestProperties.getProperty(UiOption.ProcessClasspath.pname());
- if(process_classpath == null) {
- process_classpath = System.getProperty("java.class.path");
- jobRequestProperties.setProperty(UiOption.ProcessClasspath.pname(), process_classpath);
- }
- }
- else {
- /*
- * employ default classpath if not specified
- */
- String classpath = jobRequestProperties.getProperty(UiOption.Classpath.pname());
- if(classpath == null) {
- classpath = System.getProperty("java.class.path");
- jobRequestProperties.setProperty(UiOption.Classpath.pname(), classpath);
- }
- }
- }
-
+
+ /*
+ * Set default classpath if not specified & remove DUCC jars
+ */
+ fixupClasspath(UiOption.Classpath.pname());
+
/*
* employ default process initialization failures cap if not specified
*/
@@ -529,27 +426,7 @@ public class DuccJobSubmit
/*
* Augment the environment(s) with DUCC_LD_LIBRARY_PATH and any propagetd values
*/
- boolean ev0 = jobRequestProperties.containsKey(UiOption.Environment.pname());
- boolean evd = jobRequestProperties.containsKey(UiOption.DriverEnvironment.pname());
- boolean evp = jobRequestProperties.containsKey(UiOption.ProcessEnvironment.pname());
- if(ev0 && evd) {
- throw new IllegalArgumentException("Conflict: cannot specify both "+UiOption.Environment.pname()+" and "+UiOption.DriverEnvironment.pname());
- }
- if(ev0 && evp) {
- throw new IllegalArgumentException("Conflict: cannot specify both "+UiOption.Environment.pname()+" and "+UiOption.ProcessEnvironment.pname());
- }
- if(ev0) {
- DuccUiUtilities.ducc_environment(this, jobRequestProperties, UiOption.Environment.pname());
- }
- else {
- if(evd || evp) {
- DuccUiUtilities.ducc_environment(this, jobRequestProperties, UiOption.DriverEnvironment.pname());
- DuccUiUtilities.ducc_environment(this, jobRequestProperties, UiOption.ProcessEnvironment.pname());
- }
- else {
- DuccUiUtilities.ducc_environment(this, jobRequestProperties, UiOption.Environment.pname());
- }
- }
+ DuccUiUtilities.ducc_environment(this, jobRequestProperties, UiOption.Environment.pname());
/*
* limit total number of threads
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java Thu Aug 29 18:42:19 2013
@@ -39,7 +39,7 @@ public class DuccManagedReservationSubmi
private ServiceRequestProperties serviceRequestProperties;
- private UiOption[] opts_release = new UiOption[] {
+ private UiOption[] opts = new UiOption[] {
UiOption.Help,
UiOption.Debug,
UiOption.Description,
@@ -57,28 +57,6 @@ public class DuccManagedReservationSubmi
UiOption.CancelOnInterrupt,
};
- private UiOption[] opts_beta = new UiOption[] {
- UiOption.Help,
- UiOption.Debug,
- UiOption.Description,
- UiOption.Environment,
- UiOption.LogDirectory,
- UiOption.ProcessAttachConsole,
- UiOption.ProcessEnvironment,
- UiOption.ProcessExecutable,
- UiOption.ProcessExecutableArgs,
- UiOption.ProcessFailuresLimit,
- UiOption.ProcessMemorySize,
- UiOption.SchedulingClass,
- UiOption.Specification,
- UiOption.WorkingDirectory,
- UiOption.WaitForCompletion,
- UiOption.CancelOnInterrupt,
- UiOption.CancelManagedReservationOnInterrupt,
- };
-
- private UiOption[] opts = opts_release;
-
/**
* @param args List of string arguments as described in the
* <a href="/doc/duccbook.html#DUCC_CLI_PROCESS_SUBMIT">DUCC CLI reference.</a>
@@ -122,9 +100,6 @@ public class DuccManagedReservationSubmi
throws Exception
{
serviceRequestProperties = new ServiceRequestProperties();
- if(DuccUiUtilities.isSupportedBeta()) {
- opts = opts_beta;
- }
init (this.getClass().getName(), opts, args, serviceRequestProperties, consoleCb);
}
@@ -142,9 +117,6 @@ public class DuccManagedReservationSubmi
{
String[] arg_array = args.toArray(new String[args.size()]);
serviceRequestProperties = new ServiceRequestProperties();
- if(DuccUiUtilities.isSupportedBeta()) {
- opts = opts_beta;
- }
init (this.getClass().getName(), opts, arg_array, serviceRequestProperties, consoleCb);
}
@@ -161,9 +133,6 @@ public class DuccManagedReservationSubmi
throws Exception
{
serviceRequestProperties = new ServiceRequestProperties();
- if(DuccUiUtilities.isSupportedBeta()) {
- opts = opts_beta;
- }
init (this.getClass().getName(), opts, props, serviceRequestProperties, consoleCb);
}
@@ -180,22 +149,7 @@ public class DuccManagedReservationSubmi
/*
* set DUCC_LD_LIBRARY_PATH in process environment
*/
- boolean ev0 = serviceRequestProperties.containsKey(UiOption.Environment.pname());
- boolean evp = serviceRequestProperties.containsKey(UiOption.ProcessEnvironment.pname());
- if(ev0 && evp) {
- throw new IllegalArgumentException("Conflict: cannot specify both "+UiOption.Environment.pname()+" and "+UiOption.ProcessEnvironment.pname());
- }
- if(ev0) {
- DuccUiUtilities.ducc_environment(this, serviceRequestProperties, UiOption.Environment.pname());
- }
- else {
- if(evp) {
- DuccUiUtilities.ducc_environment(this,serviceRequestProperties, UiOption.ProcessEnvironment.pname());
- }
- else {
- DuccUiUtilities.ducc_environment(this, serviceRequestProperties, UiOption.Environment.pname());
- }
- }
+ DuccUiUtilities.ducc_environment(this, serviceRequestProperties, UiOption.Environment.pname());
// Create a copy to be saved later without these 3 "ducclet" properties required by DUCC
ServiceRequestProperties serviceProperties = (ServiceRequestProperties)serviceRequestProperties.clone();
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=1518758&r1=1518757&r2=1518758&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 Thu Aug 29 18:42:19 2013
@@ -32,8 +32,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.commons.cli.CommandLine;
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.cli.IUiOptions.UiOption;
@@ -87,15 +85,14 @@ public abstract class DuccMonitor {
private UiOption[] optsSubmitJob = new UiOption[] { UiOption.Help,
UiOption.Debug, UiOption.Quiet, UiOption.Timestamp, UiOption.JobId,
- UiOption.CancelOnInterrupt, UiOption.CancelJobOnInterrupt, };
+ UiOption.CancelOnInterrupt, };
private UiOption[] optsMonitorJob = new UiOption[] { UiOption.Help,
UiOption.Debug, UiOption.Quiet, UiOption.Timestamp, UiOption.JobId, };
private UiOption[] optsSubmitManagedReservation = new UiOption[] {
UiOption.Help, UiOption.Debug, UiOption.Quiet, UiOption.Timestamp,
- UiOption.ManagedReservationId, UiOption.CancelOnInterrupt,
- UiOption.CancelManagedReservationOnInterrupt, };
+ UiOption.ManagedReservationId, UiOption.CancelOnInterrupt, };
private UiOption[] optsMonitorManagedReservation = new UiOption[] {
UiOption.Help, UiOption.Debug, UiOption.Quiet, UiOption.Timestamp,
@@ -273,14 +270,6 @@ public abstract class DuccMonitor {
if (commandLine.hasOption(UiOption.CancelOnInterrupt.pname())) {
flag_cancel_on_interrupt.set(true);
}
- if (commandLine.hasOption(UiOption.CancelJobOnInterrupt.pname())) {
- flag_cancel_on_interrupt.set(true);
- }
- if (commandLine
- .hasOption(UiOption.CancelManagedReservationOnInterrupt
- .pname())) {
- flag_cancel_on_interrupt.set(true);
- }
if (commandLine.hasOption(UiOption.JobId.pname())) {
id = commandLine.getOptionValue(UiOption.JobId.pname());
} else if (commandLine.hasOption(UiOption.ManagedReservationId
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=1518758&r1=1518757&r2=1518758&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 Thu Aug 29 18:42:19 2013
@@ -49,7 +49,7 @@ public class DuccServiceApi
String endpoint = null;
IDuccCallback callback = null;
- UiOption[] registration_options_release = {
+ UiOption[] registration_options = {
UiOption.Help,
UiOption.Debug,
UiOption.Description,
@@ -57,45 +57,9 @@ public class DuccServiceApi
UiOption.LogDirectory,
UiOption.WorkingDirectory,
UiOption.Jvm,
- UiOption.JvmArgs,
- UiOption.Classpath,
- UiOption.Environment,
- UiOption.ProcessMemorySize,
- UiOption.ProcessDD,
- UiOption.ProcessExecutable,
- UiOption.ProcessExecutableArgs,
- UiOption.ProcessFailuresLimit,
- UiOption.ClasspathOrder,
- // UiOption.Specification // not used for registration
- UiOption.ServiceDependency,
- UiOption.ServiceRequestEndpoint,
- UiOption.ServiceLinger,
- UiOption.ServicePingArguments,
- UiOption.ServicePingClass,
- UiOption.ServicePingClasspath,
- UiOption.ServicePingJvmArgs,
- UiOption.ServicePingTimeout,
- UiOption.ServicePingDoLog,
-
- UiOption.Register,
- UiOption.Autostart,
- UiOption.Instances,
- };
-
- UiOption[] registration_options_beta = {
- UiOption.Help,
- UiOption.Debug,
- UiOption.Description,
- UiOption.SchedulingClass,
- UiOption.LogDirectory,
- UiOption.WorkingDirectory,
- UiOption.Jvm,
- UiOption.JvmArgs,
+ UiOption.ProcessJvmArgs,
UiOption.Classpath,
UiOption.Environment,
- UiOption.ProcessJvmArgs,
- UiOption.ProcessClasspath,
- UiOption.ProcessEnvironment,
UiOption.ProcessMemorySize,
UiOption.ProcessDD,
UiOption.ProcessExecutable,
@@ -117,9 +81,7 @@ public class DuccServiceApi
UiOption.Autostart,
UiOption.Instances,
};
-
- UiOption[] registration_options = registration_options_release;
-
+
UiOption[] unregister_options = {
UiOption.Help,
UiOption.Debug,
@@ -239,8 +201,7 @@ public class DuccServiceApi
String default_linger = DuccPropertiesResolver.get("ducc.sm.default.linger", "5000");
String linger = cli_props.getStringProperty(UiOption.ServiceLinger.pname(), default_linger);
try {
- @SuppressWarnings("unused")
- long actual = Long.parseLong(linger); // make sure it's a long, don't care about the value
+ Long.parseLong(linger); // make sure it's a long, don't care about the value
} catch ( NumberFormatException e ) {
throw new IllegalArgumentException(UiOption.ServiceLinger.pname() + " is not numeric: " + linger);
}
@@ -267,9 +228,6 @@ public class DuccServiceApi
throws Exception
{
DuccProperties dp = new DuccProperties();
- if(DuccUiUtilities.isSupportedBeta()) {
- registration_options = registration_options_beta;
- }
init (this.getClass().getName(), registration_options, args, null, dp, callback, "sm");
// Note: dp & cli_props are identical ... use only the class variable here for consistency
@@ -277,10 +235,7 @@ public class DuccServiceApi
/*
* Fixup the environment: rename LD_LIBRARY_PATH & add any standard ones
*/
- String key_ev = UiOption.ProcessEnvironment.pname();
- if ( cli_props.containsKey(UiOption.Environment.pname()) ) {
- key_ev = UiOption.Environment.pname();
- }
+ String key_ev = UiOption.Environment.pname();
DuccUiUtilities.ducc_environment(this, cli_props, key_ev);
setLinger();
@@ -305,23 +260,13 @@ public class DuccServiceApi
}
// Infer the classpath (DuccProperties will return the default if the value isn't found.)
// Note: only used for UIMA-AS services
- String key_cp = UiOption.ProcessClasspath.pname();
- if ( cli_props.containsKey(UiOption.Classpath.pname()) ) {
- key_cp = UiOption.Classpath.pname();
- }
- String classpath = cli_props.getStringProperty(key_cp, System.getProperty("java.class.path"));
- cli_props.setProperty(key_cp, classpath);
+ fixupClasspath(UiOption.Classpath.pname());
// Given ep must match inferred ep. Use case: an application is wrapping DuccServiceApi and has to construct
// the endpoint as well. The app passes it in and we insure that the constructed endpoint matches the one
// we extract from the DD - the job will fail otherwise, so we catch this early.
//
- String key_ja = UiOption.ProcessJvmArgs.pname();
- if ( cli_props.containsKey(UiOption.JvmArgs.pname()) ) {
- key_ja = UiOption.JvmArgs.pname();
- }
- String jvmarg_string = cli_props.getProperty(key_ja);
-
+ String jvmarg_string = cli_props.getProperty(UiOption.ProcessJvmArgs.pname());
String inferred_endpoint = extractEndpoint(jvmarg_string);
if (endpoint == null) {
endpoint = inferred_endpoint;
@@ -342,8 +287,7 @@ public class DuccServiceApi
if ( ! cli_props.containsKey(UiOption.ServicePingClass.pname()) ) {
throw new IllegalArgumentException("Custom service is missing ping class name.");
}
- String classpath = cli_props.getStringProperty(UiOption.ServicePingClasspath.pname(), System.getProperty("java.class.path"));
- cli_props.setProperty(UiOption.ServicePingClasspath.pname(), classpath);
+ fixupClasspath(UiOption.ServicePingClasspath.pname());
} else {
throw new IllegalArgumentException("Invalid service endpoint: " + endpoint);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java Thu Aug 29 18:42:19 2013
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Properties;
import org.apache.uima.ducc.cli.IServiceApi.RegistrationOption;
+import org.apache.uima.ducc.cli.IUiOptions.UiOption;
import org.apache.uima.ducc.transport.event.SubmitServiceDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitServiceReplyDuccEvent;
import org.apache.uima.ducc.transport.event.cli.ServiceRequestProperties;
@@ -42,7 +43,7 @@ public class DuccServiceSubmit
//private Properties jvmargs = null;
ServiceRequestProperties requestProperties = new ServiceRequestProperties();
- UiOption[] opts_release = {
+ UiOption[] opts = {
UiOption.Help,
UiOption.Debug,
UiOption.Description,
@@ -50,41 +51,9 @@ public class DuccServiceSubmit
UiOption.LogDirectory,
UiOption.WorkingDirectory,
UiOption.Jvm,
- UiOption.JvmArgs,
- UiOption.Classpath,
- UiOption.Environment,
- UiOption.ProcessMemorySize,
- UiOption.ProcessDD,
- UiOption.ProcessExecutable,
- UiOption.ProcessExecutableArgs,
- UiOption.ProcessFailuresLimit,
- UiOption.ClasspathOrder,
- UiOption.Specification,
- UiOption.ServiceDependency,
- UiOption.ServiceRequestEndpoint,
- UiOption.ServiceLinger,
- UiOption.ServicePingArguments,
- UiOption.ServicePingClass,
- UiOption.ServicePingClasspath,
- UiOption.ServicePingJvmArgs,
- UiOption.ServicePingTimeout,
- UiOption.ServicePingDoLog,
- };
-
- UiOption[] opts_beta = {
- UiOption.Help,
- UiOption.Debug,
- UiOption.Description,
- UiOption.SchedulingClass,
- UiOption.LogDirectory,
- UiOption.WorkingDirectory,
- UiOption.Jvm,
- UiOption.JvmArgs,
+ UiOption.ProcessJvmArgs,
UiOption.Classpath,
UiOption.Environment,
- UiOption.ProcessJvmArgs,
- UiOption.ProcessClasspath,
- UiOption.ProcessEnvironment,
UiOption.ProcessMemorySize,
UiOption.ProcessDD,
UiOption.ProcessExecutable,
@@ -102,9 +71,7 @@ public class DuccServiceSubmit
UiOption.ServicePingTimeout,
UiOption.ServicePingDoLog,
};
-
- UiOption[] opts = opts_release;
-
+
/**
* @param args Array of string arguments as described in the
* <a href="/doc/duccbook.html#DUCC_CLI_SERVICE_SUBMIT">DUCC CLI reference.</a>
@@ -112,9 +79,6 @@ public class DuccServiceSubmit
public DuccServiceSubmit(String[] args)
throws Exception
{
- if(DuccUiUtilities.isSupportedBeta()) {
- opts = opts_beta;
- }
init(this.getClass().getName(), opts, args, requestProperties, null);
}
@@ -135,9 +99,6 @@ public class DuccServiceSubmit
public DuccServiceSubmit(Properties props)
throws Exception
{
- if(DuccUiUtilities.isSupportedBeta()) {
- opts = opts_beta;
- }
init (this.getClass().getName(), opts, props, requestProperties, null);
}
@@ -150,12 +111,6 @@ public class DuccServiceSubmit
public boolean execute()
throws Exception
{
- String key_ja = UiOption.ProcessJvmArgs.pname();
- if ( cli_props.containsKey(UiOption.JvmArgs.pname()) ) {
- key_ja = UiOption.JvmArgs.pname();
- }
- String jvmarg_string = requestProperties.getProperty(key_ja);
-
//
// Need to check if the mutually exclusive UIMA-AS DD and the Custom executable are specified
//
@@ -173,12 +128,17 @@ public class DuccServiceSubmit
if (customCmd != null) {
message("WARN: --process_executable is ignored for UIMA-AS services");
}
+
+ // This should have already been done when registered, but perhaps not in old services.
+ fixupClasspath(UiOption.Classpath.pname());
+
//
// Always extract the endpoint from the DD since when it is explicitly specified it must match.
//
try {
String dd = (String) requestProperties.get(UiOption.ProcessDD.pname());
String wd = (String) requestProperties.get(UiOption.WorkingDirectory.pname());
+ String jvmarg_string = requestProperties.getProperty(UiOption.ProcessJvmArgs.pname());
String inferred_endpoint = DuccUiUtilities.getEndpoint(wd, dd, jvmarg_string);
if (endpoint == null) {
endpoint = inferred_endpoint;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java Thu Aug 29 18:42:19 2013
@@ -211,27 +211,6 @@ public class DuccUiConstants {
public static final String exmp_driver_jvm_args = "-Xmx100M -Xms50M";
public static final String dval_driver_jvm_args = "";
- public static final String name_driver_classpath = JobSpecificationProperties.key_driver_classpath;
- public static final String parm_driver_classpath = "classpath";
- public static final String desc_driver_classpath = "Driver classpath. Default is current classpath.";
- public static final String labl_driver_classpath = "Classpath";
- public static final String exmp_driver_classpath = "";
- public static final String dval_driver_classpath = "";
-
- public static final String name_driver_environment = JobSpecificationProperties.key_driver_environment;
- public static final String parm_driver_environment = "environment";
- public static final String desc_driver_environment = "Driver environment.";
- public static final String labl_driver_environment = "Environment";
- public static final String exmp_driver_environment = "\"TERM=xterm DISPLAY=:1.0\"";
- public static final String dval_driver_environment = "";
-
- public static final String name_driver_memory_size = JobSpecificationProperties.key_driver_memory_size;
- public static final String parm_driver_memory_size = "size[KB|MB|GB|TB]";
- public static final String desc_driver_memory_size = "Size of memory for driver, defaults to GB if units omitted.";
- public static final String labl_driver_memory_size = "Memory Size";
- public static final String exmp_driver_memory_size = "16GB";
- public static final String dval_driver_memory_size = "";
-
public static final String name_driver_descriptor_CR = JobSpecificationProperties.key_driver_descriptor_CR;
public static final String parm_driver_descriptor_CR = "descriptor.xml";
public static final String desc_driver_descriptor_CR = "Driver Collection Reader.";
@@ -260,20 +239,6 @@ public class DuccUiConstants {
public static final String exmp_process_jvm_args = "-Xmx400M -Xms100M";
public static final String dval_process_jvm_args = "";
- public static final String name_process_classpath = JobSpecificationProperties.key_process_classpath;
- public static final String parm_process_classpath = "classpath";
- public static final String desc_process_classpath = "Process classpath. Default is current classpath.";
- public static final String labl_process_classpath = "Classpath";
- public static final String exmp_process_classpath = "";
- public static final String dval_process_classpath = "";
-
- public static final String name_process_environment = JobSpecificationProperties.key_process_environment;
- public static final String parm_process_environment = "environment";
- public static final String desc_process_environment = "Process environment.";
- public static final String labl_process_environment = "Environment";
- public static final String exmp_process_environment = "\"LANG=en_US.UTF-8\"";
- public static final String dval_process_environment = "";
-
public static final String name_process_executable = "process_executable";
public static final String parm_process_executable = "string";
public static final String desc_process_executable = "Executable program.";
@@ -380,15 +345,6 @@ public class DuccUiConstants {
public static final String exmp_process_thread_count = "4";
public static final String dval_process_thread_count = "4";
- /*
- public static final String name_process_get_meta_time_max = JobSpecificationProperties.key_process_get_meta_time_max;
- public static final String parm_process_get_meta_time_max = "integer";
- public static final String desc_process_get_meta_time_max = "Maximum elapsed time (in minutes) for processing getMeta.";
- public static final String labl_process_get_meta_time_max = "Time Max: initalize";
- public static final String exmp_process_get_meta_time_max = "2";
- public static final String dval_process_get_meta_time_max = "2";
- */
-
public static final String name_process_initialization_time_max = JobSpecificationProperties.key_process_initialization_time_max;
public static final String parm_process_initialization_time_max = "integer";
public static final String desc_process_initialization_time_max = "Maximum elapsed time (in minutes) for processing initialization.";
@@ -417,14 +373,6 @@ public class DuccUiConstants {
public static final String exmp_submit_cancel_on_interrupt = null;
public static final String dval_submit_cancel_on_interrupt = null;
- //@Deprecated
- public static final String name_submit_cancel_job_on_interrupt = "cancel_job_on_interrupt";
- public static final String parm_submit_cancel_job_on_interrupt = null;
- public static final String desc_submit_cancel_job_on_interrupt = "Cancel job on interrupt (Ctrl-C).";
- public static final String labl_submit_cancel_job_on_interrupt = null;
- public static final String exmp_submit_cancel_job_on_interrupt = null;
- public static final String dval_submit_cancel_job_on_interrupt = null;
-
public static final String classpath_order_user_before_ducc = "user-before-ducc";
public static final String classpath_order_ducc_before_user = "ducc-before-user";
public static final String classpath_order_default = classpath_order_user_before_ducc;
@@ -447,35 +395,6 @@ public class DuccUiConstants {
public static final String exmp_monitor_cancel_on_interrupt = exmp_submit_cancel_on_interrupt;
public static final String dval_monitor_cancel_on_interrupt = dval_submit_cancel_on_interrupt;
- public static final String name_monitor_cancel_job_on_interrupt = name_submit_cancel_job_on_interrupt;
- public static final String parm_monitor_cancel_job_on_interrupt = parm_submit_cancel_job_on_interrupt;
- public static final String desc_monitor_cancel_job_on_interrupt = "Cancel job on interrupt (Ctrl-C).";
- public static final String labl_monitor_cancel_job_on_interrupt = labl_submit_cancel_job_on_interrupt;
- public static final String exmp_monitor_cancel_job_on_interrupt = exmp_submit_cancel_job_on_interrupt;
- public static final String dval_monitor_cancel_job_on_interrupt = dval_submit_cancel_job_on_interrupt;
-
- /*
- * submit Managed Reservation
- */
-
- public static final String name_submit_cancel_managed_reservation_on_interrupt = "cancel_managed_reservation_on_interrupt";
- public static final String parm_submit_cancel_managed_reservation_on_interrupt = null;
- public static final String desc_submit_cancel_managed_reservation_on_interrupt = "Cancel managed_reservation on interrupt (Ctrl-C); only possible when --"+name_wait_for_completion+" is also specified.";
- public static final String labl_submit_cancel_managed_reservation_on_interrupt = null;
- public static final String exmp_submit_cancel_managed_reservation_on_interrupt = null;
- public static final String dval_submit_cancel_managed_reservation_on_interrupt = null;
-
- /*
- * monitor Managed Reservation
- */
-
- public static final String name_monitor_cancel_managed_reservation_on_interrupt = name_submit_cancel_managed_reservation_on_interrupt;
- public static final String parm_monitor_cancel_managed_reservation_on_interrupt = parm_submit_cancel_managed_reservation_on_interrupt;
- public static final String desc_monitor_cancel_managed_reservation_on_interrupt = "Cancel managed_reservation on interrupt (Ctrl-C).";
- public static final String labl_monitor_cancel_managed_reservation_on_interrupt = labl_submit_cancel_managed_reservation_on_interrupt;
- public static final String exmp_monitor_cancel_managed_reservation_on_interrupt = exmp_submit_cancel_managed_reservation_on_interrupt;
- public static final String dval_monitor_cancel_managed_reservation_on_interrupt = dval_submit_cancel_managed_reservation_on_interrupt;
-
/*
* submit Service
*/
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java Thu Aug 29 18:42:19 2013
@@ -49,24 +49,6 @@ import org.w3c.dom.NodeList;
public class DuccUiUtilities {
- private static boolean betaSet = false;
- private static boolean isBeta;
-
- public static boolean isSupportedBeta() {
- if (betaSet) return isBeta;
-
- // Set DUCC_HOME stsem property (if not already set) for DuccPropertiesResolver
- Utils.findDuccHome();
-
- // Only if "on" allow old-style process/driver options
- isBeta = false;
- String value = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_submit_beta);
- if(value != null && value.equalsIgnoreCase("on")) {
- isBeta = true;
- }
- return isBeta;
- }
-
public static String getUser() {
String user = System.getProperty("user.name");
String runmode = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_runmode);
@@ -81,41 +63,7 @@ public class DuccUiUtilities {
return user;
}
- public static ArrayList<String> getDuplicateOptions(CommandLine commandLine) {
- ArrayList<String> duplicates = new ArrayList<String>();
- HashMap<String,String> seen = new HashMap<String,String>();
- Option[] options = commandLine.getOptions();
- for(Option option : options) {
- String name = option.getLongOpt();
- if(seen.containsKey(name)) {
- if(!duplicates.contains(name)) {
- duplicates.add(name);
- }
- }
- else {
- seen.put(name,name);
- }
- }
- return duplicates;
- }
-
- //**********
-
-// public static boolean duplicate_options(IDuccMessageProcessor duccMessageProcessor, CommandLine commandLine) {
-// boolean retVal = false;
-// ArrayList<String> duplicates = DuccUiUtilities.getDuplicateOptions(commandLine);
-// if(!duplicates.isEmpty()) {
-// for(String duplicate : duplicates) {
-// duccMessageProcessor.err("duplicate option: "+duplicate);
-// }
-// retVal = true;
-// }
-// return retVal;
-// }
-
- //**********
-
- public static String fixupEnvironment(String environment) {
+ private static String fixupEnvironment(String environment) {
// Rename the user's LD_LIBRARY_PATH as Secure Linuxs will not pass that on
boolean modified = false;
String source = "LD_LIBRARY_PATH";
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=1518758&r1=1518757&r2=1518758&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 Thu Aug 29 18:42:19 2013
@@ -91,30 +91,6 @@ public interface IUiOptions
public boolean required() { return false; }
},
- // Deprecated
- CancelJobOnInterrupt {
- public String pname() { return JobSpecificationProperties.key_cancel_job_on_interrupt; }
- public String argname() { return null; }
- public String description() { return "same as "+CancelOnInterrupt.pname(); }
- public String example() { return null; }
- public String deflt() { return null; }
- public String label() { return name(); }
- public boolean multiargs() { return false; }
- public boolean required() { return false; }
- },
-
- // Deprecated
- CancelManagedReservationOnInterrupt {
- public String pname() { return ReservationSpecificationProperties.key_cancel_managed_reservation_on_interrupt; }
- public String argname() { return null; }
- public String description() { return "same as "+CancelOnInterrupt.pname(); }
- public String example() { return null; }
- public String deflt() { return null; }
- public String label() { return name(); }
- public boolean multiargs() { return false; }
- public boolean required() { return false; }
- },
-
Classpath {
public String pname() { return JobSpecificationProperties.key_classpath; }
public String description() { return "Classpath for the Job. Default is current classpath."; }
@@ -128,10 +104,10 @@ public interface IUiOptions
ClasspathOrder {
public String pname() { return JobSpecificationProperties.key_classpath_order; }
- public String argname() { return ClasspathOrderParms.UserBeforeDucc.name() + " or " + ClasspathOrderParms.DuccBeforeUser.name(); }
+ public String argname() { return ClasspathOrderParms.UserBeforeDucc.pname() + " or " + ClasspathOrderParms.DuccBeforeUser.pname(); }
public String description() { return "Specify user-supplied classpath before DUCC-supplied classpath, or the reverse."; }
public String example() { return null; }
- public String deflt() { return ClasspathOrderParms.UserBeforeDucc.name(); }
+ public String deflt() { return ClasspathOrderParms.UserBeforeDucc.pname(); }
public String label() { return name(); }
public boolean multiargs() { return false; }
public boolean required() { return false; }
@@ -192,17 +168,6 @@ public interface IUiOptions
public boolean required() { return false; }
},
- DriverClasspath {
- public String pname() { return JobSpecificationProperties.key_driver_classpath; }
- public String description() { return "Classpath for the Job driver. Default is current classpath."; }
- public String argname() { return "java classpath"; }
- public String example() { return null; }
- public String deflt() { return null; }
- public String label() { return "DriverClassPath"; }
- public boolean multiargs() { return false; }
- public boolean required() { return false; }
- },
-
DriverDescriptorCR {
public String pname() { return JobSpecificationProperties.key_driver_descriptor_CR; }
public String description() { return "Driver (collection reader) descriptor."; }
@@ -225,17 +190,6 @@ public interface IUiOptions
public boolean required() { return false; }
},
- DriverEnvironment {
- public String pname() { return JobSpecificationProperties.key_driver_environment; }
- public String argname() { return "env vars"; }
- 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; }
- public boolean required() { return false; }
- },
-
DriverExceptionHandler {
public String pname() { return JobSpecificationProperties.key_driver_exception_handler; }
public String description() { return "Driver Exception handler class. Must implement "+IJdProcessExceptionHandler.class.getName(); }
@@ -302,17 +256,6 @@ public interface IUiOptions
public boolean required() { return true; }
},
- JvmArgs {
- public String pname() { return JobSpecificationProperties.key_jvm_args; }
- public String argname() { return "jvm arguments"; }
- 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"; }
- public boolean multiargs() { return false; }
- public boolean required() { return false; }
- },
-
ManagedReservationId {
public String pname() { return JobRequestProperties.key_id; }
public String argname() { return "string"; }
@@ -553,17 +496,6 @@ public interface IUiOptions
public boolean required() { return false; }
},
- ProcessClasspath {
- public String pname() { return JobSpecificationProperties.key_process_classpath; }
- public String description() { return "Classpath for each job process. Default is current classpath."; }
- public String argname() { return "java classpath"; }
- public String example() { return null; }
- public String deflt() { return null; }
- public String label() { return "processClassPath"; }
- public boolean multiargs() { return false; }
- public boolean required() { return false; }
- },
-
ProcessDescriptorAE {
public String pname() { return JobSpecificationProperties.key_process_descriptor_AE; }
public String description() { return "Process Analysis Enginefor aggregate."; }
@@ -652,17 +584,6 @@ public interface IUiOptions
public boolean required() { return false; }
},
- ProcessEnvironment {
- public String pname() { return JobSpecificationProperties.key_process_environment; }
- public String argname() { return "environment-var-list"; }
- 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"; }
- public boolean multiargs() { return false; }
- public boolean required() { return false; }
- },
-
ProcessExecutable {
public String pname() { return JobSpecificationProperties.key_process_executable; }
public String argname() { return "program name"; }
@@ -1005,40 +926,6 @@ public interface IUiOptions
return description() + "\nexample: " + example();
}
- // Beta options helper functions
-
- public UiOption[] getBetaOptions() {
- UiOption[] list = { DriverClasspath,
- DriverEnvironment,
- DriverJvmArgs,
- ProcessClasspath,
- ProcessEnvironment,
- ProcessJvmArgs,
- };
- return list;
- }
-
- public boolean isBetaOption(String pname) {
- boolean retVal = false;
- if(pname != null) {
- UiOption[] list = getBetaOptions();
- for(UiOption option : list) {
- if(pname.equals(option.pname())) {
- retVal = true;
- }
- }
- }
- return retVal;
- }
-
- public boolean isBetaOption(UiOption option) {
- boolean retVal = false;
- if(option != null) {
- retVal = isBetaOption(option.pname());
- }
- return retVal;
- }
-
};
public enum ClasspathOrderParms
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/MonitorListener.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/MonitorListener.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/MonitorListener.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/MonitorListener.java Thu Aug 29 18:42:19 2013
@@ -22,6 +22,7 @@ package org.apache.uima.ducc.cli;
import java.util.ArrayList;
import org.apache.uima.ducc.cli.IUiOptions.UiOption;
+import org.apache.uima.ducc.cli.DuccMonitor;
import org.apache.uima.ducc.common.utils.DuccProperties;
import org.apache.uima.ducc.transport.event.IDuccContext.DuccContext;
@@ -68,14 +69,6 @@ class MonitorListener
arrayList.add("--"+DuccUiConstants.name_monitor_cancel_on_interrupt);
}
- if(props.containsKey(DuccUiConstants.name_submit_cancel_job_on_interrupt)) {
- arrayList.add("--"+DuccUiConstants.name_monitor_cancel_job_on_interrupt);
- }
-
- if(props.containsKey(DuccUiConstants.name_submit_cancel_managed_reservation_on_interrupt)) {
- arrayList.add("--"+DuccUiConstants.name_monitor_cancel_managed_reservation_on_interrupt);
- }
-
String[] argList = arrayList.toArray(new String[0]);
switch(context) {
case ManagedReservation:
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java Thu Aug 29 18:42:19 2013
@@ -329,18 +329,8 @@ public class AllInOneLauncher extends Cl
String mid = "examine_classpath";
mh.frameworkTrace(cid, mid, enter);
String pname = UiOption.Classpath.pname();
- if (jobRequestProperties.containsKey(pname)) {
- classpath = jobRequestProperties.getProperty(pname);
- used(pname);
- } else {
- pname = UiOption.ProcessClasspath.pname();
- if (jobRequestProperties.containsKey(pname)) {
- classpath = jobRequestProperties.getProperty(pname);
- used(pname);
- } else {
- classpath = System.getProperty("java.class.path");
- }
- }
+ classpath = fixupClasspath(pname);
+ used(pname);
String message = classpath;
mh.frameworkDebug(cid, mid, message);
@@ -352,9 +342,9 @@ public class AllInOneLauncher extends Cl
} else {
value = DuccPropertiesResolver.getInstance().getProperty(DuccPropertiesResolver.ducc_orchestrator_job_factory_classpath_order);
}
- if (ClasspathOrderParms.UserBeforeDucc.pname().equalsIgnoreCase(value)) {
+ if (ClasspathOrderParms.UserBeforeDucc.pname().equals(value)) {
classpath_user_first = true;
- } else if (ClasspathOrderParms.DuccBeforeUser.pname().equalsIgnoreCase(value)) {
+ } else if (ClasspathOrderParms.DuccBeforeUser.pname().equals(value)) {
classpath_user_first = false;
} else {
throw new IllegalArgumentException(UiOption.ClasspathOrder.pname()+": "+value);
@@ -379,25 +369,8 @@ public class AllInOneLauncher extends Cl
mh.frameworkTrace(cid, mid, enter);
String pname = UiOption.Environment.pname();
DuccUiUtilities.ducc_environment(this, jobRequestProperties, pname); // Augment environment
- if(jobRequestProperties.containsKey(pname)) {
- environment = jobRequestProperties.getProperty(pname);
- String message = environment;
- mh.frameworkDebug(cid, mid, message);
- used(pname);
- }
- mh.frameworkTrace(cid, mid, exit);
- }
-
- private void examine_process_environment() {
- String mid = "examine_process_environment";
- mh.frameworkTrace(cid, mid, enter);
- if(jobRequestProperties.containsKey(UiOption.Environment.pname())) {
- return;
- }
- String pname = UiOption.ProcessEnvironment.pname();
- DuccUiUtilities.ducc_environment(this, jobRequestProperties, pname); // Augment environment
- if(jobRequestProperties.containsKey(pname)) {
- environment = jobRequestProperties.getProperty(pname);
+ environment = jobRequestProperties.getProperty(pname);
+ if (environment != null) {
String message = environment;
mh.frameworkDebug(cid, mid, message);
used(pname);
@@ -405,13 +378,6 @@ public class AllInOneLauncher extends Cl
mh.frameworkTrace(cid, mid, exit);
}
- private void examine_driver_environment() {
- String mid = "examine_driver_environment";
- mh.frameworkTrace(cid, mid, enter);
- // ignored
- mh.frameworkTrace(cid, mid, exit);
- }
-
private void examine_description() {
String mid = "examine_description";
mh.frameworkTrace(cid, mid, enter);
@@ -719,20 +685,6 @@ public class AllInOneLauncher extends Cl
mh.frameworkTrace(cid, mid, exit);
}
- private void examine_cancel_job_on_interrupt() {
- String mid = "examine_cancel_job_on_interrupt";
- mh.frameworkTrace(cid, mid, enter);
- String pname = UiOption.CancelJobOnInterrupt.pname();
- if(jobRequestProperties.containsKey(pname)) {
- cancel_on_interrupt = true;
- wait_for_completion = true;
- String message = pname+"="+cancel_on_interrupt;
- mh.frameworkDebug(cid, mid, message);
- used(pname);
- }
- mh.frameworkTrace(cid, mid, exit);
- }
-
private void examine_cancel_on_interrupt() {
String mid = "examine_cancel_on_interrupt";
mh.frameworkTrace(cid, mid, enter);
@@ -837,8 +789,6 @@ public class AllInOneLauncher extends Cl
// environment
examine_environment();
- examine_driver_environment();
- examine_process_environment();
// jd
examine_driver_exception_handler();
@@ -876,7 +826,6 @@ public class AllInOneLauncher extends Cl
// wait_for_completion & cancel
examine_wait_for_completion();
examine_cancel_on_interrupt();
- examine_cancel_job_on_interrupt();
// specification - handled by super()
examine_specification();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java Thu Aug 29 18:42:19 2013
@@ -27,9 +27,6 @@ public interface IDuccEnv {
public static final String DUCC_HOME_DIR = DUCC_HOME+File.separator;
public static final String DUCC_RESOURCES_DIR = DUCC_HOME_DIR+"resources"+File.separator;
public static final String DUCC_PROPERTIES_FILE = DUCC_RESOURCES_DIR+"ducc.properties";
- //TODO
- @Deprecated
- public static final String DUCC_AUTHORIZED_MACHINES_FILE = DUCC_RESOURCES_DIR+"ducc.authorized-machines-list";
public static final String DUCC_NODES_FILE_NAME = "ducc.nodes";
public static final String DUCC_NODES_FILE_PATH = DUCC_RESOURCES_DIR+DUCC_NODES_FILE_NAME;
public static final String DUCC_ADMINISTRATORS_FILE = DUCC_RESOURCES_DIR+"ducc.administrators";
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java Thu Aug 29 18:42:19 2013
@@ -39,7 +39,6 @@ import org.apache.uima.ducc.transport.cm
import org.apache.uima.ducc.transport.cmdline.NonJavaCommandLine;
import org.apache.uima.ducc.transport.event.cli.JobRequestProperties;
import org.apache.uima.ducc.transport.event.cli.JobSpecificationProperties;
-import org.apache.uima.ducc.transport.event.cli.PropertiesHelper;
import org.apache.uima.ducc.transport.event.cli.ReservationSpecificationProperties;
import org.apache.uima.ducc.transport.event.cli.ServiceRequestProperties;
import org.apache.uima.ducc.transport.event.common.DuccProcess;
@@ -259,7 +258,7 @@ public class JobFactory {
driverCommandLine.addOption(IDuccCommand.arg_ducc_deploy_components);
driverCommandLine.addOption(IDuccCommand.arg_ducc_job_id+job.getDuccId().toString());
// classpath
- String driverClasspath = PropertiesHelper.getDriverClasspath(jobRequestProperties);
+ String driverClasspath = jobRequestProperties.getProperty(JobSpecificationProperties.key_classpath);
logger.debug(methodName, job.getDuccId(), "driver CP (spec):"+driverClasspath);
logger.debug(methodName, job.getDuccId(), "java CP:"+java_classpath);
if(driverClasspath != null) {
@@ -278,13 +277,13 @@ public class JobFactory {
}
logger.debug(methodName, job.getDuccId(), "driver CP (combined):"+driverClasspath);
driverCommandLine.setClasspath(driverClasspath);
- String driver_jvm_args = PropertiesHelper.getDriverJvmArgs(jobRequestProperties);
+ String driver_jvm_args = jobRequestProperties.getProperty(JobSpecificationProperties.key_driver_jvm_args);
ArrayList<String> dTokens = DuccUiUtilities.tokenizeList(driver_jvm_args, true);
for(String token : dTokens) {
driverCommandLine.addOption(token);
}
// Environment
- String driverEnvironmentVariables = PropertiesHelper.getDriverEnvironment(jobRequestProperties);
+ String driverEnvironmentVariables = jobRequestProperties.getProperty(JobSpecificationProperties.key_environment);
int envCountDriver = addEnvironment(job, "driver", driverCommandLine, driverEnvironmentVariables);
logger.info(methodName, job.getDuccId(), "driver env vars: "+envCountDriver);
logger.debug(methodName, job.getDuccId(), "driver: "+driverCommandLine.getCommand());
@@ -347,7 +346,7 @@ public class JobFactory {
// log
jobRequestProperties.specification(logger);
// classpath
- String processClasspath = PropertiesHelper.getProcessClasspath(jobRequestProperties);
+ String processClasspath = jobRequestProperties.getProperty(JobSpecificationProperties.key_classpath);
logger.debug(methodName, job.getDuccId(), "process CP (spec):"+processClasspath);
logger.debug(methodName, job.getDuccId(), "java CP:"+java_classpath);
if(processClasspath != null) {
@@ -464,12 +463,12 @@ public class JobFactory {
JavaCommandLine pipelineCommandLine = new JavaCommandLine(javaCmd);
pipelineCommandLine.setClassName("main:provided-by-Process-Manager");
pipelineCommandLine.setClasspath(processClasspath);
- String process_jvm_args = PropertiesHelper.getProcessJvmArgs(jobRequestProperties);
+ String process_jvm_args = jobRequestProperties.getProperty(JobSpecificationProperties.key_process_jvm_args);
ArrayList<String> pTokens = DuccUiUtilities.tokenizeList(process_jvm_args, true);
for(String token : pTokens) {
pipelineCommandLine.addOption(token);
}
- String processEnvironmentVariables = PropertiesHelper.getProcessEnvironment(jobRequestProperties);
+ String processEnvironmentVariables = jobRequestProperties.getProperty(JobSpecificationProperties.key_environment);
int envCountProcess = addEnvironment(job, "process", pipelineCommandLine, processEnvironmentVariables);
logger.info(methodName, job.getDuccId(), "process env vars: "+envCountProcess);
logger.debug(methodName, job.getDuccId(), "pipeline: "+pipelineCommandLine.getCommand());
@@ -480,7 +479,7 @@ public class JobFactory {
// ducclet (sometimes known as arbitrary process)
String process_executable = jobRequestProperties.getProperty(JobSpecificationProperties.key_process_executable);
NonJavaCommandLine executableProcessCommandLine = new NonJavaCommandLine(process_executable);
- String processEnvironmentVariables = PropertiesHelper.getProcessEnvironment(jobRequestProperties);
+ String processEnvironmentVariables = jobRequestProperties.getProperty(JobSpecificationProperties.key_environment);
int envCountProcess = addEnvironment(job, "process", executableProcessCommandLine, processEnvironmentVariables);
logger.info(methodName, job.getDuccId(), "process env vars: "+envCountProcess);
logger.debug(methodName, job.getDuccId(), "ducclet: "+executableProcessCommandLine.getCommandLine());
@@ -542,9 +541,6 @@ public class JobFactory {
if(jobRequestProperties.containsKey(JobSpecificationProperties.key_cancel_on_interrupt)) {
job.setCancelOnInterrupt();
}
- else if(jobRequestProperties.containsKey(JobSpecificationProperties.key_cancel_job_on_interrupt)) {
- job.setCancelOnInterrupt();
- }
else if(jobRequestProperties.containsKey(ReservationSpecificationProperties.key_cancel_managed_reservation_on_interrupt)) {
job.setCancelOnInterrupt();
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java Thu Aug 29 18:42:19 2013
@@ -45,6 +45,7 @@ public class JobRequestProperties extend
public static String key_id = "id";
public static String key_dpid = "dpid";
+ // Not used?
public static List<String> keys_requiring_values = Arrays.asList(
JobRequestProperties.key_signature,
JobRequestProperties.key_description,
@@ -58,15 +59,10 @@ public class JobRequestProperties extend
key_scheduling_priority,
key_jvm,
key_driver_jvm_args,
- key_driver_classpath,
- key_driver_environment,
- key_driver_memory_size,
key_driver_descriptor_CR,
key_driver_descriptor_CR_overrides,
key_driver_exception_handler,
key_process_jvm_args,
- key_process_classpath,
- key_process_environment,
key_process_memory_size,
key_process_DD,
key_process_descriptor_CM,
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java Thu Aug 29 18:42:19 2013
@@ -36,7 +36,6 @@ public class JobSpecificationProperties
public static String key_scheduling_priority = "scheduling_priority";
public static String key_jvm = "jvm";
- public static String key_jvm_args = "jvm_args";
public static String key_classpath = "classpath";
public static String key_environment = "environment";
@@ -46,16 +45,11 @@ public class JobSpecificationProperties
public static String key_driver_attach_console = "driver_attach_console";
public static String key_driver_jvm_args = "driver_jvm_args";
- public static String key_driver_classpath = "driver_classpath";
- public static String key_driver_environment = "driver_environment";
- public static String key_driver_memory_size = "driver_memory_size";
public static String key_driver_descriptor_CR = "driver_descriptor_CR";
public static String key_driver_descriptor_CR_overrides = "driver_descriptor_CR_overrides";
public static String key_driver_exception_handler = "driver_exception_handler";
public static String key_process_jvm_args = "process_jvm_args";
- public static String key_process_classpath = "process_classpath";
- public static String key_process_environment = "process_environment";
public static String key_process_memory_size = "process_memory_size";
public static String key_process_DD = "process_DD";
public static String key_process_descriptor_CM = "process_descriptor_CM";
@@ -86,9 +80,6 @@ public class JobSpecificationProperties
public static String key_classpath_order = "classpath_order";
- // Deprecated
- public static String key_cancel_job_on_interrupt = "cancel_job_on_interrupt";
-
public static String[] keys = {
JobRequestProperties.key_signature,
JobRequestProperties.key_description,
@@ -102,15 +93,10 @@ public class JobSpecificationProperties
key_scheduling_priority,
key_jvm,
key_driver_jvm_args,
- key_driver_classpath,
- key_driver_environment,
- key_driver_memory_size,
key_driver_descriptor_CR,
key_driver_descriptor_CR_overrides,
key_driver_exception_handler,
key_process_jvm_args,
- key_process_classpath,
- key_process_environment,
key_process_memory_size,
key_process_DD,
key_process_descriptor_CM,
@@ -124,15 +110,11 @@ public class JobSpecificationProperties
key_process_initialization_failures_cap,
key_process_failures_limit,
key_process_thread_count,
- /*
- key_process_get_meta_time_max,
- */
key_process_initialization_time_max,
key_process_per_item_time_max,
key_service_dependency,
key_wait_for_completion,
key_classpath_order,
- key_cancel_job_on_interrupt,
};
public boolean isRecognized(String key) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationRequestProperties.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationRequestProperties.java?rev=1518758&r1=1518757&r2=1518758&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationRequestProperties.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationRequestProperties.java Thu Aug 29 18:42:19 2013
@@ -58,6 +58,7 @@ public class ReservationRequestPropertie
*/
public static String key_node_list = "node_list";
+ // Not used ?
public static List<String> keys_requiring_values = Arrays.asList(
JobRequestProperties.key_signature,
JobRequestProperties.key_description,