* 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: Ida3e1ae95eb17b0114e099d1425db73106aaeeadtags/7.1.0
@@ -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> |
@@ -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> |
@@ -24,8 +24,9 @@ | |||
<target name="jar"> | |||
<property name="server.osgi.import" value="javax.servlet;version="2.4.0",javax.servlet.http;version="2.4.0",org.jsoup;version="1.6.3",org.jsoup.parser;version="1.6.3",org.jsoup.nodes;version="1.6.3",org.jsoup.helper;version="1.6.3",org.jsoup.safety;version="1.6.3",org.json;version="0.0.20080701"" /> | |||
<property name="server.osgi.require" value="com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";resolution:=optional" /> | |||
<antcall target="common.jar"> | |||
<param name="require-bundle" value="com.vaadin.shared;bundle-version="${vaadin.version}""/> | |||
<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" /> |