Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Jan Bartel 2020-11-18 10:55:12 +01:00
parent d30d95c26c a70ecb51a1
commit 1d3e190e53
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
View File

@ -177,7 +177,6 @@ public class TestOSGiUtil
.start()); .start());
res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-slf4j-impl").versionAsInProject().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").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-deploy").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-server").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()); res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-servlet").versionAsInProject().start());

4
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
View File

@ -266,6 +266,10 @@ public class Main
System.out.printf("%nModules %s:%n", t); System.out.printf("%nModules %s:%n", t);
System.out.printf("=========%s%n", "=".repeat(t.length())); System.out.printf("=========%s%n", "=".repeat(t.length()));
args.getAllModules().listModules(tags); 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) public void showModules(StartArgs args)

2
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
View File

@ -167,6 +167,8 @@ public class Modules implements Iterable<Module>
if (tags.contains("-*")) if (tags.contains("-*"))
return; return;
tags = new ArrayList<>(tags);
boolean wild = tags.contains("*"); boolean wild = tags.contains("*");
Set<String> included = new HashSet<>(); Set<String> included = new HashSet<>();
if (wild) if (wild)

2
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -347,8 +347,6 @@ public class StartArgs
} }
System.out.println(); System.out.println();
} }
System.out.println();
} }
public void dumpJvmArgs() public void dumpJvmArgs()

7
jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
View File

@ -19,12 +19,15 @@ Command Line Options:
--list-config List the resolved configuration that will be used to --list-config List the resolved configuration that will be used to
start Jetty. start Jetty.
Output includes: Output includes:
o Enabled jetty modules
o Java Environment o Java Environment
o Jetty Environment o Jetty Environment
o Config file search order
o JVM Arguments o JVM Arguments
o System Properties
o Properties o Properties
o Server Classpath o Java Classpath
o Server XML Configuration o XML Configuration files
--dry-run Print the command line that the start.jar generates, --dry-run Print the command line that the start.jar generates,
then exit. This may be used to generate command lines then exit. This may be used to generate command lines