Revert "Resolves #788" (#933)

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

@@ -262,13 +262,9 @@ public class Modules implements Iterable<Module>
         }
       
         // Enable the  module
-        if (module.isEnabled() && !transitive)
+        if (module.enable(enabledFrom,transitive))
         {
-            StartLog.info("Module %s has already been enabled.", module.getName());
+            StartLog.debug("enabled %s",module.getName());
-        }
-        else if (module.enable(enabledFrom,transitive))
-        {
-            StartLog.debug("Enabled %s",module.getName());
             newlyEnabled.add(module.getName());
             
             // Expand module properties
@@ -285,7 +281,8 @@ public class Modules implements Iterable<Module>
         }
         else if (module.isTransitive() && module.hasIniTemplate())
             newlyEnabled.add(module.getName());
-
+        
+        
         // Process module dependencies (always processed as may be dynamic)
         for(String dependsOn:module.getDepends())
         {

jetty-start/src/main/java/org/eclipse/jetty/start/builders/StartIniBuilder.java

@@ -88,6 +88,12 @@ public class StartIniBuilder implements BaseBuilder.Config
     @Override
     public boolean addModule(Module module) throws IOException
     {
+        if (modulesPresent.contains(module.getName()))
+        {
+            StartLog.info("%-15s already initialised in %s",module.getName(),baseHome.toShortForm(startIni));
+            // skip, already present
+            return false;
+        }
 
         if (module.isDynamic())
         {

jetty-start/src/test/resources/usecases/alternate.ModulePriorEnabled.assert.txt

@@ -1,13 +0,0 @@
-## The XMLs we expect (order is important)
-XML|${jetty.home}/etc/base.xml
-XML|${jetty.home}/etc/main.xml
-
-# The LIBs we expect (order is irrelevant)
-LIB|${jetty.home}/lib/base.jar
-LIB|${jetty.home}/lib/main.jar
-LIB|${jetty.home}/lib/other.jar
-
-# The Properties we expect (order is irrelevant)
-PROP|main.prop=value0
-
-OUTPUT|INFO : Module base has already been enabled.

jetty-start/src/test/resources/usecases/alternate.ModulePriorEnabled.cmdline.txt

@@ -1 +0,0 @@
---module=base