Merge branch 'master' of https://github.com/antoinesd/camel
Conflicts:
components/camel-cdi/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0aed44aa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0aed44aa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0aed44aa
Branch: refs/heads/master
Commit: 0aed44aa2ea017c08c9c50433e39de77716d7bd7
Parents: 808b017 0a241dd
Author: Claus Ibsen <davscl...@apache.org>
Authored: Sun Sep 7 09:49:19 2014 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Sun Sep 7 09:49:19 2014 +0200
----------------------------------------------------------------------
components/camel-cdi/pom.xml | 278 ++++++++++---------
.../camel/cdi/internal/CamelExtension.java | 49 ++--
.../cdi/internal/DelegateInjectionTarget.java | 8 +-
parent/pom.xml | 1 +
4 files changed, 177 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0aed44aa/components/camel-cdi/pom.xml
----------------------------------------------------------------------
diff --cc components/camel-cdi/pom.xml
index e1ddb94,de1ec6d..ef8ebe9
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@@ -15,155 -15,190 +15,169 @@@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>2.14-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-cdi</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: CDI</name>
- <description>Camel Contexts and Dependency Injection (JSR-299)
support</description>
-
- <properties>
- <camel.osgi.import>
- !org.apache.camel.cdi.*,
- !org.apache.deltaspike.cdise.api.*,
- org.apache.deltaspike.core.api.*;resolution:=optional,
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import>
- <camel.osgi.export.pkg>
- org.apache.camel.cdi;${camel.osgi.version},
- org.apache.camel.cdi.internal;${camel.osgi.version},
- org.apache.camel.cdi.component.*;${camel.osgi.version}
- </camel.osgi.export.pkg>
- <camel.osgi.provide.capability>
- org.ops4j.pax.cdi.extension; extension=camel-cdi-extension
- </camel.osgi.provide.capability>
- </properties>
-
- <dependencies>
-
- <!-- Camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
+ <project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>2.13-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-cdi</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: CDI</name>
- <description>Camel CDI</description>
-
- <properties>
- <camel.osgi.import>
- !org.apache.camel.cdi.*,
- !org.apache.deltaspike.cdise.api.*,
- org.apache.deltaspike.core.api.*;resolution:=optional,
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import>
- <camel.osgi.export.pkg>
- org.apache.camel.cdi;${camel.osgi.version},
- org.apache.camel.cdi.internal;${camel.osgi.version},
- org.apache.camel.cdi.component.*;${camel.osgi.version}
- </camel.osgi.export.pkg>
- <camel.osgi.provide.capability>
- org.ops4j.pax.cdi.extension; extension=camel-cdi-extension
- </camel.osgi.provide.capability>
- <openwebbeans-version>1.1.7</openwebbeans-version>
- <deltaspike-version>0.5</deltaspike-version>
- <cdi-api.version>1.0-SP4</cdi-api.version>
- </properties>
-
- <dependencies>
-
++ <modelVersion>4.0.0</modelVersion>
++
++ <parent>
++ <groupId>org.apache.camel</groupId>
++ <artifactId>components</artifactId>
++ <version>2.14-SNAPSHOT</version>
++ </parent>
++
++ <artifactId>camel-cdi</artifactId>
++ <packaging>bundle</packaging>
++ <name>Camel :: CDI</name>
++ <description>Camel Contexts and Dependency Injection (JSR-299)
support</description>
++
++ <properties>
++ <camel.osgi.import>
++ !org.apache.camel.cdi.*,
++ !org.apache.deltaspike.cdise.api.*,
++ org.apache.deltaspike.core.api.*;resolution:=optional,
++ ${camel.osgi.import.defaults},
++ *
++ </camel.osgi.import>
++ <camel.osgi.export.pkg>
++ org.apache.camel.cdi;${camel.osgi.version},
++ org.apache.camel.cdi.internal;${camel.osgi.version},
++ org.apache.camel.cdi.component.*;${camel.osgi.version}
++ </camel.osgi.export.pkg>
++ <camel.osgi.provide.capability>
++ org.ops4j.pax.cdi.extension; extension=camel-cdi-extension
++ </camel.osgi.provide.capability>
++ </properties>
++
++ <dependencies>
++
++ <dependency>
++ <groupId>org.apache.camel</groupId>
++ <artifactId>camel-core</artifactId>
++ </dependency>
++
++ <!-- cdi api -->
++ <dependency>
++ <groupId>javax.enterprise</groupId>
++ <artifactId>cdi-api</artifactId>
++ <version>${cdi-api-version}</version>
++ <scope>provided</scope>
++ </dependency>
++
++ <!-- DeltaSpike -->
++ <dependency>
++ <groupId>org.apache.deltaspike.core</groupId>
++ <artifactId>deltaspike-core-api</artifactId>
++ <version>${deltaspike-version}</version>
++ </dependency>
++
++ <dependency>
++ <groupId>org.apache.deltaspike.core</groupId>
++ <artifactId>deltaspike-core-impl</artifactId>
++ <version>${deltaspike-version}</version>
++ <scope>runtime</scope>
++ </dependency>
+
- <!-- DeltaSpike -->
++ <!-- only required for the Main -->
++ <dependency>
++ <groupId>org.apache.deltaspike.cdictrl</groupId>
++ <artifactId>deltaspike-cdictrl-api</artifactId>
++ <version>${deltaspike-version}</version>
++ </dependency>
++
++ <!-- logging -->
++ <dependency>
++ <groupId>org.slf4j</groupId>
++ <artifactId>slf4j-log4j12</artifactId>
++ <scope>test</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.camel</groupId>
++ <artifactId>camel-test</artifactId>
++ <scope>test</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.slf4j</groupId>
++ <artifactId>jul-to-slf4j</artifactId>
++ <version>${slf4j-version}</version>
++ <scope>test</scope>
++ </dependency>
++ </dependencies>
++
++
++ <profiles>
++ <profile>
++ <id>owb</id>
++ <dependencies>
<dependency>
- <groupId>org.apache.deltaspike.core</groupId>
- <artifactId>deltaspike-core-api</artifactId>
- <version>${deltaspike-version}</version>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api.version}</version>
- <scope>provided</scope>
++ <groupId>org.apache.geronimo.specs</groupId>
++ <artifactId>geronimo-servlet_3.0_spec</artifactId>
++ <scope>test</scope>
</dependency>
-
- <!-- Camel -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <dependency>
- <groupId>org.apache.deltaspike.core</groupId>
- <artifactId>deltaspike-core-impl</artifactId>
- <version>${deltaspike-version}</version>
++ <groupId>org.apache.deltaspike.cdictrl</groupId>
++ <artifactId>deltaspike-cdictrl-owb</artifactId>
++ <version>${deltaspike-version}</version>
++ <scope>test</scope>
</dependency>
--
- <!-- only required for the Main -->
- <!-- DeltaSpike -->
<dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-api</artifactId>
- <version>${deltaspike-version}</version>
- <groupId>org.apache.deltaspike.core</groupId>
- <artifactId>deltaspike-core-api</artifactId>
- <version>${deltaspike-version}</version>
++ <groupId>org.apache.openwebbeans</groupId>
++ <artifactId>openwebbeans-impl</artifactId>
++ <version>${openwebbeans-version}</version>
++ <scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo-atinject-1.0-spec-version}</version>
- <scope>provided</scope>
- <groupId>org.apache.deltaspike.core</groupId>
- <artifactId>deltaspike-core-impl</artifactId>
- <version>${deltaspike-version}</version>
- <scope>runtime</scope>
++ <groupId>org.apache.openwebbeans</groupId>
++ <artifactId>openwebbeans-spi</artifactId>
++ <version>${openwebbeans-version}</version>
++ <scope>test</scope>
</dependency>
-
- <!-- only required for the Main -->
++ </dependencies>
++ </profile>
++
++ <profile>
++ <id>weld-1</id>
++ <!-- active by default as the overriding of InvocationTarget is
currently broken in owb which breaks ProduceInjectTest -->
++ <activation>
++ <activeByDefault>true</activeByDefault>
++ </activation>
++ <dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo-jcdi-1.0-spec-version}</version>
- <scope>provided</scope>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-api</artifactId>
- <version>${deltaspike-version}</version>
++ <groupId>org.apache.deltaspike.cdictrl</groupId>
++ <artifactId>deltaspike-cdictrl-weld</artifactId>
++ <version>${deltaspike-version}</version>
++ <scope>test</scope>
</dependency>
-
-
- <!-- logging -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>${geronimo-interceptor-1.1-spec-version}</version>
- <scope>provided</scope>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
++ <groupId>org.jboss.weld.se</groupId>
++ <artifactId>weld-se-core</artifactId>
++ <version>${weld-version}</version>
++ <scope>test</scope>
</dependency>
+
- <!-- logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
++ </dependencies>
++ </profile>
++ <profile>
++ <id>weld-2</id>
++ <properties>
++ <weld-version>2.1.0.Final</weld-version>
++ <cdi-api.version>1.1</cdi-api.version>
++ </properties>
++ <dependencies>
<dependency>
-- <groupId>org.apache.camel</groupId>
-- <artifactId>camel-test</artifactId>
-- <scope>test</scope>
++ <groupId>org.apache.deltaspike.cdictrl</groupId>
++ <artifactId>deltaspike-cdictrl-weld</artifactId>
++ <version>${deltaspike-version}</version>
++ <scope>test</scope>
</dependency>
<dependency>
-- <groupId>org.slf4j</groupId>
-- <artifactId>jul-to-slf4j</artifactId>
-- <version>${slf4j-version}</version>
-- <scope>test</scope>
++ <groupId>org.jboss.weld.se</groupId>
++ <artifactId>weld-se-core</artifactId>
++ <version>${weld-version}</version>
++ <scope>provided</scope>
</dependency>
-- </dependencies>
--
--
-- <profiles>
-- <profile>
-- <id>owb</id>
-- <dependencies>
-- <dependency>
-- <groupId>org.apache.geronimo.specs</groupId>
-- <artifactId>geronimo-servlet_3.0_spec</artifactId>
-- <scope>test</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.apache.deltaspike.cdictrl</groupId>
-- <artifactId>deltaspike-cdictrl-owb</artifactId>
-- <version>${deltaspike-version}</version>
-- <scope>test</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.apache.openwebbeans</groupId>
-- <artifactId>openwebbeans-impl</artifactId>
-- <version>${openwebbeans-version}</version>
-- <scope>test</scope>
-- </dependency>
-- <dependency>
-- <groupId>org.apache.openwebbeans</groupId>
-- <artifactId>openwebbeans-spi</artifactId>
-- <version>${openwebbeans-version}</version>
-- <scope>test</scope>
-- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>weld</id>
- <!-- active by default as the overriding of InvocationTarget is
currently broken in owb which breaks ProduceInjectTest -->
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
-- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-weld</artifactId>
- <version>${deltaspike-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se-core</artifactId>
- <version>${weld-version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo-atinject-1.0-spec-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo-jcdi-1.0-spec-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-
<version>${geronimo-interceptor-1.1-spec-version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>weld-1</id>
- <!-- active by default as the overriding of InvocationTarget is
currently broken in owb which breaks ProduceInjectTest -->
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-weld</artifactId>
- <version>${deltaspike-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se-core</artifactId>
- <version>${weld-version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- </profile>
- <profile>
- <id>weld-2</id>
- <properties>
- <weld-version>2.1.0.Final</weld-version>
- <cdi-api.version>1.1</cdi-api.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.deltaspike.cdictrl</groupId>
- <artifactId>deltaspike-cdictrl-weld</artifactId>
- <version>${deltaspike-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se-core</artifactId>
- <version>${weld-version}</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
- </profile>
- </profiles>
++
++ </dependencies>
++ </profile>
++ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/0aed44aa/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
----------------------------------------------------------------------
diff --cc
components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
index 9ff5f75,955fd09..d415f8d
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
@@@ -205,7 -204,8 +206,8 @@@ public class CamelExtension implements
}
/**
- * Lets detect all producer methods createing instances of {@link
RouteBuilder} which are annotated with {@link org.apache.camel.cdi.ContextName}
- * Lets detect all producer methods createing instances of {@link
RouteBuilder} which are annotated with {@link org
++ * Lets detect all producer methods creating instances of {@link
RouteBuilder} which are annotated with {@link org
+ * .apache.camel.cdi.ContextName}
* so they can be auto-registered
*/
public void detectProducerRoutes(@Observes ProcessProducerMethod<?, ?>
event) {
@@@ -221,10 -221,10 +223,10 @@@
* Lets force the CDI container to create all beans annotated with
@Consume so that the consumer becomes active
*/
public void startConsumeBeans(@Observes AfterDeploymentValidation event,
BeanManager beanManager)
- throws Exception {
+ throws Exception {
for (CamelContextBean bean : camelContextBeans) {
String name = bean.getCamelContextName();
- CamelContext context = getCamelContext(name, beanManager);
+ CamelContext context = getCamelContext(name);
if (context == null) {
throw new IllegalStateException(
"CamelContext '" + name + "' has not been injected
into the CamelContextMap");
http://git-wip-us.apache.org/repos/asf/camel/blob/0aed44aa/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/DelegateInjectionTarget.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0aed44aa/parent/pom.xml
----------------------------------------------------------------------
diff --cc parent/pom.xml
index 42de3ac,7ee54f5..f934d8e
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -69,16 -67,13 +69,17 @@@
<bcel-bundle-version>5.2_4</bcel-bundle-version>
<beanio-version>2.0.7</beanio-version>
<bsh-version>2.0b5</bsh-version>
+ <!-- bouncycastle 1.50 does not work in OSGi -
http://www.bouncycastle.org/jira/browse/BJA-476 -->
<bouncycastle-version>1.49</bouncycastle-version>
+ <boxjavalibv2.version>3.0.9</boxjavalibv2.version>
<build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version>
<c3p0-version>0.9.1.2</c3p0-version>
+
<camel-test-spring-artifactId>camel-test-spring3</camel-test-spring-artifactId>
<castor-bundle-version>1.3.2_2</castor-bundle-version>
++ <cdi-api-version>1.2</cdi-api-version>
<cglib-bundle-version>2.1_3_7</cglib-bundle-version>
<cglib-version>2.2</cglib-version>
- <classmate-version>0.8.0</classmate-version>
+ <classmate-version>1.0.0</classmate-version>
<cmis-version>0.8.0</cmis-version>
<cometd-bayeux-version>6.1.11</cometd-bayeux-version>
<cometd-java-client-version>2.4.3</cometd-java-client-version>
