From: Jani Laakso <jani.laakso@itmill.com>
Date: Fri, 30 Nov 2007 13:05:31 +0000 (+0000)
Subject: changes according new startup (index.html inside WebContent).
X-Git-Tag: 6.7.0.beta1~5363
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c3dd44a9ecdb880b574872573a7144dbc349e988;p=vaadin-framework.git

changes according new startup (index.html inside WebContent).

svn changeset:3071/svn branch:trunk
---

diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
new file mode 100644
index 0000000000..5f6950c7ae
--- /dev/null
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!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>
+  
+  <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>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>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>
+  
+  <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>
+
+	<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>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>
+
+
+  <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>
diff --git a/build/package/web.xml b/build/package/web.xml
deleted file mode 100644
index 5f6950c7ae..0000000000
--- a/build/package/web.xml
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!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>
-  
-  <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>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>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>
-  
-  <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>
-
-	<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>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>
-
-
-  <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>
diff --git a/build/package/webcontent-index.html b/build/package/webcontent-index.html
deleted file mode 100644
index fbaf21d9e5..0000000000
--- a/build/package/webcontent-index.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<title>IT Mill Toolkit <version></version> Demo</title>
-<link rel="stylesheet" type="text/css" href="styles/demos.css" />
-</head>
-<body>
-<div id="container">
-
-<div id="itmilllogo"><h1>IT Mill Toolkit <version></version></h1></div>
-
-<div id="toolkit"></div>
-
-<div class="feature-browser">
-	<div class="option">
-	<p>
-	IT Mill Toolkit version <version></version>.
-	</p>
-	</div>
-</div>
-  
-  <div class="feature-browser">
-	<h3><a href="FeatureBrowser/">Feature Browser</a></h3>
-	<div class="option">
-	<p>
-	 Feature Browser
-	</p>
-	</div>
-	Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/featurebrowser/">browse source</a></span>
-  </div>
-  
-<div class="feature-browser">
-	<h3><a href="WindowedDemos">Windowed Demos</a></h3>
-	<div class="option">
-	<p>
-	 Windowed application which contains multiple Toolkit applications
-	</p>
-	</div>
-	Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/WindowedDemos.java.html">WindowedDemos.java</a></span>
-  </div>
-  
-  <div class="feature-browser">
-	<h3><a href="TestBench/">Testbench</a></h3>
-	<div class="option">
-	<p>
-	 Testbench contains multiple Toolkit components. All demos are custom components controlled by Testbench application.
-	</p>
-	</div>
-	Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/testbench/">browse source</a></span>
-  </div>
-  
-   <div class="feature-browser">
-	<h3><a href="NativeWindowing/">NativeWindowing</a></h3>
-	<div class="option">
-	<p>
-	 Demonstrates how to handle native windows.
-	</p>
-	</div>
-	Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/NativeWindowing.java.html">browse source</a></span>
-  </div>
-  
-   <div class="feature-browser">
-	<h4><a href="colorpicker/">Colorpicker widget</a></h4>
-	<div class="option">
-	 <span class="link"><a href="colorpicker/">Colorpicker widget</a></span>
-	 <span class="desc">Demonstrates how to make new widgets by pure Java with Toolkit.
-	 See also documentation which is located <a href="/doc/manual/ch08s02.html">here</a>.</span>
-	</div>
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/colorpicker">browse source</a></span>
-  </div>
-  
-  <div class="feature-browser">
-	<h4><a href="reservr.html">Reservr</a></h4>
-	<div class="option">
-	 <span class="link"><a href="reservr.html">Reservr</a></span>
-	 <span class="desc">Larger example application, contains complex client-side widgets. <b>Note:</b>You have to run it under localhost domain to enable Google Maps.</span>
-	</div>
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/reservation">browse source</a></span>
-  </div>
-  
-    <div class="feature-browser">
-	<h3><a href="NotificationDemo/">Notification Demo</a></h3>
-	<div class="option">
-	<p>
-	 Smaller application which demonstrates Rich Text Area widget and Window notification functionality.
-	</p>
-	</div>
-	Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/NotificationDemo.java.html">NotificationDemo.java</a></span>
-  </div>
-  
-  <div class="sample-code">
-	<h3><a href="CachingDemo/">Client-side caching demo</a></h3>
-	<div class="option">
-	 <span class="link"><a href="CachingDemo/">CachingDemo</a></span>
-	 <span class="desc">
-	 Simple demo of Toolkit cache feature. An Tabsheet contains two tabs where second tab contains heavy server-side content processing. 
-	 For the first time you load tab2 it takes long time. Following request are lightning fast because 
-	 Toolkit server instruct client-side to use already cached version (components within tab2 have not changed). </span>
-	</div>
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/CachingDemo.java.html">CachingDemo.java</a></span> 
-  </div>
-  
-  <div class="sample-code">
-	<h3><a href="UpgradingSample/">Long lifecycle of Toolkit applications</a></h3>
-	<div class="option">
-	<p>
-	Demonstrates sample <a href="http://www.millstone.org/">Millstone</a> application that was ajaxified (upgraded to Toolkit 4.0.0)
-	simply by changing three import namespaces and adding Toolkit libraries to classpath.
-	Initial IT Mill Toolkit framework has existed since 2001 (see <a href="http://www.millstone.org/">Millstone</a>) and is
-	ready for production use today.
-	</p>
-	<b>Note:</b> This sample application was created on year 2002.
-	</div>	
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/UpgradingSample.java.html">UpgradingSample.java</a></span>
-  </div>
-  
- 
-  <div class="feature-browser">
-	<h3><a href="QueryContainerDemo/">Tree using QueryContainer demo</a></h3>
-	<div class="option">
-	<p>
-	 This example shows how Table, Select and Tree UI components can use Containers. 
-	 QueryContainer is used to bind SQL table rows into Toolkit UI components. 
-	 Table has few example actions added. Also embedding XHTML through Label components is used. 
-	</p>
-	<p>
-	 Demonstrates how to create <em>com.itmill.toolkit.data.Container</em> and set it as 
-	 data source to UI components <em>com.itmill.toolkit.ui.Component.Tree</em>, how to 
-	 receive ExpandEvent and implement <em>com.itmill.toolkit.ui.Tree.ExpandListener</em>, 
-	 how to use <em>com.itmill.toolkit.event.Action</em>.
-    </p>
-	</div>
-	Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/QueryContainerDemo.java.html">QueryContainerDemo.java</a></span>
-  </div>
-  
-   <div class="feature-browser">
-	<h3><a href="TableDemo/">Table demo</a></h3>
-	<div class="option">
-	 <p>
-	 Similar to <em>Tree using QueryContainer demo</em> but uses different style
-	 for handling events with Table component.
-	 </p>
-	 <p>
-	 Demonstrates another possibility how event framework may be used,
-	 in this example specific methods are registered for button click events.
-	 </p>
-	</div>
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/TableDemo.java.html">TableDemo.java</a></span>
-  </div>
-  
-  <div class="feature-browser">
-	<h3><a href="TreeFilesystemContainer/">Tree using FilesystemContainer demo</a></h3>
-	<div class="option">
-	 <p>
-	 Browsable file explorer using Toolkit Tree component.
-	 </p>
-	 Demonstrates how to
-  	 use <em>com.itmill.toolkit.ui.Component.Tree</em> data source container,
-	 how to create <em>com.itmill.toolkit.data.util.FilesystemContainer</em>,
-	 how to read <em>com.itmill.toolkit.ui.Component.Event</em> objects, how
-	 to receive and handle any event by implementing
-	 <em>com.itmill.toolkit.ui.Component.Listener</em>.
-	</div>
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/TreeFilesystemContainer.java.html">TreeFilesystemContainer.java</a></span>
-  </div>
-  
-  <div class="feature-browser">
-	<h3><a href="TreeFilesystem/">Tree item handling demo</a></h3>
-	<div class="option">
-	 <p>
-	 Browsable file explorer using Toolkit Tree component.
-	 </p>
-	 Demonstrates: how
- 	 to add items hierarchially into
-	 <em>com.itmill.toolkit.ui.Component.Tree</em>, how to receive
-	 ExpandEvent and implement
-	 <em>com.itmill.toolkit.ui.Tree.ExpandListener</em>.
-	</div>	
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/TreeFilesystem.java.html">TreeFilesystem.java</a></span>
-  </div>
-  
-  <div class="feature-browser">
-	<h3><a href="SelectDemo/">Select demo</a></h3>
-	<div class="option">
-	<p>
-	 This example shows select component with default and lazy loading functionality enabled (a.k.a Google Suggest).
-	 Click to first select component and type few letters using your keyboard to see it in action.
-	 Second select component has default functionality. 
-	</p>
-	</div>
-	Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/SelectDemo.java.html">SelectDemo.java</a></span>
-  </div>
-  
-  <div class="feature-browser">
-	<h3><a href="FilterSelect/">FilterSelect demo</a></h3>
-	<div class="option">
-	<p>
-	 This example shows three select components with lazy loading functionality enabled.
-	 First select works like Google Suggest, second uses "Contains" filter and third uses custom "Ends with" filter.
-	 Click to select components and type few letters using your keyboard to see it in action.
-	</p>
-	</div>
-	Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/FilterSelect.java.html">FilterSelect.java</a></span>
-  </div>
-
-  <div class="feature-browser">
-	<h3><a href="KeyboardShortcut/">Keyboard events demo</a></h3>
-	<div class="option">
-	 Contains few Toolkit UI components that can be interacted by pressing keys in keyboard.
-	 <b>Note</b>: This feature is under development and is considered as beta.
-	</div>
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/KeyboardShortcut.java.html">KeyboardShortcut.java</a></span>
-  </div>
-  
-  <div class="feature-browser">
-	<h3><a href="Parameters/">URI and Parameter handling demo</a></h3>
-	<div class="option">
-	 This is a demonstration of how URL parameters can be received and handled.
-	 Parameters and URL:s can be received trough the windows by registering
-	 URIHandler and ParameterHandler classes window.
-	</div>
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/Parameters.java.html">Parameters.java</a></span>
-  </div>
-
-  <div class="feature-browser">
-	<h3><a href="BufferedComponents/">Buffered UI components demo</a></h3>
-	<div class="option">
-	 Explains how to use buffering with UI components, and how to perform commit and discard functions.
-	 With buffered UI components underlying data objects and UI objects have separate states.
-	</div>
-	<br />Source code:
-	<span class="link"><a href="doc/demo-source/com/itmill/toolkit/demo/BufferedComponents.java.html">BufferedComponents.java</a></span>
-  </div>
-  
-
-</div><!-- // Container -->
-
-</body></html>
\ No newline at end of file