summaryrefslogtreecommitdiffstats
path: root/WebContent/WEB-INF
diff options
context:
space:
mode:
authorMarc Englund <marc.englund@itmill.com>2008-04-28 10:00:40 +0000
committerMarc Englund <marc.englund@itmill.com>2008-04-28 10:00:40 +0000
commit08decaa1a93f8608fac40a95fbe4127ad1c835a0 (patch)
treea5cb10e2496732c00341d2f1785b8b6e05155743 /WebContent/WEB-INF
parent25f8a7cbf5f07cdfbaaa941769a63b0f76b1b530 (diff)
downloadvaadin-framework-08decaa1a93f8608fac40a95fbe4127ad1c835a0.tar.gz
vaadin-framework-08decaa1a93f8608fac40a95fbe4127ad1c835a0.zip
SimpleReserver added, special portlet comments added
svn changeset:4258/svn branch:trunk
Diffstat (limited to 'WebContent/WEB-INF')
-rw-r--r--WebContent/WEB-INF/web.xml33
1 files changed, 31 insertions, 2 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index d3d33ff943..5e1dc879e5 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -145,6 +145,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>CalendarDemo</servlet-name>
<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
<init-param>
@@ -407,12 +420,13 @@
<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>
+ <param-value>com.itmill.toolkit.demo.portlet.PortletDemo</param-value>
</init-param>
</servlet>
<servlet-mapping>
<servlet-name>PortletDemo</servlet-name>
<url-pattern>/PortletDemo/*</url-pattern>
+ <!-- portlet -->
</servlet-mapping>
<servlet-mapping>
@@ -466,6 +480,12 @@
<url-pattern>/Reservr/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SimpleReserver</servlet-name>
+ <url-pattern>/SimpleReserver/*</url-pattern>
+ <!-- portlet style=height:400px -->
+ </servlet-mapping>
+
<servlet-mapping>
<servlet-name>CalendarDemo</servlet-name>
<url-pattern>/CalendarDemo/*</url-pattern>
@@ -474,6 +494,7 @@
<servlet-mapping>
<servlet-name>SelectDemo</servlet-name>
<url-pattern>/SelectDemo/*</url-pattern>
+ <!-- portlet -->
</servlet-mapping>
<servlet-mapping>
@@ -484,6 +505,7 @@
<servlet-mapping>
<servlet-name>TableDemo</servlet-name>
<url-pattern>/TableDemo/*</url-pattern>
+ <!-- portlet -->
</servlet-mapping>
<servlet-mapping>
@@ -499,11 +521,13 @@
<servlet-mapping>
<servlet-name>FilterSelect</servlet-name>
<url-pattern>/FilterSelect/*</url-pattern>
+ <!-- portlet -->
</servlet-mapping>
<servlet-mapping>
<servlet-name>FeatureBrowser</servlet-name>
<url-pattern>/FeatureBrowser/*</url-pattern>
+ <!-- portlet style=height:650px -->
</servlet-mapping>
<servlet-mapping>
@@ -539,6 +563,7 @@
<servlet-mapping>
<servlet-name>ModalWindow</servlet-name>
<url-pattern>/ModalWindow/*</url-pattern>
+ <!-- portlet -->
</servlet-mapping>
<servlet-mapping>
@@ -549,6 +574,7 @@
<servlet-mapping>
<servlet-name>Calc</servlet-name>
<url-pattern>/Calc/*</url-pattern>
+ <!-- portlet -->
</servlet-mapping>
<servlet-mapping>
@@ -574,6 +600,7 @@
<servlet-mapping>
<servlet-name>NotificationDemo</servlet-name>
<url-pattern>/NotificationDemo/*</url-pattern>
+ <!-- portlet -->
</servlet-mapping>
<servlet-mapping>
@@ -588,12 +615,14 @@
<servlet-mapping>
<servlet-name>ChatServlet</servlet-name>
- <url-pattern>/chat/*</url-pattern>
+ <url-pattern>/chat/*</url-pattern>
+ <!-- portlet -->
</servlet-mapping>
<servlet-mapping>
<servlet-name>BrowserDemo</servlet-name>
<url-pattern>/BrowserDemo/*</url-pattern>
+ <!-- portlet style=height:650px -->
</servlet-mapping>
<servlet-mapping>