You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2016/04/04 15:45:11 UTC
svn commit: r1737690 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli:
DuccServiceApi.java DuccUiUtilities.java
Author: burn
Date: Mon Apr 4 13:45:11 2016
New Revision: 1737690
URL: http://svn.apache.org/viewvc?rev=1737690&view=rev
Log:
UIMA-4874 Set default scheduling-class for a service
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java?rev=1737690&r1=1737689&r2=1737690&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java Mon Apr 4 13:45:11 2016
@@ -436,13 +436,15 @@ public class DuccServiceApi
throw new IllegalArgumentException("Invalid service endpoint: " + endpoint);
}
- // Check if falsely using a fair-share class
+ // Check if falsely using a fair-share class; set the default if missing
String scheduling_class = cli_props.getProperty(UiOption.SchedulingClass.pname());
+ DuccSchedulerClasses duccSchedulerClasses = DuccSchedulerClasses.getInstance();
if (scheduling_class != null) {
- DuccSchedulerClasses duccSchedulerClasses = DuccSchedulerClasses.getInstance();
if (duccSchedulerClasses.isPreemptable(scheduling_class)) {
throw new IllegalArgumentException("Invalid pre-emptable scheduling class: " + scheduling_class);
}
+ } else {
+ cli_props.setProperty(UiOption.SchedulingClass.pname(), duccSchedulerClasses.getDebugClassDefaultName());
}
// work out stuff I'm dependent upon
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java?rev=1737690&r1=1737689&r2=1737690&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java Mon Apr 4 13:45:11 2016
@@ -233,7 +233,9 @@ public class DuccUiUtilities {
if (value == null) {
throw new IllegalArgumentException("Undefined JVM property '" + key + "' in: " + contents);
}
- matcher.appendReplacement(sb, value);
+ // value may contain unreplaced ${..} sequence which looks like a group reference so replace as-is
+ matcher.appendReplacement(sb, "");
+ sb.append(value);
}
matcher.appendTail(sb);
return sb.toString();