You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/07/23 14:58:25 UTC
[23/24] camel git commit: camel-http-common - as a common module
camel-http-common - as a common module
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2417f342
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2417f342
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2417f342
Branch: refs/heads/master
Commit: 2417f3427eaed3e6157360179c754ab3cd9a5e7d
Parents: 2b89da0
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 23 14:48:20 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 23 15:04:36 2015 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2417f342/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 94cbdf0..b26d74e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -715,6 +715,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http/${project.version}</bundle>
</feature>
<feature name='camel-http4' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -722,6 +723,7 @@
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http4/${project.version}</bundle>
</feature>
<feature name='camel-ibatis' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -797,7 +799,7 @@
<feature name='camel-jetty' version='${project.version}' resolver='(obr)' start-level='50'>
<feature>jetty</feature>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${project.version}'>camel-http</feature>
+ <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-jetty-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-jetty8/${project.version}</bundle>
</feature>
@@ -805,7 +807,7 @@
<details>camel-jetty9 intend to work with jetty9, so this feature only works in the karaf container which support jetty9, e.g. karaf 4.x</details>
<feature>jetty</feature>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${project.version}'>camel-http</feature>
+ <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-jetty-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-jetty9/${project.version}</bundle>
</feature>
@@ -1295,7 +1297,7 @@
<feature name='camel-servlet' version='${project.version}' resolver='(obr)' start-level='50'>
<details> camel-servlet need to access the http OSGi services </details>
<feature>http</feature>
- <feature version='${project.version}'>camel-http</feature>
+ <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-servlet/${project.version}</bundle>
</feature>
<feature name='camel-servletlistener' version='${project.version}' resolver='(obr)' start-level='50'>