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/01/19 22:15:07 UTC
svn commit: r1725613 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/
uima-ducc-database/src/main/java/org/apache/uima...
Author: burn
Date: Tue Jan 19 21:15:07 2016
New Revision: 1725613
URL: http://svn.apache.org/viewvc?rev=1725613&view=rev
Log:
UIMA-4752 Set the flag to disable place-holder resolution on svc and meta properties
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccProperties.java
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/StateServicesDb.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java?rev=1725613&r1=1725612&r2=1725613&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java Tue Jan 19 21:15:07 2016
@@ -100,7 +100,10 @@ public class StateServices implements IS
private DuccProperties getProperties(String name) {
String location = "getProperties";
+ // Avoid further place-holder resolving -- leave ${DUCC_SERVICE_INSTANCE} as-is
+ // (Could have used SpecificationProperties but is uima-ducc-transport)
DuccProperties properties = new DuccProperties();
+ properties.ignorePlaceholders();
try {
FileInputStream fis = new FileInputStream(name);
try {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccProperties.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccProperties.java?rev=1725613&r1=1725612&r2=1725613&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccProperties.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccProperties.java Tue Jan 19 21:15:07 2016
@@ -309,4 +309,12 @@ public class DuccProperties extends Prop
agentPropertyFile.lastIndexOf(Utils.FileSeparator) + 1);
override(configDir);
}
+
+ /**
+ * Disable place-holder resolution when already done and any unresolved entries have been left as-is
+ * for later substitution, e.g. DUCC_SERVICE_INSTANCE, DUCC_OS_ARCH
+ */
+ public void ignorePlaceholders() {
+ this.resolvePlaceholders = false;
+ }
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/StateServicesDb.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/StateServicesDb.java?rev=1725613&r1=1725612&r2=1725613&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/StateServicesDb.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/StateServicesDb.java Tue Jan 19 21:15:07 2016
@@ -122,6 +122,7 @@ public class StateServicesDb
for ( Row r : rs ) {
Map<String, Object> rowvals = DbUtil.getProperties(props, r);
DuccProperties dp = new DuccProperties();
+ dp.ignorePlaceholders(); // Place-holders already resolved -- leave ${DUCC_SERVICE_INSTANCE} as-is
for (String k : rowvals.keySet()) {
dp.put(k, rowvals.get(k));
}
@@ -160,7 +161,7 @@ public class StateServicesDb
for ( Long k : svcset.keySet() ) {
logger.trace(methodName, null, "Handling key", k);
- DuccProperties sp = svcset.get(k);
+ DuccProperties sp = svcset.get(k);
DuccProperties mp = metaset.get(k);
StateServicesSet sss = new StateServicesSet();
sss.put(svc, sp);