diff options
author | Henri Sara <henri.sara@itmill.com> | 2010-04-09 10:08:45 +0000 |
---|---|---|
committer | Henri Sara <henri.sara@itmill.com> | 2010-04-09 10:08:45 +0000 |
commit | 52ea97e792e287cf623dce14d784a014c747f687 (patch) | |
tree | 89f0ecb02be06c96d3e7b46e42857793399a57be /WebContent/WEB-INF | |
parent | 99c8a9bd48a45ce60b616de581b28b8d8b8a2468 (diff) | |
download | vaadin-framework-52ea97e792e287cf623dce14d784a014c747f687.tar.gz vaadin-framework-52ea97e792e287cf623dce14d784a014c747f687.zip |
#4500 move Reservr outside Vaadin core
svn changeset:12426/svn branch:6.3
Diffstat (limited to 'WebContent/WEB-INF')
-rw-r--r-- | WebContent/WEB-INF/liferay-display.xml | 1 | ||||
-rw-r--r-- | WebContent/WEB-INF/liferay-portlet.xml | 5 | ||||
-rw-r--r-- | WebContent/WEB-INF/portlet.xml | 48 | ||||
-rw-r--r-- | WebContent/WEB-INF/web.xml | 69 |
4 files changed, 4 insertions, 119 deletions
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>
|