Formatted XML files using defined rules (#11956)

Change-Id: Iecd621321fdde29d2d89d910ba46e9dadee58995

2 files changed, 141 insertions, 125 deletions

diff --git a/all/build.xml b/all/build.xml
index 4e1a557e53..a83d60b382 100644
--- a/all/build.xml
+++ b/all/build.xml
@@ -1,120 +1,137 @@
 <?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">
-	<description>
-		Compiles a zip containing all jars + dependencies
-	</description>
-	<include file="../common.xml" as="common" />
-	<include file="../build.xml" as="vaadin" />
-
-	<!-- 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="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" />
-
-	<path id="classpath.javadoc">
-		<fileset dir="${temp.deps.dir}" includes="*.jar">
-		</fileset>
-	</path>
-	<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}" />
-		<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" />
-		<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" />
-
-		<!-- 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">
-			<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>
-
-
-	</target>
-
-	<target name="copy-jars">
-		<delete dir="${temp.dir}" />
-		<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}">
-			<fileset dir="${temp.dir}">
-				<exclude name="vaadin-*-${vaadin.version}.*" />
-				<exclude name="vaadin-*-${vaadin.version}-*.*" />
-			</fileset>
-		</move>
-
-
-	</target>
-	<target name="zip" depends="copy-jars, javadoc">
-		<!-- Ensure filtered webcontent files are available -->
-		<antcall target="common.filter.webcontent" />
-
-		<zip destfile="${zip.file}">
-			<fileset dir="${temp.dir}">
-				<!-- Avoid conflicts with servlet and portlet API. They are provided by the container -->
-				<exclude name="**/servlet-api*" />
-				<exclude name="**/portlet-api*" />
-				<!-- Buildhelpers should not even get here ... -->
-				<exclude name="*buildhelpers*" />
-				<!-- Zip users should not need javadoc, sources or pom files -->
-				<exclude name="*.pom" />
-				<exclude name="*-javadoc.jar" />
-				<exclude name="*-sources.jar" />
-
-			</fileset>
-			<fileset refid="common.files.for.all.jars" />
-			<fileset dir="${result.dir}/..">
-				<include name="README.TXT" />
-			</fileset>
-			<!-- Do not include javadoc jar in zip as it is huge (> 40MB) and most people do not need it. -->
-		</zip>
-	</target>
-
-	<target name="publish-local" depends="zip">
-		<antcall target="common.publish-local" />
-	</target>
-
-	<target name="clean">
-		<antcall target="common.clean" />
-	</target>
-	<target name="checkstyle">
-		<!-- Checkstyle is handled by all separate modules -->
-	</target>
-	<target name="test" depends="checkstyle">
-		<!-- No tests for this zip.. -->
-	</target>
+<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>
+    <include file="../common.xml" as="common" />
+    <include file="../build.xml" as="vaadin" />
+
+    <!-- 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="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" />
+
+    <path id="classpath.javadoc">
+        <fileset dir="${temp.deps.dir}" includes="*.jar">
+        </fileset>
+    </path>
+    <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}" />
+        <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" />
+        <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" />
+
+        <!-- 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">
+            <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>
+
+
+    </target>
+
+    <target name="copy-jars">
+        <delete dir="${temp.dir}" />
+        <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}">
+            <fileset dir="${temp.dir}">
+                <exclude name="vaadin-*-${vaadin.version}.*" />
+                <exclude name="vaadin-*-${vaadin.version}-*.*" />
+            </fileset>
+        </move>
+
+
+    </target>
+    <target name="zip" depends="copy-jars, javadoc">
+        <!-- Ensure filtered webcontent files are available -->
+        <antcall target="common.filter.webcontent" />
+
+        <zip destfile="${zip.file}">
+            <fileset dir="${temp.dir}">
+                <!-- Avoid conflicts with servlet and portlet API. They are 
+                    provided by the container -->
+                <exclude name="**/servlet-api*" />
+                <exclude name="**/portlet-api*" />
+                <!-- Buildhelpers should not even get here ... -->
+                <exclude name="*buildhelpers*" />
+                <!-- Zip users should not need javadoc, sources or pom files -->
+                <exclude name="*.pom" />
+                <exclude name="*-javadoc.jar" />
+                <exclude name="*-sources.jar" />
+
+            </fileset>
+            <fileset refid="common.files.for.all.jars" />
+            <fileset dir="${result.dir}/..">
+                <include name="README.TXT" />
+            </fileset>
+            <!-- Do not include javadoc jar in zip as it is huge (> 40MB) 
+                and most people do not need it. -->
+        </zip>
+    </target>
+
+    <target name="publish-local" depends="zip">
+        <antcall target="common.publish-local" />
+    </target>
+
+    <target name="clean">
+        <antcall target="common.clean" />
+    </target>
+    <target name="checkstyle">
+        <!-- Checkstyle is handled by all separate modules -->
+    </target>
+    <target name="test" depends="checkstyle">
+        <!-- No tests for this zip.. -->
+    </target>
 
 </project>
\ No newline at end of file
diff --git a/all/ivy.xml b/all/ivy.xml
index 2b212f6675..3c49e9a884 100644
--- a/all/ivy.xml
+++ b/all/ivy.xml
@@ -19,21 +19,20 @@
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}"/>
+            rev="${vaadin.version}" />
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}"/>
+            rev="${vaadin.version}" />
         <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}"/>
+            rev="${vaadin.version}" />
         <dependency org="com.vaadin" name="vaadin-client-compiler"
-            rev="${vaadin.version}"/>
+            rev="${vaadin.version}" />
         <dependency org="com.vaadin" name="vaadin-theme-compiler"
-            rev="${vaadin.version}"/>
+            rev="${vaadin.version}" />
         <dependency org="com.vaadin" name="vaadin-themes"
-            rev="${vaadin.version}"/>
+            rev="${vaadin.version}" />
         <dependency org="com.vaadin" name="vaadin-client-compiled"
-            rev="${vaadin.version}"/>
-        <dependency org="com.vaadin" name="vaadin-push"
-            rev="${vaadin.version}"/>
+            rev="${vaadin.version}" />
+        <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" />
 
     </dependencies>