Author: cwiklik
Date: Tue Jul 17 13:49:47 2018
New Revision: 1836115
URL: http://svn.apache.org/viewvc?rev=1836115&view=rev
Log:
UIMA-5756 pull service should be used for jobs
Added:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/DeployableGeneration.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/DeployableGenerator.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/DuccUimaAggregate.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/DuccUimaAggregateComponent.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/DuccUimaReferenceByName.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/InvalidOverrideParameterException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/iface/
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/iface/IDeployableGeneration.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/iface/IDuccGeneratorUimaAggregate.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/iface/IDuccGeneratorUimaAggregateComponent.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/iface/IDuccGeneratorUimaDeployableConfiguration.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/dgen/iface/IDuccGeneratorUimaReferenceByName.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/AbstractServiceProcessor.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaAsServiceProcessor.java
uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/common/main/IServiceWrapper.java
uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/common/main/PullServiceWrapper.java
uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/common/main/ServiceFactory.java
uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/uima/UimaAEContainer.java
Modified:
uima/uima-ducc/trunk/src/main/assembly/bin.xml
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/MetaCasHelper.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckTimeout.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionData.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndTimeout.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionHelper.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInvestmentReset.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessFailure.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessPreempt.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessVolunteered.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/IActionData.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/IMetaMetaCas.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/MetaMetaCas.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/log/LoggerHelper.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/IMessageHandler.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerProcess.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerThread.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IWorkItem.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WorkItem.java
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/impl/TransactionHelper.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/Test2.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/classloading/TestClassLoading.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/messagehandler/TestMessageHandler.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/messagehandler/TestMessageHandler01.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/messagehandler/TestMessageHandler02a.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/messagehandler/TestMessageHandler02b.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/messagehandler/TestMessageHandler03.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/messagehandler/TestMessageHandler04.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/messagehandler/TestMessageHandler05a.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/messagehandler/TestMessageHandler05b.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/messagehandler/TestMessageHandler06.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/wi/tracker/TestWiTracker.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/ServiceConfiguration.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/ServiceWrapper.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/monitor/builtin/RemoteStateObserver.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaServiceProcessor.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/protocol/builtin/DefaultServiceProtocolHandler.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/JunitPullServiceTestCase.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverComponent.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverConfiguration.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/iface/IJobDriverComponent.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessComponent.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/JobDriverReport.java
uima/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/common/main/DuccJobService.java
Modified: uima/uima-ducc/trunk/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/uima-ducc/trunk/src/main/assembly/bin.xml Tue Jul 17 13:49:47 2018
@@ -64,6 +64,7 @@ under the License.
<include>org.apache.uima:uima-ducc-agent</include>
<include>org.apache.uima:uima-ducc-cli</include>
<include>org.apache.uima:uima-ducc-pm</include>
+ <include>org.apache.uima:uima-ducc-pullservice</include>
<include>org.apache.uima:uima-ducc-rm</include>
<include>org.apache.uima:uima-ducc-sm</include>
<include>org.apache.uima:uima-ducc-orchestrator</include>
@@ -96,6 +97,7 @@ under the License.
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.uima:uima-ducc-user</include>
+ <!--include>org.apache.uima:uima-ducc-pullservice</include-->
</includes>
<outputFileNameMapping>${artifact.artifactId}-${project.version}.jar</outputFileNameMapping>
<outputDirectory>lib/uima-ducc/user</outputDirectory>
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
Tue Jul 17 13:49:47 2018
@@ -745,11 +745,14 @@ public class DuccCommandExecutor extends
if (!isDucc20ServiceProcess) {
cmdLine.addOption("-Dducc.deploy.components=job-process");
}
+ // add port where an agent
listens for process state update events
+
processEnv.put(IDuccUser.EnvironmentVariable.DUCC_UPDATE_PORT.value(),
System.getProperty("AGENT_AP_STATE_UPDATE_PORT") );
((JavaCommandLine)cmdLine).setClassName("org.apache.uima.ducc.user.common.main.DuccJobService");
+
//((JavaCommandLine)cmdLine).setClassName("org.apache.uima.ducc.ps.service.main.ServiceWrapper");
} else {
cmdLine.addOption("-Dducc.deploy.components=uima-as");
-
((JavaCommandLine)cmdLine).setClassName("org.apache.uima.ducc.common.main.DuccService");
- //
((JavaCommandLine)cmdLine).setClassName("org.apache.uima.ducc.ps.service.main.ServiceWrapper");
+
processEnv.put(IDuccUser.EnvironmentVariable.DUCC_UPDATE_PORT.value(),
System.getProperty(ProcessStateUpdate.ProcessStateUpdatePort));
+
((JavaCommandLine)cmdLine).setClassName("org.apache.uima.ducc.common.main.DuccService");
}
break;
}
@@ -862,18 +865,23 @@ public class DuccCommandExecutor extends
" This process will
report state update to Camel-Mina listener running on port:" +
System.getProperty(ProcessStateUpdate.ProcessStateUpdatePort)
);
-
processEnv.put(IDuccUser.EnvironmentVariable.DUCC_UPDATE_PORT.value(),
System.getProperty(ProcessStateUpdate.ProcessStateUpdatePort));
+//
processEnv.put(IDuccUser.EnvironmentVariable.DUCC_UPDATE_PORT.value(),
System.getProperty(ProcessStateUpdate.ProcessStateUpdatePort));
}
}
// Replace the reserved DUCC variable with the
architecture of this node (ppc64 or amd64 or ...)
// (could have been done in getCommandLine if that did
return the full cmd line!)
String osArch = System.getProperty("os.arch");
- for (int i = 0; i < cmd.length; ++i) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < cmd.length; ++i) {
if (cmd[i].contains("${DUCC_OS_ARCH}")) {
cmd[i] = cmd[i].replace("${DUCC_OS_ARCH}", osArch);
}
+ sb.append(cmd[i]).append(" ");
}
+ logger.info("getDeployableCommandLine --------------- ",
+ null, sb.toString());
+
return cmd;
} catch (Exception ex) {
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/MetaCasHelper.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/MetaCasHelper.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/MetaCasHelper.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/MetaCasHelper.java
Tue Jul 17 13:49:47 2018
@@ -21,19 +21,19 @@ package org.apache.uima.ducc.container.c
import org.apache.uima.ducc.container.common.logger.IComponent;
import org.apache.uima.ducc.container.common.logger.ILogger;
import org.apache.uima.ducc.container.common.logger.Logger;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public class MetaCasHelper {
private static Logger logger = Logger.getLogger(MetaCasHelper.class,
IComponent.Id.JD.name());
- private IMetaCas metaCas = null;
+ private IMetaTask metaCas = null;
- public MetaCasHelper(IMetaCas metaCas) {
+ public MetaCasHelper(IMetaTask metaCas) {
setMetaCas(metaCas);
}
- private void setMetaCas(IMetaCas value) {
+ private void setMetaCas(IMetaTask value) {
metaCas = value;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
Tue Jul 17 13:49:47 2018
@@ -48,7 +48,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.wi.WorkItemStatistics;
import
org.apache.uima.ducc.container.jd.wi.perf.IWorkItemPerformanceSummaryKeeper;
import
org.apache.uima.ducc.container.jd.wi.perf.WorkItemPerformanceSummaryKeeper;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.JdState;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction.JdState;
public class JobDriver {
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java
Tue Jul 17 13:49:47 2018
@@ -29,7 +29,7 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.jd.JobDriverException;
import org.apache.uima.ducc.container.jd.cas.CasManagerStats.RetryReason;
import
org.apache.uima.ducc.container.jd.classload.ProxyJobDriverCollectionReader;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public class CasManager {
@@ -37,7 +37,7 @@ public class CasManager {
private ProxyJobDriverCollectionReader pjdcr = null;
- private LinkedBlockingQueue<IMetaCas> cacheQueue = new
LinkedBlockingQueue<IMetaCas>();
+ private LinkedBlockingQueue<IMetaTask> cacheQueue = new
LinkedBlockingQueue<IMetaTask>();
private CasManagerStats casManagerStats = new CasManagerStats();
@@ -57,8 +57,8 @@ public class CasManager {
}
}
- public IMetaCas getEmptyMetaCas() throws ProxyException {
- IMetaCas retVal = null;
+ public IMetaTask getEmptyMetaCas() throws ProxyException {
+ IMetaTask retVal = null;
if(retVal == null) {
retVal = pjdcr.getEmptyMetaCas();
if(retVal != null) {
@@ -68,8 +68,8 @@ public class CasManager {
return retVal;
}
- public IMetaCas getMetaCas() throws ProxyException, JobDriverException {
- IMetaCas retVal = dequeueMetaCas();
+ public IMetaTask getMetaCas() throws ProxyException, JobDriverException
{
+ IMetaTask retVal = dequeueMetaCas();
if(retVal == null) {
retVal = pjdcr.getMetaCas();
if(retVal != null) {
@@ -82,9 +82,9 @@ public class CasManager {
return retVal;
}
- private IMetaCas dequeueMetaCas() throws JobDriverException {
+ private IMetaTask dequeueMetaCas() throws JobDriverException {
String location = "dequeueMetaCas";
- IMetaCas metaCas = cacheQueue.poll();
+ IMetaTask metaCas = cacheQueue.poll();
if(metaCas != null) {
casManagerStats.incRetryQueueGets();
MessageBuffer mb = new MessageBuffer();
@@ -96,11 +96,11 @@ public class CasManager {
return metaCas;
}
- public void putMetaCas(IMetaCas metaCas, RetryReason retryReason) {
+ public void putMetaCas(IMetaTask metaCas, RetryReason retryReason) {
queueMetaCas(metaCas, retryReason);
}
- private void queueMetaCas(IMetaCas metaCas, RetryReason retryReason) {
+ private void queueMetaCas(IMetaTask metaCas, RetryReason retryReason) {
String location = "queueMetaCas";
cacheQueue.add(metaCas);
casManagerStats.incRetryQueuePuts();
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java
Tue Jul 17 13:49:47 2018
@@ -34,7 +34,7 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.common.logger.ILogger;
import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.mh.MessageHandler;
-import org.apache.uima.ducc.container.net.impl.MetaCas;
+import org.apache.uima.ducc.ps.net.impl.MetaTask;
import org.apache.uima.ducc.user.common.PrivateClassLoader;
public class ProxyJobDriverCollectionReader {
@@ -135,8 +135,8 @@ public class ProxyJobDriverCollectionRea
}
- public MetaCas getEmptyMetaCas() throws ProxyException {
- MetaCas retVal = null;
+ public MetaTask getEmptyMetaCas() throws ProxyException {
+ MetaTask retVal = null;
try {
method_getJdUserEmptyMetaCas =
class_JdUserCollectionReader.getMethod(name_getJdUserEmptyMetaCas,
nullClassArray);
long stime = System.nanoTime();
@@ -151,7 +151,7 @@ public class ProxyJobDriverCollectionRea
Method method_getDocumentText =
class_JdUserMetaCas.getMethod(name_getDocumentText, nullClassArray);
String rawDocId =
(String)ContextSwitch.call(urlClassLoader, method_getDocumentText,
instance_metaCas, nullObjectArray);
String docId = normalizeDocId(seqNo, rawDocId);
- retVal = new MetaCas(seqNo, docId,
serializedCas);
+ retVal = new MetaTask(seqNo, docId,
serializedCas);
}
}
catch(Exception e) {
@@ -163,8 +163,8 @@ public class ProxyJobDriverCollectionRea
}
- public MetaCas getMetaCas() throws ProxyException {
- MetaCas retVal = null;
+ public MetaTask getMetaCas() throws ProxyException {
+ MetaTask retVal = null;
try {
method_getJdUserMetaCas =
class_JdUserCollectionReader.getMethod(name_getJdUserMetaCas, nullClassArray);
long stime = System.nanoTime();
@@ -179,7 +179,7 @@ public class ProxyJobDriverCollectionRea
Method method_getDocumentText =
class_JdUserMetaCas.getMethod(name_getDocumentText, nullClassArray);
String rawDocId =
(String)ContextSwitch.call(urlClassLoader, method_getDocumentText,
instance_metaCas, nullObjectArray);
String docId = normalizeDocId(seqNo, rawDocId);
- retVal = new MetaCas(seqNo, docId,
serializedCas);
+ retVal = new MetaTask(seqNo, docId,
serializedCas);
}
}
catch(Exception e) {
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java
Tue Jul 17 13:49:47 2018
@@ -29,7 +29,8 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.log.LoggerHelper;
import org.apache.uima.ducc.container.jd.timeout.TimeoutManager;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
+
public class ActionAck implements IAction {
@@ -48,7 +49,7 @@ public class ActionAck implements IActio
try {
if(actionData != null) {
IWorkItem wi = actionData.getWorkItem();
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
JobDriver jd = JobDriver.getInstance();
IWorkItemStateKeeper wisk =
jd.getWorkItemStateKeeper();
MetaCasHelper metaCasHelper = new
MetaCasHelper(metaCas);
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckTimeout.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckTimeout.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckTimeout.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckTimeout.java
Tue Jul 17 13:49:47 2018
@@ -35,7 +35,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.wi.IProcessStatistics;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.jd.wi.WiTracker;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public class ActionAckTimeout extends Action implements IAction {
@@ -46,7 +46,7 @@ public class ActionAckTimeout extends Ac
return ActionAckTimeout.class.getName();
}
- private void recallWorkItem(IActionData actionData, CasManager cm,
IMetaCas metaCas, IWorkItem wi) {
+ private void recallWorkItem(IActionData actionData, CasManager cm,
IMetaTask metaCas, IWorkItem wi) {
String location = "recallWorkItem";
MessageBuffer mb = LoggerHelper.getMessageBuffer(actionData);
logger.info(location, ILogger.null_id, mb.toString());
@@ -64,7 +64,7 @@ public class ActionAckTimeout extends Ac
try {
if(actionData != null) {
IWorkItem wi = actionData.getWorkItem();
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
JobDriver jd = JobDriver.getInstance();
CasManager cm = jd.getCasManager();
WiTracker tracker = WiTracker.getInstance();
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionData.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionData.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionData.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionData.java
Tue Jul 17 13:49:47 2018
@@ -20,15 +20,15 @@ package org.apache.uima.ducc.container.j
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerThread;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
public class ActionData implements IActionData {
private IWorkItem workItem = null;
private IRemoteWorkerThread remoteWorkerThread = null;
- private IMetaCasTransaction metaCasTransaction = null;
+ private IMetaTaskTransaction metaCasTransaction = null;
- public ActionData(IWorkItem workItem, IRemoteWorkerThread
remoteWorkerThread, IMetaCasTransaction metaCasTransaction) {
+ public ActionData(IWorkItem workItem, IRemoteWorkerThread
remoteWorkerThread, IMetaTaskTransaction metaCasTransaction) {
setWorkItem(workItem);
setRemoteWorkerThread(remoteWorkerThread);
setMetaCasTransaction(metaCasTransaction);
@@ -53,11 +53,11 @@ public class ActionData implements IActi
}
@Override
- public IMetaCasTransaction getMetaCasTransaction() {
+ public IMetaTaskTransaction getMetaCasTransaction() {
return metaCasTransaction;
}
- private void setMetaCasTransaction(IMetaCasTransaction value) {
+ private void setMetaCasTransaction(IMetaTaskTransaction value) {
metaCasTransaction = value;
}
}
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java
Tue Jul 17 13:49:47 2018
@@ -46,9 +46,11 @@ import org.apache.uima.ducc.container.jd
import
org.apache.uima.ducc.container.jd.wi.perf.IWorkItemPerformanceIndividualKeeper;
import
org.apache.uima.ducc.container.jd.wi.perf.IWorkItemPerformanceSummaryKeeper;
import
org.apache.uima.ducc.container.jd.wi.perf.WorkItemPerformanceIndividualKeeper;
-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.IPerformanceMetrics;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
+import org.apache.uima.ducc.ps.service.processor.IServiceResultSerializer;
+import org.apache.uima.ducc.ps.service.processor.uima.utils.PerformanceMetrics;
+import
org.apache.uima.ducc.ps.service.processor.uima.utils.UimaResultDefaultSerializer;
public class ActionEnd extends ActionEndAbstract implements IAction {
@@ -121,15 +123,25 @@ public class ActionEnd extends ActionEnd
private void updatePerformanceMetrics(IActionData actionData, IWorkItem
wi) {
String location = "updatePerformanceMetrics";
if(wi != null) {
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
if(metaCas != null) {
- IPerformanceMetrics performanceMetrics =
metaCas.getPerformanceMetrics();
- if(performanceMetrics != null) {
- List<Properties> list =
performanceMetrics.get();
- if(list != null) {
+ IServiceResultSerializer deserializer =
+ new
UimaResultDefaultSerializer();
+ List<PerformanceMetrics> performanceMetrics =
null;
+ String serializedPerformance =
metaCas.getPerformanceMetrics();
+ try {
+ performanceMetrics =
deserializer.deserialize(serializedPerformance);
+ } catch( Exception e) {
+ logger.error(location, ILogger.null_id,
e);
+ }
+
+ if(performanceMetrics != null &&
!performanceMetrics.isEmpty()) {
+ //List<Properties> list =
performanceMetrics.get();
+ //if(list != null) {
int size = 0;
- if(list != null) {
- size = list.size();
+ //if(list != null) {
+ //size = list.size();
+ size =
performanceMetrics.size();
JobDriver jd =
JobDriver.getInstance();
String logdir =
jd.getLogDir();
String seqNo =
""+wi.getSeqNo();
@@ -137,42 +149,62 @@ public class ActionEnd extends ActionEnd
IWorkItemPerformanceSummaryKeeper wipsk =
jd.getWorkItemPerformanceSummaryKeeper();
wipsk.count();
long total_time = 0;
- for(Properties
properties : list) {
+ //for(Properties
properties : list) {
+ for( PerformanceMetrics
pm : performanceMetrics) {
+ /*
String name =
properties.getProperty(keyName);
String
uniqueName = normalizeUniqueName(properties.getProperty(keyUniqueName));
String
analysisTime = properties.getProperty(keyAnalysisTime);
- long time = 0;
+ */
+ String name =
pm.getName();
+ String
uniqueName = normalizeUniqueName(pm.getUniqueName());
+ long time =
pm.getAnalysisTime();
+ //long time = 0;
+ /*
try {
time =
Long.parseLong(analysisTime);
}
catch(Exception
e) {
logger.error(location, ILogger.null_id, e);
}
+ */
if(time < 0) {
- String
text = "seqNo="+seqNo+" "+"time="+time+" "+"analysisTime="+analysisTime+"
"+"uniqueName="+uniqueName;
+// String
text = "seqNo="+seqNo+" "+"time="+time+" "+"analysisTime="+analysisTime+"
"+"uniqueName="+uniqueName;
+ String
text = "seqNo="+seqNo+" "+"time="+time+" "+"analysisTime="+time+"
"+"uniqueName="+uniqueName;
logger.warn(location, ILogger.null_id, text);
}
wipik.dataAdd(name, uniqueName, time);
wipsk.dataAdd(name, uniqueName, time);
-
for(Entry<Object, Object> entry : properties.entrySet()) {
- String
key = (String) entry.getKey();
- String
value = (String) entry.getValue();
+
//for(Entry<Object, Object> entry : properties.entrySet()) {
+
//String key = (String) entry.getKey();
+
//String value = (String) entry.getValue();
MessageBuffer mb = LoggerHelper.getMessageBuffer(actionData);
+/*
mb.append(Standardize.Label.key.get()+key);
mb.append(Standardize.Label.value.get()+value);
+*/
+
mb.append(Standardize.Label.key.get()+"name");
+
mb.append(Standardize.Label.value.get()+name);
+
+
mb.append(Standardize.Label.key.get()+"uniqueName");
+
mb.append(Standardize.Label.value.get()+uniqueName);
+
+
mb.append(Standardize.Label.key.get()+"analysisTime");
+
mb.append(Standardize.Label.value.get()+time);
+
logger.debug(location, ILogger.null_id, mb.toString());
- }
+ //}
total_time +=
time;
}
wipik.publish();
// Add the aggregate
values as if a no-name delegate
wipsk.dataAdd("TOTALS",
"", total_time);
- }
+ //}
MessageBuffer mb =
LoggerHelper.getMessageBuffer(actionData);
mb.append(Standardize.Label.size.get()+size);
logger.debug(location,
ILogger.null_id, mb.toString());
}
- }
+ //}
}
}
}
@@ -185,9 +217,9 @@ public class ActionEnd extends ActionEnd
try {
if(actionData != null) {
IWorkItem wi = actionData.getWorkItem();
- IMetaCasTransaction trans =
actionData.getMetaCasTransaction();
+ IMetaTaskTransaction trans =
actionData.getMetaCasTransaction();
IRemoteWorkerProcess rwp = new
RemoteWorkerProcess(trans);
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
JobDriver jd = JobDriver.getInstance();
JobDriverHelper jdh =
JobDriverHelper.getInstance();
CasManager cm = jd.getCasManager();
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndAbstract.java
Tue Jul 17 13:49:47 2018
@@ -38,8 +38,8 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerProcess;
import org.apache.uima.ducc.container.jd.wi.IProcessStatistics;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
public abstract class ActionEndAbstract extends Action implements IAction {
@@ -65,9 +65,9 @@ public abstract class ActionEndAbstract
logger.debug(location, ILogger.null_id, mb.toString());
}
IWorkItem wi = actionData.getWorkItem();
- IMetaCasTransaction trans = actionData.getMetaCasTransaction();
+ IMetaTaskTransaction trans = actionData.getMetaCasTransaction();
IRemoteWorkerProcess rwp = new RemoteWorkerProcess(trans);
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
JobDriver jd = JobDriver.getInstance();
JobDriverHelper jdh = JobDriverHelper.getInstance();
CasManager cm = jd.getCasManager();
@@ -98,7 +98,7 @@ public abstract class ActionEndAbstract
//
ProxyJobDriverDirective pjdd = null;
try {
- String serializedCas = (String)
metaCas.getUserSpaceCas();
+ String serializedCas = (String)
metaCas.getUserSpaceTask();
ProxyJobDriverErrorHandler pjdeh =
jd.getProxyJobDriverErrorHandler();
pjdd = pjdeh.handle(serializedCas, userException);
}
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndTimeout.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndTimeout.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndTimeout.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndTimeout.java
Tue Jul 17 13:49:47 2018
@@ -29,7 +29,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.wi.IProcessStatistics;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.jd.wi.WiTracker;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public class ActionEndTimeout extends ActionEndAbstract implements IAction {
@@ -56,7 +56,7 @@ public class ActionEndTimeout extends Ac
try {
if(actionData != null) {
IWorkItem wi = actionData.getWorkItem();
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
WiTracker tracker = WiTracker.getInstance();
IRemoteWorkerProcess rwp =
tracker.getRemoteWorkerProcess(wi);
JobDriverHelper jdh =
JobDriverHelper.getInstance();
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
Tue Jul 17 13:49:47 2018
@@ -45,11 +45,11 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.wi.IProcessStatistics;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.jd.wi.WiTracker;
-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.JdState;
-import org.apache.uima.ducc.container.net.impl.TransactionHelper;
+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.JdState;
+import org.apache.uima.ducc.ps.net.impl.TransactionHelper;
public class ActionGet implements IAction {
@@ -92,7 +92,7 @@ public class ActionGet implements IActio
logger.error(location, ILogger.null_id, e);
if(isKillWorkItem(e)) {
logger.info(location, ILogger.null_id, "killWorkItem");
- IMetaCas metaCas = getEmptyMetaCas();
+ IMetaTask metaCas = getEmptyMetaCas();
JobDriver jd = JobDriver.getInstance();
IWorkItemStateKeeper wisk = jd.getWorkItemStateKeeper();
MetaCasHelper metaCasHelper = new
MetaCasHelper(metaCas);
@@ -115,8 +115,8 @@ public class ActionGet implements IActio
}
}
- private IMetaCas getEmptyMetaCas() throws JobDriverException {
- IMetaCas metaCas = null;
+ private IMetaTask getEmptyMetaCas() throws JobDriverException {
+ IMetaTask metaCas = null;
JobDriver jd = JobDriver.getInstance();
CasManager cm = jd.getCasManager();
try {
@@ -172,13 +172,13 @@ public class ActionGet implements IActio
WiTracker tracker = WiTracker.getInstance();
IWorkItem wi = tracker.find(rwt);
IFsm fsm = wi.getFsm();
- IMetaCasTransaction trans =
actionData.getMetaCasTransaction();
+ IMetaTaskTransaction trans =
actionData.getMetaCasTransaction();
IRemoteWorkerProcess rwp = new
RemoteWorkerProcess(trans);
//
JobDriver jd = JobDriver.getInstance();
JobDriverHelper jdh =
JobDriverHelper.getInstance();
jd.advanceJdState(JdState.Active);
- IMetaCas metaCas = null;
+ IMetaTask metaCas = null;
JobProcessBlacklist jobProcessBlacklist =
JobProcessBlacklist.getInstance();
IMetaMetaCas mmc = getMetaMetaCas(actionData);
if(mmc.isExhausted()) {
@@ -231,7 +231,7 @@ public class ActionGet implements IActio
metaCas = mmc.getMetaCas();
}
wi.setMetaCas(metaCas);
- trans.setMetaCas(metaCas);
+ trans.setMetaTask(metaCas);
IWorkItemStateKeeper wisk =
jd.getWorkItemStateKeeper();
MetaCasHelper metaCasHelper = new
MetaCasHelper(metaCas);
IProcessStatistics pStats =
jdh.getProcessStatistics(rwp);
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetRedux.java
Tue Jul 17 13:49:47 2018
@@ -29,7 +29,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerThread;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.jd.wi.WiTracker;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public class ActionGetRedux implements IAction {
@@ -52,13 +52,13 @@ public class ActionGetRedux implements I
IWorkItem wi = tracker.find(rwt);
if(wi != null) {
IEvent event = WiFsm.CAS_Unavailable;
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
if(metaCas != null) {
event = WiFsm.CAS_Available;
MessageBuffer mb =
LoggerHelper.getMessageBuffer(actionData);
logger.debug(location,
ILogger.null_id, mb.toString());
actionData.getWorkItem().setMetaCas(metaCas);
-
actionData.getMetaCasTransaction().setMetaCas(metaCas);
+
actionData.getMetaCasTransaction().setMetaTask(metaCas);
}
else {
MessageBuffer mb =
LoggerHelper.getMessageBuffer(actionData);
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionHelper.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionHelper.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionHelper.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionHelper.java
Tue Jul 17 13:49:47 2018
@@ -35,8 +35,8 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.timeout.TimeoutManager;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.jd.wi.WiTracker;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.JdState;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction.JdState;
public class ActionHelper {
@@ -87,7 +87,7 @@ public class ActionHelper {
}
}
- protected static void retryWorkItem(Logger logger, IActionData
actionData, CasManager cm, IMetaCas metaCas) {
+ protected static void retryWorkItem(Logger logger, IActionData
actionData, CasManager cm, IMetaTask metaCas) {
String location = "retryWorkItem";
MessageBuffer mb = LoggerHelper.getMessageBuffer(actionData);
logger.info(location, ILogger.null_id, mb.toString());
@@ -111,7 +111,7 @@ public class ActionHelper {
// restarted from scratch.
- protected static void killProcess(Logger logger, IActionData
actionData, CasManager cm, IMetaCas metaCas, IWorkItem wi, DeallocateReason
deallocateReason) {
+ protected static void killProcess(Logger logger, IActionData
actionData, CasManager cm, IMetaTask metaCas, IWorkItem wi, DeallocateReason
deallocateReason) {
String location = "killProcess";
WiTracker tracker = WiTracker.getInstance();
IRemoteWorkerProcess rwp = tracker.getRemoteWorkerProcess(wi);
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInvestmentReset.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInvestmentReset.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInvestmentReset.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInvestmentReset.java
Tue Jul 17 13:49:47 2018
@@ -28,7 +28,7 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.jd.JobDriver;
import org.apache.uima.ducc.container.jd.log.LoggerHelper;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public class ActionInvestmentReset implements IAction {
@@ -46,7 +46,7 @@ public class ActionInvestmentReset imple
try {
if(actionData != null) {
IWorkItem wi = actionData.getWorkItem();
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
JobDriver jd = JobDriver.getInstance();
IWorkItemStateKeeper wisk =
jd.getWorkItemStateKeeper();
MetaCasHelper metaCasHelper = new
MetaCasHelper(metaCas);
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessFailure.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessFailure.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessFailure.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessFailure.java
Tue Jul 17 13:49:47 2018
@@ -38,7 +38,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.wi.IProcessStatistics;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.jd.wi.WiTracker;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public class ActionProcessFailure extends Action implements IAction {
@@ -53,7 +53,7 @@ public class ActionProcessFailure extend
return ActionProcessFailure.class.getName();
}
- private void retryWorkItem(IActionData actionData, CasManager cm,
IWorkItem wi, IMetaCas metaCas, IRemoteWorkerProcess rwp) {
+ private void retryWorkItem(IActionData actionData, CasManager cm,
IWorkItem wi, IMetaTask metaCas, IRemoteWorkerProcess rwp) {
String location = "retryWorkItem";
MessageBuffer mb = LoggerHelper.getMessageBuffer(actionData);
logger.info(location, ILogger.null_id, mb.toString());
@@ -72,11 +72,11 @@ public class ActionProcessFailure extend
pStats.retry(wi);
}
- private void killWorkItem(CasManager cm, IWorkItem wi, IMetaCas
metaCas, IRemoteWorkerProcess rwp) {
+ private void killWorkItem(CasManager cm, IWorkItem wi, IMetaTask
metaCas, IRemoteWorkerProcess rwp) {
//TODO
}
- private void killJob(CasManager cm, IWorkItem wi, IMetaCas metaCas,
IRemoteWorkerProcess rwp) {
+ private void killJob(CasManager cm, IWorkItem wi, IMetaTask metaCas,
IRemoteWorkerProcess rwp) {
//TODO
}
@@ -88,7 +88,7 @@ public class ActionProcessFailure extend
try {
if(actionData != null) {
IWorkItem wi = actionData.getWorkItem();
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
JobDriver jd = JobDriver.getInstance();
CasManager cm = jd.getCasManager();
WiTracker tracker = WiTracker.getInstance();
@@ -97,7 +97,7 @@ public class ActionProcessFailure extend
if(rwp != null) {
IProcessStatistics pStats =
jdh.getProcessStatistics(rwp);
if(metaCas != null) {
- String serializedCas = (String)
metaCas.getUserSpaceCas();
+ String serializedCas = (String)
metaCas.getUserSpaceTask();
ProxyJobDriverErrorHandler
pjdeh = jd.getProxyJobDriverErrorHandler();
ProxyJobDriverDirective pjdd =
pjdeh.handle(serializedCas);
if(pjdd != null) {
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessPreempt.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessPreempt.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessPreempt.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessPreempt.java
Tue Jul 17 13:49:47 2018
@@ -35,7 +35,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.wi.IProcessStatistics;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.jd.wi.WiTracker;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public class ActionProcessPreempt extends Action implements IAction {
@@ -46,7 +46,7 @@ public class ActionProcessPreempt extend
return ActionProcessPreempt.class.getName();
}
- private void recallWorkItem(IActionData actionData, CasManager cm,
IMetaCas metaCas, IWorkItem wi) {
+ private void recallWorkItem(IActionData actionData, CasManager cm,
IMetaTask metaCas, IWorkItem wi) {
String location = "recallWorkItem";
MessageBuffer mb = LoggerHelper.getMessageBuffer(actionData);
logger.info(location, ILogger.null_id, mb.toString());
@@ -64,7 +64,7 @@ public class ActionProcessPreempt extend
try {
if(actionData != null) {
IWorkItem wi = actionData.getWorkItem();
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
JobDriver jd = JobDriver.getInstance();
CasManager cm = jd.getCasManager();
WiTracker tracker = WiTracker.getInstance();
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessVolunteered.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessVolunteered.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessVolunteered.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionProcessVolunteered.java
Tue Jul 17 13:49:47 2018
@@ -35,7 +35,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.wi.IProcessStatistics;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.jd.wi.WiTracker;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public class ActionProcessVolunteered extends Action implements IAction {
@@ -46,7 +46,7 @@ public class ActionProcessVolunteered ex
return ActionProcessVolunteered.class.getName();
}
- private void recallWorkItem(IActionData actionData, CasManager cm,
IMetaCas metaCas, IWorkItem wi) {
+ private void recallWorkItem(IActionData actionData, CasManager cm,
IMetaTask metaCas, IWorkItem wi) {
String location = "recallWorkItem";
MessageBuffer mb = LoggerHelper.getMessageBuffer(actionData);
logger.info(location, ILogger.null_id, mb.toString());
@@ -64,7 +64,7 @@ public class ActionProcessVolunteered ex
try {
if(actionData != null) {
IWorkItem wi = actionData.getWorkItem();
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
JobDriver jd = JobDriver.getInstance();
CasManager cm = jd.getCasManager();
WiTracker tracker = WiTracker.getInstance();
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java
Tue Jul 17 13:49:47 2018
@@ -28,8 +28,9 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.timeout.TimeoutManager;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.jd.wi.WiTracker;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
+
public class ActionSend implements IAction {
@@ -50,8 +51,8 @@ public class ActionSend implements IActi
IRemoteWorkerThread rwt =
actionData.getRemoteWorkerThread();
WiTracker tracker = WiTracker.getInstance();
IWorkItem wi = tracker.assign(rwt);
- IMetaCasTransaction trans =
actionData.getMetaCasTransaction();
- IMetaCas metaCas = trans.getMetaCas();
+ IMetaTaskTransaction trans =
actionData.getMetaCasTransaction();
+ IMetaTask metaCas = trans.getMetaTask();
wi.setMetaCas(metaCas);
//
TimeoutManager toMgr =
TimeoutManager.getInstance();
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/IActionData.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/IActionData.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/IActionData.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/IActionData.java
Tue Jul 17 13:49:47 2018
@@ -20,11 +20,11 @@ package org.apache.uima.ducc.container.j
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerThread;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
public interface IActionData {
public IWorkItem getWorkItem();
public IRemoteWorkerThread getRemoteWorkerThread();
- public IMetaCasTransaction getMetaCasTransaction();
+ public IMetaTaskTransaction getMetaCasTransaction();
}
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/IMetaMetaCas.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/IMetaMetaCas.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/IMetaMetaCas.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/IMetaMetaCas.java
Tue Jul 17 13:49:47 2018
@@ -18,7 +18,7 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
/**
* An interface for storing MetaCAS
@@ -35,6 +35,6 @@ public interface IMetaMetaCas {
public boolean isKillJob();
public void setKillJob(boolean value);
- public IMetaCas getMetaCas();
- public void setMetaCas(IMetaCas value);
+ public IMetaTask getMetaCas();
+ public void setMetaCas(IMetaTask value);
}
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/MetaMetaCas.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/MetaMetaCas.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/MetaMetaCas.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/MetaMetaCas.java
Tue Jul 17 13:49:47 2018
@@ -19,6 +19,7 @@
package org.apache.uima.ducc.container.jd.fsm.wi;
import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
/**
* An implementation for storing MetaCAS
@@ -31,7 +32,7 @@ public class MetaMetaCas implements IMet
private boolean premature;
private boolean killJob;
- private IMetaCas metaCas;
+ private IMetaTask metaCas;
public MetaMetaCas() {
}
@@ -67,12 +68,12 @@ public class MetaMetaCas implements IMet
}
@Override
- public IMetaCas getMetaCas() {
+ public IMetaTask getMetaCas() {
return metaCas;
}
@Override
- public void setMetaCas(IMetaCas value) {
+ public void setMetaCas(IMetaTask value) {
metaCas = value;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/log/LoggerHelper.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/log/LoggerHelper.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/log/LoggerHelper.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/log/LoggerHelper.java
Tue Jul 17 13:49:47 2018
@@ -27,8 +27,8 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.mh.RemoteWorkerThread;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerThread;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
public class LoggerHelper {
@@ -37,7 +37,7 @@ public class LoggerHelper {
public static String getTransNo(IActionData actionData) {
String retVal = "?";
try {
- IMetaCasTransaction trans =
actionData.getMetaCasTransaction();
+ IMetaTaskTransaction trans =
actionData.getMetaCasTransaction();
retVal = trans.getTransactionId().toString();
}
catch(Exception e) {
@@ -61,7 +61,7 @@ public class LoggerHelper {
public static String getSeqNo(IWorkItem wi) {
String retVal = "?";
try {
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
retVal = metaCas.getSystemKey();
}
catch(Exception e) {
@@ -73,7 +73,7 @@ public class LoggerHelper {
public static String getId(IWorkItem wi) {
String retVal = "?";
try {
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
retVal = metaCas.getUserKey();
}
catch(Exception e) {
@@ -85,7 +85,7 @@ public class LoggerHelper {
public static String getRemote(IActionData actionData) {
String retVal = "?";
try {
- IMetaCasTransaction trans =
actionData.getMetaCasTransaction();
+ IMetaTaskTransaction trans =
actionData.getMetaCasTransaction();
IRemoteWorkerThread rwt = new RemoteWorkerThread(trans);
retVal = rwt.toString();
}
@@ -126,7 +126,7 @@ public class LoggerHelper {
return mb;
}
- public static MessageBuffer getMessageBuffer(IMetaCasTransaction trans,
IRemoteWorkerThread rwt) {
+ public static MessageBuffer getMessageBuffer(IMetaTaskTransaction
trans, IRemoteWorkerThread rwt) {
String location = "getMessageBuffer";
MessageBuffer mb = new MessageBuffer();
try {
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/IMessageHandler.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/IMessageHandler.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/IMessageHandler.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/IMessageHandler.java
Tue Jul 17 13:49:47 2018
@@ -21,7 +21,7 @@ package org.apache.uima.ducc.container.j
import org.apache.uima.ducc.container.jd.mh.iface.INodeInfo;
import org.apache.uima.ducc.container.jd.mh.iface.IOperatingInfo;
import org.apache.uima.ducc.container.jd.mh.iface.IProcessInfo;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
public interface IMessageHandler {
@@ -34,7 +34,7 @@ public interface IMessageHandler {
public void handleProcessVolunteered(IProcessInfo processInfo);
public void handleProcessFailedInitialization(IProcessInfo processInfo);
- public void handleMetaCasTransation(IMetaCasTransaction trans);
+ public void handleMetaCasTransation(IMetaTaskTransaction trans);
public void incGets();
public void incAcks();
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java
Tue Jul 17 13:49:47 2018
@@ -56,13 +56,13 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.wi.RunningWorkItemStatistics;
import org.apache.uima.ducc.container.jd.wi.WiTracker;
import
org.apache.uima.ducc.container.jd.wi.perf.IWorkItemPerformanceSummaryKeeper;
-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.JdState;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.Type;
-import org.apache.uima.ducc.container.net.impl.MetaCas;
-import org.apache.uima.ducc.container.net.impl.TransactionHelper;
+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.JdState;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction.Type;
+import org.apache.uima.ducc.ps.net.impl.MetaTask;
+import org.apache.uima.ducc.ps.net.impl.TransactionHelper;
public class MessageHandler implements IMessageHandler {
@@ -481,7 +481,7 @@ public class MessageHandler implements I
}
@Override
- public void handleMetaCasTransation(IMetaCasTransaction trans) {
+ public void handleMetaCasTransation(IMetaTaskTransaction trans) {
String location = "handleMetaCasTransation";
RemoteWorkerThread rwt = null;
try {
@@ -513,7 +513,7 @@ public class MessageHandler implements I
accumulateTimes(type.name(), stime);
JdState jdState = JobDriver.getInstance().getJdState();
trans.setJdState(jdState);
- IMetaCas metaCas = trans.getMetaCas();
+ IMetaTask metaCas = trans.getMetaTask();
if(metaCas != null) {
metaCas.setPerformanceMetrics(null);
metaCas.setUserSpaceException(null);
@@ -527,9 +527,9 @@ public class MessageHandler implements I
}
}
- private void update(IWorkItem wi, IMetaCas metaCas) {
- IMetaCas local = wi.getMetaCas();
- IMetaCas remote = metaCas;
+ private void update(IWorkItem wi, IMetaTask metaCas) {
+ IMetaTask local = wi.getMetaCas();
+ IMetaTask remote = metaCas;
if(local != null) {
if(remote != null) {
local.setPerformanceMetrics(remote.getPerformanceMetrics());
@@ -538,7 +538,7 @@ public class MessageHandler implements I
}
}
- private void handleMetaCasTransationGet(IMetaCasTransaction trans,
IRemoteWorkerThread rwt) {
+ private void handleMetaCasTransationGet(IMetaTaskTransaction trans,
IRemoteWorkerThread rwt) {
WiTracker tracker = WiTracker.getInstance();
IWorkItem wi = tracker.link(rwt);
IFsm fsm = wi.getFsm();
@@ -547,10 +547,10 @@ public class MessageHandler implements I
fsm.transition(event, actionData);
}
- private void handleMetaCasTransationAck(IMetaCasTransaction trans,
IRemoteWorkerThread rwt) {
+ private void handleMetaCasTransationAck(IMetaTaskTransaction trans,
IRemoteWorkerThread rwt) {
String location = "handleMetaCasTransationAck";
WiTracker tracker = WiTracker.getInstance();
- MetaCas metaCas = (MetaCas) trans.getMetaCas();
+ MetaTask metaCas = (MetaTask) trans.getMetaTask();
if(tracker.isRecognized(rwt, metaCas)) {
IWorkItem wi = tracker.find(rwt);
update(wi, metaCas);
@@ -563,15 +563,15 @@ public class MessageHandler implements I
logger.debug(location, ILogger.null_id, mb.toString());
}
else {
- trans.setMetaCas(null);
+ trans.setMetaTask(null);
TransactionHelper.addResponseHint(trans, Hint.Rejected);
}
}
- private void handleMetaCasTransationEnd(IMetaCasTransaction trans,
IRemoteWorkerThread rwt) {
+ private void handleMetaCasTransationEnd(IMetaTaskTransaction trans,
IRemoteWorkerThread rwt) {
String location = "handleMetaCasTransationEnd";
WiTracker tracker = WiTracker.getInstance();
- MetaCas metaCas = (MetaCas) trans.getMetaCas();
+ MetaTask metaCas = (MetaTask) trans.getMetaTask();
if(tracker.isRecognized(rwt, metaCas)) {
IWorkItem wi = tracker.find(rwt);
update(wi, metaCas);
@@ -584,15 +584,15 @@ public class MessageHandler implements I
logger.debug(location, ILogger.null_id, mb.toString());
}
else {
- trans.setMetaCas(null);
+ trans.setMetaTask(null);
TransactionHelper.addResponseHint(trans, Hint.Rejected);
}
}
- private void handleMetaCasTransationInvestmentReset(IMetaCasTransaction
trans, IRemoteWorkerThread rwt) {
+ private void
handleMetaCasTransationInvestmentReset(IMetaTaskTransaction trans,
IRemoteWorkerThread rwt) {
String location = "handleMetaCasTransationInvestmentReset";
WiTracker tracker = WiTracker.getInstance();
- MetaCas metaCas = (MetaCas) trans.getMetaCas();
+ MetaTask metaCas = (MetaTask) trans.getMetaTask();
if(tracker.isRecognized(rwt, metaCas)) {
IWorkItem wi = tracker.find(rwt);
update(wi, metaCas);
@@ -606,7 +606,7 @@ public class MessageHandler implements I
logger.debug(location, ILogger.null_id, mb.toString());
}
else {
- trans.setMetaCas(null);
+ trans.setMetaTask(null);
TransactionHelper.addResponseHint(trans, Hint.Rejected);
}
}
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerProcess.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerProcess.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerProcess.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerProcess.java
Tue Jul 17 13:49:47 2018
@@ -23,7 +23,7 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerProcess;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerThread;
-import org.apache.uima.ducc.container.net.iface.IMetaCasRequester;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskRequester;
public class RemoteWorkerProcess implements IRemoteWorkerProcess {
@@ -52,8 +52,8 @@ public class RemoteWorkerProcess impleme
}
return rwp;
}
-
- public RemoteWorkerProcess(IMetaCasRequester metaCasRequester) {
+
+ public RemoteWorkerProcess(IMetaTaskRequester metaCasRequester) {
setNodeName(metaCasRequester.getRequesterNodeName());
setNodeAddress(metaCasRequester.getRequesterAddress());
setPidName(metaCasRequester.getRequesterProcessName());
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerThread.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerThread.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerThread.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerThread.java
Tue Jul 17 13:49:47 2018
@@ -24,7 +24,7 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteNode;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemotePid;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerThread;
-import org.apache.uima.ducc.container.net.iface.IMetaCasRequester;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskRequester;
public class RemoteWorkerThread implements IRemoteWorkerThread {
@@ -41,7 +41,7 @@ public class RemoteWorkerThread implemen
private int pid = 0;
private int tid = 0;
- public RemoteWorkerThread(IMetaCasRequester metaCasRequester) {
+ public RemoteWorkerThread(IMetaTaskRequester metaCasRequester) {
setNodeName(metaCasRequester.getRequesterNodeName());
setNodeAddress(metaCasRequester.getRequesterAddress());
setPidName(metaCasRequester.getRequesterProcessName());
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IWorkItem.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IWorkItem.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IWorkItem.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IWorkItem.java
Tue Jul 17 13:49:47 2018
@@ -19,12 +19,12 @@
package org.apache.uima.ducc.container.jd.wi;
import org.apache.uima.ducc.container.common.fsm.iface.IFsm;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public interface IWorkItem extends Comparable<Object> {
- public void setMetaCas(IMetaCas value);
- public IMetaCas getMetaCas();
+ public void setMetaCas(IMetaTask value);
+ public IMetaTask getMetaCas();
public void setFsm(IFsm value);
public IFsm getFsm();
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java
Tue Jul 17 13:49:47 2018
@@ -35,8 +35,8 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.mh.iface.IProcessInfo;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerProcess;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerThread;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
-import org.apache.uima.ducc.container.net.impl.MetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
+import org.apache.uima.ducc.ps.net.impl.MetaTask;
public class WiTracker {
@@ -61,7 +61,7 @@ public class WiTracker {
if(rwt != null) {
wi = find(rwt);
if(wi == null) {
- IMetaCas metaCas = null;
+ IMetaTask metaCas = null;
IFsm fsm = new WiFsm();
wi = new WorkItem(metaCas, fsm);
map.put(rwt, wi);
@@ -75,7 +75,7 @@ public class WiTracker {
IWorkItem wi = null;
if(rwt != null) {
wi = find(rwt);
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
MetaCasHelper metaCasHelper = new
MetaCasHelper(metaCas);
int seqNo = metaCasHelper.getSystemKey();
MessageBuffer mb = new MessageBuffer();
@@ -93,7 +93,7 @@ public class WiTracker {
IRemoteWorkerThread rwt = find(wi);
if(rwt != null) {
wi = find(rwt);
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
MetaCasHelper metaCasHelper = new
MetaCasHelper(metaCas);
int seqNo = metaCasHelper.getSystemKey();
MessageBuffer mb = new MessageBuffer();
@@ -113,7 +113,7 @@ public class WiTracker {
wi = map.get(rwt);
}
if(wi != null) {
- IMetaCas metaCas = wi.getMetaCas();
+ IMetaTask metaCas = wi.getMetaCas();
if(metaCas != null) {
}
@@ -174,7 +174,7 @@ public class WiTracker {
return submap;
}
- public boolean isRecognized(IRemoteWorkerThread rwt, MetaCas metaCas) {
+ public boolean isRecognized(IRemoteWorkerThread rwt, MetaTask metaCas) {
String location = "isRecognized";
boolean retVal = true;
IWorkItem wi = find(rwt);
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WorkItem.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WorkItem.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WorkItem.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WorkItem.java
Tue Jul 17 13:49:47 2018
@@ -25,13 +25,13 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.common.logger.ILogger;
import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.fsm.wi.WiFsm;
-import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
public class WorkItem implements IWorkItem {
private static Logger logger = Logger.getLogger(WorkItem.class,
IComponent.Id.JD.name());
- private IMetaCas metaCas = null;
+ private IMetaTask metaCas = null;
private IFsm fsm = null;
private Tod todGet = new Tod();
@@ -40,18 +40,18 @@ public class WorkItem implements IWorkIt
private Tod todInvestment = new Tod();
- public WorkItem(IMetaCas metaCas, IFsm fsm) {
+ public WorkItem(IMetaTask metaCas, IFsm fsm) {
setMetaCas(metaCas);
setFsm(fsm);
}
@Override
- public void setMetaCas(IMetaCas value) {
+ public void setMetaCas(IMetaTask value) {
metaCas = value;
}
@Override
- public IMetaCas getMetaCas() {
+ public IMetaTask getMetaCas() {
return metaCas;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/impl/TransactionHelper.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/impl/TransactionHelper.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/impl/TransactionHelper.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/impl/TransactionHelper.java
Tue Jul 17 13:49:47 2018
@@ -28,14 +28,14 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.mh.RemoteWorkerProcess;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerProcess;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
-import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.Hint;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
+import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction.Hint;
public class TransactionHelper {
private static Logger logger =
Logger.getLogger(TransactionHelper.class, IComponent.Id.JD.name());
- public static void addResponseHint(IMetaCasTransaction trans, Hint
hint) {
+ public static void addResponseHint(IMetaTaskTransaction trans, Hint
hint) {
String location = "addResponseHint";
if(trans != null) {
if(hint != null) {
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/Test2.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/Test2.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/Test2.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/Test2.java
Tue Jul 17 13:49:47 2018
@@ -32,6 +32,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.mh.impl.OperatingInfo;
import org.apache.uima.ducc.container.jd.mh.impl.WorkItemInfo;
import org.apache.uima.ducc.container.net.iface.IMetaCas;
+import org.apache.uima.ducc.ps.net.iface.IMetaTask;
import org.junit.Before;
import org.junit.Test;
@@ -52,7 +53,7 @@ public class Test2 extends TestSuite {
CasManager cm = new CasManager();
int total = cm.getCasManagerStats().getCrTotal();
assertTrue(total == 100);
- IMetaCas metaCas = cm.getMetaCas();
+ IMetaTask metaCas = cm.getMetaCas();
int retrys = 3;
while(metaCas != null) {
if(cm.getCasManagerStats().getRetryQueuePuts()
< retrys) {
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
Tue Jul 17 13:49:47 2018
@@ -28,7 +28,7 @@ import org.apache.uima.ducc.common.conta
import org.apache.uima.ducc.container.common.classloader.ProxyException;
import
org.apache.uima.ducc.container.jd.classload.ProxyJobDriverCollectionReader;
import org.apache.uima.ducc.container.jd.test.helper.Utilities;
-import org.apache.uima.ducc.container.net.impl.MetaCas;
+import org.apache.uima.ducc.ps.net.impl.MetaTask;
public class TestSuite extends TestBase {
@@ -134,11 +134,11 @@ public class TestSuite extends TestBase
try {
config();
ProxyJobDriverCollectionReader pjdcr = new
ProxyJobDriverCollectionReader();
- MetaCas mc = pjdcr.getMetaCas();
+ MetaTask mc = pjdcr.getMetaCas();
int seqNo = mc.getSeqNo();
asExpected("seqNo = "+seqNo);
assertTrue(seqNo == 1);
- String serializedCas = (String)mc.getSerializedCas();
+ String serializedCas = (String)mc.getSerializedTask();
checkCas(serializedCas);
asExpected("cas = "+serializedCas);
String documentText = mc.getDocumentText();
@@ -153,11 +153,11 @@ public class TestSuite extends TestBase
private void getMetaCases(ProxyJobDriverCollectionReader pjdcr, int
total) throws ProxyException {
for(int c=1; c <= total; c++) {
- MetaCas mc = pjdcr.getMetaCas();
+ MetaTask mc = pjdcr.getMetaCas();
int seqNo = mc.getSeqNo();
asExpected("seqNo = "+seqNo);
assertTrue(seqNo == c);
- String serializedCas = (String)mc.getSerializedCas();
+ String serializedCas = (String)mc.getSerializedTask();
checkCas(serializedCas);
asExpected("cas = "+serializedCas);
String documentText = mc.getDocumentText();
@@ -174,7 +174,7 @@ public class TestSuite extends TestBase
getMetaCases(pjdcr, total);
if(extra > 0) {
for(int j=0; j<extra; j++) {
- MetaCas mc = pjdcr.getMetaCas();
+ MetaTask mc = pjdcr.getMetaCas();
assertTrue(mc == null);
}
}
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/classloading/TestClassLoading.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/classloading/TestClassLoading.java?rev=1836115&r1=1836114&r2=1836115&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/classloading/TestClassLoading.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/classloading/TestClassLoading.java
Tue Jul 17 13:49:47 2018
@@ -40,7 +40,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.test.TestBase;
import org.apache.uima.ducc.container.jd.test.helper.Utilities;
import
org.apache.uima.ducc.container.jd.user.error.classload.ProxyUserErrorStringify;
-import org.apache.uima.ducc.container.net.impl.MetaCas;
+import org.apache.uima.ducc.ps.net.impl.MetaTask;
import org.apache.uima.ducc.user.common.PrivateClassLoader;
import org.apache.uima.ducc.user.error.iface.Transformer;
import org.junit.Before;
@@ -82,8 +82,8 @@ public class TestClassLoading extends Te
String crXml = file.getAbsolutePath();
System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
ProxyJobDriverCollectionReader pjdcr = new
ProxyJobDriverCollectionReader();
- MetaCas mc = pjdcr.getMetaCas();
- String serializedCAS = mc.getSerializedCas();
+ MetaTask mc = pjdcr.getMetaCas();
+ String serializedCAS = mc.getSerializedTask();
String serializedException = null;
ProxyJobDriverErrorHandler pjdeh = new
ProxyJobDriverErrorHandler();
pjdeh.handle(serializedCAS, serializedException);
@@ -104,8 +104,8 @@ public class TestClassLoading extends Te
String crXml = file.getAbsolutePath();
System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
ProxyJobDriverCollectionReader pjdcr = new
ProxyJobDriverCollectionReader();
- MetaCas mc = pjdcr.getMetaCas();
- String serializedCAS = mc.getSerializedCas();
+ MetaTask mc = pjdcr.getMetaCas();
+ String serializedCAS = mc.getSerializedTask();
Exception e = new Exception("test");
String serializedException = e.toString();
String className =
"org.apache.uima.ducc.user.jd.test.helper.TestJdContainerErrorHandler";
