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/15 18:12:38 UTC
svn commit: r1643115 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd:
IDriverStatusReport.java JobDriverReport.java
Author: degenaro
Date: Wed Dec 3 13:43:36 2014
New Revision: 1643115
URL: http://svn.apache.org/r1643115
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.
JobCompletionType.EndOfJob.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/IDriverStatusReport.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/event/jd/IDriverStatusReport.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/IDriverStatusReport.java?rev=1643115&r1=1643114&r2=1643115&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/IDriverStatusReport.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/IDriverStatusReport.java Wed Dec 3 13:43:36 2014
@@ -25,7 +25,6 @@ import org.apache.uima.ducc.common.jd.fi
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.common.IDuccCompletionType.JobCompletionType;
import org.apache.uima.ducc.transport.event.common.IDuccPerWorkItemStatistics;
-import org.apache.uima.ducc.transport.event.common.IDuccUimaDeploymentDescriptor;
import org.apache.uima.ducc.transport.event.common.IRationale;
import org.apache.uima.ducc.transport.event.jd.IDriverState.DriverState;
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=1643115&r1=1643114&r2=1643115&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 Wed Dec 3 13:43:36 2014
@@ -29,10 +29,8 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.jd.mh.iface.IOperatingInfo;
import org.apache.uima.ducc.container.jd.mh.iface.IWorkItemInfo;
import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.JdState;
-import org.apache.uima.ducc.transport.event.common.DuccUimaDeploymentDescriptor;
import org.apache.uima.ducc.transport.event.common.IDuccCompletionType.JobCompletionType;
import org.apache.uima.ducc.transport.event.common.IDuccPerWorkItemStatistics;
-import org.apache.uima.ducc.transport.event.common.IDuccUimaDeploymentDescriptor;
import org.apache.uima.ducc.transport.event.common.IRationale;
import org.apache.uima.ducc.transport.event.jd.IDriverState.DriverState;
@@ -72,6 +70,8 @@ public class JobDriverReport implements
private String jpDd = null;
+ private JobCompletionType jobCompletionType = JobCompletionType.EndOfJob;
+
private long max(long a, long b) {
long retVal = a;
if(b > a) {
@@ -387,14 +387,16 @@ public class JobDriverReport implements
else if(state.equals(JdState.Active.name())) {
retVal = DriverState.Running;
}
+ else if(state.equals(JdState.Ended.name())) {
+ retVal = DriverState.Completed;
+ }
}
return retVal;
}
@Override
public JobCompletionType getJobCompletionType() {
- // TODO Auto-generated method stub
- return null;
+ return jobCompletionType;
}
@Override