You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/12/01 19:42:14 UTC

[camel] branch main updated (4605dc4 -> 8824008)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 4605dc4  CAMEL-17257: camel-core - RouteBuilder should store source location of the file from the DSL loader
     new fdd204e  CAMEL-17257: camel-core - RouteBuilder should store source location of the file from the DSL loader
     new 8824008  CAMEL-17257: camel-core - RouteBuilder should store source location of the file from the DSL loader

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../component/hystrix/processor/HystrixHierarchicalConfigTest.java  | 6 +++---
 .../user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

[camel] 02/02: CAMEL-17257: camel-core - RouteBuilder should store source location of the file from the DSL loader

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 882400820c858231f8901d24f934a6e18b65862c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 1 20:39:31 2021 +0100

    CAMEL-17257: camel-core - RouteBuilder should store source location of the file from the DSL loader
---
 .../component/hystrix/processor/HystrixHierarchicalConfigTest.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java
index cbdf382..0aee584 100644
--- a/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/component/hystrix/processor/HystrixHierarchicalConfigTest.java
@@ -34,7 +34,7 @@ public class HystrixHierarchicalConfigTest {
     public void testRegistryConfiguration() throws Exception {
         final SimpleRegistry registry = new SimpleRegistry();
         final CamelContext context = new DefaultCamelContext(registry);
-        final Route route = new DefaultRoute(context, null, null, null, null);
+        final Route route = new DefaultRoute(context, null, null, null, null, null);
 
         HystrixConfigurationDefinition def = new HystrixConfigurationDefinition();
         def.setGroupKey("global-group-key");
@@ -66,7 +66,7 @@ public class HystrixHierarchicalConfigTest {
     @Test
     public void testContextConfiguration() throws Exception {
         final CamelContext context = new DefaultCamelContext();
-        final Route route = new DefaultRoute(context, null, null, null, null);
+        final Route route = new DefaultRoute(context, null, null, null, null, null);
 
         HystrixConfigurationDefinition def = new HystrixConfigurationDefinition();
         def.setGroupKey("global-group-key");
@@ -99,7 +99,7 @@ public class HystrixHierarchicalConfigTest {
     public void testMixedConfiguration() throws Exception {
         final SimpleRegistry registry = new SimpleRegistry();
         final CamelContext context = new DefaultCamelContext(registry);
-        final Route route = new DefaultRoute(context, null, null, null, null);
+        final Route route = new DefaultRoute(context, null, null, null, null, null);
 
         HystrixConfigurationDefinition def = new HystrixConfigurationDefinition();
         def.setGroupKey("global-group-key");

[camel] 01/02: CAMEL-17257: camel-core - RouteBuilder should store source location of the file from the DSL loader

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fdd204ef06ed09ea7f0544851ff45052ff31ca1c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 1 20:36:34 2021 +0100

    CAMEL-17257: camel-core - RouteBuilder should store source location of the file from the DSL loader
---
 docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc
index ec14503..035157d 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_14.adoc
@@ -10,6 +10,8 @@ from both 3.0 to 3.1 and 3.1 to 3.2.
 
 Added method `updateRoutesToCamelContext` to `org.apache.camel.RoutesBuilder` interface.
 
+Added parameter `Resource` in `createRoute` method on `org.apache.camel.spi.RouteFactory`.
+
 === camel-kafka
 
 The APIs in `camel-kafka` component changed from using the Kafka Client classes `org.apache.kafka.clients.producer.KafkaProducer` and `org.apache.kafka.clients.consumer.KafkaConsumer`