commit 20ae1dd9844bd32a46df5195cd2494731f8ba999
author Sten Roger Sandvik <srs@apache.org> Thu Oct 01 16:54:35 2015 +0000
committer Sten Roger Sandvik <srs@apache.org> Thu Oct 01 16:54:35 2015 +0000
tree b0eee5886353c1903baef357d7f2bf774e6a4b85
parent 756b801dc3caba60f6906ee2a51d635bae8ee414

Fixed some problems with split packages.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1706291 13f79535-47bb-0310-9956-ffa450edef68

http/bridge/pom.xml

diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index b953312..6ba70ea 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -49,11 +49,7 @@
                         </Bundle-Activator>
                         <Export-Package>
                             org.apache.felix.http.api,
-                            org.osgi.service.http,
-                            org.osgi.service.http.context,
-                            org.osgi.service.http.runtime,
-                            org.osgi.service.http.runtime.dto,
-                            org.osgi.service.http.whiteboard
+                            org.osgi.service.http.*;-split-package:=merge-first
                         </Export-Package>
                         <Private-Package>
                             org.apache.felix.http.base.*,

http/bundle/pom.xml

diff --git a/http/bundle/pom.xml b/http/bundle/pom.xml
index e06cb53..23b5e2e 100644
--- a/http/bundle/pom.xml
+++ b/http/bundle/pom.xml
@@ -56,12 +56,7 @@
                         </Bundle-Activator>
                         <Export-Package>
                             javax.servlet.*;version=${servlet.version};-split-package:=merge-first,
-                            org.osgi.service.http;-split-package:=merge-first,
-                            org.osgi.service.http,
-                            org.osgi.service.http.context,
-                            org.osgi.service.http.runtime,
-                            org.osgi.service.http.runtime.dto,
-                            org.osgi.service.http.whiteboard,
+                            org.osgi.service.http.*;-split-package:=merge-first,
                             org.cometd.bayeux;version=${cometd.version};-split-package:=merge-first,
                             org.cometd.bayeux.client;version=${cometd.version};-split-package:=merge-first,
                             org.cometd.bayeux.server;version=${cometd.version};-split-package:=merge-first,

http/cometd/pom.xml

diff --git a/http/cometd/pom.xml b/http/cometd/pom.xml
index b717fdf..0548f3f 100644
--- a/http/cometd/pom.xml
+++ b/http/cometd/pom.xml
@@ -67,6 +67,7 @@
                             cometd-java-server;inline=true,
                             cometd-java-common;inline=true,
                             jetty-util;inline=true,
+                            jetty-util-ajax;inline=true,
                         </Embed-Dependency>
                         <Import-Package>
                         	javax.imageio;resolution:=optional,
@@ -103,6 +104,11 @@
             <version>${jetty.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util-ajax</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
         	<groupId>org.cometd.java</groupId>
         	<artifactId>cometd-java-server</artifactId>
         	<version>${cometd.version}</version>
@@ -135,12 +141,12 @@
                     <artifactId>jetty-http</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>        
+        </dependency>
         <dependency>
         	<groupId>org.cometd.java</groupId>
         	<artifactId>cometd-java-common</artifactId>
         	<version>${cometd.version}</version>
-        </dependency>            
+        </dependency>
         <dependency>
             <groupId>org.cometd.java</groupId>
             <artifactId>bayeux-api</artifactId>