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/12/10 15:24:44 UTC
svn commit: r1644425 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
Author: cwiklik
Date: Wed Dec 10 14:24:44 2014
New Revision: 1644425
URL: http://svn.apache.org/r1644425
Log:
UIMA-4057 modified to support uima-as and core uima containers
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java?rev=1644425&r1=1644424&r2=1644425&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java Wed Dec 10 14:24:44 2014
@@ -110,15 +110,29 @@ public class JobProcessConfiguration {
}
}
private void checkPrereqs(DuccLogger logger) {
- if (null == System.getProperty(FlagsHelper.Name.UserClasspath.pname())) {
+ boolean uimaAsJob=false;
+
+ if ( null == System.getProperty("Ducc.Job.Type") ) {
+ logger.error("start", null, "Missing Job Type. Add -DDucc.Job.Type=uima-as or Ducc.Job.Type=uima. Check your command line");
+ throw new RuntimeException("Missing Job Type. Add -DDucc.Job.Type=uima-as or Ducc.Job.Type=uima. Check your command line");
+ } else {
+ String jobType = System.getProperty("Ducc.Job.Type");
+ if ( jobType.trim().equals("uima-as")) {
+ uimaAsJob = true;
+ } else if ( !jobType.trim().equals("uima")) {
+ throw new RuntimeException("Invalid value for -DDucc.Job.Type. Expected uima-as or uima, Instead it is "+jobType);
+ }
+ }
+
+ if (null == System.getProperty(FlagsHelper.Name.UserClasspath.pname())) {
logger.error("start", null, "Missing the -D"+FlagsHelper.Name.UserClasspath.pname()+"=XXXX property");
throw new RuntimeException("Missing the -D"+FlagsHelper.Name.UserClasspath.pname()+"=XXXX property");
}
- if (null == common.saxonJarPath ){
+ if (uimaAsJob && null == common.saxonJarPath ){
logger.error("start", null, "Missing saxon jar path. Check your ducc.properties");
throw new RuntimeException("Missing saxon jar path. Check your ducc.properties");
}
- if (null == common.dd2SpringXslPath ){
+ if (uimaAsJob && null == common.dd2SpringXslPath ){
logger.error("start", null, "Missing dd2sping xsl path. Check your ducc.properties");
throw new RuntimeException("Missing dd2spring xsl path. Check your ducc.properties");
}
@@ -129,7 +143,23 @@ public class JobProcessConfiguration {
}
-
+ public String getUserContainerClassForJob(String key) {
+ if ( key.equals("uima-as")) {
+ if ( common.uimaASProcessContainerClass == null ) {
+ // use default
+ return "org.apache.uima.ducc.user.jp.UimaASProcessContainer";
+ } else {
+ return common.uimaASProcessContainerClass;
+ }
+ } else {
+ if ( common.uimaProcessContainerClass == null ) {
+ // use default
+ return "org.apache.uima.ducc.user.jp.UimaProcessContainer";
+ } else {
+ return common.uimaProcessContainerClass;
+ }
+ }
+ }
@Bean
public JobProcessComponent getProcessManagerInstance() throws Exception {
try {
@@ -148,6 +178,7 @@ public class JobProcessConfiguration {
// there is something missing.
checkPrereqs(duccComponent.getLogger());
+
int serviceSocketPort = 0;
String agentSocketParams = "";
String jpSocketParams = "";
@@ -204,10 +235,6 @@ public class JobProcessConfiguration {
duccComponent.setThreadSleepTime(Integer.parseInt(common.processThreadSleepTime));
duccComponent.getLogger().info("getProcessManagerInstance", null, "Overriding Default Thread Sleep Time - New Value "+common.processThreadSleepTime+" ms");
}
- if ( common.processContainerClass != null ) {
- duccComponent.setContainerClass(common.processContainerClass);
- duccComponent.getLogger().info("getProcessManagerInstance", null, "Overriding Default Process Container Class With "+common.processContainerClass);
- }
if ( common.processRequestTimeout != null ) {
duccComponent.setTimeout(Integer.valueOf(common.processRequestTimeout));
duccComponent.getLogger().info("getProcessManagerInstance", null, "Overriding Default Process Request Timeout - New Timeout "+common.processRequestTimeout+" ms");