From b12c95e1d53caed954314ed5e42f0e54730df5cd Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Tue, 03 Apr 2018 07:40:16 +0000 Subject: [PATCH] Dateiablage als JNDI-Parameter eingebaut --- src/java/de/uhilger/filecms/web/Initialiser.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/java/de/uhilger/filecms/web/Initialiser.java b/src/java/de/uhilger/filecms/web/Initialiser.java index f6ced07..764c585 100644 --- a/src/java/de/uhilger/filecms/web/Initialiser.java +++ b/src/java/de/uhilger/filecms/web/Initialiser.java @@ -18,6 +18,7 @@ package de.uhilger.filecms.web; +import de.uhilger.wbx.WbxUtils; import java.io.File; import java.io.IOException; import java.util.logging.Level; @@ -36,6 +37,7 @@ 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 @@ -85,7 +87,9 @@ * ist anschliessend die Angabe unter Initialiser.FILE_BASE abrufbar */ protected void ablageErmitteln(ServletContext ctx) { - Object o = ctx.getInitParameter(DATENABLAGE); + //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(); @@ -111,10 +115,13 @@ if(!dataDir.exists()) { 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, new File(targetDirName)); + FileUtils.copyDirectoryToDirectory(srcDir, dataDir); srcDir = new File(srcPath, "/META-INF/daten/home"); - FileUtils.copyDirectoryToDirectory(srcDir, new File(targetDirName)); + FileUtils.copyDirectoryToDirectory(srcDir, dataDir); + srcDir = new File(srcPath, "/META-INF/daten/dav"); + FileUtils.copyDirectoryToDirectory(srcDir, dataDir); } catch (IOException ex) { logger.log(Level.SEVERE, null, ex); } -- Gitblit v1.9.3