Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2013-08-26 22:18:57 +0000
committerJoakim Erdfelt2013-08-26 22:19:27 +0000
commit8124f151c8089a9da2c13a8c767b8d3e087dbee2 (patch)
tree5e90a156e3d262c423a9af463a8bb97dffd714db /jetty-start
parent0ec70b66ce87b802536777dbc19b20cbe96acdca (diff)
downloadorg.eclipse.jetty.project-8124f151c8089a9da2c13a8c767b8d3e087dbee2.tar.gz
org.eclipse.jetty.project-8124f151c8089a9da2c13a8c767b8d3e087dbee2.tar.xz
org.eclipse.jetty.project-8124f151c8089a9da2c13a8c767b8d3e087dbee2.zip
415826 - jetty-start / add --enable an --disable functionality for modules
+ Ensure that --enable will work, even with a pristene base directory
Diffstat (limited to 'jetty-start')
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/FS.java12
-rw-r--r--jetty-start/src/main/java/org/eclipse/jetty/start/ModulePersistence.java6
2 files changed, 17 insertions, 1 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/FS.java b/jetty-start/src/main/java/org/eclipse/jetty/start/FS.java
index 5a40f47fb9..977985ccdb 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/FS.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/FS.java
@@ -124,6 +124,18 @@ public class FS
}
}
+ public static void ensureDirectoryExists(File dir) throws IOException
+ {
+ if (dir.exists())
+ {
+ return;
+ }
+ if (!dir.mkdirs())
+ {
+ throw new IOException("Unable to create directory: " + dir.getAbsolutePath());
+ }
+ }
+
public static boolean isFile(File file)
{
if (file == null)
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/ModulePersistence.java b/jetty-start/src/main/java/org/eclipse/jetty/start/ModulePersistence.java
index 947f6c9078..cee6349402 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/ModulePersistence.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/ModulePersistence.java
@@ -134,7 +134,11 @@ public class ModulePersistence extends TextFile
private void saveFile() throws IOException
{
- try (FileWriter writer = new FileWriter(getFile(),false))
+ File file = getFile();
+ File parent = file.getParentFile();
+ FS.ensureDirectoryExists(parent);
+
+ try (FileWriter writer = new FileWriter(file,false))
{
for (String line : getLines())
{

Back to the top