424390 - Allow enabling modules via regex

jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java

@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
+import java.util.regex.Pattern;
 
 /**
  * Access for all modules declared, as well as what is enabled.
@@ -206,6 +207,20 @@ public class Modules implements Iterable<Module>
     }
 
     public void enable(String name, List<String> sources)
+    {
+        if (name.contains("*"))
+        {
+            // A regex!
+            Pattern pat = Pattern.compile(name);
+            for (Map.Entry<String, Module> entry : modules.entrySet())
+            {
+                if (pat.matcher(entry.getKey()).matches())
+                {
+                    enableModule(entry.getValue(),sources);
+                }
+            }
+        }
+        else
         {
             Module module = modules.get(name);
             if (module == null)
@@ -213,7 +228,13 @@ public class Modules implements Iterable<Module>
                 System.err.printf("WARNING: Cannot enable requested module [%s]: not a valid module name.%n",name);
                 return;
             }
-        StartLog.debug("Enabling module: %s (via %s)",name,Main.join(sources,", "));
+            enableModule(module,sources);
+        }
+    }
+
+    private void enableModule(Module module, List<String> sources)
+    {
+        StartLog.debug("Enabling module: %s (via %s)",module.getName(),Main.join(sources,", "));
         module.setEnabled(true);
         if (sources != null)
         {

jetty-start/src/main/java/org/eclipse/jetty/start/StartLog.java

@@ -146,4 +146,9 @@ public class StartLog
             System.out.println("Establishing " + logfile + " on " + new Date());
         }
     }
+
+    public static void enableDebug()
+    {
+        getInstance().debug = true;
+    }
 }

jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java

@@ -47,6 +47,22 @@ public class ModulesTest
         Assert.assertThat("Module count",modules.count(),is(30));
     }
     
+    @Test
+    public void testEnableRegexSimple() throws IOException
+    {
+        StartLog.enableDebug();
+        File homeDir = MavenTestingUtils.getTestResourceDir("usecases/home");
+        BaseHome basehome = new BaseHome(homeDir,homeDir);
+
+        Modules modules = new Modules();
+        modules.registerAll(basehome, DEFAULT_ARGS);
+        modules.enable("[sj]{1}.*",TEST_SOURCE);
+        
+        String expected[] = { "jmx", "stats", "spdy", "security", "jndi", "jsp", "servlet", "jaas", "server" };
+        
+        Assert.assertThat("Enabled Module count",modules.resolveEnabled().size(),is(expected.length));
+    }
+
     @Test
     public void testResolve_ServerHttp() throws IOException
     {