Reformat build files

Change-Id: Iab68be3e5d5e59bb05610677642a5715efe50feb

11 files changed, 256 insertions, 143 deletions

diff --git a/all/build.xml b/all/build.xml
index 65980e9b05..647ec3c970 100644
--- a/all/build.xml
+++ b/all/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-all" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib">
+<project name="vaadin-all" basedir="." default="publish-local"
+    xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib">
     <description>
         Compiles a zip containing all jars + dependencies
     </description>
@@ -10,11 +11,13 @@
     <!-- global properties -->
     <property name="module.name" value="vaadin-all" />
     <property name="result.dir" value="result" />
-    <property name="javadoc.jar" location="${result.dir}/lib/vaadin-all-${vaadin.version}-javadoc.jar" />
+    <property name="javadoc.jar"
+        location="${result.dir}/lib/vaadin-all-${vaadin.version}-javadoc.jar" />
     <property name="temp.dir" location="${result.dir}/temp" />
     <property name="temp.deps.dir" value="${temp.dir}/lib" />
     <property name="javadoc.temp.dir" location="${result.dir}/javadoc-temp" />
-    <property name="zip.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" />
+    <property name="zip.file"
+        location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" />
 
     <path id="classpath.javadoc">
         <fileset dir="${temp.deps.dir}" includes="*.jar">
@@ -23,61 +26,73 @@
     <target name="fetch.module.and.dependencies">
         <fail unless="module" message="No 'module' parameter given" />
 
-        <ivy:cachepath pathid="module.and.deps" inline="true" organisation="com.vaadin" module="vaadin-${module}" revision="${vaadin.version}" />
+        <ivy:cachepath pathid="module.and.deps" inline="true"
+            organisation="com.vaadin" module="vaadin-${module}"
+            revision="${vaadin.version}" />
         <copy todir="${temp.dir}" flatten="true">
             <path refid="module.and.deps" />
         </copy>
     </target>
 
     <target name="unzip.to.javadoctemp">
-        <property name="file" location="${temp.dir}/vaadin-${module}-${vaadin.version}.jar" />
+        <property name="file"
+            location="${temp.dir}/vaadin-${module}-${vaadin.version}.jar" />
         <unzip src="${file}" dest="${javadoc.temp.dir}" />
     </target>
 
     <target name="javadoc" depends="copy-jars">
-      <!-- Ensure filtered webcontent files are available -->
-      <antcall target="common.filter.webcontent" />
-
-      <antcontrib:if>
-         <isset property="nojavadoc" />
-           <then>
-            <jar file="${javadoc.jar}" compress="true">
-              <fileset refid="common.files.for.all.jars" />
-            </jar>
-           </then>
-           <else>
-             <!-- Unpack all source files to javadoc.temp.dir -->
-             <antcontrib:foreach list="${modules.to.publish.to.maven}" target="unzip.to.javadoctemp" param="module" />
-
-             <property name="javadoc.dir" location="${result.dir}/javadoc" />
-             <property name="title" value="Vaadin ${vaadin.version} API" />
-             <javadoc maxmemory="1024m" destdir="${javadoc.dir}" author="true" version="true" 
-                use="true" windowtitle="${title}" encoding="utf-8" stylesheetfile="javadoc.css">
-               <packageset dir="${javadoc.temp.dir}">
-                  <!-- TODO Javadoc throws ClassCastException if this is included 
-                      (#9660) -->
-                  <exclude name="com/google/gwt/uibinder/elementparsers" />
-               </packageset>
-               <doctitle>&lt;h1>${title}&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.javadoc" />
-             </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>
+        <!-- Ensure filtered webcontent files are available -->
+        <antcall target="common.filter.webcontent" />
+
+        <antcontrib:if>
+            <isset property="nojavadoc" />
+            <then>
+                <jar file="${javadoc.jar}" compress="true">
+                    <fileset refid="common.files.for.all.jars" />
+                </jar>
+            </then>
+            <else>
+                <!-- Unpack all source files to javadoc.temp.dir -->
+                <antcontrib:foreach list="${modules.to.publish.to.maven}"
+                    target="unzip.to.javadoctemp" param="module" />
+
+                <property name="javadoc.dir" location="${result.dir}/javadoc" />
+                <property name="title" value="Vaadin ${vaadin.version} API" />
+                <javadoc maxmemory="1024m" destdir="${javadoc.dir}"
+                    author="true" version="true" use="true" windowtitle="${title}"
+                    encoding="utf-8" stylesheetfile="javadoc.css">
+                    <packageset dir="${javadoc.temp.dir}">
+                        <!-- TODO Javadoc throws ClassCastException if this 
+                            is included (#9660) -->
+                        <exclude
+                            name="com/google/gwt/uibinder/elementparsers" />
+                    </packageset>
+                    <doctitle>&lt;h1>${title}&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.javadoc" />
+                </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="copy-jars">
         <delete dir="${temp.dir}" />
-        <antcontrib:foreach list="${modules.to.publish.to.maven}" target="fetch.module.and.dependencies" param="module" />
+        <antcontrib:foreach list="${modules.to.publish.to.maven}"
+            target="fetch.module.and.dependencies" param="module" />
         <!-- All jars are now in temp.dir. Still need to separate vaadin 
             and deps -->
         <move todir="${temp.deps.dir}">
diff --git a/buildhelpers/build.xml b/buildhelpers/build.xml
index 49c290e9f1..c8121325fe 100644
--- a/buildhelpers/build.xml
+++ b/buildhelpers/build.xml
@@ -39,20 +39,24 @@
 
     <target name="fetch-release-notes-tickets">
         <antcall target="common.exec-buildhelper">
-            <param name="main.class" value="com.vaadin.buildhelpers.FetchReleaseNotesTickets" />
+            <param name="main.class"
+                value="com.vaadin.buildhelpers.FetchReleaseNotesTickets" />
             <param name="output" value="${output}" />
             <param name="src" value="src" />
         </antcall>
     </target>
 
     <target name="fetch-release-notes-authors">
-        <copy file="src/com/vaadin/buildhelpers/authormap.properties" tofile="result/classes/com/vaadin/buildhelpers/authormap.properties" />
+        <copy file="src/com/vaadin/buildhelpers/authormap.properties"
+            tofile="result/classes/com/vaadin/buildhelpers/authormap.properties" />
         <antcall target="common.exec-buildhelper">
-            <param name="main.class" value="com.vaadin.buildhelpers.FetchReleaseNotesAuthors" />
+            <param name="main.class"
+                value="com.vaadin.buildhelpers.FetchReleaseNotesAuthors" />
             <param name="output" value="${output}" />
             <param name="src" value="src" />
         </antcall>
-        <delete file="result/classes/com/vaadin/buildhelpers/authormap.properties" />
+        <delete
+            file="result/classes/com/vaadin/buildhelpers/authormap.properties" />
     </target>
 
     <target name="test" depends="checkstyle">
diff --git a/client-compiled/build.xml b/client-compiled/build.xml
index 78757f5ceb..3c780c280b 100644
--- a/client-compiled/build.xml
+++ b/client-compiled/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-client-compiled" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-client-compiled" basedir="." default="publish-local"
+    xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>
         Compiled (JS+HTML) version of client side
     </description>
@@ -16,8 +17,10 @@
     <property name="gwtar.dir" location="${result.dir}/gwtar" />
     <property name="work.dir" location="${result.dir}/work" />
     <property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
-    <property name="compiled.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-    <property name="compiled-cache.jar" location="${result.dir}/lib/${module.name}-cache-${vaadin.version}.jar" />
+    <property name="compiled.jar"
+        location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
+    <property name="compiled-cache.jar"
+        location="${result.dir}/lib/${module.name}-cache-${vaadin.version}.jar" />
 
     <union id="jar.includes">
         <fileset dir="${result.dir}">
@@ -39,13 +42,18 @@
 
 
     <target name="compile-module-cache">
-        <fail unless="module" message="You must give the module to compile in the 'module' parameter" />
-        <ivy:resolve log="download-only" resolveid="common" conf="compile-module" />
-        <ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" />
+        <fail unless="module"
+            message="You must give the module to compile in the 'module' parameter" />
+        <ivy:resolve log="download-only" resolveid="common"
+            conf="compile-module" />
+        <ivy:cachepath pathid="classpath.compile.widgetset"
+            conf="compile-module" />
         <echo>Creating gwtar files for ${module} in ${gwtar.dir}</echo>
 
         <!-- Produce gwtar files for the separate JAR -->
-        <java classname="com.google.gwt.dev.CompileModule" classpathref="classpath.compile.widgetset" failonerror="yes" fork="yes" maxmemory="512m">
+        <java classname="com.google.gwt.dev.CompileModule"
+            classpathref="classpath.compile.widgetset" failonerror="yes"
+            fork="yes" maxmemory="512m">
             <arg value="-out" />
             <arg value="${gwtar.dir}" />
             <arg value="-strict" />
@@ -58,20 +66,24 @@
     </target>
 
     <target name="compile-module">
-        <fail unless="module" message="You must give the module to compile in the 'module' parameter" />
+        <fail unless="module"
+            message="You must give the module to compile in the 'module' parameter" />
         <property name="style" value="OBF" />
         <property name="localWorkers" value="6" />
         <property name="extraParams" value="" />
 
-        <ivy:resolve log="download-only" resolveid="common" conf="compile-module" />
-        <ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" />
+        <ivy:resolve log="download-only" resolveid="common"
+            conf="compile-module" />
+        <ivy:cachepath pathid="classpath.compile.widgetset"
+            conf="compile-module" />
 
         <mkdir dir="${module.output.dir}" />
 
         <echo>Compiling ${module} to ${module.output.dir}</echo>
 
         <!-- compile the module -->
-        <java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.widgetset" failonerror="yes" fork="yes" maxmemory="512m">
+        <java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.widgetset"
+            failonerror="yes" fork="yes" maxmemory="512m">
             <classpath location="${compiled-cache.jar}" />
             <arg value="-workDir" />
             <arg value="${work.dir}" />
@@ -86,7 +98,7 @@
             <arg value="${localWorkers}" />
             <arg value="-strict" />
             <!-- Disabled for now as it breaks code, e.g. ButtonWithShortcutNotRendered -->
-            <!-- <arg value="-XenableClosureCompiler" />-->
+            <!-- <arg value="-XenableClosureCompiler" /> -->
             <arg line="${extraParams}" />
             <arg value="${module}" />
 
diff --git a/client-compiler/build.xml b/client-compiler/build.xml
index be8dec18bc..5a5d1a6161 100644
--- a/client-compiler/build.xml
+++ b/client-compiler/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-client-compiler" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-client-compiler" basedir="." default="publish-local"
+    xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>
         Compiles build helpers used when building other
         modules.
@@ -22,9 +23,8 @@
         </fileset>
     </path>
     <property name="extra.classes" value="**/*.properties" />
-    <!-- don't try to copy the same files twice (first from classes and then
-         from sources) in order for the build not to fail when packaging the
-         JAR -->
+    <!-- don't try to copy the same files twice (first from classes and then 
+        from sources) in order for the build not to fail when packaging the JAR -->
     <property name="jar.exclude" value="**/*.properties" />
     <union id="compiler.includes">
         <union refid="client-compiler.gwt.includes" />
@@ -35,7 +35,8 @@
 
     <target name="jar">
         <!-- Get Git revision -->
-        <exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
+        <exec executable="git" outputproperty="git.revision"
+            failifexecutionfails="false" errorproperty="">
             <arg value="describe" />
             <arg value="--tags" />
             <arg value="--always" />
@@ -72,7 +73,7 @@
 
     <target name="test" depends="checkstyle">
         <antcall target="common.test.run" />
-        <!--<echo>WHAT? No tests for ${module.name}!</echo>-->
+        <!--<echo>WHAT? No tests for ${module.name}!</echo> -->
     </target>
 
 </project>
diff --git a/client/build.xml b/client/build.xml
index a6d6f17020..1e65dc37c5 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -23,21 +23,25 @@
     <path id="classpath.test.custom" />
 
     <target name="jar">
-        <property name="jar.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
+        <property name="jar.file"
+            location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
         <antcall target="common.jar">
             <reference refid="client.gwt.includes" torefid="extra.jar.includes" />
         </antcall>
         <jar destfile="${jar.file}" update="true">
             <manifest>
-                <attribute name="Vaadin-Package-Version" value="1" />
+                <attribute name="Vaadin-Package-Version"
+                    value="1" />
                 <attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" />
             </manifest>
         </jar>
         <!-- Hack to add validation dependency with source classifier -->
-        <property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
+        <property name="pom.xml"
+            location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
         <copy file="${pom.xml}" tofile="${temp.pom}">
             <filterchain>
-                <replacestring from="  &lt;/dependencies&gt;" to="    &lt;dependency&gt;
+                <replacestring from="  &lt;/dependencies&gt;"
+                    to="    &lt;dependency&gt;
                &lt;groupId&gt;javax.validation&lt;/groupId&gt;
                &lt;artifactId&gt;validation-api&lt;/artifactId&gt;
                &lt;version&gt;1.0.0.GA&lt;/version&gt;
diff --git a/push/build.xml b/push/build.xml
index b7d57cf4d3..9afe76620c 100644
--- a/push/build.xml
+++ b/push/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-push" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-push" basedir="." default="publish-local"
+    xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>
         Meta package which defines dependencies needed for push
     </description>
@@ -13,7 +14,8 @@
     <property name="temp.dir" location="${result.dir}/temp" />
     <property name="jquery.unpack" location="${temp.dir}/jquery" />
     <property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" />
-    <property name="vaadinPush.debug.js" location="${result.dir}/js/VAADIN/vaadinPush.debug.js" />
+    <property name="vaadinPush.debug.js"
+        location="${result.dir}/js/VAADIN/vaadinPush.debug.js" />
 
     <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java -->
     <property name="atmosphere.runtime.version" value="2.2.4.vaadin2" />
@@ -30,8 +32,10 @@
 
     <target name="vaadinPush.js">
         <mkdir dir="${result.dir}/js/VAADIN" />
-        <ivy:resolve log="download-only" file="ivy.xml" conf="push.js" />
-        <ivy:cachepath pathid="atmosphere.jquery.deps" conf="push.js" />
+        <ivy:resolve log="download-only" file="ivy.xml"
+            conf="push.js" />
+        <ivy:cachepath pathid="atmosphere.jquery.deps"
+            conf="push.js" />
 
         <delete dir="${temp.dir}" />
         <copy flatten="true" tofile="${temp.dir}/jquery.war">
@@ -46,9 +50,12 @@
             <mapper type="flatten" />
         </unzip>
         <loadfile srcfile="${jquery.js}" property="jquery.js.contents" />
-        <loadfile srcfile="${jquery.unpack}/jquery.atmosphere.js" property="jquery.atmosphere.js.contents" />
+        <loadfile srcfile="${jquery.unpack}/jquery.atmosphere.js"
+            property="jquery.atmosphere.js.contents" />
 
-        <loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/vaadinPush.js.tpl" property="vaadinPush.js.contents">
+        <loadfile
+            srcfile="${vaadin.basedir}/WebContent/VAADIN/vaadinPush.js.tpl"
+            property="vaadinPush.js.contents">
             <filterchain>
                 <replacetokens begintoken="@" endtoken="@">
                     <token key="jquery.js" value="${jquery.js.contents}" />
@@ -61,7 +68,9 @@
         <echo file="${vaadinPush.debug.js}">${vaadinPush.js.contents}</echo>
 
         <!-- Minify -->
-        <ivy:retrieve organisation="com.yahoo.platform.yui" module="yuicompressor" revision="2.4.7" inline="true" type="jar" pattern="${result.dir}/compressor.jar" />
+        <ivy:retrieve organisation="com.yahoo.platform.yui"
+            module="yuicompressor" revision="2.4.7" inline="true" type="jar"
+            pattern="${result.dir}/compressor.jar" />
         <java jar="${result.dir}/compressor.jar" fork="true">
             <arg value="-v" />
             <arg value="-o" />
@@ -72,7 +81,8 @@
 
     <target name="jar" depends="vaadinPush.js">
         <antcall target="common.jar">
-            <param name="require-bundle" value="com.vaadin.external.atmosphere.runtime;bundle-version=&quot;${atmosphere.runtime.version}&quot;;visibility:=reexport" />
+            <param name="require-bundle"
+                value="com.vaadin.external.atmosphere.runtime;bundle-version=&quot;${atmosphere.runtime.version}&quot;;visibility:=reexport" />
             <reference torefid="extra.jar.includes" refid="jar.includes" />
         </antcall>
     </target>
diff --git a/server/build.xml b/server/build.xml
index 7bb70ffdc4..798058b88b 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-server" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-server" basedir="." default="publish-local"
+    xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>
-        Compiles build helpers used when building other modules.
+        Compiles build helpers used when building other
+        modules.
     </description>
     <include file="../common.xml" as="common" />
     <include file="../build.xml" as="vaadin" />
@@ -23,8 +25,10 @@
     </union>
 
     <target name="jar">
-        <property name="server.osgi.import" value="javax.servlet;version=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,javax.validation;version=&quot;1.0.0.GA&quot;;resolution:=optional,org.jsoup;version=&quot;1.6.3&quot;,org.jsoup.parser;version=&quot;1.6.3&quot;,org.jsoup.nodes;version=&quot;1.6.3&quot;,org.jsoup.helper;version=&quot;1.6.3&quot;,org.jsoup.safety;version=&quot;1.6.3&quot;,org.json;version=&quot;0.0.20080701&quot;" />
-        <property name="server.osgi.require" value="com.vaadin.shared;bundle-version=&quot;${vaadin.version}&quot;,com.vaadin.push;bundle-version=&quot;${vaadin.version}&quot;;resolution:=optional,com.vaadin.sass-compiler;bundle-version=&quot;${vaadin.sass.version}&quot;;resolution:=optional" />
+        <property name="server.osgi.import"
+            value="javax.servlet;version=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,javax.validation;version=&quot;1.0.0.GA&quot;;resolution:=optional,org.jsoup;version=&quot;1.6.3&quot;,org.jsoup.parser;version=&quot;1.6.3&quot;,org.jsoup.nodes;version=&quot;1.6.3&quot;,org.jsoup.helper;version=&quot;1.6.3&quot;,org.jsoup.safety;version=&quot;1.6.3&quot;,org.json;version=&quot;0.0.20080701&quot;" />
+        <property name="server.osgi.require"
+            value="com.vaadin.shared;bundle-version=&quot;${vaadin.version}&quot;,com.vaadin.push;bundle-version=&quot;${vaadin.version}&quot;;resolution:=optional,com.vaadin.sass-compiler;bundle-version=&quot;${vaadin.sass.version}&quot;;resolution:=optional" />
         <antcall target="common.jar">
             <param name="require-bundle" value="${server.osgi.require}" />
             <param name="import-package" value="${server.osgi.import}" />
diff --git a/shared/build.xml b/shared/build.xml
index 1e7e788be5..8e2f6bc15e 100644
--- a/shared/build.xml
+++ b/shared/build.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-shared" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-shared" basedir="." default="publish-local"
+    xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>
-        Compiles build helpers used when building other modules.
+        Compiles build helpers used when building other
+        modules.
     </description>
     <include file="../common.xml" as="common" />
     <include file="../build.xml" as="vaadin" />
@@ -18,7 +20,8 @@
     <path id="classpath.test.custom" />
 
     <target name="jar">
-        <property name="shared.osgi.import" value="org.json;version=&quot;0.0.20080701&quot;, com.google.gwt.thirdparty.guava.common.annotations;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.base;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.base.internal;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.cache;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.collect;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.eventbus;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.io;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.net;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.primitives;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.util.concurrent;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.impl;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.util;version=&quot;0.0.10.vaadin1&quot;, org.w3c.flute.parser;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.parser.selectors;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.util;version=&quot;1.3.0.gg2&quot;" />
+        <property name="shared.osgi.import"
+            value="org.json;version=&quot;0.0.20080701&quot;, com.google.gwt.thirdparty.guava.common.annotations;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.base;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.base.internal;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.cache;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.collect;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.eventbus;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.io;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.net;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.primitives;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.guava.common.util.concurrent;version=&quot;16.0.1.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.impl;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.util;version=&quot;0.0.10.vaadin1&quot;, org.w3c.flute.parser;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.parser.selectors;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.util;version=&quot;1.3.0.gg2&quot;" />
         <delete dir="${src.filtered}" />
         <!-- Update version in Version.java -->
         <copy todir="${src.filtered}">
diff --git a/themes/build.xml b/themes/build.xml
index 4a95c043fc..487376ebdf 100644
--- a/themes/build.xml
+++ b/themes/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-themes" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-themes" basedir="." default="publish-local"
+    xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>
         Themes compiled to CSS
     </description>
@@ -24,8 +25,10 @@
     </union>
 
     <target name="compile-themes">
-        <ivy:resolve log="download-only" resolveid="common" conf="build" />
-        <ivy:cachepath pathid="classpath.compile.theme" conf="build" />
+        <ivy:resolve log="download-only" resolveid="common"
+            conf="build" />
+        <ivy:cachepath pathid="classpath.compile.theme"
+            conf="build" />
 
         <antcall target="compile-theme">
             <param name="theme" value="base" />
@@ -55,7 +58,8 @@
     </target>
 
     <target name="copy-theme">
-        <fail unless="theme" message="You must give the theme name to copy n the 'theme' parameter" />
+        <fail unless="theme"
+            message="You must give the theme name to copy n the 'theme' parameter" />
         <property name="theme.source.dir" location="../WebContent/VAADIN/themes/${theme}/" />
 
         <copy todir="${theme.result.dir}/${theme}">
@@ -72,17 +76,23 @@
     </target>
 
     <target name="compile-theme" depends="copy-theme">
-        <fail unless="theme" message="You must give the theme name to compile in the 'theme' parameter" />
+        <fail unless="theme"
+            message="You must give the theme name to compile in the 'theme' parameter" />
 
-        <ivy:resolve log="download-only" resolveid="common" conf="compile-theme" />
-        <ivy:cachepath pathid="classpath.compile.theme" conf="compile-theme" />
-        <ivy:cachepath pathid="classpath.runtime.theme" conf="build" />
+        <ivy:resolve log="download-only" resolveid="common"
+            conf="compile-theme" />
+        <ivy:cachepath pathid="classpath.compile.theme"
+            conf="compile-theme" />
+        <ivy:cachepath pathid="classpath.runtime.theme"
+            conf="build" />
 
         <echo>Compiling ${theme}</echo>
         <mkdir dir="${theme.result.dir}" />
 
         <!-- compile the theme -->
-        <java classname="com.vaadin.buildhelpers.CompileTheme" classpathref="classpath.compile.theme" failonerror="yes" fork="yes" maxmemory="512m">
+        <java classname="com.vaadin.buildhelpers.CompileTheme"
+            classpathref="classpath.compile.theme" failonerror="yes"
+            fork="yes" maxmemory="512m">
             <arg value="--theme" />
             <arg value="${theme}" />
             <arg value="--theme-folder" />
diff --git a/uitest/build.xml b/uitest/build.xml
index 02b97fb3a0..246720e2c5 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-uitest" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-uitest" basedir="." default="publish-local"
+    xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>
         Provides a uitest WAR containing Vaadin UI tests
     </description>
@@ -12,20 +13,24 @@
     <property name="uitest.dir" location="${vaadin.basedir}/uitest" />
     <property name="result.dir" value="result" />
     <property name="theme.result.dir" value="${result.dir}/VAADIN/themes" />
-    <property name="result.war" location="${result.dir}/lib/${module.name}-${vaadin.version}.war" />
+    <property name="result.war"
+        location="${result.dir}/lib/${module.name}-${vaadin.version}.war" />
 
     <path id="classpath.compile.custom">
     </path>
 
     <target name="dependencies">
-        <!-- This is copied from common.xml to be able to add server.test.source
+        <!-- This is copied from common.xml to be able to add server.test.source 
             to the source path -->
 
-        <ivy:resolve log="download-only" resolveid="common" conf="build, build-provided" />
-        <ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" />
+        <ivy:resolve log="download-only" resolveid="common"
+            conf="build, build-provided" />
+        <ivy:cachepath pathid="classpath.compile.dependencies"
+            conf="build, build-provided" />
     </target>
 
-    <target name="compile" description="Compiles the module" depends="dependencies">
+    <target name="compile" description="Compiles the module"
+        depends="dependencies">
 
         <fail unless="module.name" message="No module name given" />
         <property name="result.dir" location="result" />
@@ -35,16 +40,21 @@
         <mkdir dir="${classes}" />
 
         <!-- TODO: Get rid of this -->
-        <javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
+        <javac destdir="${classes}" source="${vaadin.java.version}"
+            target="${vaadin.java.version}" debug="true" encoding="UTF-8"
+            includeantruntime="false">
             <src path="${server.test.sources}" />
             <include name="com/vaadin/tests/data/bean/**" />
             <include name="com/vaadin/tests/VaadinClasses.java" />
-            <include name="com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java" />
+            <include
+                name="com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java" />
             <classpath refid="classpath.compile.dependencies" />
             <classpath refid="classpath.compile.custom" />
         </javac>
 
-        <javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
+        <javac destdir="${classes}" source="${vaadin.java.version}"
+            target="${vaadin.java.version}" debug="true" encoding="UTF-8"
+            includeantruntime="false">
             <src path="${src}" />
             <classpath location="${classes}" />
             <classpath refid="classpath.compile.dependencies" />
@@ -53,7 +63,8 @@
     </target>
 
     <target name="testing-widgetset" depends="dependencies,compile">
-        <property name="module" value="com.vaadin.tests.widgetset.TestingWidgetSet" />
+        <property name="module"
+            value="com.vaadin.tests.widgetset.TestingWidgetSet" />
         <property name="style" value="OBF" />
         <property name="localWorkers" value="6" />
         <property name="extraParams" value="" />
@@ -65,7 +76,8 @@
         <echo>Compiling ${module} to ${module.output.dir}</echo>
 
         <!-- compile the module -->
-        <java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.dependencies" failonerror="yes" fork="yes" maxmemory="512m">
+        <java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.dependencies"
+            failonerror="yes" fork="yes" maxmemory="512m">
             <classpath location="src" />
             <classpath location="${classes}" />
             <arg value="-workDir" />
@@ -92,15 +104,18 @@
 
     </target>
 
-    <target name="war" depends="dependencies, compile, compile-test-themes, testing-widgetset">
+    <target name="war"
+        depends="dependencies, compile, compile-test-themes, testing-widgetset">
         <property name="result.dir" location="result" />
         <property name="classes" location="${result.dir}/classes" />
         <property name="WebContent.dir" location="${vaadin.basedir}/WebContent" />
         <property name="deps.dir" location="${result.dir}/deps" />
         <property name="src" location="${result.dir}/../src" />
 
-        <ivy:resolve log="download-only" resolveid="common" conf="build" />
-        <ivy:cachepath pathid="classpath.runtime.dependencies" conf="build" />
+        <ivy:resolve log="download-only" resolveid="common"
+            conf="build" />
+        <ivy:cachepath pathid="classpath.runtime.dependencies"
+            conf="build" />
 
         <delete dir="${deps.dir}" />
         <mkdir dir="${deps.dir}" />
@@ -110,7 +125,8 @@
         </copy>
 
         <delete>
-            <!-- Avoid including some potentially conflicting jars in the war -->
+            <!-- Avoid including some potentially conflicting jars in the 
+                war -->
             <fileset dir="${deps.dir}" includes="jetty-*.jar" />
             <fileset dir="${deps.dir}" includes="servlet-api-*.jar" />
         </delete>
@@ -156,38 +172,45 @@
     <target name="test" depends="checkstyle">
     </target>
 
-    <target name="test-testbench" depends="clean-testbench-errors" description="Run all TestBench based tests, including server tests">
+    <target name="test-testbench" depends="clean-testbench-errors"
+        description="Run all TestBench based tests, including server tests">
         <parallel>
             <daemons>
                 <!-- Start server -->
-                <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" />
+                <ant antfile="${uitest.dir}/vaadin-server.xml"
+                    inheritall="true" inheritrefs="true" target="deploy-and-start" />
             </daemons>
             <sequential>
                 <!-- Server tests -->
 
-                <!-- Sleep before running integration tests so testbench 2
-                        tests have time to compile and start -->
+                <!-- Sleep before running integration tests so testbench 
+                    2 tests have time to compile and start -->
                 <sleep minutes="4" />
-                <ant antfile="${uitest.dir}/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false">
+                <ant antfile="${uitest.dir}/integration_tests.xml"
+                    target="integration-test-all" inheritall="false"
+                    inheritrefs="false">
                     <property name="demo.war" value="${war.file}" />
                 </ant>
             </sequential>
             <sequential>
                 <!-- Wait for server to start -->
-                <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" />
+                <ant antfile="${uitest.dir}/vaadin-server.xml"
+                    target="wait-for-startup" />
 
                 <!-- Run all different kinds of TestBench tests in parallel -->
                 <parallel>
 
                     <!-- Legacy TestBench 2 tests -->
                     <sequential>
-                        <ant antfile="${uitest.dir}/test.xml" target="tb2-tests" />
+                        <ant antfile="${uitest.dir}/test.xml"
+                            target="tb2-tests" />
                         <echo message="TestBench 2 tests complete" />
                     </sequential>
 
                     <!-- TestBench 3 tests -->
                     <sequential>
-                        <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests" inheritall="true" />
+                        <ant antfile="${uitest.dir}/tb3test.xml"
+                            target="run-all-tb3-tests" inheritall="true" />
                         <echo message="TestBench 3 tests complete" />
                     </sequential>
                 </parallel>
@@ -196,13 +219,17 @@
     </target>
 
     <target name="test-server" depends="clean-testbench-errors">
-        <property name="war.file" location="${vaadin.basedir}/result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+        <property name="war.file"
+            location="${vaadin.basedir}/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" />
+                <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">
+                <ant antfile="${uitest.dir}/integration_tests.xml"
+                    target="integration-test-all" inheritall="false"
+                    inheritrefs="false">
                     <property name="demo.war" value="${war.file}" />
                 </ant>
             </sequential>
@@ -210,36 +237,45 @@
     </target>
 
     <target name="test-tb2" depends="clean-testbench-errors">
-        <property name="war.file" location="${vaadin.basedir}/result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+        <property name="war.file"
+            location="${vaadin.basedir}/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" />
+                <ant antfile="${uitest.dir}/vaadin-server.xml"
+                    inheritall="true" inheritrefs="true" target="deploy-and-start" />
             </daemons>
             <sequential>
-                <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" />
+                <ant antfile="${uitest.dir}/vaadin-server.xml"
+                    target="wait-for-startup" />
                 <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="${vaadin.basedir}/result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+        <property name="war.file"
+            location="${vaadin.basedir}/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" />
+                <ant antfile="${uitest.dir}/vaadin-server.xml"
+                    inheritall="true" inheritrefs="true" target="deploy-and-start" />
             </daemons>
             <sequential>
-                <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" />
-                <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests" inheritall="true" />
+                <ant antfile="${uitest.dir}/vaadin-server.xml"
+                    target="wait-for-startup" />
+                <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" />
+        <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" />
         <delete>
-            <fileset dir="${com.vaadin.testbench.screenshot.directory}/errors">
+            <fileset
+                dir="${com.vaadin.testbench.screenshot.directory}/errors">
                 <include name="*" />
             </fileset>
         </delete>
@@ -268,22 +304,28 @@
             <param name="theme" value="tests-valo-blueprint" />
         </antcall>
         <antcall target="compile-theme">
-          <param name="theme" value="tests-valo-light" />
+            <param name="theme" value="tests-valo-light" />
         </antcall>
 
     </target>
     <target name="compile-theme" depends="copy-theme">
-        <fail unless="theme" message="You must give the theme name to compile in the 'theme' parameter" />
+        <fail unless="theme"
+            message="You must give the theme name to compile in the 'theme' parameter" />
 
-        <ivy:resolve log="download-only" resolveid="common" conf="compile-theme" />
-        <ivy:cachepath pathid="classpath.compile.theme" conf="compile-theme" />
-        <ivy:cachepath pathid="classpath.runtime.theme" conf="build" />
+        <ivy:resolve log="download-only" resolveid="common"
+            conf="compile-theme" />
+        <ivy:cachepath pathid="classpath.compile.theme"
+            conf="compile-theme" />
+        <ivy:cachepath pathid="classpath.runtime.theme"
+            conf="build" />
 
         <echo>Compiling ${theme}</echo>
         <mkdir dir="${theme.result.dir}" />
 
         <!-- compile the theme -->
-        <java classname="com.vaadin.buildhelpers.CompileTheme" classpathref="classpath.compile.theme" failonerror="yes" fork="yes" maxmemory="512m">
+        <java classname="com.vaadin.buildhelpers.CompileTheme"
+            classpathref="classpath.compile.theme" failonerror="yes"
+            fork="yes" maxmemory="512m">
             <arg value="--theme" />
             <arg value="${theme}" />
             <arg value="--theme-folder" />
@@ -298,7 +340,8 @@
     </target>
 
     <target name="copy-theme">
-        <fail unless="theme" message="You must give the theme name to copy n the 'theme' parameter" />
+        <fail unless="theme"
+            message="You must give the theme name to copy n the 'theme' parameter" />
         <property name="theme.source.dir" location="../WebContent/VAADIN/themes" />
 
         <copy todir="${theme.result.dir}">
diff --git a/widgets/build.xml b/widgets/build.xml
index 3e5ed61be2..1a93f79631 100644
--- a/widgets/build.xml
+++ b/widgets/build.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-widgets" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-widgets" basedir="." default="publish-local"
+    xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>
         Widgets package for using Vaadin widgets with GWT 2.7+
     </description>
@@ -34,7 +35,8 @@
 
         <ivy:resolve transitive="false" type="jar" conf="build" />
         <ivy:cachepath pathid="vaadin.jars" />
-        <ivy:resolve transitive="false" type="jar" conf="build-provided" />
+        <ivy:resolve transitive="false" type="jar"
+            conf="build-provided" />
         <ivy:cachepath pathid="compile.deps" />
         <unjar dest="${result.deps}">
             <path refid="vaadin.jars" />
@@ -62,7 +64,8 @@
                 <include name="com/vaadin/shared/ui/grid/**/*.java" />
                 <include name="com/vaadin/shared/util/SharedUtil.java" />
                 <include name="com/vaadin/shared/VBrowserDetails.java" />
-                <include name="com/vaadin/shared/data/sort/SortDirection.java" />
+                <include
+                    name="com/vaadin/shared/data/sort/SortDirection.java" />
 
                 <include name="com/vaadin/sass/linker/*.java" />
 
@@ -79,11 +82,14 @@
             <fileset dir="${result.deps}/VAADIN/themes/base" />
         </copy>
     </target>
-    <target name="compile" description="Compiles the module" depends="dependencies,copysrc">
+    <target name="compile" description="Compiles the module"
+        depends="dependencies,copysrc">
         <property name="classes" location="${result.dir}/classes" />
         <mkdir dir="${classes}" />
 
-        <javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
+        <javac destdir="${classes}" source="${vaadin.java.version}"
+            target="${vaadin.java.version}" debug="true" encoding="UTF-8"
+            includeantruntime="false">
             <src path="${result.src}" />
             <classpath refid="classpath.compile.custom" />
             <classpath refid="compile.deps" />
@@ -91,7 +97,8 @@
     </target>
 
     <target name="jar" depends="compile">
-        <property name="jar.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
+        <property name="jar.file"
+            location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
         <antcall target="common.jar">
             <param name="src" value="${result.dir}/src" />
             <reference refid="jar.includes" torefid="extra.jar.includes" />
@@ -118,7 +125,7 @@
     </target>
 
     <target name="test" depends="checkstyle">
-        <!--        <antcall target="common.test.run" />-->
+        <!-- <antcall target="common.test.run" /> -->
     </target>
 
 </project>