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

fixed JSP issues

This commit is contained in:
Greg Wilkins 2014-08-21 11:42:21 +10:00
parent c1b66a3ea3
commit af27566d2b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-distribution/src/main/resources/modules/jsp.mod
View File

@ -4,6 +4,7 @@
[depend]
servlet
annotations
jsp-impl/${jsp-impl}-jsp
[ini-template]

13
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
View File

@ -330,6 +330,7 @@ public class Modules implements Iterable<Module>
parentNames.addAll(module.getParentNames());
for(String name: parentNames)
{
StartLog.debug("Enable parent '%s' of module: %s",name,module.getName());
Module parent = modules.get(name);
if (parent == null)
{
@ -468,6 +469,7 @@ public class Modules implements Iterable<Module>
// load missing post-expanded dependent modules
private void normalizeDependencies() throws FileNotFoundException, IOException
{
Set<String> expandedModules = new HashSet<>();
boolean done = false;
while (!done)
{
@ -478,26 +480,31 @@ public class Modules implements Iterable<Module>
{
for (String parent : m.getParentNames())
{
if (modules.containsKey(parent) || missingModules.contains(parent))
String expanded = args.getProperties().expand(parent);
if (modules.containsKey(expanded) || missingModules.contains(parent) || expandedModules.contains(parent))
{
continue; // found. skip it.
}
done = false;
StartLog.debug("Missing parent module %s == %s for %s",parent,expanded,m);
missingParents.add(parent);
}
}
for (String missingParent : missingParents)
{
Path file = baseHome.getPath("modules/" + missingParent + ".mod");
String expanded = args.getProperties().expand(missingParent);
Path file = baseHome.getPath("modules/" + expanded + ".mod");
if (FS.canReadFile(file))
{
Module module = registerModule(file);
updateParentReferencesTo(module);
if (!expanded.equals(missingParent))
expandedModules.add(missingParent);
}
else
{
StartLog.debug("Missing module definition: [ Mod: %s | File: %s ]",missingParent,file);
StartLog.debug("Missing module definition: %s == %s",missingParent,expanded);
missingModules.add(missingParent);
}
}