diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java index 5eeab69a5da..4411ca519fa 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java @@ -177,7 +177,6 @@ public class TestOSGiUtil .start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-slf4j-impl").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-util").versionAsInProject().start()); - res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-util-ajax").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-deploy").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-server").versionAsInProject().start()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-servlet").versionAsInProject().start()); 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 b2829e317ff..164c5e7a08b 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 @@ -266,6 +266,10 @@ public class Main System.out.printf("%nModules %s:%n", t); System.out.printf("=========%s%n", "=".repeat(t.length())); args.getAllModules().listModules(tags); + + // for default module listings, also show enabled modules + if ("[-internal]".equals(t) || "[*]".equals(t)) + args.getAllModules().listEnabled(); } public void showModules(StartArgs args) 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 4ce2b6fab03..df909855e27 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 @@ -167,6 +167,8 @@ public class Modules implements Iterable if (tags.contains("-*")) return; + tags = new ArrayList<>(tags); + boolean wild = tags.contains("*"); Set included = new HashSet<>(); if (wild) diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java index 9d8489b3287..433f4625d0c 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java @@ -347,8 +347,6 @@ public class StartArgs } System.out.println(); } - - System.out.println(); } public void dumpJvmArgs() diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt index b3f0449afdd..36b8c5a0713 100644 --- a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt +++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt @@ -19,12 +19,15 @@ Command Line Options: --list-config List the resolved configuration that will be used to start Jetty. Output includes: + o Enabled jetty modules o Java Environment o Jetty Environment + o Config file search order o JVM Arguments + o System Properties o Properties - o Server Classpath - o Server XML Configuration + o Java Classpath + o XML Configuration files --dry-run Print the command line that the start.jar generates, then exit. This may be used to generate command lines