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 16:39:10 UTC

svn commit: r1659290 - /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 15:39:10 2015
New Revision: 1659290

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

add user specified service DD as arg to JCL (temporary "legacy" accommodation)

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=1659290&r1=1659289&r2=1659290&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 15:39:10 2015
@@ -578,9 +578,17 @@ public class JobFactoryV2 implements IJo
 		switch(duccType) {
 		case Service:
 			ICommandLine jcl = job.getCommandLine();
-			String arg = jobRequestProperties.getProperty(JobSpecificationProperties.key_process_DD);
+			String name = JobSpecificationProperties.key_process_DD;
+			String arg = jobRequestProperties.getProperty(name);
+			if(arg == null) {
+				name = "process_DD";
+				arg = jobRequestProperties.getProperty(name);
+				logger.warn(methodName, job.getDuccId(), name+": "+arg);
+			}
+			else {
+				logger.debug(methodName, job.getDuccId(), name+": "+arg);
+			}
 			jcl.addArgument(arg);
-			logger.debug(methodName, job.getDuccId(),  "service_DD: "+arg);
 			break;
 		default:
 			break;