You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2016/03/03 15:51:11 UTC

[1/3] camel git commit: Add missing toString delegation

Repository: camel
Updated Branches:
  refs/heads/master beb08eed5 -> 2f80b8e31


Add missing toString delegation


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

Branch: refs/heads/master
Commit: adc493ece7aeac214bf4473d3667210461759d5e
Parents: beb08ee
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Thu Mar 3 15:48:35 2016 +0100
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Thu Mar 3 15:48:35 2016 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/cdi/BeanDelegate.java        | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/adc493ec/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
index c1592cd..9b5fab1 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
@@ -89,4 +89,9 @@ final class BeanDelegate<T> implements Bean<T> {
     public void destroy(T instance, CreationalContext<T> creationalContext) {
         delegate.destroy(instance, creationalContext);
     }
+
+    @Override
+    public String toString() {
+        return delegate.toString();
+    }
 }


[2/3] camel git commit: Add missing non-bean classes vetoing

Posted by as...@apache.org.
Add missing non-bean classes vetoing


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

Branch: refs/heads/master
Commit: 4665a60577c6f72caca67be84a83111bf6b21fe5
Parents: adc493e
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Thu Mar 3 15:50:06 2016 +0100
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Thu Mar 3 15:50:06 2016 +0100

----------------------------------------------------------------------
 .../camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java    | 3 ++-
 .../camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4665a605/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
index eccf446..0956c95 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
@@ -35,6 +35,7 @@ import javax.inject.Qualifier;
 
     Excluded INSTANCE = new ExcludedLiteral();
 
-    final class ExcludedLiteral extends AnnotationLiteral<Excluded>implements Excluded {
+    @Vetoed
+    final class ExcludedLiteral extends AnnotationLiteral<Excluded> implements Excluded {
     }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/4665a605/components/camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java
index aa83263..76a76e2 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java
@@ -32,8 +32,9 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * A helper class for loading route definitions from a file, URL or the classpath
  */
+@Vetoed
 public final class RoutesXml {
-    
+
     private RoutesXml() {
         //The helper class
     }


[3/3] camel git commit: Remove unused import

Posted by as...@apache.org.
Remove unused import


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

Branch: refs/heads/master
Commit: 2f80b8e31b7cb9f47a2bfa64ba18a60d67fb5669
Parents: 4665a60
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Thu Mar 3 15:50:28 2016 +0100
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Thu Mar 3 15:50:28 2016 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/camel/cdi/CdiCamelExtension.java       | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2f80b8e3/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index 4cacd4a..5d79f46 100755
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -30,7 +30,6 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import static java.util.Collections.newSetFromMap;
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.InjectionException;
 import javax.enterprise.inject.Produces;