Updated Branches:
refs/heads/camel-2.11.x 4af0d3ee3 -> f5c4ef6cf
CAMEL-7020: Make camel servlet related components deployable on OSGi with
servlet 3.0
Conflicts:
parent/pom.xml
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f5c4ef6c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f5c4ef6c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f5c4ef6c
Branch: refs/heads/camel-2.11.x
Commit: f5c4ef6cf42de7ce7ac5eb7d13e82321c78f8c4c
Parents: 4af0d3e
Author: Akitoshi Yoshida <[email protected]>
Authored: Wed Nov 27 14:45:07 2013 +0100
Committer: Akitoshi Yoshida <[email protected]>
Committed: Wed Nov 27 15:03:37 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/f5c4ef6c/components/camel-cometd/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 66a1bcb..9bda535 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/f5c4ef6c/components/camel-gae/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-gae/pom.xml b/components/camel-gae/pom.xml
index c4382e6..57bfbce 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/f5c4ef6c/components/camel-http/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index f2d2d56..8058d21 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/f5c4ef6c/components/camel-http4/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml
index f86da8e..8946941 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/f5c4ef6c/components/camel-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 8821eb2..ff4600c 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/f5c4ef6c/components/camel-servlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 294f2e3..434f135 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/f5c4ef6c/components/camel-servletlistener/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-servletlistener/pom.xml
b/components/camel-servletlistener/pom.xml
index 3a93f43..3b67144 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/f5c4ef6c/components/camel-urlrewrite/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-urlrewrite/pom.xml
b/components/camel-urlrewrite/pom.xml
index 7573e08..20356de 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/f5c4ef6c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 35eca0d..e08b8cb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -333,6 +333,7 @@
<servicemix-specs-version>2.2.0</servicemix-specs-version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<shiro-version>1.2.1</shiro-version>
+ <servlet-version-range>[2.6,4)</servlet-version-range>
<!-- use slf4j-api 1.6.x to be easy compatible with older Camel releases
-->
<slf4j-api-version>1.6.6</slf4j-api-version>
<slf4j-version>1.7.5</slf4j-version>