From 332c058bd407c4b6fb30e6bf32b634a72bc68e05 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Fri, 17 Jan 2020 16:31:42 +0000 Subject: [PATCH] Thumbnails werden nun im jeweiligen Bildordner mit abgelegt und nicht jedesmal 'on the fly' erzeugt. --- src/java/de/uhilger/filecms/web/Initialiser.java | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/java/de/uhilger/filecms/web/Initialiser.java b/src/java/de/uhilger/filecms/web/Initialiser.java index 24926ce..dcb5f9a 100644 --- a/src/java/de/uhilger/filecms/web/Initialiser.java +++ b/src/java/de/uhilger/filecms/web/Initialiser.java @@ -122,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); @@ -130,28 +131,33 @@ 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); } } - } - // 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"); - File srcDir = new File(path, "/META-INF/conf"); - File dataCtxSrc = new File(srcDir, "data.xml"); - logger.fine("dataCtxSrc: " + dataCtxSrc.getAbsolutePath()); - logger.fine("dataContext: " + dataContext.getAbsolutePath()); - try { - FileUtils.copyFile(dataCtxSrc, dataContext); - } catch (IOException ex) { - logger.log(Level.SEVERE, null, ex); } } -- Gitblit v1.9.3