#4500 move Reservr outside Vaadin core

svn changeset:12426/svn branch:6.3

3 files changed, 0 insertions, 87 deletions

diff --git a/build/build.xml b/build/build.xml
index dd79f3ff8f..0f57c5e315 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -694,37 +694,6 @@
     	</antcall>
     </target>
 
-    <target name="compile-widgetset-reserver" unless="compile.only.default-widgetset">
-        <condition property="googlemaps-jar" value="${output-dir}/WebContent/demo/lib/gwt-maps/gwt-maps.jar">
-            <available file="${output-dir}/WebContent/demo/lib/gwt-maps/gwt-maps.jar" />
-        </condition>
-        <condition property="googlemaps-jar" value="lib/gwt-maps/gwt-maps.jar">
-            <available file="lib/reservr/gwt-maps.jar" />
-        </condition>
-        <java classname="com.google.gwt.dev.Compiler" failonerror="yes" fork="yes" maxmemory="512m">
-            <arg value="-war" />
-            <arg value="${widgetsets-output-dir}" />
-            <arg value="com.vaadin.demo.reservation.gwt.ReservationWidgetSet" />
-            <arg value="-style" />
-            <arg value="OBF" />
-            <jvmarg value="-Xss8M"/>
-            <jvmarg value="-Djava.awt.headless=true"/>
-            <classpath>
-                <pathelement location="${lib-gwt-user}" />
-                <pathelement location="${lib-gwt-dev}" />
-                <pathelement location="${result-path}/src/core" />
-                <pathelement location="${result-path}/src/demo" />
-                <!-- demo jars -->
-                <pathelement location="${googlemaps-jar}" />
-                <!-- demo widgetset sources -->
-                <pathelement path="${output-dir}/WebContent/WEB-INF/src" />
-                <pathelement location="${result-path}/classes" />
-            </classpath>
-        </java>
-        <antcall target="remove-widgetset-gwt-tmp"/>
-        <echo>Compiled ReservationWidgetSet</echo>
-    </target>
-
 	 <target name="compile-widgetset-sampler" unless="compile.only.default-widgetset">
 	    	<antcall target="compile-widgetset">
 	    		<param name="widgetset" value="com.vaadin.demo.sampler.gwt.SamplerWidgetSet"/>
@@ -790,7 +759,6 @@
     <target name="widgetset-default" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-default"/>
     <target name="widgetset-portal-default" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-portal-default"/>
     <target name="widgetset-sampler" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-sampler"/>
-    <target name="widgetset-reserver" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-reserver"/>
     <target name="widgetset-colorpicker" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-colorpicker"/>
 
     <!-- ================================================================== -->
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>
@@ -185,18 +143,6 @@
 		<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>
 	</servlet-mapping>
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"/>