You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2014/02/05 12:57:01 UTC
svn commit: r1564716 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator:
config/OrchestratorConfiguration.java monitor/
Author: degenaro
Date: Wed Feb 5 11:57:00 2014
New Revision: 1564716
URL: http://svn.apache.org/r1564716
Log:
UIMA-3596 DUCC Orchestrator specification of ormon inlog4j.xml is obsolete
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/monitor/
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java?rev=1564716&r1=1564715&r2=1564716&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java Wed Feb 5 11:57:00 2014
@@ -36,9 +36,6 @@ import org.apache.uima.ducc.orchestrator
import org.apache.uima.ducc.orchestrator.OrchestratorCommonArea;
import org.apache.uima.ducc.orchestrator.OrchestratorComponent;
import org.apache.uima.ducc.orchestrator.event.OrchestratorEventListener;
-import org.apache.uima.ducc.orchestrator.monitor.Xmon;
-import org.apache.uima.ducc.orchestrator.monitor.Xmon.ExchangeType;
-import org.apache.uima.ducc.orchestrator.monitor.Xmon.LifeStatus;
import org.apache.uima.ducc.transport.DuccTransportConfiguration;
import org.apache.uima.ducc.transport.event.CancelJobDuccEvent;
import org.apache.uima.ducc.transport.event.CancelJobReplyDuccEvent;
@@ -85,14 +82,8 @@ public class OrchestratorConfiguration {
return new RouteBuilder() {
public void configure() {
- Xmon xmStart = new Xmon(LifeStatus.Start, ExchangeType.Receive);
- Xmon xmEnded = new Xmon(LifeStatus.Ended, ExchangeType.Receive);
- Xmon xmError = new Xmon(LifeStatus.Error, ExchangeType.Receive);
- onException(Exception.class).handled(true).process(xmError);
from(endpoint)
- .process(xmStart)
.bean(delegate)
- .process(xmEnded)
;
}
};
@@ -129,8 +120,6 @@ public class OrchestratorConfiguration {
JettyHttpComponent jettyComponent = new JettyHttpComponent();
- Xmon xmStart = new Xmon(LifeStatus.Start, ExchangeType.Receive);
- Xmon xmEnded = new Xmon(LifeStatus.Ended, ExchangeType.Reply);
//ExchangeMonitor xmError = new ExchangeMonitor(LifeStatus.Error, ExchangeType.Receive);
context.addComponent("jetty", jettyComponent);
@@ -139,10 +128,8 @@ public class OrchestratorConfiguration {
from("jetty://http://0.0.0.0:"+common.duccORHttpPort+"/or")
.unmarshal().xstream()
- .process(xmStart)
.bean(delegate)
.process(new OrchestratorReplyProcessor()) // inject reply object
- .process(xmEnded)
.process(new Processor() {
public void process(Exchange exchange) throws Exception {