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 2015/02/12 19:15:28 UTC

svn commit: r1659346 - /uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryV2.java

Author: degenaro
Date: Thu Feb 12 18:15:27 2015
New Revision: 1659346

URL: http://svn.apache.org/r1659346
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath

add user specified service DD as arg to JCL

Modified:
    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/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=1659346&r1=1659345&r2=1659346&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 Thu Feb 12 18:15:27 2015
@@ -44,7 +44,6 @@ import org.apache.uima.ducc.orchestrator
 import org.apache.uima.ducc.orchestrator.OrUtil;
 import org.apache.uima.ducc.orchestrator.OrchestratorCommonArea;
 import org.apache.uima.ducc.transport.cmdline.ACommandLine;
-import org.apache.uima.ducc.transport.cmdline.ICommandLine;
 import org.apache.uima.ducc.transport.cmdline.JavaCommandLine;
 import org.apache.uima.ducc.transport.cmdline.NonJavaCommandLine;
 import org.apache.uima.ducc.transport.event.cli.JobRequestProperties;
@@ -574,10 +573,11 @@ public class JobFactoryV2 implements IJo
 			logger.error(methodName, job.getDuccId(), e);
 		}
 		// jp or sp
+		JavaCommandLine pipelineCommandLine = new JavaCommandLine(javaCmd);
+		pipelineCommandLine.setClassName("main:provided-by-Process-Manager");
 		ServiceDeploymentType serviceDeploymentType = job.getServiceDeploymentType();
 		switch(duccType) {
 		case Service:
-			ICommandLine jcl = job.getCommandLine();
 			String name = JobSpecificationProperties.key_process_DD;
 			String arg = jobRequestProperties.getProperty(name);
 			if(arg == null) {
@@ -588,7 +588,7 @@ public class JobFactoryV2 implements IJo
 			else {
 				logger.debug(methodName, job.getDuccId(), name+": "+arg);
 			}
-			jcl.addArgument(arg);
+			pipelineCommandLine.addArgument(arg);
 			break;
 		default:
 			break;
@@ -631,9 +631,6 @@ public class JobFactoryV2 implements IJo
 				job.setUimaDeployableConfiguration(uimaAggregate);
 				dump(job, uimaAggregate);
 			}
-			// pipelines
-			JavaCommandLine pipelineCommandLine = new JavaCommandLine(javaCmd);
-			pipelineCommandLine.setClassName("main:provided-by-Process-Manager");
 			// user CP
 			String userCP = jobRequestProperties.getProperty(JobSpecificationProperties.key_classpath);
 			userCP = addUimaDucc(userCP);