Author: degenaro
Date: Mon Mar 25 20:20:39 2013
New Revision: 1460874
URL: http://svn.apache.org/r1460874
Log:
UIMA-2772 support for Node in DuccProcess and DuccReservation, in transport
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccReservation.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccReservation.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java?rev=1460874&r1=1460873&r2=1460874&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java
Mon Mar 25 20:20:39 2013
@@ -21,6 +21,7 @@ package org.apache.uima.ducc.transport.e
import java.util.ArrayList;
import java.util.List;
+import org.apache.uima.ducc.common.Node;
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.node.metrics.ProcessGarbageCollectionStats;
import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -38,6 +39,7 @@ public class DuccProcess implements IDuc
*/
private static final long serialVersionUID = 1L;
private DuccId duccId = null;
+ private Node node = null;
private NodeIdentity nodeIdentity = null;
private String pid = null;
private ProcessState processState = ProcessState.Undefined;
@@ -63,12 +65,27 @@ public class DuccProcess implements IDuc
setNodeIdentity(nodeIdentity);
}
+ public DuccProcess(DuccId duccId, Node node) {
+ setDuccId(duccId);
+ setNode(node);
+ NodeIdentity nodeIdentity = node.getNodeIdentity();
+ setNodeIdentity(nodeIdentity);
+ }
+
public DuccProcess(DuccId duccId, NodeIdentity nodeIdentity,
ProcessType processType) {
setDuccId(duccId);
setNodeIdentity(nodeIdentity);
setProcessType(processType);
}
-
+
+ public DuccProcess(DuccId duccId, Node node, ProcessType processType) {
+ setDuccId(duccId);
+ setNode(node);
+ NodeIdentity nodeIdentity = node.getNodeIdentity();
+ setNodeIdentity(nodeIdentity);
+ setProcessType(processType);
+ }
+
public List<IUimaPipelineAEComponent> getUimaPipelineComponents() {
return uimaPipelineComponentList;
}
@@ -484,4 +501,14 @@ public class DuccProcess implements IDuc
return this.exitCode;
}
+ @Override
+ public Node getNode() {
+ return node;
+ }
+
+ @Override
+ public void setNode(Node node) {
+ this.node = node;
+ }
+
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccReservation.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccReservation.java?rev=1460874&r1=1460873&r2=1460874&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccReservation.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccReservation.java
Mon Mar 25 20:20:39 2013
@@ -18,6 +18,7 @@
*/
package org.apache.uima.ducc.transport.event.common;
+import org.apache.uima.ducc.common.Node;
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -28,10 +29,19 @@ public class DuccReservation implements
*/
private static final long serialVersionUID = 1L;
private DuccId duccId = null;
+ private Node node = null;
private NodeIdentity nodeIdentity = null;
private int shares = 0;
private ITimeWindow timeWindow = null;
+ public DuccReservation(DuccId duccId, Node node, int shares) {
+ setDuccId(duccId);
+ setNode(node);
+ NodeIdentity nodeIdentity = node.getNodeIdentity();
+ setNodeIdentity(nodeIdentity);
+ setShares(shares);
+ }
+
public DuccReservation(DuccId duccId, NodeIdentity nodeIdentity, int
shares) {
setDuccId(duccId);
setNodeIdentity(nodeIdentity);
@@ -122,6 +132,16 @@ public class DuccReservation implements
return false;
return true;
}
+
+ @Override
+ public Node getNode() {
+ return node;
+ }
+
+ @Override
+ public void setNode(Node node) {
+ this.node = node;
+ }
// **********
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java?rev=1460874&r1=1460873&r2=1460874&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java
Mon Mar 25 20:20:39 2013
@@ -21,6 +21,7 @@ package org.apache.uima.ducc.transport.e
import java.io.Serializable;
import java.util.List;
+import org.apache.uima.ducc.common.Node;
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.node.metrics.ProcessGarbageCollectionStats;
import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -39,6 +40,9 @@ public interface IDuccProcess extends Se
public NodeIdentity getNodeIdentity();
public void setNodeIdentity(NodeIdentity nodeIdentity);
+ public Node getNode();
+ public void setNode(Node node);
+
public String getPID();
public void setPID(String pid);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccReservation.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccReservation.java?rev=1460874&r1=1460873&r2=1460874&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccReservation.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccReservation.java
Mon Mar 25 20:20:39 2013
@@ -20,6 +20,7 @@ package org.apache.uima.ducc.transport.e
import java.io.Serializable;
+import org.apache.uima.ducc.common.Node;
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -29,6 +30,9 @@ public interface IDuccReservation extend
public DuccId getDuccId();
public void setDuccId(DuccId duccId);
+ public Node getNode();
+ public void setNode(Node node);
+
public NodeIdentity getNodeIdentity();
public void setNodeIdentity(NodeIdentity nodeIdentity);
