From bc68260cf5fb2b47bb415b1065e0adb6a5275edf Mon Sep 17 00:00:00 2001
From: Marc Englund <marc.englund@itmill.com>
Date: Wed, 17 Dec 2008 08:49:13 +0000
Subject: [PATCH] Copied changes made in [6237] to the correct web.xml, for
 #2185

svn changeset:6244/svn branch:trunk
---
 build/package/WebContent/WEB-INF/web.xml | 795 +++++++++--------------
 1 file changed, 313 insertions(+), 482 deletions(-)

diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index 9dd691df00..aee2da38f3 100644
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -3,487 +3,318 @@
 <!DOCTYPE web-app
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
     "http://java.sun.com/dtd/web-app_2_3.dtd">
-
 <web-app>
-
-  <display-name>IT Mill Toolkit</display-name>
-  <description>
-     IT Mill Toolkit examples
-  </description>
-  
-  <!-- Permit use of IT Mill Testing Tools for this servlet container -->
-  <context-param>
-  	<param-name>testingToolsActive</param-name>
-  	<param-value>true</param-value>
-  	<description>IT Mill Testing Tools activation</description>
-  </context-param>
-  
-  <!-- Undefined, use default URI for Testing Tools Server
-   <context-param>
-  	<param-name>testingToolsServerUri</param-name>
-  	<param-value>http://localhost:8099/TestingToolsServer</param-value>
-  	<description>IT Mill Testing Tools URI</description>
-  </context-param>
-  -->
-  
-  <servlet>
-    <servlet-name>ITMillToolkitApplicationRunner</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>applicationRunner</param-name>
-      <param-value>true</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>RobustnessComplex</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.automatedtests.RobustnessComplex</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>FeatureBrowser</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.featurebrowser.FeatureBrowser</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>WindowedDemos</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.WindowedDemos</param-value>
-    </init-param>
-  </servlet>
-  
-   <servlet>
-    <servlet-name>PortletDemo</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.PortletDemo</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>BrowserDemo</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.BrowserDemo</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>TestBench</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.testbench.TestBench</param-value>
-    </init-param>
-  </servlet>
-  
-   <servlet>
-    <servlet-name>NativeWindowing</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.NativeWindowing</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>Reservr</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.reservation.ReservationApplication</param-value>
-    </init-param>
-    <init-param>
-      <param-name>widgetset</param-name>
-      <param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>SimpleReserver</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.reservation.simple.SimpleReserver</param-value>
-    </init-param>
-    <init-param>
-      <param-name>widgetset</param-name>
-      <param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>SelectDemo</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.SelectDemo</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>BufferedComponents</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.BufferedComponents</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>TableDemo</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.TableDemo</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>FilterSelect</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.FilterSelect</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>Parameters</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.Parameters</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>UpgradingSample</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.UpgradingSample</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>QueryContainerDemo</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.QueryContainerDemo</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>TreeFilesystemContainer</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.TreeFilesystemContainer</param-value>
-    </init-param>
-    <!-- Set this property if demo cannot access context base directory
-      because of Application Server or Servlet Container security constraints-->
-    <!--
-    <init-param>
-      <param-name>sampleDirectory</param-name>
-      <param-value>/mySampleDirectory</param-value>
-    </init-param>
-    -->								
-  </servlet>
-
-  <servlet>
-    <servlet-name>TreeFilesystem</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.TreeFilesystem</param-value>
-    </init-param>
-    <!-- Set this property if demo cannot access context base directory
-      because of Application Server or Servlet Container security constraints-->
-    <!--
-    <init-param>
-      <param-name>sampleDirectory</param-name>
-      <param-value>/mySampleDirectory</param-value>
-    </init-param>
-    -->
-  </servlet>
-
-  <servlet>
-    <servlet-name>HelloWorld</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.HelloWorld</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>Calc</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.Calc</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>KeyboardShortcut</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.KeyboardShortcut</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>ColorPickerApplication</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.colorpicker.ColorPickerApplication</param-value>
-    </init-param>
-    <init-param>
-      <param-name>widgetset</param-name>
-      <param-value>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
-    </init-param>
-  </servlet>
- 
-   <servlet>
-    <servlet-name>CachingDemo</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.CachingDemo</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>NotificationDemo</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.NotificationDemo</param-value>
-    </init-param>
-  </servlet>
-  
-   <servlet>
-    <servlet-name>CalendarDemo</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.demo.reservation.CalendarDemo</param-value>
-    </init-param>
-    <init-param>
-      <param-name>widgetset</param-name>
-      <param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
-    </init-param>
-  </servlet>
-  
-   <!-- Section begins: Automated tests used by Testing Tools plug-in client -->
-   <servlet>
-    <servlet-name>TestSimplestApplication</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.automatedtests.SimplestApplication</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>TestRobustnessComplex</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.automatedtests.robustness.RobustnessComplex</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>TestFeatureBrowser</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.automatedtests.featurebrowser.FeatureBrowser</param-value>
-    </init-param>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>StatusServlet</servlet-name>
-    <servlet-class>com.itmill.toolkit.automatedtests.util.StatusServlet</servlet-class>
-  </servlet>
-  <!-- Section ends: Automated tests used by Testing Tools plug-in client -->
-
-  <servlet-mapping>
-    <servlet-name>PortletDemo</servlet-name>
-    <url-pattern>/PortletDemo/*</url-pattern>
-    <!-- portlet -->
-  </servlet-mapping> 
-
-  <servlet-mapping>
-    <servlet-name>ITMillToolkitApplicationRunner</servlet-name>
-    <url-pattern>/run/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>FeatureBrowser</servlet-name>
-    <url-pattern>/FeatureBrowser/*</url-pattern>
-  </servlet-mapping>
-  
-    <servlet-mapping>
-    <servlet-name>BrowserDemo</servlet-name>
-    <url-pattern>/BrowserDemo/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>CalendarDemo</servlet-name>
-    <url-pattern>/CalendarDemo/*</url-pattern>
-  </servlet-mapping>
-  
-  
-  <servlet-mapping>
-    <servlet-name>WindowedDemos</servlet-name>
-    <url-pattern>/WindowedDemos/*</url-pattern>
-  </servlet-mapping>
-
+	<display-name>IT Mill Toolkit</display-name>
+	<description> IT Mill Toolkit examples </description>
+	<!--
+		Turn off productionMode (off by default). Setting productionMode=true
+		disables debug features. In when this is off, you can show debug
+		window by adding ?debug to your application URL. Always set this true
+		in production environment.
+	-->
+	<context-param>
+		<param-name>productionMode</param-name>
+		<param-value>false</param-value>
+		<description>IT Mill Toolkit production mode</description>
+	</context-param>
+	<!--
+		Permit use of IT Mill Testing Tools for this servlet continer. Do not
+		use this in production environment.
+	-->
+	<context-param>
+		<param-name>testingToolsActive</param-name>
+		<param-value>true</param-value>
+		<description>IT Mill Testing Tools activation</description>
+	</context-param>
+	<!--
+		Specify the IT Mill Testing Tools server URI. Do not use this in
+		production environment.
+	-->
+	<context-param>
+		<param-name>testingToolsServerUri</param-name>
+		<param-value>http://192.168.1.242:8099/TestingToolsServer</param-value>
+		<description>IT Mill Testing Tools URI</description>
+	</context-param>
+	<!--
+		Enable possibility to run any Java class as application from this
+		servlet. For example, if this servlet is mapped to /run, your foo.App
+		class can be run in /run/foo.App/. Do not deploy this servlet in
+		production environment.
+	-->
+	<servlet>
+		<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>applicationRunner</param-name>
+			<param-value>true</param-value>
+		</init-param>
+	</servlet>
+	<!--  Feature Browser demo application -->
+	<servlet>
+		<servlet-name>FeatureBrowser</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.featurebrowser.FeatureBrowser</param-value>
+		</init-param>
+	</servlet>
+	<!--  Reservr demo application -->
+	<servlet>
+		<servlet-name>Reservr</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.reservation.ReservationApplication</param-value>
+		</init-param>
+		<init-param>
+			<param-name>widgetset</param-name>
+			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+		</init-param>
+	</servlet>
+	<!-- Version of the Reservr to be run  as a portlet -->
+	<servlet>
+		<servlet-name>SimpleReserver</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.reservation.simple.SimpleReserver</param-value>
+		</init-param>
+		<init-param>
+			<param-name>widgetset</param-name>
+			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+		</init-param>
+	</servlet>
+	<!--  Buffered components demo app (shown in Windowed demos) -->
+	<servlet>
+		<servlet-name>BufferedComponents</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.BufferedComponents</param-value>
+		</init-param>
+	</servlet>
+	<!-- Table demo application (shown in Windowed demos) -->
+	<servlet>
+		<servlet-name>TableDemo</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.TableDemo</param-value>
+		</init-param>
+	</servlet>
+	<!-- Calendar demo application (shown in Windowed demos) -->
+	<servlet>
+		<servlet-name>CalendarDemo</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.reservation.CalendarDemo</param-value>
+		</init-param>
+		<init-param>
+			<param-name>widgetset</param-name>
+			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+		</init-param>
+	</servlet>
+	<!-- Filtering select demo -->
+	<servlet>
+		<servlet-name>FilterSelect</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.FilterSelect</param-value>
+		</init-param>
+	</servlet>
+	<!-- Hello world demo application -->
+	<servlet>
+		<servlet-name>HelloWorld</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.HelloWorld</param-value>
+		</init-param>
+	</servlet>
+	<!-- Calculator demo application -->
+	<servlet>
+		<servlet-name>Calc</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.Calc</param-value>
+		</init-param>
+	</servlet>
+	<!--  Keyboard shortcuts demo application -->
+	<servlet>
+		<servlet-name>KeyboardShortcut</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.KeyboardShortcut</param-value>
+		</init-param>
+	</servlet>
+	<!--
+		Color Picker demo application that demonstrates creation of custom
+		widgets
+	-->
+	<servlet>
+		<servlet-name>ColorPickerApplication</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.colorpicker.ColorPickerApplication</param-value>
+		</init-param>
+		<init-param>
+			<param-name>widgetset</param-name>
+			<param-value>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
+		</init-param>
+	</servlet>
+	<!-- Caching demo application that demonstrates paint optimization -->
+	<servlet>
+		<servlet-name>CachingDemo</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.CachingDemo</param-value>
+		</init-param>
+	</servlet>
+	<!-- Notification demo application -->
+	<servlet>
+		<servlet-name>NotificationDemo</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.NotificationDemo</param-value>
+		</init-param>
+	</servlet>
+ 	<!-- Select demo application (shown in Windowed demos) -->
+	<servlet>
+		<servlet-name>SelectDemo</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.SelectDemo</param-value>
+		</init-param>
+	</servlet>
+	<!-- Browser demo application -->
+	<servlet>
+		<servlet-name>BrowserDemo</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.BrowserDemo</param-value>
+		</init-param>
+	</servlet>
+	<!-- Windowed demos application -->
+	<servlet>
+		<servlet-name>WindowedDemos</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.WindowedDemos</param-value>
+		</init-param>
+	</servlet>
+	<!-- Portlet demo application -->
+	<servlet>
+		<servlet-name>PortletDemo</servlet-name>
+		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<init-param>
+			<param-name>application</param-name>
+			<param-value>com.itmill.toolkit.demo.PortletDemo</param-value>
+		</init-param>
+	</servlet>
+	<!-- Servlet Mappings below - see servlets for comments -->
 	<servlet-mapping>
-    <servlet-name>TestBench</servlet-name>
-    <url-pattern>/TestBench/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>NativeWindowing</servlet-name>
-    <url-pattern>/NativeWindowing/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>Reservr</servlet-name>
-    <url-pattern>/Reservr/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>SimpleReserver</servlet-name>
-    <url-pattern>/SimpleReserver/*</url-pattern>
-    <!-- portlet style=height:400px -->
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>SelectDemo</servlet-name>
-    <url-pattern>/SelectDemo/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>BufferedComponents</servlet-name>
-    <url-pattern>/BufferedComponents/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>TableDemo</servlet-name>
-    <url-pattern>/TableDemo/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>FilterSelect</servlet-name>
-    <url-pattern>/FilterSelect/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>Parameters</servlet-name>
-    <url-pattern>/Parameters/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>UpgradingSample</servlet-name>
-    <url-pattern>/UpgradingSample/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>QueryContainerDemo</servlet-name>
-    <url-pattern>/QueryContainerDemo/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>TreeFilesystemContainer</servlet-name>
-    <url-pattern>/TreeFilesystemContainer/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>TreeFilesystem</servlet-name>
-    <url-pattern>/TreeFilesystem/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>HelloWorld</servlet-name>
-    <url-pattern>/HelloWorld/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>Calc</servlet-name>
-    <url-pattern>/Calc/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>KeyboardShortcut</servlet-name>
-    <url-pattern>/KeyboardShortcut/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>ColorPickerApplication</servlet-name>
-    <url-pattern>/colorpicker/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>CachingDemo</servlet-name>
-    <url-pattern>/CachingDemo/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>NotificationDemo</servlet-name>
-    <url-pattern>/NotificationDemo/*</url-pattern>
-  </servlet-mapping>
-  
-  <!-- Section begins: Automated tests used by Testing Tools plug-in client -->
-    <servlet-mapping>
-    <servlet-name>TestSimplestApplication</servlet-name>
-    <url-pattern>/TestSimplestApplication/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>TestRobustnessComplex</servlet-name>
-    <url-pattern>/TestRobustnessComplex/*</url-pattern>
-  </servlet-mapping>
-  
-   <servlet-mapping>
-    <servlet-name>TestFeatureBrowser</servlet-name>
-    <url-pattern>/TestFeatureBrowser/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>StatusServlet</servlet-name>
-    <url-pattern>/StatusServlet/*</url-pattern>
-  </servlet-mapping>
-  <!-- Section ends: Automated tests used by Testing Tools plug-in client -->
-
-  <session-config>
-    <session-timeout>20</session-timeout>
-  </session-config>
-  
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-  </welcome-file-list>
-
-</web-app>
+		<servlet-name>PortletDemo</servlet-name>
+		<url-pattern>/PortletDemo/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->
+    	<!-- portlet -->
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
+		<url-pattern>/run/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>Reservr</servlet-name>
+		<url-pattern>/Reservr/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>SimpleReserver</servlet-name>
+		<url-pattern>/SimpleReserver/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->		
+    	<!-- portlet style=height:400px -->
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>CalendarDemo</servlet-name>
+		<url-pattern>/CalendarDemo/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>SelectDemo</servlet-name>
+		<url-pattern>/SelectDemo/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->		
+	    <!-- portlet -->
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>BufferedComponents</servlet-name>
+		<url-pattern>/BufferedComponents/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>TableDemo</servlet-name>
+		<url-pattern>/TableDemo/*</url-pattern>
+    	<!-- Hint for the automatic deployment descriptor generator -->		
+    	<!-- portlet -->
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>FilterSelect</servlet-name>
+		<url-pattern>/FilterSelect/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->		
+	    <!-- portlet -->
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>FeatureBrowser</servlet-name>
+		<url-pattern>/FeatureBrowser/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->		
+	    <!-- portlet style=height:650px -->
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>HelloWorld</servlet-name>
+		<url-pattern>/HelloWorld/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>Calc</servlet-name>
+		<url-pattern>/Calc/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->		
+	    <!-- portlet -->
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>KeyboardShortcut</servlet-name>
+		<url-pattern>/KeyboardShortcut/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>ColorPickerApplication</servlet-name>
+		<url-pattern>/colorpicker/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>CachingDemo</servlet-name>
+		<url-pattern>/CachingDemo/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>NotificationDemo</servlet-name>
+		<url-pattern>/NotificationDemo/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->		
+	    <!-- portlet -->
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>BrowserDemo</servlet-name>
+		<url-pattern>/BrowserDemo/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->		
+	    <!-- portlet style=height:650px -->
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>WindowedDemos</servlet-name>
+		<url-pattern>/WindowedDemos/*</url-pattern>
+	</servlet-mapping>
+	<welcome-file-list>
+		<welcome-file>index.jsp</welcome-file>
+		<welcome-file>index.html</welcome-file>
+		<welcome-file>index.htm</welcome-file>
+	</welcome-file-list>
+</web-app>
\ No newline at end of file
-- 
2.39.5