summaryrefslogtreecommitdiffstats
path: root/WebContent/WEB-INF/web.xml
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-05-30 17:06:30 +0300
committerVaadin Code Review <review@vaadin.com>2013-05-30 15:08:00 +0000
commit9a3dc4e99c7a417778342db83cd6e7c05558e5fb (patch)
tree4a77e0b93e48c9f2fec4839ffae76c3334ec337b /WebContent/WEB-INF/web.xml
parentd850db60f9f7e144307bcf525d96665d1be64fc8 (diff)
downloadvaadin-framework-9a3dc4e99c7a417778342db83cd6e7c05558e5fb.tar.gz
vaadin-framework-9a3dc4e99c7a417778342db83cd6e7c05558e5fb.zip
Formatted XML files using defined rules (#11956)
Change-Id: Iecd621321fdde29d2d89d910ba46e9dadee58995
Diffstat (limited to 'WebContent/WEB-INF/web.xml')
-rw-r--r--WebContent/WEB-INF/web.xml232
1 files changed, 116 insertions, 116 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 848baea318..ba948968e2 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,134 +1,134 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app id="vaadin-uitest" version="3.0"
- xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <!-- THIS IS A DEVELOPMENT AND TESTING web.xml . -->
+ <!-- THIS IS A DEVELOPMENT AND TESTING web.xml . -->
- <display-name>Vaadin</display-name>
- <description>Vaadin examples</description>
+ <display-name>Vaadin</display-name>
+ <description>Vaadin examples</description>
- <context-param>
- <param-name>productionMode</param-name>
- <param-value>false</param-value>
- </context-param>
+ <context-param>
+ <param-name>productionMode</param-name>
+ <param-value>false</param-value>
+ </context-param>
- <context-param>
- <param-name>resourceCacheTime</param-name>
- <param-value>3600</param-value>
- </context-param>
- <servlet>
- <servlet-name>Embed App 1</servlet-name>
- <servlet-class>com.vaadin.server.LegacyVaadinServlet</servlet-class>
- <init-param>
- <param-name>application</param-name>
- <param-value>com.vaadin.tests.components.button.Buttons</param-value>
- </init-param>
- </servlet>
- <servlet>
- <servlet-name>Embed App 2</servlet-name>
- <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
- <init-param>
- <param-name>UI</param-name>
- <param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value>
- </init-param>
- </servlet>
- <servlet>
- <servlet-name>UI provider app</servlet-name>
- <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
- <init-param>
- <param-name>UIProvider</param-name>
- <param-value>com.vaadin.tests.applicationservlet.InitParamUIProvider</param-value>
- </init-param>
- <init-param>
- <param-name>UI</param-name>
- <param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value>
- </init-param>
- </servlet>
+ <context-param>
+ <param-name>resourceCacheTime</param-name>
+ <param-value>3600</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>Embed App 1</servlet-name>
+ <servlet-class>com.vaadin.server.LegacyVaadinServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.tests.components.button.Buttons</param-value>
+ </init-param>
+ </servlet>
+ <servlet>
+ <servlet-name>Embed App 2</servlet-name>
+ <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
+ <init-param>
+ <param-name>UI</param-name>
+ <param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value>
+ </init-param>
+ </servlet>
+ <servlet>
+ <servlet-name>UI provider app</servlet-name>
+ <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
+ <init-param>
+ <param-name>UIProvider</param-name>
+ <param-value>com.vaadin.tests.applicationservlet.InitParamUIProvider</param-value>
+ </init-param>
+ <init-param>
+ <param-name>UI</param-name>
+ <param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value>
+ </init-param>
+ </servlet>
- <servlet>
- <servlet-name>VaadinApplicationRunner</servlet-name>
- <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
- <!-- Non-default values for testing purposes -->
- <init-param>
- <param-name>legacyPropertyToString</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>heartbeatInterval</param-name>
- <param-value>301</param-value>
- </init-param>
- <init-param>
- <param-name>resourceCacheTime</param-name>
- <param-value>3601</param-value>
- </init-param>
- <init-param>
- <param-name>closeIdleSessions</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>testParam</param-name>
- <param-value>42</param-value>
- </init-param>
- </servlet>
+ <servlet>
+ <servlet-name>VaadinApplicationRunner</servlet-name>
+ <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
+ <!-- Non-default values for testing purposes -->
+ <init-param>
+ <param-name>legacyPropertyToString</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>heartbeatInterval</param-name>
+ <param-value>301</param-value>
+ </init-param>
+ <init-param>
+ <param-name>resourceCacheTime</param-name>
+ <param-value>3601</param-value>
+ </init-param>
+ <init-param>
+ <param-name>closeIdleSessions</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>testParam</param-name>
+ <param-value>42</param-value>
+ </init-param>
+ </servlet>
- <servlet>
- <servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
- <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
- <init-param>
- <param-name>pushmode</param-name>
- <param-value>automatic</param-value>
- </init-param>
- <async-supported>true</async-supported>
- </servlet>
+ <servlet>
+ <servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
+ <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
+ <init-param>
+ <param-name>pushmode</param-name>
+ <param-value>automatic</param-value>
+ </init-param>
+ <async-supported>true</async-supported>
+ </servlet>
- <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet -->
- <servlet>
- <servlet-name>IntegrationTest</servlet-name>
- <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
- <init-param>
- <param-name>UI</param-name>
- <param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value>
- </init-param>
- <async-supported>true</async-supported>
- </servlet>
- <servlet-mapping>
- <servlet-name>Embed App 1</servlet-name>
- <url-pattern>/embed1/*</url-pattern>
- </servlet-mapping>
+ <!-- For testing GAE - the deployment script changes this to use GAEVaadinServlet -->
+ <servlet>
+ <servlet-name>IntegrationTest</servlet-name>
+ <servlet-class>com.vaadin.server.VaadinServlet</servlet-class>
+ <init-param>
+ <param-name>UI</param-name>
+ <param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value>
+ </init-param>
+ <async-supported>true</async-supported>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Embed App 1</servlet-name>
+ <url-pattern>/embed1/*</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Embed App 2</servlet-name>
- <url-pattern>/embed2/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Embed App 2</servlet-name>
+ <url-pattern>/embed2/*</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>UI provider app</servlet-name>
- <url-pattern>/uiprovider/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>UI provider app</servlet-name>
+ <url-pattern>/uiprovider/*</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>VaadinApplicationRunner</servlet-name>
- <url-pattern>/run/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>VaadinApplicationRunner</servlet-name>
+ <url-pattern>/run/*</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
- <url-pattern>/run-push/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>VaadinApplicationRunnerWithPush</servlet-name>
+ <url-pattern>/run-push/*</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>IntegrationTest</servlet-name>
- <url-pattern>/integration/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>IntegrationTest</servlet-name>
+ <url-pattern>/integration/*</url-pattern>
+ </servlet-mapping>
- <servlet-mapping>
- <servlet-name>IntegrationTest</servlet-name>
- <url-pattern>/VAADIN/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>IntegrationTest</servlet-name>
+ <url-pattern>/VAADIN/*</url-pattern>
+ </servlet-mapping>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
</web-app>