You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2018/04/30 18:57:28 UTC
svn commit: r1830621 - in /uima/uima-ducc/trunk: ./ uima-ducc-container/
uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/
uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/
uima-ducc-container/src/main/java/or...
Author: cwiklik
Date: Mon Apr 30 18:57:27 2018
New Revision: 1830621
URL: http://svn.apache.org/viewvc?rev=1830621&view=rev
Log:
UIMA-5756 new project uima-ducc-pullservice and refactorings
Modified:
uima/uima-ducc/trunk/pom.xml
uima/uima-ducc/trunk/uima-ducc-container/pom.xml
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/DuccServiceDriver.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/DuccServiceTaskProtocolHandler.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/TestTaskAllocatorCallbackListener.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/WiTaskConsumer.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/iface/TaskAllocatorCallbackListener.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/iface/TaskProtocolHandler.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/transport/HttpTaskTransportHandler.java
Modified: uima/uima-ducc/trunk/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/pom.xml?rev=1830621&r1=1830620&r2=1830621&view=diff
==============================================================================
--- uima/uima-ducc/trunk/pom.xml (original)
+++ uima/uima-ducc/trunk/pom.xml Mon Apr 30 18:57:27 2018
@@ -16,11 +16,8 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
-<!-- This pom serves as the release top level project for the multi-module
- project UIMA-DUCC -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+--><!-- This pom serves as the release top level project for the multi-module
+ project UIMA-DUCC --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -209,7 +206,7 @@
</dependency>
</dependencies>
<build>
- <resources />
+ <resources/>
@@ -475,12 +472,12 @@
<tasks>
<replace dir="${project.build.directory}/uima-as/apache-uima-as-${org.apache.uima.as.version}/bin">
- <include name="**/dd2spring.xsl" />
- <replacefilter token="scope="singleton"" value="" />
- <replacefilter token="spring-beans.dtd" value="spring-beans-2.0.dtd" />
+ <include name="**/dd2spring.xsl"/>
+ <replacefilter token="scope="singleton"" value=""/>
+ <replacefilter token="spring-beans.dtd" value="spring-beans-2.0.dtd"/>
</replace>
- <chmod file="${project.build.directory}/uima-as/apache-uima-as-${org.apache.uima.as.version}/bin/dd2spring.xsl" perm="ugo+rx" />
+ <chmod file="${project.build.directory}/uima-as/apache-uima-as-${org.apache.uima.as.version}/bin/dd2spring.xsl" perm="ugo+rx"/>
</tasks>
</configuration>
<goals>
@@ -579,6 +576,6 @@
<module>uima-ducc-user</module>
<!-- Note: uima-ducc-container has a test dependency on uima-ducc-user so must be built after it -->
<module>uima-ducc-container</module>
- </modules>
+ <module>uima-ducc-pullservice</module>
+ </modules>
</project>
-
Modified: uima/uima-ducc/trunk/uima-ducc-container/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/pom.xml?rev=1830621&r1=1830620&r2=1830621&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-container/pom.xml (original)
+++ uima/uima-ducc/trunk/uima-ducc-container/pom.xml Mon Apr 30 18:57:27 2018
@@ -47,6 +47,11 @@
<artifactId>uima-ducc-user</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uima-ducc-pullservice</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -62,6 +67,13 @@
<groupId>org.apache.uima</groupId>
<artifactId>uima-ducc-user</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uima-ducc-pullservice</artifactId>
+
+ </dependency>
+
</dependencies>
<profiles>
<profile>
Modified: uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/DuccServiceDriver.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/DuccServiceDriver.java?rev=1830621&r1=1830620&r2=1830621&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/DuccServiceDriver.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/DuccServiceDriver.java Mon Apr 30 18:57:27 2018
@@ -23,10 +23,7 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.uima.UIMAFramework;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.Type;
-import org.apache.uima.ducc.container.net.impl.MetaCasTransaction;
-import org.apache.uima.ducc.container.net.impl.TransactionId;
+
import org.apache.uima.ducc.container.sd.iface.ServiceDriver;
import org.apache.uima.ducc.container.sd.task.DuccServiceTaskProtocolHandler;
import org.apache.uima.ducc.container.sd.task.TestTaskAllocatorCallbackListener;
@@ -37,6 +34,10 @@ import org.apache.uima.ducc.container.sd
import org.apache.uima.ducc.container.sd.task.transport.Transports;
import org.apache.uima.ducc.container.sd.task.transport.Transports.TransportType;
import org.apache.uima.ducc.container.sd.task.transport.iface.TaskTransportHandler;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction.Type;
+import org.apache.uima.ducc.ps.net.impl.MetaTaskTransaction;
+import org.apache.uima.ducc.ps.net.impl.TransactionId;
import org.apache.uima.util.Level;
import org.apache.uima.util.Logger;
@@ -115,7 +116,7 @@ public class DuccServiceDriver implement
public void test() throws Exception {
AtomicInteger IdGenerator =
new AtomicInteger();
- IMetaCasTransaction transaction = new MetaCasTransaction();
+ IMetaTaskTransaction transaction = new MetaTaskTransaction();
int major = IdGenerator.addAndGet(1);
int minor = 0;
Modified: uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/DuccServiceTaskProtocolHandler.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/DuccServiceTaskProtocolHandler.java?rev=1830621&r1=1830620&r2=1830621&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/DuccServiceTaskProtocolHandler.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/DuccServiceTaskProtocolHandler.java Mon Apr 30 18:57:27 2018
@@ -31,20 +31,21 @@ import java.util.concurrent.atomic.Atomi
import org.apache.uima.UIMAFramework;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
-import org.apache.uima.ducc.container.jd.fsm.wi.IMetaMetaCas;
-import org.apache.uima.ducc.container.jd.fsm.wi.MetaMetaCas;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.Hint;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.Type;
-import org.apache.uima.ducc.container.net.iface.IPerformanceMetrics;
-import org.apache.uima.ducc.container.net.impl.MetaCas;
+
import org.apache.uima.ducc.container.sd.DuccServiceDriver;
import org.apache.uima.ducc.container.sd.iface.ServiceDriver;
import org.apache.uima.ducc.container.sd.task.error.TaskProtocolException;
+import org.apache.uima.ducc.container.sd.task.iface.ITask;
import org.apache.uima.ducc.container.sd.task.iface.TaskAllocatorCallbackListener;
import org.apache.uima.ducc.container.sd.task.iface.TaskConsumer;
import org.apache.uima.ducc.container.sd.task.iface.TaskProtocolHandler;
+import org.apache.uima.ducc.ps.net.iface.IMetaMetaTask;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction.Hint;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction.Type;
+import org.apache.uima.ducc.ps.net.impl.MetaMetaTask;
+import org.apache.uima.ducc.ps.net.impl.MetaTask;
import org.apache.uima.util.Level;
import org.apache.uima.util.Logger;
@@ -62,11 +63,11 @@ public class DuccServiceTaskProtocolHand
}
@Override
- public void handle(IMetaCasTransaction wi) throws TaskProtocolException {
- handleMetaCasTransation(wi);
+ public void handle(IMetaTaskTransaction wi) throws TaskProtocolException {
+ handleMetaTaskTransation(wi);
}
- private void handleMetaCasTransation(IMetaCasTransaction trans) {
+ private void handleMetaTaskTransation(IMetaTaskTransaction trans) {
try {
trans.setResponseHints(new ArrayList<Hint>());
@@ -80,15 +81,15 @@ public class DuccServiceTaskProtocolHand
switch(type) {
case Get:
logger.log(Level.FINE,"---- Driver handling GET Request - Requestor:"+taskConsumer.toString());
- handleMetaCasTransationGet(trans, taskConsumer);
+ handleMetaTaskTransationGet(trans, taskConsumer);
break;
case Ack:
logger.log(Level.FINE,"---- Driver handling ACK Request - Requestor:"+taskConsumer.toString());
- handleMetaCasTransationAck(trans, taskConsumer);
+ handleMetaTaskTransationAck(trans, taskConsumer);
break;
case End:
logger.log(Level.FINE,"---- Driver handling END Request - Requestor:"+taskConsumer.toString());
- handleMetaCasTransationEnd(trans, taskConsumer);
+ handleMetaTaskTransationEnd(trans, taskConsumer);
break;
case InvestmentReset:
// handleMetaCasTransationInvestmentReset(trans, rwt);
@@ -96,7 +97,7 @@ public class DuccServiceTaskProtocolHand
default:
break;
}
- IMetaCas metaCas = trans.getMetaCas();
+ IMetaTask metaCas = trans.getMetaTask();
if(metaCas != null) {
metaCas.setPerformanceMetrics(null);
metaCas.setUserSpaceException(null);
@@ -120,31 +121,30 @@ public class DuccServiceTaskProtocolHand
// TODO Auto-generated method stub
}
- private void handleMetaCasTransationGet(IMetaCasTransaction trans, TaskConsumer taskConsumer) {
- IMetaMetaCas mmc = getMetaMetaCas(taskConsumer);
- trans.setMetaCas( mmc.getMetaCas());
+ private void handleMetaTaskTransationGet(IMetaTaskTransaction trans, TaskConsumer taskConsumer) {
+ IMetaMetaTask mmc = getMetaMetaTask(taskConsumer);
+ trans.setMetaTask( mmc.getMetaCas());
}
- private IMetaCas getMetaCas(String serializedCas) {
+ private IMetaTask getMetaTask(String serializedCas) {
if ( serializedCas == null ) {
return null;
}
- return new MetaCas(atomicCounter.incrementAndGet(), "", serializedCas);
+ return new MetaTask(atomicCounter.incrementAndGet(), "", serializedCas);
}
- private synchronized IMetaMetaCas getMetaMetaCas(TaskConsumer taskConsumer) {
- IMetaMetaCas mmc = new MetaMetaCas();
+ private synchronized IMetaMetaTask getMetaMetaTask(TaskConsumer taskConsumer) {
+ IMetaMetaTask mmc = new MetaMetaTask();
ServiceDriver sd = DuccServiceDriver.getInstance();
TaskAllocatorCallbackListener taskAllocator =
sd.getTaskAllocator();
- String serializedCas =
- taskAllocator.getSerializedCAS(taskConsumer);
- IMetaCas metaCas = getMetaCas(serializedCas);
+ ITask task = taskAllocator.getTask(taskConsumer);
+ IMetaTask metaTask = getMetaTask(task.asString());
- mmc.setMetaCas(metaCas);
+ mmc.setMetaCas(metaTask);
return mmc;
}
- private void handleMetaCasTransationAck(IMetaCasTransaction trans, TaskConsumer taskConsumer) {
+ private void handleMetaTaskTransationAck(IMetaTaskTransaction trans, TaskConsumer taskConsumer) {
}
private Throwable deserialize(Object byteArray) throws IOException, ClassNotFoundException {
@@ -153,13 +153,13 @@ public class DuccServiceTaskProtocolHand
Throwable t = (Throwable) ois.readObject();
return t;
}
- private void handleMetaCasTransationEnd(IMetaCasTransaction trans, TaskConsumer taskConsumer) {
+ private void handleMetaTaskTransationEnd(IMetaTaskTransaction trans, TaskConsumer taskConsumer) {
ServiceDriver sd = DuccServiceDriver.getInstance();
TaskAllocatorCallbackListener taskAllocator =
sd.getTaskAllocator();
- if ( trans.getMetaCas().getUserSpaceException() != null ) {
+ if ( trans.getMetaTask().getUserSpaceException() != null ) {
Object serializedException =
- trans.getMetaCas().getUserSpaceException();
+ trans.getMetaTask().getUserSpaceException();
String exceptionAsString="";
try {
Throwable t = deserialize(serializedException);
@@ -169,13 +169,13 @@ public class DuccServiceTaskProtocolHand
} catch( Exception ee) {
logger.log(Level.WARNING,"Error",ee );
}
- taskAllocator.onTaskFailure( taskConsumer, exceptionAsString );
+ taskAllocator.onTaskFailure( taskConsumer, trans.getMetaTask().getAppData(), exceptionAsString );
} else {
- IPerformanceMetrics m =
- trans.getMetaCas().getPerformanceMetrics();
+ String m =
+ trans.getMetaTask().getPerformanceMetrics();
- taskAllocator.onTaskSuccess( taskConsumer, m );
+ taskAllocator.onTaskSuccess( taskConsumer,trans.getMetaTask().getAppData(), m );
}
}
Modified: uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/TestTaskAllocatorCallbackListener.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/TestTaskAllocatorCallbackListener.java?rev=1830621&r1=1830620&r2=1830621&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/TestTaskAllocatorCallbackListener.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/TestTaskAllocatorCallbackListener.java Mon Apr 30 18:57:27 2018
@@ -30,6 +30,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.uima.UIMAFramework;
import org.apache.uima.cas.CAS;
import org.apache.uima.ducc.container.net.iface.IPerformanceMetrics;
+import org.apache.uima.ducc.container.sd.task.iface.ITask;
import org.apache.uima.ducc.container.sd.task.iface.TaskAllocatorCallbackListener;
import org.apache.uima.ducc.container.sd.task.iface.TaskConsumer;
import org.apache.uima.ducc.user.common.DuccUimaSerializer;
@@ -59,7 +60,7 @@ public class TestTaskAllocatorCallbackLi
String serializedCas = uimaSerializer.serializeCasToXmi(cas);
return serializedCas;
}
- public String getSerializedCAS(TaskConsumer taskConsumer) {
+ public ITask getTask(TaskConsumer taskConsumer) {
logger.log(Level.INFO,"getSerializedCAS() Call "+seqno.incrementAndGet()
+ " - from "+taskConsumer.getType()+":"+taskConsumer.getHostName()+"-"+taskConsumer.getPid()+"-"+taskConsumer.getThreadId() );
String serializedCas = null;
@@ -90,22 +91,22 @@ public class TestTaskAllocatorCallbackLi
logger.log(Level.WARNING,"Error",e);
}
- return serializedCas;
+ return new SimpleTask(serializedCas);
}
- public synchronized void onTaskSuccess(TaskConsumer taskConsumer, IPerformanceMetrics metrics) {
+ public synchronized void onTaskSuccess(TaskConsumer taskConsumer, String appdata, String processResult) {
logger.log(Level.INFO,"onTaskSuccess() Starting");
- List<Properties> breakdown = metrics.get();
-
- for( Properties p : breakdown ) {
- StringBuffer sb = new StringBuffer();
- sb.append("AE Name: ").append(p.get("uniqueName")).append(" Analysis Time: ").append(p.get("analysisTime"));
- System.out.println("\tmetrics: "+taskConsumer.toString()+" -- "+sb.toString());
- }
+ //List<Properties> breakdown = metrics.get();
+ System.out.println("\tmetrics: "+processResult);
+// for( Properties p : breakdown ) {
+// StringBuffer sb = new StringBuffer();
+// sb.append("AE Name: ").append(p.get("uniqueName")).append(" Analysis Time: ").append(p.get("analysisTime"));
+// System.out.println("\tmetrics: "+taskConsumer.toString()+" -- "+sb.toString());
+// }
logger.log(Level.INFO,"onTaskSuccess() Completed");
}
- public void onTaskFailure(TaskConsumer taskConsumer, String stringifiedException) {
+ public void onTaskFailure(TaskConsumer taskConsumer, String appdata, String processError) {
logger.log(Level.INFO,"onTaskFailure) Called");
}
Modified: uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/WiTaskConsumer.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/WiTaskConsumer.java?rev=1830621&r1=1830620&r2=1830621&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/WiTaskConsumer.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/WiTaskConsumer.java Mon Apr 30 18:57:27 2018
@@ -19,8 +19,8 @@
package org.apache.uima.ducc.container.sd.task;
-import org.apache.uima.ducc.container.net.iface.IMetaCasRequester;
import org.apache.uima.ducc.container.sd.task.iface.TaskConsumer;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskRequester;
public class WiTaskConsumer implements TaskConsumer {
@@ -30,11 +30,11 @@ public class WiTaskConsumer implements T
private String pid;
private String threadId;
- public WiTaskConsumer(IMetaCasRequester metaCasRequester) {
- this.serviceType = metaCasRequester.getRequesterProcessName();
- this.host = metaCasRequester.getRequesterNodeName();
- this.pid = String.valueOf(metaCasRequester.getRequesterProcessId());
- this.threadId = String.valueOf(metaCasRequester.getRequesterThreadId());
+ public WiTaskConsumer(IMetaTaskRequester metaTaskRequester) {
+ this.serviceType = metaTaskRequester.getRequesterProcessName();
+ this.host = metaTaskRequester.getRequesterNodeName();
+ this.pid = String.valueOf(metaTaskRequester.getRequesterProcessId());
+ this.threadId = String.valueOf(metaTaskRequester.getRequesterThreadId());
}
public String getType() {
Modified: uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/iface/TaskAllocatorCallbackListener.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/iface/TaskAllocatorCallbackListener.java?rev=1830621&r1=1830620&r2=1830621&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/iface/TaskAllocatorCallbackListener.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/iface/TaskAllocatorCallbackListener.java Mon Apr 30 18:57:27 2018
@@ -19,10 +19,8 @@
package org.apache.uima.ducc.container.sd.task.iface;
-import org.apache.uima.ducc.container.net.iface.IPerformanceMetrics;
-
public interface TaskAllocatorCallbackListener {
- public String getSerializedCAS(TaskConsumer taskConsumer);
- public void onTaskSuccess(TaskConsumer taskConsumer, IPerformanceMetrics metrics);
- public void onTaskFailure(TaskConsumer taskConsumer, String stringifiedException);
+ public ITask getTask(TaskConsumer taskConsumer);
+ public void onTaskSuccess(TaskConsumer taskConsumer, String appdata, String processResult);
+ public void onTaskFailure(TaskConsumer taskConsumer, String appdata, String processError);
}
Modified: uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/iface/TaskProtocolHandler.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/iface/TaskProtocolHandler.java?rev=1830621&r1=1830620&r2=1830621&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/iface/TaskProtocolHandler.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/iface/TaskProtocolHandler.java Mon Apr 30 18:57:27 2018
@@ -21,15 +21,15 @@ package org.apache.uima.ducc.container.s
import java.util.Properties;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
import org.apache.uima.ducc.container.sd.iface.Lifecycle;
import org.apache.uima.ducc.container.sd.task.error.TaskProtocolException;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
public interface TaskProtocolHandler extends Lifecycle {
public String initialize(Properties props) throws TaskProtocolException;
// The JP/Service sends IMetaCasTransaction object which includes
// the protocol state: GET, ACK, END
- public void handle(IMetaCasTransaction wi) throws TaskProtocolException;
+ public void handle(IMetaTaskTransaction wi) throws TaskProtocolException;
}
Modified: uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/transport/HttpTaskTransportHandler.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/transport/HttpTaskTransportHandler.java?rev=1830621&r1=1830620&r2=1830621&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/transport/HttpTaskTransportHandler.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/sd/task/transport/HttpTaskTransportHandler.java Mon Apr 30 18:57:27 2018
@@ -30,12 +30,13 @@ import javax.servlet.http.HttpServletRes
import org.apache.uima.UIMAFramework;
import org.apache.uima.ducc.common.utils.XStreamUtils;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.Direction;
+
import org.apache.uima.ducc.container.sd.iface.ServiceDriver;
import org.apache.uima.ducc.container.sd.task.error.TaskProtocolException;
import org.apache.uima.ducc.container.sd.task.iface.TaskProtocolHandler;
import org.apache.uima.ducc.container.sd.task.transport.iface.TaskTransportHandler;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction.Direction;
import org.apache.uima.util.Level;
import org.apache.uima.util.Logger;
import org.eclipse.jetty.server.Connector;
@@ -201,12 +202,12 @@ public class HttpTaskTransportHandler im
// logger.debug("doPost",jobid,
// "Http Request Body:::"+String.valueOf(content));
- IMetaCasTransaction imt = null;
+ IMetaTaskTransaction imt = null;
// String t = String.valueOf(content);
// imt = (IMetaCasTransaction) XStreamUtils
// .unmarshall(t.trim());
- imt = (IMetaCasTransaction) XStreamUtils.unmarshall(content);
+ imt = (IMetaTaskTransaction) XStreamUtils.unmarshall(content);
//MessageHandler.accumulateTimes("Unmarshall", post_stime);
// process service request