Author: degenaro Date: Thu May 2 12:01:39 2013 New Revision: 1478336 URL: http://svn.apache.org/r1478336 Log: UIMA-2854 DUCC command line interface (CLI) should choose an appropriate "fixed" class for submission when all-in-one or debug flag is specified
Modified: 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/utils/DuccPropertiesResolver.java 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=1478336&r1=1478335&r2=1478336&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 May 2 12:01:39 2013 @@ -34,7 +34,6 @@ import org.apache.uima.ducc.cli.DuccJobS import org.apache.uima.ducc.cli.DuccManagedReservationSubmit; import org.apache.uima.ducc.cli.aio.IMessageHandler.Level; import org.apache.uima.ducc.cli.aio.IMessageHandler.Toggle; -import org.apache.uima.ducc.common.utils.DuccPropertiesResolver; import org.apache.uima.ducc.common.utils.DuccSchedulerClasses; import org.apache.uima.ducc.transport.event.cli.JobRequestProperties; @@ -105,11 +104,6 @@ public class AllInOneLauncher extends Cl public AllInOneLauncher(String[] args) throws Exception { this.args = args; init(this.getClass().getName(), opts, args, jobRequestProperties, or_host, or_port, "or", consoleCb, null); - String key = DuccPropertiesResolver.ducc_submit_all_in_one_class; - String value = DuccPropertiesResolver.getInstance().getFileProperty(key); - if(value != null) { - scheduling_class = value; - } } private boolean isLocal() { Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java?rev=1478336&r1=1478335&r2=1478336&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java Thu May 2 12:01:39 2013 @@ -49,7 +49,6 @@ public class DuccPropertiesResolver { public static final String ducc_submit_threads_limit = "ducc.submit.threads.limit"; public static final String ducc_submit_driver_jvm_args = "ducc.submit.driver.jvm.args"; public static final String ducc_submit_process_jvm_args = "ducc.submit.process.jvm.args"; - public static final String ducc_submit_all_in_one_class = "ducc.submit.all.in.one.class"; public static final String ducc_runmode = "ducc.runmode"; public static final String ducc_signature_required = "ducc.signature.required";