summaryrefslogtreecommitdiffstats
path: root/build/package/WebContent
diff options
context:
space:
mode:
authorMarko Grönroos <magi@iki.fi>2008-05-07 13:41:49 +0000
committerMarko Grönroos <magi@iki.fi>2008-05-07 13:41:49 +0000
commit79e164ecbea35810763660ecca2717bfe5e18c2a (patch)
tree926b3ced8a397a3b4bf45db196970eed8308d118 /build/package/WebContent
parentd5e867897166f099be2654238caeced4935495d1 (diff)
downloadvaadin-framework-79e164ecbea35810763660ecca2717bfe5e18c2a.tar.gz
vaadin-framework-79e164ecbea35810763660ecca2717bfe5e18c2a.zip
Changed build result path from /result to build/result.
svn changeset:4374/svn branch:trunk
Diffstat (limited to 'build/package/WebContent')
-rw-r--r--build/package/WebContent/WEB-INF/web.xml36
1 files changed, 35 insertions, 1 deletions
diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index 686e74ddd9..2cada40fb4 100644
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -66,6 +66,15 @@
</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>
<servlet-name>BrowserDemo</servlet-name>
<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
@@ -107,6 +116,19 @@
</servlet>
<servlet>
+ <servlet-name>SimpleReserver</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.reservation.simple.SimpleReserver</param-value>
+ </init-param>
+ <init-param>
+ <param-name>widgetset</param-name>
+ <param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+ </init-param>
+ </servlet>
+
+ <servlet>
<servlet-name>SelectDemo</servlet-name>
<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
<init-param>
@@ -307,7 +329,13 @@
<servlet-class>com.itmill.toolkit.automatedtests.util.StatusServlet</servlet-class>
</servlet>
<!-- Section ends: Automated tests used by Testing Tools plug-in client -->
-
+
+ <servlet-mapping>
+ <servlet-name>PortletDemo</servlet-name>
+ <url-pattern>/PortletDemo/*</url-pattern>
+ <!-- portlet -->
+ </servlet-mapping>
+
<servlet-mapping>
<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
<url-pattern>/run/*</url-pattern>
@@ -350,6 +378,12 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>SimpleReserver</servlet-name>
+ <url-pattern>/SimpleReserver/*</url-pattern>
+ <!-- portlet style=height:400px -->
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>SelectDemo</servlet-name>
<url-pattern>/SelectDemo/*</url-pattern>
</servlet-mapping>