diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-08-10 14:54:20 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-08-10 14:54:20 +0000 |
| commit | 19ae86af9b484bcccf4ec3aed3d43a136609c842 (patch) | |
| tree | 05c3212cf8f57901a1b3193298f473fb1b06df7e /build | |
| parent | 9e92396665f26de73871ec02ef8c8a1ea62f4822 (diff) | |
| download | vaadin-framework-19ae86af9b484bcccf4ec3aed3d43a136609c842.tar.gz vaadin-framework-19ae86af9b484bcccf4ec3aed3d43a136609c842.zip | |
#7178 replaced most demo portlets with a test portlet, use it in Liferay 5 integration test
svn changeset:20276/svn branch:6.7
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 1 | ||||
| -rw-r--r-- | build/package/WebContent/WEB-INF/web.xml | 14 |
2 files changed, 1 insertions, 14 deletions
diff --git a/build/build.xml b/build/build.xml index fcf3b7bebc..fffa906ec1 100644 --- a/build/build.xml +++ b/build/build.xml @@ -831,6 +831,7 @@ <copy todir="${output-dir}/WebContent/WEB-INF/classes"> <fileset dir="${result-path}/classes"> <include name="${toolkit-package}/demo/**/*" /> + <include name="${toolkit-package}/tests/integration/**/*" /> <!-- user might want to tweak launcher classes --> <include name="${toolkit-package}/launcher/**" /> </fileset> diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml index ecc4f0fcff..cc57e0d68f 100644 --- a/build/package/WebContent/WEB-INF/web.xml +++ b/build/package/WebContent/WEB-INF/web.xml @@ -40,22 +40,8 @@ </init-param> </servlet> - <!-- Portlet demo application --> - <servlet> - <servlet-name>PortletDemo</servlet-name> - <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> - <init-param> - <param-name>application</param-name> - <param-value>com.vaadin.demo.portlet.PortletDemo</param-value> - </init-param> - </servlet> - <!-- Servlet Mappings below - see servlets for comments --> <servlet-mapping> - <servlet-name>PortletDemo</servlet-name> - <url-pattern>/PortletDemo/*</url-pattern> - </servlet-mapping> - <servlet-mapping> <servlet-name>VaadinApplicationRunner</servlet-name> <url-pattern>/run/*</url-pattern> </servlet-mapping> |