Skip to content

Fix for CAMEL-6513 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
antoinesd wants to merge 3 commits into from
Closed

Fix for CAMEL-6513 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1595b17
Update Deltaspike to 0.5
antoinesd Nov 7, 2013
fb5c57f
extension correction to make veto works on CamelContext descendants
antoinesd Nov 7, 2013
3e997e2
Merge branch 'master' of github.com:apache/camel
antoinesd Nov 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 56 additions & 18 deletions components/camel-cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
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">
<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>
Expand Down Expand Up @@ -43,12 +44,22 @@
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
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>

<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>${cdi-api.version}</version>
<scope>provided</scope>
</dependency>

<!-- Camel -->
<dependency>
<groupId>org.apache.camel</groupId>
Expand All @@ -65,6 +76,7 @@
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-impl</artifactId>
<version>${deltaspike-version}</version>
<scope>runtime</scope>
</dependency>

<!-- only required for the Main -->
Expand All @@ -74,21 +86,6 @@
<version>${deltaspike-version}</version>
</dependency>

<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<version>${geronimo-atinject-1.0-spec-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
<version>${geronimo-jcdi-1.0-spec-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.1_spec</artifactId>
<version>${geronimo-interceptor-1.1-spec-version}</version>
</dependency>

<!-- logging -->
<dependency>
Expand Down Expand Up @@ -137,15 +134,55 @@
<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>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</id>
<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>
Expand All @@ -159,6 +196,7 @@
<version>${weld-version}</version>
<scope>provided</scope>
</dependency>

</dependencies>
</profile>
</profiles>
Expand Down
50 changes: 24 additions & 26 deletions components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,20 @@
*/
package org.apache.camel.cdi.internal;

import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Consume;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiCamelContext;
import org.apache.camel.cdi.ContextName;
import org.apache.camel.impl.DefaultCamelBeanPostProcessor;
import org.apache.camel.model.RouteContainer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ReflectionHelper;
import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;

import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
Expand All @@ -42,22 +47,15 @@
import javax.enterprise.inject.spi.ProcessProducerMethod;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;

import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Consume;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.CdiCamelContext;
import org.apache.camel.cdi.ContextName;
import org.apache.camel.impl.DefaultCamelBeanPostProcessor;
import org.apache.camel.model.RouteContainer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ReflectionHelper;
import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

/**
* Set of camel specific hooks for CDI.
Expand Down Expand Up @@ -128,7 +126,7 @@ private void addRouteBuilderBean(final ProcessAnnotatedType<?> process, ContextN
*
* @param process Annotated type.
*/
protected void disableDefaultContext(@Observes ProcessAnnotatedType<CamelContext> process) {
protected void disableDefaultContext(@Observes ProcessAnnotatedType<? extends CamelContext> process) {
process.veto();
}

Expand Down
10 changes: 5 additions & 5 deletions .../camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
*/
package org.apache.camel.cdi;

import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;

import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.store.Item;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.deltaspike.core.api.config.annotation.ConfigProperty;
import org.apache.deltaspike.core.api.config.ConfigProperty;
import org.junit.Test;

import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;

public class EndpointDefinedUsingConfigPropertyTest extends CdiContextTestSupport {

@Inject @ConfigProperty(name = "directEndpoint")
Expand Down