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

JETTY-1550 virtual WEB-INF not created if project has overlays

This commit is contained in:
Jan Bartel 2012-11-01 15:37:17 +11:00
parent ced624e203
commit 8186794775
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
View File

@ -344,37 +344,40 @@ public class JettyWebAppContext extends WebAppContext
@Override
public Set<String> getResourcePaths(String path)
{
// Try to get regular resource paths
// Try to get regular resource paths - this will get appropriate paths from any overlaid wars etc
Set<String> paths = super.getResourcePaths(path);
// If no paths are returned check for virtual paths /WEB-INF/classes and /WEB-INF/lib
if (paths.isEmpty() && path != null)
if (path != null)
{
path = URIUtil.canonicalPath(path);
TreeSet<String> allPaths = new TreeSet<String>();
allPaths.addAll(paths);
//add in the dependency jars as a virtual WEB-INF/lib entry
if (path.startsWith(WEB_INF_LIB_PREFIX))
{
paths = new TreeSet<String>();
for (String fileName : webInfJarMap.keySet())
{
// Return all jar files from class path
paths.add(WEB_INF_LIB_PREFIX + "/" + fileName);
allPaths.add(WEB_INF_LIB_PREFIX + "/" + fileName);
}
}
else if (path.startsWith(WEB_INF_CLASSES_PREFIX))
{
int i=0;
while (paths.isEmpty() && (i < webInfClasses.size()))
while (i < webInfClasses.size())
{
String newPath = path.replace(WEB_INF_CLASSES_PREFIX, webInfClasses.get(i).getPath());
paths = super.getResourcePaths(newPath);
allPaths.addAll(super.getResourcePaths(newPath));
i++;
}
}
return allPaths;
}
return paths;
}
public String addPattern (String s, String pattern)
{
if (s == null)