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/04/29 14:48:34 UTC
[1/3] camel git commit: Fix Javadoc
Repository: camel
Updated Branches:
refs/heads/master 41a8ccabb -> 3dfec74fd
Fix Javadoc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/45145bf2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/45145bf2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/45145bf2
Branch: refs/heads/master
Commit: 45145bf24f035c704de2a1641891e074533ec311
Parents: 41a8cca
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Fri Apr 29 14:46:09 2016 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Fri Apr 29 14:46:09 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/cdi/CdiEventEndpoint.java | 38 ++++++++++----------
1 file changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/45145bf2/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
index a003609..adfda4f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
@@ -29,22 +29,22 @@ import org.apache.camel.impl.DefaultEndpoint;
/**
* A Camel {@link Endpoint} that bridges the CDI events facility with Camel routes so that CDI events
- * can be seamlessly observed / consumed (respectively produced / fired) from Camel consumers (respectively by Camel producers).
- * <p/>
+ * can be seamlessly observed / consumed (respectively produced / fired) from Camel consumers (respectively by Camel producers).<p>
+ *
* The {@code CdiEventEndpoint<T>} bean can be used to observe / consume CDI events whose event type is {@code T}, for example:
* <pre><code>
* {@literal @}Inject
- * CdiEventEndpoint{@literal <}String{@literal >} cdiEventEndpoint;
+ * CdiEventEndpoint{@literal <}String{@literal >} cdiEventEndpoint;
*
- * from(cdiEventEndpoint).log("CDI event received: ${body}");
+ * from(cdiEventEndpoint).log("CDI event received: ${body}");
* </code></pre>
*
* Conversely, the {@code CdiEventEndpoint<T>} bean can be used to produce / fire CDI events whose event type is {@code T}, for example:
* <pre><code>
* {@literal @}Inject
- * CdiEventEndpoint{@literal <}String{@literal >} cdiEventEndpoint;
+ * CdiEventEndpoint{@literal <}String{@literal >} cdiEventEndpoint;
*
- * from("direct:event").to(cdiEventEndpoint).log("CDI event sent: ${body}");
+ * from("direct:event").to(cdiEventEndpoint).log("CDI event sent: ${body}");
* </code></pre>
*
* The type variable {@code T}, respectively the qualifiers, of a particular {@code CdiEventEndpoint<T>} injection point
@@ -52,13 +52,13 @@ import org.apache.camel.impl.DefaultEndpoint;
* <pre><code>
* {@literal @}Inject
* {@literal @}FooQualifier
- * CdiEventEndpoint{@literal <}List{@literal <}String{@literal >}{@literal >} cdiEventEndpoint;
+ * CdiEventEndpoint{@literal <}List{@literal <}String{@literal >}{@literal >} cdiEventEndpoint;
*
- * from("direct:event").to(cdiEventEndpoint);
+ * from("direct:event").to(cdiEventEndpoint);
*
- * void observeCdiEvents({@literal @}Observes {@literal @}FooQualifier List{@literal <}String{@literal >} event) {
- * logger.info("CDI event: {}", event);
- * }
+ * void observeCdiEvents({@literal @}Observes {@literal @}FooQualifier List{@literal <}String{@literal >} event) {
+ * logger.info("CDI event: {}", event);
+ * }
* </code></pre>
*
* When multiple Camel contexts exist in the CDI container, the {@code @ContextName} qualifier can be used
@@ -66,17 +66,17 @@ import org.apache.camel.impl.DefaultEndpoint;
* <pre><code>
* {@literal @}Inject
* {@literal @}ContextName("foo")
- * CdiEventEndpoint{@literal <}List{@literal <}String{@literal >}{@literal >} cdiEventEndpoint;
+ * CdiEventEndpoint{@literal <}List{@literal <}String{@literal >}{@literal >} cdiEventEndpoint;
*
- * // Only observe / consume events having the {@literal @}ContextName("foo") qualifier
- * from(cdiEventEndpoint).log("Camel context 'foo' > CDI event received: ${body}");
+ * // Only observe / consume events having the {@literal @}ContextName("foo") qualifier
+ * from(cdiEventEndpoint).log("Camel context 'foo'{@literal >} CDI event received: ${body}");
*
- * // Produce / fire events with the {@literal @}ContextName("foo") qualifier
- * from("...").to(cdiEventEndpoint);
+ * // Produce / fire events with the {@literal @}ContextName("foo") qualifier
+ * from("...").to(cdiEventEndpoint);
*
- * void observeCdiEvents({@literal @}Observes {@literal @}ContextName("foo") List{@literal <}String{@literal >} event) {
- * logger.info("Camel context 'foo' > CDI event: {}", event);
- * }
+ * void observeCdiEvents({@literal @}Observes {@literal @}ContextName("foo") List{@literal <}String{@literal >} event) {
+ * logger.info("Camel context 'foo'{@literal >} CDI event: {}", event);
+ * }
* </code></pre>
*/
public final class CdiEventEndpoint<T> extends DefaultEndpoint {
[3/3] camel git commit: Remove FIXME as CAMEL-9200 has been fixed
Posted by as...@apache.org.
Remove FIXME as CAMEL-9200 has been fixed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3dfec74f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3dfec74f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3dfec74f
Branch: refs/heads/master
Commit: 3dfec74fd1b36145afdd8588745ad11621b827d9
Parents: c263bc3
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Fri Apr 29 14:48:19 2016 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Fri Apr 29 14:48:19 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/cdi/test/ContextComponentTest.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3dfec74f/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
index fe1a80e..65041f0 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
@@ -69,11 +69,8 @@ public class ContextComponentTest {
@Override
public void configure() {
from("direct:inbound").to("first:in");
- // FIXME: The context component does not support multiple logical endpoints
- // with the same remaining defined in two distinct Camel contexts.
- // See https://issues.apache.org/jira/browse/CAMEL-9200.
- // from("first:out").to("second:in");
- from("first:out").to("mock:outbound");
+ from("first:out").to("second:in");
+ from("second:out").to("mock:outbound");
}
});
}
@@ -83,7 +80,7 @@ public class ContextComponentTest {
public void sendMessageToInbound(@Uri("direct:inbound") ProducerTemplate inbound,
@Uri("mock:outbound") MockEndpoint outbound) throws InterruptedException {
outbound.expectedMessageCount(1);
- outbound.expectedBodiesReceived("first-test");
+ outbound.expectedBodiesReceived("second-first-test");
inbound.sendBody("test");
[2/3] camel git commit: CAMEL-9882: Add deprecation
Posted by as...@apache.org.
CAMEL-9882: Add deprecation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c263bc3b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c263bc3b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c263bc3b
Branch: refs/heads/master
Commit: c263bc3bb92c060c291f587e3d1a9c682a57ae0c
Parents: 45145bf
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Fri Apr 29 14:47:20 2016 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Fri Apr 29 14:47:20 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/cdi/RoutesXml.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c263bc3b/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 76a76e2..6edc7cc 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
@@ -30,9 +30,19 @@ import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.util.ObjectHelper;
/**
- * A helper class for loading route definitions from a file, URL or the classpath
+ * A helper class for loading route definitions from a file, URL or the classpath.
+ *
+ * @deprecated Use {@link org.apache.camel.cdi.ImportResource} instead:
+ *
+ * <pre><code>
+ * {@literal @}ImportResource("foo-camel-context.xml")
+ * class BarBean {
+ *
+ * };
+ * </code></pre>
*/
@Vetoed
+@Deprecated
public final class RoutesXml {
private RoutesXml() {