diff options
| author | Artur Signell <artur.signell@itmill.com> | 2012-02-02 09:20:29 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2012-02-02 09:20:29 +0000 |
| commit | 98737932a588f1b4a8f8115f2545da63ae7f4e4a (patch) | |
| tree | d35a758200b6c75f12de9325c8c80f5fc5103746 /WebContent/WEB-INF | |
| parent | 7c200d4e869139ff72e848e973cd5ce5932908d8 (diff) | |
| download | vaadin-framework-98737932a588f1b4a8f8115f2545da63ae7f4e4a.tar.gz vaadin-framework-98737932a588f1b4a8f8115f2545da63ae7f4e4a.zip | |
#8311 Converted CRLF -> LF in css/html/xml files
svn changeset:22852/svn branch:6.7
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index b83979acc6..73d9951d21 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -1,61 +1,61 @@ -<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<!-- THIS IS A DEVELOPMENT AND TESTING web.xml . -->
-
-<web-app>
- <display-name>Vaadin</display-name>
- <description>Vaadin examples</description>
-
- <context-param>
- <param-name>productionMode</param-name>
- <param-value>false</param-value>
- <description>Vaadin production mode</description>
- </context-param>
-
- <context-param>
- <param-name>resourceCacheTime</param-name>
- <param-value>3600</param-value>
- </context-param>
-
- <servlet>
- <servlet-name>VaadinApplicationRunner</servlet-name>
- <servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>
- <init-param>
- <param-name>defaultPackages</param-name>
- <param-value>com.vaadin.tests,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,com.vaadin.tests.validation</param-value>
- </init-param>
- </servlet>
-
- <!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet -->
- <servlet>
- <servlet-name>IntegrationTest</servlet-name>
- <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
- <init-param>
- <param-name>application</param-name>
- <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>VaadinApplicationRunner</servlet-name>
- <url-pattern>/run/*</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>
-
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
+<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE web-app + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> + +<!-- THIS IS A DEVELOPMENT AND TESTING web.xml . --> + +<web-app> + <display-name>Vaadin</display-name> + <description>Vaadin examples</description> + + <context-param> + <param-name>productionMode</param-name> + <param-value>false</param-value> + <description>Vaadin production mode</description> + </context-param> + + <context-param> + <param-name>resourceCacheTime</param-name> + <param-value>3600</param-value> + </context-param> + + <servlet> + <servlet-name>VaadinApplicationRunner</servlet-name> + <servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class> + <init-param> + <param-name>defaultPackages</param-name> + <param-value>com.vaadin.tests,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,com.vaadin.tests.validation</param-value> + </init-param> + </servlet> + + <!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet --> + <servlet> + <servlet-name>IntegrationTest</servlet-name> + <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> + <init-param> + <param-name>application</param-name> + <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value> + </init-param> + </servlet> + + <servlet-mapping> + <servlet-name>VaadinApplicationRunner</servlet-name> + <url-pattern>/run/*</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> + + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> |