Author: degenaro
Date: Fri Mar 28 14:30:58 2014
New Revision: 1582761
URL: http://svn.apache.org/r1582761
Log:
UIMA-3701 DUCC WebServer (WS) should accept any case for ducc.runmode = "test"
in ducc.properties
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java?rev=1582761&r1=1582760&r2=1582761&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
Fri Mar 28 14:30:58 2014
@@ -72,7 +72,7 @@ implements IWebServer {
public void start(DuccService service, String[] args) throws Exception {
super.start(service, args);
-
DuccDaemonRuntimeProperties.getInstance().boot(DaemonName.Webserver,getProcessJmxUrl());
+
DuccDaemonRuntimeProperties.getInstance().boot(DaemonName.Webserver,getProcessJmxUrl());
}
public DuccLogger getLogger() {
return duccLogger;
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java?rev=1582761&r1=1582760&r2=1582761&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java
Fri Mar 28 14:30:58 2014
@@ -205,7 +205,7 @@ public class DuccWebServer {
logger.debug(methodName, null,
"path:"+$runmodeFile.getAbsolutePath());
$runmodeFile.delete();
String text;
- if(ducc_runmode.equals("Test")) {
+ if(ducc_runmode.equalsIgnoreCase("Test")) {
text = "<html><%@ include
file=\"$runmode.test.jsp\" %></html>";
}
else {