Updated Branches: refs/heads/master 6ce5bae1c -> 4b18ddd99
CAMEL-7020: Make camel servlet related components deployable on OSGi with servlet 3.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4b18ddd9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4b18ddd9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4b18ddd9 Branch: refs/heads/master Commit: 4b18ddd99b714466affba8139c9603025c6b227b Parents: 6ce5bae Author: Akitoshi Yoshida <[email protected]> Authored: Wed Nov 27 14:45:07 2013 +0100 Committer: Akitoshi Yoshida <[email protected]> Committed: Wed Nov 27 14:45:32 2013 +0100 ---------------------------------------------------------------------- components/camel-cometd/pom.xml | 1 + components/camel-gae/pom.xml | 3 +++ components/camel-http/pom.xml | 3 +++ components/camel-http4/pom.xml | 11 ++++++----- components/camel-jetty/pom.xml | 3 +++ components/camel-servlet/pom.xml | 7 +++++-- components/camel-servletlistener/pom.xml | 3 +++ components/camel-urlrewrite/pom.xml | 3 +++ parent/pom.xml | 1 + 9 files changed, 28 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4b18ddd9/components/camel-cometd/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml index 9aa65fc..0870370 100644 --- a/components/camel-cometd/pom.xml +++ b/components/camel-cometd/pom.xml @@ -34,6 +34,7 @@ <camel.osgi.import.pkg> !org.apache.camel.component.cometd.*, org.eclipse.jetty.util.ssl;version="[7.6,8.2)";resolution:=optional, + javax.servlet.*;version="${servlet-version-range}", ${camel.osgi.import.defaults}, * </camel.osgi.import.pkg> http://git-wip-us.apache.org/repos/asf/camel/blob/4b18ddd9/components/camel-gae/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-gae/pom.xml b/components/camel-gae/pom.xml index eb64df3..a2ff7f7 100644 --- a/components/camel-gae/pom.xml +++ b/components/camel-gae/pom.xml @@ -30,6 +30,9 @@ <description>Camel GAE support</description> <properties> + <camel.osgi.import.before.defaults> + javax.servlet.*;version="${servlet-version-range}" + </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.component.gae.*</camel.osgi.export.pkg> <camel.osgi.export.service> org.apache.camel.spi.ComponentResolver;component=gauth, http://git-wip-us.apache.org/repos/asf/camel/blob/4b18ddd9/components/camel-http/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml index 2e9641f..29a694c 100644 --- a/components/camel-http/pom.xml +++ b/components/camel-http/pom.xml @@ -30,6 +30,9 @@ <description>Camel HTTP support</description> <properties> + <camel.osgi.import.before.defaults> + javax.servlet.*;version="${servlet-version-range}" + </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.component.http.*</camel.osgi.export.pkg> <camel.osgi.export.service> org.apache.camel.spi.ComponentResolver;component=http, http://git-wip-us.apache.org/repos/asf/camel/blob/4b18ddd9/components/camel-http4/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml index 93bb090..fd0099e 100644 --- a/components/camel-http4/pom.xml +++ b/components/camel-http4/pom.xml @@ -30,11 +30,12 @@ <description>Camel HTTP (Apache HttpClient 4.x) support</description> <properties> - <!-- Now we move to the 4.2 --> - <camel.osgi.import.before.defaults> - org.apache.http.*;version="[4.2,5)" - </camel.osgi.import.before.defaults> - <camel.osgi.export.pkg>org.apache.camel.component.http4.*</camel.osgi.export.pkg> + <!-- Now we move to the 4.2 --> + <camel.osgi.import.before.defaults> + javax.servlet.*;version="${servlet-version-range}", + org.apache.http.*;version="[4.2,5)" + </camel.osgi.import.before.defaults> + <camel.osgi.export.pkg>org.apache.camel.component.http4.*</camel.osgi.export.pkg> <camel.osgi.export.service> org.apache.camel.spi.ComponentResolver;component=http4, org.apache.camel.spi.ComponentResolver;component=https4 http://git-wip-us.apache.org/repos/asf/camel/blob/4b18ddd9/components/camel-jetty/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml index 1777224..573a5a4 100644 --- a/components/camel-jetty/pom.xml +++ b/components/camel-jetty/pom.xml @@ -30,6 +30,9 @@ <description>Camel Jetty support</description> <properties> + <camel.osgi.import.before.defaults> + javax.servlet.*;version="${servlet-version-range}" + </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.component.jetty.*</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jetty</camel.osgi.export.service> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/4b18ddd9/components/camel-servlet/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml index aaceb82..8e95f12 100644 --- a/components/camel-servlet/pom.xml +++ b/components/camel-servlet/pom.xml @@ -31,8 +31,11 @@ <description>Camel servlet transport support</description> <properties> - <camel.osgi.export.pkg>org.apache.camel.component.servlet.*</camel.osgi.export.pkg> - <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=servlet</camel.osgi.export.service> + <camel.osgi.import.before.defaults> + javax.servlet.*;version="${servlet-version-range}" + </camel.osgi.import.before.defaults> + <camel.osgi.export.pkg>org.apache.camel.component.servlet.*</camel.osgi.export.pkg> + <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=servlet</camel.osgi.export.service> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/4b18ddd9/components/camel-servletlistener/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml index e65a2fc..15de1b5 100644 --- a/components/camel-servletlistener/pom.xml +++ b/components/camel-servletlistener/pom.xml @@ -31,6 +31,9 @@ <description>Camel servlet listener for bootstrapping Camel in Web Applications</description> <properties> + <camel.osgi.import.before.defaults> + javax.servlet.*;version="${servlet-version-range}" + </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.component.servletlistener.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/4b18ddd9/components/camel-urlrewrite/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-urlrewrite/pom.xml b/components/camel-urlrewrite/pom.xml index bde50f9..4eec0dd 100644 --- a/components/camel-urlrewrite/pom.xml +++ b/components/camel-urlrewrite/pom.xml @@ -30,6 +30,9 @@ <description>Camel URLRewrite support</description> <properties> + <camel.osgi.import.before.defaults> + javax.servlet.*;version="${servlet-version-range}" + </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.component.urlrewrite.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/4b18ddd9/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f0e5a32..4bb95b6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -358,6 +358,7 @@ <servicemix-specs-version>2.2.0</servicemix-specs-version> <servlet-api-2.5-version>1.1.2</servlet-api-2.5-version> <servlet-api-3.0-version>1.0</servlet-api-3.0-version> + <servlet-version-range>[2.6,4)</servlet-version-range> <shiro-version>1.2.2</shiro-version> <!-- use slf4j-api 1.6.x to be easy compatible with older Camel releases --> <slf4j-api-version>1.6.6</slf4j-api-version>
