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/24 14:37:44 UTC

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

Author: degenaro
Date: Wed Dec 24 13:37:44 2014
New Revision: 1647780

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

version 1.2.0-beta+ (for now)

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java?rev=1647780&r1=1647779&r2=1647780&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java Wed Dec 24 13:37:44 2014
@@ -19,7 +19,7 @@
 package org.apache.uima.ducc.orchestrator.factory;
 
 import org.apache.uima.ducc.common.config.CommonConfiguration;
-import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
+import org.apache.uima.ducc.common.utils.VersionCommunicationsJdJp;
 import org.apache.uima.ducc.transport.event.cli.JobRequestProperties;
 import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
 
@@ -27,14 +27,11 @@ public class JobFactory implements IJobF
 	
 	public static IJobFactory getInstance() {
 		IJobFactory jobFactory = null;
-		String jd_configuration_class = DuccPropertiesResolver.getInstance().getFileProperty(DuccPropertiesResolver.ducc_jd_configuration_class);
-		if(jd_configuration_class != null) {
-			if(jd_configuration_class.trim().equals("org.apache.uima.ducc.jd.config.JobDriverConfiguration")) {
-				jobFactory = JobFactoryV1.getInstance();
-			}
-			else {
-				jobFactory = JobFactoryV2.getInstance();
-			}
+		if(VersionCommunicationsJdJp.get() == 1) {
+			jobFactory = JobFactoryV1.getInstance();
+		}
+		else {
+			jobFactory = JobFactoryV2.getInstance();
 		}
 		return jobFactory;
 	}