From bdb24d1de0f03af3c9855f5ebe7c39dc4fef56ff Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 5 Mar 2010 12:27:18 +0000 Subject: [PATCH] 294799 when configuring a webapp, don't look for WEB-INF/jetty6-web.xml git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1344 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 0ea76fa3eaa..87b1074c82c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,6 +1,7 @@ jetty-7.0.2-SNAPSHOT + JSON parses NaN as null + 290765 Reset input for HttpExchange retry. + + 294799 when configuring a webapp, don't look for WEB-INF/jetty6-web.xml + 296569 removeLifeCycleListener() has no effect + 296765 JMX Connector Server and ShutdownThread + 297421 Hide server/system classes from WebAppClassLoader.getResources diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java index e445b09fd32..24f245e5e00 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java @@ -58,7 +58,7 @@ public class JettyWebXmlConfiguration implements Configuration if(web_inf!=null&&web_inf.isDirectory()) { // do jetty.xml file - Resource jetty=web_inf.addPath("jetty6-web.xml"); + Resource jetty=web_inf.addPath("jetty7-web.xml"); if(!jetty.exists()) jetty=web_inf.addPath("jetty-web.xml"); if(!jetty.exists())