You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2013/04/15 22:04:49 UTC
svn commit: r1468206 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
Author: degenaro
Date: Mon Apr 15 20:04:48 2013
New Revision: 1468206
URL: http://svn.apache.org/r1468206
Log:
UIMA-2793 Support --all_in_one remote (optionally specify ManagedResource submit class in ducc.properties)
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=1468206&r1=1468205&r2=1468206&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 Mon Apr 15 20:04:48 2013
@@ -34,6 +34,7 @@ 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.transport.event.cli.JobRequestProperties;
public class AllInOneLauncher extends CliBase {
@@ -46,7 +47,6 @@ public class AllInOneLauncher extends Cl
private static String remote = "remote";
private static String local = "local";
- //TODO get scheduling class from ducc.properties
private static String fixed = "fixed";
private static String enter = "enter";
@@ -105,6 +105,11 @@ 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=1468206&r1=1468205&r2=1468206&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 Mon Apr 15 20:04:48 2013
@@ -49,6 +49,7 @@ 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";