Merge branch 'refs/heads/master' of https://arnaudroques@github.com/arnaudroques/plantumlservlet.git into HEAD

content/WEB-INF/web.xml

@@ -5,7 +5,15 @@
         <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>
     <!-- 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>
@@ -27,7 +35,7 @@
         <url-pattern>/proxy/*</url-pattern>
     </servlet-mapping>
     <welcome-file-list>
-    	<welcome-file>index.jsp</welcome-file>
+    	<welcome-file>welcome</welcome-file>
     </welcome-file-list>
     <error-page>
         <exception-type>java.lang.Throwable</exception-type>

content/error.jsp

@@ -1,4 +1,4 @@
-<%@ page isErrorPage="true" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ page isErrorPage="true" contentType="text/html; charset=utf-8" pageEncoding="utf-8" session="false" %>
 <%
 String contextRoot = request.getContextPath();
 %>

content/index.jsp

@@ -1,4 +1,4 @@
-<%@ page info="index" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ page info="index" contentType="text/html; charset=utf-8" pageEncoding="utf-8" session="false" %>
 
 <%
 String contextRoot = request.getContextPath();
@@ -14,10 +14,7 @@ if (encodedAttribute != null) {
 	}
 }
 Object decodedAttribute = request.getAttribute("net.sourceforge.plantuml.servlet.decoded");
-if (decodedAttribute == null) {
-	umltext = "Bob -> Alice : hello";
-    imgurl = host + contextRoot + "/img/SyfFKj2rKt3CoKnELR1Io4ZDoSa70000";
-} else {
+if (decodedAttribute != null) {
 	umltext = decodedAttribute.toString();
 }
 %>
@@ -68,7 +65,11 @@ if (decodedAttribute == null) {
     </p>
     <% } //endif %>
 </div>
-
+<!-- This comment is used by the TestProxy class  
+@startuml
+Bob -> Alice : hello
+@enduml
+-->
 <%-- FOOTER 
 <%@ include file="util/footer.jspf" %> --%>
 </body>