From 35827a56037a583eabea82708a801b7fc3f6d355 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Sun, 04 Mar 2018 13:25:08 +0000 Subject: [PATCH] Umgestellt auf Thumbnailator --- src/de/uhilger/wbx/web/ViewServlet.java | 75 +++++++++++++++++++++++++------------ 1 files changed, 51 insertions(+), 24 deletions(-) diff --git a/src/de/uhilger/wbx/web/ViewServlet.java b/src/de/uhilger/wbx/web/ViewServlet.java index 491273a..76e1a04 100644 --- a/src/de/uhilger/wbx/web/ViewServlet.java +++ b/src/de/uhilger/wbx/web/ViewServlet.java @@ -1,3 +1,20 @@ +/* + WebBox - Dein Server. + Copyright (C) 2017 Ulrich Hilger, http://uhilger.de + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + */ package de.uhilger.wbx.web; import java.io.IOException; @@ -11,13 +28,42 @@ import org.apache.catalina.servlets.DefaultServlet; /** - * + * Das ViewServlet fügt dem DefaultServlet von Tomcat + * Methoden hinzu, mit denen HTML-Inhalte wie sie z.B. mit + * TinyMCE erzeugt werden zu ganzen HTML-Seiten + * mit head und body tags sowie Stylesheet-Verweisen + * ergänzt werden + * + * TODO: Stylesheets dynamisch einbinden */ public class ViewServlet extends DefaultServlet { private static final Logger logger = Logger.getLogger(ViewServlet.class.getName()); private static final String HOME_CTX = "/home"; + + private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + ServletOutputStream out = response.getOutputStream(); + printHeader(out); + super.doGet(request, response); + printFooter(out); + } + + private void printHeader(ServletOutputStream out) throws IOException { + out.print("<!DOCTYPE html><html><head>\r\n"); + out.print("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/bootstrap/css/bootstrap.min.css\">\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/lightbox/lightbox.css\">\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"stile.css\">\r\n"); + out.print("</head><body class=\"p-3\">\r\n"); + } + + private void printFooter(ServletOutputStream out) throws IOException { + out.print("<script src=\"/jslib/jquery/jquery.min.js\"></script>\r\n"); + out.print("<script src=\"/jslib/lightbox/lightbox.min.js\"></script>\r\n"); + out.print("</body></html>"); + } + /** * Handles the HTTP <code>GET</code> method. * @@ -27,8 +73,7 @@ * @throws IOException if an I/O error occurs */ @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String contextPath = request.getContextPath(); if(HOME_CTX.equals(contextPath)) { String userName = getUserName(request); @@ -47,25 +92,7 @@ } } - private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - ServletOutputStream out = response.getOutputStream(); - printHeader(out); - super.doGet(request, response); - printFooter(out); - } - - private void printHeader(ServletOutputStream out) throws IOException { - out.print("<!DOCTYPE html><html><head>"); - out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/bootstrap/css/bootstrap.min.css\">"); - out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"stile.css\">"); - out.print("</head><body class=\"p-3\">"); - } - - private void printFooter(ServletOutputStream out) throws IOException { - out.print("</body></html>"); - } - - private String getUrlUser(HttpServletRequest request, String userName) throws IOException { + protected String getUrlUser(HttpServletRequest request, String userName) { String result = ""; String requestUrlStr = request.getRequestURL().toString(); String contextPath = request.getContextPath(); @@ -83,7 +110,7 @@ return result; } - private String getUserName(HttpServletRequest hr) { + protected String getUserName(HttpServletRequest hr) { String userName = null; Object p = hr.getUserPrincipal(); if (p instanceof Principal) { @@ -91,7 +118,7 @@ } return userName; } - + /** * Returns a short description of the servlet. * -- Gitblit v1.9.3