FELIX-2974 & FELIX-4211:
- marked only a bare minimum of packages as optional import;
- aligned the import/exports for all bundles [FELIX-2974];
- exported the Jetty packages for easier reuse of existing
functionality, such as GZip-filters [FELIX-4211].
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1567618 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/base/pom.xml b/http/base/pom.xml
index b15c98b..b4b7aba 100644
--- a/http/base/pom.xml
+++ b/http/base/pom.xml
@@ -48,7 +48,8 @@
org.apache.felix.http.base.*
</Private-Package>
<Import-Package>
- *;resolution:=optional
+ org.osgi.service.useradmin;resolution:=optional,
+ *
</Import-Package>
</instructions>
</configuration>
diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index fbb564b..8081205 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -56,8 +56,8 @@
org.apache.felix.http.bridge.internal.*
</Private-Package>
<Import-Package>
- javax.servlet.*,
- *;resolution:=optional
+ org.osgi.service.useradmin;resolution:=optional,
+ *
</Import-Package>
</instructions>
</configuration>
diff --git a/http/bundle/pom.xml b/http/bundle/pom.xml
index c8b9f58..6f07745 100644
--- a/http/bundle/pom.xml
+++ b/http/bundle/pom.xml
@@ -51,13 +51,14 @@
org.apache.felix.http.bundle.internal.CombinedActivator
</Bundle-Activator>
<Export-Package>
- org.apache.felix.http.api;version${http.api.version};-split-package:=merge-first,
- org.apache.felix.http.cometd;version=${project.version};-split-package:=merge-first,
+ javax.servlet.*;version=${servlet.version};-split-package:=merge-first,
org.osgi.service.http;version=${http.service.version};-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,
- javax.servlet.*;version=${servlet.version};-split-package:=merge-first
+ org.apache.felix.http.api;version${http.api.version};-split-package:=merge-first,
+ org.apache.felix.http.cometd;version=${project.version};-split-package:=merge-first,
+ org.eclipse.jetty.*;-split-package:=merge-first;version=${version;===;${jetty.version}}
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*;-split-package:=merge-first,
@@ -66,16 +67,20 @@
org.apache.felix.http.cometd.*,
org.apache.felix.http.jetty.*,
org.apache.felix.http.whiteboard.*,
- org.eclipse.jetty.*;-split-package:=merge-first,
org.cometd.server.*;-split-package:=merge-first,
org.cometd.common.*;-split-package:=merge-first
</Private-Package>
<Import-Package>
- javax.servlet.*,
- org.cometd.bayeux,
- org.cometd.bayeux.client,
- org.cometd.bayeux.server,
- *;resolution:=optional
+ javax.imageio;resolution:=optional,
+ javax.sql;resolution:=optional,
+ org.slf4j.*;resolution:=optional,
+ org.ietf.jgss;resolution:=optional,
+ org.mortbay.log;resolution:=optional;version="[6.1,7)",
+ org.mortbay.util.ajax;resolution:=optional;version="[6.1,7)",
+ org.osgi.service.useradmin;resolution:=optional,
+ org.codehaus.jackson.map;resolution:=optional,
+ org.codehaus.jackson.type;resolution:=optional,
+ *
</Import-Package>
</instructions>
</configuration>
diff --git a/http/cometd/pom.xml b/http/cometd/pom.xml
index ff7c8e2..a292cab 100644
--- a/http/cometd/pom.xml
+++ b/http/cometd/pom.xml
@@ -49,19 +49,31 @@
</Bundle-Activator>
<Export-Package>
org.apache.felix.http.cometd;version=${project.version},
- org.cometd.bayeux;version=${cometd.version},
- org.cometd.bayeux.client;version=${cometd.version},
- org.cometd.client;version=${cometd.version}
+ 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,
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*,
- org.apache.felix.http.cometd.internal
+ org.apache.felix.http.cometd.internal,
+ org.cometd.server.*;-split-package:=merge-first,
+ org.cometd.common.*;-split-package:=merge-first
</Private-Package>
<Embed-Dependency>
cometd-java-server;inline=true,
cometd-java-common;inline=true,
jetty-util;inline=true,
</Embed-Dependency>
+ <Import-Package>
+ javax.imageio;resolution:=optional,
+ org.slf4j.*;resolution:=optional,
+ org.osgi.service.useradmin;resolution:=optional,
+ org.codehaus.jackson.map;resolution:=optional,
+ org.codehaus.jackson.type;resolution:=optional,
+ org.eclipse.jetty.continuation;version="[7.6,9)",
+ org.eclipse.jetty.jmx;version="[7.6,9)",
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index d308d4c..a8290e6 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -55,25 +55,25 @@
org.apache.felix.http.jetty.internal.JettyActivator
</Bundle-Activator>
<Export-Package>
- org.apache.felix.http.api;version=${http.api.version},
+ javax.servlet.*;version=${servlet.version};-split-package:=merge-first,
org.osgi.service.http;version=${http.service.version},
- javax.servlet.*;version=${servlet.version};-split-package:=merge-first
+ org.apache.felix.http.api;version=${http.api.version},
+ org.eclipse.jetty.*;-split-package:=merge-first;version=${version;===;${jetty.version}}
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*,
- org.apache.felix.http.jetty.*,
- org.eclipse.*;-split-package:=merge-first
+ org.apache.felix.http.jetty.*
</Private-Package>
<Import-Package>
- javax.net.ssl; javax.security.cert;
- javax.xml.parsers; org.xml.sax;
- org.xml.sax.helpers;
- org.slf4j;resolution:=optional,
- *;resolution:=optional
+ javax.imageio;resolution:=optional,
+ javax.sql;resolution:=optional,
+ org.slf4j.*;resolution:=optional,
+ org.ietf.jgss;resolution:=optional,
+ org.mortbay.log;resolution:=optional;version="[6.1,7)",
+ org.mortbay.util.ajax;resolution:=optional;version="[6.1,7)",
+ org.osgi.service.useradmin;resolution:=optional,
+ *
</Import-Package>
- <DynamicImport-Package>
- org.osgi.service.cm;version=1.2
- </DynamicImport-Package>
</instructions>
</configuration>
</plugin>
diff --git a/http/parent/pom.xml b/http/parent/pom.xml
index a8b4562..2b4185f 100755
--- a/http/parent/pom.xml
+++ b/http/parent/pom.xml
@@ -40,7 +40,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>8.1.14.v20131031</jetty.version>
- <cometd.version>2.7.0</cometd.version>
+ <cometd.version>2.8.0</cometd.version>
<http.service.version>1.2.0</http.service.version>
<servlet.version>3.0.1</servlet.version>
diff --git a/http/proxy/pom.xml b/http/proxy/pom.xml
index ec36e4a..afad7e5 100644
--- a/http/proxy/pom.xml
+++ b/http/proxy/pom.xml
@@ -47,9 +47,6 @@
<Export-Package>
org.apache.felix.http.proxy;version=2.1.0
</Export-Package>
- <Import-Package>
- *;resolution:=optional
- </Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/http/sslfilter/pom.xml b/http/sslfilter/pom.xml
index 88fe4ee..682c069 100644
--- a/http/sslfilter/pom.xml
+++ b/http/sslfilter/pom.xml
@@ -52,10 +52,6 @@
<Bundle-Activator>
org.apache.felix.http.sslfilter.internal.SslFilterActivator
</Bundle-Activator>
- <Import-Package>
- javax.servlet.*;version=${servlet.version},
- *
- </Import-Package>
</instructions>
</configuration>
</plugin>