You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2013/11/13 00:57:15 UTC
svn commit: r1541326 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java
uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
Author: burn
Date: Tue Nov 12 23:57:15 2013
New Revision: 1541326
URL: http://svn.apache.org/r1541326
Log:
UIMA_3428 Load JD & JP abbreviated classpaths from resources/jobclasspath.properties
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java?rev=1541326&r1=1541325&r2=1541326&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccEnv.java Tue Nov 12 23:57:15 2013
@@ -30,6 +30,7 @@ public interface IDuccEnv {
public static final String DUCC_NODES_FILE_NAME = "ducc.nodes";
public static final String DUCC_NODES_FILE_PATH = DUCC_RESOURCES_DIR+DUCC_NODES_FILE_NAME;
public static final String DUCC_ADMINISTRATORS_FILE = DUCC_RESOURCES_DIR+"ducc.administrators";
+ public static final String DUCC_CLASSPATH_FILE = DUCC_RESOURCES_DIR+"jobclasspath.properties";
public static final String DUCC_STATE_DIR = DUCC_HOME_DIR+"state"+File.separator;
public static final String DUCC_DAEMONS_DIR = DUCC_STATE_DIR+"daemons"+File.separator;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java?rev=1541326&r1=1541325&r2=1541326&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java Tue Nov 12 23:57:15 2013
@@ -83,8 +83,7 @@ public class JobFactory {
private IDuccIdFactory duccIdFactory = orchestratorCommonArea.getDuccIdFactory();
private JobDriverHostManager hostManager = orchestratorCommonArea.getHostManager();
private DuccIdFactory jdIdFactory = new DuccIdFactory();
-
- private String java_classpath = System.getProperty("java.class.path");
+
private String classpath_order = System.getProperty("ducc.orchestrator.job.factory.classpath.order");
private int addEnvironment(DuccWorkJob job, String type, ACommandLine aCommandLine, String environmentVariables) {
@@ -284,6 +283,13 @@ public class JobFactory {
driverCommandLine.addOption(IDuccCommand.arg_ducc_deploy_components);
driverCommandLine.addOption(IDuccCommand.arg_ducc_job_id+job.getDuccId().toString());
// classpath
+ DuccProperties props = new DuccProperties();
+ try {
+ props.load(IDuccEnv.DUCC_CLASSPATH_FILE);
+ } catch (Exception e) {
+ logger.error(methodName, job.getDuccId(), "Failed to load " + IDuccEnv.DUCC_CLASSPATH_FILE);
+ }
+ String java_classpath = props.getProperty("ducc.jobdriver.classpath");
String driverClasspath = jobRequestProperties.getProperty(JobSpecificationProperties.key_classpath);
logger.debug(methodName, job.getDuccId(), "driver CP (spec):"+driverClasspath);
logger.debug(methodName, job.getDuccId(), "java CP:"+java_classpath);
@@ -411,6 +417,13 @@ public class JobFactory {
// log
jobRequestProperties.specification(logger);
// classpath
+ DuccProperties props = new DuccProperties();
+ try {
+ props.load(IDuccEnv.DUCC_CLASSPATH_FILE);
+ } catch (Exception e) {
+ logger.error(methodName, job.getDuccId(), "Failed to load " + IDuccEnv.DUCC_CLASSPATH_FILE);
+ }
+ String java_classpath = props.getProperty("ducc.jobprocess.classpath");
String processClasspath = jobRequestProperties.getProperty(JobSpecificationProperties.key_classpath);
logger.debug(methodName, job.getDuccId(), "process CP (spec):"+processClasspath);
logger.debug(methodName, job.getDuccId(), "java CP:"+java_classpath);