diff options
| author | Marc Englund <marc.englund@itmill.com> | 2008-04-15 09:16:32 +0000 |
|---|---|---|
| committer | Marc Englund <marc.englund@itmill.com> | 2008-04-15 09:16:32 +0000 |
| commit | 671708d240a998f33b32c9759270312ff5c83697 (patch) | |
| tree | 69789b3b21622661c5ad9212d440aa698e2ba0c5 /WebContent/WEB-INF | |
| parent | c95bf3d9ff40e79174536905450c9e62b4ef3eee (diff) | |
| download | vaadin-framework-671708d240a998f33b32c9759270312ff5c83697.tar.gz vaadin-framework-671708d240a998f33b32c9759270312ff5c83697.zip | |
Strange Liferay / Portlet problem fixed, intermediate commit.
svn changeset:4177/svn branch:trunk
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/liferay-display.xml | 6 | ||||
| -rw-r--r-- | WebContent/WEB-INF/liferay-portlet.xml | 6 | ||||
| -rw-r--r-- | WebContent/WEB-INF/portlet.xml | 12 | ||||
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 15 |
4 files changed, 26 insertions, 13 deletions
diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml index 8ba4a93f7f..c0a3308aa3 100644 --- a/WebContent/WEB-INF/liferay-display.xml +++ b/WebContent/WEB-INF/liferay-display.xml @@ -3,8 +3,8 @@ <display>
<category name="IT Mill Toolkit">
- <portlet id="PortletDemo" />
- <portlet id="Calc" />
- <portlet id="FeatureBrowser" />
+ <portlet id="PortletDemoPortlet" />
+ <portlet id="CalcPortlet" />
+ <portlet id="FeatureBrowserPortlet" />
</category>
</display>
\ No newline at end of file diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/WebContent/WEB-INF/liferay-portlet.xml index d445af65a7..d863fdac60 100644 --- a/WebContent/WEB-INF/liferay-portlet.xml +++ b/WebContent/WEB-INF/liferay-portlet.xml @@ -4,17 +4,17 @@ <liferay-portlet-app>
<portlet>
- <portlet-name>PortletDemo</portlet-name>
+ <portlet-name>PortletDemoPortlet</portlet-name>
<instanceable>true</instanceable>
<ajaxable>false</ajaxable>
</portlet>
<portlet>
- <portlet-name>Calc</portlet-name>
+ <portlet-name>CalcPortlet</portlet-name>
<instanceable>true</instanceable>
<ajaxable>false</ajaxable>
</portlet>
<portlet>
- <portlet-name>FeatureBrowser</portlet-name>
+ <portlet-name>FeatureBrowserPortlet</portlet-name>
<instanceable>true</instanceable>
<ajaxable>false</ajaxable>
</portlet>
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index e0b00b5dae..dc48102bc5 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -5,9 +5,9 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
<portlet>
- <portlet-name>PortletDemo</portlet-name>
+ <portlet-name>PortletDemoPortlet</portlet-name>
<display-name>IT Mill Toolkit PortletDemo</display-name>
- <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+ <portlet-class>com.itmill.toolkit.terminal.gwt.server.ITMillApplicationPortlet</portlet-class>
<init-param>
<name>application</name>
<value>PortletDemo</value>
@@ -37,9 +37,9 @@ </security-role-ref>
</portlet>
<portlet>
- <portlet-name>FeatureBrowser</portlet-name>
+ <portlet-name>FeatureBrowserPortlet</portlet-name>
<display-name>IT Mill Toolkit FeatureBrowser</display-name>
- <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+ <portlet-class>com.itmill.toolkit.terminal.gwt.server.ITMillApplicationPortlet</portlet-class>
<init-param>
<name>application</name>
<value>FeatureBrowser</value>
@@ -69,9 +69,9 @@ </security-role-ref>
</portlet>
<portlet>
- <portlet-name>Calc</portlet-name>
+ <portlet-name>CalcPortlet</portlet-name>
<display-name>IT Mill Toolkit Calc</display-name>
- <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+ <portlet-class>com.itmill.toolkit.terminal.gwt.server.ITMillApplicationPortlet</portlet-class>
<init-param>
<name>application</name>
<value>Calc</value>
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 78508e6b67..02817d0816 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -20,7 +20,7 @@ <context-param> <param-name>testingToolsServerUri</param-name> - <param-value>http://192.168.1.120:8099/TestingToolsServer</param-value> + <param-value>http://192.168.1.242:8099/TestingToolsServer</param-value> <description>IT Mill Testing Tools URI</description> </context-param> @@ -383,6 +383,19 @@ <param-value>com.itmill.toolkit.demo.WindowedDemos</param-value>
</init-param>
</servlet> +
+ <servlet>
+ <servlet-name>PortletDemo</servlet-name>
+ <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.itmill.toolkit.demo.PortletDemo</param-value>
+ </init-param>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PortletDemo</servlet-name>
+ <url-pattern>/PortletDemo/*</url-pattern>
+ </servlet-mapping>
<servlet-mapping> <servlet-name>ITMillToolkitApplicationRunner</servlet-name> |