From 17727f11c12bd7176af946bb440d509cb558ac22 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Thu, 25 Jun 2020 07:48:23 +0000
Subject: [PATCH] Initialiser wieder zurueckgestellt auf JNDI
---
src/java/de/uhilger/filecms/web/Initialiser.java | 173 +++++++++++++++++++++++-
/dev/null | 177 -------------------------
src/java/de/uhilger/filecms/web/InitialiserHome.java | 33 ++++
3 files changed, 197 insertions(+), 186 deletions(-)
diff --git a/src/java/de/uhilger/filecms/web/Initialiser.java b/src/java/de/uhilger/filecms/web/Initialiser.java
index 90cf53a..758c374 100644
--- a/src/java/de/uhilger/filecms/web/Initialiser.java
+++ b/src/java/de/uhilger/filecms/web/Initialiser.java
@@ -1,27 +1,182 @@
+/*
+ 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.io.IOException;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
+import org.apache.commons.io.FileUtils;
/**
- *
+ * Initialisieren der Dateiverwaltung
*/
+
+/*
+ der folgende Eintrag kann z.B. in $CATALINA_BASE/conf/context.xml
+ <Environment
+ name="wbxFileBase"
+ type="java.lang.String"
+ value="/media/wbx-data/cms"
+ override="false"
+ />
+
+*/
public class Initialiser implements ServletContextListener {
-
- public static final String FILE_BASE = "filebase";
private static final Logger logger = Logger.getLogger(Initialiser.class.getName());
-
+
+ public static final String FILE_BASE = "filebase";
+ public static final String DATENABLAGE = "datenAblage";
+ public static final String WBX_FILE_BASE = "wbxFileBase";
+
+ /**
+ * Bei der WebBox ist das Datenverzeichnis relativ zum Verzeichnis
+ * $CATALINA_BASE/webapps untergebracht.
+ * Die Abfrage ServletContext.getRealPath
+ * liefert das Verzeichnis des Context dieser Webanwendung, also
+ * $CATALINA_BASE/webapps/file-cms
+ * oder
+ * $WBX/sys/base/webapps/file-cms
+ *
+ * Unter Windows z.B.
+ * C:\Users\fred\Documents\srv\wbx\sys\base\webapps\file-cms
+ * Unter Linux oder Mac OS z.B.
+ * /home/fred/srv/wbx/sys/base/webapps/file-cms
+ *
+ * Das Datenverzeichis liegt dann auf
+ * $WBX/daten
+ *
+ * Mit dem Verzeichnis des Context dieser Webanwendung ist das
+ * Datenverzeichnis der WebBox hart kodierbar mit dieser Methode
+ *
+ * @return Verzeichnis 'daten' der WebBox
+ */
+ /*
+ protected File getWbxDataDir(ServletContext ctx) {
+ File file = getWbxDir(ctx);
+ file = new File(file, "daten/");
+ logger.fine("WebBox Datenbasis: " + file.getAbsolutePath());
+ return file;
+ }
+ */
+
+ /*
+ protected File getWbxDir(ServletContext ctx) {
+ logger.fine("Catalina Base: " + System.getProperty("catalina.base"));
+ File catalinaBase = new File(System.getProperty("catalina.base"));
+ File wbxDir = catalinaBase.getParentFile().getParentFile();
+ return wbxDir;
+ /*
+ String path = ctx.getRealPath("/");
+ logger.fine("getRealPath: " + path); // file-cms in webapps
+ File file = new File(path);
+ file = file.getParentFile().getParentFile().getParentFile().getParentFile();
+ logger.fine("WebBox: " + file.getAbsolutePath());
+ return file;
+ */
+ //}
+
+ /**
+ * 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
+ */
+ protected void ablageErmitteln(ServletContext ctx) {
+ //Object o = ctx.getInitParameter(DATENABLAGE);
+ WbxUtils wu = new WbxUtils();
+ Object o = wu.getJNDIParameter(WBX_FILE_BASE, WbxUtils.EMPTY_STRING);
+ 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, wu.getWbxDataDir().getAbsolutePath());
+ }
+ } else {
+ ctx.setAttribute(FILE_BASE, wu.getWbxDataDir().getAbsolutePath());
+ }
+ } catch(Exception ex) {
+ ctx.setAttribute(FILE_BASE, wu.getWbxDataDir().getAbsolutePath());
+ }
+ }
+
+ protected void ablageInitialisieren(ServletContext ctx) {
+ Object o = ctx.getAttribute(FILE_BASE);
+ if(o instanceof String) {
+ String targetDirName = (String) o;
+ File dataDir = new File(targetDirName, "www");
+ if(!dataDir.exists()) {
+ dataDir.mkdirs();
+ String srcPath = ctx.getRealPath("/"); // file-cms in webapps
+ File srcDir = new File(srcPath, "/META-INF/daten/www");
+ dataDir = new File(targetDirName);
+ try {
+ FileUtils.copyDirectoryToDirectory(srcDir, dataDir);
+ srcDir = new File(srcPath, "/META-INF/daten/home");
+ FileUtils.copyDirectoryToDirectory(srcDir, dataDir);
+ srcDir = new File(srcPath, "/META-INF/daten/dav");
+ FileUtils.copyDirectoryToDirectory(srcDir, dataDir);
+
+ /*
+
+ an dieser Stelle koennten noch die Kontexte fuer www und home
+ angelegt werden. Sie muessten aber dynamisch erzeugt werden,
+ mit der jeweiligen Einstellung laut FILE_BASE, nicht, wie
+ unten durch Kopieren einer statischen Datei
+
+ // hier noch den context anlegen
+ String path = ctx.getRealPath("/");
+ //File appDir = new File(path);
+ logger.fine("Catalina Base: " + System.getProperty("catalina.base"));
+ //File catalinaBase = appDir.getParentFile().getParentFile();
+ File catalinaBase = new File(System.getProperty("catalina.base"));
+ File confLocalhost = new File(catalinaBase, "conf/Catalina/localhost");
+ File dataContext = new File(confLocalhost, "data.xml");
+ srcDir = new File(path, "/META-INF/conf");
+ File dataCtxSrc = new File(srcDir, "data.xml");
+ logger.fine("dataCtxSrc: " + dataCtxSrc.getAbsolutePath());
+ logger.fine("dataContext: " + dataContext.getAbsolutePath());
+ FileUtils.copyFile(dataCtxSrc, dataContext);
+ */
+ } catch (IOException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+ }
+
@Override
public void contextInitialized(ServletContextEvent sce) {
ServletContext ctx = sce.getServletContext();
- StringBuilder sb = new StringBuilder();
- sb.append(System.getProperty("user.home"));
- sb.append("/file-cms");
- System.out.println(" FILE_BASE: " + sb.toString());
- ctx.setAttribute(FILE_BASE, sb.toString());
+ ablageErmitteln(ctx);
+ ablageInitialisieren(ctx);
}
@Override
diff --git a/src/java/de/uhilger/filecms/web/InitialiserDep.java b/src/java/de/uhilger/filecms/web/InitialiserDep.java
deleted file mode 100644
index 7d2f5cd..0000000
--- a/src/java/de/uhilger/filecms/web/InitialiserDep.java
+++ /dev/null
@@ -1,177 +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.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import org.apache.commons.io.FileUtils;
-
-/**
- * Initialisieren der Dateiverwaltung
- */
-public class InitialiserDep implements ServletContextListener {
-
- private static final Logger logger = Logger.getLogger(InitialiserDep.class.getName());
-
- public static final String FILE_BASE = "filebase";
- public static final String DATENABLAGE = "datenAblage";
- public static final String WBX_FILE_BASE = "wbxFileBase";
-
- /**
- * Bei der WebBox ist das Datenverzeichnis relativ zum Verzeichnis
- * $CATALINA_BASE/webapps untergebracht.
- * Die Abfrage ServletContext.getRealPath
- * liefert das Verzeichnis des Context dieser Webanwendung, also
- * $CATALINA_BASE/webapps/file-cms
- * oder
- * $WBX/sys/base/webapps/file-cms
- *
- * Unter Windows z.B.
- * C:\Users\fred\Documents\srv\wbx\sys\base\webapps\file-cms
- * Unter Linux oder Mac OS z.B.
- * /home/fred/srv/wbx/sys/base/webapps/file-cms
- *
- * Das Datenverzeichis liegt dann auf
- * $WBX/daten
- *
- * Mit dem Verzeichnis des Context dieser Webanwendung ist das
- * Datenverzeichnis der WebBox hart kodierbar mit dieser Methode
- *
- * @return Verzeichnis 'daten' der WebBox
- */
- /*
- protected File getWbxDataDir(ServletContext ctx) {
- File file = getWbxDir(ctx);
- file = new File(file, "daten/");
- logger.fine("WebBox Datenbasis: " + file.getAbsolutePath());
- return file;
- }
- */
-
- /*
- protected File getWbxDir(ServletContext ctx) {
- logger.fine("Catalina Base: " + System.getProperty("catalina.base"));
- File catalinaBase = new File(System.getProperty("catalina.base"));
- File wbxDir = catalinaBase.getParentFile().getParentFile();
- return wbxDir;
- /*
- String path = ctx.getRealPath("/");
- logger.fine("getRealPath: " + path); // file-cms in webapps
- File file = new File(path);
- file = file.getParentFile().getParentFile().getParentFile().getParentFile();
- logger.fine("WebBox: " + file.getAbsolutePath());
- return file;
- */
- //}
-
- /**
- * 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
- */
- protected void ablageErmitteln(ServletContext ctx) {
- //Object o = ctx.getInitParameter(DATENABLAGE);
- WbxUtils wu = new WbxUtils();
- Object o = wu.getJNDIParameter(WBX_FILE_BASE, WbxUtils.EMPTY_STRING);
- 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, wu.getWbxDataDir().getAbsolutePath());
- }
- } else {
- ctx.setAttribute(FILE_BASE, wu.getWbxDataDir().getAbsolutePath());
- }
- } catch(Exception ex) {
- ctx.setAttribute(FILE_BASE, wu.getWbxDataDir().getAbsolutePath());
- }
- }
-
- protected void ablageInitialisieren(ServletContext ctx) {
- Object o = ctx.getAttribute(FILE_BASE);
- if(o instanceof String) {
- String targetDirName = (String) o;
- File dataDir = new File(targetDirName, "www");
- if(!dataDir.exists()) {
- dataDir.mkdirs();
- String srcPath = ctx.getRealPath("/"); // file-cms in webapps
- File srcDir = new File(srcPath, "/META-INF/daten/www");
- dataDir = new File(targetDirName);
- try {
- FileUtils.copyDirectoryToDirectory(srcDir, dataDir);
- srcDir = new File(srcPath, "/META-INF/daten/home");
- FileUtils.copyDirectoryToDirectory(srcDir, dataDir);
- srcDir = new File(srcPath, "/META-INF/daten/dav");
- FileUtils.copyDirectoryToDirectory(srcDir, dataDir);
-
- /*
-
- an dieser Stelle koennten noch die Kontexte fuer www und home
- angelegt werden. Sie muessten aber dynamisch erzeugt werden,
- mit der jeweiligen Einstellung laut FILE_BASE, nicht, wie
- unten durch Kopieren einer statischen Datei
-
- // hier noch den context anlegen
- String path = ctx.getRealPath("/");
- //File appDir = new File(path);
- logger.fine("Catalina Base: " + System.getProperty("catalina.base"));
- //File catalinaBase = appDir.getParentFile().getParentFile();
- File catalinaBase = new File(System.getProperty("catalina.base"));
- File confLocalhost = new File(catalinaBase, "conf/Catalina/localhost");
- File dataContext = new File(confLocalhost, "data.xml");
- srcDir = new File(path, "/META-INF/conf");
- File dataCtxSrc = new File(srcDir, "data.xml");
- logger.fine("dataCtxSrc: " + dataCtxSrc.getAbsolutePath());
- logger.fine("dataContext: " + dataContext.getAbsolutePath());
- FileUtils.copyFile(dataCtxSrc, dataContext);
- */
- } catch (IOException ex) {
- logger.log(Level.SEVERE, null, ex);
- }
- }
- }
- }
-
- @Override
- public void contextInitialized(ServletContextEvent sce) {
- ServletContext ctx = sce.getServletContext();
- //ablageErmitteln(ctx);
- //ablageInitialisieren(ctx);
- }
-
- @Override
- public void contextDestroyed(ServletContextEvent sce) {
- ServletContext ctx = sce.getServletContext();
- ctx.removeAttribute(FILE_BASE);
- }
-
-}
diff --git a/src/java/de/uhilger/filecms/web/InitialiserHome.java b/src/java/de/uhilger/filecms/web/InitialiserHome.java
new file mode 100644
index 0000000..ae556a5
--- /dev/null
+++ b/src/java/de/uhilger/filecms/web/InitialiserHome.java
@@ -0,0 +1,33 @@
+package de.uhilger.filecms.web;
+
+import java.util.logging.Logger;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ *
+ */
+public class InitialiserHome implements ServletContextListener {
+
+ public static final String FILE_BASE = "filebase";
+
+ private static final Logger logger = Logger.getLogger(Initialiser.class.getName());
+
+ @Override
+ public void contextInitialized(ServletContextEvent sce) {
+ ServletContext ctx = sce.getServletContext();
+ StringBuilder sb = new StringBuilder();
+ sb.append(System.getProperty("user.home"));
+ sb.append("/file-cms");
+ System.out.println(" FILE_BASE: " + sb.toString());
+ ctx.setAttribute(FILE_BASE, sb.toString());
+ }
+
+ @Override
+ public void contextDestroyed(ServletContextEvent sce) {
+ ServletContext ctx = sce.getServletContext();
+ ctx.removeAttribute(FILE_BASE);
+ }
+
+}
--
Gitblit v1.9.3