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 2014/06/18 20:25:06 UTC
svn commit: r1603565 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccAbstractHandler.java DuccHandlerViz.java DuccWebServer.java
Author: degenaro
Date: Wed Jun 18 18:25:06 2014
New Revision: 1603565
URL: http://svn.apache.org/r1603565
Log:
UIMA-3900 DUCC Web Server (WS) add Viz support
skeleton code to support Viz servlet
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerViz.java (with props)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.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/server/DuccAbstractHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1603565&r1=1603564&r2=1603565&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java Wed Jun 18 18:25:06 2014
@@ -85,6 +85,7 @@ public abstract class DuccAbstractHandle
public final String duccContextUser = duccContext+"/user";
public final String duccContextClassic = duccContext+"/classic";
public final String duccContextProxy = duccContext+"/proxy";
+ public final String duccContextViz = duccContext+"/viz";
public final String duccjConsoleLink = duccContext+"/jconsole-link.jnlp";
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerViz.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerViz.java?rev=1603565&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerViz.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerViz.java Wed Jun 18 18:25:06 2014
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.ws.server;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.uima.ducc.common.internationalization.Messages;
+import org.apache.uima.ducc.common.utils.DuccLogger;
+import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
+import org.apache.uima.ducc.common.utils.id.DuccId;
+import org.eclipse.jetty.server.Request;
+
+public class DuccHandlerViz extends DuccAbstractHandler {
+
+ private static DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(DuccHandlerClassic.class.getName());
+ private static Messages messages = Messages.getInstance();
+ private static DuccId jobid = null;
+
+ public final String vizNodes = duccContextViz+"-nodes";
+
+ private void handleServletVizNodes(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
+ throws IOException, ServletException
+ {
+ String methodName = "handleServletVizNodes";
+ duccLogger.trace(methodName, jobid, messages.fetch("enter"));
+
+ String data = "<html><p>"+methodName+" not yet implemented</p></html>";
+
+ duccLogger.debug(methodName, jobid, data);
+ response.getWriter().println(data);
+ duccLogger.trace(methodName, jobid, messages.fetch("exit"));
+ }
+
+
+ private void handleServletUnknown(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
+ throws IOException, ServletException
+ {
+ String methodName = "handleServletUnknown";
+ duccLogger.trace(methodName, jobid, messages.fetch("enter"));
+ duccLogger.info(methodName, jobid, request.toString());
+ duccLogger.trace(methodName, jobid, messages.fetch("exit"));
+ }
+
+ private void handleDuccRequest(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
+ throws Exception
+ {
+ String methodName = "handleDuccRequest";
+ duccLogger.trace(methodName, jobid, messages.fetch("enter"));
+ duccLogger.debug(methodName, jobid,request.toString());
+ duccLogger.debug(methodName, jobid,"getRequestURI():"+request.getRequestURI());
+ String reqURI = request.getRequestURI()+"";
+ if(reqURI.startsWith(vizNodes)) {
+ handleServletVizNodes(target, baseRequest, request, response);
+ }
+ else {
+ handleServletUnknown(target, baseRequest, request, response);
+ }
+ duccLogger.trace(methodName, jobid, messages.fetch("exit"));
+ }
+
+ public void handle(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
+ throws IOException, ServletException {
+ String methodName = "handle";
+ try {
+ duccLogger.debug(methodName, jobid,request.toString());
+ duccLogger.debug(methodName, jobid,"getRequestURI():"+request.getRequestURI());
+ String reqURI = request.getRequestURI()+"";
+ if(reqURI.startsWith(duccContextViz)) {
+ response.setContentType("text/html;charset=utf-8");
+ response.setStatus(HttpServletResponse.SC_OK);
+ baseRequest.setHandled(true);
+ handleDuccRequest(target, baseRequest, request, response);
+ DuccWebUtil.noCache(response);
+ }
+ }
+ catch(Throwable t) {
+ if(isIgnorable(t)) {
+ duccLogger.debug(methodName, jobid, t);
+ }
+ else {
+ duccLogger.info(methodName, jobid, "", t.getMessage(), t);
+ duccLogger.error(methodName, jobid, t);
+ }
+ }
+ }
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerViz.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1603565&r1=1603564&r2=1603565&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 Wed Jun 18 18:25:06 2014
@@ -227,6 +227,7 @@ public class DuccWebServer {
DuccHandlerClassic duccHandlerClassic = new DuccHandlerClassic(this);
DuccHandlerJsonFormat duccHandlerJson = new DuccHandlerJsonFormat(this);
DuccHandlerProxy duccHandlerProxy = new DuccHandlerProxy();
+ DuccHandlerViz duccHandlerViz = new DuccHandlerViz();
DuccHandlerUserAuthentication duccHandlerUserAuthentication = new DuccHandlerUserAuthentication();
SessionHandler sessionHandler = new SessionHandler();
handlers.addHandler(sessionHandler);
@@ -237,6 +238,7 @@ public class DuccWebServer {
handlers.addHandler(duccHandlerJson);
handlers.addHandler(duccHandlerProxy);
handlers.addHandler(duccHandlerClassic);
+ handlers.addHandler(duccHandlerViz);
handlers.addHandler(duccHandler);
handlers.addHandler(jspHandler);
handlers.addHandler(resourceHandler);