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/08/24 21:31:25 UTC
svn commit: r1697487 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Author: degenaro
Date: Mon Aug 24 19:31:25 2015
New Revision: 1697487
URL: http://svn.apache.org/r1697487
Log:
UIMA-4539 DUCC Web Server (WS) DUCC's home should be more easily found from WS
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1697487&r1=1697486&r2=1697487&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Mon Aug 24 19:31:25 2015
@@ -132,6 +132,7 @@ public class DuccHandler extends DuccAbs
private DuccAuthenticator duccAuthenticator = DuccAuthenticator.getInstance();
private String duccVersion = duccContext+"/version";
+ private String duccHome = duccContext+"/home";
private String duccLoginLink = duccContext+"/login-link";
private String duccLogoutLink = duccContext+"/logout-link";
@@ -281,6 +282,17 @@ public class DuccHandler extends DuccAbs
duccLogger.trace(methodName, null, messages.fetch("exit"));
}
+ private void handleDuccServletHome(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
+ throws IOException, ServletException
+ {
+ String methodName = "handleDuccServletHome";
+ duccLogger.trace(methodName, null, messages.fetch("enter"));
+ StringBuffer sb = new StringBuffer();
+ sb.append(dir_home);
+ response.getWriter().println(sb);
+ duccLogger.trace(methodName, null, messages.fetch("exit"));
+ }
+
private void handleDuccServletAuthenticationStatus(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
throws IOException, ServletException
{
@@ -3630,7 +3642,7 @@ public class DuccHandler extends DuccAbs
StringBuffer sb = new StringBuffer();
IDuccWorkMap duccWorkMap = DuccData.getInstance().get();
if(duccWorkMap.size()> 0) {
- sb.append("<span title=\"home="+dir_home+"\">");
+ sb.append("<span>");
sb.append(getDuccWebServer().getClusterName());
sb.append("</span>");
}
@@ -4668,6 +4680,10 @@ public class DuccHandler extends DuccAbs
handleDuccServletVersion(target, baseRequest, request, response);
//DuccWebUtil.noCache(response);
}
+ else if(reqURI.startsWith(duccHome)) {
+ handleDuccServletHome(target, baseRequest, request, response);
+ //DuccWebUtil.noCache(response);
+ }
else if(reqURI.startsWith(duccAuthenticationStatus)) {
handleDuccServletAuthenticationStatus(target, baseRequest, request, response);
DuccWebUtil.noCache(response);