From 4c53ff2081c1042a09ae5637e2c6e85e274f3e0a Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Sun, 18 Mar 2018 22:03:14 +0000
Subject: [PATCH] Titel als JNDI Variable
---
src/de/uhilger/wbx/web/ViewServlet.java | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/src/de/uhilger/wbx/web/ViewServlet.java b/src/de/uhilger/wbx/web/ViewServlet.java
index 19b0c8b..f4b7126 100644
--- a/src/de/uhilger/wbx/web/ViewServlet.java
+++ b/src/de/uhilger/wbx/web/ViewServlet.java
@@ -21,6 +21,9 @@
import java.security.Principal;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
@@ -41,6 +44,50 @@
private static final Logger logger = Logger.getLogger(ViewServlet.class.getName());
private static final String HOME_CTX = "/home";
+ private String getTitle() {
+ String title = null;
+ try {
+ Object object = ((Context) new InitialContext().lookup("java:comp/env")).lookup("webBoxViewTitle");
+ if(object != null) {
+ title = object.toString();
+ logger.finer("WebBox View Titel: " + title);
+ }
+ } catch (NamingException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ }
+ return title;
+ }
+
+ private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+ ServletOutputStream out = response.getOutputStream();
+ printHeader(out, request);
+ super.doGet(request, response);
+ printFooter(out);
+ }
+
+ private void printHeader(ServletOutputStream out, HttpServletRequest request) 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");
+ String title = getTitle();
+ if(title != null) {
+ out.print("<title>");
+ out.print(title);
+ out.print(" ");
+ out.print(request.getRequestURI());
+ out.print("</title>\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.
*
@@ -50,8 +97,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);
@@ -70,25 +116,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();
@@ -106,7 +134,7 @@
return result;
}
- private String getUserName(HttpServletRequest hr) {
+ protected String getUserName(HttpServletRequest hr) {
String userName = null;
Object p = hr.getUserPrincipal();
if (p instanceof Principal) {
@@ -114,7 +142,7 @@
}
return userName;
}
-
+
/**
* Returns a short description of the servlet.
*
--
Gitblit v1.9.3