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 2022/01/29 08:04:26 UTC

[camel] branch main updated (6d047a0 -> 2f0ed31)

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 6d047a0  [CAMEL-17566]add a HttpsResolver into org.apache.camel.impl.engine.DefaultResourceResolvers so RestEndpoint producer can access https url (#6849)
     new 759ae8d  Update route-template.adoc (#6851)
     new 2f0ed31  Update camel-3x-upgrade-guide-3_4.adoc (#6850)

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:
 .../ROOT/pages/camel-3x-upgrade-guide-3_4.adoc       |  7 +++----
 .../modules/ROOT/pages/route-template.adoc           | 20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

[camel] 01/02: Update route-template.adoc (#6851)

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 759ae8dadcf8b1389677461f2ca00155480166dc
Author: Chirag <cs...@manh.com>
AuthorDate: Sat Jan 29 03:01:09 2022 -0500

    Update route-template.adoc (#6851)
    
    Clarifying that using with camelContext is Spring XML vs using routeTemplates is with XML DSL.
---
 .../modules/ROOT/pages/route-template.adoc           | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/docs/user-manual/modules/ROOT/pages/route-template.adoc b/docs/user-manual/modules/ROOT/pages/route-template.adoc
index 2885010..1d74a1c 100644
--- a/docs/user-manual/modules/ROOT/pages/route-template.adoc
+++ b/docs/user-manual/modules/ROOT/pages/route-template.adoc
@@ -34,7 +34,7 @@ public class MyRouteTemplates extends RouteBuilder {
 }
 ----
 
-And in XML DSL
+And in Spring XML DSL
 
 [source,xml]
 ----
@@ -52,6 +52,24 @@ And in XML DSL
 </camelContext>
 ----
 
+And in XML DSL
+
+[source,xml]
+----
+<routeTemplates xmlns="http://camel.apache.org/schema/spring">
+    <routeTemplate id="myTemplate">
+        <templateParameter name="name"/>
+        <templateParameter name="greeting"/>
+        <templateParameter name="myPeriod" defaultValue="3s"/>
+        <route>
+            <from uri="timer:{{name}}?period={{myPeriod}}"/>
+            <setBody><simple>{{greeting}} ${body}</simple></setBody>
+            <log message="${body}"/>
+        </route>
+    </routeTemplate>
+</routeTemplates>
+----
+
 In the examples above there was one route template, but you can define as many as you want.
 Each template must have a unique id. The template parameters are used for defining the parameters
 the template accepts. As you can see there are 3 parameters: name, greeting, and myPeriod. The first two

[camel] 02/02: Update camel-3x-upgrade-guide-3_4.adoc (#6850)

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 2f0ed31bbe627cbb927e27efbde656b882cdaad5
Author: Chirag <cs...@manh.com>
AuthorDate: Sat Jan 29 03:01:23 2022 -0500

    Update camel-3x-upgrade-guide-3_4.adoc (#6850)
    
    Added clarification to custom type converters
---
 .../user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc
index 7b65c35..d44b615 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc
@@ -65,8 +65,9 @@ import static org.apache.camel.builder.Builder.language;
 
 === Using custom type converters
 
-If you are using custom type converters and they have not source code generated a loader class (by `@Converter(generateLoader = true)`)
-then Camel needs to be instructed to scan for custom converters. This can be done as shown:
+If you are using custom type converters, you can now generate loader classes and have Camel discover them automatically. To generate loader class, Change  `@Converter` to `@Converter(generateLoader = true)` at class level and implement maven plugin as described in xref:camel-component-maven-plugin.adoc[here].
+
+If a loader class is not to be used, Camel needs to be instructed to scan for custom converters. This can be done as shown:
 
 [source,java]
 ----
@@ -150,5 +151,3 @@ You need to have a look at the following issue for more information: https://iss
 === Camel-Karaf
 
 Removed `camel-hdfs` and `camel-pulsar` Karaf features.
-
-