From e489e631eb602385014d9513c7ade1e4a4ef6bbc Mon Sep 17 00:00:00 2001
From: Pablo Lalloni <plalloni@gmail.com>
Date: Sat, 12 Nov 2011 20:54:15 -0300
Subject: [PATCH] Restore previous welcome servlet path to serve static
 resources correctly.

Add jetty default servlet parameter to allow "servlet welcome files".
---
 src/main/webapp/WEB-INF/web.xml | 133 +++++++++++++++++---------------
 1 file changed, 71 insertions(+), 62 deletions(-)

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 2911e7d..240841c 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,65 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 	<display-name>plantuml</display-name>
-    <servlet>
-        <servlet-name>plantumlservlet</servlet-name>
-        <servlet-class>net.sourceforge.plantuml.servlet.PlantUmlServlet</servlet-class>
-    </servlet>
-    <servlet>
-        <servlet-name>welcome</servlet-name>
-        <servlet-class>net.sourceforge.plantuml.servlet.Welcome</servlet-class>
-    </servlet>
-    <servlet>
-        <servlet-name>imgservlet</servlet-name>
-        <servlet-class>net.sourceforge.plantuml.servlet.ImgServlet</servlet-class>
-    </servlet>
-    <servlet>
-        <servlet-name>svgservlet</servlet-name>
-        <servlet-class>net.sourceforge.plantuml.servlet.SvgServlet</servlet-class>
-    </servlet>
-    <servlet>
-        <servlet-name>asciiservlet</servlet-name>
-        <servlet-class>net.sourceforge.plantuml.servlet.AsciiServlet</servlet-class>
-    </servlet>
-    <!-- Patterns of the servlet -->
-    <servlet-mapping>
-        <servlet-name>welcome</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>    
-    <servlet-mapping>
-        <servlet-name>plantumlservlet</servlet-name>
-        <url-pattern>/uml/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>plantumlservlet</servlet-name>
-        <url-pattern>/form</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>imgservlet</servlet-name>
-        <url-pattern>/img/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>svgservlet</servlet-name>
-        <url-pattern>/svg/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>asciiservlet</servlet-name>
-        <url-pattern>/txt/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>plantumlservlet</servlet-name>
-        <url-pattern>/start/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>plantumlservlet</servlet-name>
-        <url-pattern>/proxy/*</url-pattern>
-    </servlet-mapping>
-    <error-page>
-        <exception-type>java.lang.Throwable</exception-type>
-        <location>/error.jsp</location>
-    </error-page>
-    <error-page>
-        <error-code>500</error-code>
-        <location>/error.jsp</location>
-    </error-page>
+	<context-param>
+		<param-name>org.eclipse.jetty.servlet.Default.welcomeServlets</param-name>
+		<param-value>exact</param-value>
+	</context-param>
+	<servlet>
+		<servlet-name>plantumlservlet</servlet-name>
+		<servlet-class>net.sourceforge.plantuml.servlet.PlantUmlServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>welcome</servlet-name>
+		<servlet-class>net.sourceforge.plantuml.servlet.Welcome</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>imgservlet</servlet-name>
+		<servlet-class>net.sourceforge.plantuml.servlet.ImgServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>svgservlet</servlet-name>
+		<servlet-class>net.sourceforge.plantuml.servlet.SvgServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>asciiservlet</servlet-name>
+		<servlet-class>net.sourceforge.plantuml.servlet.AsciiServlet</servlet-class>
+	</servlet>
+	<!-- Patterns of the servlet -->
+	<servlet-mapping>
+		<servlet-name>welcome</servlet-name>
+		<url-pattern>/welcome</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>plantumlservlet</servlet-name>
+		<url-pattern>/uml/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>plantumlservlet</servlet-name>
+		<url-pattern>/form</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>imgservlet</servlet-name>
+		<url-pattern>/img/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>svgservlet</servlet-name>
+		<url-pattern>/svg/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>asciiservlet</servlet-name>
+		<url-pattern>/txt/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>plantumlservlet</servlet-name>
+		<url-pattern>/start/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>plantumlservlet</servlet-name>
+		<url-pattern>/proxy/*</url-pattern>
+	</servlet-mapping>
+	<error-page>
+		<exception-type>java.lang.Throwable</exception-type>
+		<location>/error.jsp</location>
+	</error-page>
+	<error-page>
+		<error-code>500</error-code>
+		<location>/error.jsp</location>
+	</error-page>
+	<welcome-file-list>
+		<welcome-file>welcome</welcome-file>
+	</welcome-file-list>
 </web-app>