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

Issue #2191 - JPMS Support. 

Reverted wrong change in WebInfConfiguration.findAndFilterContainerPaths().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2018-09-26 12:41:12 +02:00
parent e4ff653295
commit 22cbbdc900
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
View File

@ -178,8 +178,9 @@ public class WebInfConfiguration extends AbstractConfiguration
public void findAndFilterContainerPaths (final WebAppContext context) throws Exception public void findAndFilterContainerPaths (final WebAppContext context) throws Exception
{ {
//assume the target jvm is the same as that running //assume the target jvm is the same as that running
int targetPlatform = JavaVersion.VERSION.getPlatform(); int currentPlatform = JavaVersion.VERSION.getPlatform();
//allow user to specify target jvm different to current runtime //allow user to specify target jvm different to current runtime
int targetPlatform = currentPlatform;
Object target = context.getAttribute(JavaVersion.JAVA_TARGET_PLATFORM); Object target = context.getAttribute(JavaVersion.JAVA_TARGET_PLATFORM);
if (target!=null) if (target!=null)
targetPlatform = Integer.parseInt(target.toString()); targetPlatform = Integer.parseInt(target.toString());
@ -222,7 +223,7 @@ public class WebInfConfiguration extends AbstractConfiguration
//if running on jvm 9 or above, we we won't be able to look at the application classloader //if running on jvm 9 or above, we we won't be able to look at the application classloader
//to extract urls, so we need to examine the classpath instead. //to extract urls, so we need to examine the classpath instead.
if (targetPlatform >= 9) if (currentPlatform >= 9)
{ {
tmp = System.getProperty("java.class.path"); tmp = System.getProperty("java.class.path");
if (tmp != null) if (tmp != null)

3
jetty-webapp/src/test/resources/jetty-logging.properties
View File

@ -1,6 +1,5 @@
# Setup default logging implementation for during testing
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
org.eclipse.jetty.LEVEL=INFO #org.eclipse.jetty.LEVEL=DEBUG
# org.eclipse.jetty.webapp.WebAppClassLoader.LEVEL=DEBUG # org.eclipse.jetty.webapp.WebAppClassLoader.LEVEL=DEBUG
# org.eclipse.jetty.util.LEVEL=DEBUG # org.eclipse.jetty.util.LEVEL=DEBUG
# org.eclipse.jetty.util.PathWatcher.Noisy.LEVEL=OFF # org.eclipse.jetty.util.PathWatcher.Noisy.LEVEL=OFF