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 2014/11/24 21:01:51 UTC
svn commit: r1641463 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common:
config/CommonConfiguration.java main/DuccService.java
Author: cwiklik
Date: Mon Nov 24 20:01:50 2014
New Revision: 1641463
URL: http://svn.apache.org/r1641463
Log:
UIM-4123 added support for new properties. Changed how the camel Main starts up ( from run() to start() )
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java?rev=1641463&r1=1641462&r2=1641463&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java Mon Nov 24 20:01:50 2014
@@ -192,7 +192,20 @@ public class CommonConfiguration {
@Value("#{ systemProperties['ducc.agent.launcher.process.stop.timeout'] }")
public String processStopTimeout;
- @Value("#{ systemProperties['ducc.orchestrator.http.port'] }")
+ // Fetch max amount of time to wait for a reply from the JD
+ @Value("#{ systemProperties['ducc.process.request.timeout'] }")
+ public String processRequestTimeout;
+
+ // Fetch the container class
+ @Value("#{ systemProperties['ducc.process.container.class'] }")
+ public String processContainerClass;
+
+ // Fetch the container class
+ @Value("#{ systemProperties['ducc.process.thread.sleep.time'] }")
+ public String processThreadSleepTime;
+
+
+ @Value("#{ systemProperties['ducc.orchestrator.http.port'] }")
public String duccORHttpPort;
public CamelContext camelContext() {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java?rev=1641463&r1=1641462&r2=1641463&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java Mon Nov 24 20:01:50 2014
@@ -167,10 +167,10 @@ public class DuccService extends Abstrac
}
getDuccLogger().info(methodName, null, "... Component started: ", duccComponent.getKey());
}
-
+ System.out.println("Starting Camel. Use ctrl + c to terminate the JVM.\n");
// run until you terminate the JVM
getDuccLogger().info(methodName, null, "Starting Camel. Use ctrl + c to terminate the JVM.\n");
- main.run();
+ main.start();
}
public AbstractDuccComponent getComponentInstance(String componentKey) {