Merge changes from origin/7.1

dd5698f Revert "Fix displaced TabSheet caption icon in Chrome"
2d8ec53 Fix TabSheet caption icon alignment on Chrome and Safari (#13077)
1e22aaf Added nojavadoc parameter, test-server, test-tb2, test-tb3 targets.

Change-Id: Ibc8421d3e3c037c01f31e168ce79baf20ef61684

3 files changed, 78 insertions, 19 deletions

diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
index e6b1a669c6..a2091130a1 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
@@ -143,8 +143,13 @@
 }
 .v-sa & .#{$primaryStyleName}-tabs .v-captiontext {
 	display: inline-block;
-	vertical-align: middle;
 }
+
+/* Align TabSheet icons differently on Chromes and Safaris #13077 */
+.v-sa & .#{$primaryStyleName}-tabs .v-icon {
+	vertical-align: top;
+}
+
 .#{$primaryStyleName}-tabs .v-icon {
 	width: 16px !important;
 	height: 16px !important;
@@ -160,4 +165,4 @@
 	display: inline-block;
 }
 
-}
\ No newline at end of file
+}
diff --git a/common.xml b/common.xml
index a49c25c6be..cef335035d 100644
--- a/common.xml
+++ b/common.xml
@@ -152,28 +152,44 @@
     </target>
 
     <target name="javadoc.jar" depends="dependencies, filter.webcontent">
-        <fail unless="result.dir" message="No result.dir parameter given" />
+      <fail unless="result.dir" message="No result.dir parameter given" />
         <fail unless="module.name" message="No module.name parameter given" />
         <property name="src" location="{$result.dir}/../src" />
         <property name="javadoc.dir" value="${result.dir}/javadoc" />
         <property name="javadoc.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}-javadoc.jar" />
 
-        <javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="${module.name}">
-            <packageset dir="${src}" excludes="${classes.exclude}" />
-            <doctitle>&lt;h1>${module.name}&lt;/h1></doctitle>
-            <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> -->
-            <bottom>${javadoc.bottom}</bottom>
-            <link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" />
-            <link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" />
-            <classpath refid="classpath.compile.dependencies" />
-        </javadoc>
-
-        <!-- Create a javadoc jar -->
-        <jar file="${javadoc.jar}" compress="true">
-            <fileset dir="${javadoc.dir}" />
-            <fileset refid="common.files.for.all.jars" />
-        </jar>
-
+        <antcontrib:if>
+            <!--
+              Most straight forward way to skip javadocs is to provide
+              an empty javadoc.jar. Ivy publish won't allow leaving the file
+              out without using conf attribute. Using conf would make internal
+              dependency resolution unnecessary complicated.
+             -->
+        	<isset property="nojavadoc" />
+              <then>
+                <jar file="${javadoc.jar}" compress="true">
+                  <fileset refid="common.files.for.all.jars" />
+                </jar>
+              </then>
+            <else>
+              <javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="${module.name}">
+                <packageset dir="${src}" excludes="${classes.exclude}" />
+
+                  <doctitle>&lt;h1>${module.name}&lt;/h1></doctitle>
+                  <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> -->
+                  <bottom>${javadoc.bottom}</bottom>
+                  <link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" />
+                  <link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" />
+                  <classpath refid="classpath.compile.dependencies" />
+              </javadoc>
+
+              <!-- Create a javadoc jar -->
+              <jar file="${javadoc.jar}" compress="true">
+                <fileset dir="${javadoc.dir}" />
+                <fileset refid="common.files.for.all.jars" />
+              </jar>
+            </else>
+        </antcontrib:if>
     </target>
 
     <target name="jar" depends="compile, pom.xml, filter.webcontent">
diff --git a/uitest/build.xml b/uitest/build.xml
index 7d5ce867fe..b9bb5a4cbd 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -191,6 +191,44 @@
         </parallel>
     </target>
 
+    <target name="test-server" depends="clean-testbench-errors">
+       <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+       <parallel>
+         <daemons>
+           <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
+         </daemons>
+         <sequential>
+           <ant antfile="${uitest.dir}/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false">
+             <property name="demo.war" value="${war.file}" />
+           </ant>
+         </sequential>
+       </parallel>
+    </target>
+
+    <target name="test-tb2" depends="clean-testbench-errors">
+       <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+       <parallel>
+         <daemons>
+           <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
+         </daemons>
+         <sequential>
+           <ant antfile="${uitest.dir}/test.xml" target="tb2-tests" />
+         </sequential>
+       </parallel>
+    </target>
+
+    <target name="test-tb3" depends="clean-testbench-errors">
+       <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+       <parallel>
+         <daemons>
+           <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
+         </daemons>
+         <sequential>
+           <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests" inheritall="true" />
+         </sequential>
+       </parallel>
+    </target>
+
     <target name="clean-testbench-errors">
         <fail unless="com.vaadin.testbench.screenshot.directory" message="Define screenshot directory using -Dcom.vaadin.testbench.screenshot.directory" />
         <mkdir dir="${com.vaadin.testbench.screenshot.directory}/errors" />