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 2014/12/17 15:32:43 UTC
svn commit: r1646263 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator:
StateManager.java factory/JobFactoryV2.java
Author: degenaro
Date: Wed Dec 17 14:32:42 2014
New Revision: 1646263
URL: http://svn.apache.org/r1646263
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath
Jp Ae from pieces-parts
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryV2.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1646263&r1=1646262&r2=1646263&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java Wed Dec 17 14:32:42 2014
@@ -470,25 +470,28 @@ public class StateManager {
}
}
- private void addDdToJpCommandLine(IDuccWorkJob dwj, IDriverStatusReport jdStatusReport) {
- String location = "addDdToJpCommandLine";
+ private void addDeployableToJpCommandLine(IDuccWorkJob dwj, IDriverStatusReport jdStatusReport) {
+ String location = "addDeployableToJpCommandLine";
DuccId jobid = null;
if(!dwj.isDdSpecified()) {
+ //V1
String jpDd = jdStatusReport.getUimaDeploymentDescriptor();
if(jpDd != null) {
- //V1
IDuccUimaDeploymentDescriptor uimaDeploymentDescriptor = new DuccUimaDeploymentDescriptor(jpDd);
dwj.setUimaDeployableConfiguration(uimaDeploymentDescriptor);
- //V2
+ }
+ //V2
+ String jpAe = jdStatusReport.getUimaAnalysisEngine();
+ if(jpAe != null) {
ICommandLine jcl = dwj.getCommandLine();
List<String> args = jcl.getArguments();
- String arg = uimaDeploymentDescriptor.getDeploymentDescriptorPath();
+ String arg = jpAe;
if(args == null) {
jcl.addArgument(arg);
logger.debug(location, jobid, "add[null]:"+arg);
}
else if(args.isEmpty()) {
- jcl.addArgument(uimaDeploymentDescriptor.getDeploymentDescriptorPath());
+ jcl.addArgument(jpAe);
logger.debug(location, jobid, "add[empty]:"+arg);
}
List<String> argList = jcl.getArguments();
@@ -519,7 +522,7 @@ public class StateManager {
DuccWorkJob duccWorkJob = (DuccWorkJob) WorkMapHelper.findDuccWork(workMap, sid, this, methodName);
if(duccWorkJob != null) {
addJdUrlToJpCommandLine(duccWorkJob, jdStatusReport);
- addDdToJpCommandLine(duccWorkJob, jdStatusReport);
+ addDeployableToJpCommandLine(duccWorkJob, jdStatusReport);
//
String jdJmxUrl = jdStatusReport.getJdJmxUrl();
setJdJmxUrl(duccWorkJob, jdJmxUrl);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryV2.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryV2.java?rev=1646263&r1=1646262&r2=1646263&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryV2.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryV2.java Wed Dec 17 14:32:42 2014
@@ -645,7 +645,12 @@ public class JobFactoryV2 implements IJo
pipelineCommandLine.addOption(opt);
- addDashD(pipelineCommandLine, FlagsHelper.Name.JpType, "uima-as");
+ addDashD(pipelineCommandLine, FlagsHelper.Name.JpType, "uima");
+
+ String process_thread_count = jobRequestProperties.getProperty(JobSpecificationProperties.key_process_thread_count);
+ if(process_thread_count != null) {
+ addDashD(pipelineCommandLine, FlagsHelper.Name.JpThreadCount, process_thread_count);
+ }
String processEnvironmentVariables = jobRequestProperties.getProperty(JobSpecificationProperties.key_environment);
int envCountProcess = addEnvironment(job, "process", pipelineCommandLine, processEnvironmentVariables);