Enable on-the-fly SASS compilation in OSGi (#10307)

* Add proper Import-Package directives to theme-compiler
* Require-Bundle theme-compiler in server bundle

Change-Id: I7dec20c04eac92271b8adf0b1e23c573f1b06a29

diff --git a/server/build.xml b/server/build.xml
index 98ee2342cf7a5e8a026b702097ede9a2be9f3f3a..ad377584b92e38d4328b03706f068a4c68ee619c 100644 (file)
--- a/server/build.xml
+++ b/server/build.xml
@@ -24,7 +24,7 @@
 
     <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;,javax.validation;version=&quot;1.0.0.GA&quot;;resolution:=optional,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" />
+        <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,com.vaadin.theme-compiler;bundle-version=&quot;${vaadin.version}&quot;;resolution:=optional" />
         <antcall target="common.jar">
             <param name="require-bundle" value="${server.osgi.require}" />
             <param name="import-package" value="${server.osgi.import}" />

diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index 03d0531a68dbe1d49bf4b363ca9c37a4e5741969..576b402ff4dde6514b8764bfcd7d2246ffd2e832 100644 (file)
--- a/theme-compiler/build.xml
+++ b/theme-compiler/build.xml
@@ -53,6 +53,7 @@
 
     <target name="jar" depends="parser">
         <antcall target="common.jar">
+            <param name="import-package" value="org.apache.commons.jexl2;version=&quot;2.1.1&quot;,org.w3c.css.sac;version=&quot;1.3&quot;,org.w3c.flute.parser;version=&quot;1.3.0.gg2&quot;,org.w3c.flute.parser.selectors;version=&quot;1.3.0.gg2&quot;,org.w3c.flute.util;version=&quot;1.3.0.gg2&quot;" />
             <reference torefid="extra.jar.includes" refid="empty.reference" />
         </antcall>
     </target>