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 2013/06/06 10:53:56 UTC
[3/4] git commit: Fixed features.xml
Fixed features.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a2dd39d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a2dd39d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a2dd39d
Branch: refs/heads/master
Commit: 4a2dd39db63ace6d6f0225c72c6a5fcf46c26fcf
Parents: 169ed90
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 6 10:53:09 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 6 10:53:09 2013 +0200
----------------------------------------------------------------------
.../karaf/features/src/main/resources/features.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4a2dd39d/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 d10a094..cf30660 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -218,11 +218,13 @@
<bundle>mvn:org.apache.camel/camel-cxf-transport/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cxf/${project.version}</bundle>
</feature>
+<!-- TODO: Does not work due: No export found to match sun.misc (imported by mvn:com.lmax/disruptor/3.0.1)
<feature name='camel-disruptor' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:com.lmax/disruptor/${disruptor-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-disruptor/${project.version}</bundle>
</feature>
+-->
<feature name='camel-dns' version='${project.version}' resolver='(obr)' start-level='50'>
<details>The camel-dns feature can only run on a SUN JVM. You need to ddd the package sun.net.spi.nameservice to the java platform packages in the etc/jre.properties file.</details>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dnsjava/${dnsjava-bundle-version}</bundle>
@@ -298,6 +300,7 @@
<feature name='camel-geocoder' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<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.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.code.geocoder-java/geocoder-java/${geocoder-java-version}</bundle>
@@ -752,6 +755,7 @@
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-client/${cometd-java-client-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-client-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-client-version}</bundle>