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/12 09:23:26 UTC
[1/2] camel git commit: Polished
Repository: camel
Updated Branches:
refs/heads/master 28ef2272d -> e0956524d
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e0956524
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e0956524
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e0956524
Branch: refs/heads/master
Commit: e0956524d3b3b96724ce0ec6cd85d2c4b2ab964a
Parents: ea98b66
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jul 12 08:52:50 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jul 12 09:29:18 2015 +0200
----------------------------------------------------------------------
camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e0956524/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
index 919766e..7e533e5 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
@@ -19,7 +19,6 @@ package org.apache.camel.impl;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
-import org.apache.camel.EndpointAware;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Route;
[2/2] camel git commit: manifest update for camel-cdi
Posted by da...@apache.org.
manifest update for camel-cdi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea98b667
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea98b667
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea98b667
Branch: refs/heads/master
Commit: ea98b66757bc1cfb72d1a394cf6d4bb39aa2020d
Parents: 28ef227
Author: charlie <cm...@gmail.com>
Authored: Sat Jul 11 22:02:44 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jul 12 09:29:18 2015 +0200
----------------------------------------------------------------------
components/camel-cdi/pom.xml | 5 +++++
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ea98b667/components/camel-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 21f2744..0d501c2 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -45,6 +45,11 @@
<camel.osgi.provide.capability>
org.ops4j.pax.cdi.extension; extension=camel-cdi-extension
</camel.osgi.provide.capability>
+ <camel.osgi.require.capability>
+ osgi.extender;filter:="(osgi.extender=pax.cdi)",
+ org.ops4j.pax.cdi.extension;filter:="(extension=deltaspike-core-api)",
+ org.ops4j.pax.cdi.extension;filter:="(extension=camel-cdi-extension)"
+ </camel.osgi.require.capability>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/ea98b667/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c2905c7..af90b58 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -386,6 +386,7 @@
<osgi-version>4.3.1</osgi-version>
<paho-version>1.0.2</paho-version>
<paranamer-bundle-version>2.6_1</paranamer-bundle-version>
+ <pax-cdi-version>1.0.0.RC1</pax-cdi-version>
<pax-exam-version>4.5.0</pax-exam-version>
<pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version>
<pax-logging-version>1.8.1</pax-logging-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/ea98b667/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 44040d7..959857c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -18,6 +18,7 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0" name='camel-${project.version}'>
<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features</repository>
<repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds-version}/xml/features</repository>
+ <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax-cdi-version}/xml/features</repository>
<feature name='xml-specs-api' version='${servicemix-specs-version}' resolver='(obr)' start-level='10'>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
@@ -244,13 +245,12 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.castor/${castor-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-castor/${project.version}</bundle>
</feature>
-<!-- TODO: Karaf does not yet support CDI seamless in the container
<feature name='camel-cdi' version='${project.version}' resolver='(obr)' start-level='50'>
+ <!-- you've got to install pax-cdi-weld or pax-cdi-openwebbeans in order to make it works -->
+ <feature version='${pax-cdi-version}'>pax-cdi</feature>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0</bundle>
<bundle>mvn:org.apache.camel/camel-cdi/${project.version}</bundle>
</feature>
--->
<feature name='camel-chunk' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>