#4500 move Reservr outside Vaadin core

svn changeset:12426/svn branch:6.3

10 files changed, 5 insertions, 181 deletions

diff --git a/WebContent/VAADIN/readme.txt b/WebContent/VAADIN/readme.txt
index 672862a35c..ee64a23423 100644
--- a/WebContent/VAADIN/readme.txt
+++ b/WebContent/VAADIN/readme.txt
@@ -28,7 +28,7 @@ Vaadin Development
 ---------------------------
 When developing the Vaadin Library itself, change to "build" directory and
 run "ant widgetsets" to compile all widgetsets or "ant widgetset-default",
-"ant-widgetset-reserver", or "ant widgetset-colorpicker" to compile individual
+"ant-widgetset-sampler", or "ant widgetset-colorpicker" to compile individual
 widgetsets. You must have GWT installed under build/gwt.
 
 See http://dev.vaadin.com/wiki/DevDocs/StartingDevelopment for instructions for
diff --git a/WebContent/VAADIN/themes/liferay/styles.css b/WebContent/VAADIN/themes/liferay/styles.css
index 51a32d1fee..e60cc98ace 100644
--- a/WebContent/VAADIN/themes/liferay/styles.css
+++ b/WebContent/VAADIN/themes/liferay/styles.css
@@ -30,8 +30,3 @@ input[type="text"].v-filterselect-input {
 	padding: 3px 0px 0px 4px;
 }

 	
-.simplereserver div.v-datefield-entrycalendar-hours {

-	height: 200px;

-	overflow: auto;

-}

-
diff --git a/WebContent/VAADIN/themes/reservr/bmw.jpg b/WebContent/VAADIN/themes/reservr/bmw.jpg
deleted file mode 100644
index 5d91713a11..0000000000
--- a/WebContent/VAADIN/themes/reservr/bmw.jpg
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reservr/favicon.ico b/WebContent/VAADIN/themes/reservr/favicon.ico
deleted file mode 100644
index e58158c02c..0000000000
--- a/WebContent/VAADIN/themes/reservr/favicon.ico
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reservr/reservr.jpg b/WebContent/VAADIN/themes/reservr/reservr.jpg
deleted file mode 100644
index 5fc956a372..0000000000
--- a/WebContent/VAADIN/themes/reservr/reservr.jpg
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reservr/styles.css b/WebContent/VAADIN/themes/reservr/styles.css
deleted file mode 100644
index 380df00591..0000000000
--- a/WebContent/VAADIN/themes/reservr/styles.css
+++ /dev/null
@@ -1,56 +0,0 @@
-@import url(../runo/styles.css);
-
-/* Reservr styles */

-.v-app-ReservationApplication {

-	background-color: #E9ECED;

-	background-image: url(bmw.jpg);

-	background-repeat: no-repeat;

-	background-position: top right;

-}

-

-.v-app-ReservationApplication .v-label-logo {
-	font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
-	padding-left: 13px;
-	padding-bottom: 10px;
-	padding-top: 10px;
-	color: #F14C1A;

-	font-size: 22px;

-	letter-spacing: -0.03em;

-}
-.v-app-ReservationApplication .v-label-slogan {
-	color: black;
-	padding-left: 15px;
-	padding-bottom: 10px;
-	font-style: italic;	
-}

-

-.v-caption {

-	color: #F14C1A;

-	font-size: 16px;

-}
-

-

-.v-label-arrow {

-	line-height: 160px;

-	font-family: Times New Roman;

-	color: #F14C1A;

-	font-size: 65px;

-	margin: 0 20px 0 12px;

-}

-

-.v-button-important-link {

-	border: 0px;

-	text-align: left;

-	text-decoration: none;

-	background: none;

-	font-weight: bold;

-}

-

-.v-app-ReservationApplication .v-button-selected-link {

-	border: 0px;

-	text-align: left;

-	text-decoration: none;

-	background: #5daee8;

-	font-weight: bold;

-	color: #fff;

-}

diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
index 50bed9c7d5..0e88c0e862 100644
--- a/WebContent/WEB-INF/liferay-display.xml
+++ b/WebContent/WEB-INF/liferay-display.xml
@@ -4,7 +4,6 @@
 <display>
         <category name="Vaadin">
                 <portlet id="PortletDemoPortlet" />
-                <portlet id="SimpleReserverPortlet" />
                 <portlet id="SelectDemoPortlet" />
                 <portlet id="TableDemoPortlet" />
                 <portlet id="FilterSelectPortlet" />
diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/WebContent/WEB-INF/liferay-portlet.xml
index cff3366a41..f3c18e57d0 100644
--- a/WebContent/WEB-INF/liferay-portlet.xml
+++ b/WebContent/WEB-INF/liferay-portlet.xml
@@ -8,11 +8,6 @@
                 <ajaxable>false</ajaxable>
         </portlet>
         <portlet>
-                <portlet-name>SimpleReserverPortlet</portlet-name>
-                <instanceable>true</instanceable>       
-                <ajaxable>false</ajaxable>
-        </portlet>
-        <portlet>
                 <portlet-name>SelectDemoPortlet</portlet-name>
                 <instanceable>true</instanceable>       
                 <ajaxable>false</ajaxable>
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index 6cd7f70a48..265c3b3869 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -14,7 +14,7 @@
 
 		<init-param>
 			<name>widgetset</name>
-			<value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value>
+			<value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value>
 		</init-param>
 		<supports>
 			<mime-type>text/html</mime-type>
@@ -41,46 +41,6 @@
 		</security-role-ref>
 	</portlet>
 	<portlet>
-		<portlet-name>SimpleReserverPortlet</portlet-name>
-		<display-name>Vaadin SimpleReserver</display-name>
-		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
-		<init-param>
-			<name>application</name>
-			<value>SimpleReserver</value>
-		</init-param>
-		<init-param>
-			<name>style</name>
-			<value>height:400px</value>
-		</init-param>
-		<init-param>
-			<name>widgetset</name>
-			<value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value>
-		</init-param>
-		<supports>
-			<mime-type>text/html</mime-type>
-			<portlet-mode>view</portlet-mode>
-			<portlet-mode>edit</portlet-mode>
-			<portlet-mode>help</portlet-mode>
-		</supports>
-		<portlet-info>
-			<title>SimpleReserver</title>
-			<short-title>SimpleReserver</short-title>
-		</portlet-info>
-
-		<security-role-ref>
-			<role-name>administrator</role-name>
-		</security-role-ref>
-		<security-role-ref>
-			<role-name>guest</role-name>
-		</security-role-ref>
-		<security-role-ref>
-			<role-name>power-user</role-name>
-		</security-role-ref>
-		<security-role-ref>
-			<role-name>user</role-name>
-		</security-role-ref>
-	</portlet>
-	<portlet>
 		<portlet-name>FeatureBrowserPortlet</portlet-name>
 		<display-name>Vaadin FeatureBrowser</display-name>
 		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
@@ -94,7 +54,7 @@
 		</init-param>
 		<init-param>
 			<name>widgetset</name>
-			<value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value>
+			<value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value>
 		</init-param>
 		<supports>
 			<mime-type>text/html</mime-type>
@@ -295,7 +255,7 @@
 
 		<init-param>
 			<name>widgetset</name>
-			<value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value>
+			<value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value>
 		</init-param>
 		<supports>
 			<mime-type>text/html</mime-type>
@@ -335,7 +295,7 @@
 		</init-param>
 		<init-param>
 			<name>widgetset</name>
-			<value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value>
+			<value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value>
 		</init-param>
 		<supports>
 			<mime-type>text/html</mime-type>
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 096828c99f..dfdedf5dce 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -130,45 +130,6 @@
 	</servlet>	

 

 	<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>

-

-	<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>

-

-	<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>

-

-	<servlet>

 		<servlet-name>CustomLayoutDemo</servlet-name>

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

 		<init-param>

@@ -232,15 +193,6 @@
 	</servlet>

 

 	<servlet>

-		<servlet-name>QueryContainerDemo</servlet-name>

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

-		<init-param>

-			<param-name>application</param-name>

-			<param-value>com.vaadin.tests.QueryContainerDemo</param-value>

-		</init-param>

-	</servlet>

-

-	<servlet>

 		<servlet-name>TreeFilesystemContainer</servlet-name>

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

 		<init-param>

@@ -392,22 +344,6 @@
 	</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>

-		<!-- portlet style=height:400px -->

-	</servlet-mapping>

-

-	<servlet-mapping>

-		<servlet-name>CalendarDemo</servlet-name>

-		<url-pattern>/CalendarDemo/*</url-pattern>

-	</servlet-mapping>

-

-	<servlet-mapping>

 		<servlet-name>CustomLayoutDemo</servlet-name>

 		<url-pattern>/CustomLayoutDemo/*</url-pattern>

 	</servlet-mapping>

@@ -450,11 +386,6 @@
 	</servlet-mapping>

 

 	<servlet-mapping>

-		<servlet-name>QueryContainerDemo</servlet-name>

-		<url-pattern>/QueryContainerDemo/*</url-pattern>

-	</servlet-mapping>

-

-	<servlet-mapping>

 		<servlet-name>TreeFilesystemContainer</servlet-name>

 		<url-pattern>/TreeFilesystemContainer/*</url-pattern>

 	</servlet-mapping>