Fixed #719

svn changeset:1497/svn branch:trunk

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 2d860167fc5c34bb8425a2f4862f466d3ee47d12..adad2341584d29a42fb5b63db4b63c92f99dd56f 100644 (file)
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,238 +1,265 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-       <display-name>IT Mill Toolkit</display-name>
-
-       <servlet>
-        <servlet-name>SelectDemo</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.SelectDemo</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>SelectDemo</servlet-name>
-        <url-pattern>/SelectDemo/*</url-pattern>
-    </servlet-mapping>
-    
-       <servlet>
-        <servlet-name>BufferedComponents</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.BufferedComponents</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>BufferedComponents</servlet-name>
-        <url-pattern>/BufferedComponents/*</url-pattern>
-    </servlet-mapping>
-    
-       <servlet>
-        <servlet-name>CustomLayoutDemo</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.CustomLayoutDemo</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>CustomLayoutDemo</servlet-name>
-        <url-pattern>/CustomLayoutDemo/*</url-pattern>
-    </servlet-mapping>
-    
-       <servlet>
-        <servlet-name>LayoutDemo</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.LayoutDemo</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>LayoutDemo</servlet-name>
-        <url-pattern>/LayoutDemo/*</url-pattern>
-    </servlet-mapping>
-    
-    <servlet>
-        <servlet-name>FilterSelect</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.FilterSelect</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>FilterSelect</servlet-name>
-        <url-pattern>/FilterSelect/*</url-pattern>
-    </servlet-mapping>
-    
-    <servlet>
-        <servlet-name>features</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.features.FeaturesApplication</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>features</servlet-name>
-        <url-pattern>/features/*</url-pattern>
-    </servlet-mapping>
-
-       <servlet>
-        <servlet-name>Parameters</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.Parameters</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Parameters</servlet-name>
-        <url-pattern>/Parameters/*</url-pattern>
-    </servlet-mapping>
-    
-       <servlet>
-        <servlet-name>UpgradingSample</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.UpgradingSample</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>UpgradingSample</servlet-name>
-        <url-pattern>/UpgradingSample/*</url-pattern>
-    </servlet-mapping>
-    
-    <servlet>
-        <servlet-name>QueryContainerDemo</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.QueryContainerDemo</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>QueryContainerDemo</servlet-name>
-        <url-pattern>/QueryContainerDemo/*</url-pattern>
-    </servlet-mapping>
-    
-     <servlet>
-        <servlet-name>TableDemo</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.TableDemo</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>TableDemo</servlet-name>
-        <url-pattern>/TableDemo/*</url-pattern>
-    </servlet-mapping>
-    
-    <servlet>
-        <servlet-name>TreeFilesystemContainer</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.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-mapping>
-        <servlet-name>TreeFilesystemContainer</servlet-name>
-        <url-pattern>/TreeFilesystemContainer/*</url-pattern>
-    </servlet-mapping>
-    
-    <servlet>
-        <servlet-name>TreeFilesystem</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.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-mapping>
-        <servlet-name>TreeFilesystem</servlet-name>
-        <url-pattern>/TreeFilesystem/*</url-pattern>
-    </servlet-mapping>
-    
-     <servlet>
-        <servlet-name>ModalWindow</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.ModalWindow</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>ModalWindow</servlet-name>
-        <url-pattern>/ModalWindow/*</url-pattern>
-    </servlet-mapping>
-    
-    <servlet>
-        <servlet-name>HelloWorld</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.HelloWorld</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>HelloWorld</servlet-name>
-        <url-pattern>/HelloWorld/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet>
-        <servlet-name>Calc</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.Calc</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Calc</servlet-name>
-        <url-pattern>/Calc/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet>
-        <servlet-name>KeyboardShortcut</servlet-name>
-        <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>
-        <init-param>
-            <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.KeyboardShortcut</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>KeyboardShortcut</servlet-name>
-        <url-pattern>/KeyboardShortcut/*</url-pattern>
-    </servlet-mapping>
-    
-       <welcome-file-list>
-               <welcome-file>index.html</welcome-file>
-               <welcome-file>index.htm</welcome-file>
-               <welcome-file>index.jsp</welcome-file>
-               <welcome-file>default.html</welcome-file>
-               <welcome-file>default.htm</welcome-file>
-               <welcome-file>default.jsp</welcome-file>
-       </welcome-file-list>
-       
-</web-app>
+<?xml version="1.0" encoding="ISO-8859-1"?>\r
+\r
+<!DOCTYPE web-app\r
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\r
+    "http://java.sun.com/dtd/web-app_2_3.dtd">\r
+\r
+<web-app>\r
+\r
+  <display-name>IT Mill Toolkit</display-name>\r
+  <description>\r
+     IT Mill Toolkit examples\r
+  </description>\r
+\r
+  <servlet>\r
+    <servlet-name>SelectDemo</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.SelectDemo</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>BufferedComponents</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.BufferedComponents</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>TableDemo</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.TableDemo</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>CustomLayoutDemo</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.CustomLayoutDemo</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>LayoutDemo</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.LayoutDemo</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>FilterSelect</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.FilterSelect</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>FeaturesApplication</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.features.FeaturesApplication</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>Parameters</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.Parameters</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>UpgradingSample</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.UpgradingSample</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>QueryContainerDemo</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.QueryContainerDemo</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>TreeFilesystemContainer</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.TreeFilesystemContainer</param-value>\r
+    </init-param>\r
+    <!-- Set this property if demo cannot access context base directory\r
+      because of Application Server or Servlet Container security constraints-->\r
+    <!--\r
+    <init-param>\r
+      <param-name>sampleDirectory</param-name>\r
+      <param-value>/mySampleDirectory</param-value>\r
+    </init-param>\r
+    -->                                                                \r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>TreeFilesystem</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.TreeFilesystem</param-value>\r
+    </init-param>\r
+    <!-- Set this property if demo cannot access context base directory\r
+      because of Application Server or Servlet Container security constraints-->\r
+    <!--\r
+    <init-param>\r
+      <param-name>sampleDirectory</param-name>\r
+      <param-value>/mySampleDirectory</param-value>\r
+    </init-param>\r
+    -->\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>ModalWindow</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.ModalWindow</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>HelloWorld</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.HelloWorld</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>Calc</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.Calc</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet>\r
+    <servlet-name>KeyboardShortcut</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.web.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.KeyboardShortcut</param-value>\r
+    </init-param>\r
+  </servlet>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>SelectDemo</servlet-name>\r
+    <url-pattern>/SelectDemo/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>BufferedComponents</servlet-name>\r
+    <url-pattern>/BufferedComponents/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>TableDemo</servlet-name>\r
+    <url-pattern>/TableDemo/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>CustomLayoutDemo</servlet-name>\r
+    <url-pattern>/CustomLayoutDemo/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>LayoutDemo</servlet-name>\r
+    <url-pattern>/LayoutDemo/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>FilterSelect</servlet-name>\r
+    <url-pattern>/FilterSelect/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>FeaturesApplication</servlet-name>\r
+    <url-pattern>/FeaturesApplication/*</url-pattern>\r
+  </servlet-mapping>\r
+  \r
+  <servlet-mapping>\r
+    <servlet-name>FeaturesApplication</servlet-name>\r
+    <url-pattern>/features/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>Parameters</servlet-name>\r
+    <url-pattern>/Parameters/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>UpgradingSample</servlet-name>\r
+    <url-pattern>/UpgradingSample/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>QueryContainerDemo</servlet-name>\r
+    <url-pattern>/QueryContainerDemo/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>TreeFilesystemContainer</servlet-name>\r
+    <url-pattern>/TreeFilesystemContainer/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>TreeFilesystem</servlet-name>\r
+    <url-pattern>/TreeFilesystem/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>ModalWindow</servlet-name>\r
+    <url-pattern>/ModalWindow/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>HelloWorld</servlet-name>\r
+    <url-pattern>/HelloWorld/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>Calc</servlet-name>\r
+    <url-pattern>/Calc/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>KeyboardShortcut</servlet-name>\r
+    <url-pattern>/KeyboardShortcut/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <welcome-file-list>\r
+    <welcome-file>index.jsp</welcome-file>\r
+    <welcome-file>index.html</welcome-file>\r
+    <welcome-file>index.htm</welcome-file>\r
+  </welcome-file-list>\r
+\r
+</web-app>\r

diff --git a/WebContent/index.html b/WebContent/index.html
index 1f3a9904a9e78f1252075002bd99100f80b3ec0e..754f38fdbd0b85bc985850d707d64679855b80d2 100644 (file)
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -15,15 +15,15 @@
   <div class="feature-browser">\r
        <h4>Feature Browser</h4>\r
        <div class="option">\r
-        <span class="link"><a href="features?renderingMode=detect">Autodetected mode</a></span>\r
+        <span class="link"><a href="FeaturesApplication?renderingMode=detect">Autodetected mode</a></span>\r
         <span class="desc">Use AJAX if supported by browser, otherwise fallback to HTML mode</span>\r
        </div>\r
        <div class="option">\r
-        <span class="link"><a href="features?renderingMode=ajax">AJAX mode</a></span>\r
+        <span class="link"><a href="FeaturesApplication?renderingMode=ajax">AJAX mode</a></span>\r
         <span class="desc">Select AJAX-based technology mode</span>\r
        </div>\r
        <div class="option">\r
-        <span class="link"><a href="features?renderingMode=html">HTML mode</a></span>\r
+        <span class="link"><a href="FeaturesApplication?renderingMode=html">HTML mode</a></span>\r
         <span class="desc">Select page based request/response technology mode</span>\r
        </div>\r
        <br />Source code:\r

diff --git a/WebContent/openajax/index.html b/WebContent/openajax/index.html
index 222d01b4776c299008f274c79fccf9a9d2a4ae32..12ce3823ab607b334580f710097c8352815a78f4 100644 (file)
--- a/WebContent/openajax/index.html
+++ b/WebContent/openajax/index.html
@@ -103,18 +103,18 @@
                                The <script> tag below that references SampleAjaxLibrary.js must be removed and \r
                                instead you will need to have your own Ajax library loaded instead.\r
                                **************************************************************************** -->\r
-       <link rel="stylesheet" href="../features/RES/base/css/base-ajax.css" type="text/css" />\r
-       <link rel="stylesheet" href="../features/RES/base/css/calendar-default.css" type="text/css" />\r
-       <script src="../features/RES/base/script/ajax-client.js" type="text/javascript"></script>\r
-       <script src="../features/RES/base/script/base-ajax-components.js" type="text/javascript"></script>\r
-       <script src="../features/RES/base/ext/jscalendar/calendar.js" type="text/javascript"></script>\r
-       <script src="../features/RES/base/ext/jscalendar/lang/calendar-en.js" type="text/javascript"></script>\r
-       <script src="../features/RES/base/ext/jscalendar/calendar-setup.js" type="text/javascript"></script>\r
-       <script src="../features/RES/base/ext/firebug/firebug.js" type="text/javascript"></script>\r
-       <link rel="stylesheet" href="../features/RES/corporate/css/corporate-ajax.css" type="text/css" />\r
-       <script src="../features/RES/corporate/script/corporate-ajax-components.js" type="text/javascript"></script>\r
-       <script src="../features/RES/demo/featurebrowser/components.js" type="text/javascript"></script>\r
-       <link rel="stylesheet" href="../features/RES/demo/featurebrowser/featurebrowser.css" type="text/css" />\r
+       <link rel="stylesheet" href="../FeaturesApplication/RES/base/css/base-ajax.css" type="text/css" />\r
+       <link rel="stylesheet" href="../FeaturesApplication/RES/base/css/calendar-default.css" type="text/css" />\r
+       <script src="../FeaturesApplication/RES/base/script/ajax-client.js" type="text/javascript"></script>\r
+       <script src="../FeaturesApplication/RES/base/script/base-ajax-components.js" type="text/javascript"></script>\r
+       <script src="../FeaturesApplication/RES/base/ext/jscalendar/calendar.js" type="text/javascript"></script>\r
+       <script src="../FeaturesApplication/RES/base/ext/jscalendar/lang/calendar-en.js" type="text/javascript"></script>\r
+       <script src="../FeaturesApplication/RES/base/ext/jscalendar/calendar-setup.js" type="text/javascript"></script>\r
+       <script src="../FeaturesApplication/RES/base/ext/firebug/firebug.js" type="text/javascript"></script>\r
+       <link rel="stylesheet" href="../FeaturesApplication/RES/corporate/css/corporate-ajax.css" type="text/css" />\r
+       <script src="../FeaturesApplication/RES/corporate/script/corporate-ajax-components.js" type="text/javascript"></script>\r
+       <script src="../FeaturesApplication/RES/demo/featurebrowser/components.js" type="text/javascript"></script>\r
+       <link rel="stylesheet" href="../FeaturesApplication/RES/demo/featurebrowser/featurebrowser.css" type="text/css" />\r
 \r
        <!--    ****************************************************************************\r
                                YOU MAY CUSTOMIZE THE FOLLOWING LOGIC.\r
@@ -201,8 +201,8 @@
 <script language="JavaScript">\r
        // Initialize client part of the IT Mill Toolkit and start it\r
        function ITMillToolkit_Start () {\r
-               var client = new itmill.Client(document.getElementById('ajax-window'),"../features/UIDL/","../features/RES/base/client/",document.getElementById('ajax-wait'));\r
-               (new itmill.themes.Demo("../features/RES/demo/")).registerTo(client);\r
+               var client = new itmill.Client(document.getElementById('ajax-window'),"../FeaturesApplication/UIDL/","../FeaturesApplication/RES/base/client/",document.getElementById('ajax-wait'));\r
+               (new itmill.themes.Demo("../FeaturesApplication/RES/demo/")).registerTo(client);\r
                client.start();\r
        }\r
        OpenAjax.addOnLoad("ITMillToolkit_Start", null, "library");\r