Skip to content

Commit

Permalink
Fixes #5679 and #5680 listing modules (#5683)
Browse files Browse the repository at this point in the history
+ Updated usage to show that --list-config lists the enabled Modules
+ fixed unsupported operation in --list-all-modules
+ list enabled modules with default --list-module
  • Loading branch information
gregw authored Nov 17, 2020
1 parent e9c6c94 commit 41a7d8b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 4 additions & 0 deletions jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,10 @@ public void listModules(StartArgs args)
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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ public void listModules(List<String> tags)
if (tags.contains("-*"))
return;

tags = new ArrayList<>(tags);

boolean wild = tags.contains("*");
Set<String> included = new HashSet<>();
if (wild)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,6 @@ public void dumpEnvironment()
}
System.out.println();
}

System.out.println();
}

public void dumpJvmArgs()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 41a7d8b

Please sign in to comment.