Merge remote-tracking branch 'origin/master' into feature/vaadin8

Change-Id: I12a87d0b61a928da6af38fcd629420016f6090e0

checkstyle/vaadin-checkstyle.xml

@@ -18,12 +18,12 @@
 	to ^[A-Z_]*$ . Others (protected, package and private) still have ^[a-z][a-zA-Z0-9]*$
 	- Modified the severity of the following Checks from error to info:
 	• JavadocPackage (checks for package-info.java)
-	• JavadocType (class and interface declarations, scope private)
-	• JavadocMethod (method declarations, scope private)
-	• JavadocVariable (variable declarations, scope private)
+	- Modified the severity of the following Checks from error to warning and the scope from private to protected:
+	• JavadocType (class and interface declarations)
+	• JavadocMethod (method declarations)
+	• JavadocVariable (variable declarations)
 	• JavadocStyle (Javadocs are "well formed")
-	- Modified the severity of the following Checks from error to warning because
-	not so critical:
+	- Modified the severity of the following Checks from error to warning because not so critical:
 	• LineLenght (the default value is 80 which is also used in formatter, but
 	i.e. member declarations are not wrapped onto next line)
 	• RedundantModifier (i.e. using public in interface method declarations)
@@ -104,16 +104,20 @@
         <!-- Checks for Javadoc comments. -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <module name="JavadocMethod">
-            <property name="severity" value="info" />
+            <property name="severity" value="warning" />
+            <property name="scope" value="protected" />
         </module>
         <module name="JavadocType">
-            <property name="severity" value="info" />
-        </module>
+            <property name="severity" value="warning" />
+            <property name="scope" value="protected" />
+                    </module>
         <module name="JavadocVariable">
-            <property name="severity" value="info" />
+            <property name="severity" value="warning" />
+            <property name="scope" value="protected" />
         </module>
         <module name="JavadocStyle">
-            <property name="severity" value="info" />
+            <property name="severity" value="warning" />
+            <property name="scope" value="protected" />
         </module>
 
         <!-- Checks for Naming Conventions. -->

client-compiled/pom.xml

@@ -67,7 +67,7 @@
 							<classpathScope>compile</classpathScope>
 							<executable>${java.home}/bin/java</executable>
 							<arguments>
-								<argument>-Dvaadin.version=${project.version}</argument>
+								<argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
 								<argument>-DincludeNumberPackages=1</argument>
 
 								<argument>-classpath</argument>
@@ -110,6 +110,7 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+						<Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
 						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
 						<!-- Export package is handled in exec plugin -->
 						<Export-Package></Export-Package>

client-compiler/pom.xml

@@ -229,8 +229,9 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+						<Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
 						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-						<Export-Package>com.vaadin.*;version="${project.version}"</Export-Package>
+						<Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
 						<!--TODO decide gwt packages version number<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${vaadin.gwt.version}"</Export-Package> -->
 						<Import-Package></Import-Package> <!--todo find out what should be in Import-Package -->
 					</instructions>

client/pom.xml

@@ -96,7 +96,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-						<Export-Package>com.vaadin.*;version="${project.version}"</Export-Package>
+						<Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
 						<Import-Package></Import-Package>
 					</instructions>
 				</configuration>

client/src/main/java/com/vaadin/client/ApplicationConfiguration.java

@@ -191,10 +191,9 @@ public class ApplicationConfiguration implements EntryPoint {
          */
         private native String getAtmosphereJSVersion()
         /*-{
-            if ($wnd.jQueryVaadin != undefined){
-                return $wnd.jQueryVaadin.atmosphere.version;
-            }
-            else {
+            if ($wnd.vaadinPush && $wnd.vaadinPush.atmosphere) {
+                return $wnd.vaadinPush.atmosphere.version;
+            } else {
                 return null;
             }
         }-*/;

client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java

@@ -556,7 +556,7 @@ public class AtmospherePushConnection implements PushConnection {
             self.@com.vaadin.client.communication.AtmospherePushConnection::onClientTimeout(*)(request);
         });
 
-        return $wnd.jQueryVaadin.atmosphere.subscribe(config);
+        return $wnd.vaadinPush.atmosphere.subscribe(config);
     }-*/;
 
     private native void doPush(JavaScriptObject socket, String message)
@@ -566,12 +566,12 @@ public class AtmospherePushConnection implements PushConnection {
 
     private static native void doDisconnect(String url)
     /*-{
-       $wnd.jQueryVaadin.atmosphere.unsubscribeUrl(url);
+       $wnd.vaadinPush.atmosphere.unsubscribeUrl(url);
     }-*/;
 
     private static native boolean isAtmosphereLoaded()
     /*-{
-        return $wnd.jQueryVaadin != undefined;
+        return $wnd.vaadinPush && $wnd.vaadinPush.atmosphere;
     }-*/;
 
     private void runWhenAtmosphereLoaded(final Command command) {

client/src/main/java/com/vaadin/client/widgets/Grid.java

@@ -2526,7 +2526,8 @@ public class Grid<T> extends ResizeComposite implements
          */
         private void setCellFocus(int rowIndex, int columnIndexDOM,
                 RowContainer container) {
-            if (rowIndex == rowWithFocus
+            if (container == null
+                    || rowIndex == rowWithFocus
                     && cellFocusRange.contains(columnIndexDOM)
                     && container == this.containerWithFocus) {
                 return;

documentation/layout/layout-formlayout.asciidoc

@@ -18,8 +18,7 @@ shown for each field. The field captions can have an icon in addition to the
 text. [classname]#FormLayout# is an ordered layout and much like
 [classname]#VerticalLayout#. For description of margins, spacing, and other
 features in ordered layouts, see
-<<dummy/../../../framework/layout/layout-orderedlayout#layout.orderedlayout,"VerticalLayout
-and HorizontalLayout">>.
+<<dummy/../../../framework/layout/layout-orderedlayout#layout.orderedlayout, "VerticalLayout and HorizontalLayout">>.
 
 The following example shows typical use of [classname]#FormLayout# in a form:
 
@@ -32,11 +31,11 @@ tf1.setIcon(FontAwesome.USER);
 tf1.setRequired(true);
 tf1.addValidator(new NullValidator("Must be given", false));
 form.addComponent(tf1);
-        
+
 TextField tf2 = new TextField("Street address");
 tf2.setIcon(FontAwesome.ROAD);
 form.addComponent(tf2);
-        
+
 TextField tf3 = new TextField("Postal code");
 tf3.setIcon(FontAwesome.ENVELOPE);
 tf3.addValidator(new IntegerRangeValidator("Doh!", 1, 99999));
@@ -91,9 +90,4 @@ shown as a part of the caption column.
 For information on setting margins and spacing, see also
 <<dummy/../../../framework/layout/layout-orderedlayout#layout.orderedlayout.spacing,"Spacing
 in Ordered Layouts">> and
-<<dummy/../../../framework/layout/layout-settings#layout.settings.margins,"Layout
-Margins">>.
-
-
-
-
+<<dummy/../../../framework/layout/layout-settings#layout.settings.margins, "Layout Margins">>.

documentation/layout/layout-gridlayout.asciidoc

@@ -12,22 +12,18 @@ ifdef::web[]
 image:{live-demo-image}[alt="Live Demo", link="http://demo.vaadin.com/sampler/#ui/layout/grid-layout"]
 endif::web[]
 
-[classname]#GridLayout# container lays components out on a grid, defined by the
-number of columns and rows. The columns and rows of the grid serve as
-coordinates that are used for laying out components on the grid. Each component
-can use multiple cells from the grid, defined as an area (x1,y1,x2,y2), although
-they typically take up only a single grid cell.
+[classname]#GridLayout# container lays components out on a grid consisting of rows and columns.
+The columns and rows of the grid serve as coordinates that are used for laying out components on the grid.
+Each component can use multiple cells from the grid, defined as an area (x1,y1,x2,y2), although they typically take up only a single grid cell.
 
-The grid layout maintains a cursor for adding components in left-to-right,
-top-to-bottom order. If the cursor goes past the bottom-right corner, it will
-automatically extend the grid downwards by adding a new row.
-
-The following example demonstrates the use of [classname]#GridLayout#. The
-[methodname]#addComponent# takes a component and optional coordinates. The
-coordinates can be given for a single cell or for an area in x,y (column,row)
-order. The coordinate values have a base value of 0. If coordinates are not
-given, the cursor will be used.
+The grid layout maintains a cursor for adding components in left-to-right, top-to-bottom order.
+If the cursor goes past the bottom-right corner, it will automatically extend the grid downwards by adding a new row.
 
+The following example demonstrates the use of [classname]#GridLayout#.
+The [methodname]#addComponent()# method takes the component to be added and optional coordinates.
+The coordinates can be given for a single cell or for an area in x,y (column,row) order.
+The coordinate values have a base value of 0.
+If the coordinates are not given, the cursor will be used.
 
 [source, java]
 ----
@@ -64,31 +60,21 @@ image::img/gridlayout.png[width=50%, scaledwidth=75%]
 A component to be placed on the grid must not overlap with existing components.
 A conflict causes throwing a [classname]#GridLayout.OverlapsException#.
 
+[[layout.gridlayout.sizing]]
 == Sizing Grid Cells
 
-You can define the size of both a grid layout and its components in either fixed
-or percentual units, or leave the size undefined altogether, as described in
-<<dummy/../../../framework/components/components-features#components.features.sizeable,"Sizing
-Components">>.
-<<dummy/../../../framework/layout/layout-settings#layout.settings.size,"Layout
-Size">> gives an introduction to sizing of layouts.
-
-The size of the [classname]#GridLayout# component is undefined by default, so it
-will shrink to fit the size of the components placed inside it. In most cases,
-especially if you set a defined size for the layout but do not set the contained
-components to full size, there will be some unused space. The position of the
-non-full components within the grid cells will be determined by their
-__alignment__. See
-<<dummy/../../../framework/layout/layout-settings#layout.settings.alignment,"Layout
-Cell Alignment">> for details on how to align the components inside the cells.
+You can define the size of both a grid layout and its components in either fixed or percentual units, or leave the size undefined altogether, as described in <<dummy/../../../framework/components/components-features#components.features.sizeable,"Sizing Components">>.
+<<dummy/../../../framework/layout/layout-settings#layout.settings.size,"Layout Size">> gives an introduction to sizing of layouts.
+
+The size of the [classname]#GridLayout# component is undefined by default, so it will shrink to fit the size of the components placed inside it.
+In most cases, especially if you set a defined size for the layout but do not set the contained components to full size, there will be some unused space.
+The position of the non-full components within the grid cells will be determined by their __alignment__.
+See <<dummy/../../../framework/layout/layout-settings#layout.settings.alignment,"Layout Cell Alignment">> for details on how to align the components inside the cells.
 
 The components contained within a [classname]#GridLayout# layout can be laid out
 in a number of different ways depending on how you specify their height or
-width. The layout options are similar to [classname]#HorizontalLayout# and
-[classname]#VerticalLayout#, as described in
-<<dummy/../../../framework/layout/layout-orderedlayout#layout.orderedlayout,"VerticalLayout
-and HorizontalLayout">>.
-
+width.
+The layout options are similar to [classname]#HorizontalLayout# and [classname]#VerticalLayout#, as described in <<dummy/../../../framework/layout/layout-orderedlayout#layout.orderedlayout, "VerticalLayout and HorizontalLayout">>.
 
 [WARNING]
 .A layout that contains components with percentual size must have a defined size!
@@ -100,7 +86,6 @@ requirement holds for height and width separately. The debug mode allows
 detecting such invalid cases; see
 <<dummy/../../../framework/advanced/advanced-debug#advanced.debug.mode,"Enabling
 the Debug Mode">>.
-
 ====
 
 Often, you want to have one or more rows or columns that take all the available
@@ -117,7 +102,7 @@ expanding rows/columns.
 [source, java]
 ----
 GridLayout grid = new GridLayout(3,2);
-
+ifdef::web[]
 // Layout containing relatively sized components must have
 // a defined size, here is fixed size.
 grid.setWidth("600px");
@@ -137,7 +122,7 @@ for (int i=0; i<labels.length; i++) {
     label.setWidth(null); // Set width as undefined
     grid.addComponent(label);
 }
-
+endif::web[]
 // Set different expansion ratios for the two columns
 grid.setColumnExpandRatio(1, 1);
 grid.setColumnExpandRatio(2, 5);
@@ -145,6 +130,7 @@ grid.setColumnExpandRatio(2, 5);
 // Set the bottom row to expand
 grid.setRowExpandRatio(1, 1);
 
+ifdef::web[]
 // Align and size the labels.
 for (int col=0; col<grid.getColumns(); col++) {
     for (int row=0; row<grid.getRows(); row++) {
@@ -157,6 +143,7 @@ for (int col=0; col<grid.getColumns(); col++) {
             c.setHeight("100%");
     }
 }
+endif::web[]
 ----
 
 [[figure.ui.gridlayout.sizing.expanding]]
@@ -180,7 +167,7 @@ and 80 pixels, regardless of the minimum size of their contained components.
 [source, css]
 ----
 .v-gridlayout {}
-.v-gridlayout-margin {}
+  .v-gridlayout-margin {}
 ----
 
 The `v-gridlayout` is the root element of the [classname]#GridLayout# component.

documentation/layout/layout-orderedlayout.asciidoc

@@ -20,7 +20,6 @@ vertically. [classname]#HorizontalLayout# has undefined size in both dimensions.
 
 Typical use of the layouts goes as follows:
 
-
 [source, java]
 ----
 VerticalLayout vertical = new VerticalLayout ();
@@ -39,10 +38,14 @@ image::img/orderedlayout_vertical.png[width=30%, scaledwidth=65%]
 
 image::img/orderedlayout_horizontal.png[width=80%, scaledwidth=100%]
 
-[[layout.orderedlayout.properties]]
-== Properties or Attributes
+|===============
+|Component|Element Name
+|[classname]#VerticalLayout#|[elementname]#v-verticallayout#
+|[classname]#HorizontalLayout#|[elementname]#v-horizontallayout#
+|[classname]#FormLayout#|[elementname]#v-formlayout#
+|===============
 
-Ordered layouts have the following properties:
+The have the following declarative attributes:
 
 [[layout.orderedlayout.properties.table]]
 .Properties and Declarative Attributes

pom.xml

@@ -42,7 +42,7 @@
 		<!-- Atmosphere versions -->
 		<!-- Note that this should be kept in sync with the class Constants -->
 		<atmosphere.runtime.version>2.2.9.vaadin2</atmosphere.runtime.version>
-		<atmosphere.js.version>2.2.13.vaadin3</atmosphere.js.version>
+		<atmosphere.js.version>2.2.13.vaadin5</atmosphere.js.version>
 
 		<!-- Dependency unpack directory -->
 		<dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory>
@@ -231,6 +231,19 @@
 		</pluginManagement>
 
 		<plugins>
+			<plugin>
+			    <groupId>org.codehaus.mojo</groupId>
+			    <artifactId>build-helper-maven-plugin</artifactId>
+			    <version>1.8</version>
+			    <executions>
+			      <execution>
+			        <id>parse-version</id>
+			        <goals>
+			          <goal>parse-version</goal>
+			        </goals>
+			      </execution>
+			    </executions>
+			</plugin>		
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>animal-sniffer-maven-plugin</artifactId>

push/pom.xml

@@ -26,7 +26,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.vaadin.external.atmosphere.client</groupId>
-			<artifactId>jquery</artifactId>
+			<artifactId>javascript</artifactId>
 			<version>${atmosphere.js.version}</version>
 			<type>war</type>
 			<scope>provided</scope>
@@ -48,7 +48,7 @@
 						<!-- <inherited>false</inherited> -->
 						<configuration>
 							<target>
-								<property name="jquery.unpack" location="${project.build.directory}/temp" />
+								<property name="javascript.unpack" location="${project.build.directory}/temp" />
 								<property name="vaadinPush.js"
 									location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" />
 								<property name="templates.dir"
@@ -56,24 +56,21 @@
 
 								<!-- Unzip to temp dir -->
 								<unzip
-									src="${maven.dependency.com.vaadin.external.atmosphere.client.jquery.war.path}"
-									dest="${jquery.unpack}">
+									src="${maven.dependency.com.vaadin.external.atmosphere.client.javascript.war.path}"
+									dest="${javascript.unpack}">
 									<patternset>
-										<include name="**/jquery.atmosphere.js" />
+										<include name="**/atmosphere.js" />
 									</patternset>
 									<mapper type="flatten" />
 								</unzip>
-								<loadfile srcfile="${templates.dir}/jquery-1.11.0.js"
-									property="jquery.js.contents" />
-								<loadfile srcfile="${jquery.unpack}/jquery.atmosphere.js"
-									property="jquery.atmosphere.js.contents" />
+								<loadfile srcfile="${javascript.unpack}/atmosphere.js"
+									property="atmosphere.js.contents" />
 
 								<loadfile srcfile="${templates.dir}/vaadinPush.js.tpl"
 									property="vaadinPush.js.contents">
 									<filterchain>
 										<replacetokens begintoken="@" endtoken="@">
-											<token key="jquery.js" value="${jquery.js.contents}" />
-											<token key="jquery.atmosphere.js" value="${jquery.atmosphere.js.contents}" />
+											<token key="atmosphere.js" value="${atmosphere.js.contents}" />
 										</replacetokens>
 									</filterchain>
 								</loadfile>
@@ -138,6 +135,7 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+						<Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
 						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
 						<Export-Package>VAADIN</Export-Package>
 						<Require-Bundle>com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport</Require-Bundle>

push/src/main/templates/vaadinPush.js.tpl

@@ -1,10 +1,7 @@
+window.vaadinPush = window.vaadinPush|| {};
 (function(define) {
-@jquery.js@
-window.jQueryVaadin = window.jQuery.noConflict(true);
-(function(jQuery, undefined) {
-	@jquery.atmosphere.js@
-})(jQueryVaadin);
+@atmosphere.js@
 if (window.console) {
 	window.console.log("Vaadin push loaded");
 }
-})();
+}).call(window.vaadinPush);

server/pom.xml

@@ -150,7 +150,7 @@
 	</dependencies>
 
 	<build>
-		<plugins>
+		<plugins>		
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<executions>
@@ -221,9 +221,10 @@
 				<configuration>
 					<instructions>
 						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-						<Export-Package>com.vaadin.*;version="${project.version}"</Export-Package>
-						<Import-Package>javax.servlet;version="${javax.servlet.version}",
-							javax.servlet.http;version="${javax.servlet.version}",
+						<Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+						<Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
+						<Import-Package>javax.servlet;version="[2.4,${javax.servlet.version}]",
+							javax.servlet.http;version="[2.4,${javax.servlet.version}]",
 							javax.validation;version="${javax.validation.version}";resolution:=optional,
 							org.jsoup;version="${jsoup.version}",
 							org.jsoup.parser;version="${jsoup.version}",
@@ -235,9 +236,9 @@
 							javax.portlet.filter;version="[${javax.portlet.version},3)";resolution:=optional,
 							com.liferay.portal.kernel.util;resolution:=optional</Import-Package>
 						<Require-Bundle>
-							com.vaadin.shared;bundle-version="${project.version}",
-							com.vaadin.push;bundle-version="${project.version}";resolution:=optional,
-							com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional"</Require-Bundle>
+							com.vaadin.shared;bundle-version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+							com.vaadin.push;bundle-version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}";resolution:=optional,
+							com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional</Require-Bundle>
 					</instructions>
 				</configuration>
 				<executions>

shared/pom.xml

@@ -117,7 +117,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-						<Export-Package>com.vaadin.*;version="${project.version}",elemental.*;version="${project.version}"</Export-Package>
+						<Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+						<Export-Package>com.vaadin.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",elemental.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
 						<Import-Package>com.google.gwt.thirdparty.streamhtmlparser;version="${streamhtmlparser.version}",
 							com.google.gwt.thirdparty.streamhtmlparser.impl;version="${streamhtmlparser.version}",
 							com.google.gwt.thirdparty.streamhtmlparser.util;version="${streamhtmlparser.version}",

themes/pom.xml

@@ -246,7 +246,7 @@
 							<classpathScope>compile</classpathScope>
 							<executable>${java.home}/bin/java</executable>
 							<arguments>
-								<argument>-Dvaadin.version=${project.version}</argument>
+								<argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
 								<argument>-DincludeNumberPackages=0</argument>
 
 								<argument>-classpath</argument>
@@ -295,6 +295,7 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
+						<Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
 						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
 						<!-- Export package is handled in exec plugin -->
 						<Export-Package></Export-Package>

uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java

@@ -18,16 +18,12 @@ package com.vaadin.tests.components.grid;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.number.IsCloseTo.closeTo;
 
-import java.util.List;
-
 import org.junit.Test;
 import org.openqa.selenium.By;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.GridElement;
 import com.vaadin.testbench.elements.GridLayoutElement;
 import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
@@ -39,15 +35,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
 @TestCategory("grid")
 public class GridLayoutDetailsRowTest extends MultiBrowserTest {
 
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        List<DesiredCapabilities> browsersToTest = super.getBrowsersToTest();
-        // for some reason PhantomJS doesn't find the label even if it detects
-        // the presence
-        browsersToTest.remove(Browser.PHANTOMJS.getDesiredCapabilities());
-        return browsersToTest;
-    }
-
     @Test
     public void testLabelHeights() {
         openTestURL();
@@ -55,7 +42,7 @@ public class GridLayoutDetailsRowTest extends MultiBrowserTest {
 
         GridElement grid = $(GridElement.class).first();
 
-        grid.getRow(2).click();
+        grid.getRow(2).click(5, 5);
         waitForElementPresent(By.id("lbl2"));
 
         GridLayoutElement gridLayout = $(GridLayoutElement.class).first();

uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java

@@ -25,7 +25,7 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.parallel.TestCategory;
-import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.tests.tb3.SingleBrowserTest;
 
 /**
  * Test for PUSH version string in debug window.
@@ -33,7 +33,7 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  * @author Vaadin Ltd
  */
 @TestCategory("push")
-public class PushVersionInfoTest extends MultiBrowserTest {
+public class PushVersionInfoTest extends SingleBrowserTest {
 
     @Test
     public void testDisabledPush() {
@@ -63,8 +63,8 @@ public class PushVersionInfoTest extends MultiBrowserTest {
                 "Push client version doesn't contain 'vaadin' string",
                 jsString.contains("vaadin"));
         Assert.assertTrue(
-                "Push client version doesn't contain 'jquery' string",
-                jsString.contains("jquery"));
+                "Push client version doesn't contain 'javascript' string",
+                jsString.contains("javascript"));
     }
 
     private void selectInfoTab() {

widgets/pom.xml

@@ -63,6 +63,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                    	<Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
                         <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
                         <!-- Export package is handled in exec plugin -->
                         <Export-Package></Export-Package>
@@ -225,7 +226,7 @@
                             <classpathScope>compile</classpathScope>
                             <executable>${java.home}/bin/java</executable>
                             <arguments>
-                                <argument>-Dvaadin.version=${project.version}</argument>
+                                <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
                                 <argument>-DincludeNumberPackages=1</argument>
 
                                 <argument>-classpath</argument>