Fixed demos. Pumped version up.

svn changeset:2962/svn branch:trunk

6 files changed, 75 insertions, 15 deletions

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index c50e11e776..d2efa61f31 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -10,7 +10,16 @@
   <description>

      IT Mill Toolkit examples

   </description>

-

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

     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>

@@ -333,6 +342,10 @@
     </init-param>

   </servlet>

   

+  	<servlet-mapping>
+    <servlet-name>DemoTestBench</servlet-name>
+    <url-pattern>/DemoTestBench/*</url-pattern>
+  </servlet-mapping>
   

         <servlet-mapping>

     <servlet-name>TestForNativeWindowing</servlet-name>

diff --git a/build/VERSION.properties b/build/VERSION.properties
index 396b7550d4..a547f6cb33 100644
--- a/build/VERSION.properties
+++ b/build/VERSION.properties
@@ -1 +1 @@
-version=5.0.0-alpha-3
+version=5.0.0-alpha-15
diff --git a/build/package/web.xml b/build/package/web.xml
index 2e880364c1..8508ade1ee 100644
--- a/build/package/web.xml
+++ b/build/package/web.xml
@@ -21,6 +21,15 @@
   </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>
@@ -206,9 +215,33 @@
     </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>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>
+    <url-pattern>/WindowedDemos/*</url-pattern>
   </servlet-mapping>
 
 	<servlet-mapping>
diff --git a/build/package/webcontent-index.html b/build/package/webcontent-index.html
index 410f4c31f9..f91bf0ef17 100644
--- a/build/package/webcontent-index.html
+++ b/build/package/webcontent-index.html
@@ -23,7 +23,7 @@
   </div>
   
   <div class="feature-browser">
-	<h3><a href="WindowedDemos">Testbench</a></h3>
+	<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.
@@ -34,6 +34,17 @@
   </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>
@@ -48,7 +59,7 @@
 	<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</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>
@@ -66,7 +77,7 @@
   </div>
   
   <div class="sample-code">
-	<h3>Client-side caching demo</h3>
+	<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">
diff --git a/src/com/itmill/toolkit/demo/testbench/TestBench.java b/src/com/itmill/toolkit/demo/testbench/TestBench.java
index 8880525e55..c455dc72ae 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestBench.java
+++ b/src/com/itmill/toolkit/demo/testbench/TestBench.java
@@ -88,11 +88,13 @@ public class TestBench extends com.itmill.toolkit.Application implements
         for (Iterator i = itemCaptions.keySet().iterator(); i.hasNext();) {
             Class testable = (Class) i.next();
             // simplify captions
-            String name = testable.getName().replaceAll("com.itmill.toolkit.",
-                    "");
+            String name = testable.getName().substring(
+                    testable.getName().lastIndexOf('.') + 1);
             menu.setItemCaption(testable, name);
-            // TODO fix #1191
-            menu.collapseItem(testable);
+        }
+        // expand all root items
+        for (Iterator i = menu.rootItemIds().iterator(); i.hasNext();) {
+            menu.expandItemsRecursively(i.next());
         }
 
         menu.addListener(this);
diff --git a/src/com/itmill/toolkit/tests/TestBench.java b/src/com/itmill/toolkit/tests/TestBench.java
index 76f1c119c5..48fd3cffe5 100644
--- a/src/com/itmill/toolkit/tests/TestBench.java
+++ b/src/com/itmill/toolkit/tests/TestBench.java
@@ -92,12 +92,13 @@ public class TestBench extends com.itmill.toolkit.Application implements
         for (Iterator i = itemCaptions.keySet().iterator(); i.hasNext();) {
             Class testable = (Class) i.next();
             // simplify captions
-            String name = testable.getName().replaceAll("com.itmill.toolkit.",
-                    "");
+            String name = testable.getName().substring(
+                    testable.getName().lastIndexOf('.') + 1);
             menu.setItemCaption(testable, name);
-            // TODO fix #1191
-            System.err.println(name);
-            menu.collapseItem(testable);
+        }
+        // expand all root items
+        for (Iterator i = menu.rootItemIds().iterator(); i.hasNext();) {
+            menu.expandItemsRecursively(i.next());
         }
 
         menu.addListener(this);