Added "IT Mill Toolkit Hosted Mode" "IT Mill Toolkit Web Mode" launchers integrated...

Enhanced build.xml in multiple ways.

svn changeset:2897/svn branch:trunk

diff --git a/build/build.xml b/build/build.xml
index 48d941b7adc68f00056cd787d996b8163ba6f3e3..d13d055c5693324e332c4b7457a90b7aa5115137 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -44,6 +44,27 @@
     </target>
 
 
+    <!-- internal tests for packaging -->
+
+    <target name="test-build" depends="clean-all, init, build" description="used for testing build.xml">
+    </target>
+
+    <target name="test-package" depends="init" description="used for testing build.xml">
+        <echo>Creating package for Mac platform.</echo>
+        <var name="package-platform" value="mac" />
+        <var name="eclipse-launch-vmargs" value="-XstartOnFirstThread -Xms256M -Xmx512M" />
+        <antcall target="add-platform-specific-files" inheritAll="true" inheritRefs="true" />
+        <exec executable="ln" failonerror="false">
+            <arg line="-s" />
+            <arg line="${basedir}/${output-dir}" />
+            <arg line="/tk/eclipse-test" />
+        </exec>
+        <exec executable="ln" failonerror="false">
+            <arg line="-s" />
+            <arg line="${basedir}/build/gwt/gwt" />
+            <arg line="${basedir}/${output-dir}/gwt" />
+        </exec>
+    </target>
 
     <!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - -->
     <target name="init">
@@ -80,14 +101,11 @@
         <property name="product-name" value="IT Mill Toolkit" />
         <property name="toolkit-package" value="com/itmill/toolkit" />
         <property name="eclipse-workspace-name" value="itmill-toolkit-examples" />
-
+        <property name="eclipse-launch-vmargs" value="-Xms256M -Xmx512M" />
         <property file="build/html-style.properties" />
 
         <!-- Destination files -->
         <property name="lib-jar-name" value="${product-file}-${version}.jar" />
-        <!-- <property name="lib-dev-jar-name" value="${product-file}-dev-${version}.jar" />
-               <property name="demo-lib-jar-name" value="${product-file}-demo-${version}.jar" />
-               <property name="lib-src-jar-name" value="${product-file}-src-${version}.jar" /> -->
         <property name="demo-war-name" value="${product-file}-demo-${version}.war" />
 
         <echo message="Prepared to build ${product-file} version ${version} packages" />
@@ -103,6 +121,8 @@
         <mkdir dir="${output-dir}/WebContent" />
         <mkdir dir="${output-dir}/WebContent/WEB-INF" />
         <mkdir dir="${output-dir}/WebContent/WEB-INF/classes" />
+        <mkdir dir="${output-dir}/WebContent/doc" />
+        <mkdir dir="${output-dir}/WebContent/doc/demo-source" />
 
         <!-- Construct classpath used by java and javadoc compilation -->
         <path id="compile.classpath">
@@ -159,6 +179,7 @@
     <target name="internal-package-mac">
         <echo>Creating package for Mac platform.</echo>
         <var name="package-platform" value="mac" />
+        <var name="eclipse-launch-vmargs" value="-XstartOnFirstThread -Xms256M -Xmx512M" />
         <antcall target="add-platform-specific-files" inheritAll="true" inheritRefs="true" />
         <tar destfile="build/result/${product-file}-${package-platform}-${version}.tar.gz" compression="gzip" longfile="gnu">
             <tarfileset prefix="${product-file}-${package-platform}-${version}" dir="build/result/${product-file}-${version}">
@@ -255,22 +276,31 @@
         <copy todir="${output-dir}">
             <filterchain>
                 <expandproperties />
+                <!-- .classpath, *.launch, build-widgetsets.xml -->
                 <replacetokens begintoken="&lt;" endtoken=">">
                     <token key="version" value="${version}" />
                     <token key="/version" value="" />
                 </replacetokens>
+                <!-- .classpath -->
                 <replacetokens begintoken="&lt;" endtoken=">">
                     <token key="platform-specific-entries" value="&lt;classpathentry kind=&quot;lib&quot; path=&quot;gwt/gwt-dev-${package-platform}.jar&quot; /&gt;" />
                     <token key="/platform-specific-entries" value="" />
                 </replacetokens>
+                <!-- .classpath, HostedMode.launch, build-widgetsets.xml -->
                 <replacetokens begintoken="&lt;" endtoken=">">
                     <token key="platform" value="${package-platform}" />
                     <token key="/platform" value="" />
                 </replacetokens>
+                <!-- .project, *.launch -->
                 <replacetokens begintoken="&lt;" endtoken=">">
                     <token key="eclipse-workspace-name" value="${eclipse-workspace-name}" />
                     <token key="/eclipse-workspace-name" value="" />
                 </replacetokens>
+                <!-- HostedMode.launch -->
+                <replacetokens begintoken="&lt;" endtoken=">">
+                    <token key="eclipse-launch-vmargs" value="${eclipse-launch-vmargs}" />
+                    <token key="/eclipse-launch-vmargs" value="" />
+                </replacetokens>
             </filterchain>
             <fileset dir="build/package">
                 <include name=".classpath" />
@@ -673,6 +703,7 @@
   Documentation: Add manual
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
     <target name="dbdoclet" depends="preprocess-src">
+        <echo>Manual: DocBookDoclet</echo>
         <javadoc access="public" charset="UTF-8" docencoding="UTF-8" encoding="ISO-8859-15" failonerror="yes" classpath="build/lib/servlet-api.jar" maxmemory="512m" source="1.5">
             <packageset dir="build/result/src">
                 <include name="${toolkit-package}/**" />
@@ -726,6 +757,7 @@
     </target>
 
     <target name="manual-html">
+        <echo>Manual: HTML</echo>
         <delete file="build/docbook/conf/temp.xsl" />
         <copy file="build/docbook/conf/custom-html-docbook.xsl" tofile="build/docbook/conf/temp.xsl">
             <filterchain>
@@ -764,12 +796,12 @@
 
     <!-- Clean results - - - - - - - - - - - - - - - - - - - - - - - - - -->
     <target name="clean-all" depends="">
-        <delete includeemptydirs="true" defaultexcludes="false">
+        <delete includeemptydirs="true" defaultexcludes="false" followsymlinks="false">
             <fileset dir="build/result" includes="**/*" />
         </delete>
     </target>
 
-    <!-- ant contrib required for flow control (for loop) -->
+    <!-- ant contrib required for flow control (for loop, if, property override) -->
     <taskdef resource="net/sf/antcontrib/antlib.xml">
         <classpath>
             <pathelement location="build/lib/ant-contrib-1.0b3.jar" />

diff --git a/build/package/.classpath b/build/package/.classpath
index 5640b355fc87a776cbcbd64176339372231dd8c2..4c1bd5523bc212b386858948f0e9765430073b5f 100644 (file)
--- a/build/package/.classpath
+++ b/build/package/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="src" path="WebContent/WEB-INF/src"/>
-       <classpathentry kind="lib" path="WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar" sourcepath="WebContent/WEB-INF/lib/itmill-toolkit-src-<version></version>.jar"/>
+       <classpathentry kind="lib" path="WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar" sourcepath="WebContent/WEB-INF/lib/itmill-toolkit-<version></version>.jar"/>
        <classpathentry kind="lib" path="gwt/gwt-servlet.jar" />
        <classpathentry kind="lib" path="gwt/gwt-user.jar" />
        <classpathentry kind="lib" path="lib/demo/reservr/googlemaps_gwt.jar" />

diff --git a/build/package/IT Mill Toolkit Hosted Mode.launch b/build/package/IT Mill Toolkit Hosted Mode.launch
new file mode 100644 (file)
index 0000000..f638fa8
--- /dev/null
+++ b/build/package/IT Mill Toolkit Hosted Mode.launch
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<stringAttribute key="bad_container_name" value="/<eclipse-workspace-name></eclipse-workspace-name>/IT_Mill_Toolkit_Hosted_Mode.launch"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-<platform></platform>.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/<eclipse-workspace-name></eclipse-workspace-name>/WebContent/WEB-INF/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.0.1  ^http[:][/][/]127[.]0[.]0[.]1[:]8888&quot; -out WebContent/ITMILL/widgetsets http://127.0.0.1:8888/"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="<eclipse-launch-vmargs></eclipse-launch-vmargs>"/>
+</launchConfiguration>

diff --git a/build/package/IT Mill Toolkit Web Mode.launch b/build/package/IT Mill Toolkit Web Mode.launch
new file mode 100644 (file)
index 0000000..2c60ed4
--- /dev/null
+++ b/build/package/IT Mill Toolkit Web Mode.launch
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/src/com/itmill/toolkit/launcher/ITMillWebModeLaunch.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.itmill.toolkit.launcher.ITMillToolkitWebMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
+</launchConfiguration>

diff --git a/build/package/Toolkit Hosted Mode.launch b/build/package/Toolkit Hosted Mode.launch
deleted file mode 100644 (file)
index 3dc7390..0000000
--- a/build/package/Toolkit Hosted Mode.launch
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-<platform></platform>.jar"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;sourceLookupDirector&gt;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;javaProject name=&amp;quot;<eclipse-workspace-name></eclipse-workspace-name>&amp;quot;/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#10;&amp;lt;default/&amp;gt;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#10;&lt;/sourceContainers&gt;&#10;&lt;/sourceLookupDirector&gt;&#10;"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;GwtClient&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-<platform></platform>.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/<eclipse-workspace-name></eclipse-workspace-name>/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.0.1  ^http[:][/][/]127[.]0[.]0[.]1[:]8080&quot; -out WebContents/gwt http://localhost:8080/<eclipse-workspace-name></eclipse-workspace-name>/"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XstartOnFirstThread -Xms256M -Xmx512M"/>
-</launchConfiguration>

diff --git a/build/package/Toolkit Web Mode.launch b/build/package/Toolkit Web Mode.launch
deleted file mode 100644 (file)
index f8139ee..0000000
--- a/build/package/Toolkit Web Mode.launch
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/src/com/itmill/toolkit/launcher/ITMillWebModeLaunch.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.itmill.toolkit.launcher.ITMillWebModeLaunch"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
-</launchConfiguration>

diff --git a/build/package/build-widgetsets.xml b/build/package/build-widgetsets.xml
index 9d04ce6e6486397bbe2fd3b16c64518f882d715d..46e4fd25c72d4db449d3bd0f249e0006a60efef2 100644 (file)
--- a/build/package/build-widgetsets.xml
+++ b/build/package/build-widgetsets.xml
@@ -6,6 +6,8 @@ Client-side code is compiled by using GWTCompiler which compiles client-side Jav
 JavaScript. Generated files are located under WebContent/ITMILL/widgetsets/*.
 
 Client-side compilation is required if you create new or modify existing widgets.
+You may use either this script or IT Mill Toolkit Hosted Mode.launch (in Eclipse)
+to compile your client-side java code. 
 
 By default IT Mill Toolkit first tries to serve widgetset resources from the file system, if that
 fails then files are streamed from itmill-toolkit-<version>.jar. 

diff --git a/build/package/start-demo.bat b/build/package/start-demo.bat
index b4f879f91b2c6cd44014899ceb526a43b1861107..8ac629e9c551fe3be309c6f184fdf3b5f33c55f8 100644 (file)
--- a/build/package/start-demo.bat
+++ b/build/package/start-demo.bat
@@ -1 +1 @@
-@java -cp "lib\jetty\jetty-6.1.5.jar;lib\jetty\jetty-util-6.1.5.jar;lib\jetty\servlet-api-2.5-6.1.5.jar;WebContent\WEB-INF\classes" com.itmill.toolkit.launcher.ITMillDesktopLaunch\r
+@java -cp "lib\jetty\jetty-6.1.5.jar;lib\jetty\jetty-util-6.1.5.jar;lib\jetty\servlet-api-2.5-6.1.5.jar;WebContent\WEB-INF\classes" com.itmill.toolkit.launcher.ITMillToolkitDesktopMode\r

diff --git a/build/package/start-demo.sh b/build/package/start-demo.sh
index 3a7b612f15c2be05cc9fe289c2898370da45650e..1576528db74ee9b2b6cadb3ba3cbe2e2bdf00046 100644 (file)
--- a/build/package/start-demo.sh
+++ b/build/package/start-demo.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-java -cp lib/jetty/jetty-6.1.5.jar:lib/jetty/jetty-util-6.1.5.jar:lib/jetty/servlet-api-2.5-6.1.5.jar:WebContent/WEB-INF/classes com.itmill.toolkit.launcher.ITMillDesktopLaunch
+java -cp lib/jetty/jetty-6.1.5.jar:lib/jetty/jetty-util-6.1.5.jar:lib/jetty/servlet-api-2.5-6.1.5.jar:WebContent/WEB-INF/classes com.itmill.toolkit.launcher.ITMillToolkitDesktopMode

diff --git a/build/package/web.xml b/build/package/web.xml
new file mode 100644 (file)
index 0000000..b6ec1b7
--- /dev/null
+++ b/build/package/web.xml
@@ -0,0 +1,330 @@
+<?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>TestComponentsAndLayouts</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.tests.TestComponentsAndLayouts</param-value>
+    </init-param>
+  </servlet>
+  
+ <servlet>
+    <servlet-name>TestForNativeWindowing</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.tests.TestForNativeWindowing</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>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>FeaturesApplication</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.tests.featurebrowser.FeaturesApplication</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-mapping>
+    <servlet-name>TestSplitPanel</servlet-name>
+    <url-pattern>/TestSplitPanel/*</url-pattern>
+  </servlet-mapping>
+  
+     <servlet-mapping>
+    <servlet-name>RandomLayoutStress</servlet-name>
+    <url-pattern>/RandomLayoutStress/*</url-pattern>
+  </servlet-mapping>
+  
+   <servlet-mapping>
+    <servlet-name>TestBench</servlet-name>
+    <url-pattern>/TestBench/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>Reservr</servlet-name>
+    <url-pattern>/Reservr/*</url-pattern>
+  </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>
+  </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>FeaturesApplication</servlet-name>
+    <url-pattern>/FeaturesApplication/*</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>