svn commit: r1636935 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src: main/java/org/apache/uima/ducc/container/jd/mh/iface/ main/java/org/apache/uima/ducc/container/jd/mh/impl/ test/java/org/apache/uima/ducc/container/jd/test/

[degenaro]

Author: degenaro
Date: Wed Nov  5 18:45:06 2014
New Revision: 1636935

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

CR status: isPending

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
    
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
    
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java?rev=1636935&r1=1636934&r2=1636935&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
 Wed Nov  5 18:45:06 2014
@@ -26,6 +26,8 @@ public interface IOperatingInfo {
        public void setWorkItemCrFetches(int value);
        public int getWorkItemCrFetches();
        
+       public boolean isWorkItemCrPending();
+
        public void setWorkItemJpSends(int value);
        public int getWorkItemJpSends();
        

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java?rev=1636935&r1=1636934&r2=1636935&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
 Wed Nov  5 18:45:06 2014
@@ -62,6 +62,11 @@ public class OperatingInfo implements IO
        }
 
        @Override
+       public boolean isWorkItemCrPending() {
+               return (crFetches < crTotal);
+       }
+       
+       @Override
        public void setWorkItemJpSends(int value) {
                jpSends = value;
        }

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java?rev=1636935&r1=1636934&r2=1636935&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
 Wed Nov  5 18:45:06 2014
@@ -212,6 +212,13 @@ public class TestDispatcher {
                        IMetaCas metaCas = 
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
                        assertTrue(metaCas != null);
                        while(metaCas != null) {
+                               IOperatingInfo oi = 
dispatcher.handleGetOperatingInfo();
+                               if(metaCas.getSystemKey().equals("100")) {
+                                       assertTrue(!oi.isWorkItemCrPending());
+                               }
+                               else {
+                                       assertTrue(oi.isWorkItemCrPending());
+                               }
                                
transAck(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
                                
transEnd(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
                                casNo++;