camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/5] git commit: extension correction to make veto works on CamelContext descendants
Date Sun, 07 Sep 2014 07:50:37 GMT
extension correction to make veto works on CamelContext descendants


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fb5c57f8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fb5c57f8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fb5c57f8

Branch: refs/heads/master
Commit: fb5c57f88155bde1f4fc46325393990f37cec56c
Parents: 1595b17
Author: Antoine Sabot-Durand <antoine@sabot-durand.net>
Authored: Thu Nov 7 11:29:37 2013 +0100
Committer: Antoine Sabot-Durand <antoine@sabot-durand.net>
Committed: Thu Nov 7 11:31:14 2013 +0100

----------------------------------------------------------------------
 .../camel/cdi/internal/CamelExtension.java      | 50 ++++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/fb5c57f8/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
----------------------------------------------------------------------
diff --git 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
index 44a44b5..b93fb54 100644
--- 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
@@ -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;
@@ -42,22 +47,15 @@ import javax.enterprise.inject.spi.ProcessInjectionTarget;
 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.
@@ -128,7 +126,7 @@ public class CamelExtension implements Extension {
      *
      * @param process Annotated type.
      */
-    protected void disableDefaultContext(@Observes ProcessAnnotatedType<CamelContext>
process) {
+    protected void disableDefaultContext(@Observes ProcessAnnotatedType<? extends CamelContext>
process) {
         process.veto();
     }
 


Mime
View raw message