From 9a3dc4e99c7a417778342db83cd6e7c05558e5fb Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 30 May 2013 17:06:30 +0300
Subject: Formatted XML files using defined rules (#11956)

Change-Id: Iecd621321fdde29d2d89d910ba46e9dadee58995
---
 push/build.xml | 131 +++++++++++++++++++++++++++++++--------------------------
 push/ivy.xml   |  17 +++-----
 2 files changed, 78 insertions(+), 70 deletions(-)

(limited to 'push')

diff --git a/push/build.xml b/push/build.xml
index 3e750b67cd..ad27599d36 100644
--- a/push/build.xml
+++ b/push/build.xml
@@ -1,73 +1,84 @@
 <?xml version="1.0"?>
 
-<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>
-	<include file="../build.xml" as="vaadin" />
-	<include file="../common.xml" as="common" />
+<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>
+    <include file="../build.xml" as="vaadin" />
+    <include file="../common.xml" as="common" />
 
-	<property name="module.name" value="vaadin-push" />
-	<property name="module.symbolic" value="com.vaadin.push" />
-	<property name="result.dir" location="result" />
-	<property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" />
+    <property name="module.name" value="vaadin-push" />
+    <property name="module.symbolic" value="com.vaadin.push" />
+    <property name="result.dir" location="result" />
+    <property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" />
 
-	<!-- Keep the version number in sync with ivy.xml -->
-	<property name="atmosphere.version" value="1.0.13" />
-	<property name="jquery.version" value="1.7.2" />
+    <!-- Keep the version number in sync with ivy.xml -->
+    <property name="atmosphere.version" value="1.0.13" />
+    <property name="jquery.version" value="1.7.2" />
 
-	<path id="classpath.compile.custom" />
+    <path id="classpath.compile.custom" />
 
-	<union id="jar.includes">
-		<fileset dir="${result.dir}/js">
-			<include name="VAADIN/vaadinPush.js" />
-		</fileset>
-	</union>
+    <union id="jar.includes">
+        <fileset dir="${result.dir}/js">
+            <include name="VAADIN/vaadinPush.js" />
+        </fileset>
+    </union>
 
-	<target name="vaadinPush.js">
-		<mkdir dir="${result.dir}/js/VAADIN" />
-		<property name="vaadinPush.js.output" location="${result.dir}/js/VAADIN/vaadinPush.js" />
-		<property name="vaadinPush.js.combined.output" location="${result.dir}/js/VAADIN/push.combined.js" />
+    <target name="vaadinPush.js">
+        <mkdir dir="${result.dir}/js/VAADIN" />
+        <property name="vaadinPush.js.output" location="${result.dir}/js/VAADIN/vaadinPush.js" />
+        <property name="vaadinPush.js.combined.output"
+            location="${result.dir}/js/VAADIN/push.combined.js" />
 
-		<loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery-${jquery.version}.js" property="jquery.js.contents" />
-		<loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery.atmosphere.js" property="jquery.atmosphere.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}" />
-					<token key="jquery.atmosphere.js" value="${jquery.atmosphere.js.contents}" />
-				</replacetokens>
-			</filterchain>
-		</loadfile>
-		<echo file="${vaadinPush.js.combined.output}">${vaadinPush.js.contents}</echo>
+        <loadfile
+            srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery-${jquery.version}.js"
+            property="jquery.js.contents" />
+        <loadfile
+            srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery.atmosphere.js"
+            property="jquery.atmosphere.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}" />
+                    <token key="jquery.atmosphere.js" value="${jquery.atmosphere.js.contents}" />
+                </replacetokens>
+            </filterchain>
+        </loadfile>
+        <echo file="${vaadinPush.js.combined.output}">${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" />
-		<java jar="${result.dir}/compressor.jar" fork="true">
-			<arg value="-v"/>
-			<arg value="-o"/>
-			<arg file="${vaadinPush.js.output}"/>
-			<arg file="${vaadinPush.js.combined.output}"/>
-		</java>
-	</target>
-		
-	<target name="jar" depends="vaadinPush.js">
-		<antcall target="common.jar">
-			<param name="require-bundle" value="org.atmosphere.atmosphere-runtime;bundle-version=&quot;${atmosphere.version}&quot;;visibility:=reexport" />
-			<reference torefid="extra.jar.includes" refid="jar.includes" />
-		</antcall>
-	</target>
+        <!-- Minify -->
+        <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" />
+            <arg file="${vaadinPush.js.output}" />
+            <arg file="${vaadinPush.js.combined.output}" />
+        </java>
+    </target>
 
-	<target name="publish-local" depends="jar">
-		<antcall target="common.publish-local" />
-	</target>
+    <target name="jar" depends="vaadinPush.js">
+        <antcall target="common.jar">
+            <param name="require-bundle"
+                value="org.atmosphere.atmosphere-runtime;bundle-version=&quot;${atmosphere.version}&quot;;visibility:=reexport" />
+            <reference torefid="extra.jar.includes" refid="jar.includes" />
+        </antcall>
+    </target>
 
-	<target name="clean">
-		<antcall target="common.clean" />
-	</target>
-	<target name="checkstyle">
-	</target>
+    <target name="publish-local" depends="jar">
+        <antcall target="common.publish-local" />
+    </target>
 
-	<target name="test" depends="checkstyle">
-	</target>
+    <target name="clean">
+        <antcall target="common.clean" />
+    </target>
+    <target name="checkstyle">
+    </target>
+
+    <target name="test" depends="checkstyle">
+    </target>
 </project>
\ No newline at end of file
diff --git a/push/ivy.xml b/push/ivy.xml
index 69b7661fca..e2ba3a63f7 100644
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -4,8 +4,7 @@
     xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
     xmlns:m="http://ant.apache.org/ivy/maven">
 
-    <info organisation="com.vaadin" module="vaadin-push"
-        revision="${vaadin.version}" />
+    <info organisation="com.vaadin" module="vaadin-push" revision="${vaadin.version}" />
 
     <configurations>
         <conf name="build" />
@@ -15,23 +14,21 @@
     </configurations>
     <publications>
         <artifact type="jar" ext="jar" />
-<!-- 
-        <artifact type="source" ext="jar" m:classifier="sources" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
--->        
+        <!-- <artifact type="source" ext="jar" m:classifier="sources" /> 
+            <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> -->
         <artifact type="pom" ext="pom" />
     </publications>
     <dependencies>
         <!-- API DEPENDENCIES -->
-        
+
         <!--Servlet API version 2.4 -->
         <dependency org="javax.servlet" name="servlet-api"
             rev="2.4" conf="build-provided,ide,test -> default" />
-                       
+
         <!-- Atmosphere -->
         <!-- Keep the version number in sync with build.xml -->
-        <dependency org="org.atmosphere" name="atmosphere-runtime" rev="1.0.13"
-        	conf="build,ide,test -> default">
+        <dependency org="org.atmosphere" name="atmosphere-runtime"
+            rev="1.0.13" conf="build,ide,test -> default">
         </dependency>
     </dependencies>
 
-- 
cgit v1.2.3