diff options
| author | Artur Signell <artur.signell@itmill.com> | 2009-02-17 13:27:24 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2009-02-17 13:27:24 +0000 |
| commit | 421161b20fe4a53d0d4a663796927b561388a942 (patch) | |
| tree | 1139eea696af0dc56f3e788896a2be4c6bcc51b4 /build/package | |
| parent | a881365f771d8e8231f1e7f6f167742c6ed3ae31 (diff) | |
| download | vaadin-framework-421161b20fe4a53d0d4a663796927b561388a942.tar.gz vaadin-framework-421161b20fe4a53d0d4a663796927b561388a942.zip | |
Fixed build problem (missing beancontainer.jar)
Updated portlet configuration generator to include actual demos and to use sampler widgetset
Re-added PortletDemo which demonstrates portal integration
svn changeset:6873/svn branch:trunk
Diffstat (limited to 'build/package')
| -rw-r--r-- | build/package/WebContent/WEB-INF/web.xml | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml index 26878ed651..ae6bfab666 100644 --- a/build/package/WebContent/WEB-INF/web.xml +++ b/build/package/WebContent/WEB-INF/web.xml @@ -167,6 +167,16 @@ </init-param> </servlet> + <!-- Portlet demo application --> + <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> + <!-- Layout demo (ToolkitTunes) --> <servlet> <servlet-name>ToolkitTunesLayout</servlet-name> @@ -193,6 +203,12 @@ <!-- Servlet Mappings below - see servlets for comments --> <servlet-mapping> + <servlet-name>PortletDemo</servlet-name> + <url-pattern>/PortletDemo/*</url-pattern> + <!-- Hint for the automatic deployment descriptor generator --> + <!-- portlet style= --> + </servlet-mapping> + <servlet-mapping> <servlet-name>ITMillToolkitApplicationRunner</servlet-name> <url-pattern>/run/*</url-pattern> </servlet-mapping> @@ -203,8 +219,6 @@ <servlet-mapping> <servlet-name>SimpleReserver</servlet-name> <url-pattern>/SimpleReserver/*</url-pattern> - <!-- Hint for the automatic deployment descriptor generator --> - <!-- portlet style=height:400px --> </servlet-mapping> <servlet-mapping> <servlet-name>CalendarDemo</servlet-name> @@ -225,8 +239,6 @@ <servlet-mapping> <servlet-name>AddressBook</servlet-name> <url-pattern>/AddressBook/*</url-pattern> - <!-- Hint for the automatic deployment descriptor generator --> - <!-- portlet style=height:650px --> </servlet-mapping> <servlet-mapping> <servlet-name>HelloWorld</servlet-name> @@ -236,7 +248,7 @@ <servlet-name>Calc</servlet-name> <url-pattern>/Calc/*</url-pattern> <!-- Hint for the automatic deployment descriptor generator --> - <!-- portlet --> + <!-- portlet style= --> </servlet-mapping> <servlet-mapping> <servlet-name>ColorPickerApplication</servlet-name> |