From 3970295804c26b5dc23c6f9766538c61af096695 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 26 Aug 2013 18:35:02 +1000 Subject: [PATCH] 415826 start.jar module --enable and --disable ensure ini files are copied or renamed as appropriate --- .../main/java/org/eclipse/jetty/start/Main.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java index 8df126e0373..b7047460895 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java @@ -600,13 +600,23 @@ public class Main // Is there a disabled ini? File disabled=new File(start_d,name+".ini.disabled"); + boolean copy=false; if (!disabled.exists() && baseHome.isBaseDifferent()) + { + copy=true; disabled=new File(new File(baseHome.getHomeDir(),"start.d"),name+".ini.disabled"); + if (!disabled.exists()) + disabled=new File(new File(baseHome.getHomeDir(),"start.d"),name+".ini"); + } + if (disabled.exists()) { - // enable module by copying ini template + // enable module by renaming/copying ini template System.err.printf("Enabling %s in %s from %s%n",name,baseHome.toShortForm(ini),baseHome.toShortForm(disabled)); - Files.copy(disabled.toPath(),ini.toPath()); + if (copy) + Files.copy(disabled.toPath(),ini.toPath()); + else + disabled.renameTo(ini); args.parse(baseHome, new StartIni(ini)); } else if (args.getAllModules().resolveEnabled().contains(args.getAllModules().get(name))) @@ -661,7 +671,7 @@ public class Main } StartLog.warn("Disabling %s from %s",name,baseHome.toShortForm(ini)); - Files.copy(ini.toPath(),disabled.toPath()); + ini.renameTo(disabled); return; }