diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2013-05-13 17:34:16 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-05-20 10:30:52 +0000 |
| commit | 2772641acf8f84046e3ac42c8386b65e4f2346f2 (patch) | |
| tree | 26aa4dda21b5ebaf11f627c0d13db5ea0610788e /push | |
| parent | 73a50dbf002b381411a7c6ca1d6b4e59a93bbe0c (diff) | |
| download | vaadin-framework-2772641acf8f84046e3ac42c8386b65e4f2346f2.tar.gz vaadin-framework-2772641acf8f84046e3ac42c8386b65e4f2346f2.zip | |
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
Diffstat (limited to 'push')
| -rw-r--r-- | push/build.xml | 11 | ||||
| -rw-r--r-- | push/ivy.xml | 3 |
2 files changed, 8 insertions, 6 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="${atmosphere.version}";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> |