Added all demos in all modes to demo-page. Currently only some of those really work.

svn changeset:105/svn branch:toolkit

2 files changed, 213 insertions, 18 deletions

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index f0276d5dfa..1f758112bf 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,7 +1,20 @@
 <?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>enably-toolkit</display-name>
-	
+
+<!-- APPLICATION: ...demo.features -->
+    <servlet>
+        <servlet-name>features-ajax</servlet-name>
+        <servlet-class>com.itmill.toolkit.terminal.ajax.AjaxAdapterServlet</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-ajax</servlet-name>
+        <url-pattern>/demo/features/ajax/*</url-pattern>
+    </servlet-mapping>
     <servlet>
         <servlet-name>features-web</servlet-name>
         <servlet-class>com.itmill.toolkit.terminal.web.WebAdapterServlet</servlet-class>
@@ -14,25 +27,42 @@
             <param-value>false</param-value>
         </init-param>
     </servlet>
-    
+    <servlet-mapping>
+        <servlet-name>features-web</servlet-name>
+        <url-pattern>/demo/features/web/*</url-pattern>
+    </servlet-mapping>
+
+
+<!-- APPLICATION: ...demo.table -->
     <servlet>
-        <servlet-name>features-ajax</servlet-name>
+        <servlet-name>table-ajax</servlet-name>
         <servlet-class>com.itmill.toolkit.terminal.ajax.AjaxAdapterServlet</servlet-class>
         <init-param>
             <param-name>application</param-name>
-            <param-value>com.itmill.toolkit.demo.features.FeaturesApplication</param-value>
+            <param-value>com.itmill.toolkit.demo.table.TableDemoApplication</param-value>
         </init-param>
     </servlet>    
-
     <servlet-mapping>
-        <servlet-name>features-web</servlet-name>
-        <url-pattern>/demo/features/web/*</url-pattern>
+        <servlet-name>table-ajax</servlet-name>
+        <url-pattern>/demo/table/ajax/*</url-pattern>
     </servlet-mapping>
-    
+    <servlet>
+        <servlet-name>table-web</servlet-name>
+        <servlet-class>com.itmill.toolkit.terminal.web.WebAdapterServlet</servlet-class>
+        <init-param>
+            <param-name>application</param-name>
+            <param-value>com.itmill.toolkit.demo.table.TableDemoApplication</param-value>
+        </init-param>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>false</param-value>
+        </init-param>
+    </servlet>
     <servlet-mapping>
-        <servlet-name>features-ajax</servlet-name>
-        <url-pattern>/demo/features/ajax/*</url-pattern>
-    </servlet-mapping>    
+        <servlet-name>table-web</servlet-name>
+        <url-pattern>/demo/table/web/*</url-pattern>
+    </servlet-mapping>
+
 
 <!-- APPLICATION: ...demo.calc -->
     <servlet>
@@ -47,6 +77,23 @@
         <servlet-name>calc-ajax</servlet-name>
         <url-pattern>/demo/calc/ajax/*</url-pattern>
     </servlet-mapping>
+    <servlet>
+        <servlet-name>calc-web</servlet-name>
+        <servlet-class>com.itmill.toolkit.terminal.web.WebAdapterServlet</servlet-class>
+        <init-param>
+            <param-name>application</param-name>
+            <param-value>com.itmill.toolkit.demo.Calc</param-value>
+        </init-param>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>false</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>table-web</servlet-name>
+        <url-pattern>/demo/calc/web/*</url-pattern>
+    </servlet-mapping>
+
 
 <!-- APPLICATION: ...demo.chat -->
     <servlet>
@@ -61,6 +108,23 @@
         <servlet-name>chat-ajax</servlet-name>
         <url-pattern>/demo/chat/ajax/*</url-pattern>
     </servlet-mapping>
+    <servlet>
+        <servlet-name>chat-web</servlet-name>
+        <servlet-class>com.itmill.toolkit.terminal.web.WebAdapterServlet</servlet-class>
+        <init-param>
+            <param-name>application</param-name>
+            <param-value>com.itmill.toolkit.demo.Chat</param-value>
+        </init-param>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>false</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>chat-web</servlet-name>
+        <url-pattern>/demo/chat/web/*</url-pattern>
+    </servlet-mapping>
+
 
 <!-- APPLICATION: ...demo.Hello -->
     <servlet>
@@ -75,6 +139,23 @@
         <servlet-name>hello-ajax</servlet-name>
         <url-pattern>/demo/hello/ajax/*</url-pattern>
     </servlet-mapping>
+    <servlet>
+        <servlet-name>hello-web</servlet-name>
+        <servlet-class>com.itmill.toolkit.terminal.web.WebAdapterServlet</servlet-class>
+        <init-param>
+            <param-name>application</param-name>
+            <param-value>com.itmill.toolkit.demo.HelloWorld</param-value>
+        </init-param>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>false</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>hello-web</servlet-name>
+        <url-pattern>/demo/hello/web/*</url-pattern>
+    </servlet-mapping>
+
 
 <!-- APPLICATION: ...demo.Login -->
     <servlet>
@@ -89,8 +170,54 @@
         <servlet-name>login-ajax</servlet-name>
         <url-pattern>/demo/login/ajax/*</url-pattern>
     </servlet-mapping>
+    <servlet>
+        <servlet-name>login-web</servlet-name>
+        <servlet-class>com.itmill.toolkit.terminal.web.WebAdapterServlet</servlet-class>
+        <init-param>
+            <param-name>application</param-name>
+            <param-value>com.itmill.toolkit.demo.Login</param-value>
+        </init-param>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>false</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>login-web</servlet-name>
+        <url-pattern>/demo/login/web/*</url-pattern>
+    </servlet-mapping>
 
 
+<!-- APPLICATION: ...demo.GoGame -->
+    <servlet>
+        <servlet-name>gogame-ajax</servlet-name>
+        <servlet-class>com.itmill.toolkit.terminal.ajax.AjaxAdapterServlet</servlet-class>
+        <init-param>
+            <param-name>application</param-name>
+            <param-value>com.itmill.toolkit.demo.gogame.Go</param-value>
+        </init-param>
+    </servlet>    
+    <servlet-mapping>
+        <servlet-name>gogame-ajax</servlet-name>
+        <url-pattern>/demo/gogame/ajax/*</url-pattern>
+    </servlet-mapping>
+    <servlet>
+        <servlet-name>gogame-web</servlet-name>
+        <servlet-class>com.itmill.toolkit.terminal.web.WebAdapterServlet</servlet-class>
+        <init-param>
+            <param-name>application</param-name>
+            <param-value>com.itmill.toolkit.demo.gogame.Go</param-value>
+        </init-param>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>false</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>gogame-web</servlet-name>
+        <url-pattern>/demo/gogame/web/*</url-pattern>
+    </servlet-mapping>
+
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 		<welcome-file>index.htm</welcome-file>
diff --git a/WebContent/index.html b/WebContent/index.html
index 81aa7b9fad..a754723384 100644
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -4,14 +4,82 @@
 </head>
 <body>
 
+<center>
+
 <h1>IT Mill Toolkit Demos</h1>
 
-<p>
-Feature Browser <a href="demo/features/web/">[web]</a> <a href="demo/features-ajax.html">[ajax]</a>
-</p>
-<p>Demo application (ajax) : <a href="demo/demoapp.html?app=calc">Calculator</a></p>
-<p>Demo application (ajax) : <a href="demo/demoapp.html?app=chat">Chat</a> (broken)</p>
-<p>Demo application (ajax) : <a href="demo/demoapp.html?app=hello">HelloWorld</a></p>
-<p>Demo application (ajax) : <a href="demo/demoapp.html?app=login">Login</a></p>
+<table border="1" cellpadding="30px">
+
+<tr><td>
+	<h2>Hello World</h2>
+	<ul>
+		<li><a href="demo/demoapp.html?app=hello">AJAX</a></li>
+		<li><a href="demo/demoapp.html?debug=1&app=hello">AJAX + debug</a></li>
+		<li><a href="demo/hello/web/">Traditional web</a></li>
+		<li><a href="src/com/itmill/toolkit/demo/Hello.java">Source</li>
+	</ul>
+</td><td>
+	<h2>Feature Browser</h2>
+	<ul>
+		<li><a href="demo/demoapp.html?app=features">AJAX</a></li>
+		<li><a href="demo/demoapp.html?debug=1&app=features">AJAX + debug</a></li>
+		<li><a href="demo/features/web/">Traditional web</a></li>
+		<li><a href="src/com/itmill/toolkit/demo/features/">Sources folder</li>
+	</ul>
+</td></tr>
+
+<tr><td>
+	<h2>Calculator</h2>
+	<ul>
+		<li><a href="demo/demoapp.html?app=calc">AJAX</a></li>
+		<li><a href="demo/demoapp.html?debug=1&app=calc">AJAX + debug</a></li>
+		<li><a href="demo/calc/web/">Traditional web</a></li>
+		<li><a href="src/com/itmill/toolkit/demo/Calc.java">Source</li>
+	</ul>
+</td><td>
+	<h2>Large Table</h2>
+	<ul>
+		<li><a href="demo/demoapp.html?app=table">AJAX</a></li>
+		<li><a href="demo/demoapp.html?debug=1&app=table">AJAX + debug</a></li>
+		<li><a href="demo/tableweb/">Traditional web</a></li>
+		<li><a href="src/com/itmill/toolkit/demo/table/TableDemoApplication.java">Source</li>
+	</ul>
+</td></tr>
+
+<tr><td>
+	<h2>Chat</h2>
+	<ul>
+		<li><a href="demo/demoapp.html?app=chat">AJAX</a></li>
+		<li><a href="demo/demoapp.html?debug=1&app=chat">AJAX + debug</a></li>
+		<li><a href="demo/chat/web/">Traditional web</a></li>
+		<li><a href="src/com/itmill/toolkit/demo/Chat.java">Source</li>
+	</ul>
+</td><td>
+	<h2>Login</h2>
+	<ul>
+		<li><a href="demo/demoapp.html?app=login">AJAX</a></li>
+		<li><a href="demo/demoapp.html?debug=1&app=login">AJAX + debug</a></li>
+		<li><a href="demo/login/web/">Traditional web</a></li>
+		<li><a href="src/com/itmill/toolkit/demo/Login.java">Source</li>
+	</ul>
+</td></tr>
+
+<tr><td>
+	<h2>GO-game</h2>
+	<ul>
+		<li><a href="demo/demoapp.html?app=gogame">AJAX</a></li>
+		<li><a href="demo/demoapp.html?debug=1&app=gogame">AJAX + debug</a></li>
+		<li><a href="demo/gogame/web/">Traditional web</a></li>
+		<li><a href="src/com/itmill/toolkit/demo/gogame/Board.java">Board component source</li>
+		<li><a href="src/com/itmill/toolkit/demo/gogame/Game.java">Game state model source</li>
+		<li><a href="src/com/itmill/toolkit/demo/gogame/Go.java">Application source</li>
+	</ul>
+</td><td>
+
+</td></tr>
+</table>
+
+</center>
+
 </body>
 </html>
\ No newline at end of file