From 3b888fe28b22de289ac658e9d36073d751705c70 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Thu, 23 May 2013 12:42:14 +0300 Subject: Support nested SASS imports (#11909) Change-Id: I05f88e398e7e28f476d8c0d50b7f9ac54a7cba0b --- .../com/vaadin/sass/internal/parser/Parser.java | 16 ++++++++---- .../src/com/vaadin/sass/internal/parser/Parser.jj | 6 +++-- .../com/vaadin/sass/internal/tree/ImportNode.java | 5 ++-- .../sass/internal/visitor/ImportNodeHandler.java | 29 +++++++++++++++++++--- .../resources/automatic/css/nested-import.css | 5 ++++ .../resources/automatic/scss/nested-import.scss | 3 +++ 6 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 theme-compiler/tests/resources/automatic/css/nested-import.css create mode 100644 theme-compiler/tests/resources/automatic/scss/nested-import.scss (limited to 'theme-compiler') diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java index d938dfefe8..382e8e6711 100755 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java @@ -136,6 +136,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { * @exception IOException the source can't be parsed. * @exception CSSException the source is not CSS valid. */ + // TODO required by original parser but not used by Vaadin? public void parseRule(InputSource source) throws CSSException, IOException { this.source = source; @@ -1870,6 +1871,7 @@ char connector = ' '; case IDENT: case VARIABLE: case HASH: + case IMPORT_SYM: case MEDIA_SYM: case KEY_FRAME_SYM: ; @@ -1907,6 +1909,9 @@ char connector = ' '; case MICROSOFT_RULE: microsoftExtension(); break; + case IMPORT_SYM: + importDeclaration(); + break; default: jj_la1[69] = jj_gen; jj_consume_token(-1); @@ -6080,6 +6085,7 @@ LexicalUnitImpl result = null; * The following functions are useful for a DOM CSS implementation only and are * not part of the general CSS2 parser. */ +// TODO required by original parser but not used by Vaadin? final public void _parseRule() throws ParseException { String ret = null; label_168: @@ -7364,13 +7370,13 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_261() { - if (jj_scan_token(INTERPOLATION)) return true; + private boolean jj_3_9() { + if (jj_3R_184()) return true; return false; } - private boolean jj_3_9() { - if (jj_3R_184()) return true; + private boolean jj_3R_261() { + if (jj_scan_token(INTERPOLATION)) return true; return false; } @@ -7529,7 +7535,7 @@ LexicalUnitImpl result = null; jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x401,0x4000,0x0,0x0,0x0,0x0,0x2200,0x0,0x0,0x0,0x400,0x400,0x0,0x0,0x8000,0x0,0x8000,0x0,0x0,0x4465,0x4465,0x0,0x0,0x0,0xae00,0xae00,0x0,0x0,0x0,0x400,0x0,0x0,0x400,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x400,0x0,0xaa00,0x0,0x0,0x0,0x0,0x0,0xe00,0xe00,0x0,0x400,0x400,0x0,0x0,0x0,0x0,0x4465,0x4465,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x400,0x400,0x400,0x400,0x400,0x0,0x0,0x0,0x0,0x600,0x0,0x0,0x0,0x0,0x400,0x0,0x100,0x0,0x0,0x1,0x424,0x4000,0x4c00,0x0,0x4424,0x0,0x2,0x0,0x4c00,0x80,0x0,0x4424,0x0,0x4c00,0x0,0x0,0x0,0x4400,0x0,0x4424,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x4425,0x4425,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0xffffee00,0x0,0x0,0x0,0x0,0xffffee00,0x0,0x0,0x0,0x4400,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x400,0x0,0x0,0x400,0x0,0x0,0x0,0x400,0x0,0x0,0x400,0x0,0xffffee00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffee00,0x0,0xffff8800,0x0,0x400,0x2600,0xffffae00,0x0,0x0,0xffffee00,0x0,0x400,0x0,0x0,0x0,0x400,0x0,0x0,0x400,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x20,0x200,0x200,0x8,0x200,0x0,0x0,0x0,0x1d4,0x0,0x200,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x114,0x114,0x0,0x0,0x0,0x31006fc,0x31006fc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x31006f8,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x114,0x114,0x0,0x0,0x0,0x4,0x0,0x4,0x4,0x0,0x0,0x4,0x4,0x4,0x4,0x4,0x4,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x114,0x0,0x800000,0x0,0x114,0x0,0x0,0x0,0x800000,0x0,0x0,0x114,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x114,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x1d4,0x1d4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1100007,0x0,0x0,0x0,0x0,0x1100007,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0xe00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x1100007,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1100007,0x0,0x1000003,0x0,0x0,0x100004,0x1100007,0x0,0x0,0x1100007,0x0,0xdc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x20,0x200,0x200,0x8,0x200,0x0,0x0,0x0,0x1d4,0x0,0x200,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x114,0x114,0x0,0x0,0x0,0x31006fc,0x31006fc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x31006f8,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11c,0x11c,0x0,0x0,0x0,0x4,0x0,0x4,0x4,0x0,0x0,0x4,0x4,0x4,0x4,0x4,0x4,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x114,0x0,0x800000,0x0,0x114,0x0,0x0,0x0,0x800000,0x0,0x0,0x114,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x114,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x1d4,0x1d4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1100007,0x0,0x0,0x0,0x0,0x1100007,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0xe00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x1100007,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1100007,0x0,0x1000003,0x0,0x0,0x100004,0x1100007,0x0,0x0,0x1100007,0x0,0xdc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } final private JJCalls[] jj_2_rtns = new JJCalls[9]; private boolean jj_rescan = false; diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj index 7f86527015..daf20423d6 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj @@ -169,6 +169,7 @@ public class Parser implements org.w3c.css.sac.Parser { * @exception IOException the source can't be parsed. * @exception CSSException the source is not CSS valid. */ + // TODO required by original parser but not used by Vaadin? public void parseRule(InputSource source) throws CSSException, IOException { this.source = source; @@ -1188,7 +1189,8 @@ void styleRule() : start = true; documentHandler.startSelector(l); } - ( ifContentStatement() | controlDirective() | microsoftExtension() )* + // a CSS import here will not work + ( ifContentStatement() | controlDirective() | microsoftExtension() | importDeclaration() )* ()* } catch (ThrowedParseException e) { if (errorHandler != null) { @@ -2947,7 +2949,7 @@ String skipAfterExpression() { * The following functions are useful for a DOM CSS implementation only and are * not part of the general CSS2 parser. */ - +// TODO required by original parser but not used by Vaadin? void _parseRule() : {String ret = null; } diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/ImportNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/ImportNode.java index f7d664d54d..6dc95db5c2 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/tree/ImportNode.java +++ b/theme-compiler/src/com/vaadin/sass/internal/tree/ImportNode.java @@ -18,7 +18,6 @@ package com.vaadin.sass.internal.tree; import org.w3c.css.sac.SACMediaList; -import com.vaadin.sass.internal.ScssStylesheet; import com.vaadin.sass.internal.visitor.ImportNodeHandler; public class ImportNode extends Node { @@ -74,7 +73,7 @@ public class ImportNode extends Node { @Override public void traverse() { - // TODO shouldn't be reached with current setup, try anyway? - ImportNodeHandler.traverse((ScssStylesheet) getParentNode()); + // nested imports + ImportNodeHandler.traverse(getParentNode()); } } diff --git a/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java index e356ed3525..cb9896967a 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java +++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java @@ -26,6 +26,7 @@ import org.w3c.css.sac.LexicalUnit; import com.vaadin.sass.internal.ScssStylesheet; import com.vaadin.sass.internal.parser.LexicalUnitImpl; +import com.vaadin.sass.internal.parser.ParseException; import com.vaadin.sass.internal.tree.ImportNode; import com.vaadin.sass.internal.tree.Node; import com.vaadin.sass.internal.tree.RuleNode; @@ -33,7 +34,23 @@ import com.vaadin.sass.internal.util.StringUtil; public class ImportNodeHandler { - public static void traverse(ScssStylesheet node) { + public static void traverse(Node node) { + ScssStylesheet styleSheet = null; + if (node instanceof ScssStylesheet) { + styleSheet = (ScssStylesheet) node; + } else { + // iterate to parents of node, find ScssStylesheet + Node parent = node.getParentNode(); + while (parent != null && !(parent instanceof ScssStylesheet)) { + parent = parent.getParentNode(); + } + if (parent instanceof ScssStylesheet) { + styleSheet = (ScssStylesheet) parent; + } + } + if (styleSheet == null) { + throw new ParseException("Nested import in an invalid context"); + } ArrayList c = new ArrayList(node.getChildren()); for (Node n : c) { if (n instanceof ImportNode) { @@ -41,7 +58,7 @@ public class ImportNodeHandler { if (!importNode.isPureCssImport()) { try { StringBuilder filePathBuilder = new StringBuilder( - node.getFileName()); + styleSheet.getFileName()); filePathBuilder.append(File.separatorChar).append( importNode.getUri()); if (!filePathBuilder.toString().endsWith(".scss")) { @@ -50,7 +67,8 @@ public class ImportNodeHandler { // set parent's charset to imported node. ScssStylesheet imported = ScssStylesheet.get( - filePathBuilder.toString(), node.getCharset()); + filePathBuilder.toString(), + styleSheet.getCharset()); if (imported == null) { imported = ScssStylesheet.get(importNode.getUri()); } @@ -76,6 +94,11 @@ public class ImportNodeHandler { } catch (IOException e) { e.printStackTrace(); } + } else { + if (styleSheet != node) { + throw new ParseException( + "CSS imports can only be used at the top level, not as nested imports. Within style rules, use SCSS imports."); + } } } } diff --git a/theme-compiler/tests/resources/automatic/css/nested-import.css b/theme-compiler/tests/resources/automatic/css/nested-import.css new file mode 100644 index 0000000000..7c6793f9ed --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/nested-import.css @@ -0,0 +1,5 @@ +.foo .bar { + background: url(foo/lorem.png); + background: url(foo/lorem.png); + background: url(foo/lorem.png); +} \ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/nested-import.scss b/theme-compiler/tests/resources/automatic/scss/nested-import.scss new file mode 100644 index 0000000000..605d64a13a --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/nested-import.scss @@ -0,0 +1,3 @@ +.foo { + @import "foo/bar.scss"; +} \ No newline at end of file -- cgit v1.2.3 From a3ad62d947c86d3f53f333ca9bc36e4544cd5d46 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Wed, 29 May 2013 14:59:28 +0300 Subject: Updated to custom build of Smartsprites 0.2.10 which includes a fix for SMARTSPRITES-36 (#9959) Change-Id: Ibf549acba14a8b884424a5e2c98f3a4aac5de84c --- ivysettings.xml | 12 +++---- theme-compiler/ivy.xml | 8 ++--- .../ivymodule/smartsprites-ivy-0.2.3-itmill.xml | 38 ---------------------- 3 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml (limited to 'theme-compiler') diff --git a/ivysettings.xml b/ivysettings.xml index 288eae9036..88c38ff33e 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -16,12 +16,12 @@ pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" /> - - - + + + + pattern="http://vaadin.com/download/external/[artifact](-[revision]).[ext]" /> @@ -32,9 +32,9 @@ - + + revision="0.2.10-vaadin" resolver="custom-smartsprites" /> - - + rev="0.2.10-vaadin" /> + + diff --git a/theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml b/theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml deleted file mode 100644 index 29dc2d3474..0000000000 --- a/theme-compiler/ivymodule/smartsprites-ivy-0.2.3-itmill.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - CSS Sprites Generator Done Right. SmartSprites maintains CSS sprites in your designs, - fully automatically. No tedious copying and pasting to your CSS when adding or changing - sprited images. - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 9a3dc4e99c7a417778342db83cd6e7c05558e5fb Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 30 May 2013 17:06:30 +0300 Subject: 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 +- client/src/com/vaadin/DefaultWidgetSet.gwt.xml | 14 +- client/src/com/vaadin/Vaadin.gwt.xml | 25 +- .../vaadin/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(-) (limited to 'theme-compiler') 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. + + + + + -- cgit v1.2.3