Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2014-07-11 06:06:40 +0000
committerJan Bartel2014-07-11 06:06:40 +0000
commitd5c210f1c3fde55718d50f1049cc401ce690e1ac (patch)
tree79c20b340abb00e3c8a259fcb8ce5d4675d04a62 /jetty-quickstart
parent644eccab8b600665a611b33be136025ba3aafde6 (diff)
downloadorg.eclipse.jetty.project-d5c210f1c3fde55718d50f1049cc401ce690e1ac.tar.gz
org.eclipse.jetty.project-d5c210f1c3fde55718d50f1049cc401ce690e1ac.tar.xz
org.eclipse.jetty.project-d5c210f1c3fde55718d50f1049cc401ce690e1ac.zip
439390 Ensure jsp scratchdir is created same way for quickstart and non-quickstart
Diffstat (limited to 'jetty-quickstart')
-rw-r--r--jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java
index 50da724c60..cea689bd61 100644
--- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java
+++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/QuickStartDescriptorGenerator.java
@@ -570,6 +570,15 @@ public class QuickStartDescriptorGenerator
if (holder instanceof FilterHolder)
out.tag(tag + "-class",origin(md,ot + tag + "-class"),holder.getClassName());
+ else if (holder instanceof ServletHolder)
+ {
+ ServletHolder s = (ServletHolder)holder;
+ if (s.getForcedPath() != null && s.getClassName() == null)
+ out.tag("jsp-file",s.getForcedPath());
+ else
+ out.tag(tag + "-class",origin(md,ot + tag + "-class"),s.getClassName());
+
+ }
for (String p : holder.getInitParameters().keySet())
{
@@ -584,11 +593,6 @@ public class QuickStartDescriptorGenerator
if (holder instanceof ServletHolder)
{
ServletHolder s = (ServletHolder)holder;
- if (s.getForcedPath() != null && s.getClassName() == null)
- out.tag("jsp-file",s.getForcedPath());
- else
- out.tag(tag + "-class",origin(md,ot + tag + "-class"),s.getClassName());
-
if (s.getInitOrder() != 0)
out.tag("load-on-startup",Integer.toString(s.getInitOrder()));

Back to the top