From 52ea97e792e287cf623dce14d784a014c747f687 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Fri, 9 Apr 2010 10:08:45 +0000
Subject: #4500 move Reservr outside Vaadin core

svn changeset:12426/svn branch:6.3
---
 build/package/WebContent/WEB-INF/web.xml | 54 --------------------------------
 build/package/eclipse-classpath          |  1 -
 2 files changed, 55 deletions(-)

(limited to 'build/package')

diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index dc18d792fb..7048ffd64e 100644
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -64,48 +64,6 @@
 		</init-param>
 	</servlet>
 
-	<!--  Reservr demo application -->
-	<servlet>
-		<servlet-name>Reservr</servlet-name>
-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
-		<init-param>
-			<param-name>application</param-name>
-			<param-value>com.vaadin.demo.reservation.ReservationApplication</param-value>
-		</init-param>
-		<init-param>
-			<param-name>widgetset</param-name>
-			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
-		</init-param>
-	</servlet>
-
-	<!-- Version of the Reservr to be run  as a portlet -->
-	<servlet>
-		<servlet-name>SimpleReserver</servlet-name>
-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
-		<init-param>
-			<param-name>application</param-name>
-			<param-value>com.vaadin.demo.reservation.simple.SimpleReserver</param-value>
-		</init-param>
-		<init-param>
-			<param-name>widgetset</param-name>
-			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
-		</init-param>
-	</servlet>
-
-	<!-- Calendar demo application (shown in Windowed demos) -->
-	<servlet>
-		<servlet-name>CalendarDemo</servlet-name>
-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
-		<init-param>
-			<param-name>application</param-name>
-			<param-value>com.vaadin.demo.reservation.CalendarDemo</param-value>
-		</init-param>
-		<init-param>
-			<param-name>widgetset</param-name>
-			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
-		</init-param>
-	</servlet>
-
 	<!-- Hello world demo application -->
 	<servlet>
 		<servlet-name>HelloWorld</servlet-name>
@@ -184,18 +142,6 @@
 		<servlet-name>VaadinApplicationRunner</servlet-name>
 		<url-pattern>/run/*</url-pattern>
 	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>Reservr</servlet-name>
-		<url-pattern>/Reservr/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>SimpleReserver</servlet-name>
-		<url-pattern>/SimpleReserver/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>CalendarDemo</servlet-name>
-		<url-pattern>/CalendarDemo/*</url-pattern>
-	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>FeatureBrowser</servlet-name>
 		<url-pattern>/FeatureBrowser/*</url-pattern>
diff --git a/build/package/eclipse-classpath b/build/package/eclipse-classpath
index f8420353c8..1f70f30d0e 100644
--- a/build/package/eclipse-classpath
+++ b/build/package/eclipse-classpath
@@ -5,7 +5,6 @@
 	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/vaadin-@version@.jar"/>
 	<classpathentry kind="lib" path="gwt/gwt-user.jar" />
 	<classpathentry kind="lib" path="gwt/gwt-servlet.jar" />
-	<classpathentry kind="lib" path="WebContent/demo/lib/gwt-maps/gwt-maps.jar" />
 	<classpathentry kind="lib" path="WebContent/demo/lib/jetty/jetty-6.1.7.jar"/>
 	<classpathentry kind="lib" path="WebContent/demo/lib/jetty/jetty-util-6.1.7.jar"/>
 	<classpathentry kind="lib" path="WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar"/>
-- 
cgit v1.2.3