343680 Handle OSGi bundle jars not ending in ".war"

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3108 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2011-05-10 06:50:36 +00:00
parent 138bcbff91
commit 1aeb9fb761
2 changed files with 2 additions and 1 deletions

View File

@ -8,6 +8,7 @@ jetty-7.4.1-SNAPSHOT
+ 343352 make sure that jetty.osgi.boot is activated when a WAB is registered
+ 343482 refactored overlay deployer layout to use WAR layout
+ 343567 HttpClient does not limit the destination's exchange queue
+ 343680 Handle OSGi bundle jars not ending in ".war"
+ 343707 'REQUEST' is printed on console for each incoming HTTP request
+ 343923 flush timeouts applied to outer loop
+ 343936 Session idle calls unbind and remove listeners

View File

@ -420,7 +420,7 @@ public class WebInfConfiguration extends AbstractConfiguration
{
// look for a sibling like "foo/" to a "foo.war"
File warfile=Resource.newResource(war).getFile();
if (warfile!=null)
if (warfile!=null && warfile.getName().toLowerCase().endsWith(".war"))
{
File sibling = new File(warfile.getParent(),warfile.getName().substring(0,warfile.getName().length()-4));
if (sibling.exists() && sibling.isDirectory() && sibling.canWrite())