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/24 23:01:06 UTC
svn commit: r1641489 - 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: Mon Nov 24 22:01:05 2014
New Revision: 1641489
URL: http://svn.apache.org/r1641489
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.
JobDriverReoprt with DriverStatus.
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=1641489&r1=1641488&r2=1641489&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 Mon Nov 24 22:01:05 2014
@@ -91,6 +91,7 @@ public interface IDriverStatusReport {
public Iterator<DuccId> getKillDuccIds();
+ @Deprecated
public DriverState getDriverState();
public JobCompletionType getJobCompletionType();
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=1641489&r1=1641488&r2=1641489&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 Mon Nov 24 22:01:05 2014
@@ -28,6 +28,7 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.container.common.Util;
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.IDuccCompletionType.JobCompletionType;
import org.apache.uima.ducc.transport.event.common.IDuccPerWorkItemStatistics;
import org.apache.uima.ducc.transport.event.common.IDuccUimaDeploymentDescriptor;
@@ -356,10 +357,20 @@ public class JobDriverReport implements
return null;
}
+ @Deprecated
@Override
public DriverState getDriverState() {
- // TODO Auto-generated method stub
- return null;
+ DriverState retVal = DriverState.Undefined;
+ String state = getJdState();
+ if(state != null) {
+ if(state.equals(JdState.Initializing.name())) {
+ retVal = DriverState.Initializing;
+ }
+ else if(state.equals(JdState.Active.name())) {
+ retVal = DriverState.Running;
+ }
+ }
+ return retVal;
}
@Override