From 054647b3211894b36fcc590a1918d33271a82c8a Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Wed, 29 Mar 2017 05:39:09 +0000
Subject: [PATCH] Initialiser nach wbx-lib geschoben
---
/dev/null | 83 -----------------------------------------
web/WEB-INF/web.xml | 2
src/java/de/uhilger/filecms/web/UploadServlet.java | 2
src/java/de/uhilger/filecms/api/FileMgr.java | 1
src/java/de/uhilger/filecms/api/Api.java | 2
5 files changed, 3 insertions(+), 87 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/Api.java b/src/java/de/uhilger/filecms/api/Api.java
index 3da69f3..e5196f5 100644
--- a/src/java/de/uhilger/filecms/api/Api.java
+++ b/src/java/de/uhilger/filecms/api/Api.java
@@ -21,9 +21,9 @@
package de.uhilger.filecms.api;
import de.uhilger.filecms.data.FileRef;
-import de.uhilger.filecms.web.Initialiser;
import de.uhilger.transit.web.RequestKontext;
import de.uhilger.transit.web.WebKontext;
+import de.uhilger.wbx.web.Initialiser;
import java.io.File;
import java.security.Principal;
import java.util.logging.Logger;
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 82c5369..5937daa 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -19,7 +19,6 @@
package de.uhilger.filecms.api;
import de.uhilger.filecms.data.FileRef;
-import de.uhilger.filecms.web.Initialiser;
import de.uhilger.wbx.Bild;
import java.awt.Container;
import java.awt.Image;
diff --git a/src/java/de/uhilger/filecms/web/Initialiser.java b/src/java/de/uhilger/filecms/web/Initialiser.java
deleted file mode 100644
index ac25f00..0000000
--- a/src/java/de/uhilger/filecms/web/Initialiser.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- Dateiverwaltung - File management in your browser
- 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.filecms.web;
-
-import de.uhilger.wbx.WbxUtils;
-import java.io.File;
-import java.util.logging.Logger;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-/**
- * Initialisieren der Dateiverwaltung
- */
-public class Initialiser implements ServletContextListener {
-
- private static final Logger logger = Logger.getLogger(Initialiser.class.getName());
-
-
- public static final String FILE_BASE = "filebase";
- public static final String DATENABLAGE = "datenAblage";
-
- /* ----- ServletContextListener Implementation ----- */
-
- @Override
- public void contextInitialized(ServletContextEvent sce) {
- // hier kann etwas initialisiert werden
- ServletContext ctx = sce.getServletContext();
- ablageErmitteln(ctx);
- }
-
- /**
- * Die Dateiablage wird entweder auf einen absoluten Pfad gesetzt,
- * der im Deployment Descriptor hinterlegt werden kann oder, wenn
- * dort nichts eingetragen ist, auf den hart kodierten Pfad
- * der WebBox.
- *
- * @param ctx der ServletContext, in den die Angabe eingetragen wird. Dort
- * ist anschliessend die Angabe unter Initialiser.FILE_BASE abrufbar
- */
- private void ablageErmitteln(ServletContext ctx) {
- Object o = ctx.getInitParameter(DATENABLAGE);
- try {
- if(o instanceof String) {
- String pfad = o.toString();
- if(pfad.trim().length() > 0) {
- ctx.setAttribute(FILE_BASE, pfad);
- logger.fine("Basis: " + pfad);
- } else {
- ctx.setAttribute(FILE_BASE, WbxUtils.getWbxDataDir(ctx).getAbsolutePath());
- }
- } else {
- ctx.setAttribute(FILE_BASE, WbxUtils.getWbxDataDir(ctx).getAbsolutePath());
- }
- } catch(Exception ex) {
- ctx.setAttribute(FILE_BASE, WbxUtils.getWbxDataDir(ctx).getAbsolutePath());
- }
- }
-
- @Override
- public void contextDestroyed(ServletContextEvent sce) {
- // hier wird alles wieder aufgeraeumt
- ServletContext ctx = sce.getServletContext();
- ctx.removeAttribute(FILE_BASE);
- }
-
-}
diff --git a/src/java/de/uhilger/filecms/web/UploadServlet.java b/src/java/de/uhilger/filecms/web/UploadServlet.java
index c588736..5ed25fb 100644
--- a/src/java/de/uhilger/filecms/web/UploadServlet.java
+++ b/src/java/de/uhilger/filecms/web/UploadServlet.java
@@ -23,7 +23,7 @@
import static de.uhilger.filecms.api.FileMgr.PUB_DIR_NAME;
import static de.uhilger.filecms.api.FileMgr.PUB_DIR_PATH;
import de.uhilger.filecms.data.FileRef;
-import de.uhilger.filecms.web.Initialiser;
+import de.uhilger.wbx.web.Initialiser;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index eb03881..9670d51 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -11,7 +11,7 @@
</context-param>
<listener>
<description>Der Initialiser setzt globale Variable fuer die Dateiverwaltung</description>
- <listener-class>de.uhilger.filecms.web.Initialiser</listener-class>
+ <listener-class>de.uhilger.wbx.web.Initialiser</listener-class>
</listener>
<servlet>
<servlet-name>TransitRS</servlet-name>
--
Gitblit v1.9.3