From 4400b1b62587e74073aac7f3c60710ac535795a5 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 17 Apr 2013 18:08:38 +0300
Subject: Package Atmosphere javascript files in vaadin-push (#11629)

Change-Id: Id1beb7f83945478e464eca15a9cc0015d792c8db
---
 push/build.xml | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'push')

diff --git a/push/build.xml b/push/build.xml
index 6fae99e760..3e0d5805b9 100644
--- a/push/build.xml
+++ b/push/build.xml
@@ -11,26 +11,32 @@
 	<property name="module.symbolic" value="com.vaadin.push" />
 	<property name="result.dir" location="result" />
 	<path id="classpath.compile.custom" />
+	
+	<union id="jar.includes">
+		<fileset dir="${vaadin.basedir}/WebContent">
+			<include name="VAADIN/jquery-1.7.2.rebased.js" />
+			<include name="VAADIN/jquery.atmosphere.rebased.js" />
+		</fileset>
+	</union>
+	
+	<target name="jar">
+		<property name="server.osgi.import" value="" />
+		<antcall target="common.jar">
+			<param name="require-bundle" value="" />
+			<param name="import-package" value="${server.osgi.import}" />
+			<reference torefid="extra.jar.includes" refid="jar.includes" />
+		</antcall>
+	</target>
 
-   	 <target name="jar">
-            <property name="server.osgi.import" value="" />
-            <antcall target="common.jar">
-                    <param name="require-bundle" value="" />
-                    <param name="import-package" value="${server.osgi.import}" />
-           		  <reference torefid="extra.jar.includes"
-           		  refid="empty.reference" />
-	    </antcall>
-	 </target>
-
-         <target name="publish-local" depends="jar">
-             <antcall target="common.publish-local" />
-         </target>
+	<target name="publish-local" depends="jar">
+		<antcall target="common.publish-local" />
+	</target>
 
-         <target name="clean">
-             <antcall target="common.clean" />
-         </target>
-         <target name="checkstyle">
-	 </target>
+	<target name="clean">
+		<antcall target="common.clean" />
+	</target>
+	<target name="checkstyle">
+	</target>
 
 	<target name="test" depends="checkstyle">
 	</target>
-- 
cgit v1.2.3