Reformatted using Ant editor (#12040)

Change-Id: If8afd65d5905302c64f12ef7f76ee7e63073c474

2 files changed, 17 insertions, 39 deletions

diff --git a/build/common.xml b/build/common.xml
index ee60c1ff42..39f3ee7d9f 100644
--- a/build/common.xml
+++ b/build/common.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0"?>
 
-<project xmlns:antcontrib="antlib:net.sf.antcontrib"
-    xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant"
-    name="common" basedir="../" default="init-deps">
+<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="common" basedir="../" default="init-deps">
 
     <property name="ivy.install.version" value="2.2.0" />
     <property name="ivy.jar.name" value="ivy-${ivy.install.version}.jar" />
     <property name="ivy.jar.dir" value="${user.home}/.ant/lib" />
     <property name="ivy.jar.file" value="${ivy.jar.dir}/${ivy.jar.name}" />
 
-    <target name="init-deps"
-        description="Configure Ivy dependency management and load common task definitions"
-        depends="init-taskdefs" unless="deps.initialized">
+    <target name="init-deps" description="Configure Ivy dependency management and load common task definitions" depends="init-taskdefs" unless="deps.initialized">
         <property name="deps.initialized" value="1" />
     </target>
 
@@ -23,26 +19,20 @@
 
     <target name="ivy-download" unless="ivy.installed">
         <mkdir dir="${ivy.jar.dir}" />
-        <get
-            src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
-            dest="${ivy.jar.file}" usetimestamp="true" />
+        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true" />
     </target>
 
-    <target name="ivy-configure" depends="check-ivy-installed"
-        unless="deps.initialized">
+    <target name="ivy-configure" depends="check-ivy-installed" unless="deps.initialized">
         <!-- Ivy task definitions -->
-        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
-            classpath="${ivy.jar.file}" />
+        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}" />
         <!-- Ivy settings -->
-        <property name="ivy.settings.file"
-            value="${project.root}/build/ivy/ivysettings.xml" />
+        <property name="ivy.settings.file" value="${project.root}/build/ivy/ivysettings.xml" />
         <ivy:configure />
     </target>
 
     <target name="init-taskdefs" depends="ivy-configure" unless="deps.initialized">
         <echo>Loading Ant tasks</echo>
-        <ivy:resolve file="${project.root}/build/ivy/ivy.xml"
-            conf="taskdefs" />
+        <ivy:resolve file="${project.root}/build/ivy/ivy.xml" conf="taskdefs" />
         <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />
         <taskdef resource="emma_ant.properties" classpathref="taskdefs.classpath" />
 
@@ -50,16 +40,13 @@
             override) -->
         <!-- Note that we have to use a namespace to avoid clash when running 
             sub-ant. -->
-        <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml"
-            classpathref="taskdefs.classpath" />
+        <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" />
 
         <!-- ant contrib for Maven integration -->
-        <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
-            uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
+        <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
 
         <!-- jarjar -->
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
-            classpathref="taskdefs.classpath" />
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="taskdefs.classpath" />
 
     </target>
 
diff --git a/build/ide.xml b/build/ide.xml
index 37cd3dd802..ab5749edaf 100755
--- a/build/ide.xml
+++ b/build/ide.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 
-<project xmlns:antcontrib="antlib:net.sf.antcontrib"
-    xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant"
-    name="Build script for IDE users" basedir=".."
-    default="theme-and-default-widgetset">
+<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="Build script for IDE users" basedir=".." default="theme-and-default-widgetset">
     <include file="${basedir}/gwt-files.xml" />
 
     <property name="gwt.dev.classes" location="${gwt.eclipse.basedir}/dev/bin" />
@@ -73,8 +70,7 @@
     </target>
 
     <target name="compile-theme">
-        <java classname="com.vaadin.buildhelpers.CompileTheme"
-            failonerror="yes" fork="yes">
+        <java classname="com.vaadin.buildhelpers.CompileTheme" failonerror="yes" fork="yes">
             <classpath refid="classpath" />
             <jvmarg value="-Djava.awt.headless=true" />
             <arg value="--theme" />
@@ -94,8 +90,7 @@
 
     <target name="testing-widgetset">
         <antcall target="compile-widgetset">
-            <param name="widgetset"
-                value="com.vaadin.tests.widgetset.TestingWidgetSet" />
+            <param name="widgetset" value="com.vaadin.tests.widgetset.TestingWidgetSet" />
         </antcall>
     </target>
 
@@ -116,8 +111,7 @@
             revision="1.0.0.GA"/> -->
 
         <!-- compile the module -->
-        <java classname="com.google.gwt.dev.Compiler" classpathref="classpath"
-            failonerror="yes" fork="yes" maxmemory="512m">
+        <java classname="com.google.gwt.dev.Compiler" classpathref="classpath" failonerror="yes" fork="yes" maxmemory="512m">
             <arg value="-workDir" />
             <arg value="${work.dir}" />
             <arg value="-logLevel" />
@@ -144,12 +138,9 @@
     <target name="vaadinPush.js">
         <property name="vaadinPush.js.output" location="WebContent/VAADIN/vaadinPush.js" />
 
-        <loadfile srcfile="WebContent/VAADIN/jquery-1.7.2.js"
-            property="jquery.js.contents" />
-        <loadfile srcfile="WebContent/VAADIN/jquery.atmosphere.js"
-            property="jquery.atmosphere.js.contents" />
-        <loadfile srcfile="WebContent/VAADIN/vaadinPush.js.tpl"
-            property="vaadinPush.js.contents">
+        <loadfile srcfile="WebContent/VAADIN/jquery-1.7.2.js" property="jquery.js.contents" />
+        <loadfile srcfile="WebContent/VAADIN/jquery.atmosphere.js" property="jquery.atmosphere.js.contents" />
+        <loadfile srcfile="WebContent/VAADIN/vaadinPush.js.tpl" property="vaadinPush.js.contents">
             <filterchain>
                 <replacetokens begintoken="@" endtoken="@">
                     <token key="jquery.js" value="${jquery.js.contents}" />