You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2015/03/31 15:40:15 UTC
svn commit: r1670338 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServerHelper.java
Author: degenaro
Date: Tue Mar 31 13:40:15 2015
New Revision: 1670338
URL: http://svn.apache.org/r1670338
Log:
UIMA-3491 DUCC Web Server (WS) plugable images
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServerHelper.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServerHelper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServerHelper.java?rev=1670338&r1=1670337&r2=1670338&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServerHelper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServerHelper.java Tue Mar 31 13:40:15 2015
@@ -97,13 +97,19 @@ public class DuccWebServerHelper {
Properties properties = new Properties();
properties.load(fis);
fis.close();
- String value = properties.getProperty(key);
- if(exists(value)) {
- retVal = value;
+ String relativeFilePath = properties.getProperty(key);
+ String rootFilePath = relativeFilePath;
+ if(rootFilePath != null) {
+ if(rootFilePath.trim().length() > 0) {
+ rootFilePath = getDuccWebRoot()+File.separator+rootFilePath;
+ }
+ }
+ if(exists(rootFilePath)) {
+ retVal = relativeFilePath;
logger.debug(location, jobid, key+"="+retVal);
}
else {
- logger.debug(location, jobid, value+" not found");
+ logger.debug(location, jobid, relativeFilePath+" not found");
}
}
catch (FileNotFoundException e) {