diff options
Diffstat (limited to 'jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java')
| -rw-r--r-- | jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java index 3b1f79e227..a55fd9e77b 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java @@ -265,6 +265,12 @@ public class Modules implements Iterable<Module> } } + public void enable(String name) throws IOException + { + List<String> empty = Collections.emptyList(); + enable(name,empty); + } + public void enable(String name, List<String> sources) throws IOException { if (name.contains("*")) @@ -310,9 +316,14 @@ public class Modules implements Iterable<Module> private void enableModule(Module module, List<String> sources) throws IOException { + // Always add the sources + if (sources != null) + module.addSources(sources); + + // If already enabled, nothing else to do if (module.isEnabled()) { - // already enabled, skip + StartLog.debug("Enabled module: %s (via %s)",module.getName(),Main.join(sources,", ")); return; } @@ -320,10 +331,6 @@ public class Modules implements Iterable<Module> module.setEnabled(true); args.parseModule(module); module.expandProperties(args.getProperties()); - if (sources != null) - { - module.addSources(sources); - } // enable any parents that haven't been enabled (yet) Set<String> parentNames = new HashSet<>(); @@ -349,7 +356,7 @@ public class Modules implements Iterable<Module> } if (parent != null) { - enableModule(parent,sources); + enableModule(parent,null); } } } |