From f59dcede93351149bb5ff99c9310f467efd0d660 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Tue, 17 Nov 2020 15:54:25 +0000
Subject: [PATCH] Ant build begonnen

---
 src/java/de/uhilger/filecms/web/Initialiser.java |   53 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 35 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..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());
@@ -122,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);
@@ -130,28 +142,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