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 /server/build.xml | |
| 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 'server/build.xml')
| -rw-r--r-- | server/build.xml | 3 |
1 files changed, 2 insertions, 1 deletions
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="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" /> |