jetty-start / removing last remnants of module persistence

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

@@ -148,8 +148,6 @@ public class StartArgs
     private List<String> jvmArgs = new ArrayList<>();
     private List<String> moduleIni = new ArrayList<>();
     private List<String> moduleStartIni = new ArrayList<>();
-    private List<String> modulePersistEnable = new ArrayList<>();
-    private List<String> modulePersistDisable = new ArrayList<>();
     private Modules allModules;
 
     // Should the server be run?
@@ -540,16 +538,6 @@ public class StartArgs
         return System.getProperty("main.class",mainclass);
     }
 
-    public List<String> getModulePersistDisable()
-    {
-        return modulePersistDisable;
-    }
-
-    public List<String> getModulePersistEnable()
-    {
-        return modulePersistEnable;
-    }
-
     public Properties getProperties()
     {
         return properties;
@@ -648,11 +636,6 @@ public class StartArgs
         return listModules;
     }
 
-    public boolean isModulePersistenceChanging()
-    {
-        return (modulePersistDisable.size() > 0) || (modulePersistEnable.size() > 0);
-    }
-
     public boolean isRun()
     {
         return run;
@@ -799,28 +782,6 @@ public class StartArgs
             return;
         }
 
-        if (arg.startsWith("--enable-module="))
-        {
-            if (!CMD_LINE_SOURCE.equals(source))
-            {
-                throw new UsageException(ERR_BAD_ARG,"%s not allowed in %s",arg,source);
-            }
-            modulePersistEnable.addAll(getValues(arg));
-            run = false;
-            return;
-        }
-
-        if (arg.startsWith("--disable-module="))
-        {
-            if (!CMD_LINE_SOURCE.equals(source))
-            {
-                throw new UsageException(ERR_BAD_ARG,"%s not allowed in %s",arg,source);
-            }
-            modulePersistDisable.addAll(getValues(arg));
-            run = false;
-            return;
-        }
-
         // Start property (syntax similar to System property)
         if (arg.startsWith("-D"))
         {
@@ -904,16 +865,6 @@ public class StartArgs
         this.allModules = allModules;
     }
 
-    public void setModulePersistDisable(List<String> modulePersistDisable)
-    {
-        this.modulePersistDisable = modulePersistDisable;
-    }
-
-    public void setModulePersistEnable(List<String> modulePersistEnable)
-    {
-        this.modulePersistEnable = modulePersistEnable;
-    }
-
     @Override
     public String toString()
     {

jetty-start/src/test/resources/usecases/base.with.module.persistence/modules/enabled

@@ -1,2 +0,0 @@
-https
-websocket

jetty-start/src/test/resources/usecases/base.with.module.persistence/start.d/requestlog.ini

@@ -1,2 +0,0 @@
-
---module=requestlog

jetty-start/src/test/resources/usecases/base.with.module.persistence/start.d/websocket.ini

@@ -1,2 +0,0 @@
-
---module=websocket

jetty-start/src/test/resources/usecases/base.with.module.persistence/start.ini

@@ -1,13 +0,0 @@
-
-# this should not be picked up as there is a module persistence layer present
---module=debug
---module=ipaccess
---module=rewrite
-
-jetty.port=12345
-
-jetty.keystore=etc/keystore
-jetty.keystore.password=friendly
-jetty.keymanager.password=icecream
-jetty.truststore=etc/keystore
-jetty.truststore.password=sundae