Formatted using Eclipse formatter

svn changeset:15429/svn branch:6.5

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index b0498613e4e3a324dd5ce32dd806694801239909..69c0ce0112cd5af7aeca77e3187d87dd39880660 100644 (file)
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -3,11 +3,8 @@
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\r
     "http://java.sun.com/dtd/web-app_2_3.dtd">\r
 \r
-       <!--\r
-               THIS IS THE DEVELOPMENT web.xml Package web.xml can be found in\r
-               build/package, please update it too when making changes that should\r
-               affect the package.\r
-       -->\r
+<!-- THIS IS THE DEVELOPMENT web.xml Package web.xml can be found in build/package, \r
+       please update it too when making changes that should affect the package. -->\r
 \r
 \r
 <web-app>\r
@@ -19,17 +16,19 @@
                <param-value>false</param-value>\r
                <description>Vaadin production mode</description>\r
        </context-param>\r
-       \r
+\r
        <context-param>\r
                <param-name>resourceCacheTime</param-name>\r
-               <param-value>3600</param-value> \r
+               <param-value>3600</param-value>\r
        </context-param>\r
 \r
        <servlet>\r
                <servlet-name>VaadinApplicationRunner</servlet-name>\r
                <servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>\r
-               <init-param><param-name>defaultPackages</param-name>\r
-               <param-value>com.vaadin.tests,com.vaadin.demo,com.vaadin.tests.tickets,com.vaadin.tests.components,com.vaadin.tests.components.layouts,com.vaadin.tests.components.panel,com.vaadin.tests.components.combobox,com.vaadin.tests.components.popupview,com.vaadin.tests.components.datefield,com.vaadin.tests.components.richtextarea,com.vaadin.tests.components.absolutelayout,com.vaadin.tests.components.embedded,com.vaadin.tests.components.splitpanel,com.vaadin.tests.components.abstractfield,com.vaadin.tests.components.form,com.vaadin.tests.components.table,com.vaadin.tests.components.accordion,com.vaadin.tests.components.label,com.vaadin.tests.components.tabsheet,com.vaadin.tests.components.beanitemcontainer,com.vaadin.tests.components.link,com.vaadin.tests.components.textfield,com.vaadin.tests.components.button,com.vaadin.tests.components.optiongroup,com.vaadin.tests.components.tree,com.vaadin.tests.components.caption,com.vaadin.tests.components.orderedlayout,com.vaadin.tests.components.window,com.vaadin.tests.dd</param-value></init-param>\r
+               <init-param>\r
+                       <param-name>defaultPackages</param-name>\r
+                       <param-value>com.vaadin.tests,com.vaadin.demo,com.vaadin.tests.tickets,com.vaadin.tests.components,com.vaadin.tests.components.layouts,com.vaadin.tests.components.panel,com.vaadin.tests.components.combobox,com.vaadin.tests.components.popupview,com.vaadin.tests.components.datefield,com.vaadin.tests.components.richtextarea,com.vaadin.tests.components.absolutelayout,com.vaadin.tests.components.embedded,com.vaadin.tests.components.splitpanel,com.vaadin.tests.components.abstractfield,com.vaadin.tests.components.form,com.vaadin.tests.components.table,com.vaadin.tests.components.accordion,com.vaadin.tests.components.label,com.vaadin.tests.components.tabsheet,com.vaadin.tests.components.beanitemcontainer,com.vaadin.tests.components.link,com.vaadin.tests.components.textfield,com.vaadin.tests.components.button,com.vaadin.tests.components.optiongroup,com.vaadin.tests.components.tree,com.vaadin.tests.components.caption,com.vaadin.tests.components.orderedlayout,com.vaadin.tests.components.window,com.vaadin.tests.dd</param-value>\r
+               </init-param>\r
        </servlet>\r
 \r
 \r
@@ -119,7 +118,7 @@
                        <param-value>com.vaadin.tests.RandomLayoutStress</param-value>\r
                </init-param>\r
        </servlet>\r
-       \r
+\r
        <servlet>\r
                <servlet-name>PortletDemo</servlet-name>\r
                <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
@@ -127,7 +126,7 @@
                        <param-name>application</param-name>\r
                        <param-value>com.vaadin.demo.portlet.PortletDemo</param-value>\r
                </init-param>\r
-       </servlet>      \r
+       </servlet>\r
 \r
        <servlet>\r
                <servlet-name>CustomLayoutDemo</servlet-name>\r
@@ -208,15 +207,10 @@
                        <param-name>application</param-name>\r
                        <param-value>com.vaadin.tests.TreeFilesystemContainer</param-value>\r
                </init-param>\r
-               <!--\r
-                       Set this property if demo cannot access context base directory\r
-                       because of Application Server or Servlet Container security\r
-                       constraints\r
-               -->\r
-               <!--\r
-                       <init-param> <param-name>sampleDirectory</param-name>\r
-                       <param-value>/mySampleDirectory</param-value> </init-param>\r
-               -->\r
+               <!-- Set this property if demo cannot access context base directory because \r
+                       of Application Server or Servlet Container security constraints -->\r
+               <!-- <init-param> <param-name>sampleDirectory</param-name> <param-value>/mySampleDirectory</param-value> \r
+                       </init-param> -->\r
        </servlet>\r
 \r
        <servlet>\r
@@ -226,15 +220,10 @@
                        <param-name>application</param-name>\r
                        <param-value>com.vaadin.tests.TreeFilesystem</param-value>\r
                </init-param>\r
-               <!--\r
-                       Set this property if demo cannot access context base directory\r
-                       because of Application Server or Servlet Container security\r
-                       constraints\r
-               -->\r
-               <!--\r
-                       <init-param> <param-name>sampleDirectory</param-name>\r
-                       <param-value>/mySampleDirectory</param-value> </init-param>\r
-               -->\r
+               <!-- Set this property if demo cannot access context base directory because \r
+                       of Application Server or Servlet Container security constraints -->\r
+               <!-- <init-param> <param-name>sampleDirectory</param-name> <param-value>/mySampleDirectory</param-value> \r
+                       </init-param> -->\r
        </servlet>\r
 \r
        <servlet>\r
@@ -407,12 +396,12 @@
                <servlet-name>ChatServlet</servlet-name>\r
                <url-pattern>/chat/*</url-pattern>\r
        </servlet-mapping>\r
-       \r
+\r
        <servlet-mapping>\r
                <servlet-name>PortletDemo</servlet-name>\r
                <url-pattern>/PortletDemo/*</url-pattern>\r
        </servlet-mapping>\r
-       \r
+\r
        <servlet-mapping>\r
                <servlet-name>GAESyncTest</servlet-name>\r
                <url-pattern>/gaesynctest/*</url-pattern>\r
@@ -422,12 +411,12 @@
                <servlet-name>AddressBook</servlet-name>\r
                <url-pattern>/AddressBook/*</url-pattern>\r
        </servlet-mapping>\r
-       \r
+\r
        <servlet-mapping>\r
                <servlet-name>ReindeerThemeStyles</servlet-name>\r
                <url-pattern>/ReindeerTheme/*</url-pattern>\r
        </servlet-mapping>\r
-       \r
+\r
        <servlet-mapping>\r
                <servlet-name>RunoTheme</servlet-name>\r
                <url-pattern>/RunoTheme/*</url-pattern>\r