diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-08-04 07:59:56 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-08-04 07:59:56 +0000 |
| commit | 58185d1262b453e843bff82a0318ab527ae0d1ac (patch) | |
| tree | 47bdd04e13eaa179458c70d742f691ffd9b108db /WebContent/WEB-INF | |
| parent | f34695c63cb4a212671cd8c03721c0ed8cad3282 (diff) | |
| download | vaadin-framework-58185d1262b453e843bff82a0318ab527ae0d1ac.tar.gz vaadin-framework-58185d1262b453e843bff82a0318ab527ae0d1ac.zip | |
#7266 removed sampler from Vaadin 6.7 (now separate), related screenshot updates
svn changeset:20113/svn branch:6.7
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 | 39 | ||||
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 19 |
4 files changed, 0 insertions, 64 deletions
diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml index c4da4c96bd..ae893853d7 100644 --- a/WebContent/WEB-INF/liferay-display.xml +++ b/WebContent/WEB-INF/liferay-display.xml @@ -5,7 +5,6 @@ <category name="Vaadin"> <portlet id="PortletDemoPortlet" /> <portlet id="CalcPortlet" /> - <portlet id="SamplerPortlet" /> <portlet id="Portlet Mode Example" /> <portlet id="Portlet HTML Mode Example" /> <portlet id="AddressBookPortlet" /> diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/WebContent/WEB-INF/liferay-portlet.xml index 1cfb3d05f2..d74d8fc916 100644 --- a/WebContent/WEB-INF/liferay-portlet.xml +++ b/WebContent/WEB-INF/liferay-portlet.xml @@ -13,11 +13,6 @@ <ajaxable>false</ajaxable> </portlet> <portlet> - <portlet-name>SamplerPortlet</portlet-name> - <instanceable>true</instanceable> - <ajaxable>false</ajaxable> - </portlet> - <portlet> <portlet-name>Portlet Mode Example</portlet-name> <instanceable>true</instanceable> <ajaxable>false</ajaxable> diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index 30071ef599..ea184518f4 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -76,45 +76,6 @@ </portlet> <portlet> - <portlet-name>SamplerPortlet</portlet-name> - <display-name>Sampler</display-name> - <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class> - <init-param> - <name>application</name> - <value>sampler</value> - </init-param> - <init-param> - <name>widgetset</name> - <value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value> - </init-param> - <init-param> - <name>style</name> - <value>height:650px</value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>view</portlet-mode> - </supports> - <portlet-info> - <title>Sampler</title> - <short-title>Sampler</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>Portlet Mode Example</portlet-name> <display-name>Portlet Mode Example</display-name> <portlet-class>com.vaadin.demo.portlet.PortletModePortlet</portlet-class> diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 0d776d631a..d065ef00a3 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -78,20 +78,6 @@ </servlet>
<servlet>
- <servlet-name>Sampler</servlet-name>
- <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
- <init-param>
- <param-name>application</param-name>
- <param-value>com.vaadin.demo.sampler.SamplerApplication</param-value>
- </init-param>
- <init-param>
- <param-name>widgetset</param-name>
- <param-value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</param-value>
- </init-param>
-
- </servlet>
-
- <servlet>
<servlet-name>AddressBook</servlet-name>
<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
<init-param>
@@ -335,11 +321,6 @@ </servlet-mapping>
<servlet-mapping>
- <servlet-name>Sampler</servlet-name>
- <url-pattern>/sampler/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>FeaturesApplication</servlet-name>
<url-pattern>/FeaturesApplication/*</url-pattern>
</servlet-mapping>
|