From 8995ae75208c68a0f3b9a23c05a525f721b42f8a Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 29 Aug 2012 08:18:04 +0000
Subject: [PATCH] SP-239, SWE-6: create webapps folder if it doesn't exist.
SVN: 26475
---
.../server/coreplugin/JettyWebAppPluginInjector.java | 9 ++++++---
.../webapp/.dummy_file_to_make_this_folder_not_empty | 0
2 files changed, 6 insertions(+), 3 deletions(-)
delete mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/public/webapp/.dummy_file_to_make_this_folder_not_empty
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
index 328969fefc2..b1caffc0382 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
@@ -148,15 +148,18 @@ public class JettyWebAppPluginInjector
String jettyHome = System.getProperty("jetty.home");
if (jettyHome != null)
{
- list.add(new File(jettyHome + "/webapps/openbis/" + WEBAPP_FOLDER));
+ File webappFolder = new File(jettyHome + "/webapps/openbis/" + WEBAPP_FOLDER);
+ webappFolder.mkdirs();
+ list.add(webappFolder);
} else
{
File[] files = new File("targets/www").listFiles();
for (File file : files)
{
- File webappFolder = new File(file, WEBAPP_FOLDER);
- if (webappFolder.isDirectory())
+ if (file.getName().equals("WEB-INF") == false)
{
+ File webappFolder = new File(file, WEBAPP_FOLDER);
+ webappFolder.mkdirs();
list.add(webappFolder);
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/webapp/.dummy_file_to_make_this_folder_not_empty b/openbis/source/java/ch/systemsx/cisd/openbis/public/webapp/.dummy_file_to_make_this_folder_not_empty
deleted file mode 100644
index e69de29bb2d..00000000000
--
GitLab