From 9a3dc4e99c7a417778342db83cd6e7c05558e5fb Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 30 May 2013 17:06:30 +0300 Subject: [PATCH] Formatted XML files using defined rules (#11956) Change-Id: Iecd621321fdde29d2d89d910ba46e9dadee58995 --- WebContent/WEB-INF/liferay-display.xml | 2 +- WebContent/WEB-INF/liferay-portlet.xml | 6 +- WebContent/WEB-INF/portlet.xml | 116 +- WebContent/WEB-INF/web.xml | 232 ++-- all/build.xml | 249 ++-- all/ivy.xml | 17 +- build.xml | 131 +- build/common.xml | 80 +- build/ide.xml | 311 ++--- buildhelpers/build.xml | 93 +- buildhelpers/ivy.xml | 2 +- client-compiled/build.xml | 280 ++-- client-compiled/ivy.xml | 4 +- client-compiler/build.xml | 108 +- client-compiler/ivy.xml | 106 +- client/build.xml | 117 +- .../src/com/vaadin/DefaultWidgetSet.gwt.xml | 14 +- client/src/com/vaadin/Vaadin.gwt.xml | 25 +- .../VaadinBrowserSpecificOverrides.gwt.xml | 101 +- common.xml | 875 ++++++------ gwt-files.xml | 370 +++--- ivy-taskdefs.xml | 38 +- ivysettings.xml | 3 +- publish.xml | 127 +- push/build.xml | 131 +- push/ivy.xml | 17 +- server/build.xml | 113 +- server/ivy.xml | 12 +- shared/build.xml | 106 +- theme-compiler/build.xml | 114 +- themes/build.xml | 214 +-- themes/ivy.xml | 4 +- uitest/build.xml | 301 +++-- uitest/integration_base_files/base.xml | 253 ++-- uitest/integration_tests.xml | 1169 +++++++++-------- uitest/ivy.xml | 10 +- .../tests/widgetset/TestingWidgetSet.gwt.xml | 15 +- uitest/test.xml | 412 +++--- uitest/vaadin-server.xml | 58 +- 39 files changed, 3327 insertions(+), 3009 deletions(-) diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml index 12a8e4315b..014ed31b47 100644 --- a/WebContent/WEB-INF/liferay-display.xml +++ b/WebContent/WEB-INF/liferay-display.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/WebContent/WEB-INF/liferay-portlet.xml index 5a8d6fac8e..ea060ce44a 100644 --- a/WebContent/WEB-INF/liferay-portlet.xml +++ b/WebContent/WEB-INF/liferay-portlet.xml @@ -4,7 +4,7 @@ JSR286TestPortlet - false + false false @@ -12,7 +12,7 @@ false false - + administrator Administrator @@ -29,5 +29,5 @@ user User - + \ No newline at end of file diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index 45ce1eee83..3a603c43ae 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -1,85 +1,79 @@ + version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> - - JSR286TestPortlet - Vaadin Portlet 2.0 Test - com.vaadin.server.VaadinPortlet - - ui - com.vaadin.tests.integration.JSR286Portlet - - - widgetset - com.vaadin.DefaultWidgetSet - - - text/html - view - edit - help - - - Vaadin Portlet 2.0 Test - Vaadin Portlet 2.0 Test - + + JSR286TestPortlet + Vaadin Portlet 2.0 Test + com.vaadin.server.VaadinPortlet + + ui + com.vaadin.tests.integration.JSR286Portlet + + + widgetset + com.vaadin.DefaultWidgetSet + + + text/html + view + edit + help + + + Vaadin Portlet 2.0 Test + Vaadin Portlet 2.0 Test + - - administrator - - - guest - - - power-user - - - user - - + + administrator + + + guest + + + power-user + + + user + + - + Vaadin Liferay Theme Portlet Vaadin Liferay Theme - + com.vaadin.server.LegacyVaadinPortlet application com.vaadin.tests.integration.LiferayThemeDemo - + text/html view - + Vaadin Liferay Theme Vaadin Liferay Theme - + + + administrator + + + guest + - administrator - - - guest - - - power-user - - - user - + power-user + + + user + - + \ No newline at end of file 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 @@ + 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"> - + - Vaadin - Vaadin examples + Vaadin + Vaadin examples - - productionMode - false - + + productionMode + false + - - resourceCacheTime - 3600 - - - Embed App 1 - com.vaadin.server.LegacyVaadinServlet - - application - com.vaadin.tests.components.button.Buttons - - - - Embed App 2 - com.vaadin.server.VaadinServlet - - UI - com.vaadin.tests.components.label.MarginsInLabels - - - - UI provider app - com.vaadin.server.VaadinServlet - - UIProvider - com.vaadin.tests.applicationservlet.InitParamUIProvider - - - UI - com.vaadin.tests.VerifyAssertionsEnabled - - + + resourceCacheTime + 3600 + + + Embed App 1 + com.vaadin.server.LegacyVaadinServlet + + application + com.vaadin.tests.components.button.Buttons + + + + Embed App 2 + com.vaadin.server.VaadinServlet + + UI + com.vaadin.tests.components.label.MarginsInLabels + + + + UI provider app + com.vaadin.server.VaadinServlet + + UIProvider + com.vaadin.tests.applicationservlet.InitParamUIProvider + + + UI + com.vaadin.tests.VerifyAssertionsEnabled + + - - VaadinApplicationRunner - com.vaadin.launcher.ApplicationRunnerServlet - - - legacyPropertyToString - false - - - heartbeatInterval - 301 - - - resourceCacheTime - 3601 - - - closeIdleSessions - true - - - testParam - 42 - - + + VaadinApplicationRunner + com.vaadin.launcher.ApplicationRunnerServlet + + + legacyPropertyToString + false + + + heartbeatInterval + 301 + + + resourceCacheTime + 3601 + + + closeIdleSessions + true + + + testParam + 42 + + - - VaadinApplicationRunnerWithPush - com.vaadin.launcher.ApplicationRunnerServlet - - pushmode - automatic - - true - + + VaadinApplicationRunnerWithPush + com.vaadin.launcher.ApplicationRunnerServlet + + pushmode + automatic + + true + - - - IntegrationTest - com.vaadin.server.VaadinServlet - - UI - com.vaadin.tests.integration.IntegrationTestUI - - true - - - Embed App 1 - /embed1/* - + + + IntegrationTest + com.vaadin.server.VaadinServlet + + UI + com.vaadin.tests.integration.IntegrationTestUI + + true + + + Embed App 1 + /embed1/* + - - Embed App 2 - /embed2/* - + + Embed App 2 + /embed2/* + - - UI provider app - /uiprovider/* - + + UI provider app + /uiprovider/* + - - VaadinApplicationRunner - /run/* - + + VaadinApplicationRunner + /run/* + - - VaadinApplicationRunnerWithPush - /run-push/* - + + VaadinApplicationRunnerWithPush + /run-push/* + - - IntegrationTest - /integration/* - + + IntegrationTest + /integration/* + - - IntegrationTest - /VAADIN/* - + + IntegrationTest + /VAADIN/* + - - index.html - + + index.html + diff --git a/all/build.xml b/all/build.xml index 4e1a557e53..a83d60b382 100644 --- a/all/build.xml +++ b/all/build.xml @@ -1,120 +1,137 @@ - - - Compiles a zip containing all jars + dependencies - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <h1>${title}</h1> - - ${javadoc.bottom} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Compiles a zip containing all jars + dependencies + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <h1>${title}</h1> + + ${javadoc.bottom} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/all/ivy.xml b/all/ivy.xml index 2b212f6675..3c49e9a884 100644 --- a/all/ivy.xml +++ b/all/ivy.xml @@ -19,21 +19,20 @@ + rev="${vaadin.version}" /> + rev="${vaadin.version}" /> + rev="${vaadin.version}" /> + rev="${vaadin.version}" /> + rev="${vaadin.version}" /> + rev="${vaadin.version}" /> - + rev="${vaadin.version}" /> + diff --git a/build.xml b/build.xml index 37e4afd03b..192d034b9b 100644 --- a/build.xml +++ b/build.xml @@ -1,71 +1,78 @@ - - + + - + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - Java version is ${ant.java.version} as required. - + + + + + + Java version is ${ant.java.version} as required. + diff --git a/build/common.xml b/build/common.xml index 1fc6349a46..ee60c1ff42 100644 --- a/build/common.xml +++ b/build/common.xml @@ -1,59 +1,65 @@ - - - + xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" + name="common" basedir="../" default="init-deps"> + + + - - + + - + - - - - + + + + - - + + + + + + + + + + - - - - - - - - Loading Ant tasks - + - - - - + + + + - - + + - - + uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" /> + + + classpathref="taskdefs.classpath" /> diff --git a/build/ide.xml b/build/ide.xml index b1845020f3..5380536e2e 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -1,152 +1,165 @@ - - - - - - - - - - - - - Using gwt files from ${gwt.user.classes} and ${gwt.dev.classes} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Compiling ${module} to ${module.output.dir} with parameters -logLevel TRACE -style ${style} -localWorkers ${localWorkers} -strict ${extraParams} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${vaadinPush.js.contents} - + + + + + + + + + + + + + Using gwt files from ${gwt.user.classes} and + ${gwt.dev.classes} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Compiling ${module} to ${module.output.dir} with + parameters -logLevel TRACE -style ${style} -localWorkers + ${localWorkers} -strict ${extraParams} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vaadinPush.js.contents} + \ No newline at end of file diff --git a/buildhelpers/build.xml b/buildhelpers/build.xml index a101bff191..aa1eb8cb0d 100644 --- a/buildhelpers/build.xml +++ b/buildhelpers/build.xml @@ -1,50 +1,51 @@ - - Compiles build helpers used when building other modules. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WHAT? No JUnit tests for ${module.name}! - + + Compiles build helpers used when building other modules. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WHAT? No JUnit tests for ${module.name}! + \ No newline at end of file diff --git a/buildhelpers/ivy.xml b/buildhelpers/ivy.xml index 7c0a7b82a7..21c2a808cc 100644 --- a/buildhelpers/ivy.xml +++ b/buildhelpers/ivy.xml @@ -28,7 +28,7 @@ - + diff --git a/client-compiled/build.xml b/client-compiled/build.xml index c9c3244c0e..01bf2fa15e 100644 --- a/client-compiled/build.xml +++ b/client-compiled/build.xml @@ -1,139 +1,149 @@ - - - Compiled (JS+HTML) version of client side - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating gwtar files for ${module} in ${gwtar.dir} - - - - - - - - - - - - - - - - - - - - - - - - - - Compiling ${module} to ${module.output.dir} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No java files in module - - - - WHAT? No tests for ${module.name}! - + + + Compiled (JS+HTML) version of client side + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Creating gwtar files for ${module} in ${gwtar.dir} + + + + + + + + + + + + + + + + + + + + + + + + + + Compiling ${module} to ${module.output.dir} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No java files in module + + + + WHAT? No tests for ${module.name}! + diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml index 7802775f70..2f1dcfd22f 100644 --- a/client-compiled/ivy.xml +++ b/client-compiled/ivy.xml @@ -14,8 +14,8 @@ - - + + diff --git a/client-compiler/build.xml b/client-compiler/build.xml index cd8433f1cf..0ed4d7b0e3 100644 --- a/client-compiler/build.xml +++ b/client-compiler/build.xml @@ -1,68 +1,70 @@ - - - Compiles build helpers used when building other modules. - - - - + + + Compiles build helpers used when building other modules. + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - gwt.version=${vaadin.version} -gwt.svnrev=${git.revision} + gwt.version=${vaadin.version} + gwt.svnrev=${git.revision} - - - + + + - + - - - - - + + + + + - - + + - - - + + + - - - - - + + + + + - - - WHAT? No tests for ${module.name}! - + + + WHAT? No tests for ${module.name}! + \ No newline at end of file diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml index 64c0de2830..f66a2e0255 100644 --- a/client-compiler/ivy.xml +++ b/client-compiler/ivy.xml @@ -1,62 +1,64 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" + xmlns:m="http://ant.apache.org/ivy/maven"> - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - + - + diff --git a/client/build.xml b/client/build.xml index a2262eed7d..a027d00f60 100644 --- a/client/build.xml +++ b/client/build.xml @@ -1,43 +1,46 @@ - - - Compiles build helpers used when building other modules. - - - - + + + Compiles build helpers used when building other modules. + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - - - + + + + + - - - + + + \ No newline at end of file diff --git a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml index 26ab7478e0..3aba1f6fee 100755 --- a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml +++ b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml @@ -1,13 +1,13 @@ - + - - + + - + - + diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml index a4eb88d9b4..31eb703e3c 100644 --- a/client/src/com/vaadin/Vaadin.gwt.xml +++ b/client/src/com/vaadin/Vaadin.gwt.xml @@ -12,13 +12,14 @@ - + - + - + @@ -40,19 +41,21 @@ - - + + - - - + + + - - + + - + diff --git a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml b/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml index ba6c171a7d..45ede928f5 100644 --- a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml +++ b/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml @@ -1,54 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common.xml b/common.xml index c0c5ca5eb5..e46cefd895 100644 --- a/common.xml +++ b/common.xml @@ -1,407 +1,472 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <h1>${module.name}</h1> - - ${javadoc.bottom} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ##teamcity[importData type='checkstyle' path='${result.dir.full}/checkstyle-errors.xml'] - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <h1>${module.name}</h1> + + ${javadoc.bottom} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ##teamcity[importData type='checkstyle' + path='${result.dir.full}/checkstyle-errors.xml'] + + + + + + + + + + diff --git a/gwt-files.xml b/gwt-files.xml index cc4b4a1e96..4f9f746c99 100644 --- a/gwt-files.xml +++ b/gwt-files.xml @@ -1,189 +1,191 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ivy-taskdefs.xml b/ivy-taskdefs.xml index 64d5ec1be1..3c04e5a051 100644 --- a/ivy-taskdefs.xml +++ b/ivy-taskdefs.xml @@ -1,24 +1,24 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"> - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/ivysettings.xml b/ivysettings.xml index 88c38ff33e..6c230b9fd8 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -17,7 +17,8 @@ - + - - - + + + - - - + + + - - - + + + - - - - + + + + - + - + - - - - + + + + - Installing ${src} to ${target} + Installing ${src} to ${target} - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/push/build.xml b/push/build.xml index 3e750b67cd..ad27599d36 100644 --- a/push/build.xml +++ b/push/build.xml @@ -1,73 +1,84 @@ - - - Meta package which defines dependencies needed for push - - - + + + Meta package which defines dependencies needed for push + + + - - - - + + + + - - - + + + - + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - ${vaadinPush.js.contents} + + + + + + + + + + + ${vaadinPush.js.contents} - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + + + + + - - - - - + + + - - + + + + + + + + \ No newline at end of file diff --git a/push/ivy.xml b/push/ivy.xml index 69b7661fca..e2ba3a63f7 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -4,8 +4,7 @@ xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" xmlns:m="http://ant.apache.org/ivy/maven"> - + @@ -15,23 +14,21 @@ - + - + - + - + diff --git a/server/build.xml b/server/build.xml index 1c84c7e6f5..a812404862 100644 --- a/server/build.xml +++ b/server/build.xml @@ -1,60 +1,63 @@ - - - Compiles build helpers used when building other modules. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Compiles build helpers used when building other modules. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/ivy.xml b/server/ivy.xml index 46d9e4c9f5..db7e953371 100644 --- a/server/ivy.xml +++ b/server/ivy.xml @@ -45,8 +45,8 @@ rev="${vaadin.version}" conf="build,test->build" /> - + - + - + diff --git a/shared/build.xml b/shared/build.xml index 8520ee6eba..67dd3e9843 100644 --- a/shared/build.xml +++ b/shared/build.xml @@ -1,64 +1,66 @@ - - - Compiles build helpers used when building other modules. - - - - + + + Compiles build helpers used when building other modules. + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - + + - - - - - - - - - + + + - - - WHAT? No tests for ${module.name}! - + + + + + + + + + WHAT? No tests for ${module.name}! + \ No newline at end of file diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml index 277929d160..b28eca8cf7 100644 --- a/theme-compiler/build.xml +++ b/theme-compiler/build.xml @@ -1,58 +1,64 @@ - - - Compiles build helpers used when building other modules. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Compiles build helpers used when building other modules. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/build.xml b/themes/build.xml index 75b3e5a903..5bca50e5f5 100644 --- a/themes/build.xml +++ b/themes/build.xml @@ -1,107 +1,115 @@ - - - Themes compiled to CSS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Compiling ${theme} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No java files in module - - - - WHAT? No tests for ${module.name}! - + + + Themes compiled to CSS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Compiling ${theme} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No java files in module + + + + WHAT? No tests for ${module.name}! + diff --git a/themes/ivy.xml b/themes/ivy.xml index e0e22429ab..beb1b16a00 100644 --- a/themes/ivy.xml +++ b/themes/ivy.xml @@ -14,8 +14,8 @@ - - + + diff --git a/uitest/build.xml b/uitest/build.xml index 453fc26ea5..dc9258a807 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -1,148 +1,161 @@ - - - Provides a uitest WAR containing Vaadin UI tests - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Compiling ${module} to ${module.output.dir} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Checkstyle is disabled for uitest for now - - - - WHAT? No JUnit tests for ${module.name}! - + + + Provides a uitest WAR containing Vaadin UI tests + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Compiling ${module} to ${module.output.dir} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Checkstyle is disabled for uitest for now + + + + WHAT? No JUnit tests for ${module.name}! + \ No newline at end of file diff --git a/uitest/integration_base_files/base.xml b/uitest/integration_base_files/base.xml index 5196aecfa9..d8ba018b75 100644 --- a/uitest/integration_base_files/base.xml +++ b/uitest/integration_base_files/base.xml @@ -1,138 +1,143 @@ - + - - - + + + + - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${server}: Getting the lock + + + + + + + + ${server}: Got the lock + + + + + + + + + + + + ${server}: Released the lock - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${server}: Getting the lock - - - - - - - - ${server}: Got the lock - - - - - - - - - - - - ${server}: Released the lock - - - - - - + + + + + diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml index cb96834307..ba353dbdbb 100644 --- a/uitest/integration_tests.xml +++ b/uitest/integration_tests.xml @@ -1,541 +1,634 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Delaying startup of ${target-server} with ${sleepTime} seconds - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ##teamcity[testStarted name='${target-server}' flowId='${target-server}'] - - - - - - - - - - ##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}'] - - - ##teamcity[testFinished name='${target-server}' flowId='${target-server}']" - - - - - - - - - - - - - - - - ##teamcity[testStarted name='${target-server}' flowId='${target-server}'] - - - - - - - - - - ##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']" - - - ##teamcity[testFinished name='${target-server}' flowId='${target-server}']" - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Delaying startup of ${target-server} with + ${sleepTime} seconds + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ##teamcity[testStarted name='${target-server}' + flowId='${target-server}'] + + + + + + + + + + ##teamcity[testFailed name='${target-server}' + flowId='${target-server}' message='Integration test + for ${target-server} failed.' + details='${tried-escaped}'] + + + ##teamcity[testFinished name='${target-server}' + flowId='${target-server}']" + + + + + + + + + + + + + + + + ##teamcity[testStarted name='${target-server}' + flowId='${target-server}'] + + + + + + + + + + ##teamcity[testFailed name='${target-server}' + flowId='${target-server}' message='Integration test + for ${target-server} failed.' + details='${tried-escaped}']" + + + ##teamcity[testFinished name='${target-server}' + flowId='${target-server}']" + + + + + + + + + + + + + + diff --git a/uitest/ivy.xml b/uitest/ivy.xml index bb54232852..7ff83324ae 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -14,8 +14,8 @@ - - + + - - + + diff --git a/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml index 1b47a86113..fd52e5cd0e 100644 --- a/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml +++ b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml @@ -1,15 +1,16 @@ - + + + + - - - - - + + - + diff --git a/uitest/test.xml b/uitest/test.xml index 8228bd9d70..44dac13d90 100644 --- a/uitest/test.xml +++ b/uitest/test.xml @@ -1,189 +1,227 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/uitest/vaadin-server.xml b/uitest/vaadin-server.xml index 5741d78525..4b32cebe26 100644 --- a/uitest/vaadin-server.xml +++ b/uitest/vaadin-server.xml @@ -1,34 +1,38 @@ - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - Waiting for Servlet Container to start up. - - - - - + + Waiting for Servlet Container to start up. + + + + + -- 2.39.5