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 2019/10/08 19:25:32 UTC
svn commit: r1868154 - in
/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws:
helper/DiagnosticsHelper.java server/AlienTextFile.java
server/DuccHandler.java
Author: degenaro
Date: Tue Oct 8 19:25:32 2019
New Revision: 1868154
URL: http://svn.apache.org/viewvc?rev=1868154&view=rev
Log:
UIMA-6014 DUCC site.ducc.properties should allow override of DUCC_HOME for WS display
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DiagnosticsHelper.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/AlienTextFile.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DiagnosticsHelper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DiagnosticsHelper.java?rev=1868154&r1=1868153&r2=1868154&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DiagnosticsHelper.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DiagnosticsHelper.java Tue Oct 8 19:25:32 2019
@@ -29,7 +29,7 @@ import org.apache.uima.ducc.common.utils
public class DiagnosticsHelper extends Thread {
- private static DuccLogger duccLogger = DuccLogger.getLogger(DiagnosticsHelper .class.getName(), null);
+ private static DuccLogger duccLogger = DuccLogger.getLogger(DiagnosticsHelper .class.getName(), "WS");
private static DuccId jobid = null;
private static File devNull = new File("/dev/null");
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/AlienTextFile.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/AlienTextFile.java?rev=1868154&r1=1868153&r2=1868154&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/AlienTextFile.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/AlienTextFile.java Tue Oct 8 19:25:32 2019
@@ -31,7 +31,7 @@ import org.apache.uima.ducc.ws.utils.ali
public class AlienTextFile extends AlienAbstract {
- private static DuccLogger duccLogger = DuccLogger.getLogger(AlienTextFile.class.getName(), null);
+ private static DuccLogger duccLogger = DuccLogger.getLogger(AlienTextFile.class.getName(), "WS");
private static String command_du = "/usr/bin/du";
private static String flag_dash_b = "-b";
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1868154&r1=1868153&r2=1868154&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Tue Oct 8 19:25:32 2019
@@ -302,7 +302,12 @@ public class DuccHandler extends DuccAbs
String methodName = "handleDuccServletHome";
duccLogger.trace(methodName, null, messages.fetch("enter"));
StringBuffer sb = new StringBuffer();
- sb.append(dir_home);
+ String ducc_ws_display_home = "ducc.ws.display.home";
+ String text = DuccPropertiesResolver.getInstance().getProperty(ducc_ws_display_home);
+ if(text == null) {
+ text = dir_home;
+ }
+ sb.append(text);
response.getWriter().println(sb);
duccLogger.trace(methodName, null, messages.fetch("exit"));
}