From 9778400996a77ca6118c4ed6857d9ced33dcf14b Mon Sep 17 00:00:00 2001 From: Ulrich <undisclosed> Date: Fri, 20 Nov 2020 15:36:20 +0000 Subject: [PATCH] Compiler-Ausgabe fuer Ant-Builds --- src/java/de/uhilger/filecms/web/Initialiser.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 48 insertions(+), 5 deletions(-) diff --git a/src/java/de/uhilger/filecms/web/Initialiser.java b/src/java/de/uhilger/filecms/web/Initialiser.java index 764c585..758c374 100644 --- a/src/java/de/uhilger/filecms/web/Initialiser.java +++ b/src/java/de/uhilger/filecms/web/Initialiser.java @@ -31,6 +31,17 @@ /** * 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 { private static final Logger logger = Logger.getLogger(Initialiser.class.getName()); @@ -61,21 +72,30 @@ * * @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, @@ -97,13 +117,13 @@ ctx.setAttribute(FILE_BASE, pfad); logger.fine("Basis: " + pfad); } else { - ctx.setAttribute(FILE_BASE, getWbxDataDir(ctx).getAbsolutePath()); + ctx.setAttribute(FILE_BASE, wu.getWbxDataDir().getAbsolutePath()); } } else { - ctx.setAttribute(FILE_BASE, getWbxDataDir(ctx).getAbsolutePath()); + ctx.setAttribute(FILE_BASE, wu.getWbxDataDir().getAbsolutePath()); } } catch(Exception ex) { - ctx.setAttribute(FILE_BASE, getWbxDataDir(ctx).getAbsolutePath()); + ctx.setAttribute(FILE_BASE, wu.getWbxDataDir().getAbsolutePath()); } } @@ -113,6 +133,7 @@ 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); @@ -121,7 +142,29 @@ srcDir = new File(srcPath, "/META-INF/daten/home"); FileUtils.copyDirectoryToDirectory(srcDir, dataDir); srcDir = new File(srcPath, "/META-INF/daten/dav"); - FileUtils.copyDirectoryToDirectory(srcDir, dataDir); + 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); } -- Gitblit v1.9.3