Reformatted using Ant editor (#12040)

Change-Id: If8afd65d5905302c64f12ef7f76ee7e63073c474

1 files changed, 10 insertions, 23 deletions

diff --git a/all/build.xml b/all/build.xml
index d6095af20b..080346403f 100644
--- a/all/build.xml
+++ b/all/build.xml
@@ -1,7 +1,6 @@
 <?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>
@@ -11,13 +10,11 @@
     <!-- 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">
@@ -26,17 +23,14 @@
     <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>
 
@@ -45,14 +39,11 @@
         <antcall target="common.filter.webcontent" />
 
         <!-- Unpack all source files to javadoc.temp.dir -->
-        <antcontrib:foreach list="${modules.to.publish.to.maven}"
-            target="unzip.to.javadoctemp" param="module" />
+        <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">
+        <javadoc maxmemory="1024m" destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="${title}" encoding="utf-8">
             <packageset dir="${javadoc.temp.dir}">
                 <!-- TODO Javadoc throws ClassCastException if this is included 
                     (#9660) -->
@@ -61,11 +52,8 @@
             <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" />
+            <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>
 
@@ -80,8 +68,7 @@
 
     <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}">