From 26115ecfe17ecd438a0aca7686bac1670709905e Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Thu, 05 Apr 2018 18:34:49 +0000
Subject: [PATCH] collect aufgenommen

---
 src/java/de/uhilger/filecms/web/Initialiser.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/java/de/uhilger/filecms/web/Initialiser.java b/src/java/de/uhilger/filecms/web/Initialiser.java
index ea52033..764c585 100644
--- a/src/java/de/uhilger/filecms/web/Initialiser.java
+++ b/src/java/de/uhilger/filecms/web/Initialiser.java
@@ -18,19 +18,26 @@
 
 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 Initialiser {
+public class Initialiser implements ServletContextListener {
   
   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 
@@ -80,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();
@@ -97,5 +106,40 @@
       ctx.setAttribute(FILE_BASE, getWbxDataDir(ctx).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()) {
+        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);          
+        } 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);
+  }
     
 }

--
Gitblit v1.9.3