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 2015/03/03 23:27:56 UTC
svn commit: r1663811 - 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-sm/src/main/java/org/apache/uima/ducc/sm/
Author: burn
Date: Tue Mar 3 22:27:56 2015
New Revision: 1663811
URL: http://svn.apache.org/r1663811
Log:
UIMA-4271 Deprecate --classpath_order as unused in 2.0
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/CliFixups.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CommandLine.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/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/IUiOptions.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-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.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=1663811&r1=1663810&r2=1663811&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 Tue Mar 3 22:27:56 2015
@@ -27,7 +27,6 @@ import java.lang.management.ManagementFa
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
@@ -204,21 +203,6 @@ public abstract class CliBase
}
}
- protected String[] mkArgs(Properties props)
- {
- List<String> arglist = new ArrayList<String>();
- for ( Object o : props.keySet() ) {
- String k = (String) o;
- String v = props.getProperty(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()]);
- }
-
DuccEventHttpDispatcher makeDispatcher(String targetUrl)
{
String[] classpath = {
@@ -255,8 +239,8 @@ public abstract class CliBase
*
* @param myClassName Name of the class invoking me, for help string
* @param uiOpts Array of IUioptions permitted for this command
- * @param args Arguments from the command line
- * @param props Properties passed in from the API
+ * @param args Arguments from the command line (or null)
+ * @param props Properties passed in from the API (or null)
* @param cli_props (Initially) empty properties file to be filled in
* @param consoleCb Console callback object (optional)
* @param servlet The name of the http servlet that will serve this request
@@ -267,7 +251,12 @@ public abstract class CliBase
throws Exception
{
- CliFixups.cleanupArgs(args, myClassName); // Default implementation does nothing
+ // Either args or props passed in, not both
+ if (args != null) {
+ CliFixups.cleanupArgs(args, myClassName);
+ } else {
+ CliFixups.cleanupProps(props, myClassName);
+ }
if ( init_done ) return;
@@ -313,7 +302,7 @@ public abstract class CliBase
Properties defaults = new Properties();
defaults.load(fis);
fis.close();
- CliFixups.cleanupProps(defaults, myClassName); // By default does nothing
+ CliFixups.cleanupProps(defaults, myClassName); // May correct or drop deprecated options
// If invoked with overriding properties add to or replace the defaults
if (props != null) {
@@ -321,6 +310,9 @@ public abstract class CliBase
}
commandLine = new CommandLine(args, uiOpts, defaults);
commandLine.parse();
+
+ // Remove the file option to avoid re-parsing or confusion in the saved properties files
+ commandLine.allOptions().remove(UiOption.Specification);
}
commandLine.verify(); // Insure all the rules specified by the IUiOpts are enforced
@@ -410,13 +402,7 @@ public abstract class CliBase
//
// here clean up stuff that was specified but we want to validate it
//
- if (uiopt == UiOption.ClasspathOrder) {
- String val = cli_props.getStringProperty(uiopt.pname());
- if (!val.equals(ClasspathOrderParms.DuccBeforeUser.pname())
- && !val.equals(ClasspathOrderParms.UserBeforeDucc.pname())) {
- throw new IllegalArgumentException("Invalid value for " + uiopt.pname() + ": " + val);
- }
- } else if (uiopt == UiOption.ProcessMemorySize || uiopt == UiOption.ReservationMemorySize) {
+ if (uiopt == UiOption.ProcessMemorySize || uiopt == UiOption.ReservationMemorySize) {
String val = cli_props.getStringProperty(uiopt.pname());
if (!val.matches("^\\d+$")) {
throw new IllegalArgumentException("Invalid non-numeric value for " + uiopt.pname() + ": " + val);
@@ -451,9 +437,10 @@ public abstract class CliBase
if (value != null) {
matcher.appendReplacement(sb, value);
} else {
- matcher.appendReplacement(sb, "");
- sb.append("${" + key + "}");
- message("WARN: undefined placeholder", key, "not replaced");
+ matcher.appendReplacement(sb, ""); // Can't include the value as it looks like a group specification
+ value = "${" + key + "}";
+ sb.append(value);
+ message("WARN: undefined placeholder", value, "not replaced");
}
}
matcher.appendTail(sb);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliFixups.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliFixups.java?rev=1663811&r1=1663810&r2=1663811&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliFixups.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliFixups.java Tue Mar 3 22:27:56 2015
@@ -36,6 +36,10 @@ public class CliFixups {
if (arg.equals("--process_DD")) {
args[i] = "--process_descriptor_DD";
System.out.println("CLI replaced deprecated option: " + arg + " with: " + args[i]);
+ } else if (arg.equals("--classpath_order")) {
+ System.out.println("CLI ignored deprecated option: " + arg);
+ args[i] = null;
+ if (++i < args.length && !args[i].startsWith("--")) args[i] = null;
}
}
}
@@ -45,7 +49,10 @@ public class CliFixups {
if (key.equals("process_DD")) {
props.put("process_descriptor_DD", props.get(key));
props.remove(key);
- System.out.println("CLI replaced deprecated property: " + key + " with: process_descriptor_DD");
+ System.out.println("CLI replaced deprecated option: " + key + " with: process_descriptor_DD");
+ } else if (key.equals("classpath_order")) {
+ props.remove(key);
+ System.out.println("CLI ignored deprecated option: " + key);
}
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CommandLine.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CommandLine.java?rev=1663811&r1=1663810&r2=1663811&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CommandLine.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CommandLine.java Tue Mar 3 22:27:56 2015
@@ -442,6 +442,9 @@ public class CommandLine
String v;
for ( i = 0; i < args.length; i++ ) {
+ if (args[i] == null) { // May have been removed by CliFixups
+ continue;
+ }
// constant: at the top of the loop we must be poised at the next '-' string
// must throw otherwise
if ( args[i].startsWith("--") ) {
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=1663811&r1=1663810&r2=1663811&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 Tue Mar 3 22:27:56 2015
@@ -87,7 +87,6 @@ public class DuccJobSubmit
UiOption.WaitForCompletion,
UiOption.CancelOnInterrupt,
UiOption.ServiceDependency,
- UiOption.ClasspathOrder,
};
private AllInOneLauncher allInOneLauncher = null;
@@ -152,8 +151,8 @@ public class DuccJobSubmit
{
init (this.getClass().getName(), opts, args, jobRequestProperties, consoleCb);
check_descriptor_options();
- if(isAllInOne()) {
- allInOneLauncher = new AllInOneLauncher(args, consoleCb);
+ if (isAllInOne()) {
+ allInOneLauncher = new AllInOneLauncher(userSpecifiedProperties, consoleCb); // Pass the already fixed-up user properties
}
}
@@ -161,7 +160,7 @@ public class DuccJobSubmit
* This form of the constructor allows the API user to capture
* messages, rather than directing them to stdout.
*
- * @param props Properties file contianing string arguments as described in the
+ * @param props Properties file containing string arguments as described in the
* <a href="/doc/duccbook.html#DUCC_CLI_SUBMIT">DUCC CLI reference.</a>
* @param consoleCb If provided, messages are directed to it instead of
* stdout.
@@ -171,9 +170,8 @@ public class DuccJobSubmit
{
init (this.getClass().getName(), opts, props, jobRequestProperties, consoleCb);
check_descriptor_options();
- if(isAllInOne()) {
- String[] args = mkArgs(props);
- allInOneLauncher = new AllInOneLauncher(args, consoleCb);
+ if (isAllInOne()) {
+ allInOneLauncher = new AllInOneLauncher(userSpecifiedProperties, consoleCb); // Pass the already fixed-up user properties
}
}
@@ -371,7 +369,8 @@ public class DuccJobSubmit
}
}
catch(Exception e) {
- System.out.println("Cannot initialize: " + e);
+ System.out.println("Cannot initialize: ");
+ e.printStackTrace();
System.exit(1);
}
}
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=1663811&r1=1663810&r2=1663811&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 Tue Mar 3 22:27:56 2015
@@ -72,7 +72,6 @@ public class DuccServiceApi
UiOption.ProcessInitializationTimeMax,
UiOption.ProcessDebug,
- UiOption.ClasspathOrder,
// UiOption.Specification // not used for registration
UiOption.ServiceDependency,
UiOption.ServiceRequestEndpoint,
@@ -171,7 +170,6 @@ public class DuccServiceApi
UiOption.ProcessJvmArgs,
UiOption.ProcessDebug,
UiOption.Classpath,
- UiOption.ClasspathOrder,
};
// These options are only valid for services with an explicit pinger
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=1663811&r1=1663810&r2=1663811&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 Tue Mar 3 22:27:56 2015
@@ -63,7 +63,6 @@ public class DuccServiceSubmit
UiOption.ProcessDebug,
UiOption.InstanceFailureLimit,
- UiOption.ClasspathOrder,
UiOption.Specification,
UiOption.ServiceDependency,
UiOption.ServiceRequestEndpoint,
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=1663811&r1=1663810&r2=1663811&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 Tue Mar 3 22:27:56 2015
@@ -102,13 +102,6 @@ public interface IUiOptions
public String argname() { return "java classpath"; }
},
- ClasspathOrder {
- public String pname() { return JobSpecificationProperties.key_classpath_order; }
- 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 deflt() { return ClasspathOrderParms.DuccBeforeUser.pname(); }
- },
-
Debug {
public String pname() { return "debug"; }
public boolean noargs() { return true; }
@@ -667,25 +660,4 @@ public interface IUiOptions
};
- public enum ClasspathOrderParms
- {
- UserBeforeDucc {
- public String pname() { return DuccUiConstants.classpath_order_user_before_ducc; }
- public String description() { return "Start process with user's classpath ahead of DUCC's"; }
- },
- DuccBeforeUser {
- public String pname() { return DuccUiConstants.classpath_order_ducc_before_user; }
- public String description() { return "Start process with DUCC's classpath ahead of user's"; }
- },
- Unknown {
- public String pname() { return "unknown"; }
- public String description() { return "Illegal argument"; }
- },
- ;
-
- public abstract String pname();
- public abstract String description();
-
- };
-
}
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=1663811&r1=1663810&r2=1663811&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 Tue Mar 3 22:27:56 2015
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
import org.apache.uima.ducc.cli.CliBase;
import org.apache.uima.ducc.cli.DuccJobSubmit;
@@ -87,8 +88,6 @@ public class AllInOneLauncher extends Cl
private boolean wait_for_completion = false;
private boolean cancel_on_interrupt = false;
- private boolean classpath_user_first = true;
-
private IMessageHandler mh = new MessageHandler();
private JobRequestProperties jobRequestProperties = new JobRequestProperties();
@@ -97,15 +96,17 @@ public class AllInOneLauncher extends Cl
private HashMap<String,String> optionsMap = new HashMap<String,String>();
- public AllInOneLauncher(String[] args) throws Exception {
- init (this.getClass().getName(), opts, args, jobRequestProperties, null);
+ /*
+ * Called with the already cleaned-up properties parsed by DuccSubmit to
+ * avoid duplicate fix-up messages produced by a full re-parse.
+ */
+ public AllInOneLauncher(Properties props, IDuccCallback consoleCb) throws Exception {
+ if (consoleCb != null) {
+ mh = new MessageHandler(consoleCb);
+ }
+ init (this.getClass().getName(), opts, props, jobRequestProperties, consoleCb);
}
- public AllInOneLauncher(String[] args, IDuccCallback consoleCb) throws Exception {
- mh = new MessageHandler(consoleCb);
- init (this.getClass().getName(), opts, args, jobRequestProperties, consoleCb);
- }
-
private boolean isLocal() {
return allInOneType.equalsIgnoreCase(local);
}
@@ -316,23 +317,10 @@ public class AllInOneLauncher extends Cl
String message = classpath;
mh.frameworkDebug(cid, mid, message);
- // Note: defaulted or validated in init method
- pname = UiOption.ClasspathOrder.pname();
- String value = jobRequestProperties.getProperty(pname);
- used(pname);
- classpath_user_first = value.equals(ClasspathOrderParms.UserBeforeDucc.pname());
- message = value;
- mh.frameworkDebug(cid, mid, message);
-
// Don't need all the DUCC jars as user's classpath must have all the UIMA jars it needs.
// For simplicity add only the jar that has the AllInOne class --- it will pull in other
// jars that have dependencies such as the flow controller.
- String duccClasspath = ducc_home + "/lib/uima-ducc-cli.jar";
- if (classpath_user_first) {
- classpath = classpath + File.pathSeparatorChar + duccClasspath;
- } else {
- classpath = duccClasspath + File.pathSeparatorChar + classpath;
- }
+ classpath = classpath + File.pathSeparatorChar + ducc_home + "/lib/uima-ducc-cli.jar";
mh.frameworkTrace(cid, mid, exit);
}
@@ -767,7 +755,7 @@ public class AllInOneLauncher extends Cl
}
private void addArg(ArrayList<String> cmdLine, String arg) {
- String mid = "launch_remote";
+ String mid = "addArg";
mh.frameworkTrace(cid, mid, "enter");
cmdLine.add(arg);
mh.frameworkDebug(cid, mid, arg);
@@ -828,46 +816,38 @@ public class AllInOneLauncher extends Cl
private void launch_remote() throws Exception {
String mid = "launch_remote";
mh.frameworkTrace(cid, mid, "enter");
- ArrayList<String> cmdLine = new ArrayList<String>();
- addArg(cmdLine, "--"+UiOption.ProcessExecutable.pname());
- addArg(cmdLine, jvm);
- addArg(cmdLine, "--"+UiOption.ProcessExecutableArgs.pname());
- addArg(cmdLine, getProcessExecutableArgs());
+ Properties props = new Properties();
+ props.put(UiOption.ProcessExecutable.pname(), jvm);
+ props.put(UiOption.ProcessExecutableArgs.pname(), getProcessExecutableArgs());
if(scheduling_class != null) {
- addArg(cmdLine, "--"+UiOption.SchedulingClass.pname());
- addArg(cmdLine, scheduling_class);
+ props.put(UiOption.SchedulingClass.pname(), scheduling_class);
}
+ // NOTE - revert to user-provided environment so it is not modified twice
+ environment = userSpecifiedProperties.getProperty(UiOption.Environment.pname());
if(environment != null) {
- addArg(cmdLine, "--"+UiOption.Environment.pname());
- addArg(cmdLine, environment);
+ props.put(UiOption.Environment.pname(), environment);
}
if(process_memory_size != null) {
- addArg(cmdLine, "--"+UiOption.ProcessMemorySize.pname());
- addArg(cmdLine, process_memory_size);
+ props.put(UiOption.ProcessMemorySize.pname(), process_memory_size);
}
if(log_directory != null) {
- addArg(cmdLine, "--"+UiOption.LogDirectory.pname());
- addArg(cmdLine, log_directory);
+ props.put(UiOption.LogDirectory.pname(), log_directory);
}
if(working_directory != null) {
- addArg(cmdLine, "--"+UiOption.WorkingDirectory.pname());
- addArg(cmdLine, working_directory);
+ props.put(UiOption.WorkingDirectory.pname(), working_directory);
}
if(description != null) {
- addArg(cmdLine, "--"+UiOption.Description.pname());
- addArg(cmdLine, description);
+ props.put(UiOption.Description.pname(), description);
}
if(wait_for_completion) {
- addArg(cmdLine, "--"+UiOption.WaitForCompletion.pname());
+ props.put(UiOption.WaitForCompletion.pname(), "true");
}
if(cancel_on_interrupt) {
- addArg(cmdLine, "--"+UiOption.CancelOnInterrupt.pname());
+ props.put(UiOption.CancelOnInterrupt.pname(), "true");
}
- addArg(cmdLine, "--"+UiOption.AttachConsole.pname()); // Always return console output to match "local"
-
- String[] argList = cmdLine.toArray(new String[cmdLine.size()]);
+ props.put(UiOption.AttachConsole.pname(), "true");
- DuccManagedReservationSubmit mr = new DuccManagedReservationSubmit(argList, consoleCb);
+ DuccManagedReservationSubmit mr = new DuccManagedReservationSubmit(props, consoleCb);
boolean rc = mr.execute();
String dt = "Managed Reservation";
@@ -916,11 +896,4 @@ public class AllInOneLauncher extends Cl
return returnCode;
}
- public static void main(String[] args) throws Exception {
- AllInOneLauncher allInOneLauncher = new AllInOneLauncher(args);
- allInOneLauncher.execute();
- System.exit(allInOneLauncher.getReturnCode());
- }
-
-
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java?rev=1663811&r1=1663810&r2=1663811&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java Tue Mar 3 22:27:56 2015
@@ -1094,7 +1094,6 @@ public class ServiceHandler
case ProcessMemorySize:
case ProcessExecutable:
case ProcessExecutableArgs:
- case ClasspathOrder:
case ServiceDependency:
case ProcessInitializationTimeMax:
case WorkingDirectory:
@@ -1131,6 +1130,9 @@ public class ServiceHandler
}
restart_pinger = true;
break;
+ default:
+ // In case a deprecated option such as classpath_order slips through
+ break;
}
}