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/11/18 14:18:24 UTC

svn commit: r1640335 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport: configuration/jd/JobDriverComponent.java event/jd/JobDriverReport.java

Author: degenaro
Date: Tue Nov 18 13:18:24 2014
New Revision: 1640335

URL: http://svn.apache.org/r1640335
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.

JobDriverReport (incomplete) - add JobId.
JdFlagsHelper.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java?rev=1640335&r1=1640334&r2=1640335&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java Tue Nov 18 13:18:24 2014
@@ -25,8 +25,8 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.camel.CamelContext;
 import org.apache.uima.ducc.common.component.AbstractDuccComponent;
-import org.apache.uima.ducc.common.config.SystemPropertiesHelper;
-import org.apache.uima.ducc.common.config.SystemPropertiesHelper.Name;
+import org.apache.uima.ducc.common.jd.JdFlagsHelper;
+import org.apache.uima.ducc.common.jd.JdFlagsHelper.Name;
 import org.apache.uima.ducc.common.utils.DuccLogger;
 import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
 import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -57,7 +57,7 @@ implements IJobDriverComponent {
 		String location = "verifySystemProperties";
 		Properties properties = System.getProperties();
 		ArrayList<String> missing = new ArrayList<String>();
-		for(Name name : SystemPropertiesHelper.Name.values()) {
+		for(Name name : JdFlagsHelper.Name.values()) {
 			String key = name.name();
 			if(properties.containsKey(key)) {
 				String value = properties.getProperty(key);

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java?rev=1640335&r1=1640334&r2=1640335&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java Tue Nov 18 13:18:24 2014
@@ -81,8 +81,20 @@ public class JobDriverReport implements 
 		return retVal;
 	}
 	
+	private DuccId getDuccId(IOperatingInfo operatingInfo) {
+		DuccId retVal = null;
+		try {
+			String jobId = operatingInfo.getJobId();
+			long value = Long.parseLong(jobId);
+			retVal = new DuccId(value);
+		}
+		catch(Exception e) {
+			e.printStackTrace();
+		}
+		return retVal;
+	}
 	public JobDriverReport(IOperatingInfo operatingInfo) {
-		//setDuccId(driverContainer.getDuccId());
+		setDuccId(getDuccId(operatingInfo));
 		//setJmxUrl(driverContainer.getJmxUrl());
 		setWorkItemsTotal(operatingInfo.getWorkItemCrTotal());
 		setWorkItemsProcessingCompleted(operatingInfo.getWorkItemEndSuccesses());