#8311 Converted CRLF -> LF in css/html/xml files

svn changeset:22852/svn branch:6.7

diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css
index 22121209150ef7cae812609a8b2cbab562239765..48d30d457635db2482e66c987b12c2f93af99091 100644 (file)
--- a/WebContent/VAADIN/themes/base/button/button.css
+++ b/WebContent/VAADIN/themes/base/button/button.css
@@ -1,176 +1,176 @@
-/*\r
- * Default button (more customizable)\r
- * -------------------------------------- */\r
-.v-button {\r
-       display: inline-block;\r
-       zoom: 1;\r
-       text-align: center;\r
-       text-decoration: none;\r
-       border: 2px outset #ddd;\r
-       background: #eee;\r
-       cursor: pointer;\r
-       white-space: nowrap;\r
-       margin: 0;\r
-       padding: .2em 1em;\r
-       color: inherit;\r
-       font: inherit;\r
-       line-height: normal;\r
-       -khtml-user-select: none;\r
-       -moz-user-select: none;\r
-       -ie-user-select: none;\r
-       user-select: none;\r
-       -webkit-box-sizing: border-box;\r
-       -moz-box-sizing: border-box;\r
-       -ms-box-sizing: border-box;\r
-       box-sizing: border-box;\r
-}\r
-\r
-.v-button.v-disabled {\r
-       cursor: default;\r
-}\r
-\r
-.v-ie6 .v-button {\r
-       display: inline;\r
-}\r
-\r
-.v-ie7 .v-button {\r
-   display: inline;\r
-}\r
-\r
-.v-button-wrap,\r
-.v-button-caption {\r
-       vertical-align: middle;\r
-       white-space: nowrap;\r
-       font: inherit;\r
-       color: inherit;\r
-       line-height: normal;\r
-       }\r
-\r
-.v-button .v-icon,\r
-.v-nativebutton .v-icon {\r
-       vertical-align: middle;\r
-       margin-right: 3px;\r
-       border: none;\r
-       }\r
-\r
-.v-button .v-errorindicator,\r
-.v-nativebutton .v-errorindicator {\r
-       display: inline-block;\r
-       zoom: 1;\r
-       vertical-align: middle;\r
-       float: none;\r
-}\r
-\r
-/* Link style (we really should deprecate this) */\r
-.v-button-link,\r
-.v-nativebutton-link {\r
-       border: none;\r
-       text-align: left;\r
-       background: transparent;\r
-       padding: 0;\r
-       color: inherit;\r
-       -khtml-user-select: text;\r
-       -moz-user-select: text;\r
-       -ie-user-select: text;\r
-       user-select: text;\r
-}\r
-\r
-/* Inset Safari focus outline a bit */\r
-.v-sa .v-button-link:focus{\r
-       outline-offset: -3px;\r
-       }\r
-\r
-.v-button-link .v-button-caption,\r
-.v-nativebutton-link .v-nativebutton-caption {\r
-       text-decoration: underline;\r
-       color: inherit;\r
-       text-align: left;\r
-       }\r
-\r
-\r
-/*\r
- * NativeButton styles (html button element)\r
- * -------------------------------------- */\r
-.v-nativebutton {\r
-       text-align: center;\r
-       cursor: pointer;\r
-       white-space: nowrap;\r
-       margin: 0;\r
-       color: inherit;\r
-       font: inherit;\r
-       line-height: normal;\r
-       }\r
-.v-nativebutton .v-nativebutton-caption {\r
-       vertical-align: middle;\r
-       white-space: nowrap;\r
-       font: inherit;\r
-       color: inherit;\r
-       }\r
-\r
-.v-nativebutton .v-icon {\r
-       vertical-align: middle;\r
-       margin-right: 3px;\r
-       }\r
-\r
-.v-nativebutton .v-errorindicator {\r
-       display: inline-block;\r
-       zoom: 1;\r
-       float: none;\r
-}\r
-/* Fixes streched buttons in IE6 and IE7*/\r
-.v-ie6 .v-nativebutton {\r
-       width: 1px;\r
-}\r
-.v-ie .v-nativebutton {\r
-       overflow: visible;\r
-       padding-left: 1em;\r
-       padding-right: 1em;\r
-}\r
-\r
-.v-ie .v-nativebutton-link {\r
-       padding: 0;\r
-}\r
-\r
-/*\r
- * Checkbox styles\r
- * -------------------------------------- */\r
- \r
- .v-checkbox {\r
-       display: block;\r
- }\r
-\r
-.v-checkbox,\r
-.v-checkbox label,\r
-.v-checkbox input,\r
-.v-checkbox .v-icon {\r
-       vertical-align: middle;\r
-       white-space: nowrap;\r
-}\r
-\r
-/* Fix for IE6/IE7 issue where checkbox moves 1 pixel down after selection (#4636) */\r
-.v-ie6 .v-checkbox,\r
-.v-ie7 .v-checkbox {\r
-       vertical-align: baseline;\r
-}\r
-\r
-.v-checkbox .v-icon {\r
-       margin: 0 2px;\r
-}\r
-.v-checkbox .v-errorindicator {\r
-       float: none;\r
-       display: inline;\r
-       display: inline-block;\r
-       zoom: 1;\r
-}\r
-\r
-\r
-/* Disabled by default\r
-.v-checkbox-error {\r
-       background: #ffe0e0;\r
-}\r
-*/\r
-/* Disabled by default\r
-.v-checkbox-required {\r
-       background: #ffe0e0;\r
-}\r
+/*
+ * Default button (more customizable)
+ * -------------------------------------- */
+.v-button {
+       display: inline-block;
+       zoom: 1;
+       text-align: center;
+       text-decoration: none;
+       border: 2px outset #ddd;
+       background: #eee;
+       cursor: pointer;
+       white-space: nowrap;
+       margin: 0;
+       padding: .2em 1em;
+       color: inherit;
+       font: inherit;
+       line-height: normal;
+       -khtml-user-select: none;
+       -moz-user-select: none;
+       -ie-user-select: none;
+       user-select: none;
+       -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+       -ms-box-sizing: border-box;
+       box-sizing: border-box;
+}
+
+.v-button.v-disabled {
+       cursor: default;
+}
+
+.v-ie6 .v-button {
+       display: inline;
+}
+
+.v-ie7 .v-button {
+   display: inline;
+}
+
+.v-button-wrap,
+.v-button-caption {
+       vertical-align: middle;
+       white-space: nowrap;
+       font: inherit;
+       color: inherit;
+       line-height: normal;
+       }
+
+.v-button .v-icon,
+.v-nativebutton .v-icon {
+       vertical-align: middle;
+       margin-right: 3px;
+       border: none;
+       }
+
+.v-button .v-errorindicator,
+.v-nativebutton .v-errorindicator {
+       display: inline-block;
+       zoom: 1;
+       vertical-align: middle;
+       float: none;
+}
+
+/* Link style (we really should deprecate this) */
+.v-button-link,
+.v-nativebutton-link {
+       border: none;
+       text-align: left;
+       background: transparent;
+       padding: 0;
+       color: inherit;
+       -khtml-user-select: text;
+       -moz-user-select: text;
+       -ie-user-select: text;
+       user-select: text;
+}
+
+/* Inset Safari focus outline a bit */
+.v-sa .v-button-link:focus{
+       outline-offset: -3px;
+       }
+
+.v-button-link .v-button-caption,
+.v-nativebutton-link .v-nativebutton-caption {
+       text-decoration: underline;
+       color: inherit;
+       text-align: left;
+       }
+
+
+/*
+ * NativeButton styles (html button element)
+ * -------------------------------------- */
+.v-nativebutton {
+       text-align: center;
+       cursor: pointer;
+       white-space: nowrap;
+       margin: 0;
+       color: inherit;
+       font: inherit;
+       line-height: normal;
+       }
+.v-nativebutton .v-nativebutton-caption {
+       vertical-align: middle;
+       white-space: nowrap;
+       font: inherit;
+       color: inherit;
+       }
+
+.v-nativebutton .v-icon {
+       vertical-align: middle;
+       margin-right: 3px;
+       }
+
+.v-nativebutton .v-errorindicator {
+       display: inline-block;
+       zoom: 1;
+       float: none;
+}
+/* Fixes streched buttons in IE6 and IE7*/
+.v-ie6 .v-nativebutton {
+       width: 1px;
+}
+.v-ie .v-nativebutton {
+       overflow: visible;
+       padding-left: 1em;
+       padding-right: 1em;
+}
+
+.v-ie .v-nativebutton-link {
+       padding: 0;
+}
+
+/*
+ * Checkbox styles
+ * -------------------------------------- */
+ 
+ .v-checkbox {
+       display: block;
+ }
+
+.v-checkbox,
+.v-checkbox label,
+.v-checkbox input,
+.v-checkbox .v-icon {
+       vertical-align: middle;
+       white-space: nowrap;
+}
+
+/* Fix for IE6/IE7 issue where checkbox moves 1 pixel down after selection (#4636) */
+.v-ie6 .v-checkbox,
+.v-ie7 .v-checkbox {
+       vertical-align: baseline;
+}
+
+.v-checkbox .v-icon {
+       margin: 0 2px;
+}
+.v-checkbox .v-errorindicator {
+       float: none;
+       display: inline;
+       display: inline-block;
+       zoom: 1;
+}
+
+
+/* Disabled by default
+.v-checkbox-error {
+       background: #ffe0e0;
+}
+*/
+/* Disabled by default
+.v-checkbox-required {
+       background: #ffe0e0;
+}
 */
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/base/notification/notification.css b/WebContent/VAADIN/themes/base/notification/notification.css
index 9455c25a366a49a62c5cc15b2faa23016386183d..ccd5b8d218d1c48f449dfcbb6f18895e4443d813 100644 (file)
--- a/WebContent/VAADIN/themes/base/notification/notification.css
+++ b/WebContent/VAADIN/themes/base/notification/notification.css
@@ -27,13 +27,13 @@
 }
 .v-Notification-tray p {
        display: block;
-}\r
-.v-Notification-system {\r
-       background-color: red;\r
-       opacity: .7;\r
-       filter: alpha(opacity=70);\r
-}\r
-.v-Notification-system h1 {\r
-       display: block;\r
-       margin: 0;\r
-}\r
+}
+.v-Notification-system {
+       background-color: red;
+       opacity: .7;
+       filter: alpha(opacity=70);
+}
+.v-Notification-system h1 {
+       display: block;
+       margin: 0;
+}

diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css
index d789e8b54886f9f9dc762d5cdcba0d708fb48710..2c1e3d9593c1afc8ed79c179b0b608fc7ad66769 100644 (file)
--- a/WebContent/VAADIN/themes/base/table/table.css
+++ b/WebContent/VAADIN/themes/base/table/table.css
@@ -245,11 +245,11 @@
        margin-top: -1px;
        margin-bottom: -1px;
 }
-/* row in column selector */\r
+/* row in column selector */
 .v-on {
-       \r
+       
 }
-.v-off {\r
+.v-off {
        color: #ddd;
 }
 /*************************************

diff --git a/WebContent/VAADIN/themes/runo/button/button.css b/WebContent/VAADIN/themes/runo/button/button.css
index c196841ad32b2c7d6a991dc7e4789d07bd03b4cc..75557d8a39347b3759a62c771db72748a9e8f9b5 100644 (file)
--- a/WebContent/VAADIN/themes/runo/button/button.css
+++ b/WebContent/VAADIN/themes/runo/button/button.css
@@ -1,172 +1,172 @@
-.v-button {\r
-       padding: 1px;\r
-       border: none;\r
-       background: transparent;\r
-       }\r
-\r
-.v-button:focus {\r
-       outline: none;\r
-       }\r
-\r
-.v-button:focus .v-button-wrap {\r
-       border-color: #57a7ed;\r
-       border-top-color: #60aef1;\r
-       border-bottom-color: #4c9adf;\r
-       -webkit-box-shadow: 0 0 2px #57a7ed;\r
-       -moz-box-shadow:  0 0 2px #57a7ed;\r
-       }\r
-       \r
-.v-button:active .v-button-wrap,\r
-.v-button.v-pressed .v-button-wrap {\r
-       background-position: 0 -79px;\r
-       background-color: #e7e9e9;\r
-       border-color: #b8bdbe;\r
-       border-top-color: #9da1a2;\r
-       border-bottom-color: #babfc0;\r
-       border-color: rgba(146,151,152,.9);\r
-       border-top-color: rgba(146,151,152,1);\r
-       -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;\r
-       -moz-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;;\r
-       text-shadow: none;\r
-       }\r
-\r
-.v-button .v-button-wrap,\r
-.v-disabled.v-button .v-button-wrap {\r
-       display: block;\r
-       font-size: 12px;\r
-       border: 1px solid #bdc1c2;\r
-       border-top-color: #cbcfd0;\r
-       border-bottom-color: #b6bbbb;\r
-       border-color: rgba(146,151,152,.8);\r
-       border-top-color: rgba(146,151,152,.6);\r
-       background: #e6e8e8 url(img/bg.png) repeat-x;\r
-       -webkit-background-origin: padding;\r
-       -moz-background-origin: padding;\r
-       padding: 3px 15px;\r
-       -webkit-border-radius: 11px;\r
-       -moz-border-radius: 11px;\r
-       border-radius: 11px;\r
-       line-height: 14px;\r
-       min-height: 14px;\r
-       -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.15);\r
-       -moz-box-shadow: 0 1px 0 rgba(0,0,0,.15);\r
-       text-shadow: 0 1px 0 #fff;\r
-       color: #464f52;\r
-       overflow: hidden;\r
-       text-overflow: ellipsis;\r
-       }\r
-\r
-.v-ie7 .v-button .v-button-wrap {\r
-       overflow: visible;\r
-}\r
-\r
-\r
-\r
-/* Small style */\r
-.v-button-small .v-button-wrap,\r
-.v-disabled.v-button-small .v-button-wrap {\r
-       font-size: 11px;\r
-       line-height: 13px;\r
-       padding: 1px 12px;\r
-       min-height: 13px;\r
-       }\r
-\r
-\r
-/* Big style */\r
-.v-button-big .v-button-wrap,\r
-.v-disabled.v-button-big .v-button-wrap {\r
-       font-size: 15px;\r
-       line-height: 18px;\r
-       padding: 4px 18px;\r
-       min-height: 18px;\r
-       -webkit-border-radius: 14px;\r
-       -moz-border-radius: 14px;\r
-       border-radius: 14px;\r
-       }\r
-\r
-\r
-\r
-/* Default style */\r
-.v-button-default:focus .v-button-wrap {\r
-       background-color: #60839a;\r
-       background-position: 0 -158px;\r
-       text-shadow: 0 -1px 0 #657883;\r
-       }\r
-\r
-.v-button-default:active .v-button-wrap,\r
-.v-button-default.v-pressed .v-button-wrap {\r
-       background-position: 0 -79px;\r
-       background-color: #8f9898;\r
-       border-color: #737e81;\r
-       border-top-color: #576063;\r
-       border-bottom-color: #747f82;\r
-       color: #f0f2f2;\r
-       text-shadow: 0 -1px 0 #5d6969;\r
-       -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;;\r
-       -moz-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;;\r
-       }\r
-\r
-.v-button-default .v-button-wrap,\r
-.v-disabled.v-button-default .v-button-wrap {\r
-       border-color: #899395;\r
-       border-top-color: #a4abae;\r
-       border-bottom-color: #727b7d;\r
-       background: #869090 url(img/bg-default.png) repeat-x;\r
-       text-shadow: 0 -1px 0 #797e7e;\r
-       color: #fff;\r
-       font-weight: bold;\r
-       -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.22);\r
-       -moz-box-shadow: 0 1px 0 rgba(0,0,0,.22);\r
-       }\r
-\r
-\r
-\r
-\r
-/* Link style */\r
-.v-button-link,\r
-.v-disabled.v-button-link {\r
-       padding: 0;\r
-       }\r
-\r
-.v-button-link .v-button-wrap,\r
-.v-disabled.v-button-link .v-button-wrap,\r
-.v-button-link:active .v-button-wrap,\r
-.v-disabled.v-button-pressedv-button-link .v-button-wrap {\r
-       border: none;\r
-       background: transparent;\r
-       padding: 0;\r
-       font-size: 13px;\r
-       -webkit-box-shadow: none;\r
-       -mox-box-shadow: none;\r
-       -webkit-border-radius: 0;\r
-       -moz-border-radius: 0;\r
-       border-radius: 0;\r
-       text-shadow: none;\r
-       }\r
-\r
-.v-button-link:focus {\r
-       outline: 1px dotted #4897dc;\r
-       }\r
-\r
-.v-button-link:focus .v-button-wrap {\r
-       -webkit-box-shadow: none;\r
-       -moz-box-shadow: none;\r
-       }\r
-\r
-\r
-\r
-\r
-/* Checkbox styles */\r
-.v-checkbox .v-errorindicator {\r
-       padding-left: 10px;\r
-       }
-.v-ie6 .v-checkbox .v-errorindicator {\r
-       padding-right: 4px;\r
-       }
-.v-ie7 .v-checkbox .v-errorindicator {\r
-       padding-right: 7px;\r
-       }
-.v-ie6 .v-button .v-errorindicator,\r
-.v-ie7 .v-button .v-errorindicator {\r
-       padding-right: 5px;\r
+.v-button {
+       padding: 1px;
+       border: none;
+       background: transparent;
+       }
+
+.v-button:focus {
+       outline: none;
+       }
+
+.v-button:focus .v-button-wrap {
+       border-color: #57a7ed;
+       border-top-color: #60aef1;
+       border-bottom-color: #4c9adf;
+       -webkit-box-shadow: 0 0 2px #57a7ed;
+       -moz-box-shadow:  0 0 2px #57a7ed;
+       }
+       
+.v-button:active .v-button-wrap,
+.v-button.v-pressed .v-button-wrap {
+       background-position: 0 -79px;
+       background-color: #e7e9e9;
+       border-color: #b8bdbe;
+       border-top-color: #9da1a2;
+       border-bottom-color: #babfc0;
+       border-color: rgba(146,151,152,.9);
+       border-top-color: rgba(146,151,152,1);
+       -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;
+       -moz-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;;
+       text-shadow: none;
+       }
+
+.v-button .v-button-wrap,
+.v-disabled.v-button .v-button-wrap {
+       display: block;
+       font-size: 12px;
+       border: 1px solid #bdc1c2;
+       border-top-color: #cbcfd0;
+       border-bottom-color: #b6bbbb;
+       border-color: rgba(146,151,152,.8);
+       border-top-color: rgba(146,151,152,.6);
+       background: #e6e8e8 url(img/bg.png) repeat-x;
+       -webkit-background-origin: padding;
+       -moz-background-origin: padding;
+       padding: 3px 15px;
+       -webkit-border-radius: 11px;
+       -moz-border-radius: 11px;
+       border-radius: 11px;
+       line-height: 14px;
+       min-height: 14px;
+       -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.15);
+       -moz-box-shadow: 0 1px 0 rgba(0,0,0,.15);
+       text-shadow: 0 1px 0 #fff;
+       color: #464f52;
+       overflow: hidden;
+       text-overflow: ellipsis;
+       }
+
+.v-ie7 .v-button .v-button-wrap {
+       overflow: visible;
+}
+
+
+
+/* Small style */
+.v-button-small .v-button-wrap,
+.v-disabled.v-button-small .v-button-wrap {
+       font-size: 11px;
+       line-height: 13px;
+       padding: 1px 12px;
+       min-height: 13px;
+       }
+
+
+/* Big style */
+.v-button-big .v-button-wrap,
+.v-disabled.v-button-big .v-button-wrap {
+       font-size: 15px;
+       line-height: 18px;
+       padding: 4px 18px;
+       min-height: 18px;
+       -webkit-border-radius: 14px;
+       -moz-border-radius: 14px;
+       border-radius: 14px;
+       }
+
+
+
+/* Default style */
+.v-button-default:focus .v-button-wrap {
+       background-color: #60839a;
+       background-position: 0 -158px;
+       text-shadow: 0 -1px 0 #657883;
+       }
+
+.v-button-default:active .v-button-wrap,
+.v-button-default.v-pressed .v-button-wrap {
+       background-position: 0 -79px;
+       background-color: #8f9898;
+       border-color: #737e81;
+       border-top-color: #576063;
+       border-bottom-color: #747f82;
+       color: #f0f2f2;
+       text-shadow: 0 -1px 0 #5d6969;
+       -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;;
+       -moz-box-shadow: 0 1px 2px rgba(0,0,0,.4) inset;;
+       }
+
+.v-button-default .v-button-wrap,
+.v-disabled.v-button-default .v-button-wrap {
+       border-color: #899395;
+       border-top-color: #a4abae;
+       border-bottom-color: #727b7d;
+       background: #869090 url(img/bg-default.png) repeat-x;
+       text-shadow: 0 -1px 0 #797e7e;
+       color: #fff;
+       font-weight: bold;
+       -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.22);
+       -moz-box-shadow: 0 1px 0 rgba(0,0,0,.22);
+       }
+
+
+
+
+/* Link style */
+.v-button-link,
+.v-disabled.v-button-link {
+       padding: 0;
+       }
+
+.v-button-link .v-button-wrap,
+.v-disabled.v-button-link .v-button-wrap,
+.v-button-link:active .v-button-wrap,
+.v-disabled.v-button-pressedv-button-link .v-button-wrap {
+       border: none;
+       background: transparent;
+       padding: 0;
+       font-size: 13px;
+       -webkit-box-shadow: none;
+       -mox-box-shadow: none;
+       -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+       border-radius: 0;
+       text-shadow: none;
+       }
+
+.v-button-link:focus {
+       outline: 1px dotted #4897dc;
+       }
+
+.v-button-link:focus .v-button-wrap {
+       -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+       }
+
+
+
+
+/* Checkbox styles */
+.v-checkbox .v-errorindicator {
+       padding-left: 10px;
+       }
+.v-ie6 .v-checkbox .v-errorindicator {
+       padding-right: 4px;
+       }
+.v-ie7 .v-checkbox .v-errorindicator {
+       padding-right: 7px;
+       }
+.v-ie6 .v-button .v-errorindicator,
+.v-ie7 .v-button .v-errorindicator {
+       padding-right: 5px;
        }
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/runo/datefield/datefield.css b/WebContent/VAADIN/themes/runo/datefield/datefield.css
index 0b65fd9054b40c4af564802f41539961409eab81..b9a4efc50ecd32a5ee7e1f703f5d246a6fc03186 100644 (file)
--- a/WebContent/VAADIN/themes/runo/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/runo/datefield/datefield.css
@@ -3,138 +3,138 @@
        height: 18px;
 }
 .v-datefield-button {
-       font-size:13px;\r
-       width: 22px;\r
-       height: 24px;\r
-       padding: 0;\r
-       overflow: hidden;\r
-       border: none;\r
+       font-size:13px;
+       width: 22px;
+       height: 24px;
+       padding: 0;
+       overflow: hidden;
+       border: none;
        background: transparent url(img/open-button.png) no-repeat right 0;
-       vertical-align: top;\r
-}\r
-.v-datefield-popup {\r
-       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;\r
-       color: #464f52;\r
-       font-size: 12px;\r
-       background: #f6f7f7;\r
-       border: 1px solid #b6bbbc;\r
+       vertical-align: top;
+}
+.v-datefield-popup {
+       font-family: "Trebuchet MS", geneva, helvetica, arial, tahoma, verdana, sans-serif;
+       color: #464f52;
+       font-size: 12px;
+       background: #f6f7f7;
+       border: 1px solid #b6bbbc;
        padding: 2px 6px;
        -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
-       border-radius: 4px;\r
-}\r
-.v-datefield-calendarpanel {\r
-       width: 230px;\r
-}\r
-.v-datefield-popup .v-datefield-calendarpanel {\r
-       width: 200px;\r
+       border-radius: 4px;
+}
+.v-datefield-calendarpanel {
+       width: 230px;
+}
+.v-datefield-popup .v-datefield-calendarpanel {
+       width: 200px;
 }
 .v-datefield-year .v-datefield-calendarpanel {
        width: 100px;
-}\r
-.v-datefield-calendarpanel td {\r
-       text-align: right;\r
-}\r
-.v-datefield-calendarpanel td span {\r
-       display: block;\r
-}\r
-.v-datefield-calendarpanel-header {\r
+}
+.v-datefield-calendarpanel td {
+       text-align: right;
+}
+.v-datefield-calendarpanel td span {
+       display: block;
+}
+.v-datefield-calendarpanel-header {
        height: 30px;
-       font-size: 13px;\r
-}\r
-td.v-datefield-calendarpanel-month {\r
-       font-weight: bold;\r
+       font-size: 13px;
+}
+td.v-datefield-calendarpanel-month {
+       font-weight: bold;
        text-shadow: 0 1px 0 #fff;
-       width: 150px;\r
+       width: 150px;
 }
 .v-datefield-calendarpanel-prevyear,
 .v-datefield-calendarpanel-nextyear,
 .v-datefield-calendarpanel-prevmonth,
 .v-datefield-calendarpanel-nextmonth {
        width: 16px;
-}\r
-/* Year buttons */\r
-.v-datefield-calendarpanel .v-button-prevyear,\r
-.v-datefield-calendarpanel .v-button-nextyear {\r
-       display: block;\r
-       width: 16px;\r
-       height: 16px;\r
-       border: none;\r
-       padding: 0;\r
-       background: transparent url(img/prevyear.png) no-repeat;\r
-       text-indent: -90000px;\r
-       margin: 0 auto;\r
-}\r
-.v-datefield-calendarpanel .v-button-nextyear {\r
-       background: transparent url(img/nextyear.png) no-repeat;\r
-}\r
-.v-datefield-calendarpanel .v-button-prevyear:hover,\r
-.v-datefield-calendarpanel .v-button-nextyear:hover {\r
-       background-position: left bottom;\r
-}\r
-/* Month buttons */\r
-.v-datefield-calendarpanel .v-button-prevmonth,\r
-.v-datefield-calendarpanel .v-button-nextmonth {\r
-       display: block;\r
-       width: 11px;\r
-       height: 16px;\r
-       border: none;\r
-       padding: 0;\r
-       background: transparent url(img/prevmonth.png) no-repeat;\r
-       text-indent: -90000px;\r
-       margin: 0 auto;\r
-}\r
-.v-datefield-calendarpanel .v-button-nextmonth {\r
-       background: transparent url(img/nextmonth.png) no-repeat;\r
-}\r
-.v-datefield-calendarpanel .v-button-prevmonth:hover,\r
-.v-datefield-calendarpanel .v-button-nextmonth:hover {\r
-       background-position: left bottom;\r
-}\r
-.v-datefield-calendarpanel strong {\r
-       color: #ee5311;\r
-       display: block;\r
+}
+/* Year buttons */
+.v-datefield-calendarpanel .v-button-prevyear,
+.v-datefield-calendarpanel .v-button-nextyear {
+       display: block;
+       width: 16px;
+       height: 16px;
+       border: none;
+       padding: 0;
+       background: transparent url(img/prevyear.png) no-repeat;
+       text-indent: -90000px;
+       margin: 0 auto;
+}
+.v-datefield-calendarpanel .v-button-nextyear {
+       background: transparent url(img/nextyear.png) no-repeat;
+}
+.v-datefield-calendarpanel .v-button-prevyear:hover,
+.v-datefield-calendarpanel .v-button-nextyear:hover {
+       background-position: left bottom;
+}
+/* Month buttons */
+.v-datefield-calendarpanel .v-button-prevmonth,
+.v-datefield-calendarpanel .v-button-nextmonth {
+       display: block;
+       width: 11px;
+       height: 16px;
+       border: none;
+       padding: 0;
+       background: transparent url(img/prevmonth.png) no-repeat;
+       text-indent: -90000px;
+       margin: 0 auto;
+}
+.v-datefield-calendarpanel .v-button-nextmonth {
+       background: transparent url(img/nextmonth.png) no-repeat;
+}
+.v-datefield-calendarpanel .v-button-prevmonth:hover,
+.v-datefield-calendarpanel .v-button-nextmonth:hover {
+       background-position: left bottom;
+}
+.v-datefield-calendarpanel strong {
+       color: #ee5311;
+       display: block;
        width: 20px;
-       font-size: 12px;\r
-}\r
-.v-datefield-calendarpanel-day,\r
+       font-size: 12px;
+}
+.v-datefield-calendarpanel-day,
 .v-datefield-calendarpanel-weeknumber,
-.v-datefield-calendarpanel-day-today {\r
-       padding: 1px 3px;\r
-       width: 14px;\r
-       height: 16px;\r
-}\r
-.v-datefield-calendarpanel-day-today {\r
-       border: 1px solid #429ce9;\r
-       width: 12px;\r
-       height: 14px\r
-}\r
-.v-datefield-calendarpanel-day-entry {\r
-       color: #6a98b5;\r
-}\r
-.v-datefield-calendarpanel-day-disabled {\r
-       font-weight: normal;\r
-       color: #dddddd;\r
-}\r
-.v-datefield-calendarpanel-day-entry.v-datefield-calendarpanel-day-disabled {\r
-       color: #afd6f8;\r
-}\r
-.v-datefield-calendarpanel-day-selected {\r
-       font-weight: bold;\r
-       width: 14px;\r
-       height: 16px;\r
-       color: #fff;\r
-       padding: 1px 3px;\r
-       background: transparent url(img/selected-bg.png) no-repeat 50% 50%;\r
-       border: none;\r
-}\r
-.v-datefield-time {\r
-       font-size: 11px;\r
-}\r
-.v-datefield-time .v-select {\r
-       font-size: 10px;\r
-       padding: 0;\r
-       margin: 0;\r
+.v-datefield-calendarpanel-day-today {
+       padding: 1px 3px;
+       width: 14px;
+       height: 16px;
+}
+.v-datefield-calendarpanel-day-today {
+       border: 1px solid #429ce9;
+       width: 12px;
+       height: 14px
+}
+.v-datefield-calendarpanel-day-entry {
+       color: #6a98b5;
+}
+.v-datefield-calendarpanel-day-disabled {
+       font-weight: normal;
+       color: #dddddd;
+}
+.v-datefield-calendarpanel-day-entry.v-datefield-calendarpanel-day-disabled {
+       color: #afd6f8;
+}
+.v-datefield-calendarpanel-day-selected {
+       font-weight: bold;
+       width: 14px;
+       height: 16px;
+       color: #fff;
+       padding: 1px 3px;
+       background: transparent url(img/selected-bg.png) no-repeat 50% 50%;
+       border: none;
+}
+.v-datefield-time {
+       font-size: 11px;
+}
+.v-datefield-time .v-select {
+       font-size: 10px;
+       padding: 0;
+       margin: 0;
 }
 .v-datefield-rendererror .v-textfield {
        background: #ff9999;

diff --git a/WebContent/VAADIN/themes/runo/notification/notification.css b/WebContent/VAADIN/themes/runo/notification/notification.css
index bc9b3f665d546a989a047dc084444c8a1b11bc9f..1d9f868a1426fa8ed2470dc8d287388029249116 100644 (file)
--- a/WebContent/VAADIN/themes/runo/notification/notification.css
+++ b/WebContent/VAADIN/themes/runo/notification/notification.css
@@ -59,9 +59,9 @@
        line-height: 1.2;
        margin: 4px 10px 5px 10px;
        color: #e4e7ea;
-}\r
-.v-Notification-system {\r
+}
+.v-Notification-system {
        background-color: #ff0a0a;
        font-size: .9em;
-       padding: 14px 32px;\r
+       padding: 14px 32px;
 }
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css
index 9c224cb84f80f3f199c86152c546bf382bdfed02..64cd85b61dfd2fe94b9eb71aa1d45819e6a99fd3 100644 (file)
--- a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css
@@ -103,10 +103,10 @@
        background-color: #fff;
        border-bottom: 1px solid #dee2e3;
        border-top: none;
-}\r
-.v-tabsheet-hidetabs .v-tabsheet-content {\r
-       border-top: 1px solid #b5babb;\r
-}\r
+}
+.v-tabsheet-hidetabs .v-tabsheet-content {
+       border-top: 1px solid #b5babb;
+}
 .v-tabsheet-deco {
        height: 10px;
        background: transparent url(../panel/img/bottom-right.png) repeat-x right top;

diff --git a/WebContent/VAADIN/themes/tests-components/styles.css b/WebContent/VAADIN/themes/tests-components/styles.css
index da173964f45ffc90ee76d13a459ffaa8de7f881b..c38f32f13278c82905f33539058b47fa1395387e 100644 (file)
--- a/WebContent/VAADIN/themes/tests-components/styles.css
+++ b/WebContent/VAADIN/themes/tests-components/styles.css
@@ -1,39 +1,39 @@
-@import url(../reindeer/styles.css);\r
-\r
-.missing {\r
-       color: red;\r
-       font-weight: bold;\r
-}\r
-\r
-.v-tree-node-caption-red {\r
-       color: red;\r
-}\r
-\r
-.v-tree-node-caption-green {\r
-       color: green;\r
-}\r
-\r
-.v-tree-node-caption-blue {\r
-       color: blue;\r
-}\r
-\r
-.v-tree-node-caption-bold {\r
-       font-weight: bold;\r
-}\r
-\r
-.background-lightblue {\r
-       background: lightblue;\r
-}\r
-\r
-.border-red-1px {\r
-       border: 1px solid red;\r
-}\r
-\r
-.border-blue-2px {\r
-       border: 2px solid blue;\r
-}\r
-\r
-.v-table-row-tables-test-cell-style-red-row,\r
-.v-table-cell-content-tables-test-cell-style-red-row {\r
-       background: #f00;\r
+@import url(../reindeer/styles.css);
+
+.missing {
+       color: red;
+       font-weight: bold;
+}
+
+.v-tree-node-caption-red {
+       color: red;
+}
+
+.v-tree-node-caption-green {
+       color: green;
+}
+
+.v-tree-node-caption-blue {
+       color: blue;
+}
+
+.v-tree-node-caption-bold {
+       font-weight: bold;
+}
+
+.background-lightblue {
+       background: lightblue;
+}
+
+.border-red-1px {
+       border: 1px solid red;
+}
+
+.border-blue-2px {
+       border: 2px solid blue;
+}
+
+.v-table-row-tables-test-cell-style-red-row,
+.v-table-cell-content-tables-test-cell-style-red-row {
+       background: #f00;
 }
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html
index 26b6548dd0bc4397f904a9056c45b35d400d98a7..9c7a6942c9059d9fd6c723e51bd322a5779bd91d 100644 (file)
--- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html
+++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html
@@ -1 +1 @@
-<b>Testing custom layout..</b>\r
+<b>Testing custom layout..</b>

diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html
index 430548173d944297d0c064c82be30a0da3f8c332..6bde912879a417490df79a9cd7d82968e1572639 100644 (file)
--- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html
+++ b/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html
@@ -1,2 +1,2 @@
 <div>This is an utf-8 string: åäöéèáèë<br/>
-The same in ISO-8859-1: åäöéèáèë</div>\r
+The same in ISO-8859-1: åäöéèáèë</div>

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index b83979acc6e0509e9410d2520f6b428f96993032..73d9951d21708ac10b92c2d84fd6fe4d684a5803 100644 (file)
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>\r
-<!DOCTYPE web-app\r
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\r
-    "http://java.sun.com/dtd/web-app_2_3.dtd">\r
-\r
-<!-- THIS IS A DEVELOPMENT AND TESTING web.xml . -->\r
-\r
-<web-app>\r
-       <display-name>Vaadin</display-name>\r
-       <description>Vaadin examples</description>\r
-\r
-       <context-param>\r
-               <param-name>productionMode</param-name>\r
-               <param-value>false</param-value>\r
-               <description>Vaadin production mode</description>\r
-       </context-param>\r
-\r
-       <context-param>\r
-               <param-name>resourceCacheTime</param-name>\r
-               <param-value>3600</param-value>\r
-       </context-param>\r
-\r
-       <servlet>\r
-               <servlet-name>VaadinApplicationRunner</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>defaultPackages</param-name>\r
-                   <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>\r
-               </init-param>\r
-       </servlet>\r
-\r
-       <!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet -->\r
-       <servlet>\r
-               <servlet-name>IntegrationTest</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value>\r
-               </init-param>\r
-       </servlet>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>VaadinApplicationRunner</servlet-name>\r
-               <url-pattern>/run/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>IntegrationTest</servlet-name>\r
-               <url-pattern>/integration/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>IntegrationTest</servlet-name>\r
-               <url-pattern>/VAADIN/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <welcome-file-list>\r
-               <welcome-file>index.html</welcome-file>\r
-       </welcome-file-list>\r
-\r
-</web-app>\r
+<?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>

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 946dbc53fd182b159beec7698c748e905e0c8fb8..be928aacf46f0afc6c9f46d8e4f33b479ebaf495 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -1,499 +1,498 @@
-<?xml version="1.0"?>\r
-\r
-<project name="Vaadin Integration Tests" basedir="." default="integration-test-all">\r
-\r
-       <!-- Target deploying demo.war -->\r
-       <fail unless="test.integration.server" message="test.integration.server must be set for integration tests to run" />\r
-\r
-       <fail unless="test.integration.user" message="test.integration.user must be set for integration tests to run" />\r
-       <fail unless="test.integration.antfile" message="test.integration.antfile must be set for integration tests to run" />\r
-\r
-       <!-- Test with these browsers -->\r
-       <property name="test_browsers" value="winxp-firefox9" />\r
-\r
-       <!-- Path to key file. Default value -->\r
-       <property name="sshkey.file" value="id_dsa" />\r
-\r
-       <!-- path and name for demo.war to be deployed -->\r
-       <property name="demo.war" value="demo.war" />\r
-\r
-       <!-- Host running Testbench RC or Testbench Hub. Default value -->\r
-       <property name="com.vaadin.testbench.tester.host" value="127.0.0.1" />\r
-\r
-       <!-- Base url where the testable application is deployed -->\r
-       <property name="deployment.url" value="http://${test.integration.server}:8080" />\r
-\r
-       <!-- ssh host values -->\r
-       <property name="ant.hub" value="${test.integration.antfile}" />\r
-       <property name="user" value="${test.integration.user}" />\r
-       <property name="passphrase" value="" />\r
-\r
-       <!-- add ant contrib -->\r
-       <taskdef resource="net/sf/antcontrib/antcontrib.properties">\r
-               <classpath>\r
-                       <pathelement location="../build/lib/ant-contrib-1.0b3.jar" />\r
-               </classpath>\r
-       </taskdef>\r
-\r
-       <!-- Upload war to deploy to ssh host -->\r
-       <target name="integration-test-upload-demo">\r
-               <scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />\r
-       </target>\r
-\r
-       <!-- Run basic integration test test -->\r
-       <target name="integration-test-servlet">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-servlet.html" />\r
-               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />\r
-               <subant target="run-tests" failonerror="false" antfile="test.xml">\r
-                       <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />\r
-                       <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />\r
-                       <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />\r
-                       <property name="server.start.succeeded" value="1" />\r
-                       <property name="browsers" value="${test_browsers}" />\r
-                       <property name="testfiles" value="${testfiles}" />\r
-                       <property name="test-output-dir" value="../build/integration-test-output/${server-name}" />\r
-                       <property name="retries" value="0" />\r
-\r
-                       <fileset dir="." includes="test.xml" />\r
-               </subant>\r
-       </target>\r
-\r
-       <target name="integration-test-theme">\r
-               <subant target="run-tests" failonerror="false" antfile="test.xml">\r
-                       <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />\r
-                       <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />\r
-                       <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />\r
-                       <property name="server.start.succeeded" value="1" />\r
-                       <property name="testfiles" value="${testfiles-theme}" />\r
-                       <property name="test-output-dir" value="../build/integration-test-output/${server-name}" />\r
-\r
-                       <fileset dir="." includes="test.xml" />\r
-               </subant>\r
-       </target>\r
-\r
-       <!-- Run integration test on GAE -->\r
-       <target name="integration-test-test-GAE">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="GoogleAppEngine/integration-test-GAE.html" />\r
-               <pathconvert pathsep=" " property="test-GAE" refid="html-test-files" />\r
-\r
-               <subant target="run-tests" failonerror="false" antfile="test.xml">\r
-                       <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />\r
-                       <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />\r
-                       <property name="com.vaadin.testbench.deployment.url" value="http://vaadin-integration-test.appspot.com/" />\r
-                       <property name="server.start.succeeded" value="1" />\r
-                       <property name="browsers" value="${test_browsers}" />\r
-                       <property name="testfiles" value="${test-GAE}" />\r
-                       <property name="test-output-dir" value="../build/integration-test-gae-output" />\r
-\r
-                       <fileset dir="." includes="test.xml" />\r
-               </subant>\r
-       </target>\r
-\r
-       <target name="integration-test-deploy-to-GAE">\r
-               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} deploy-to-GAE" />\r
-       </target>\r
-\r
-\r
-       <target name="integration-test-tomcat7">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="tomcat7" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-tomcat4">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="tomcat4" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-tomcat5">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="tomcat5" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-tomcat6">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="tomcat6" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-jetty5">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="target-server" value="jetty5" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-jetty6">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="target-server" value="jetty6" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-jetty7">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="target-server" value="jetty7" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-jetty8">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="300" />\r
-                       <param name="target-server" value="jetty8" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-jboss3">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="jboss3" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-jboss4">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="jboss4" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-jboss5">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="jboss5" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-jboss6">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="jboss6" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-jboss7">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="jboss7" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-glassfish2">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="glassfish2" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-glassfish3">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="10" />\r
-                       <param name="target-server" value="glassfish3" />\r
-               </antcall>\r
-       </target>\r
-\r
-\r
-       <target name="integration-test-liferay6">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6/integration-test-liferay-6.0.5.html" />\r
-               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />\r
-\r
-               <fileset dir="integration-testscripts" id="html-theme-files" includes="Liferay-6/Liferay6-theme.html" />\r
-               <pathconvert pathsep=" " property="testfiles-theme" refid="html-theme-files" />\r
-\r
-\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="600" />\r
-                       <param name="target-server" value="liferay6" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-liferay5">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-5/integration-test-liferay-5.2.3-portlet2.html" />\r
-               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />\r
-\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="600" />\r
-                       <param name="target-server" value="liferay5" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-liferay6ee">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6EE/integration-test-liferay-6ee.html" />\r
-               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />\r
-\r
-               <fileset dir="integration-testscripts" id="html-theme-files" includes="Liferay-6EE/Liferay6EE-theme.html" />\r
-               <pathconvert pathsep=" " property="testfiles-theme" refid="html-theme-files" />\r
-\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="600" />\r
-                       <param name="target-server" value="liferay6ee" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-gatein3">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="GateIn-3/integration-test-GateIn-3.1.0-portlet2.html" />\r
-               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="600" />\r
-                       <param name="test_browsers" value="winxp-firefox36" />\r
-                       <param name="target-server" value="gatein3" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-exo3">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="eXo-3/integration-test-eXo-3.0.3-portlet2.html" />\r
-               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="600" />\r
-                       <param name="test_browsers" value="winxp-firefox36" />\r
-                       <param name="target-server" value="exo3" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-weblogic9">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="600" />\r
-                       <param name="target-port" value="7001" />\r
-                       <param name="target-server" value="weblogic9" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-weblogic10">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="600" />\r
-                       <param name="target-port" value="7001" />\r
-                       <param name="target-server" value="weblogic10" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-weblogic12">\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="600" />\r
-                       <param name="target-port" value="7001" />\r
-                       <param name="target-server" value="weblogic12" />\r
-               </antcall>\r
-       </target>\r
-\r
-\r
-       <target name="integration-test-weblogicPortal">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" />\r
-               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />\r
-               <antcall target="run-generic-integration-test">\r
-                       <param name="startDelay" value="600" />\r
-                       <param name="target-port" value="7001" />\r
-                       <param name="target-server" value="weblogicportal" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="integration-test-GAE">\r
-               <antcall target="integration-test-deploy-to-GAE" />\r
-               <antcall target="integration-test-test-GAE" />\r
-       </target>\r
-\r
-       <!-- Upload demo, clean error screenshots and test deployment on all servers -->\r
-       <target name="integration-test-all">\r
-\r
-               <parallel>\r
-                       <trycatch property="tried">\r
-                               <try>\r
-                                       <!-- Still running GAE test from the old server which requires its own lock -->\r
-                                       <echo message="Getting lock" />\r
-                                       <antcall target="integration-test-get-lock" />\r
-                                       <echo message="Got lock" />\r
-                                       <antcall target="integration-test-upload-demo" />\r
-\r
-                                       <antcall target="run-integration-test">\r
-                                               <param name="target-server" value="GAE" />\r
-                                       </antcall>\r
-\r
-                                       <antcall target="integration-test-clean" />\r
-                                       <echo message="Getting lock" />\r
-                                       <antcall target="integration-test-release-lock" />\r
-                                       <echo message="Lock released" />\r
-\r
-                               </try>\r
-                               <catch>\r
-                                       <echo message="Uploading of demo.war failed. ${tried}" />\r
-                               </catch>\r
-                       </trycatch>\r
-\r
-                       <antcall target="integration-test-liferay6" />\r
-                       <antcall target="integration-test-liferay6ee" />\r
-                       <antcall target="integration-test-exo3" />\r
-                       <antcall target="integration-test-weblogicPortal" />\r
-                       <antcall target="integration-test-liferay5" />\r
-                       <antcall target="integration-test-weblogic9" />\r
-                       <antcall target="integration-test-weblogic10" />\r
-                       <antcall target="integration-test-weblogic12" />\r
-                       <antcall target="integration-test-gatein3" />\r
-                       <antcall target="integration-test-glassfish2" />\r
-                       <antcall target="integration-test-glassfish3" />\r
-                       <antcall target="integration-test-jboss3" />\r
-                       <antcall target="integration-test-jboss4" />\r
-                       <antcall target="integration-test-jboss5" />\r
-                       <antcall target="integration-test-jboss6" />\r
-                       <antcall target="integration-test-jboss7" />\r
-                       <antcall target="integration-test-jetty5" />\r
-                       <antcall target="integration-test-jetty6" />\r
-                       <antcall target="integration-test-jetty7" />\r
-                       <antcall target="integration-test-jetty8" />\r
-                       <antcall target="integration-test-tomcat4" />\r
-                       <antcall target="integration-test-tomcat5" />\r
-                       <antcall target="integration-test-tomcat6" />\r
-                       <antcall target="integration-test-tomcat7" />\r
-\r
-               </parallel>\r
-\r
-       </target>\r
-\r
-       <target name="do-run-generic-test">\r
-               <property name="target-host" value="${target-server}.devnet.vaadin.com" />\r
-               <property name="target-port" value="8080" />\r
-\r
-               <if>\r
-                       <isset property="startDelay" />\r
-                       <then>\r
-                               <math result="sleepTime" datatype="int">\r
-                                       <op op="rint">\r
-                                               <op op="*">\r
-                                                       <num value="${startDelay}" />\r
-                                                       <op op="random" />\r
-                                               </op>\r
-                                       </op>\r
-                               </math>\r
-                               <echo>Delaying startup of ${target-server} with ${sleepTime} seconds</echo>\r
-                               <sleep seconds="${sleepTime}" />\r
-                       </then>\r
-               </if>\r
-\r
-               <scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}">\r
-                       <fileset dir="integration_base_files">\r
-                               <include name="*" />\r
-                       </fileset>\r
-               </scp>\r
-\r
-               <!-- trycatch probably not needed any more as it just fails with the original message and doesn't do anything in the finally block -->\r
-               <trycatch property="error_message">\r
-                       <try>\r
-                               <!-- timeout in one hour (remote end should timeout in 55 minutes) -->\r
-                               <sshexec host="${target-host}" outputproperty="lock-output" timeout="3600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="chmod +x *.sh; ant -f deploy.xml get-lock" />\r
-                               <antcall target="echo-prefix">\r
-                                       <param name="prefix" value="${target-server}: " />\r
-                                       <param name="message" value="${lock-output}" />\r
-                               </antcall>\r
-\r
-                               <scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />\r
-\r
-                               <!-- timeout in 15 minutes -->\r
-                               <sshexec host="${target-host}" outputproperty="start-output" timeout="900000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml startup-and-deploy" failonerror="false" />\r
-                               <antcall target="echo-prefix">\r
-                                       <param name="prefix" value="${target-server}: " />\r
-                                       <param name="message" value="${start-output}" />\r
-                               </antcall>\r
-\r
-                               <fail message="${start-output}">\r
-                                       <condition>\r
-                                               <not>\r
-                                                       <contains string="${start-output}" substring="Demo deployed successfully" />\r
-                                               </not>\r
-                                       </condition>\r
-                               </fail>\r
-\r
-                               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-${target-server}-servlet.html" overwrite="true" />\r
-                               <antcall target="integration-test-servlet">\r
-                                       <param name="server-name" value="${target-server}" />\r
-                                       <param name="deployment.url" value="http://${target-host}:${target-port}" />\r
-                               </antcall>\r
-\r
-                               <!-- Run theme tests in all browsers if there's a property with the test files -->\r
-                               <if>\r
-                                       <isset property="testfiles-theme" />\r
-                                       <then>\r
-                                               <antcall target="integration-test-theme">\r
-                                                       <param name="server-name" value="${target-server}" />\r
-                                                       <param name="deployment.url" value="http://${target-host}:${target-port}" />\r
-                                               </antcall>\r
-                                       </then>\r
-                               </if>\r
-\r
-                               <!-- timeout in five minutes -->\r
-                               <sshexec host="${target-host}" outputproperty="stop-output" timeout="600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml shutdown-and-cleanup" failonerror="false" />\r
-                               <antcall target="echo-prefix">\r
-                                       <param name="prefix" value="${target-server}: " />\r
-                                       <param name="message" value="${stop-output}" />\r
-                               </antcall>\r
-                       </try>\r
-                       <catch>\r
-                               <fail message="${error_message}" />\r
-                       </catch>\r
-               </trycatch>\r
-       </target>\r
-\r
-       <target name="echo-prefix">\r
-               <propertyregex property="message-prefixed" input="${prefix}${message}" regexp="\n" replace="\0${prefix}" global="true" defaultValue="${prefix}${message}" />\r
-               <echo message="${message-prefixed}" />\r
-       </target>\r
-\r
-       <target name="run-generic-integration-test">\r
-               <concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat>\r
-               <trycatch property="tried">\r
-                       <try>\r
-                               <antcall target="do-run-generic-test" />\r
-                       </try>\r
-                       <catch>\r
-                               <antcallback target="teamcity-escape" return="tried-escaped">\r
-                                       <param name="returnTo" value="tried-escaped" />\r
-                                       <param name="message" value="${tried}" />\r
-                               </antcallback>\r
-                               <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']</concat>\r
-                       </catch>\r
-               </trycatch>\r
-               <concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>\r
-       </target>\r
-\r
-       <target name="teamcity-escape">\r
-               <property name="returnTo" value="return" />\r
-\r
-               <!-- Should also perform other escaping (\u0085, \u2028 and \u2029) - see http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity -->\r
-               <!-- Immutable properties -> needs to create a new one every time -->\r
-               <propertyregex property="details-escaped1" input="${message}" regexp="['|\[\]]" replace="|\0" global="true" defaultValue="${message}" />\r
-               <propertyregex property="details-escaped2" input="${details-escaped1}" regexp="\n" replace="|n" global="true" defaultValue="${details-escaped1}" />\r
-               <propertyregex property="details-escaped3" input="${details-escaped2}" regexp="\r" replace="|r" global="true" defaultValue="${details-escaped2}" />\r
-\r
-               <property name="${returnTo}" value="${details-escaped3}" />\r
-       </target>\r
-\r
-       <target name="run-integration-test">\r
-               <concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat>\r
-               <trycatch property="tried">\r
-                       <try>\r
-                               <antcall target="integration-test-${target-server}" />\r
-                       </try>\r
-                       <catch>\r
-                               <antcallback target="teamcity-escape" return="tried-escaped">\r
-                                       <param name="returnTo" value="tried-escaped" />\r
-                                       <param name="message" value="${tried}" />\r
-                               </antcallback>\r
-                               <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']"</concat>\r
-                       </catch>\r
-               </trycatch>\r
-               <concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>\r
-       </target>\r
-\r
-       <target name="integration-test-get-lock">\r
-               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} get-lock" />\r
-       </target>\r
-\r
-       <target name="integration-test-release-lock">\r
-               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} release-lock" />\r
-       </target>\r
-\r
-       <!-- Remove demo.war -->\r
-       <target name="integration-test-clean">\r
-               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} clean" />\r
-       </target>\r
+<?xml version="1.0"?>
+
+<project name="Vaadin Integration Tests" basedir="." default="integration-test-all">
+
+       <!-- Target deploying demo.war -->
+       <fail unless="test.integration.server" message="test.integration.server must be set for integration tests to run" />
+
+       <fail unless="test.integration.user" message="test.integration.user must be set for integration tests to run" />
+       <fail unless="test.integration.antfile" message="test.integration.antfile must be set for integration tests to run" />
+
+       <!-- Test with these browsers -->
+       <property name="test_browsers" value="winxp-firefox9" />
+
+       <!-- Path to key file. Default value -->
+       <property name="sshkey.file" value="id_dsa" />
+
+       <!-- path and name for demo.war to be deployed -->
+       <property name="demo.war" value="demo.war" />
+
+       <!-- Host running Testbench RC or Testbench Hub. Default value -->
+       <property name="com.vaadin.testbench.tester.host" value="127.0.0.1" />
+
+       <!-- Base url where the testable application is deployed -->
+       <property name="deployment.url" value="http://${test.integration.server}:8080" />
+
+       <!-- ssh host values -->
+       <property name="ant.hub" value="${test.integration.antfile}" />
+       <property name="user" value="${test.integration.user}" />
+       <property name="passphrase" value="" />
+
+       <!-- add ant contrib -->
+       <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+               <classpath>
+                       <pathelement location="../build/lib/ant-contrib-1.0b3.jar" />
+               </classpath>
+       </taskdef>
+
+       <!-- Upload war to deploy to ssh host -->
+       <target name="integration-test-upload-demo">
+               <scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />
+       </target>
+
+       <!-- Run basic integration test test -->
+       <target name="integration-test-servlet">
+               <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-servlet.html" />
+               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
+               <subant target="run-tests" failonerror="false" antfile="test.xml">
+                       <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
+                       <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
+                       <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
+                       <property name="server.start.succeeded" value="1" />
+                       <property name="browsers" value="${test_browsers}" />
+                       <property name="testfiles" value="${testfiles}" />
+                       <property name="test-output-dir" value="../build/integration-test-output/${server-name}" />
+                       <property name="retries" value="0" />
+
+                       <fileset dir="." includes="test.xml" />
+               </subant>
+       </target>
+
+       <target name="integration-test-theme">
+               <subant target="run-tests" failonerror="false" antfile="test.xml">
+                       <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
+                       <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
+                       <property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
+                       <property name="server.start.succeeded" value="1" />
+                       <property name="testfiles" value="${testfiles-theme}" />
+                       <property name="test-output-dir" value="../build/integration-test-output/${server-name}" />
+
+                       <fileset dir="." includes="test.xml" />
+               </subant>
+       </target>
+
+       <!-- Run integration test on GAE -->
+       <target name="integration-test-test-GAE">
+               <fileset dir="integration-testscripts" id="html-test-files" includes="GoogleAppEngine/integration-test-GAE.html" />
+               <pathconvert pathsep=" " property="test-GAE" refid="html-test-files" />
+
+               <subant target="run-tests" failonerror="false" antfile="test.xml">
+                       <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
+                       <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
+                       <property name="com.vaadin.testbench.deployment.url" value="http://vaadin-integration-test.appspot.com/" />
+                       <property name="server.start.succeeded" value="1" />
+                       <property name="browsers" value="${test_browsers}" />
+                       <property name="testfiles" value="${test-GAE}" />
+                       <property name="test-output-dir" value="../build/integration-test-gae-output" />
+
+                       <fileset dir="." includes="test.xml" />
+               </subant>
+       </target>
+
+       <target name="integration-test-deploy-to-GAE">
+               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} deploy-to-GAE" />
+       </target>
+
+
+       <target name="integration-test-tomcat7">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="tomcat7" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-tomcat4">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="tomcat4" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-tomcat5">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="tomcat5" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-tomcat6">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="tomcat6" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-jetty5">
+               <antcall target="run-generic-integration-test">
+                       <param name="target-server" value="jetty5" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-jetty6">
+               <antcall target="run-generic-integration-test">
+                       <param name="target-server" value="jetty6" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-jetty7">
+               <antcall target="run-generic-integration-test">
+                       <param name="target-server" value="jetty7" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-jetty8">
+               <antcall target="run-generic-integration-test">
+                       <param name="target-server" value="jetty8" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-jboss3">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="jboss3" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-jboss4">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="jboss4" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-jboss5">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="jboss5" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-jboss6">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="jboss6" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-jboss7">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="jboss7" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-glassfish2">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="glassfish2" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-glassfish3">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="10" />
+                       <param name="target-server" value="glassfish3" />
+               </antcall>
+       </target>
+
+
+       <target name="integration-test-liferay6">
+               <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6/integration-test-liferay-6.0.5.html" />
+               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
+
+               <fileset dir="integration-testscripts" id="html-theme-files" includes="Liferay-6/Liferay6-theme.html" />
+               <pathconvert pathsep=" " property="testfiles-theme" refid="html-theme-files" />
+
+
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="600" />
+                       <param name="target-server" value="liferay6" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-liferay5">
+               <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-5/integration-test-liferay-5.2.3-portlet2.html" />
+               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
+
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="600" />
+                       <param name="target-server" value="liferay5" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-liferay6ee">
+               <fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6EE/integration-test-liferay-6ee.html" />
+               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
+
+               <fileset dir="integration-testscripts" id="html-theme-files" includes="Liferay-6EE/Liferay6EE-theme.html" />
+               <pathconvert pathsep=" " property="testfiles-theme" refid="html-theme-files" />
+
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="600" />
+                       <param name="target-server" value="liferay6ee" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-gatein3">
+               <fileset dir="integration-testscripts" id="html-test-files" includes="GateIn-3/integration-test-GateIn-3.1.0-portlet2.html" />
+               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="600" />
+                       <param name="test_browsers" value="winxp-firefox36" />
+                       <param name="target-server" value="gatein3" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-exo3">
+               <fileset dir="integration-testscripts" id="html-test-files" includes="eXo-3/integration-test-eXo-3.0.3-portlet2.html" />
+               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="600" />
+                       <param name="test_browsers" value="winxp-firefox36" />
+                       <param name="target-server" value="exo3" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-weblogic9">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="600" />
+                       <param name="target-port" value="7001" />
+                       <param name="target-server" value="weblogic9" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-weblogic10">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="600" />
+                       <param name="target-port" value="7001" />
+                       <param name="target-server" value="weblogic10" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-weblogic12">
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="600" />
+                       <param name="target-port" value="7001" />
+                       <param name="target-server" value="weblogic12" />
+               </antcall>
+       </target>
+
+
+       <target name="integration-test-weblogicPortal">
+               <fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" />
+               <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
+               <antcall target="run-generic-integration-test">
+                       <param name="startDelay" value="600" />
+                       <param name="target-port" value="7001" />
+                       <param name="target-server" value="weblogicportal" />
+               </antcall>
+       </target>
+
+       <target name="integration-test-GAE">
+               <antcall target="integration-test-deploy-to-GAE" />
+               <antcall target="integration-test-test-GAE" />
+       </target>
+
+       <!-- Upload demo, clean error screenshots and test deployment on all servers -->
+       <target name="integration-test-all">
+
+               <parallel>
+                       <trycatch property="tried">
+                               <try>
+                                       <!-- Still running GAE test from the old server which requires its own lock -->
+                                       <echo message="Getting lock" />
+                                       <antcall target="integration-test-get-lock" />
+                                       <echo message="Got lock" />
+                                       <antcall target="integration-test-upload-demo" />
+
+                                       <antcall target="run-integration-test">
+                                               <param name="target-server" value="GAE" />
+                                       </antcall>
+
+                                       <antcall target="integration-test-clean" />
+                                       <echo message="Getting lock" />
+                                       <antcall target="integration-test-release-lock" />
+                                       <echo message="Lock released" />
+
+                               </try>
+                               <catch>
+                                       <echo message="Uploading of demo.war failed. ${tried}" />
+                               </catch>
+                       </trycatch>
+
+                       <antcall target="integration-test-liferay6" />
+                       <antcall target="integration-test-liferay6ee" />
+                       <antcall target="integration-test-exo3" />
+                       <antcall target="integration-test-weblogicPortal" />
+                       <antcall target="integration-test-liferay5" />
+                       <antcall target="integration-test-weblogic9" />
+                       <antcall target="integration-test-weblogic10" />
+                       <antcall target="integration-test-weblogic12" />
+                       <antcall target="integration-test-gatein3" />
+                       <antcall target="integration-test-glassfish2" />
+                       <antcall target="integration-test-glassfish3" />
+                       <antcall target="integration-test-jboss3" />
+                       <antcall target="integration-test-jboss4" />
+                       <antcall target="integration-test-jboss5" />
+                       <antcall target="integration-test-jboss6" />
+                       <antcall target="integration-test-jboss7" />
+                       <antcall target="integration-test-jetty5" />
+                       <antcall target="integration-test-jetty6" />
+                       <antcall target="integration-test-jetty7" />
+                       <antcall target="integration-test-jetty8" />
+                       <antcall target="integration-test-tomcat4" />
+                       <antcall target="integration-test-tomcat5" />
+                       <antcall target="integration-test-tomcat6" />
+                       <antcall target="integration-test-tomcat7" />
+
+               </parallel>
+
+       </target>
+
+       <target name="do-run-generic-test">
+               <property name="target-host" value="${target-server}.devnet.vaadin.com" />
+               <property name="target-port" value="8080" />
+
+               <if>
+                       <isset property="startDelay" />
+                       <then>
+                               <math result="sleepTime" datatype="int">
+                                       <op op="rint">
+                                               <op op="*">
+                                                       <num value="${startDelay}" />
+                                                       <op op="random" />
+                                               </op>
+                                       </op>
+                               </math>
+                               <echo>Delaying startup of ${target-server} with ${sleepTime} seconds</echo>
+                               <sleep seconds="${sleepTime}" />
+                       </then>
+               </if>
+
+               <scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}">
+                       <fileset dir="integration_base_files">
+                               <include name="*" />
+                       </fileset>
+               </scp>
+
+               <!-- trycatch probably not needed any more as it just fails with the original message and doesn't do anything in the finally block -->
+               <trycatch property="error_message">
+                       <try>
+                               <!-- timeout in one hour (remote end should timeout in 55 minutes) -->
+                               <sshexec host="${target-host}" outputproperty="lock-output" timeout="3600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="chmod +x *.sh; ant -f deploy.xml get-lock" />
+                               <antcall target="echo-prefix">
+                                       <param name="prefix" value="${target-server}: " />
+                                       <param name="message" value="${lock-output}" />
+                               </antcall>
+
+                               <scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />
+
+                               <!-- timeout in 15 minutes -->
+                               <sshexec host="${target-host}" outputproperty="start-output" timeout="900000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml startup-and-deploy" failonerror="false" />
+                               <antcall target="echo-prefix">
+                                       <param name="prefix" value="${target-server}: " />
+                                       <param name="message" value="${start-output}" />
+                               </antcall>
+
+                               <fail message="${start-output}">
+                                       <condition>
+                                               <not>
+                                                       <contains string="${start-output}" substring="Demo deployed successfully" />
+                                               </not>
+                                       </condition>
+                               </fail>
+
+                               <copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-${target-server}-servlet.html" overwrite="true" />
+                               <antcall target="integration-test-servlet">
+                                       <param name="server-name" value="${target-server}" />
+                                       <param name="deployment.url" value="http://${target-host}:${target-port}" />
+                               </antcall>
+
+                               <!-- Run theme tests in all browsers if there's a property with the test files -->
+                               <if>
+                                       <isset property="testfiles-theme" />
+                                       <then>
+                                               <antcall target="integration-test-theme">
+                                                       <param name="server-name" value="${target-server}" />
+                                                       <param name="deployment.url" value="http://${target-host}:${target-port}" />
+                                               </antcall>
+                                       </then>
+                               </if>
+
+                               <!-- timeout in five minutes -->
+                               <sshexec host="${target-host}" outputproperty="stop-output" timeout="600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml shutdown-and-cleanup" failonerror="false" />
+                               <antcall target="echo-prefix">
+                                       <param name="prefix" value="${target-server}: " />
+                                       <param name="message" value="${stop-output}" />
+                               </antcall>
+                       </try>
+                       <catch>
+                               <fail message="${error_message}" />
+                       </catch>
+               </trycatch>
+       </target>
+
+       <target name="echo-prefix">
+               <propertyregex property="message-prefixed" input="${prefix}${message}" regexp="\n" replace="\0${prefix}" global="true" defaultValue="${prefix}${message}" />
+               <echo message="${message-prefixed}" />
+       </target>
+
+       <target name="run-generic-integration-test">
+               <concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat>
+               <trycatch property="tried">
+                       <try>
+                               <antcall target="do-run-generic-test" />
+                       </try>
+                       <catch>
+                               <antcallback target="teamcity-escape" return="tried-escaped">
+                                       <param name="returnTo" value="tried-escaped" />
+                                       <param name="message" value="${tried}" />
+                               </antcallback>
+                               <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']</concat>
+                       </catch>
+               </trycatch>
+               <concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>
+       </target>
+
+       <target name="teamcity-escape">
+               <property name="returnTo" value="return" />
+
+               <!-- Should also perform other escaping (\u0085, \u2028 and \u2029) - see http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity -->
+               <!-- Immutable properties -> needs to create a new one every time -->
+               <propertyregex property="details-escaped1" input="${message}" regexp="['|\[\]]" replace="|\0" global="true" defaultValue="${message}" />
+               <propertyregex property="details-escaped2" input="${details-escaped1}" regexp="\n" replace="|n" global="true" defaultValue="${details-escaped1}" />
+               <propertyregex property="details-escaped3" input="${details-escaped2}" regexp="\r" replace="|r" global="true" defaultValue="${details-escaped2}" />
+
+               <property name="${returnTo}" value="${details-escaped3}" />
+       </target>
+
+       <target name="run-integration-test">
+               <concat>##teamcity[testStarted name='${target-server}' flowId='${target-server}']</concat>
+               <trycatch property="tried">
+                       <try>
+                               <antcall target="integration-test-${target-server}" />
+                       </try>
+                       <catch>
+                               <antcallback target="teamcity-escape" return="tried-escaped">
+                                       <param name="returnTo" value="tried-escaped" />
+                                       <param name="message" value="${tried}" />
+                               </antcallback>
+                               <concat>##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']"</concat>
+                       </catch>
+               </trycatch>
+               <concat>##teamcity[testFinished name='${target-server}' flowId='${target-server}']"</concat>
+       </target>
+
+       <target name="integration-test-get-lock">
+               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} get-lock" />
+       </target>
+
+       <target name="integration-test-release-lock">
+               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} release-lock" />
+       </target>
+
+       <!-- Remove demo.war -->
+       <target name="integration-test-clean">
+               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} clean" />
+       </target>
 </project>
\ No newline at end of file