commit 1f9b0794952a40fb23df71cce1c96196c72a0cbb
author Mark Struberg <struberg@apache.org> Thu Sep 20 13:45:54 2018 +0000
committer Mark Struberg <struberg@apache.org> Thu Sep 20 13:45:54 2018 +0000
tree 67bd3d322f9a1e5b924b0b1e0429f2ebf8406ad5
parent 5ae0674e6eb769fa91391236d1dfb0648ad64e8f

MEECROWAVE-130 make webapps directory optional


git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/meecrowave/trunk@1841476 13f79535-47bb-0310-9956-ffa450edef68

meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java

diff --git a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
index 42307e2..4d50b67 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
@@ -63,6 +63,7 @@
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.logging.Logger;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -141,6 +142,7 @@
     protected ConfigurableBus clientBus;
     protected File base;
     protected final File ownedTempDir;
+    protected File workDir;
     protected InternalTomcat tomcat;
     protected volatile Thread hook;
 
@@ -466,18 +468,25 @@
             final File conf = createDirectory(base, "conf");
             createDirectory(base, "lib");
             createDirectory(base, "logs");
-            createDirectory(base, "work");
-            createDirectory(base, "webapps");
 
+            // create the temp dir folder.
+            File tempDir;
             if (configuration.getTempDir() == null || configuration.getTempDir().length() == 0) {
-                createDirectory(base, "temp");
+                tempDir = createDirectory(base, "temp");
             } else {
-                File tempDir = new File(configuration.getTempDir());
+                tempDir = new File(configuration.getTempDir());
                 if (!tempDir.exists()) {
                     tempDir.mkdirs();
                 }
             }
 
+            try {
+                workDir = createDirectory(base, "work");
+            } catch (IllegalStateException ise) {
+                // in case we could not create that directory we create it in the temp dir folder
+                workDir = createDirectory(tempDir, "work");
+            }
+
             synchronize(conf, configuration.conf);
         }
 
@@ -498,7 +507,6 @@
         }
 
         final File conf = new File(base, "conf");
-        final File webapps = new File(base, "webapps");
 
         tomcat.setBaseDir(base.getAbsolutePath());
         tomcat.setHostname(configuration.host);
@@ -573,12 +581,20 @@
             tomcat.getEngine().setDefaultHost(configuration.host);
             final StandardHost host = new StandardHost();
             host.setName(configuration.host);
-            host.setAppBase(webapps.getAbsolutePath());
+
+            try {
+                final File webapps = createDirectory(base, "webapps");
+                host.setAppBase(webapps.getAbsolutePath());
+            } catch (IllegalStateException ise) {
+                Logger.getLogger(this.getClass().getName()).info("Could not create Tomcat AppBase directory (webapps) in " +
+                    new File(base, "webapps").getAbsolutePath() + " . This is only a problem if you deploy WARs!");
+            }
+
             host.setUnpackWARs(true); // forced for now cause OWB doesn't support war:file:// urls
             try {
-                host.setWorkDir(new File(base, "work").getCanonicalPath());
+                host.setWorkDir(workDir.getCanonicalPath());
             } catch (final IOException e) {
-                host.setWorkDir(new File(base, "work").getAbsolutePath());
+                host.setWorkDir(workDir.getAbsolutePath());
             }
             tomcat.setHost(host);
         }
@@ -1919,6 +1935,7 @@
         public String getConf() {
             return conf;
         }
+
         public void setConf(final String conf) {
             this.conf = conf;
         }