SimpleReserver added, special portlet comments added

svn changeset:4258/svn branch:trunk

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index d3d33ff94340628f0ac9d3bcdc4a781097e3c193..5e1dc879e565f0eb6c6fdc5694314a9695ee7f04 100644 (file)
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -144,6 +144,19 @@
     </init-param>\r
   </servlet>\r
   \r
+  <servlet>\r
+    <servlet-name>SimpleReserver</servlet-name>\r
+    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>\r
+    <init-param>\r
+      <param-name>application</param-name>\r
+      <param-value>com.itmill.toolkit.demo.reservation.simple.SimpleReserver</param-value>\r
+    </init-param>\r
+    <init-param>\r
+      <param-name>widgetset</param-name>\r
+      <param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>\r
+    </init-param>\r
+  </servlet>\r
+  \r
   <servlet>\r
     <servlet-name>CalendarDemo</servlet-name>\r
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>\r
@@ -407,12 +420,13 @@
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>\r
     <init-param>\r
       <param-name>application</param-name>\r
-      <param-value>com.itmill.toolkit.demo.PortletDemo</param-value>\r
+      <param-value>com.itmill.toolkit.demo.portlet.PortletDemo</param-value>\r
     </init-param>\r
   </servlet>\r
  <servlet-mapping>\r
     <servlet-name>PortletDemo</servlet-name>\r
     <url-pattern>/PortletDemo/*</url-pattern>\r
+    <!-- portlet -->\r
   </servlet-mapping> \r
   
        <servlet-mapping>
@@ -466,6 +480,12 @@
     <url-pattern>/Reservr/*</url-pattern>\r
   </servlet-mapping>\r
   \r
+ <servlet-mapping>\r
+    <servlet-name>SimpleReserver</servlet-name>\r
+    <url-pattern>/SimpleReserver/*</url-pattern>\r
+    <!-- portlet style=height:400px -->\r
+  </servlet-mapping>\r
+  \r
   <servlet-mapping>\r
     <servlet-name>CalendarDemo</servlet-name>\r
     <url-pattern>/CalendarDemo/*</url-pattern>\r
@@ -474,6 +494,7 @@
   <servlet-mapping>\r
     <servlet-name>SelectDemo</servlet-name>\r
     <url-pattern>/SelectDemo/*</url-pattern>\r
+    <!-- portlet -->\r
   </servlet-mapping>\r
 \r
   <servlet-mapping>\r
@@ -484,6 +505,7 @@
   <servlet-mapping>\r
     <servlet-name>TableDemo</servlet-name>\r
     <url-pattern>/TableDemo/*</url-pattern>\r
+    <!-- portlet -->\r
   </servlet-mapping>\r
 \r
   <servlet-mapping>\r
@@ -499,11 +521,13 @@
   <servlet-mapping>\r
     <servlet-name>FilterSelect</servlet-name>\r
     <url-pattern>/FilterSelect/*</url-pattern>\r
+    <!-- portlet -->\r
   </servlet-mapping>\r
 \r
  <servlet-mapping>\r
     <servlet-name>FeatureBrowser</servlet-name>\r
     <url-pattern>/FeatureBrowser/*</url-pattern>\r
+    <!-- portlet style=height:650px -->\r
   </servlet-mapping>\r
 \r
   <servlet-mapping>\r
@@ -539,6 +563,7 @@
   <servlet-mapping>\r
     <servlet-name>ModalWindow</servlet-name>\r
     <url-pattern>/ModalWindow/*</url-pattern>\r
+    <!-- portlet -->\r
   </servlet-mapping>\r
 \r
   <servlet-mapping>\r
@@ -549,6 +574,7 @@
   <servlet-mapping>\r
     <servlet-name>Calc</servlet-name>\r
     <url-pattern>/Calc/*</url-pattern>\r
+    <!-- portlet -->\r
   </servlet-mapping>\r
 \r
   <servlet-mapping>\r
@@ -574,6 +600,7 @@
   <servlet-mapping>\r
     <servlet-name>NotificationDemo</servlet-name>\r
     <url-pattern>/NotificationDemo/*</url-pattern>\r
+    <!-- portlet -->\r
   </servlet-mapping>\r
 
   <servlet-mapping>
@@ -588,12 +615,14 @@
 
   <servlet-mapping>
     <servlet-name>ChatServlet</servlet-name>
-    <url-pattern>/chat/*</url-pattern>
+    <url-pattern>/chat/*</url-pattern>\r
+    <!-- portlet -->
   </servlet-mapping>
 
   <servlet-mapping>\r
     <servlet-name>BrowserDemo</servlet-name>\r
     <url-pattern>/BrowserDemo/*</url-pattern>\r
+    <!-- portlet style=height:650px -->\r
   </servlet-mapping>\r
 \r
   <servlet-mapping>\r