Fixed #719

svn changeset:1497/svn branch:trunk

3 files changed, 282 insertions, 255 deletions

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 2d860167fc..adad234158 100644
--- 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"?>

+

+<!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>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>

+    <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>

+    <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>

+    <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>

+    <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>

+    <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>

+    <servlet-name>FeaturesApplication</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>

+    <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>

+    <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>

+    <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>

+    <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>

+    <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>

+    <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>

+    <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>

+    <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>

+    <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>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>CustomLayoutDemo</servlet-name>

+    <url-pattern>/CustomLayoutDemo/*</url-pattern>

+  </servlet-mapping>

+

+  <servlet-mapping>

+    <servlet-name>LayoutDemo</servlet-name>

+    <url-pattern>/LayoutDemo/*</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>FeaturesApplication</servlet-name>

+    <url-pattern>/features/*</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>ModalWindow</servlet-name>

+    <url-pattern>/ModalWindow/*</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>

+

+  <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/WebContent/index.html b/WebContent/index.html
index 1f3a9904a9..754f38fdbd 100644
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -15,15 +15,15 @@
   <div class="feature-browser">

 	<h4>Feature Browser</h4>

 	<div class="option">

-	 <span class="link"><a href="features?renderingMode=detect">Autodetected mode</a></span>

+	 <span class="link"><a href="FeaturesApplication?renderingMode=detect">Autodetected mode</a></span>

 	 <span class="desc">Use AJAX if supported by browser, otherwise fallback to HTML mode</span>

 	</div>

 	<div class="option">

-	 <span class="link"><a href="features?renderingMode=ajax">AJAX mode</a></span>

+	 <span class="link"><a href="FeaturesApplication?renderingMode=ajax">AJAX mode</a></span>

 	 <span class="desc">Select AJAX-based technology mode</span>

 	</div>

 	<div class="option">

-	 <span class="link"><a href="features?renderingMode=html">HTML mode</a></span>

+	 <span class="link"><a href="FeaturesApplication?renderingMode=html">HTML mode</a></span>

 	 <span class="desc">Select page based request/response technology mode</span>

 	</div>

 	<br />Source code:

diff --git a/WebContent/openajax/index.html b/WebContent/openajax/index.html
index 222d01b477..12ce3823ab 100644
--- 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 

 				instead you will need to have your own Ajax library loaded instead.

 				**************************************************************************** -->

-	<link rel="stylesheet" href="../features/RES/base/css/base-ajax.css" type="text/css" />

-	<link rel="stylesheet" href="../features/RES/base/css/calendar-default.css" type="text/css" />

-	<script src="../features/RES/base/script/ajax-client.js" type="text/javascript"></script>

-	<script src="../features/RES/base/script/base-ajax-components.js" type="text/javascript"></script>

-	<script src="../features/RES/base/ext/jscalendar/calendar.js" type="text/javascript"></script>

-	<script src="../features/RES/base/ext/jscalendar/lang/calendar-en.js" type="text/javascript"></script>

-	<script src="../features/RES/base/ext/jscalendar/calendar-setup.js" type="text/javascript"></script>

-	<script src="../features/RES/base/ext/firebug/firebug.js" type="text/javascript"></script>

-	<link rel="stylesheet" href="../features/RES/corporate/css/corporate-ajax.css" type="text/css" />

-	<script src="../features/RES/corporate/script/corporate-ajax-components.js" type="text/javascript"></script>

-	<script src="../features/RES/demo/featurebrowser/components.js" type="text/javascript"></script>

-	<link rel="stylesheet" href="../features/RES/demo/featurebrowser/featurebrowser.css" type="text/css" />

+	<link rel="stylesheet" href="../FeaturesApplication/RES/base/css/base-ajax.css" type="text/css" />

+	<link rel="stylesheet" href="../FeaturesApplication/RES/base/css/calendar-default.css" type="text/css" />

+	<script src="../FeaturesApplication/RES/base/script/ajax-client.js" type="text/javascript"></script>

+	<script src="../FeaturesApplication/RES/base/script/base-ajax-components.js" type="text/javascript"></script>

+	<script src="../FeaturesApplication/RES/base/ext/jscalendar/calendar.js" type="text/javascript"></script>

+	<script src="../FeaturesApplication/RES/base/ext/jscalendar/lang/calendar-en.js" type="text/javascript"></script>

+	<script src="../FeaturesApplication/RES/base/ext/jscalendar/calendar-setup.js" type="text/javascript"></script>

+	<script src="../FeaturesApplication/RES/base/ext/firebug/firebug.js" type="text/javascript"></script>

+	<link rel="stylesheet" href="../FeaturesApplication/RES/corporate/css/corporate-ajax.css" type="text/css" />

+	<script src="../FeaturesApplication/RES/corporate/script/corporate-ajax-components.js" type="text/javascript"></script>

+	<script src="../FeaturesApplication/RES/demo/featurebrowser/components.js" type="text/javascript"></script>

+	<link rel="stylesheet" href="../FeaturesApplication/RES/demo/featurebrowser/featurebrowser.css" type="text/css" />

 

 	<!--	****************************************************************************

 				YOU MAY CUSTOMIZE THE FOLLOWING LOGIC.

@@ -201,8 +201,8 @@
 <script language="JavaScript">

 	// Initialize client part of the IT Mill Toolkit and start it

 	function ITMillToolkit_Start () {

-		var client = new itmill.Client(document.getElementById('ajax-window'),"../features/UIDL/","../features/RES/base/client/",document.getElementById('ajax-wait'));

-		(new itmill.themes.Demo("../features/RES/demo/")).registerTo(client);

+		var client = new itmill.Client(document.getElementById('ajax-window'),"../FeaturesApplication/UIDL/","../FeaturesApplication/RES/base/client/",document.getElementById('ajax-wait'));

+		(new itmill.themes.Demo("../FeaturesApplication/RES/demo/")).registerTo(client);

 		client.start();

 	}

 	OpenAjax.addOnLoad("ITMillToolkit_Start", null, "library");