diff options
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/liferay-display.xml | 5 | ||||
| -rw-r--r-- | WebContent/WEB-INF/portlet.xml | 44 | ||||
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 2 |
3 files changed, 45 insertions, 6 deletions
diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml index 2981e08fd4..302f9961dd 100644 --- a/WebContent/WEB-INF/liferay-display.xml +++ b/WebContent/WEB-INF/liferay-display.xml @@ -18,6 +18,9 @@ <portlet id="AddressBookPortlet" /> <portlet id="CalcPortlet"/> <portlet id="SamplerPortlet"/> - <portlet id="HelloWorldEventPortlet"/> + <!-- + <portlet id="InterPortletEventPortlet" /> + <portlet id="VaadinInterPortletEventPortlet" /> + --> </category> </display>
\ No newline at end of file diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index c91bac7589..b4a40e77aa 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -136,33 +136,69 @@ <title>HelloWorld</title> <short-title>HelloWorld</short-title> </portlet-info> + </portlet> + + <!-- + <portlet> + <portlet-name>VaadinInterPortletEventPortlet</portlet-name> + <display-name>Hello World Event</display-name> + <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class> + <init-param> + <name>application</name> + <value>com.vaadin.demo.portlet.VaadinInterPortletEventPortlet</value> + </init-param> + <init-param> + <name>widgetset</name> + <value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>view</portlet-mode> + </supports> + <portlet-info> + <title>Inter-portlet events</title> + <short-title>Inter-portlet events</short-title> + </portlet-info> <supported-processing-event> <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname> </supported-processing-event> + <supported-processing-event> + <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:ReplyToVaadin</qname> + </supported-processing-event> <supported-publishing-event> <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname> </supported-publishing-event> + <supported-publishing-event> + <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:FromVaadin</qname> + </supported-publishing-event> </portlet> <portlet> - <portlet-name>HelloWorldEventPortlet</portlet-name> + <portlet-name>InterPortletEventPortlet</portlet-name> <display-name>Hello World Event (non-Vaadin)</display-name> - <portlet-class>com.vaadin.demo.HelloWorldEventPortlet</portlet-class> + <portlet-class>com.vaadin.demo.portlet.InterPortletEventPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> <portlet-mode>view</portlet-mode> </supports> <portlet-info> - <title>HelloWorldEvent (non-Vaadin)</title> - <short-title>HelloWorldEvent (non-Vaadin)</short-title> + <title>Inter-portlet events (non-Vaadin)</title> + <short-title>Inter-portlet events (non-Vaadin)</short-title> </portlet-info> <supported-processing-event> <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Reply</qname> </supported-processing-event> + <supported-processing-event> + <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:FromVaadin</qname> + </supported-processing-event> <supported-publishing-event> <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:Hello</qname> </supported-publishing-event> + <supported-publishing-event> + <qname xmlns:vaadin="http://www.vaadin.com/hello">vaadin:ReplyToVaadin</qname> + </supported-publishing-event> </portlet> + --> <portlet> <portlet-name>AddressBookPortlet</portlet-name> diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index ce3c2bba13..2e2c1b680e 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -120,7 +120,7 @@ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
<init-param>
<param-name>application</param-name>
- <param-value>com.vaadin.demo.PortletDemo</param-value>
+ <param-value>com.vaadin.demo.portlet.PortletDemo</param-value>
</init-param>
</servlet>
|