Fix for #2359 - Demo app renewal. Merged all changes from /branches/2359_Renew_demo_apps

svn changeset:6862/svn branch:trunk

2 files changed, 74 insertions, 153 deletions

diff --git a/build/build.xml b/build/build.xml
index dc7cb03f5b..696dc6f4d3 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -770,6 +770,27 @@
 		<echo>Compiled SamplerWidgetSet</echo>
 	</target>
 	
+	<target name="compile-widgetset-coverflow">
+		<echo>com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet</echo>
+		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
+			<arg value="-out" />
+			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
+			<arg value="com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet" />
+			<arg value="-style" />
+			<arg value="OBF" />
+            <jvmarg value="-Xss8M"/>
+            <jvmarg value="-Djava.awt.headless=true"/>
+			<classpath>
+				<pathelement location="${gwt-dir}/${platform}/gwt-user.jar" />
+				<pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
+				<pathelement location="${result-path}/src" />
+				<!-- demo widgetset sources -->
+				<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
+			</classpath>
+		</java>
+		<echo>Compiled SamplerWidgetSet</echo>
+	</target>
+	
 	<target name="compile-widgetset-colorpicker">
 		<echo>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
@@ -792,7 +813,7 @@
 	</target>
 
 	<!-- Builds the client-side engine, i.e., the widgetsets. -->
-	<target name="compile-client-side" depends="compile-widgetset-default, compile-widgetset-reserver, compile-widgetset-sampler, compile-widgetset-colorpicker">
+	<target name="compile-client-side" depends="compile-widgetset-default, compile-widgetset-reserver, compile-widgetset-sampler, compile-widgetset-colorpicker, compile-widgetset-coverflow">
         <!-- Building the widgetsets is currently done sequentially, because
             parallel compilation takes too much memory for most machines. -->
 	</target>
@@ -830,6 +851,10 @@
 	<target name="widgetset-sampler" depends="init-nonpackage, compile-widgetset-sampler">
 	</target>
 	
+	<!-- Builds the coverflow widgetset locally, i.e., not for an installation package. -->
+	<target name="widgetset-coverflow" depends="init-nonpackage, compile-widgetset-coverflow">
+	</target>
+	
 	<!-- Builds the reservation widgetset locally, i.e., not for an installation package. -->
 	<target name="widgetset-reserver" depends="init-nonpackage, compile-widgetset-reserver">
 	</target>
diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index fdd70fbf70..26878ed651 100644
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -65,64 +65,54 @@
 	</servlet>
 
 	<!--  Sampler demo application -->
-    <servlet>
-      <servlet-name>Sampler</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.sampler.SamplerApplication</param-value>
-      </init-param>
-      <init-param>
-        <param-name>widgetset</param-name>
-        <param-value>com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet</param-value>
-      </init-param>
-    </servlet>
-
-	<!--  Reservr demo application -->
 	<servlet>
-		<servlet-name>Reservr</servlet-name>
+		<servlet-name>Sampler</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>
+			<param-value>com.itmill.toolkit.demo.sampler.SamplerApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
-	<!-- Version of the Reservr to be run  as a portlet -->
+	<!--  AddressBook demo application -->
 	<servlet>
-		<servlet-name>SimpleReserver</servlet-name>
+		<servlet-name>AddressBook</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.simple.SimpleReserver</param-value>
-		</init-param>
-		<init-param>
-			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.itmill.toolkit.demo.tutorial.addressbook.AddressBookApplication</param-value>
 		</init-param>
 	</servlet>
 
-	<!--  Buffered components demo app (shown in Windowed demos) -->
+	<!--  Reservr demo application -->
 	<servlet>
-		<servlet-name>BufferedComponents</servlet-name>
+		<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.BufferedComponents</param-value>
+			<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>
 
-	<!-- Table demo application (shown in Windowed demos) -->
+	<!-- Version of the Reservr to be run  as a portlet -->
 	<servlet>
-		<servlet-name>TableDemo</servlet-name>
+		<servlet-name>SimpleReserver</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>
+			<param-value>com.itmill.toolkit.demo.reservation.simple.SimpleReserver</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>
 
@@ -140,16 +130,6 @@
 		</init-param>
 	</servlet>
 
-	<!-- Filtering select demo -->
-	<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>
-
 	<!-- Hello world demo application -->
 	<servlet>
 		<servlet-name>HelloWorld</servlet-name>
@@ -170,16 +150,6 @@
 		</init-param>
 	</servlet>
 
-	<!--  Keyboard shortcuts demo application -->
-	<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>
-
 	<!--
 		Color Picker demo application that demonstrates creation of custom
 		widgets
@@ -197,74 +167,32 @@
 		</init-param>
 	</servlet>
 
-	<!-- Caching demo application that demonstrates paint optimization -->
+	<!--  Layout demo (ToolkitTunes) -->
 	<servlet>
-		<servlet-name>CachingDemo</servlet-name>
+		<servlet-name>ToolkitTunesLayout</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>
+			<param-value>com.itmill.toolkit.demo.ToolkitTunesLayout</param-value>
 		</init-param>
 	</servlet>
 
-	<!-- Notification demo application -->
+	<!--  Coverflow demo -->
 	<servlet>
-		<servlet-name>NotificationDemo</servlet-name>
+		<servlet-name>Coverflow</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>
+			<param-value>com.itmill.toolkit.demo.coverflow.CoverflowApplication</param-value>
 		</init-param>
-	</servlet>
-
- 	<!-- Select demo application (shown in Windowed demos) -->
-	<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>
-
-	<!-- Browser demo application -->
-	<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>
-
-	<!-- Windowed demos application -->
-	<servlet>
-		<servlet-name>WindowedDemos</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.WindowedDemos</param-value>
-		</init-param>
-	</servlet>
-
-	<!-- Portlet demo application -->
-	<servlet>
-		<servlet-name>PortletDemo</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.PortletDemo</param-value>
+			<param-name>widgetset</param-name>
+			<param-value>com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Servlet Mappings below - see servlets for comments -->
 	<servlet-mapping>
-		<servlet-name>PortletDemo</servlet-name>
-		<url-pattern>/PortletDemo/*</url-pattern>
-		<!-- Hint for the automatic deployment descriptor generator -->
-    	<!-- portlet -->
-	</servlet-mapping>
-	<servlet-mapping>
 		<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
 		<url-pattern>/run/*</url-pattern>
 	</servlet-mapping>
@@ -275,47 +203,31 @@
 	<servlet-mapping>
 		<servlet-name>SimpleReserver</servlet-name>
 		<url-pattern>/SimpleReserver/*</url-pattern>
-		<!-- Hint for the automatic deployment descriptor generator -->		
-    	<!-- portlet style=height:400px -->
+		<!-- Hint for the automatic deployment descriptor generator -->
+		<!-- portlet style=height:400px -->
 	</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>
-		<!-- Hint for the automatic deployment descriptor generator -->		
-	    <!-- portlet -->
-	</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>
-    	<!-- Hint for the automatic deployment descriptor generator -->		
-    	<!-- portlet -->
+		<servlet-name>FeatureBrowser</servlet-name>
+		<url-pattern>/FeatureBrowser/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->
+		<!-- portlet style=height:650px -->
 	</servlet-mapping>
 	<servlet-mapping>
-		<servlet-name>FilterSelect</servlet-name>
-		<url-pattern>/FilterSelect/*</url-pattern>
-		<!-- Hint for the automatic deployment descriptor generator -->		
-	    <!-- portlet -->
+		<servlet-name>Sampler</servlet-name>
+		<url-pattern>/sampler/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->
+		<!-- portlet style=height:650px -->
 	</servlet-mapping>
 	<servlet-mapping>
-		<servlet-name>FeatureBrowser</servlet-name>
-		<url-pattern>/FeatureBrowser/*</url-pattern>
-		<!-- Hint for the automatic deployment descriptor generator -->		
-	    <!-- portlet style=height:650px -->
+		<servlet-name>AddressBook</servlet-name>
+		<url-pattern>/AddressBook/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->
+		<!-- portlet style=height:650px -->
 	</servlet-mapping>
-    <servlet-mapping>
-      <servlet-name>Sampler</servlet-name>
-      <url-pattern>/sampler/*</url-pattern>
-      <!-- Hint for the automatic deployment descriptor generator -->		
-      <!-- portlet style=height:650px -->
-    </servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>HelloWorld</servlet-name>
 		<url-pattern>/HelloWorld/*</url-pattern>
@@ -323,36 +235,20 @@
 	<servlet-mapping>
 		<servlet-name>Calc</servlet-name>
 		<url-pattern>/Calc/*</url-pattern>
-		<!-- Hint for the automatic deployment descriptor generator -->		
-	    <!-- portlet -->
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>KeyboardShortcut</servlet-name>
-		<url-pattern>/KeyboardShortcut/*</url-pattern>
+		<!-- Hint for the automatic deployment descriptor generator -->
+		<!-- portlet -->
 	</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>
-		<!-- Hint for the automatic deployment descriptor generator -->		
-	    <!-- portlet -->
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>BrowserDemo</servlet-name>
-		<url-pattern>/BrowserDemo/*</url-pattern>
-		<!-- Hint for the automatic deployment descriptor generator -->		
-	    <!-- portlet style=height:650px -->
+		<servlet-name>ToolkitTunesLayout</servlet-name>
+		<url-pattern>/ToolkitTunesLayout/*</url-pattern>
 	</servlet-mapping>
 	<servlet-mapping>
-		<servlet-name>WindowedDemos</servlet-name>
-		<url-pattern>/WindowedDemos/*</url-pattern>
+		<servlet-name>Coverflow</servlet-name>
+		<url-pattern>/Coverflow/*</url-pattern>
 	</servlet-mapping>
 	<welcome-file-list>
 		<welcome-file>index.jsp</welcome-file>