From 2772641acf8f84046e3ac42c8386b65e4f2346f2 Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannesd@vaadin.com>
Date: Mon, 13 May 2013 17:34:16 +0300
Subject: OSGi support for vaadin-push (#11691)

* Require atmosphere-runtime in vaadin-push with visibility:=reexport
* Require vaadin-push in vaadin-server with resolution:=optional

Serving vaadinPush.js from vaadin-push will be handled by Florian's OSGi addon

Change-Id: Ida3e1ae95eb17b0114e099d1425db73106aaeead
---
 push/build.xml   | 11 +++++++----
 push/ivy.xml     |  3 +--
 server/build.xml |  3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/push/build.xml b/push/build.xml
index 95284e6e37..d06b946dd1 100644
--- a/push/build.xml
+++ b/push/build.xml
@@ -11,6 +11,11 @@
 	<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.12" />
+	<property name="jquery.version" value="1.7.2" />
+
 	<path id="classpath.compile.custom" />
 
 	<union id="jar.includes">
@@ -24,7 +29,7 @@
 		<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-1.7.2.js" property="jquery.js.contents" />
+		<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>
@@ -47,10 +52,8 @@
 	</target>
 		
 	<target name="jar" depends="vaadinPush.js">
-		<property name="server.osgi.import" value="" />
 		<antcall target="common.jar">
-			<param name="require-bundle" value="" />
-			<param name="import-package" value="${server.osgi.import}" />
+			<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>
diff --git a/push/ivy.xml b/push/ivy.xml
index 153c02e256..a5ca79d4a3 100644
--- a/push/ivy.xml
+++ b/push/ivy.xml
@@ -20,8 +20,6 @@
         <artifact type="pom" ext="pom" />
     </publications>
     <dependencies>
-	
-		
         <!-- API DEPENDENCIES -->
         
         <!--Servlet API version 2.4 -->
@@ -29,6 +27,7 @@
             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.12"
         	conf="build,ide,test -> default">
         </dependency>
diff --git a/server/build.xml b/server/build.xml
index d61f412883..1c84c7e6f5 100644
--- a/server/build.xml
+++ b/server/build.xml
@@ -24,8 +24,9 @@
 
 	<target name="jar">
 		<property name="server.osgi.import" value="javax.servlet;version=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,org.jsoup;version=&quot;1.6.3&quot;,org.jsoup.parser;version=&quot;1.6.3&quot;,org.jsoup.nodes;version=&quot;1.6.3&quot;,org.jsoup.helper;version=&quot;1.6.3&quot;,org.jsoup.safety;version=&quot;1.6.3&quot;,org.json;version=&quot;0.0.20080701&quot;" />
+		<property name="server.osgi.require" value="com.vaadin.shared;bundle-version=&quot;${vaadin.version}&quot;,com.vaadin.push;bundle-version=&quot;${vaadin.version}&quot;;resolution:=optional" />
 		<antcall target="common.jar">
-			<param name="require-bundle" value="com.vaadin.shared;bundle-version=&quot;${vaadin.version}&quot;"/>
+			<param name="require-bundle" value="${server.osgi.require}" />
 			<param name="import-package" value="${server.osgi.import}" />
 			<param name="osgi.extra.package.prefixes" value="VAADIN" />
 			<reference torefid="extra.jar.includes" refid="jar.includes" />
-- 
cgit v1.2.3