diff options
| author | Ilia Motornyi <elmot@vaadin.com> | 2018-05-17 11:02:49 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2018-05-17 11:02:49 +0300 |
| commit | 0e97fadbf9c57c3c6504c46a5f080f050d1bf288 (patch) | |
| tree | 667d32bbb9f658595f5c63b16ff829be8dd225e2 /uitest/src/main/webapp | |
| parent | cebb74c38ba133453c8c97ce5b5fd0d15ab4ff21 (diff) | |
| download | vaadin-framework-0e97fadbf9c57c3c6504c46a5f080f050d1bf288.tar.gz vaadin-framework-0e97fadbf9c57c3c6504c46a5f080f050d1bf288.zip | |
Enable maven formatting for uitest (#10908)
Diffstat (limited to 'uitest/src/main/webapp')
| -rw-r--r-- | uitest/src/main/webapp/WEB-INF/portlet.xml | 4 | ||||
| -rw-r--r-- | uitest/src/main/webapp/WEB-INF/web.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/uitest/src/main/webapp/WEB-INF/portlet.xml b/uitest/src/main/webapp/WEB-INF/portlet.xml index 3886dc65e9..3276048afb 100644 --- a/uitest/src/main/webapp/WEB-INF/portlet.xml +++ b/uitest/src/main/webapp/WEB-INF/portlet.xml @@ -40,6 +40,6 @@ </security-role-ref> </portlet> - <!-- This can be used to work around an issue in liferay 5.0-5.1.1 <container-runtime-option> + <!-- This can be used to work around an issue in liferay 5.0-5.1.1 <container-runtime-option> <name>javax.portlet.escapeXml</name> <value>false</value> </container-runtime-option> --> -</portlet-app>
\ No newline at end of file +</portlet-app> diff --git a/uitest/src/main/webapp/WEB-INF/web.xml b/uitest/src/main/webapp/WEB-INF/web.xml index 1771a0bd98..a52478bb0c 100644 --- a/uitest/src/main/webapp/WEB-INF/web.xml +++ b/uitest/src/main/webapp/WEB-INF/web.xml @@ -115,8 +115,8 @@ </servlet> <servlet> - <!-- This servlet is a separate instance for the sole purpose of - testing #12446 (com.vaadin.tests.components.ui.TimeoutRedirectResetsOnActivity) + <!-- This servlet is a separate instance for the sole purpose of + testing #12446 (com.vaadin.tests.components.ui.TimeoutRedirectResetsOnActivity) because it modifies the VaadinService timeout parameters --> <servlet-name>VaadinApplicationRunnerWithTimeoutRedirect</servlet-name> <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> |