From d61a61bfa06aaa5c62cc137e059e17f921689e05 Mon Sep 17 00:00:00 2001
From: ulrich@undisclosed
Date: Mon, 04 May 2020 11:12:59 +0000
Subject: [PATCH] Rudimentaere Breadcrumb-Ansicht hinzugefuegt
---
src/java/de/uhilger/filecms/web/Initialiser.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 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..dcb5f9a 100644
--- a/src/java/de/uhilger/filecms/web/Initialiser.java
+++ b/src/java/de/uhilger/filecms/web/Initialiser.java
@@ -61,21 +61,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 +106,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 +122,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 +131,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