Ensure we don't look in WEB-INF/lib for webapps that don't have a WEB-INF.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1424 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
parent
f971ed42ee
commit
681c29bcdb
|
@ -7,6 +7,7 @@ jetty-7.0.2.SNAPSHOT
|
|||
+ 306884 Suspend with timeout <=0 never expires
|
||||
+ 306782 httpbis interpretation of 100 continues. Body never skipped
|
||||
+ Take excess logging statements out of startup
|
||||
+ Ensure webapps with no WEB-INF don't scan WEB-INF/lib
|
||||
|
||||
jetty-7.0.2.RC0
|
||||
+ JSON parses NaN as null
|
||||
|
|
|
@ -128,24 +128,31 @@ public abstract class AbstractConfiguration implements Configuration
|
|||
throws Exception
|
||||
{
|
||||
Log.debug("Scanning classes in WEB-INF/classes");
|
||||
parser.parse(context.getWebInf().addPath("classes/"),
|
||||
new ClassNameResolver()
|
||||
if (context.getWebInf() != null)
|
||||
{
|
||||
public boolean isExcluded (String name)
|
||||
Resource classesDir = context.getWebInf().addPath("classes/");
|
||||
if (classesDir.exists())
|
||||
{
|
||||
if (context.isSystemClass(name)) return true;
|
||||
if (context.isServerClass(name)) return false;
|
||||
return false;
|
||||
}
|
||||
parser.parse(classesDir,
|
||||
new ClassNameResolver()
|
||||
{
|
||||
public boolean isExcluded (String name)
|
||||
{
|
||||
if (context.isSystemClass(name)) return true;
|
||||
if (context.isServerClass(name)) return false;
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean shouldOverride (String name)
|
||||
{
|
||||
//looking at webapp classpath, found already-parsed class of same name - did it come from system or duplicate in webapp?
|
||||
if (context.isParentLoaderPriority())
|
||||
return false;
|
||||
return true;
|
||||
public boolean shouldOverride (String name)
|
||||
{
|
||||
//looking at webapp classpath, found already-parsed class of same name - did it come from system or duplicate in webapp?
|
||||
if (context.isParentLoaderPriority())
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public void parse25Classes (final WebAppContext context, final AnnotationParser parser)
|
||||
|
|
Loading…
Reference in New Issue