* 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
<property name="module.symbolic" value="com.vaadin.push" /> | <property name="module.symbolic" value="com.vaadin.push" /> | ||||
<property name="result.dir" location="result" /> | <property name="result.dir" location="result" /> | ||||
<property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" /> | <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" /> | <path id="classpath.compile.custom" /> | ||||
<union id="jar.includes"> | <union id="jar.includes"> | ||||
<property name="vaadinPush.js.output" location="${result.dir}/js/VAADIN/vaadinPush.js" /> | <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" /> | <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/jquery.atmosphere.js" property="jquery.atmosphere.js.contents" /> | ||||
<loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/vaadinPush.js.tpl" property="vaadinPush.js.contents"> | <loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/vaadinPush.js.tpl" property="vaadinPush.js.contents"> | ||||
<filterchain> | <filterchain> | ||||
</target> | </target> | ||||
<target name="jar" depends="vaadinPush.js"> | <target name="jar" depends="vaadinPush.js"> | ||||
<property name="server.osgi.import" value="" /> | |||||
<antcall target="common.jar"> | <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" /> | <reference torefid="extra.jar.includes" refid="jar.includes" /> | ||||
</antcall> | </antcall> | ||||
</target> | </target> |
<artifact type="pom" ext="pom" /> | <artifact type="pom" ext="pom" /> | ||||
</publications> | </publications> | ||||
<dependencies> | <dependencies> | ||||
<!-- API DEPENDENCIES --> | <!-- API DEPENDENCIES --> | ||||
<!--Servlet API version 2.4 --> | <!--Servlet API version 2.4 --> | ||||
rev="2.4" conf="build-provided,ide,test -> default" /> | rev="2.4" conf="build-provided,ide,test -> default" /> | ||||
<!-- Atmosphere --> | <!-- Atmosphere --> | ||||
<!-- Keep the version number in sync with build.xml --> | |||||
<dependency org="org.atmosphere" name="atmosphere-runtime" rev="1.0.12" | <dependency org="org.atmosphere" name="atmosphere-runtime" rev="1.0.12" | ||||
conf="build,ide,test -> default"> | conf="build,ide,test -> default"> | ||||
</dependency> | </dependency> |
<target name="jar"> | <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.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"> | <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="import-package" value="${server.osgi.import}" /> | ||||
<param name="osgi.extra.package.prefixes" value="VAADIN" /> | <param name="osgi.extra.package.prefixes" value="VAADIN" /> | ||||
<reference torefid="extra.jar.includes" refid="jar.includes" /> | <reference torefid="extra.jar.includes" refid="jar.includes" /> |