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 2019/08/02 17:30:47 UTC
svn commit: r1864248 [1/7] - in
/uima/uima-ducc/trunk/uima-ducc-pullservice/src:
main/java/org/apache/uima/ducc/ps/
main/java/org/apache/uima/ducc/ps/net/iface/
main/java/org/apache/uima/ducc/ps/net/impl/
main/java/org/apache/uima/ducc/ps/sd/ main/java...
Author: cwiklik
Date: Fri Aug 2 17:30:46 2019
New Revision: 1864248
URL: http://svn.apache.org/viewvc?rev=1864248&view=rev
Log:
UIMA-6106 refromatted source using uima formatting rules
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/ServiceThreadFactory.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/ThreadLifecycleMgr.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaMetaTask.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTask.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskKeys.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskProvider.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskRequester.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskTransaction.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IPerformanceMetrics.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/ITransport.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/TimeoutException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaMetaTask.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaTask.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaTaskTransaction.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/PerformanceMetrics.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/TransactionHelper.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/TransactionId.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/DriverException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/DuccServiceDriver.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/iface/Lifecycle.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/iface/ServiceDriver.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/MessageBuffer.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/SimpleTask.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/Standardize.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/TestTaskAllocatorCallbackListener.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/WiTaskConsumer.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/error/TaskProtocolException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/iface/ITask.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/iface/TaskAllocatorCallbackListener.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/iface/TaskConsumer.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/iface/TaskProtocolHandler.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/transport/TaskTransportException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/transport/Transports.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/transport/iface/TaskTransportHandler.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/IScaleable.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/IService.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/IServiceComponent.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/IServiceState.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/Lifecycle.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/builders/PullServiceStepBuilder.java
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/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/IDuccGeneratorUimaReferenceByName.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/IErrorHandler.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/IServiceErrorHandler.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/InvalidOverrideParameterException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/ProcessErrorHandler.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/ReconnectErrorHandler.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/ServiceException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/ServiceInitializationException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/ServiceProcessException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/Thresholds.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/builtin/DefaultErrorHandler.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/errors/builtin/WindowBasedErrorHandler.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/examples/processor/CustomProcessorExample.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/examples/processor/SuccessResultExample.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/examples/registry/RegistryClientExample.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/jmx/JMXAgent.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/jmx/JmxAEProcessInitMonitor.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/Application.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/PullService.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/metrics/IWindowStats.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/metrics/builtin/ProcessWindowStats.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/monitor/IServiceMonitor.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/IProcessResult.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/IServiceProcessor.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/IServiceResultSerializer.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-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaDelegator.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaProcessResult.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/processor/uima/utils/PerformanceMetrics.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/UimaMetricsGenerator.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/UimaResultDefaultSerializer.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/protocol/INoTaskAvailableStrategy.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/protocol/IServiceProtocolHandler.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/protocol/builtin/DefaultNoTaskAvailableStrategy.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/main/java/org/apache/uima/ducc/ps/service/protocol/builtin/NoWaitStrategy.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/protocol/builtin/WaitWithLockWhenNoTaskAvailable.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/registry/DefaultRegistryClient.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/registry/IRegistryClient.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/registry/RegistryNotAvailableException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/ConnectionLostException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/IServiceTransport.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/ITargetURI.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/TransportException.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/TransportStats.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/XStreamUtils.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/http/HttpServiceTransport.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/target/HttpTargetURI.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/target/NoOpTargetURI.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/target/SocketTargetURI.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/transport/target/TargetURIFactory.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/utils/UimaSerializer.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/utils/UimaUtils.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/utils/Utils.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/Client.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/StateMonitor.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/JunitErrorHandlingTestSuite.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-pullservice/src/test/java/org/apache/uima/ducc/ps/test/ae/NoOpAE.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/transport/JunitProtocolHandlerTestCase.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/transport/JunitTransportTestCase.java
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/ServiceThreadFactory.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/ServiceThreadFactory.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/ServiceThreadFactory.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/ServiceThreadFactory.java Fri Aug 2 17:30:46 2019
@@ -26,47 +26,48 @@ import org.apache.uima.UIMAFramework;
import org.apache.uima.util.Level;
/**
- * Factory for creating process threads.
+ * Factory for creating process threads.
*
*
*/
public class ServiceThreadFactory implements ThreadFactory {
- private static final String THREAD_POOL = "[ServiceThreadPool ";
+ private static final String THREAD_POOL = "[ServiceThreadPool ";
- private boolean isDaemon=false;
- private String threadNamePrefix=null;
-
- public static AtomicInteger poolIdGenerator = new AtomicInteger(1);
-
- @Override
- public Thread newThread(final Runnable r) {
-
- Thread newThread = null;
- try {
- newThread = new Thread(new Runnable() {
- public void run() {
- if ( threadNamePrefix == null ) {
- threadNamePrefix = THREAD_POOL+poolIdGenerator+"] " + " Process Thread";
- }
- Thread.currentThread().setName( threadNamePrefix +" - "
- + Thread.currentThread().getId());
- try {
-
- // Call given Worker (Runnable) run() method and block. This call blocks until the
- // TaskExecutor is terminated.
- r.run();
-
- UIMAFramework.getLogger().log(Level.INFO, "Thread "+Thread.currentThread().getName()+" ["+Thread.currentThread().getId()+"] Terminating");
- } catch (Throwable e) {
- throw e;
- }
- }
- });
- } catch (Exception e) {
- UIMAFramework.getLogger().log(Level.WARNING, "", e);
- }
- newThread.setDaemon(isDaemon);
- return newThread;
- }
+ private boolean isDaemon = false;
+
+ private String threadNamePrefix = null;
+
+ public static AtomicInteger poolIdGenerator = new AtomicInteger(1);
+
+ @Override
+ public Thread newThread(final Runnable r) {
+
+ Thread newThread = null;
+ try {
+ newThread = new Thread(new Runnable() {
+ public void run() {
+ if (threadNamePrefix == null) {
+ threadNamePrefix = THREAD_POOL + poolIdGenerator + "] " + " Process Thread";
+ }
+ Thread.currentThread().setName(threadNamePrefix + " - " + Thread.currentThread().getId());
+ try {
+
+ // Call given Worker (Runnable) run() method and block. This call blocks until the
+ // TaskExecutor is terminated.
+ r.run();
+
+ UIMAFramework.getLogger().log(Level.INFO, "Thread " + Thread.currentThread().getName()
+ + " [" + Thread.currentThread().getId() + "] Terminating");
+ } catch (Throwable e) {
+ throw e;
+ }
+ }
+ });
+ } catch (Exception e) {
+ UIMAFramework.getLogger().log(Level.WARNING, "", e);
+ }
+ newThread.setDaemon(isDaemon);
+ return newThread;
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/ThreadLifecycleMgr.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/ThreadLifecycleMgr.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/ThreadLifecycleMgr.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/ThreadLifecycleMgr.java Fri Aug 2 17:30:46 2019
@@ -19,17 +19,18 @@
package org.apache.uima.ducc.ps;
-
public class ThreadLifecycleMgr {
- private volatile boolean running = false;
-
- public void start() {
- running = true;
- }
- public void stop() {
- running = false;
- }
- public boolean isRunning() {
- return running;
- }
+ private volatile boolean running = false;
+
+ public void start() {
+ running = true;
+ }
+
+ public void stop() {
+ running = false;
+ }
+
+ public boolean isRunning() {
+ return running;
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaMetaTask.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaMetaTask.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaMetaTask.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaMetaTask.java Fri Aug 2 17:30:46 2019
@@ -18,22 +18,24 @@
*/
package org.apache.uima.ducc.ps.net.iface;
-
/**
- * An interface for storing MetaCAS
- * and CasManager status together
+ * An interface for storing MetaCAS and CasManager status together
*/
public interface IMetaMetaTask {
- public boolean isExhausted();
- public void setExhausted(boolean value);
-
- public boolean isPremature();
- public void setPremature(boolean value);
-
- public boolean isKillJob();
- public void setKillJob(boolean value);
-
- public IMetaTask getMetaCas();
- public void setMetaCas(IMetaTask value);
+ public boolean isExhausted();
+
+ public void setExhausted(boolean value);
+
+ public boolean isPremature();
+
+ public void setPremature(boolean value);
+
+ public boolean isKillJob();
+
+ public void setKillJob(boolean value);
+
+ public IMetaTask getMetaCas();
+
+ public void setMetaCas(IMetaTask value);
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTask.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTask.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTask.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTask.java Fri Aug 2 17:30:46 2019
@@ -21,19 +21,23 @@ package org.apache.uima.ducc.ps.net.ifac
import java.io.Serializable;
public interface IMetaTask extends IMetaTaskKeys, Serializable {
-
- // Performance metrics
- public String getPerformanceMetrics();
- public void setPerformanceMetrics(String serializedMetrics);
-
- // Task (accessible in user space only)
- public Object getUserSpaceTask();
- public void setUserSpaceTask(Object value);
-
- // Exception (accessible in user space only)
- public Object getUserSpaceException();
- public void setUserSpaceException(Object value);
-
- public String getAppData();
- public void setAppData(String value);
+
+ // Performance metrics
+ public String getPerformanceMetrics();
+
+ public void setPerformanceMetrics(String serializedMetrics);
+
+ // Task (accessible in user space only)
+ public Object getUserSpaceTask();
+
+ public void setUserSpaceTask(Object value);
+
+ // Exception (accessible in user space only)
+ public Object getUserSpaceException();
+
+ public void setUserSpaceException(Object value);
+
+ public String getAppData();
+
+ public void setAppData(String value);
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskKeys.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskKeys.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskKeys.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskKeys.java Fri Aug 2 17:30:46 2019
@@ -22,11 +22,13 @@ import java.io.Serializable;
public interface IMetaTaskKeys extends Serializable {
- // System assigned key, e.g. a CAS sequence number
- public String getSystemKey();
- public void setSystemKey(String value);
+ // System assigned key, e.g. a CAS sequence number
+ public String getSystemKey();
- // User provided key, e.g. getDocumentText()
- public String getUserKey();
- public void setUserKey(String value);
+ public void setSystemKey(String value);
+
+ // User provided key, e.g. getDocumentText()
+ public String getUserKey();
+
+ public void setUserKey(String value);
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskProvider.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskProvider.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskProvider.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskProvider.java Fri Aug 2 17:30:46 2019
@@ -21,13 +21,16 @@ package org.apache.uima.ducc.ps.net.ifac
import java.io.Serializable;
public interface IMetaTaskProvider extends Serializable {
-
- public String getProviderKey();
- public void setProviderKey(String value);
-
- public String getProviderName();
- public void setProviderName(String value);
-
- public int getProviderPort();
- public void setProviderPort(int value);
+
+ public String getProviderKey();
+
+ public void setProviderKey(String value);
+
+ public String getProviderName();
+
+ public void setProviderName(String value);
+
+ public int getProviderPort();
+
+ public void setProviderPort(int value);
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskRequester.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskRequester.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskRequester.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskRequester.java Fri Aug 2 17:30:46 2019
@@ -21,19 +21,24 @@ package org.apache.uima.ducc.ps.net.ifac
import java.io.Serializable;
public interface IMetaTaskRequester extends Serializable {
-
- public String getRequesterNodeName();
- public void setRequesterNodeName(String value);
-
- public String getRequesterAddress();
- public void setRequesterAddress(String value);
-
- public String getRequesterProcessName();
- public void setRequesterProcessName(String value);
-
- public int getRequesterProcessId();
- public void setRequesterProcessId(int value);
-
- public int getRequesterThreadId();
- public void setRequesterThreadId(int value);
+
+ public String getRequesterNodeName();
+
+ public void setRequesterNodeName(String value);
+
+ public String getRequesterAddress();
+
+ public void setRequesterAddress(String value);
+
+ public String getRequesterProcessName();
+
+ public void setRequesterProcessName(String value);
+
+ public int getRequesterProcessId();
+
+ public void setRequesterProcessId(int value);
+
+ public int getRequesterThreadId();
+
+ public void setRequesterThreadId(int value);
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskTransaction.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskTransaction.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskTransaction.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IMetaTaskTransaction.java Fri Aug 2 17:30:46 2019
@@ -25,40 +25,51 @@ import org.apache.uima.ducc.ps.net.impl.
public interface IMetaTaskTransaction extends IMetaTaskProvider, IMetaTaskRequester, Serializable {
- public enum Type { Get, Ack, End , InvestmentReset };
-
- public Type getType();
- public void setType(Type value);
-
- public enum Hint {
- Blacklisted, // the requesting JP has been blacklisted (no workitems will ever be assigned)
- Killed, // the JD has been killed
- Exhausted, // the workitems have all been processed (successfully or otherwise)
- Premature, // the available workitems have all been processed (successfully or otherwise)
- Rejected, // the request has been rejected
- };
-
- public List<Hint> getResponseHints();
- public void setResponseHints(List<Hint> value);
-
- public enum Direction { Request, Response };
-
- public Direction getDirection();
- public void setDirection(Direction value);
-
- public TransactionId getTransactionId();
- public void setTransactionId(TransactionId value);
-
- public IMetaTask getMetaTask();
- public void setMetaTask(IMetaTask value);
-
- /*
- * Initializing - driver is not yet ready to deliver work items
- * Active - driver is ready or delivering work items
- * Ended - driver is finished delivering work items
- */
- public enum JdState { Prelaunch, Initializing, Active, Ended };
-
- public JdState getJdState();
- public void setJdState(JdState value);
+ public enum Type {
+ Get, Ack, End, InvestmentReset
+ };
+
+ public Type getType();
+
+ public void setType(Type value);
+
+ public enum Hint {
+ Blacklisted, // the requesting JP has been blacklisted (no workitems will ever be assigned)
+ Killed, // the JD has been killed
+ Exhausted, // the workitems have all been processed (successfully or otherwise)
+ Premature, // the available workitems have all been processed (successfully or otherwise)
+ Rejected, // the request has been rejected
+ };
+
+ public List<Hint> getResponseHints();
+
+ public void setResponseHints(List<Hint> value);
+
+ public enum Direction {
+ Request, Response
+ };
+
+ public Direction getDirection();
+
+ public void setDirection(Direction value);
+
+ public TransactionId getTransactionId();
+
+ public void setTransactionId(TransactionId value);
+
+ public IMetaTask getMetaTask();
+
+ public void setMetaTask(IMetaTask value);
+
+ /*
+ * Initializing - driver is not yet ready to deliver work items Active - driver is ready or
+ * delivering work items Ended - driver is finished delivering work items
+ */
+ public enum JdState {
+ Prelaunch, Initializing, Active, Ended
+ };
+
+ public JdState getJdState();
+
+ public void setJdState(JdState value);
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IPerformanceMetrics.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IPerformanceMetrics.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IPerformanceMetrics.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/IPerformanceMetrics.java Fri Aug 2 17:30:46 2019
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Properties;
public interface IPerformanceMetrics extends Serializable {
- public void set(List<Properties> metrics);
- public List<Properties> get();
+ public void set(List<Properties> metrics);
+
+ public List<Properties> get();
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/ITransport.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/ITransport.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/ITransport.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/ITransport.java Fri Aug 2 17:30:46 2019
@@ -20,5 +20,5 @@ package org.apache.uima.ducc.ps.net.ifac
public interface ITransport {
- public void sendAndReceive(IMetaTaskTransaction metaCastransaction) throws TimeoutException;
+ public void sendAndReceive(IMetaTaskTransaction metaCastransaction) throws TimeoutException;
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/TimeoutException.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/TimeoutException.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/TimeoutException.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/iface/TimeoutException.java Fri Aug 2 17:30:46 2019
@@ -20,6 +20,6 @@ package org.apache.uima.ducc.ps.net.ifac
public class TimeoutException extends Exception {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaMetaTask.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaMetaTask.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaMetaTask.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaMetaTask.java Fri Aug 2 17:30:46 2019
@@ -22,59 +22,60 @@ import org.apache.uima.ducc.ps.net.iface
import org.apache.uima.ducc.ps.net.iface.IMetaTask;
/**
- * An implementation for storing MetaCAS
- * and CasManager status together
+ * An implementation for storing MetaCAS and CasManager status together
*/
public class MetaMetaTask implements IMetaMetaTask {
- private boolean exhausted;
- private boolean premature;
- private boolean killJob;
-
- private IMetaTask metaCas;
-
- public MetaMetaTask() {
- }
-
- @Override
- public boolean isExhausted() {
- return exhausted;
- }
-
- @Override
- public void setExhausted(boolean value) {
- exhausted = value;
- }
-
- @Override
- public boolean isPremature() {
- return premature;
- }
-
- @Override
- public void setPremature(boolean value) {
- premature = value;
- }
-
- @Override
- public boolean isKillJob() {
- return killJob;
- }
-
- @Override
- public void setKillJob(boolean value) {
- killJob = value;
- }
-
- @Override
- public IMetaTask getMetaCas() {
- return metaCas;
- }
-
- @Override
- public void setMetaCas(IMetaTask value) {
- metaCas = value;
- }
+ private boolean exhausted;
+
+ private boolean premature;
+
+ private boolean killJob;
+
+ private IMetaTask metaCas;
+
+ public MetaMetaTask() {
+ }
+
+ @Override
+ public boolean isExhausted() {
+ return exhausted;
+ }
+
+ @Override
+ public void setExhausted(boolean value) {
+ exhausted = value;
+ }
+
+ @Override
+ public boolean isPremature() {
+ return premature;
+ }
+
+ @Override
+ public void setPremature(boolean value) {
+ premature = value;
+ }
+
+ @Override
+ public boolean isKillJob() {
+ return killJob;
+ }
+
+ @Override
+ public void setKillJob(boolean value) {
+ killJob = value;
+ }
+
+ @Override
+ public IMetaTask getMetaCas() {
+ return metaCas;
+ }
+
+ @Override
+ public void setMetaCas(IMetaTask value) {
+ metaCas = value;
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaTask.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaTask.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaTask.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaTask.java Fri Aug 2 17:30:46 2019
@@ -22,102 +22,109 @@ import org.apache.uima.ducc.ps.net.iface
public class MetaTask implements IMetaTask {
- private static final long serialVersionUID = 1L;
-
- private String systemKey = (new Integer(-1)).toString();
- private String userKey = null;
- private String performanceMetrics = null;
- private Object userSpaceTask = null;
- private Object userSpaceException = null;
- private String appData = null;
- /////
-
- public MetaTask(int seqNo, String documentText, Object userSpaceTask) {
- setSeqNo(seqNo);
- setDocumentText(documentText);
- setUserSpaceTask(userSpaceTask);
- }
- public int getSeqNo() {
- return Integer.parseInt(getSystemKey());
- }
- public String getAppData() {
- return appData;
- }
- public void setAppData(String value) {
- appData = value;
- }
-
- public void setSeqNo(int value) {
- setSystemKey(Integer.toString(value));
- }
-
- public String getDocumentText() {
- return getUserKey();
- }
-
- public void setDocumentText(String value) {
- setUserKey(value);
- }
-
- public String getSerializedTask() {
- return (String)getUserSpaceTask();
- }
-
- public void setSerializedTask(String value) {
- setUserSpaceTask(value);
- }
-
- /////
-
- @Override
- public String getSystemKey() {
- return systemKey;
- }
-
- @Override
- public void setSystemKey(String value) {
- systemKey = value;
- }
-
- @Override
- public String getUserKey() {
- return userKey;
- }
-
- @Override
- public void setUserKey(String value) {
- userKey = value;
- }
-
- @Override
- public String getPerformanceMetrics() {
- return performanceMetrics;
- }
-
- @Override
- public void setPerformanceMetrics(String serializedMetrics) {
- performanceMetrics = serializedMetrics;
- }
-
- @Override
- public Object getUserSpaceTask() {
- return userSpaceTask;
- }
-
- @Override
- public void setUserSpaceTask(Object value) {
- userSpaceTask = value;
- }
-
- @Override
- public Object getUserSpaceException() {
- return userSpaceException;
- }
-
- @Override
- public void setUserSpaceException(Object value) {
- userSpaceException = value;
- }
+ private static final long serialVersionUID = 1L;
+
+ private String systemKey = (new Integer(-1)).toString();
+
+ private String userKey = null;
+
+ private String performanceMetrics = null;
+
+ private Object userSpaceTask = null;
+
+ private Object userSpaceException = null;
+
+ private String appData = null;
+ /////
+
+ public MetaTask(int seqNo, String documentText, Object userSpaceTask) {
+ setSeqNo(seqNo);
+ setDocumentText(documentText);
+ setUserSpaceTask(userSpaceTask);
+ }
+
+ public int getSeqNo() {
+ return Integer.parseInt(getSystemKey());
+ }
+
+ public String getAppData() {
+ return appData;
+ }
+
+ public void setAppData(String value) {
+ appData = value;
+ }
+
+ public void setSeqNo(int value) {
+ setSystemKey(Integer.toString(value));
+ }
+
+ public String getDocumentText() {
+ return getUserKey();
+ }
+
+ public void setDocumentText(String value) {
+ setUserKey(value);
+ }
+
+ public String getSerializedTask() {
+ return (String) getUserSpaceTask();
+ }
+
+ public void setSerializedTask(String value) {
+ setUserSpaceTask(value);
+ }
+
+ /////
+
+ @Override
+ public String getSystemKey() {
+ return systemKey;
+ }
+
+ @Override
+ public void setSystemKey(String value) {
+ systemKey = value;
+ }
+
+ @Override
+ public String getUserKey() {
+ return userKey;
+ }
+
+ @Override
+ public void setUserKey(String value) {
+ userKey = value;
+ }
+
+ @Override
+ public String getPerformanceMetrics() {
+ return performanceMetrics;
+ }
+
+ @Override
+ public void setPerformanceMetrics(String serializedMetrics) {
+ performanceMetrics = serializedMetrics;
+ }
+
+ @Override
+ public Object getUserSpaceTask() {
+ return userSpaceTask;
+ }
+
+ @Override
+ public void setUserSpaceTask(Object value) {
+ userSpaceTask = value;
+ }
+
+ @Override
+ public Object getUserSpaceException() {
+ return userSpaceException;
+ }
+
+ @Override
+ public void setUserSpaceException(Object value) {
+ userSpaceException = value;
+ }
-
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaTaskTransaction.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaTaskTransaction.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaTaskTransaction.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/MetaTaskTransaction.java Fri Aug 2 17:30:46 2019
@@ -23,174 +23,180 @@ import java.util.List;
import org.apache.uima.ducc.ps.net.iface.IMetaTask;
import org.apache.uima.ducc.ps.net.iface.IMetaTaskTransaction;
-
public class MetaTaskTransaction implements IMetaTaskTransaction {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
+
+ private TransactionId transactionId = null;
+
+ private Type type = null;
+
+ private Direction direction = null;
- private TransactionId transactionId = null;
-
- private Type type = null;
- private Direction direction = null;
-
- private List<Hint> hints = null;
-
- private String providerKey = null;
- private String providerName = null;
- private int providerPort = 0;
-
- private String requesterNodeName = null;
- private String requesterAddress = null;
- private String requesterPidName = null;
- private int requesterPid = 0;
- private int requesterTid = 0;
-
- private IMetaTask metaTask = null;
-
- private JdState jdState = null;
-
- public MetaTaskTransaction() {
- transactionId = new TransactionId(0,0);
- }
-
- @Override
- public String getProviderKey() {
- return providerKey;
- }
-
- @Override
- public void setProviderKey(String value) {
- providerKey = value;
- }
-
- @Override
- public String getProviderName() {
- return providerName;
- }
-
- @Override
- public void setProviderName(String value) {
- providerName = value;
- }
-
- @Override
- public int getProviderPort() {
- return providerPort;
- }
-
- @Override
- public void setProviderPort(int value) {
- providerPort = value;
- }
-
- @Override
- public String getRequesterNodeName() {
- return requesterNodeName;
- }
-
- @Override
- public void setRequesterNodeName(String value) {
- requesterNodeName = value;
- }
-
- @Override
- public String getRequesterAddress() {
- return requesterAddress;
- }
-
- @Override
- public void setRequesterAddress(String value) {
- requesterAddress = value;
- }
-
- @Override
- public String getRequesterProcessName() {
- return requesterPidName;
- }
-
- @Override
- public void setRequesterProcessName(String value) {
- requesterPidName = value;
- }
-
- @Override
- public int getRequesterProcessId() {
- return requesterPid;
- }
-
- @Override
- public void setRequesterProcessId(int value) {
- requesterPid = value;
- }
-
- @Override
- public int getRequesterThreadId() {
- return requesterTid;
- }
-
- @Override
- public void setRequesterThreadId(int value) {
- requesterTid = value;
- }
-
- @Override
- public Type getType() {
- return type;
- }
-
- @Override
- public void setType(Type value) {
- type = value;
- }
-
- @Override
- public Direction getDirection() {
- return direction;
- }
-
- @Override
- public void setDirection(Direction value) {
- direction = value;
- }
-
- @Override
- public List<Hint> getResponseHints() {
- return hints;
- }
-
- @Override
- public void setResponseHints(List<Hint> value) {
- hints = value;
- }
-
- @Override
- public TransactionId getTransactionId() {
- return transactionId;
- }
-
- @Override
- public void setTransactionId(TransactionId value) {
- transactionId = value;
- }
-
- @Override
- public IMetaTask getMetaTask() {
- return metaTask;
- }
-
- @Override
- public void setMetaTask(IMetaTask value) {
- metaTask = value;
- }
-
- @Override
- public JdState getJdState() {
- return jdState;
- }
-
- @Override
- public void setJdState(JdState value) {
- jdState = value;
- }
+ private List<Hint> hints = null;
+
+ private String providerKey = null;
+
+ private String providerName = null;
+
+ private int providerPort = 0;
+
+ private String requesterNodeName = null;
+
+ private String requesterAddress = null;
+
+ private String requesterPidName = null;
+
+ private int requesterPid = 0;
+
+ private int requesterTid = 0;
+
+ private IMetaTask metaTask = null;
+
+ private JdState jdState = null;
+
+ public MetaTaskTransaction() {
+ transactionId = new TransactionId(0, 0);
+ }
+
+ @Override
+ public String getProviderKey() {
+ return providerKey;
+ }
+
+ @Override
+ public void setProviderKey(String value) {
+ providerKey = value;
+ }
+
+ @Override
+ public String getProviderName() {
+ return providerName;
+ }
+
+ @Override
+ public void setProviderName(String value) {
+ providerName = value;
+ }
+
+ @Override
+ public int getProviderPort() {
+ return providerPort;
+ }
+
+ @Override
+ public void setProviderPort(int value) {
+ providerPort = value;
+ }
+
+ @Override
+ public String getRequesterNodeName() {
+ return requesterNodeName;
+ }
+
+ @Override
+ public void setRequesterNodeName(String value) {
+ requesterNodeName = value;
+ }
+
+ @Override
+ public String getRequesterAddress() {
+ return requesterAddress;
+ }
+
+ @Override
+ public void setRequesterAddress(String value) {
+ requesterAddress = value;
+ }
+
+ @Override
+ public String getRequesterProcessName() {
+ return requesterPidName;
+ }
+
+ @Override
+ public void setRequesterProcessName(String value) {
+ requesterPidName = value;
+ }
+
+ @Override
+ public int getRequesterProcessId() {
+ return requesterPid;
+ }
+
+ @Override
+ public void setRequesterProcessId(int value) {
+ requesterPid = value;
+ }
+
+ @Override
+ public int getRequesterThreadId() {
+ return requesterTid;
+ }
+
+ @Override
+ public void setRequesterThreadId(int value) {
+ requesterTid = value;
+ }
+
+ @Override
+ public Type getType() {
+ return type;
+ }
+
+ @Override
+ public void setType(Type value) {
+ type = value;
+ }
+
+ @Override
+ public Direction getDirection() {
+ return direction;
+ }
+
+ @Override
+ public void setDirection(Direction value) {
+ direction = value;
+ }
+
+ @Override
+ public List<Hint> getResponseHints() {
+ return hints;
+ }
+
+ @Override
+ public void setResponseHints(List<Hint> value) {
+ hints = value;
+ }
+
+ @Override
+ public TransactionId getTransactionId() {
+ return transactionId;
+ }
+
+ @Override
+ public void setTransactionId(TransactionId value) {
+ transactionId = value;
+ }
+
+ @Override
+ public IMetaTask getMetaTask() {
+ return metaTask;
+ }
+
+ @Override
+ public void setMetaTask(IMetaTask value) {
+ metaTask = value;
+ }
+
+ @Override
+ public JdState getJdState() {
+ return jdState;
+ }
+
+ @Override
+ public void setJdState(JdState value) {
+ jdState = value;
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/PerformanceMetrics.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/PerformanceMetrics.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/PerformanceMetrics.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/PerformanceMetrics.java Fri Aug 2 17:30:46 2019
@@ -26,25 +26,29 @@ import java.util.Properties;
import org.apache.uima.ducc.ps.net.iface.IPerformanceMetrics;
public class PerformanceMetrics implements IPerformanceMetrics {
- private static final long serialVersionUID = 1L;
- private List<Properties> perfMetrics;
- public List<Properties> get() {
- return perfMetrics;
- }
- public void set(List<Properties> metrics) {
- perfMetrics = metrics;
- }
- public String toString() {
- StringBuilder sb = new StringBuilder();
- if ( perfMetrics != null && !perfMetrics.isEmpty()) {
- for( Properties p : perfMetrics ) {
- Enumeration<Object> keys = p.keys();
- while( keys.hasMoreElements() ) {
- String key = (String)keys.nextElement();
- sb.append(key).append(":").append(p.getProperty(key)).append("\t");
- }
- }
- }
- return sb.toString();
+ private static final long serialVersionUID = 1L;
+
+ private List<Properties> perfMetrics;
+
+ public List<Properties> get() {
+ return perfMetrics;
+ }
+
+ public void set(List<Properties> metrics) {
+ perfMetrics = metrics;
+ }
+
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ if (perfMetrics != null && !perfMetrics.isEmpty()) {
+ for (Properties p : perfMetrics) {
+ Enumeration<Object> keys = p.keys();
+ while (keys.hasMoreElements()) {
+ String key = (String) keys.nextElement();
+ sb.append(key).append(":").append(p.getProperty(key)).append("\t");
+ }
+ }
}
+ return sb.toString();
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/TransactionHelper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/TransactionHelper.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/TransactionHelper.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/TransactionHelper.java Fri Aug 2 17:30:46 2019
@@ -26,27 +26,28 @@ import org.apache.uima.ducc.ps.net.iface
public class TransactionHelper {
-// private static Logger logger = Logger.getLogger(TransactionHelper.class, IComponent.Id.JD.name());
-
- public static void addResponseHint(IMetaTaskTransaction trans, Hint hint) {
- String location = "addResponseHint";
- if(trans != null) {
- if(hint != null) {
- List<Hint> hints = trans.getResponseHints();
- if(hints == null) {
- hints = new ArrayList<Hint>();
- trans.setResponseHints(hints);
- }
- if(!hints.contains(hint)) {
- hints.add(hint);
-// IRemoteWorkerProcess rwp = new RemoteWorkerProcess(trans);
-// MessageBuffer mb = new MessageBuffer();
-// mb.append(Standardize.Label.node.get()+rwp.getNodeName());
-// mb.append(Standardize.Label.pid.get()+rwp.getPid());
-// mb.append(Standardize.Label.value.get()+hint);
-// logger.debug(location, ILogger.null_id, mb.toString());
- }
- }
- }
- }
+ // private static Logger logger = Logger.getLogger(TransactionHelper.class,
+ // IComponent.Id.JD.name());
+
+ public static void addResponseHint(IMetaTaskTransaction trans, Hint hint) {
+ String location = "addResponseHint";
+ if (trans != null) {
+ if (hint != null) {
+ List<Hint> hints = trans.getResponseHints();
+ if (hints == null) {
+ hints = new ArrayList<Hint>();
+ trans.setResponseHints(hints);
+ }
+ if (!hints.contains(hint)) {
+ hints.add(hint);
+ // IRemoteWorkerProcess rwp = new RemoteWorkerProcess(trans);
+ // MessageBuffer mb = new MessageBuffer();
+ // mb.append(Standardize.Label.node.get()+rwp.getNodeName());
+ // mb.append(Standardize.Label.pid.get()+rwp.getPid());
+ // mb.append(Standardize.Label.value.get()+hint);
+ // logger.debug(location, ILogger.null_id, mb.toString());
+ }
+ }
+ }
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/TransactionId.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/TransactionId.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/TransactionId.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/net/impl/TransactionId.java Fri Aug 2 17:30:46 2019
@@ -22,38 +22,39 @@ import java.io.Serializable;
public class TransactionId implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private int major = 0;
- private int minor = 0;
-
- public TransactionId(int major, int minor) {
- setMajor(major);
- setMinor(minor);
- }
-
- private int getMajor() {
- return major;
- }
-
- private void setMajor(int value) {
- major = value;
- }
-
- private int getMinor() {
- return minor;
- }
-
- private void setMinor(int value) {
- minor = value;
- }
-
- public void next() {
- minor++;
- }
-
- @Override
- public String toString() {
- return getMajor()+"."+getMinor();
- }
+ private static final long serialVersionUID = 1L;
+
+ private int major = 0;
+
+ private int minor = 0;
+
+ public TransactionId(int major, int minor) {
+ setMajor(major);
+ setMinor(minor);
+ }
+
+ private int getMajor() {
+ return major;
+ }
+
+ private void setMajor(int value) {
+ major = value;
+ }
+
+ private int getMinor() {
+ return minor;
+ }
+
+ private void setMinor(int value) {
+ minor = value;
+ }
+
+ public void next() {
+ minor++;
+ }
+
+ @Override
+ public String toString() {
+ return getMajor() + "." + getMinor();
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/DriverException.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/DriverException.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/DriverException.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/DriverException.java Fri Aug 2 17:30:46 2019
@@ -21,26 +21,26 @@ package org.apache.uima.ducc.ps.sd;
public class DriverException extends Exception {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public DriverException() {
- }
+ public DriverException() {
+ }
- public DriverException(String message) {
- super(message);
- }
-
- public DriverException(Throwable cause) {
- super(cause);
- }
-
- public DriverException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public DriverException(String message, Throwable cause,
- boolean enableSuppression, boolean writableStackTrace) {
- super(message, cause, enableSuppression, writableStackTrace);
- }
+ public DriverException(String message) {
+ super(message);
+ }
+
+ public DriverException(Throwable cause) {
+ super(cause);
+ }
+
+ public DriverException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public DriverException(String message, Throwable cause, boolean enableSuppression,
+ boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/DuccServiceDriver.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/DuccServiceDriver.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/DuccServiceDriver.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/DuccServiceDriver.java Fri Aug 2 17:30:46 2019
@@ -42,128 +42,136 @@ import org.apache.uima.util.Level;
import org.apache.uima.util.Logger;
public class DuccServiceDriver implements ServiceDriver {
- Logger logger = UIMAFramework.getLogger(DuccServiceDriver.class);
-
- private TaskAllocatorCallbackListener taskAllocator;
- private TaskTransportHandler transport;
- private TransportType transportType = TransportType.HTTP;
- private TaskProtocolHandler protocolHandler = null;
-
- // prevent empty constructor instantiation
- private DuccServiceDriver() {
- }
- /**
- * Thread safe singleton helper class
- */
- private static class DuccServiceDriverSingleton {
- private static final DuccServiceDriver instance =
- new DuccServiceDriver();
- }
- public static DuccServiceDriver getInstance() {
- return DuccServiceDriverSingleton.instance;
- }
- public TaskAllocatorCallbackListener getTaskAllocator() {
- return taskAllocator;
- }
- public void setTaskAllocator(TaskAllocatorCallbackListener taskAllocator) {
- this.taskAllocator = taskAllocator;
- }
- public String start() throws Exception {
- if ( protocolHandler == null ) {
- throw new DriverException("start() called before initialize()");
- }
- if ( transport == null ) {
- throw new DriverException("start() called before initialize()");
- }
- if ( taskAllocator == null ) {
- throw new DriverException("start() called before setTaskAllocator()");
- }
- String retValue = protocolHandler.start();
- transport.start();
-
- return retValue;
- }
- public void stop() throws Exception {
- if ( transport != null ) {
- transport.stop();
- }
- if ( protocolHandler != null ) {
- protocolHandler.stop();
- }
- }
- public String initialize(Properties properties) throws DriverException {
- if ( TransportType.HTTP.equals(transportType)) {
- transport =
- Transports.newHttpTransport();
-
- protocolHandler = new DuccServiceTaskProtocolHandler(taskAllocator);
- try {
- logger.log(Level.INFO, "Initializing protocol handler ...");
- protocolHandler.initialize(properties);
- logger.log(Level.INFO, "Initializing transport ...");
- transport.setTaskProtocolHandler(protocolHandler);
- return transport.initialize(properties);
- } catch( TaskProtocolException e) {
- throw new DriverException(e);
- } catch( TaskTransportException e) {
- throw new DriverException(e);
- } catch( Exception e) {
- throw new DriverException(e);
- }
- }
+ Logger logger = UIMAFramework.getLogger(DuccServiceDriver.class);
+
+ private TaskAllocatorCallbackListener taskAllocator;
+
+ private TaskTransportHandler transport;
+
+ private TransportType transportType = TransportType.HTTP;
+
+ private TaskProtocolHandler protocolHandler = null;
+
+ // prevent empty constructor instantiation
+ private DuccServiceDriver() {
+ }
+
+ /**
+ * Thread safe singleton helper class
+ */
+ private static class DuccServiceDriverSingleton {
+ private static final DuccServiceDriver instance = new DuccServiceDriver();
+ }
+
+ public static DuccServiceDriver getInstance() {
+ return DuccServiceDriverSingleton.instance;
+ }
+
+ public TaskAllocatorCallbackListener getTaskAllocator() {
+ return taskAllocator;
+ }
+
+ public void setTaskAllocator(TaskAllocatorCallbackListener taskAllocator) {
+ this.taskAllocator = taskAllocator;
+ }
+
+ public String start() throws Exception {
+ if (protocolHandler == null) {
+ throw new DriverException("start() called before initialize()");
+ }
+ if (transport == null) {
+ throw new DriverException("start() called before initialize()");
+ }
+ if (taskAllocator == null) {
+ throw new DriverException("start() called before setTaskAllocator()");
+ }
+ String retValue = protocolHandler.start();
+ transport.start();
+
+ return retValue;
+ }
+
+ public void stop() throws Exception {
+ if (transport != null) {
+ transport.stop();
+ }
+ if (protocolHandler != null) {
+ protocolHandler.stop();
+ }
+ }
+
+ public String initialize(Properties properties) throws DriverException {
+ if (TransportType.HTTP.equals(transportType)) {
+ transport = Transports.newHttpTransport();
+
+ protocolHandler = new DuccServiceTaskProtocolHandler(taskAllocator);
+ try {
+ logger.log(Level.INFO, "Initializing protocol handler ...");
+ protocolHandler.initialize(properties);
+ logger.log(Level.INFO, "Initializing transport ...");
+ transport.setTaskProtocolHandler(protocolHandler);
+ return transport.initialize(properties);
+ } catch (TaskProtocolException e) {
+ throw new DriverException(e);
+ } catch (TaskTransportException e) {
+ throw new DriverException(e);
+ } catch (Exception e) {
+ throw new DriverException(e);
+ }
+ }
return null;
- }
- public void test() throws Exception {
- AtomicInteger IdGenerator =
- new AtomicInteger();
- IMetaTaskTransaction transaction = new MetaTaskTransaction();
-
- int major = IdGenerator.addAndGet(1);
- int minor = 0;
-
- TransactionId tid = new TransactionId(major, minor);
- transaction.setTransactionId(tid);
- // According to HTTP spec, GET may not contain Body in
- // HTTP request. HttpClient actually enforces this. So
- // do a POST instead of a GET.
- transaction.setType(Type.Get); // Tell JD you want a Work Item
- protocolHandler.handle(transaction);
- logger.log(Level.INFO,"Returned from Get Handler - Client Got Message");
- transaction.setType(Type.Ack); // Tell JD you want a Work Item
- protocolHandler.handle(transaction);
- logger.log(Level.INFO,"Returned from Ack Handler - Client Got Message");
- transaction.setType(Type.End); // Tell JD you want a Work Item
- protocolHandler.handle(transaction);
- logger.log(Level.INFO,"Returned from End Handler - Client Got Message");
-
- }
- public static void main(String[] args) {
- String port = "8888";
- String application = "/test";
- if (args.length > 0) {
- if (args.length != 2) {
- System.out.println("Two arguments required: port application (defaults: 8888 /test");
- return;
- }
- port = args[0];
- application = args[1];
- }
- try {
- Properties properties = new Properties();
- properties.put(ServiceDriver.Port, port);
- properties.put(ServiceDriver.Application, application);
- properties.put(ServiceDriver.MaxThreads, "100");
-
- TaskAllocatorCallbackListener taskAllocator =
- new TestTaskAllocatorCallbackListener();
- ServiceDriver driver = DuccServiceDriver.getInstance();
- driver.setTaskAllocator(taskAllocator);
- driver.initialize(properties);
- driver.start();
- // ((DuccServiceDriver)driver).test();
-
- } catch( Exception e) {
- e.printStackTrace();
- }
- }
+ }
+
+ public void test() throws Exception {
+ AtomicInteger IdGenerator = new AtomicInteger();
+ IMetaTaskTransaction transaction = new MetaTaskTransaction();
+
+ int major = IdGenerator.addAndGet(1);
+ int minor = 0;
+
+ TransactionId tid = new TransactionId(major, minor);
+ transaction.setTransactionId(tid);
+ // According to HTTP spec, GET may not contain Body in
+ // HTTP request. HttpClient actually enforces this. So
+ // do a POST instead of a GET.
+ transaction.setType(Type.Get); // Tell JD you want a Work Item
+ protocolHandler.handle(transaction);
+ logger.log(Level.INFO, "Returned from Get Handler - Client Got Message");
+ transaction.setType(Type.Ack); // Tell JD you want a Work Item
+ protocolHandler.handle(transaction);
+ logger.log(Level.INFO, "Returned from Ack Handler - Client Got Message");
+ transaction.setType(Type.End); // Tell JD you want a Work Item
+ protocolHandler.handle(transaction);
+ logger.log(Level.INFO, "Returned from End Handler - Client Got Message");
+
+ }
+
+ public static void main(String[] args) {
+ String port = "8888";
+ String application = "/test";
+ if (args.length > 0) {
+ if (args.length != 2) {
+ System.out.println("Two arguments required: port application (defaults: 8888 /test");
+ return;
+ }
+ port = args[0];
+ application = args[1];
+ }
+ try {
+ Properties properties = new Properties();
+ properties.put(ServiceDriver.Port, port);
+ properties.put(ServiceDriver.Application, application);
+ properties.put(ServiceDriver.MaxThreads, "100");
+
+ TaskAllocatorCallbackListener taskAllocator = new TestTaskAllocatorCallbackListener();
+ ServiceDriver driver = DuccServiceDriver.getInstance();
+ driver.setTaskAllocator(taskAllocator);
+ driver.initialize(properties);
+ driver.start();
+ // ((DuccServiceDriver)driver).test();
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/iface/Lifecycle.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/iface/Lifecycle.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/iface/Lifecycle.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/iface/Lifecycle.java Fri Aug 2 17:30:46 2019
@@ -20,6 +20,7 @@
package org.apache.uima.ducc.ps.sd.iface;
public interface Lifecycle {
- public String start() throws Exception;
- public void stop() throws Exception;
+ public String start() throws Exception;
+
+ public void stop() throws Exception;
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/iface/ServiceDriver.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/iface/ServiceDriver.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/iface/ServiceDriver.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/iface/ServiceDriver.java Fri Aug 2 17:30:46 2019
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.uima.ducc.ps.sd.iface;
import java.util.Properties;
@@ -26,13 +25,19 @@ import org.apache.uima.ducc.ps.sd.Driver
import org.apache.uima.ducc.ps.sd.task.iface.TaskAllocatorCallbackListener;
public interface ServiceDriver extends Lifecycle {
- public static String Application = "driver.application.name";
- public static String Port = "driver.server.port";
- public static String MaxThreads = "driver.server.max.threads";
- public static String DriverTaskRetryCount = "driver.task.retry.count";
- public static String DriverTaskWaitTime = "driver.task.wait.time.millis";
-
- public String initialize(Properties props) throws DriverException;
- public TaskAllocatorCallbackListener getTaskAllocator();
- public void setTaskAllocator(TaskAllocatorCallbackListener taskAllocator);
+ public static String Application = "driver.application.name";
+
+ public static String Port = "driver.server.port";
+
+ public static String MaxThreads = "driver.server.max.threads";
+
+ public static String DriverTaskRetryCount = "driver.task.retry.count";
+
+ public static String DriverTaskWaitTime = "driver.task.wait.time.millis";
+
+ public String initialize(Properties props) throws DriverException;
+
+ public TaskAllocatorCallbackListener getTaskAllocator();
+
+ public void setTaskAllocator(TaskAllocatorCallbackListener taskAllocator);
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/MessageBuffer.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/MessageBuffer.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/MessageBuffer.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/MessageBuffer.java Fri Aug 2 17:30:46 2019
@@ -20,17 +20,17 @@ package org.apache.uima.ducc.ps.sd.task;
public class MessageBuffer {
- private StringBuffer sb = new StringBuffer();
-
- public void append(String text) {
- if(sb.length() > 0) {
- sb.append(" ");
- }
- sb.append(text);
- }
-
- @Override
- public String toString() {
- return sb.toString();
- }
+ private StringBuffer sb = new StringBuffer();
+
+ public void append(String text) {
+ if (sb.length() > 0) {
+ sb.append(" ");
+ }
+ sb.append(text);
+ }
+
+ @Override
+ public String toString() {
+ return sb.toString();
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/SimpleTask.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/SimpleTask.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/SimpleTask.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/SimpleTask.java Fri Aug 2 17:30:46 2019
@@ -23,24 +23,24 @@ import java.util.UUID;
import org.apache.uima.ducc.ps.sd.task.iface.ITask;
public class SimpleTask implements ITask {
- private String task;
-
- SimpleTask(String serializedTask) {
- task = serializedTask;
- }
-
- public boolean isEmpty() {
- return task == null;
- }
-
- @Override
- public String asString() {
- return task;
- }
-
- @Override
- public String getMetadata() {
- return UUID.randomUUID().toString();
- }
+ private String task;
+
+ SimpleTask(String serializedTask) {
+ task = serializedTask;
+ }
+
+ public boolean isEmpty() {
+ return task == null;
+ }
+
+ @Override
+ public String asString() {
+ return task;
+ }
+
+ @Override
+ public String getMetadata() {
+ return UUID.randomUUID().toString();
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/Standardize.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/Standardize.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/Standardize.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/Standardize.java Fri Aug 2 17:30:46 2019
@@ -20,115 +20,14 @@ package org.apache.uima.ducc.ps.sd.task;
public class Standardize {
- public enum Label {
- workitem,
- statistics,
- memory,
- free,
- tasks,
- futures,
- collectionReaderCfg,
- collectionReaderXml,
- userClasspath,
- workItemTimeout,
- jobdir,
- jobid,
- deallocate,
- text,
- limit,
- classname,
- exception,
- instance,
- id,
- skip,
- dispatched,
- deadline,
- sum,
- count,
- total,
- name,
- key,
- value,
- size,
- status,
- add,
- puts,
- gets,
- reason,
- enter,
- exit,
- dispatch,
- done,
- error,
- preempt,
- retry,
- avg,
- min,
- max,
- stddev,
- removed,
- isKillJob,
- isKillProcess,
- isKillWorkItem,
- current,
- request,
- result,
- remainder,
- jdObject,
- jdState,
- directory,
- node,
- ip,
- pidName,
- pid,
- tid,
- crFetches,
- crTotal,
- retrys,
- preemptions,
- endSuccess,
- endFailure,
- finishedMillisMax,
- finishedMillisMin,
- finishedMillisAvg,
- runningMillisMax,
- runningMillisMin,
- todMostRecentStart,
- state,
- event,
- curr,
- prev,
- hash,
- loaded,
- loading,
- seqNo,
- transNo,
- remote,
- action,
- type,
- AckMsecs,
- EndMsecs,
- killJob,
- killProcess,
- killWorkItem,
- investmentMillis,
- operatingMillis,
- endAvg,
- endCount,
- aboveAvgMillis,
- aboveAvgCount,
- aboveAvg,
- skewAvg,
- skewCount,
- runMax,
- runMin,
- ;
-
- Label() {
- }
-
- public String get() {
- return this+"=";
- }
- }
+ public enum Label {
+ workitem, statistics, memory, free, tasks, futures, collectionReaderCfg, collectionReaderXml, userClasspath, workItemTimeout, jobdir, jobid, deallocate, text, limit, classname, exception, instance, id, skip, dispatched, deadline, sum, count, total, name, key, value, size, status, add, puts, gets, reason, enter, exit, dispatch, done, error, preempt, retry, avg, min, max, stddev, removed, isKillJob, isKillProcess, isKillWorkItem, current, request, result, remainder, jdObject, jdState, directory, node, ip, pidName, pid, tid, crFetches, crTotal, retrys, preemptions, endSuccess, endFailure, finishedMillisMax, finishedMillisMin, finishedMillisAvg, runningMillisMax, runningMillisMin, todMostRecentStart, state, event, curr, prev, hash, loaded, loading, seqNo, transNo, remote, action, type, AckMsecs, EndMsecs, killJob, killProcess, killWorkItem, investmentMillis, operatingMillis, endAvg, endCount, aboveAvgMillis, aboveAvgCount, aboveAvg, skewAvg, skewCount, runMax, runMin,;
+
+ Label() {
+ }
+
+ public String get() {
+ return this + "=";
+ }
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/TestTaskAllocatorCallbackListener.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/TestTaskAllocatorCallbackListener.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/TestTaskAllocatorCallbackListener.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/TestTaskAllocatorCallbackListener.java Fri Aug 2 17:30:46 2019
@@ -39,73 +39,83 @@ import org.apache.uima.util.Logger;
/*
* Creates tasks/work from an input file or sends a fixed string every time.
*/
-public class TestTaskAllocatorCallbackListener implements
- TaskAllocatorCallbackListener {
- Logger logger = UIMAFramework.getLogger(TestTaskAllocatorCallbackListener.class);
- private static UimaSerializer uimaSerializer = new UimaSerializer();
- private AtomicLong seqno = new AtomicLong(0);
- private BufferedReader inf;
- private String text = "Some Text";
- public TestTaskAllocatorCallbackListener() throws FileNotFoundException {
- String taskFilename = System.getProperty("TestTaskFile");
- if (taskFilename != null) {
- File taskFile = new File(taskFilename);
- inf = new BufferedReader(new FileReader(taskFile));
- }
- }
- private String serialize(CAS cas) throws Exception {
- String serializedCas = uimaSerializer.serializeCasToXmi(cas);
- return serializedCas;
- }
- 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;
- try {
- CAS cas = null;
- cas = CasCreationUtils.createCas(new TypeSystemDescription_impl(), null, null);
- cas.setDocumentLanguage("en");
- if (inf != null) {
- text = inf.readLine();
- if (text == null) {
- inf.close();
- inf = null;
- }
- }
- if (text == null) {
- logger.log(Level.INFO," ... no work avaialble");
- return null;
- }
- logger.log(Level.INFO,"delivering: " + text);
- cas.setDocumentText(text);
-// cas.setDocumentText("100 "+seqno.incrementAndGet()+" 1000 0");
-
- serializedCas = serialize(cas);
- cas.reset();
- cas.release();
-
- } catch( Exception e) {
- logger.log(Level.WARNING,"Error",e);
- }
-
- return new SimpleTask(serializedCas);
- }
-
- public synchronized void onTaskSuccess(TaskConsumer taskConsumer, String appdata, String processResult) {
- logger.log(Level.INFO,"onTaskSuccess() Starting");
- //List<Properties> breakdown = metrics.get();
- //System.out.println("\tmetrics: "+processResult);
- System.out.println("----------appdata: "+appdata);
-// 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 appdata, String processError) {
- logger.log(Level.INFO,"onTaskFailure) Called");
- }
+public class TestTaskAllocatorCallbackListener implements TaskAllocatorCallbackListener {
+ Logger logger = UIMAFramework.getLogger(TestTaskAllocatorCallbackListener.class);
+
+ private static UimaSerializer uimaSerializer = new UimaSerializer();
+
+ private AtomicLong seqno = new AtomicLong(0);
+
+ private BufferedReader inf;
+
+ private String text = "Some Text";
+
+ public TestTaskAllocatorCallbackListener() throws FileNotFoundException {
+ String taskFilename = System.getProperty("TestTaskFile");
+ if (taskFilename != null) {
+ File taskFile = new File(taskFilename);
+ inf = new BufferedReader(new FileReader(taskFile));
+ }
+ }
+
+ private String serialize(CAS cas) throws Exception {
+ String serializedCas = uimaSerializer.serializeCasToXmi(cas);
+ return serializedCas;
+ }
+
+ 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;
+ try {
+ CAS cas = null;
+ cas = CasCreationUtils.createCas(new TypeSystemDescription_impl(), null, null);
+ cas.setDocumentLanguage("en");
+ if (inf != null) {
+ text = inf.readLine();
+ if (text == null) {
+ inf.close();
+ inf = null;
+ }
+ }
+ if (text == null) {
+ logger.log(Level.INFO, " ... no work avaialble");
+ return null;
+ }
+ logger.log(Level.INFO, "delivering: " + text);
+ cas.setDocumentText(text);
+ // cas.setDocumentText("100 "+seqno.incrementAndGet()+" 1000 0");
+
+ serializedCas = serialize(cas);
+ cas.reset();
+ cas.release();
+
+ } catch (Exception e) {
+ logger.log(Level.WARNING, "Error", e);
+ }
+
+ return new SimpleTask(serializedCas);
+ }
+
+ public synchronized void onTaskSuccess(TaskConsumer taskConsumer, String appdata,
+ String processResult) {
+ logger.log(Level.INFO, "onTaskSuccess() Starting");
+ // List<Properties> breakdown = metrics.get();
+ // System.out.println("\tmetrics: "+processResult);
+ System.out.println("----------appdata: " + appdata);
+ // 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 appdata, String processError) {
+ logger.log(Level.INFO, "onTaskFailure) Called");
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/WiTaskConsumer.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/WiTaskConsumer.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/WiTaskConsumer.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/WiTaskConsumer.java Fri Aug 2 17:30:46 2019
@@ -24,121 +24,126 @@ import org.apache.uima.ducc.ps.net.iface
public class WiTaskConsumer implements TaskConsumer {
- private static final long serialVersionUID = 1L;
- private String serviceType;
- private String host;
- private String pid;
- private String threadId;
-
- 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() {
- return serviceType;
- }
-
- public String getHostName() {
- return host;
- }
-
- public String getPid() {
- return pid;
- }
-
- public String getThreadId() {
- return threadId;
- }
- public String toString() {
- StringBuffer sb = new StringBuffer();
- if(host != null) {
- sb.append(host);
- sb.append(".");
- }
- sb.append(pid);
- sb.append(".");
- sb.append(threadId);
- return sb.toString();
- }
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- String thisNodeName = this.host;
- Integer thisPid = new Integer(this.pid);
- Integer thisTid = new Integer(this.threadId);
- result = prime * result + ((thisNodeName == null) ? 0 : thisNodeName.hashCode());
- result = prime * result + ((thisPid == null) ? 0 : thisPid.hashCode());
- result = prime * result + ((thisTid == null) ? 0 : thisTid.hashCode());
- return result;
- }
- public boolean equals(Object obj) {
- boolean retVal = false;
- try {
- if(obj != null) {
- if(this == obj) {
- retVal = true;
- }
- else {
- WiTaskConsumer that = (WiTaskConsumer) obj;
- if(this.compareTo(that) == 0) {
- retVal = true;
- }
- }
- }
- }
- catch(Exception e) {
- }
- return retVal;
- }
-
- public int compareTo(Object o) {
- int retVal = 0;
- try {
- if(o != null) {
- WiTaskConsumer that = (WiTaskConsumer) o;
- if(retVal == 0) {
- retVal = compareHost(that);
- }
- if(retVal == 0) {
- retVal = comparePid(that);
- }
- if(retVal == 0) {
- retVal = compareThreadId(that);
- }
- }
- }
- catch(Exception e) {
- }
- return retVal;
- }
- private int compareHost(WiTaskConsumer that) {
- int retVal = 0;
- String thisNodeName = this.getHostName();
- String thatNodeName = that.getHostName();
- if(thisNodeName != null) {
- if(thatNodeName != null) {
- retVal = thisNodeName.compareTo(thatNodeName);
- }
- }
- return retVal;
- }
-
- private int comparePid(WiTaskConsumer that) {
- int retVal = 0;
- Integer thisPid = new Integer(this.pid);
- Integer thatPid = new Integer(that.pid);
- retVal = thisPid.compareTo(thatPid);
- return retVal;
- }
-
- private int compareThreadId(WiTaskConsumer that) {
- int retVal = 0;
- Integer thisTid = new Integer(this.threadId);
- Integer thatTid = new Integer(that.threadId);
- retVal = thisTid.compareTo(thatTid);
- return retVal;
- }
+ private static final long serialVersionUID = 1L;
+
+ private String serviceType;
+
+ private String host;
+
+ private String pid;
+
+ private String threadId;
+
+ 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() {
+ return serviceType;
+ }
+
+ public String getHostName() {
+ return host;
+ }
+
+ public String getPid() {
+ return pid;
+ }
+
+ public String getThreadId() {
+ return threadId;
+ }
+
+ public String toString() {
+ StringBuffer sb = new StringBuffer();
+ if (host != null) {
+ sb.append(host);
+ sb.append(".");
+ }
+ sb.append(pid);
+ sb.append(".");
+ sb.append(threadId);
+ return sb.toString();
+ }
+
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ String thisNodeName = this.host;
+ Integer thisPid = new Integer(this.pid);
+ Integer thisTid = new Integer(this.threadId);
+ result = prime * result + ((thisNodeName == null) ? 0 : thisNodeName.hashCode());
+ result = prime * result + ((thisPid == null) ? 0 : thisPid.hashCode());
+ result = prime * result + ((thisTid == null) ? 0 : thisTid.hashCode());
+ return result;
+ }
+
+ public boolean equals(Object obj) {
+ boolean retVal = false;
+ try {
+ if (obj != null) {
+ if (this == obj) {
+ retVal = true;
+ } else {
+ WiTaskConsumer that = (WiTaskConsumer) obj;
+ if (this.compareTo(that) == 0) {
+ retVal = true;
+ }
+ }
+ }
+ } catch (Exception e) {
+ }
+ return retVal;
+ }
+
+ public int compareTo(Object o) {
+ int retVal = 0;
+ try {
+ if (o != null) {
+ WiTaskConsumer that = (WiTaskConsumer) o;
+ if (retVal == 0) {
+ retVal = compareHost(that);
+ }
+ if (retVal == 0) {
+ retVal = comparePid(that);
+ }
+ if (retVal == 0) {
+ retVal = compareThreadId(that);
+ }
+ }
+ } catch (Exception e) {
+ }
+ return retVal;
+ }
+
+ private int compareHost(WiTaskConsumer that) {
+ int retVal = 0;
+ String thisNodeName = this.getHostName();
+ String thatNodeName = that.getHostName();
+ if (thisNodeName != null) {
+ if (thatNodeName != null) {
+ retVal = thisNodeName.compareTo(thatNodeName);
+ }
+ }
+ return retVal;
+ }
+
+ private int comparePid(WiTaskConsumer that) {
+ int retVal = 0;
+ Integer thisPid = new Integer(this.pid);
+ Integer thatPid = new Integer(that.pid);
+ retVal = thisPid.compareTo(thatPid);
+ return retVal;
+ }
+
+ private int compareThreadId(WiTaskConsumer that) {
+ int retVal = 0;
+ Integer thisTid = new Integer(this.threadId);
+ Integer thatTid = new Integer(that.threadId);
+ retVal = thisTid.compareTo(thatTid);
+ return retVal;
+ }
}
Modified: uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/error/TaskProtocolException.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/error/TaskProtocolException.java?rev=1864248&r1=1864247&r2=1864248&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/error/TaskProtocolException.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/sd/task/error/TaskProtocolException.java Fri Aug 2 17:30:46 2019
@@ -17,17 +17,17 @@
* under the License.
*/
-
package org.apache.uima.ducc.ps.sd.task.error;
public class TaskProtocolException extends Exception {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
+
+ public TaskProtocolException(String cause) {
+ super(cause);
+ }
- public TaskProtocolException(String cause) {
- super(cause);
- }
- public TaskProtocolException(Exception cause) {
- super(cause);
- }
+ public TaskProtocolException(Exception cause) {
+ super(cause);
+ }
}