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/11 21:38:43 UTC
svn commit: r1644756 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp:
JobProcessComponent.java JobProcessConfiguration.java
Author: cwiklik
Date: Thu Dec 11 20:38:42 2014
New Revision: 1644756
URL: http://svn.apache.org/r1644756
Log:
UIMA-4066 replace hardcoded param names with Enums
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessComponent.java
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/JobProcessComponent.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/JobProcessComponent.java?rev=1644756&r1=1644755&r2=1644756&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessComponent.java Thu Dec 11 20:38:42 2014
@@ -143,7 +143,7 @@ public class JobProcessComponent extends
executor.scheduleAtFixedRate(monitor, 20, 30, TimeUnit.SECONDS);
// the JobProcessConfiguration class already checked for
// existence of -DDucc.Job.Type
- String jobType = System.getProperty("Ducc.Job.Type");
+ String jobType = System.getProperty(FlagsHelper.Name.JpType.pname());
containerClass = configuration.getUserContainerClassForJob(jobType);
String[] uimaAsArgs;
if ( "uima-as".equals(jobType)) {
@@ -152,7 +152,7 @@ public class JobProcessComponent extends
uimaAsArgs = new String[] { "-dd",args[0],"-saxonURL",saxonJarPath,
"-xslt",dd2SpringXslPath};
} else {
- String scaleout = System.getProperty("Ducc.Job.Threads");
+ String scaleout = System.getProperty(FlagsHelper.Name.JpThreadCount.pname());
if ( scaleout == null ) {
scaleout = "1";
}
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=1644756&r1=1644755&r2=1644756&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 Thu Dec 11 20:38:42 2014
@@ -112,15 +112,15 @@ public class JobProcessConfiguration {
private void checkPrereqs(DuccLogger logger) {
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");
+ if ( null == System.getProperty(FlagsHelper.Name.JpType.pname()) ) { //"Ducc.Job.Type") ) {
+ logger.error("start", null, "Missing Job Type. Add -D"+FlagsHelper.Name.JpType.pname()+"=uima-as or "+FlagsHelper.Name.JpType.pname()+"=uima. Check your command line");
+ throw new RuntimeException("Missing Job Type. Add -D"+FlagsHelper.Name.JpType.pname()+"=uima-as or "+FlagsHelper.Name.JpType.pname()+"=uima. Check your command line");
} else {
- String jobType = System.getProperty("Ducc.Job.Type");
+ String jobType = System.getProperty(FlagsHelper.Name.JpType.pname());
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);
+ throw new RuntimeException("Invalid value for -D"+FlagsHelper.Name.JpType.pname()+". Expected uima-as or uima, Instead it is "+jobType);
}
}