You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/04/21 07:24:58 UTC

[camel] branch main updated (234e9b9 -> 9406841)

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

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


    from 234e9b9  CAMEL-16534: camel-core - Multiple doTry ..doCatch in Java DSL - issue setting outer doCatch blocks
     new d5061f4  Moving from master branch to main branch
     new f407897  Moving from master branch to main branch
     new 7668106  Regen
     new 9406841  Regen

The 4 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:
 .../apache/camel/catalog/docs/apns-component.adoc  |   2 +-
 .../camel/catalog/docs/aws2-lambda-component.adoc  |   2 +-
 .../apache/camel/catalog/docs/bean-language.adoc   |   4 +-
 .../catalog/docs/bean-validator-component.adoc     |   2 +-
 .../catalog/docs/content-based-router-eip.adoc     |   2 +-
 .../camel/catalog/docs/content-enricher.adoc       |   8 +-
 .../camel/catalog/docs/content-filter-eip.adoc     |   4 +-
 .../apache/camel/catalog/docs/cxf-component.adoc   |   2 +-
 .../apache/camel/catalog/docs/cxfrs-component.adoc |   4 +-
 .../apache/camel/catalog/docs/http-component.adoc  |   2 +-
 .../apache/camel/catalog/docs/msv-component.adoc   |   2 +-
 .../apache/camel/catalog/docs/pgp-dataformat.adoc  |  10 +-
 .../camel/catalog/docs/polling-consumer.adoc       |  20 +-
 .../apache/camel/catalog/docs/return-address.adoc  |   2 +-
 .../apache/camel/catalog/docs/rollback-eip.adoc    |  16 +-
 .../camel/catalog/docs/servlet-component.adoc      |  10 +-
 .../camel/catalog/docs/validator-component.adoc    |   2 +-
 .../catalog/docs/xmlsecurity-sign-component.adoc   |  10 +-
 .../catalog/docs/xmlsecurity-verify-component.adoc |  10 +-
 .../apache/camel/catalog/docs/xpath-language.adoc  |   4 +-
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 502 ++++++++++++++++++---
 .../eips/pages/content-based-router-eip.adoc       |   2 +-
 .../docs/modules/eips/pages/content-enricher.adoc  |   8 +-
 .../modules/eips/pages/content-filter-eip.adoc     |   4 +-
 .../docs/modules/eips/pages/polling-consumer.adoc  |  20 +-
 .../docs/modules/eips/pages/return-address.adoc    |   2 +-
 .../main/docs/modules/eips/pages/rollback-eip.adoc |  16 +-
 .../modules/ROOT/pages/apns-component.adoc         |   2 +-
 .../modules/ROOT/pages/aws2-lambda-component.adoc  |   2 +-
 .../ROOT/pages/bean-validator-component.adoc       |   2 +-
 .../modules/ROOT/pages/cxf-component.adoc          |   2 +-
 .../modules/ROOT/pages/cxfrs-component.adoc        |   4 +-
 .../modules/ROOT/pages/http-component.adoc         |   2 +-
 .../modules/ROOT/pages/msv-component.adoc          |   2 +-
 .../modules/ROOT/pages/servlet-component.adoc      |  10 +-
 .../modules/ROOT/pages/validator-component.adoc    |   2 +-
 .../ROOT/pages/xmlsecurity-sign-component.adoc     |  10 +-
 .../ROOT/pages/xmlsecurity-verify-component.adoc   |  10 +-
 .../modules/dataformats/pages/pgp-dataformat.adoc  |  10 +-
 .../modules/languages/pages/bean-language.adoc     |   4 +-
 .../modules/languages/pages/xpath-language.adoc    |   4 +-
 .../modules/ROOT/pages/componentconfiguration.adoc |   2 +-
 .../user-manual/modules/ROOT/pages/expression.adoc |   4 +-
 docs/user-manual/modules/ROOT/pages/index.adoc     |   2 +-
 docs/user-manual/modules/ROOT/pages/predicate.adoc |   4 +-
 docs/user-manual/modules/ROOT/pages/registry.adoc  |   8 +-
 .../modules/ROOT/pages/spring-example.adoc         |   6 +-
 .../modules/ROOT/pages/spring-testing.adoc         |   2 +-
 docs/user-manual/modules/ROOT/pages/testing.adoc   |  14 +-
 49 files changed, 586 insertions(+), 194 deletions(-)

[camel] 02/04: Moving from master branch to main branch

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

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

commit f4078973eb78945a88744f081f3e1dcb9c87e81a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 09:09:01 2021 +0200

    Moving from master branch to main branch
---
 .../modules/ROOT/pages/componentconfiguration.adoc         |  2 +-
 docs/user-manual/modules/ROOT/pages/expression.adoc        |  4 ++--
 docs/user-manual/modules/ROOT/pages/index.adoc             |  2 +-
 docs/user-manual/modules/ROOT/pages/predicate.adoc         |  4 ++--
 docs/user-manual/modules/ROOT/pages/registry.adoc          |  8 ++++----
 docs/user-manual/modules/ROOT/pages/spring-example.adoc    |  6 +++---
 docs/user-manual/modules/ROOT/pages/spring-testing.adoc    |  2 +-
 docs/user-manual/modules/ROOT/pages/testing.adoc           | 14 +++++++-------
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/componentconfiguration.adoc b/docs/user-manual/modules/ROOT/pages/componentconfiguration.adoc
index a3ed3cb..3962f0d 100644
--- a/docs/user-manual/modules/ROOT/pages/componentconfiguration.adoc
+++ b/docs/user-manual/modules/ROOT/pages/componentconfiguration.adoc
@@ -10,7 +10,7 @@ editting of Camel routes for example).
 
 To get an idea for the kinds of things you can do with the
 ComponentConfiguration API
-https://github.com/apache/camel/blob/master/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java#L72[check
+https://github.com/apache/camel/blob/main/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java#L72[check
 out the test case].
 
 For example given a Component object you can create a new configuration;
diff --git a/docs/user-manual/modules/ROOT/pages/expression.adoc b/docs/user-manual/modules/ROOT/pages/expression.adoc
index f8fa2d1..61fa147 100644
--- a/docs/user-manual/modules/ROOT/pages/expression.adoc
+++ b/docs/user-manual/modules/ROOT/pages/expression.adoc
@@ -110,8 +110,8 @@ xref:components:languages:groovy-language.adoc[Groovy] |
 
 |xref:components::sql-component.adoc[SQL] |
 
-|xref:components:languages:xpath-language.adoc[XPath] |https://github.com/apache/camel/blob/master/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java[org.apache.camel.builder.xml.XPathBuilder]
+|xref:components:languages:xpath-language.adoc[XPath] |https://github.com/apache/camel/blob/main/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java[org.apache.camel.builder.xml.XPathBuilder]
 
-|xref:components::xquery-component.adoc[XQuery] |https://github.com/apache/camel/blob/master/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java[org.apache.camel.builder.saxon.XQueryBuilder]
+|xref:components::xquery-component.adoc[XQuery] |https://github.com/apache/camel/blob/main/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java[org.apache.camel.builder.saxon.XQueryBuilder]
 |=======================================================================
 
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index e4c2301..7800c2e 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -29,7 +29,7 @@ For a deeper and better understanding of Apache Camel, an xref:faq:what-is-camel
 * xref:getting-started.adoc[Getting Started]
 * xref:book-getting-started.adoc[Longer Getting Started Guide]
 * xref:faq:index.adoc[FAQ]
-* https://github.com/apache/camel/blob/master/NOTICE.txt[Legal Notice]
+* https://github.com/apache/camel/blob/main/NOTICE.txt[Legal Notice]
 
 == Documentation
 
diff --git a/docs/user-manual/modules/ROOT/pages/predicate.adoc b/docs/user-manual/modules/ROOT/pages/predicate.adoc
index 9a0b722..6237f2f 100644
--- a/docs/user-manual/modules/ROOT/pages/predicate.adoc
+++ b/docs/user-manual/modules/ROOT/pages/predicate.adoc
@@ -173,9 +173,9 @@ xref:parameter-binding-annotations.adoc[Annotation Based
 Expression Language].
 
 You can easily write your own plugin predicate by implementing the
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/Predicate.java[Predicate
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/Predicate.java[Predicate
 interface].
 
 There are also a number of helper builders available such as the
-https://github.com/apache/camel/blob/master/core/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java[PredicateBuilder
+https://github.com/apache/camel/blob/main/core/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java[PredicateBuilder
 class]
diff --git a/docs/user-manual/modules/ROOT/pages/registry.adoc b/docs/user-manual/modules/ROOT/pages/registry.adoc
index 1eace73..0f36648 100644
--- a/docs/user-manual/modules/ROOT/pages/registry.adoc
+++ b/docs/user-manual/modules/ROOT/pages/registry.adoc
@@ -2,16 +2,16 @@
 = Registry
 
 Camel supports a pluggable
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/spi/Registry.java[Registry]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/spi/Registry.java[Registry]
 plugin strategy. This allows Camel to easily work with some kind of
 registry like
 
-* https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/SimpleRegistry.java[SimpleRegistry]
+* https://github.com/apache/camel/blob/main/core/camel-support/src/main/java/org/apache/camel/support/SimpleRegistry.java[SimpleRegistry]
 which is a simple `java.util.Map` based registry.
-* https://github.com/apache/camel/blob/master/core/camel-core-engine/src/main/java/org/apache/camel/impl/JndiRegistry.java[JndiRegistry]
+* https://github.com/apache/camel/blob/main/core/camel-core-engine/src/main/java/org/apache/camel/impl/JndiRegistry.java[JndiRegistry]
 which uses the JNDI InitialContext as the registry
 
 You can also access the Registry from the
 CamelContext via the
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/CamelContext.java#L690[camelContext.getRegistry()
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/CamelContext.java#L690[camelContext.getRegistry()
 method]
diff --git a/docs/user-manual/modules/ROOT/pages/spring-example.adoc b/docs/user-manual/modules/ROOT/pages/spring-example.adoc
index 1ce2641..2c1ba15 100644
--- a/docs/user-manual/modules/ROOT/pages/spring-example.adoc
+++ b/docs/user-manual/modules/ROOT/pages/spring-example.adoc
@@ -19,7 +19,7 @@ mvn camel:run
 
 What this does is boot up the Spring ApplicationContext defined in the
 file
-https://github.com/apache/camel/blob/master/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml[META-INF/spring/camel-context.xml]
+https://github.com/apache/camel/blob/main/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml[META-INF/spring/camel-context.xml]
 on the classpath. This is a regular Spring XML document which uses the
 Camel link:xml-configuration.html[Xml Configuration] to configure a
 link:camelcontext.html[CamelContext]. Notice how the <camelContext>
@@ -36,7 +36,7 @@ The packages attribute defines the comma separated list of Java package
 names which are recursively searched for Java classes on the classpath
 which implement the xref:route-builder.adoc[RouteBuilder] interface. What
 this means is that Camel will automatically detect our
-https://github.com/apache/camel/blob/master/examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java[MyRouteBuilder
+https://github.com/apache/camel/blob/main/examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java[MyRouteBuilder
 class] and automatically install its routes. Of course, in practice you
 should not specify org.apache.camel (or a sub package of this) as the
 package name because this will instruct Camel to search in its own
@@ -49,6 +49,6 @@ of XML bloat. Of course if you prefer you can create all of your routes
 in the xref:xml-configuration.adoc[Xml Configuration].
 
 Also note at the end of this
-https://github.com/apache/camel/blob/master/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml[XML
+https://github.com/apache/camel/blob/main/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml[XML
 example file] we explicitly configure the xref:components::activemq-component.adoc[ActiveMQ]
 component with details of how to connect to the broker.
diff --git a/docs/user-manual/modules/ROOT/pages/spring-testing.adoc b/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
index 30a0aeb..6db8de1 100644
--- a/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
@@ -236,7 +236,7 @@ details on the registration of the mock endpoints. |Not enabled |All endpoints a
 
 |org.apache.camel.test.spring.MockEndpointsAndSkip |Class |Triggers the auto-mocking of endpoints whose URIs match the provided
 filter.  The default filter is "*", which matches all endpoints.
- See https://github.com/apache/camel/blob/master/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java[org.apache.camel.impl.InterceptSendToMockEndpointStrategy] for more
+ See https://github.com/apache/camel/blob/main/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java[org.apache.camel.impl.InterceptSendToMockEndpointStrategy] for more
 details on the registration of the mock endpoints.  This annotation will
 also skip sending the message to matched endpoints as well. |Not enabled |All endpoints are sniffed and recorded in a mock endpoint.  The original
 endpoint is not invoked.
diff --git a/docs/user-manual/modules/ROOT/pages/testing.adoc b/docs/user-manual/modules/ROOT/pages/testing.adoc
index 5ffedcf..5885b23 100644
--- a/docs/user-manual/modules/ROOT/pages/testing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/testing.adoc
@@ -76,7 +76,7 @@ injection annotations].
 === Camel Test Example
 
 Here is the Camel Test
-https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java[example]:
+https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java[example]:
 
 [source,java]
 ----
@@ -91,7 +91,7 @@ overrides the `createRouteBuilder()` method.
 === CDI Test Example
 
 Here is the CDI Testing
-https://github.com/apache/camel/blob/master/components/camel-test-cdi/src/test/java/org/apache/camel/test/cdi/FilterTest.java[example]:
+https://github.com/apache/camel/blob/main/components/camel-test-cdi/src/test/java/org/apache/camel/test/cdi/FilterTest.java[example]:
 
 [source,java]
 ----
@@ -105,7 +105,7 @@ and the test classes that come with it.
 === Spring Test with XML Config Example
 
 Here is the Spring Testing
-https://github.com/apache/camel/blob/master/components/camel-spring-xml/src/test/java/org/apache/camel/spring/patterns/FilterTest.java[example
+https://github.com/apache/camel/blob/main/components/camel-spring-xml/src/test/java/org/apache/camel/spring/patterns/FilterTest.java[example
 using XML Config]:
 
 [source,java]
@@ -121,7 +121,7 @@ sending to an endpoint that is then reused in another test method).
 
 Also notice the use of `@ContextConfiguration` to indicate that by
 default we should look for the
-https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml[`FilterTest-context.xml`
+https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml[`FilterTest-context.xml`
 on the classpath] to configure the test case which looks like this:
 
 [source,xml]
@@ -133,7 +133,7 @@ include::{examplesdir}/components/camel-spring-xml/src/test/resources/org/apache
 === Spring Test with Java Config Example
 
 Here is the Spring Testing
-https://github.com/apache/camel/blob/master/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java[example
+https://github.com/apache/camel/blob/main/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java[example
 using Java Config]:
 
 [source,java]
@@ -159,7 +159,7 @@ register the RouteBuilder we create.
 
 Since *Camel 2.11.0* you can use the `CamelSpringJUnit4ClassRunner` with
 `CamelSpringDelegatingTestContextLoader` like
-https://github.com/apache/camel/blob/master/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java[example
+https://github.com/apache/camel/blob/main/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java[example
 using Java Config with `CamelSpringJUnit4ClassRunner`]:
 
 Since *Camel 2.18.0* `CamelSpringJUnit4ClassRunner` is deprecated. you can use the `CamelSpringRunner`
@@ -173,7 +173,7 @@ include::{examplesdir}/components/camel-spring-javaconfig/src/test/java/org/apac
 === Spring Test with XML Config and Declarative Configuration Example
 
 Here is a Camel test support enhanced xref:spring-testing.adoc[Spring
-Testing] https://github.com/apache/camel/blob/master/components/camel-test/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java[example
+Testing] https://github.com/apache/camel/blob/main/components/camel-test/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java[example
 using XML Config and pure Spring Test based configuration of the Camel
 Context]:
 

[camel] 04/04: Regen

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

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

commit 9406841edf1cc0ec4c720f3c7b0bcfd71314f4bf
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 09:23:48 2021 +0200

    Regen
---
 .../sql/stored/template/generated/SSPTParser.java  |  833 ++++++-------
 .../template/generated/SSPTParserConstants.java    |  110 +-
 .../template/generated/SSPTParserTokenManager.java | 1222 ++++++++++----------
 3 files changed, 1093 insertions(+), 1072 deletions(-)

diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
index 13c79f5..319202c 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
@@ -3,419 +3,476 @@ package org.apache.camel.component.sql.stored.template.generated;
 
 import java.io.Reader;
 
-import org.apache.camel.spi.ClassResolver;
 import org.apache.camel.component.sql.stored.template.ast.*;
+import org.apache.camel.spi.ClassResolver;
 
 public class SSPTParser implements SSPTParserConstants {
-   int parameterNameCounter = 0;
-
-   ClassResolver classResolver;
-
-   public SSPTParser(Reader reader, ClassResolver classResolver) {
-     this(reader);
-     this.classResolver = classResolver;
-   }
-
-   String createNextParameterName() {
-      return "_"+(parameterNameCounter++);
-   }
-
-  final public Template parse() throws ParseException {
-    Token procedureName;
-    Template template = new Template();
-    Object parameter = null;
-    procedureName = jj_consume_token(IDENTIFIER);
-    jj_consume_token(PROCEDURE_BEGIN);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case 2:
-    case 3:
-    case NUMBER:
-    case PARAMETER_NAME:
-    case IDENTIFIER:
-      parameter = Parameter();
-                                                                               template.addParameter(parameter);
-      label_1:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case SEPARATOR:
-          ;
-          break;
-        default:
-          jj_la1[0] = jj_gen;
-          break label_1;
-        }
-        jj_consume_token(SEPARATOR);
-        parameter = Parameter();
-                template.addParameter(parameter);
-      }
-      break;
-    default:
-      jj_la1[1] = jj_gen;
-      ;
+    int parameterNameCounter = 0;
+
+    ClassResolver classResolver;
+
+    public SSPTParser(Reader reader, ClassResolver classResolver) {
+        this(reader);
+        this.classResolver = classResolver;
     }
-    jj_consume_token(PROCEDURE_END);
-    jj_consume_token(0);
-   template.setProcedureName(procedureName.toString());
-   {if (true) return template;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Object Parameter() throws ParseException {
-    Object param;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case NUMBER:
-    case PARAMETER_NAME:
-    case IDENTIFIER:
-      param = InParameter();
-                             {if (true) return param;}
-      break;
-    case 2:
-      param = OutParameter();
-                                                                       {if (true) return param;}
-      break;
-    case 3:
-      param = InOutParameter();
-                                                                                                                   {if (true) return param;}
-      break;
-    default:
-      jj_la1[2] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
+
+    String createNextParameterName() {
+        return "_" + (parameterNameCounter++);
     }
-    throw new Error("Missing return statement in function");
-  }
-
-  final public InParameter InParameter() throws ParseException {
-     Token sqlTypeToken;
-     String name = null;
-     Token valueSrcToken;
-     Integer scale = null;
-     String typeName = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case PARAMETER_NAME:
-      name = ParameterName();
-      jj_consume_token(1);
-      break;
-    default:
-      jj_la1[3] = jj_gen;
-      ;
+
+    final public Template parse() throws ParseException {
+        Token procedureName;
+        Template template = new Template();
+        Object parameter = null;
+        procedureName = jj_consume_token(IDENTIFIER);
+        jj_consume_token(PROCEDURE_BEGIN);
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case 2:
+            case 3:
+            case NUMBER:
+            case PARAMETER_NAME:
+            case IDENTIFIER:
+                parameter = Parameter();
+                template.addParameter(parameter);
+                label_1: while (true) {
+                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+                        case SEPARATOR:
+                            ;
+                            break;
+                        default:
+                            jj_la1[0] = jj_gen;
+                            break label_1;
+                    }
+                    jj_consume_token(SEPARATOR);
+                    parameter = Parameter();
+                    template.addParameter(parameter);
+                }
+                break;
+            default:
+                jj_la1[1] = jj_gen;
+                ;
+        }
+        jj_consume_token(PROCEDURE_END);
+        jj_consume_token(0);
+        template.setProcedureName(procedureName.toString());
+        {
+            if (true)
+                return template;
+        }
+        throw new Error("Missing return statement in function");
     }
-    sqlTypeToken = ParameterSqlType();
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case SCALE:
-      scale = Scale();
-      break;
-    default:
-      jj_la1[4] = jj_gen;
-      ;
+
+    final public Object Parameter() throws ParseException {
+        Object param;
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case NUMBER:
+            case PARAMETER_NAME:
+            case IDENTIFIER:
+                param = InParameter(); {
+                if (true)
+                    return param;
+            }
+                break;
+            case 2:
+                param = OutParameter(); {
+                if (true)
+                    return param;
+            }
+                break;
+            case 3:
+                param = InOutParameter(); {
+                if (true)
+                    return param;
+            }
+                break;
+            default:
+                jj_la1[2] = jj_gen;
+                jj_consume_token(-1);
+                throw new ParseException();
+        }
+        throw new Error("Missing return statement in function");
     }
-    jj_consume_token(1);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case PARAMETER_NAME:
-      typeName = ParameterName();
-      jj_consume_token(1);
-      break;
-    default:
-      jj_la1[5] = jj_gen;
-      ;
+
+    final public InParameter InParameter() throws ParseException {
+        Token sqlTypeToken;
+        String name = null;
+        Token valueSrcToken;
+        Integer scale = null;
+        String typeName = null;
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case PARAMETER_NAME:
+                name = ParameterName();
+                jj_consume_token(1);
+                break;
+            default:
+                jj_la1[3] = jj_gen;
+                ;
+        }
+        sqlTypeToken = ParameterSqlType();
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case SCALE:
+                scale = Scale();
+                break;
+            default:
+                jj_la1[4] = jj_gen;
+                ;
+        }
+        jj_consume_token(1);
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case PARAMETER_NAME:
+                typeName = ParameterName();
+                jj_consume_token(1);
+                break;
+            default:
+                jj_la1[5] = jj_gen;
+                ;
+        }
+        valueSrcToken = InParameterSrc();
+        int sqlType = ParseHelper.parseSqlType(sqlTypeToken, classResolver);
+
+        {
+            if (true)
+                return new InParameter(
+                        name == null ? createNextParameterName() : name, sqlType, valueSrcToken, scale, typeName);
+        }
+        throw new Error("Missing return statement in function");
     }
-    valueSrcToken = InParameterSrc();
+
+    final public OutParameter OutParameter() throws ParseException {
+        Token sqlTypeToken;
+        String outValueMapKey;
+        Integer scale = null;
+        String typeName = null;
+        jj_consume_token(2);
+        sqlTypeToken = ParameterSqlType();
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case SCALE:
+                scale = Scale();
+                break;
+            default:
+                jj_la1[6] = jj_gen;
+                ;
+        }
+        jj_consume_token(1);
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case PARAMETER_NAME:
+                typeName = ParameterName();
+                jj_consume_token(1);
+                break;
+            default:
+                jj_la1[7] = jj_gen;
+                ;
+        }
+        outValueMapKey = OutHeader();
+        {
+            if (true)
+                return new OutParameter(ParseHelper.parseSqlType(sqlTypeToken, classResolver), outValueMapKey, scale, typeName);
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public InOutParameter InOutParameter() throws ParseException {
+        Token sqlTypeToken;
+        Token valueSrcToken;
+        Integer scale = null;
+        String typeName = null;
+        String outValueMapKey;
+        jj_consume_token(3);
+        sqlTypeToken = ParameterSqlType();
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case SCALE:
+                scale = Scale();
+                break;
+            default:
+                jj_la1[8] = jj_gen;
+                ;
+        }
+        jj_consume_token(1);
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case PARAMETER_NAME:
+                typeName = ParameterName();
+                jj_consume_token(1);
+                break;
+            default:
+                jj_la1[9] = jj_gen;
+                ;
+        }
+        valueSrcToken = InParameterSrc();
+        jj_consume_token(1);
+        outValueMapKey = OutHeader();
         int sqlType = ParseHelper.parseSqlType(sqlTypeToken, classResolver);
 
-        {if (true) return new InParameter(name == null ? createNextParameterName() : name, sqlType, valueSrcToken, scale, typeName);}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public OutParameter OutParameter() throws ParseException {
-     Token sqlTypeToken;
-     String outValueMapKey;
-     Integer scale = null;
-     String typeName = null;
-    jj_consume_token(2);
-    sqlTypeToken = ParameterSqlType();
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case SCALE:
-      scale = Scale();
-      break;
-    default:
-      jj_la1[6] = jj_gen;
-      ;
+        {
+            if (true)
+                return new InOutParameter(sqlType, valueSrcToken, scale, typeName, outValueMapKey);
+        }
+        throw new Error("Missing return statement in function");
     }
-    jj_consume_token(1);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case PARAMETER_NAME:
-      typeName = ParameterName();
-      jj_consume_token(1);
-      break;
-    default:
-      jj_la1[7] = jj_gen;
-      ;
+
+    final public String ParameterName() throws ParseException {
+        Token t = null;
+        t = jj_consume_token(PARAMETER_NAME);
+        {
+            if (true)
+                return ParseHelper.removeQuotes(t.toString());
+        }
+        throw new Error("Missing return statement in function");
     }
-    outValueMapKey = OutHeader();
-        {if (true) return new OutParameter(ParseHelper.parseSqlType(sqlTypeToken, classResolver), outValueMapKey, scale, typeName);}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public InOutParameter InOutParameter() throws ParseException {
-     Token sqlTypeToken;
-     Token valueSrcToken;
-     Integer scale = null;
-     String typeName = null;
-     String outValueMapKey;
-    jj_consume_token(3);
-    sqlTypeToken = ParameterSqlType();
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case SCALE:
-      scale = Scale();
-      break;
-    default:
-      jj_la1[8] = jj_gen;
-      ;
+
+    final public Integer Scale() throws ParseException {
+        Token t;
+        t = jj_consume_token(SCALE);
+        {
+            if (true)
+                return ParseHelper.parseScale(t);
+        }
+        throw new Error("Missing return statement in function");
     }
-    jj_consume_token(1);
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case PARAMETER_NAME:
-      typeName = ParameterName();
-      jj_consume_token(1);
-      break;
-    default:
-      jj_la1[9] = jj_gen;
-      ;
+
+    final public Token ParameterSqlType() throws ParseException {
+        Token t;
+        Token scaleToken;
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case NUMBER:
+                t = jj_consume_token(NUMBER);
+                break;
+            case IDENTIFIER:
+                t = jj_consume_token(IDENTIFIER);
+                break;
+            default:
+                jj_la1[10] = jj_gen;
+                jj_consume_token(-1);
+                throw new ParseException();
+        }
+        {
+            if (true)
+                return t;
+        }
+        throw new Error("Missing return statement in function");
     }
-    valueSrcToken = InParameterSrc();
-    jj_consume_token(1);
-    outValueMapKey = OutHeader();
-        int sqlType = ParseHelper.parseSqlType(sqlTypeToken, classResolver);
 
-        {if (true) return new InOutParameter(sqlType, valueSrcToken, scale, typeName, outValueMapKey);}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public String ParameterName() throws ParseException {
-    Token t = null;
-    t = jj_consume_token(PARAMETER_NAME);
-        {if (true) return ParseHelper.removeQuotes(t.toString()) ;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Integer Scale() throws ParseException {
-    Token t;
-    t = jj_consume_token(SCALE);
-        {if (true) return ParseHelper.parseScale(t);}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Token ParameterSqlType() throws ParseException {
-    Token t;
-    Token scaleToken;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case NUMBER:
-      t = jj_consume_token(NUMBER);
-      break;
-    case IDENTIFIER:
-      t = jj_consume_token(IDENTIFIER);
-      break;
-    default:
-      jj_la1[10] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
+    final public String OutHeader() throws ParseException {
+        Token token;
+        token = jj_consume_token(IDENTIFIER);
+        {
+            if (true)
+                return token.toString();
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    final public Token InParameterSrc() throws ParseException {
+        Token ret = null;
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
+            case SIMPLE_EXP_TOKEN:
+                ret = jj_consume_token(SIMPLE_EXP_TOKEN); {
+                if (true)
+                    return ret;
+            }
+                break;
+            case PARAMETER_POS_TOKEN:
+                ret = jj_consume_token(PARAMETER_POS_TOKEN); {
+                if (true)
+                    return ret;
+            }
+                break;
+            default:
+                jj_la1[11] = jj_gen;
+                jj_consume_token(-1);
+                throw new ParseException();
+        }
+        throw new Error("Missing return statement in function");
+    }
+
+    /** Generated Token Manager. */
+    public SSPTParserTokenManager token_source;
+    SimpleCharStream jj_input_stream;
+    /** Current token. */
+    public Token token;
+    /** Next token. */
+    public Token jj_nt;
+    private int jj_ntk;
+    private int jj_gen;
+    final private int[] jj_la1 = new int[12];
+    static private int[] jj_la1_0;
+    static {
+        jj_la1_init_0();
+    }
+
+    private static void jj_la1_init_0() {
+        jj_la1_0 = new int[] {
+                0x800, 0x3002c, 0x3002c, 0x10000, 0x10, 0x10000, 0x10, 0x10000, 0x10, 0x10000, 0x20020, 0xc000, };
+    }
+
+    /** Constructor with InputStream. */
+    public SSPTParser(java.io.InputStream stream) {
+        this(stream, null);
+    }
+
+    /** Constructor with InputStream and supplied encoding */
+    public SSPTParser(java.io.InputStream stream, String encoding) {
+        try {
+            jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1);
+        } catch (java.io.UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+        token_source = new SSPTParserTokenManager(jj_input_stream);
+        token = new Token();
+        jj_ntk = -1;
+        jj_gen = 0;
+        for (int i = 0; i < 12; i++)
+            jj_la1[i] = -1;
+    }
+
+    /** Reinitialise. */
+    public void ReInit(java.io.InputStream stream) {
+        ReInit(stream, null);
+    }
+
+    /** Reinitialise. */
+    public void ReInit(java.io.InputStream stream, String encoding) {
+        try {
+            jj_input_stream.ReInit(stream, encoding, 1, 1);
+        } catch (java.io.UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+        token_source.ReInit(jj_input_stream);
+        token = new Token();
+        jj_ntk = -1;
+        jj_gen = 0;
+        for (int i = 0; i < 12; i++)
+            jj_la1[i] = -1;
     }
-        {if (true) return t;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public String OutHeader() throws ParseException {
- Token token;
-    token = jj_consume_token(IDENTIFIER);
-        {if (true) return token.toString();}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public Token InParameterSrc() throws ParseException {
-    Token ret = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case SIMPLE_EXP_TOKEN:
-      ret = jj_consume_token(SIMPLE_EXP_TOKEN);
-        {if (true) return ret;}
-      break;
-    case PARAMETER_POS_TOKEN:
-      ret = jj_consume_token(PARAMETER_POS_TOKEN);
-            {if (true) return ret;}
-      break;
-    default:
-      jj_la1[11] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
+
+    /** Constructor. */
+    public SSPTParser(java.io.Reader stream) {
+        jj_input_stream = new SimpleCharStream(stream, 1, 1);
+        token_source = new SSPTParserTokenManager(jj_input_stream);
+        token = new Token();
+        jj_ntk = -1;
+        jj_gen = 0;
+        for (int i = 0; i < 12; i++)
+            jj_la1[i] = -1;
     }
-    throw new Error("Missing return statement in function");
-  }
-
-  /** Generated Token Manager. */
-  public SSPTParserTokenManager token_source;
-  SimpleCharStream jj_input_stream;
-  /** Current token. */
-  public Token token;
-  /** Next token. */
-  public Token jj_nt;
-  private int jj_ntk;
-  private int jj_gen;
-  final private int[] jj_la1 = new int[12];
-  static private int[] jj_la1_0;
-  static {
-      jj_la1_init_0();
-   }
-   private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0x800,0x3002c,0x3002c,0x10000,0x10,0x10000,0x10,0x10000,0x10,0x10000,0x20020,0xc000,};
-   }
-
-  /** Constructor with InputStream. */
-  public SSPTParser(java.io.InputStream stream) {
-     this(stream, null);
-  }
-  /** Constructor with InputStream and supplied encoding */
-  public SSPTParser(java.io.InputStream stream, String encoding) {
-    try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
-    token_source = new SSPTParserTokenManager(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream stream) {
-     ReInit(stream, null);
-  }
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream stream, String encoding) {
-    try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
-    token_source.ReInit(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
-  }
-
-  /** Constructor. */
-  public SSPTParser(java.io.Reader stream) {
-    jj_input_stream = new SimpleCharStream(stream, 1, 1);
-    token_source = new SSPTParserTokenManager(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.Reader stream) {
-    jj_input_stream.ReInit(stream, 1, 1);
-    token_source.ReInit(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
-  }
-
-  /** Constructor with generated Token Manager. */
-  public SSPTParser(SSPTParserTokenManager tm) {
-    token_source = tm;
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(SSPTParserTokenManager tm) {
-    token_source = tm;
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
-  }
-
-  private Token jj_consume_token(int kind) throws ParseException {
-    Token oldToken;
-    if ((oldToken = token).next != null) token = token.next;
-    else token = token.next = token_source.getNextToken();
-    jj_ntk = -1;
-    if (token.kind == kind) {
-      jj_gen++;
-      return token;
+
+    /** Reinitialise. */
+    public void ReInit(java.io.Reader stream) {
+        jj_input_stream.ReInit(stream, 1, 1);
+        token_source.ReInit(jj_input_stream);
+        token = new Token();
+        jj_ntk = -1;
+        jj_gen = 0;
+        for (int i = 0; i < 12; i++)
+            jj_la1[i] = -1;
     }
-    token = oldToken;
-    jj_kind = kind;
-    throw generateParseException();
-  }
-
-
-/** Get the next Token. */
-  final public Token getNextToken() {
-    if (token.next != null) token = token.next;
-    else token = token.next = token_source.getNextToken();
-    jj_ntk = -1;
-    jj_gen++;
-    return token;
-  }
-
-/** Get the specific Token. */
-  final public Token getToken(int index) {
-    Token t = token;
-    for (int i = 0; i < index; i++) {
-      if (t.next != null) t = t.next;
-      else t = t.next = token_source.getNextToken();
+
+    /** Constructor with generated Token Manager. */
+    public SSPTParser(SSPTParserTokenManager tm) {
+        token_source = tm;
+        token = new Token();
+        jj_ntk = -1;
+        jj_gen = 0;
+        for (int i = 0; i < 12; i++)
+            jj_la1[i] = -1;
+    }
+
+    /** Reinitialise. */
+    public void ReInit(SSPTParserTokenManager tm) {
+        token_source = tm;
+        token = new Token();
+        jj_ntk = -1;
+        jj_gen = 0;
+        for (int i = 0; i < 12; i++)
+            jj_la1[i] = -1;
     }
-    return t;
-  }
-
-  private int jj_ntk() {
-    if ((jj_nt=token.next) == null)
-      return (jj_ntk = (token.next=token_source.getNextToken()).kind);
-    else
-      return (jj_ntk = jj_nt.kind);
-  }
-
-  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
-  private int[] jj_expentry;
-  private int jj_kind = -1;
-
-  /** Generate ParseException. */
-  public ParseException generateParseException() {
-    jj_expentries.clear();
-    boolean[] la1tokens = new boolean[18];
-    if (jj_kind >= 0) {
-      la1tokens[jj_kind] = true;
-      jj_kind = -1;
+
+    private Token jj_consume_token(int kind) throws ParseException {
+        Token oldToken;
+        if ((oldToken = token).next != null)
+            token = token.next;
+        else
+            token = token.next = token_source.getNextToken();
+        jj_ntk = -1;
+        if (token.kind == kind) {
+            jj_gen++;
+            return token;
+        }
+        token = oldToken;
+        jj_kind = kind;
+        throw generateParseException();
+    }
+
+    /** Get the next Token. */
+    final public Token getNextToken() {
+        if (token.next != null)
+            token = token.next;
+        else
+            token = token.next = token_source.getNextToken();
+        jj_ntk = -1;
+        jj_gen++;
+        return token;
     }
-    for (int i = 0; i < 12; i++) {
-      if (jj_la1[i] == jj_gen) {
-        for (int j = 0; j < 32; j++) {
-          if ((jj_la1_0[i] & (1<<j)) != 0) {
-            la1tokens[j] = true;
-          }
+
+    /** Get the specific Token. */
+    final public Token getToken(int index) {
+        Token t = token;
+        for (int i = 0; i < index; i++) {
+            if (t.next != null)
+                t = t.next;
+            else
+                t = t.next = token_source.getNextToken();
         }
-      }
+        return t;
     }
-    for (int i = 0; i < 18; i++) {
-      if (la1tokens[i]) {
-        jj_expentry = new int[1];
-        jj_expentry[0] = i;
-        jj_expentries.add(jj_expentry);
-      }
+
+    private int jj_ntk() {
+        if ((jj_nt = token.next) == null)
+            return (jj_ntk = (token.next = token_source.getNextToken()).kind);
+        else
+            return (jj_ntk = jj_nt.kind);
     }
-    int[][] exptokseq = new int[jj_expentries.size()][];
-    for (int i = 0; i < jj_expentries.size(); i++) {
-      exptokseq[i] = jj_expentries.get(i);
+
+    private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
+    private int[] jj_expentry;
+    private int jj_kind = -1;
+
+    /** Generate ParseException. */
+    public ParseException generateParseException() {
+        jj_expentries.clear();
+        boolean[] la1tokens = new boolean[18];
+        if (jj_kind >= 0) {
+            la1tokens[jj_kind] = true;
+            jj_kind = -1;
+        }
+        for (int i = 0; i < 12; i++) {
+            if (jj_la1[i] == jj_gen) {
+                for (int j = 0; j < 32; j++) {
+                    if ((jj_la1_0[i] & (1 << j)) != 0) {
+                        la1tokens[j] = true;
+                    }
+                }
+            }
+        }
+        for (int i = 0; i < 18; i++) {
+            if (la1tokens[i]) {
+                jj_expentry = new int[1];
+                jj_expentry[0] = i;
+                jj_expentries.add(jj_expentry);
+            }
+        }
+        int[][] exptokseq = new int[jj_expentries.size()][];
+        for (int i = 0; i < jj_expentries.size(); i++) {
+            exptokseq[i] = jj_expentries.get(i);
+        }
+        return new ParseException(token, exptokseq, tokenImage);
     }
-    return new ParseException(token, exptokseq, tokenImage);
-  }
 
-  /** Enable tracing. */
-  final public void enable_tracing() {
-  }
+    /** Enable tracing. */
+    final public void enable_tracing() {
+    }
 
-  /** Disable tracing. */
-  final public void disable_tracing() {
-  }
+    /** Disable tracing. */
+    final public void disable_tracing() {
+    }
 
 }
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
index f48d31d..b3363d9 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
@@ -1,67 +1,65 @@
 /* Generated By:JavaCC: Do not edit this line. SSPTParserConstants.java */
 package org.apache.camel.component.sql.stored.template.generated;
 
-
 /**
- * Token literal values and constants.
- * Generated by org.javacc.parser.OtherFilesGen#start()
+ * Token literal values and constants. Generated by org.javacc.parser.OtherFilesGen#start()
  */
 public interface SSPTParserConstants {
 
-  /** End of File. */
-  int EOF = 0;
-  /** RegularExpression Id. */
-  int SCALE = 4;
-  /** RegularExpression Id. */
-  int NUMBER = 5;
-  /** RegularExpression Id. */
-  int DIGIT = 6;
-  /** RegularExpression Id. */
-  int LETTER = 7;
-  /** RegularExpression Id. */
-  int SPECIAL = 8;
-  /** RegularExpression Id. */
-  int WHITESPACE = 9;
-  /** RegularExpression Id. */
-  int COMMA = 10;
-  /** RegularExpression Id. */
-  int SEPARATOR = 11;
-  /** RegularExpression Id. */
-  int PROCEDURE_BEGIN = 12;
-  /** RegularExpression Id. */
-  int PROCEDURE_END = 13;
-  /** RegularExpression Id. */
-  int SIMPLE_EXP_TOKEN = 14;
-  /** RegularExpression Id. */
-  int PARAMETER_POS_TOKEN = 15;
-  /** RegularExpression Id. */
-  int PARAMETER_NAME = 16;
-  /** RegularExpression Id. */
-  int IDENTIFIER = 17;
+    /** End of File. */
+    int EOF = 0;
+    /** RegularExpression Id. */
+    int SCALE = 4;
+    /** RegularExpression Id. */
+    int NUMBER = 5;
+    /** RegularExpression Id. */
+    int DIGIT = 6;
+    /** RegularExpression Id. */
+    int LETTER = 7;
+    /** RegularExpression Id. */
+    int SPECIAL = 8;
+    /** RegularExpression Id. */
+    int WHITESPACE = 9;
+    /** RegularExpression Id. */
+    int COMMA = 10;
+    /** RegularExpression Id. */
+    int SEPARATOR = 11;
+    /** RegularExpression Id. */
+    int PROCEDURE_BEGIN = 12;
+    /** RegularExpression Id. */
+    int PROCEDURE_END = 13;
+    /** RegularExpression Id. */
+    int SIMPLE_EXP_TOKEN = 14;
+    /** RegularExpression Id. */
+    int PARAMETER_POS_TOKEN = 15;
+    /** RegularExpression Id. */
+    int PARAMETER_NAME = 16;
+    /** RegularExpression Id. */
+    int IDENTIFIER = 17;
 
-  /** Lexical state. */
-  int DEFAULT = 0;
+    /** Lexical state. */
+    int DEFAULT = 0;
 
-  /** Literal token values. */
-  String[] tokenImage = {
-    "<EOF>",
-    "\" \"",
-    "\"OUT \"",
-    "\"INOUT \"",
-    "<SCALE>",
-    "<NUMBER>",
-    "<DIGIT>",
-    "<LETTER>",
-    "<SPECIAL>",
-    "<WHITESPACE>",
-    "\",\"",
-    "<SEPARATOR>",
-    "<PROCEDURE_BEGIN>",
-    "<PROCEDURE_END>",
-    "<SIMPLE_EXP_TOKEN>",
-    "<PARAMETER_POS_TOKEN>",
-    "<PARAMETER_NAME>",
-    "<IDENTIFIER>",
-  };
+    /** Literal token values. */
+    String[] tokenImage = {
+            "<EOF>",
+            "\" \"",
+            "\"OUT \"",
+            "\"INOUT \"",
+            "<SCALE>",
+            "<NUMBER>",
+            "<DIGIT>",
+            "<LETTER>",
+            "<SPECIAL>",
+            "<WHITESPACE>",
+            "\",\"",
+            "<SEPARATOR>",
+            "<PROCEDURE_BEGIN>",
+            "<PROCEDURE_END>",
+            "<SIMPLE_EXP_TOKEN>",
+            "<PARAMETER_POS_TOKEN>",
+            "<PARAMETER_NAME>",
+            "<IDENTIFIER>",
+    };
 
 }
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
index ba002be..db7f99c 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
@@ -1,646 +1,612 @@
 /* Generated By:JavaCC: Do not edit this line. SSPTParserTokenManager.java */
 package org.apache.camel.component.sql.stored.template.generated;
-import java.io.Reader;
-import org.apache.camel.spi.ClassResolver;
+
 import org.apache.camel.component.sql.stored.template.ast.*;
 
 /** Token Manager. */
-public class SSPTParserTokenManager implements SSPTParserConstants
-{
-
-  /** Debug output. */
-  public  java.io.PrintStream debugStream = System.out;
-  /** Set debug output. */
-  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private final int jjStopStringLiteralDfa_0(int pos, long active0)
-{
-   switch (pos)
-   {
-      case 0:
-         if ((active0 & 0xcL) != 0L)
-         {
-            jjmatchedKind = 17;
-            return 15;
-         }
-         if ((active0 & 0x2L) != 0L)
-            return 25;
-         return -1;
-      case 1:
-         if ((active0 & 0xcL) != 0L)
-         {
-            jjmatchedKind = 17;
-            jjmatchedPos = 1;
-            return 15;
-         }
-         return -1;
-      case 2:
-         if ((active0 & 0xcL) != 0L)
-         {
-            jjmatchedKind = 17;
-            jjmatchedPos = 2;
-            return 15;
-         }
-         return -1;
-      case 3:
-         if ((active0 & 0x8L) != 0L)
-         {
-            jjmatchedKind = 17;
-            jjmatchedPos = 3;
-            return 15;
-         }
-         return -1;
-      case 4:
-         if ((active0 & 0x8L) != 0L)
-         {
-            jjmatchedKind = 17;
-            jjmatchedPos = 4;
-            return 15;
-         }
-         return -1;
-      default :
-         return -1;
-   }
-}
-private final int jjStartNfa_0(int pos, long active0)
-{
-   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
-}
-private int jjStopAtPos(int pos, int kind)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   return pos + 1;
-}
-private int jjMoveStringLiteralDfa0_0()
-{
-   switch(curChar)
-   {
-      case 32:
-         return jjStartNfaWithStates_0(0, 1, 25);
-      case 73:
-         return jjMoveStringLiteralDfa1_0(0x8L);
-      case 79:
-         return jjMoveStringLiteralDfa1_0(0x4L);
-      default :
-         return jjMoveNfa_0(8, 0);
-   }
-}
-private int jjMoveStringLiteralDfa1_0(long active0)
-{
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(0, active0);
-      return 1;
-   }
-   switch(curChar)
-   {
-      case 78:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8L);
-      case 85:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4L);
-      default :
-         break;
-   }
-   return jjStartNfa_0(0, active0);
-}
-private int jjMoveStringLiteralDfa2_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(0, old0);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(1, active0);
-      return 2;
-   }
-   switch(curChar)
-   {
-      case 79:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8L);
-      case 84:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4L);
-      default :
-         break;
-   }
-   return jjStartNfa_0(1, active0);
-}
-private int jjMoveStringLiteralDfa3_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(1, old0);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(2, active0);
-      return 3;
-   }
-   switch(curChar)
-   {
-      case 32:
-         if ((active0 & 0x4L) != 0L)
-            return jjStopAtPos(3, 2);
-         break;
-      case 85:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8L);
-      default :
-         break;
-   }
-   return jjStartNfa_0(2, active0);
-}
-private int jjMoveStringLiteralDfa4_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(2, old0);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(3, active0);
-      return 4;
-   }
-   switch(curChar)
-   {
-      case 84:
-         return jjMoveStringLiteralDfa5_0(active0, 0x8L);
-      default :
-         break;
-   }
-   return jjStartNfa_0(3, active0);
-}
-private int jjMoveStringLiteralDfa5_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(3, old0);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(4, active0);
-      return 5;
-   }
-   switch(curChar)
-   {
-      case 32:
-         if ((active0 & 0x8L) != 0L)
-            return jjStopAtPos(5, 3);
-         break;
-      default :
-         break;
-   }
-   return jjStartNfa_0(4, active0);
-}
-private int jjStartNfaWithStates_0(int pos, int kind, int state)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_0(state, pos + 1);
-}
-private int jjMoveNfa_0(int startState, int curPos)
-{
-   int startsAt = 0;
-   jjnewStateCnt = 25;
-   int i = 1;
-   jjstateSet[0] = startState;
-   int kind = 0x7fffffff;
-   for (;;)
-   {
-      if (++jjround == 0x7fffffff)
-         ReInitRounds();
-      if (curChar < 64)
-      {
-         long l = 1L << curChar;
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 8:
-                  if ((0x7ff609c00000000L & l) != 0L)
-                  {
-                     if (kind > 17)
-                        kind = 17;
-                     jjCheckNAdd(15);
-                  }
-                  else if ((0x100002600L & l) != 0L)
-                  {
-                     if (kind > 9)
-                        kind = 9;
-                     jjCheckNAddStates(0, 5);
-                  }
-                  else if (curChar == 40)
-                  {
-                     if (kind > 12)
-                        kind = 12;
-                     jjCheckNAddTwoStates(17, 19);
-                  }
-                  else if (curChar == 41)
-                  {
-                     if (kind > 13)
-                        kind = 13;
-                     jjCheckNAdd(4);
-                  }
-                  else if (curChar == 44)
-                  {
-                     if (kind > 11)
-                        kind = 11;
-                     jjCheckNAdd(2);
-                  }
-                  if ((0x3ff200000000000L & l) != 0L)
-                  {
-                     if (kind > 5)
-                        kind = 5;
-                     jjCheckNAdd(0);
-                  }
-                  else if (curChar == 39)
-                     jjCheckNAdd(13);
-                  else if (curChar == 58)
-                     jjstateSet[jjnewStateCnt++] = 9;
-                  else if (curChar == 36)
-                     jjstateSet[jjnewStateCnt++] = 5;
-                  break;
-               case 25:
-                  if ((0x100002600L & l) != 0L)
-                     jjCheckNAddTwoStates(24, 3);
-                  else if (curChar == 41)
-                  {
-                     if (kind > 13)
-                        kind = 13;
-                     jjCheckNAdd(4);
-                  }
-                  else if (curChar == 40)
-                  {
-                     if (kind > 12)
-                        kind = 12;
-                     jjCheckNAdd(19);
-                  }
-                  else if (curChar == 44)
-                  {
-                     if (kind > 11)
-                        kind = 11;
-                     jjCheckNAdd(2);
-                  }
-                  if ((0x100002600L & l) != 0L)
-                     jjCheckNAddTwoStates(22, 23);
-                  if ((0x100002600L & l) != 0L)
-                     jjCheckNAddTwoStates(21, 1);
-                  break;
-               case 0:
-                  if ((0x3ff200000000000L & l) == 0L)
-                     break;
-                  if (kind > 5)
-                     kind = 5;
-                  jjCheckNAdd(0);
-                  break;
-               case 1:
-                  if (curChar != 44)
-                     break;
-                  kind = 11;
-                  jjCheckNAdd(2);
-                  break;
-               case 2:
-                  if ((0x100002600L & l) == 0L)
-                     break;
-                  if (kind > 11)
-                     kind = 11;
-                  jjCheckNAdd(2);
-                  break;
-               case 3:
-                  if (curChar != 41)
-                     break;
-                  if (kind > 13)
-                     kind = 13;
-                  jjCheckNAdd(4);
-                  break;
-               case 4:
-                  if ((0x100002600L & l) == 0L)
-                     break;
-                  if (kind > 13)
-                     kind = 13;
-                  jjCheckNAdd(4);
-                  break;
-               case 6:
-                  if ((0x7ff609d00000000L & l) != 0L)
-                     jjAddStates(6, 7);
-                  break;
-               case 9:
-                  if (curChar == 35)
-                     jjCheckNAdd(10);
-                  break;
-               case 10:
-                  if ((0x7ff609c00000000L & l) == 0L)
-                     break;
-                  if (kind > 15)
-                     kind = 15;
-                  jjCheckNAdd(10);
-                  break;
-               case 11:
-                  if (curChar == 58)
-                     jjstateSet[jjnewStateCnt++] = 9;
-                  break;
-               case 12:
-                  if (curChar == 39)
-                     jjCheckNAdd(13);
-                  break;
-               case 13:
-                  if ((0x7ff609c00000000L & l) != 0L)
-                     jjCheckNAddTwoStates(13, 14);
-                  break;
-               case 14:
-                  if (curChar == 39 && kind > 16)
-                     kind = 16;
-                  break;
-               case 15:
-                  if ((0x7ff609c00000000L & l) == 0L)
-                     break;
-                  if (kind > 17)
-                     kind = 17;
-                  jjCheckNAdd(15);
-                  break;
-               case 16:
-                  if (curChar != 40)
-                     break;
-                  if (kind > 12)
-                     kind = 12;
-                  jjCheckNAddTwoStates(17, 19);
-                  break;
-               case 17:
-                  if ((0x3ff200000000000L & l) != 0L)
-                     jjCheckNAddTwoStates(17, 18);
-                  break;
-               case 18:
-                  if (curChar == 41 && kind > 4)
-                     kind = 4;
-                  break;
-               case 19:
-                  if ((0x100002600L & l) == 0L)
-                     break;
-                  if (kind > 12)
-                     kind = 12;
-                  jjCheckNAdd(19);
-                  break;
-               case 20:
-                  if ((0x100002600L & l) == 0L)
-                     break;
-                  if (kind > 9)
-                     kind = 9;
-                  jjCheckNAddStates(0, 5);
-                  break;
-               case 21:
-                  if ((0x100002600L & l) != 0L)
-                     jjCheckNAddTwoStates(21, 1);
-                  break;
-               case 22:
-                  if ((0x100002600L & l) != 0L)
-                     jjCheckNAddTwoStates(22, 23);
-                  break;
-               case 23:
-                  if (curChar != 40)
-                     break;
-                  if (kind > 12)
-                     kind = 12;
-                  jjCheckNAdd(19);
-                  break;
-               case 24:
-                  if ((0x100002600L & l) != 0L)
-                     jjCheckNAddTwoStates(24, 3);
-                  break;
-               default : break;
+public class SSPTParserTokenManager implements SSPTParserConstants {
+
+    /** Debug output. */
+    public java.io.PrintStream debugStream = System.out;
+
+    /** Set debug output. */
+    public void setDebugStream(java.io.PrintStream ds) {
+        debugStream = ds;
+    }
+
+    private final int jjStopStringLiteralDfa_0(int pos, long active0) {
+        switch (pos) {
+            case 0:
+                if ((active0 & 0xcL) != 0L) {
+                    jjmatchedKind = 17;
+                    return 15;
+                }
+                if ((active0 & 0x2L) != 0L)
+                    return 25;
+                return -1;
+            case 1:
+                if ((active0 & 0xcL) != 0L) {
+                    jjmatchedKind = 17;
+                    jjmatchedPos = 1;
+                    return 15;
+                }
+                return -1;
+            case 2:
+                if ((active0 & 0xcL) != 0L) {
+                    jjmatchedKind = 17;
+                    jjmatchedPos = 2;
+                    return 15;
+                }
+                return -1;
+            case 3:
+                if ((active0 & 0x8L) != 0L) {
+                    jjmatchedKind = 17;
+                    jjmatchedPos = 3;
+                    return 15;
+                }
+                return -1;
+            case 4:
+                if ((active0 & 0x8L) != 0L) {
+                    jjmatchedKind = 17;
+                    jjmatchedPos = 4;
+                    return 15;
+                }
+                return -1;
+            default:
+                return -1;
+        }
+    }
+
+    private final int jjStartNfa_0(int pos, long active0) {
+        return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
+    }
+
+    private int jjStopAtPos(int pos, int kind) {
+        jjmatchedKind = kind;
+        jjmatchedPos = pos;
+        return pos + 1;
+    }
+
+    private int jjMoveStringLiteralDfa0_0() {
+        switch (curChar) {
+            case 32:
+                return jjStartNfaWithStates_0(0, 1, 25);
+            case 73:
+                return jjMoveStringLiteralDfa1_0(0x8L);
+            case 79:
+                return jjMoveStringLiteralDfa1_0(0x4L);
+            default:
+                return jjMoveNfa_0(8, 0);
+        }
+    }
+
+    private int jjMoveStringLiteralDfa1_0(long active0) {
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            jjStopStringLiteralDfa_0(0, active0);
+            return 1;
+        }
+        switch (curChar) {
+            case 78:
+                return jjMoveStringLiteralDfa2_0(active0, 0x8L);
+            case 85:
+                return jjMoveStringLiteralDfa2_0(active0, 0x4L);
+            default:
+                break;
+        }
+        return jjStartNfa_0(0, active0);
+    }
+
+    private int jjMoveStringLiteralDfa2_0(long old0, long active0) {
+        if (((active0 &= old0)) == 0L)
+            return jjStartNfa_0(0, old0);
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            jjStopStringLiteralDfa_0(1, active0);
+            return 2;
+        }
+        switch (curChar) {
+            case 79:
+                return jjMoveStringLiteralDfa3_0(active0, 0x8L);
+            case 84:
+                return jjMoveStringLiteralDfa3_0(active0, 0x4L);
+            default:
+                break;
+        }
+        return jjStartNfa_0(1, active0);
+    }
+
+    private int jjMoveStringLiteralDfa3_0(long old0, long active0) {
+        if (((active0 &= old0)) == 0L)
+            return jjStartNfa_0(1, old0);
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            jjStopStringLiteralDfa_0(2, active0);
+            return 3;
+        }
+        switch (curChar) {
+            case 32:
+                if ((active0 & 0x4L) != 0L)
+                    return jjStopAtPos(3, 2);
+                break;
+            case 85:
+                return jjMoveStringLiteralDfa4_0(active0, 0x8L);
+            default:
+                break;
+        }
+        return jjStartNfa_0(2, active0);
+    }
+
+    private int jjMoveStringLiteralDfa4_0(long old0, long active0) {
+        if (((active0 &= old0)) == 0L)
+            return jjStartNfa_0(2, old0);
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            jjStopStringLiteralDfa_0(3, active0);
+            return 4;
+        }
+        switch (curChar) {
+            case 84:
+                return jjMoveStringLiteralDfa5_0(active0, 0x8L);
+            default:
+                break;
+        }
+        return jjStartNfa_0(3, active0);
+    }
+
+    private int jjMoveStringLiteralDfa5_0(long old0, long active0) {
+        if (((active0 &= old0)) == 0L)
+            return jjStartNfa_0(3, old0);
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            jjStopStringLiteralDfa_0(4, active0);
+            return 5;
+        }
+        switch (curChar) {
+            case 32:
+                if ((active0 & 0x8L) != 0L)
+                    return jjStopAtPos(5, 3);
+                break;
+            default:
+                break;
+        }
+        return jjStartNfa_0(4, active0);
+    }
+
+    private int jjStartNfaWithStates_0(int pos, int kind, int state) {
+        jjmatchedKind = kind;
+        jjmatchedPos = pos;
+        try {
+            curChar = input_stream.readChar();
+        } catch (java.io.IOException e) {
+            return pos + 1;
+        }
+        return jjMoveNfa_0(state, pos + 1);
+    }
+
+    private int jjMoveNfa_0(int startState, int curPos) {
+        int startsAt = 0;
+        jjnewStateCnt = 25;
+        int i = 1;
+        jjstateSet[0] = startState;
+        int kind = 0x7fffffff;
+        for (;;) {
+            if (++jjround == 0x7fffffff)
+                ReInitRounds();
+            if (curChar < 64) {
+                long l = 1L << curChar;
+                do {
+                    switch (jjstateSet[--i]) {
+                        case 8:
+                            if ((0x7ff609c00000000L & l) != 0L) {
+                                if (kind > 17)
+                                    kind = 17;
+                                jjCheckNAdd(15);
+                            } else if ((0x100002600L & l) != 0L) {
+                                if (kind > 9)
+                                    kind = 9;
+                                jjCheckNAddStates(0, 5);
+                            } else if (curChar == 40) {
+                                if (kind > 12)
+                                    kind = 12;
+                                jjCheckNAddTwoStates(17, 19);
+                            } else if (curChar == 41) {
+                                if (kind > 13)
+                                    kind = 13;
+                                jjCheckNAdd(4);
+                            } else if (curChar == 44) {
+                                if (kind > 11)
+                                    kind = 11;
+                                jjCheckNAdd(2);
+                            }
+                            if ((0x3ff200000000000L & l) != 0L) {
+                                if (kind > 5)
+                                    kind = 5;
+                                jjCheckNAdd(0);
+                            } else if (curChar == 39)
+                                jjCheckNAdd(13);
+                            else if (curChar == 58)
+                                jjstateSet[jjnewStateCnt++] = 9;
+                            else if (curChar == 36)
+                                jjstateSet[jjnewStateCnt++] = 5;
+                            break;
+                        case 25:
+                            if ((0x100002600L & l) != 0L)
+                                jjCheckNAddTwoStates(24, 3);
+                            else if (curChar == 41) {
+                                if (kind > 13)
+                                    kind = 13;
+                                jjCheckNAdd(4);
+                            } else if (curChar == 40) {
+                                if (kind > 12)
+                                    kind = 12;
+                                jjCheckNAdd(19);
+                            } else if (curChar == 44) {
+                                if (kind > 11)
+                                    kind = 11;
+                                jjCheckNAdd(2);
+                            }
+                            if ((0x100002600L & l) != 0L)
+                                jjCheckNAddTwoStates(22, 23);
+                            if ((0x100002600L & l) != 0L)
+                                jjCheckNAddTwoStates(21, 1);
+                            break;
+                        case 0:
+                            if ((0x3ff200000000000L & l) == 0L)
+                                break;
+                            if (kind > 5)
+                                kind = 5;
+                            jjCheckNAdd(0);
+                            break;
+                        case 1:
+                            if (curChar != 44)
+                                break;
+                            kind = 11;
+                            jjCheckNAdd(2);
+                            break;
+                        case 2:
+                            if ((0x100002600L & l) == 0L)
+                                break;
+                            if (kind > 11)
+                                kind = 11;
+                            jjCheckNAdd(2);
+                            break;
+                        case 3:
+                            if (curChar != 41)
+                                break;
+                            if (kind > 13)
+                                kind = 13;
+                            jjCheckNAdd(4);
+                            break;
+                        case 4:
+                            if ((0x100002600L & l) == 0L)
+                                break;
+                            if (kind > 13)
+                                kind = 13;
+                            jjCheckNAdd(4);
+                            break;
+                        case 6:
+                            if ((0x7ff609d00000000L & l) != 0L)
+                                jjAddStates(6, 7);
+                            break;
+                        case 9:
+                            if (curChar == 35)
+                                jjCheckNAdd(10);
+                            break;
+                        case 10:
+                            if ((0x7ff609c00000000L & l) == 0L)
+                                break;
+                            if (kind > 15)
+                                kind = 15;
+                            jjCheckNAdd(10);
+                            break;
+                        case 11:
+                            if (curChar == 58)
+                                jjstateSet[jjnewStateCnt++] = 9;
+                            break;
+                        case 12:
+                            if (curChar == 39)
+                                jjCheckNAdd(13);
+                            break;
+                        case 13:
+                            if ((0x7ff609c00000000L & l) != 0L)
+                                jjCheckNAddTwoStates(13, 14);
+                            break;
+                        case 14:
+                            if (curChar == 39 && kind > 16)
+                                kind = 16;
+                            break;
+                        case 15:
+                            if ((0x7ff609c00000000L & l) == 0L)
+                                break;
+                            if (kind > 17)
+                                kind = 17;
+                            jjCheckNAdd(15);
+                            break;
+                        case 16:
+                            if (curChar != 40)
+                                break;
+                            if (kind > 12)
+                                kind = 12;
+                            jjCheckNAddTwoStates(17, 19);
+                            break;
+                        case 17:
+                            if ((0x3ff200000000000L & l) != 0L)
+                                jjCheckNAddTwoStates(17, 18);
+                            break;
+                        case 18:
+                            if (curChar == 41 && kind > 4)
+                                kind = 4;
+                            break;
+                        case 19:
+                            if ((0x100002600L & l) == 0L)
+                                break;
+                            if (kind > 12)
+                                kind = 12;
+                            jjCheckNAdd(19);
+                            break;
+                        case 20:
+                            if ((0x100002600L & l) == 0L)
+                                break;
+                            if (kind > 9)
+                                kind = 9;
+                            jjCheckNAddStates(0, 5);
+                            break;
+                        case 21:
+                            if ((0x100002600L & l) != 0L)
+                                jjCheckNAddTwoStates(21, 1);
+                            break;
+                        case 22:
+                            if ((0x100002600L & l) != 0L)
+                                jjCheckNAddTwoStates(22, 23);
+                            break;
+                        case 23:
+                            if (curChar != 40)
+                                break;
+                            if (kind > 12)
+                                kind = 12;
+                            jjCheckNAdd(19);
+                            break;
+                        case 24:
+                            if ((0x100002600L & l) != 0L)
+                                jjCheckNAddTwoStates(24, 3);
+                            break;
+                        default:
+                            break;
+                    }
+                } while (i != startsAt);
+            } else if (curChar < 128) {
+                long l = 1L << (curChar & 077);
+                do {
+                    switch (jjstateSet[--i]) {
+                        case 8:
+                        case 15:
+                            if ((0x2ffffffeaffffffeL & l) == 0L)
+                                break;
+                            if (kind > 17)
+                                kind = 17;
+                            jjCheckNAdd(15);
+                            break;
+                        case 5:
+                            if (curChar == 123)
+                                jjCheckNAdd(6);
+                            break;
+                        case 6:
+                            if ((0x2ffffffeaffffffeL & l) != 0L)
+                                jjCheckNAddTwoStates(6, 7);
+                            break;
+                        case 7:
+                            if (curChar == 125 && kind > 14)
+                                kind = 14;
+                            break;
+                        case 10:
+                            if ((0x2ffffffeaffffffeL & l) == 0L)
+                                break;
+                            if (kind > 15)
+                                kind = 15;
+                            jjstateSet[jjnewStateCnt++] = 10;
+                            break;
+                        case 13:
+                            if ((0x2ffffffeaffffffeL & l) != 0L)
+                                jjAddStates(8, 9);
+                            break;
+                        default:
+                            break;
+                    }
+                } while (i != startsAt);
+            } else {
+                int i2 = (curChar & 0xff) >> 6;
+                long l2 = 1L << (curChar & 077);
+                do {
+                    switch (jjstateSet[--i]) {
+                        default:
+                            break;
+                    }
+                } while (i != startsAt);
             }
-         } while(i != startsAt);
-      }
-      else if (curChar < 128)
-      {
-         long l = 1L << (curChar & 077);
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 8:
-               case 15:
-                  if ((0x2ffffffeaffffffeL & l) == 0L)
-                     break;
-                  if (kind > 17)
-                     kind = 17;
-                  jjCheckNAdd(15);
-                  break;
-               case 5:
-                  if (curChar == 123)
-                     jjCheckNAdd(6);
-                  break;
-               case 6:
-                  if ((0x2ffffffeaffffffeL & l) != 0L)
-                     jjCheckNAddTwoStates(6, 7);
-                  break;
-               case 7:
-                  if (curChar == 125 && kind > 14)
-                     kind = 14;
-                  break;
-               case 10:
-                  if ((0x2ffffffeaffffffeL & l) == 0L)
-                     break;
-                  if (kind > 15)
-                     kind = 15;
-                  jjstateSet[jjnewStateCnt++] = 10;
-                  break;
-               case 13:
-                  if ((0x2ffffffeaffffffeL & l) != 0L)
-                     jjAddStates(8, 9);
-                  break;
-               default : break;
+            if (kind != 0x7fffffff) {
+                jjmatchedKind = kind;
+                jjmatchedPos = curPos;
+                kind = 0x7fffffff;
             }
-         } while(i != startsAt);
-      }
-      else
-      {
-         int i2 = (curChar & 0xff) >> 6;
-         long l2 = 1L << (curChar & 077);
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               default : break;
+            ++curPos;
+            if ((i = jjnewStateCnt) == (startsAt = 25 - (jjnewStateCnt = startsAt)))
+                return curPos;
+            try {
+                curChar = input_stream.readChar();
+            } catch (java.io.IOException e) {
+                return curPos;
             }
-         } while(i != startsAt);
-      }
-      if (kind != 0x7fffffff)
-      {
-         jjmatchedKind = kind;
-         jjmatchedPos = curPos;
-         kind = 0x7fffffff;
-      }
-      ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 25 - (jjnewStateCnt = startsAt)))
-         return curPos;
-      try { curChar = input_stream.readChar(); }
-      catch(java.io.IOException e) { return curPos; }
-   }
-}
-static final int[] jjnextStates = {
-   21, 1, 22, 23, 24, 3, 6, 7, 13, 14, 
-};
-
-/** Token literal values. */
-public static final String[] jjstrLiteralImages = {
-"", "\40", "\117\125\124\40", "\111\116\117\125\124\40", null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, };
-
-/** Lexer state names. */
-public static final String[] lexStateNames = {
-   "DEFAULT",
-};
-protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[25];
-private final int[] jjstateSet = new int[50];
-protected char curChar;
-/** Constructor. */
-public SSPTParserTokenManager(SimpleCharStream stream){
-   if (SimpleCharStream.staticFlag)
-      throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
-   input_stream = stream;
-}
+        }
+    }
 
-/** Constructor. */
-public SSPTParserTokenManager(SimpleCharStream stream, int lexState){
-   this(stream);
-   SwitchTo(lexState);
-}
+    static final int[] jjnextStates = {
+            21, 1, 22, 23, 24, 3, 6, 7, 13, 14,
+    };
 
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream)
-{
-   jjmatchedPos = jjnewStateCnt = 0;
-   curLexState = defaultLexState;
-   input_stream = stream;
-   ReInitRounds();
-}
-private void ReInitRounds()
-{
-   int i;
-   jjround = 0x80000001;
-   for (i = 25; i-- > 0;)
-      jjrounds[i] = 0x80000000;
-}
+    /** Token literal values. */
+    public static final String[] jjstrLiteralImages = {
+            "", "\40", "\117\125\124\40", "\111\116\117\125\124\40", null, null, null,
+            null, null, null, null, null, null, null, null, null, null, null, };
 
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream, int lexState)
-{
-   ReInit(stream);
-   SwitchTo(lexState);
-}
+    /** Lexer state names. */
+    public static final String[] lexStateNames = {
+            "DEFAULT",
+    };
+    protected SimpleCharStream input_stream;
+    private final int[] jjrounds = new int[25];
+    private final int[] jjstateSet = new int[50];
+    protected char curChar;
 
-/** Switch to specified lex state. */
-public void SwitchTo(int lexState)
-{
-   if (lexState >= 1 || lexState < 0)
-      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-   else
-      curLexState = lexState;
-}
+    /** Constructor. */
+    public SSPTParserTokenManager(SimpleCharStream stream) {
+        if (SimpleCharStream.staticFlag)
+            throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+        input_stream = stream;
+    }
 
-protected Token jjFillToken()
-{
-   final Token t;
-   final String curTokenImage;
-   final int beginLine;
-   final int endLine;
-   final int beginColumn;
-   final int endColumn;
-   String im = jjstrLiteralImages[jjmatchedKind];
-   curTokenImage = (im == null) ? input_stream.GetImage() : im;
-   beginLine = input_stream.getBeginLine();
-   beginColumn = input_stream.getBeginColumn();
-   endLine = input_stream.getEndLine();
-   endColumn = input_stream.getEndColumn();
-   t = Token.newToken(jjmatchedKind, curTokenImage);
-
-   t.beginLine = beginLine;
-   t.endLine = endLine;
-   t.beginColumn = beginColumn;
-   t.endColumn = endColumn;
-
-   return t;
-}
+    /** Constructor. */
+    public SSPTParserTokenManager(SimpleCharStream stream, int lexState) {
+        this(stream);
+        SwitchTo(lexState);
+    }
 
-int curLexState = 0;
-int defaultLexState = 0;
-int jjnewStateCnt;
-int jjround;
-int jjmatchedPos;
-int jjmatchedKind;
-
-/** Get the next Token. */
-public Token getNextToken() 
-{
-  Token matchedToken;
-  int curPos = 0;
-
-  EOFLoop :
-  for (;;)
-  {
-   try
-   {
-      curChar = input_stream.BeginToken();
-   }
-   catch(java.io.IOException e)
-   {
-      jjmatchedKind = 0;
-      matchedToken = jjFillToken();
-      return matchedToken;
-   }
-
-   jjmatchedKind = 0x7fffffff;
-   jjmatchedPos = 0;
-   curPos = jjMoveStringLiteralDfa0_0();
-   if (jjmatchedKind != 0x7fffffff)
-   {
-      if (jjmatchedPos + 1 < curPos)
-         input_stream.backup(curPos - jjmatchedPos - 1);
-         matchedToken = jjFillToken();
-         return matchedToken;
-   }
-   int error_line = input_stream.getEndLine();
-   int error_column = input_stream.getEndColumn();
-   String error_after = null;
-   boolean EOFSeen = false;
-   try { input_stream.readChar(); input_stream.backup(1); }
-   catch (java.io.IOException e1) {
-      EOFSeen = true;
-      error_after = curPos <= 1 ? "" : input_stream.GetImage();
-      if (curChar == '\n' || curChar == '\r') {
-         error_line++;
-         error_column = 0;
-      }
-      else
-         error_column++;
-   }
-   if (!EOFSeen) {
-      input_stream.backup(1);
-      error_after = curPos <= 1 ? "" : input_stream.GetImage();
-   }
-   throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
-  }
-}
+    /** Reinitialise parser. */
+    public void ReInit(SimpleCharStream stream) {
+        jjmatchedPos = jjnewStateCnt = 0;
+        curLexState = defaultLexState;
+        input_stream = stream;
+        ReInitRounds();
+    }
 
-private void jjCheckNAdd(int state)
-{
-   if (jjrounds[state] != jjround)
-   {
-      jjstateSet[jjnewStateCnt++] = state;
-      jjrounds[state] = jjround;
-   }
-}
-private void jjAddStates(int start, int end)
-{
-   do {
-      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
-   } while (start++ != end);
-}
-private void jjCheckNAddTwoStates(int state1, int state2)
-{
-   jjCheckNAdd(state1);
-   jjCheckNAdd(state2);
-}
+    private void ReInitRounds() {
+        int i;
+        jjround = 0x80000001;
+        for (i = 25; i-- > 0;)
+            jjrounds[i] = 0x80000000;
+    }
 
-private void jjCheckNAddStates(int start, int end)
-{
-   do {
-      jjCheckNAdd(jjnextStates[start]);
-   } while (start++ != end);
-}
+    /** Reinitialise parser. */
+    public void ReInit(SimpleCharStream stream, int lexState) {
+        ReInit(stream);
+        SwitchTo(lexState);
+    }
+
+    /** Switch to specified lex state. */
+    public void SwitchTo(int lexState) {
+        if (lexState >= 1 || lexState < 0)
+            throw new TokenMgrError(
+                    "Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.",
+                    TokenMgrError.INVALID_LEXICAL_STATE);
+        else
+            curLexState = lexState;
+    }
+
+    protected Token jjFillToken() {
+        final Token t;
+        final String curTokenImage;
+        final int beginLine;
+        final int endLine;
+        final int beginColumn;
+        final int endColumn;
+        String im = jjstrLiteralImages[jjmatchedKind];
+        curTokenImage = (im == null) ? input_stream.GetImage() : im;
+        beginLine = input_stream.getBeginLine();
+        beginColumn = input_stream.getBeginColumn();
+        endLine = input_stream.getEndLine();
+        endColumn = input_stream.getEndColumn();
+        t = Token.newToken(jjmatchedKind, curTokenImage);
+
+        t.beginLine = beginLine;
+        t.endLine = endLine;
+        t.beginColumn = beginColumn;
+        t.endColumn = endColumn;
+
+        return t;
+    }
+
+    int curLexState = 0;
+    int defaultLexState = 0;
+    int jjnewStateCnt;
+    int jjround;
+    int jjmatchedPos;
+    int jjmatchedKind;
+
+    /** Get the next Token. */
+    public Token getNextToken() {
+        Token matchedToken;
+        int curPos = 0;
+
+        EOFLoop: for (;;) {
+            try {
+                curChar = input_stream.BeginToken();
+            } catch (java.io.IOException e) {
+                jjmatchedKind = 0;
+                matchedToken = jjFillToken();
+                return matchedToken;
+            }
+
+            jjmatchedKind = 0x7fffffff;
+            jjmatchedPos = 0;
+            curPos = jjMoveStringLiteralDfa0_0();
+            if (jjmatchedKind != 0x7fffffff) {
+                if (jjmatchedPos + 1 < curPos)
+                    input_stream.backup(curPos - jjmatchedPos - 1);
+                matchedToken = jjFillToken();
+                return matchedToken;
+            }
+            int error_line = input_stream.getEndLine();
+            int error_column = input_stream.getEndColumn();
+            String error_after = null;
+            boolean EOFSeen = false;
+            try {
+                input_stream.readChar();
+                input_stream.backup(1);
+            } catch (java.io.IOException e1) {
+                EOFSeen = true;
+                error_after = curPos <= 1 ? "" : input_stream.GetImage();
+                if (curChar == '\n' || curChar == '\r') {
+                    error_line++;
+                    error_column = 0;
+                } else
+                    error_column++;
+            }
+            if (!EOFSeen) {
+                input_stream.backup(1);
+                error_after = curPos <= 1 ? "" : input_stream.GetImage();
+            }
+            throw new TokenMgrError(
+                    EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
+        }
+    }
+
+    private void jjCheckNAdd(int state) {
+        if (jjrounds[state] != jjround) {
+            jjstateSet[jjnewStateCnt++] = state;
+            jjrounds[state] = jjround;
+        }
+    }
+
+    private void jjAddStates(int start, int end) {
+        do {
+            jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+        } while (start++ != end);
+    }
+
+    private void jjCheckNAddTwoStates(int state1, int state2) {
+        jjCheckNAdd(state1);
+        jjCheckNAdd(state2);
+    }
+
+    private void jjCheckNAddStates(int start, int end) {
+        do {
+            jjCheckNAdd(jjnextStates[start]);
+        } while (start++ != end);
+    }
 
 }

[camel] 01/04: Moving from master branch to main branch

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

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

commit d5061f4864a1408fcbd594148fac9365cf749673
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 09:08:25 2021 +0200

    Moving from master branch to main branch
---
 .../modules/eips/pages/content-based-router-eip.adoc |  2 +-
 .../docs/modules/eips/pages/content-enricher.adoc    |  8 ++++----
 .../docs/modules/eips/pages/content-filter-eip.adoc  |  4 ++--
 .../docs/modules/eips/pages/polling-consumer.adoc    | 20 ++++++++++----------
 .../main/docs/modules/eips/pages/return-address.adoc |  2 +-
 .../main/docs/modules/eips/pages/rollback-eip.adoc   | 16 ++++++++--------
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-based-router-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-based-router-eip.adoc
index a6ff7e0..ae6ffb0 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-based-router-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-based-router-eip.adoc
@@ -66,7 +66,7 @@ problems with the Java DSL, accepting using `when` or `otherwise`.
 ----
 
 For further examples of this pattern in use you could look at the
-https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java[junit test case].
+https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java[junit test case].
 
 [[ContentBasedRouter-UsingThisPattern]]
 == Using This Pattern
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc
index 2a483b2..10be36a 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-enricher.adoc
@@ -78,8 +78,8 @@ from("activemq:My.Queue")
 For further examples of this pattern in use you could look at one of the
 JUnit tests
 
-* https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java[TransformTest]
-* https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java[TransformViaDSLTest]
+* https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java[TransformTest]
+* https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java[TransformViaDSLTest]
 
 *Using Spring XML*
 
@@ -164,7 +164,7 @@ dynamic language that can compute the uri dynamically using values from
 the current  xref:latest@manual:ROOT:exchange.adoc[Exchange].
 
 |`strategyRef` |  |Refers to an
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java[AggregationStrategy]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java[AggregationStrategy]
 to be used to merge the reply from the external service, into a single
 outgoing message. By default Camel will use the reply from the external
 service as outgoing message. From *Camel 2.12* onwards you can also use
@@ -377,7 +377,7 @@ dynamic language that can compute the uri dynamically using values from
 the current xref:latest@manual:ROOT:exchange.adoc[Exchange].
 
 |`strategyRef` |  |Refers to an
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java[AggregationStrategy]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java[AggregationStrategy]
 to be used to merge the reply from the external service, into a single
 outgoing message. By default Camel will use the reply from the external
 service as outgoing message. From *Camel 2.12* onwards you can also use
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-filter-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-filter-eip.adoc
index eccdbcc..89a23d9 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/content-filter-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/content-filter-eip.adoc
@@ -27,8 +27,8 @@ In this example we add our own xref:latest@manual:ROOT:processor.adoc[Processor]
 For further examples of this pattern in use you could look at one of the
 JUnit tests
 
-* https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java[TransformTest]
-* https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java[TransformViaDSLTest]
+* https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java[TransformTest]
+* https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java[TransformViaDSLTest]
 
 == Using Spring XML
 
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc
index b43c5a9..8522266 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc
@@ -5,9 +5,9 @@ Camel supports implementing the
 http://www.enterpriseintegrationpatterns.com/PollingConsumer.html[Polling
 Consumer] from the xref:enterprise-integration-patterns.adoc[EIP
 patterns] using the
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
 interface which can be created via the
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/Endpoint.java[Endpoint.createPollingConsumer()]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/Endpoint.java[Endpoint.createPollingConsumer()]
 method.
 
 image::eip/PollingConsumerSolution.gif[image]
@@ -24,21 +24,21 @@ Exchange exchange = consumer.receive();
 The *`ConsumerTemplate`* (discussed below) is also available.
 
 There are three main polling methods on
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
 
 [width="100%",cols="50%,50%",options="header",]
 |=======================================================================
 |Method name |Description
-|https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receive()]
+|https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receive()]
 |Waits until a message is available and then returns it; potentially
 blocking forever
 
-|https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receive(long)]
+|https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receive(long)]
 |Attempts to receive a message exchange, waiting up to the given timeout
 and returning null if no message exchange could be received within the
 time available
 
-|https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receiveNoWait()]
+|https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receiveNoWait()]
 |Attempts to receive a message exchange immediately without waiting and
 returning null if a message exchange is not available yet
 |=======================================================================
@@ -163,16 +163,16 @@ scheduled poll is used to monitor some kind of state or resource and
 then fire message exchanges.
 
 Since this a such a common pattern, polling components can extend the
-https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
+https://github.com/apache/camel/blob/main/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
 base class which makes it simpler to implement this pattern. There is
 also the xref:components::quartz-component.adoc[Quartz Component] which provides scheduled
 delivery of messages using the Quartz enterprise scheduler.
 
 For more details see:
 
-* https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
+* https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
 * Scheduled Polling Components
-** https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
+** https://github.com/apache/camel/blob/main/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
 ** xref:components::scheduler-component.adoc[Scheduler]
 ** xref:components::atom-component.adoc[Atom]
 ** xref:components::beanstalk-component.adoc[Beanstalk]
@@ -316,7 +316,7 @@ kicking-in.
 [[PollingConsumer-AboutErrorHandlingandScheduledPollingConsumers]]
 === About Error Handling and Scheduled Polling Consumers
 
-https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
+https://github.com/apache/camel/blob/main/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
 is scheduled based and its *`run`* method is invoked periodically based
 on schedule settings. But errors can also occur when a poll is being
 executed. For instance if Camel should poll a file network, and this
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/return-address.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/return-address.adoc
index 45ee442..fa35d98 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/return-address.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/return-address.adoc
@@ -53,6 +53,6 @@ from("activemq:queue:bar?disableReplyTo=true").to("mock:bar");
 ----
 
 For a complete example of this pattern, see this
-https://github.com/apache/camel/blob/master/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToAsHeaderTest.java[junit
+https://github.com/apache/camel/blob/main/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToAsHeaderTest.java[junit
 test case]
 
diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/rollback-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/rollback-eip.adoc
index 28fa95d..dd54a8a 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/rollback-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/rollback-eip.adoc
@@ -146,7 +146,7 @@ And then refer to "required" from the route:
 In this sample we want to ensure that two endpoints is under transaction
 control. These two endpoints inserts data into a database. +
 The sample is in its full as a
-https://github.com/apache/camel/blob/master/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java[unit
+https://github.com/apache/camel/blob/main/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java[unit
 test].
 
 First of all we setup the usual spring stuff in its configuration file.
@@ -162,12 +162,12 @@ configure a transaction policy bean, so we do not have any
 `PROPAGATION_REQUIRED` beans. All the beans needed to be configured is
 *standard* Spring beans only, eg. there are no Camel specific
 configuration at
-all.https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml[springTransactionalClientDataSourceMinimalConfiguration]Then
+all.https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml[springTransactionalClientDataSourceMinimalConfiguration]Then
 we are ready to define our Camel routes. We have two routes: 1 for
 success conditions, and 1 for a forced rollback condition. +
 This is after all based on a unit test. Notice that we mark each route
 as transacted using the *transacted*
-tag.https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml[springTransactionalClientDataSourceMinimalConfiguration]That
+tag.https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml[springTransactionalClientDataSourceMinimalConfiguration]That
 is all that is needed to configure a Camel route as being transacted.
 Just remember to use the *transacted* DSL. The rest is standard Spring
 XML to setup the transaction manager.
@@ -176,15 +176,15 @@ XML to setup the transaction manager.
 
 In this sample we want to listen for messages on a queue and process the
 messages with our business logic java code and send them along. Since
-its based on a https://github.com/apache/camel/blob/master/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.java[TransactionMinimalConfigurationTest.java] the destination is a mock endpoint.
+its based on a https://github.com/apache/camel/blob/main/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.java[TransactionMinimalConfigurationTest.java] the destination is a mock endpoint.
 
 First we configure the standard Spring XML to declare a JMS connection
 factory, a JMS transaction manager and our ActiveMQ component that we
 use in our
-routing.https://github.com/apache/camel/blob/master/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml[TransactionMinimalConfigurationTest.xml]And
+routing.https://github.com/apache/camel/blob/main/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml[TransactionMinimalConfigurationTest.xml]And
 then we configure our routes. Notice that all we have to do is mark the
 route as transacted using the *transacted*
-tag.https://github.com/apache/camel/blob/master/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml[TransactionMinimalConfigurationTest.xml]
+tag.https://github.com/apache/camel/blob/main/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml[TransactionMinimalConfigurationTest.xml]
 
 Transaction error handler
 
@@ -233,10 +233,10 @@ propagation behaviors for that where you configure it as follows:
 * The second route use `PROPAGATION_REQUIRES_NEW`
 
 This is configured in the Spring XML
-file.https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml[MixedTransactionPropagationTest.xml]Then
+file.https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml[MixedTransactionPropagationTest.xml]Then
 in the routes you use transacted DSL to indicate which of these two
 propagations it
-uses.https://github.com/apache/camel/blob/master/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java[MixedTransactionPropagationTest.java]Notice
+uses.https://github.com/apache/camel/blob/main/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java[MixedTransactionPropagationTest.java]Notice
 how we have configured the `onException` in the 2nd route to indicate in
 case of any exceptions we should handle it and just rollback this
 transaction. This is done using the `markRollbackOnlyLast` which tells

[camel] 03/04: Regen

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

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

commit 7668106554bf180240de929cc89719528e843b68
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Apr 21 09:19:12 2021 +0200

    Regen
---
 .../apache/camel/catalog/docs/apns-component.adoc  |    2 +-
 .../camel/catalog/docs/aws2-lambda-component.adoc  |    2 +-
 .../apache/camel/catalog/docs/bean-language.adoc   |    4 +-
 .../catalog/docs/bean-validator-component.adoc     |    2 +-
 .../catalog/docs/content-based-router-eip.adoc     |    2 +-
 .../camel/catalog/docs/content-enricher.adoc       |    8 +-
 .../camel/catalog/docs/content-filter-eip.adoc     |    4 +-
 .../apache/camel/catalog/docs/cxf-component.adoc   |    2 +-
 .../apache/camel/catalog/docs/cxfrs-component.adoc |    4 +-
 .../apache/camel/catalog/docs/http-component.adoc  |    2 +-
 .../apache/camel/catalog/docs/msv-component.adoc   |    2 +-
 .../apache/camel/catalog/docs/pgp-dataformat.adoc  |   10 +-
 .../camel/catalog/docs/polling-consumer.adoc       |   20 +-
 .../apache/camel/catalog/docs/return-address.adoc  |    2 +-
 .../apache/camel/catalog/docs/rollback-eip.adoc    |   16 +-
 .../camel/catalog/docs/servlet-component.adoc      |   10 +-
 .../camel/catalog/docs/validator-component.adoc    |    2 +-
 .../catalog/docs/xmlsecurity-sign-component.adoc   |   10 +-
 .../catalog/docs/xmlsecurity-verify-component.adoc |   10 +-
 .../apache/camel/catalog/docs/xpath-language.adoc  |    4 +-
 .../apache/camel/catalog/schemas/camel-spring.xsd  |  502 +++++++-
 .../sql/stored/template/generated/SSPTParser.java  |  833 +++++++------
 .../template/generated/SSPTParserConstants.java    |  110 +-
 .../template/generated/SSPTParserTokenManager.java | 1222 ++++++++++----------
 .../modules/ROOT/pages/apns-component.adoc         |    2 +-
 .../modules/ROOT/pages/aws2-lambda-component.adoc  |    2 +-
 .../ROOT/pages/bean-validator-component.adoc       |    2 +-
 .../modules/ROOT/pages/cxf-component.adoc          |    2 +-
 .../modules/ROOT/pages/cxfrs-component.adoc        |    4 +-
 .../modules/ROOT/pages/http-component.adoc         |    2 +-
 .../modules/ROOT/pages/msv-component.adoc          |    2 +-
 .../modules/ROOT/pages/servlet-component.adoc      |   10 +-
 .../modules/ROOT/pages/validator-component.adoc    |    2 +-
 .../ROOT/pages/xmlsecurity-sign-component.adoc     |   10 +-
 .../ROOT/pages/xmlsecurity-verify-component.adoc   |   10 +-
 .../modules/dataformats/pages/pgp-dataformat.adoc  |   10 +-
 .../modules/languages/pages/bean-language.adoc     |    4 +-
 .../modules/languages/pages/xpath-language.adoc    |    4 +-
 38 files changed, 1611 insertions(+), 1240 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/apns-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/apns-component.adoc
index d0a587f..a2d60b4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/apns-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/apns-component.adoc
@@ -147,7 +147,7 @@ source code].
 In order to use secure connection, an instance of `org.apache.camel.support.jsse.SSLContextParameters`
  should be injected to `org.apache.camel.component.apns.factory.ApnsServiceFactory` which is
  used to configure the component. See the test resources for an example.
- https://github.com/apache/camel/blob/master/components/camel-apns/src/test/resources/org/apache/camel/component/apns/spring/SpringApnsConsumerTest-context.xml[ssl example]
+ https://github.com/apache/camel/blob/main/components/camel-apns/src/test/resources/org/apache/camel/component/apns/spring/SpringApnsConsumerTest-context.xml[ssl example]
 
 == Exchange data format
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-lambda-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-lambda-component.adoc
index 886ea0c..2b03424 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-lambda-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-lambda-component.adoc
@@ -218,7 +218,7 @@ The default is 3 seconds.|No
 
 == Example
 
-To have a full understanding of how the component works, you may have a look at this https://github.com/apache/camel/blob/master/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentIntegrationTest.java[integration test]
+To have a full understanding of how the component works, you may have a look at this https://github.com/apache/camel/blob/main/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentIntegrationTest.java[integration test]
 
 == Using a POJO as body
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
index afef896..98dc589 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
@@ -180,10 +180,10 @@ from("activemq:topic:OrdersTopic")
 
 We have some test cases you can look at if it'll help
 
-* https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java[MethodFilterTest]
+* https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java[MethodFilterTest]
 is a JUnit test case showing the Java xref:manual::dsl.adoc[DSL] use of the bean
 expression being used in a filter
-* https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml[aggregator.xml]
+* https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml[aggregator.xml]
 is a Spring XML test case for the xref:{eip-vc}:eips:aggregate-eip.adoc[Aggregator] which
 uses a bean method call to test for the completion of the aggregation.
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-validator-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-validator-component.adoc
index b89abd9..e65d19a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-validator-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-validator-component.adoc
@@ -279,7 +279,7 @@ and the `constraints-car.xml` file
 </constraint-mappings>
 ----------------------------------------------------------------------------------------------------
 
-Here is the XML syntax for the example route definition where **OrderedChecks** can be https://github.com/apache/camel/blob/master/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java 
+Here is the XML syntax for the example route definition where **OrderedChecks** can be https://github.com/apache/camel/blob/main/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java 
 
 Note that the body should include an instance of a class to validate.
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-based-router-eip.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-based-router-eip.adoc
index a6ff7e0..ae6ffb0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-based-router-eip.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-based-router-eip.adoc
@@ -66,7 +66,7 @@ problems with the Java DSL, accepting using `when` or `otherwise`.
 ----
 
 For further examples of this pattern in use you could look at the
-https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java[junit test case].
+https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java[junit test case].
 
 [[ContentBasedRouter-UsingThisPattern]]
 == Using This Pattern
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc
index 2a483b2..10be36a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-enricher.adoc
@@ -78,8 +78,8 @@ from("activemq:My.Queue")
 For further examples of this pattern in use you could look at one of the
 JUnit tests
 
-* https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java[TransformTest]
-* https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java[TransformViaDSLTest]
+* https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java[TransformTest]
+* https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java[TransformViaDSLTest]
 
 *Using Spring XML*
 
@@ -164,7 +164,7 @@ dynamic language that can compute the uri dynamically using values from
 the current  xref:latest@manual:ROOT:exchange.adoc[Exchange].
 
 |`strategyRef` |  |Refers to an
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java[AggregationStrategy]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java[AggregationStrategy]
 to be used to merge the reply from the external service, into a single
 outgoing message. By default Camel will use the reply from the external
 service as outgoing message. From *Camel 2.12* onwards you can also use
@@ -377,7 +377,7 @@ dynamic language that can compute the uri dynamically using values from
 the current xref:latest@manual:ROOT:exchange.adoc[Exchange].
 
 |`strategyRef` |  |Refers to an
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java[AggregationStrategy]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java[AggregationStrategy]
 to be used to merge the reply from the external service, into a single
 outgoing message. By default Camel will use the reply from the external
 service as outgoing message. From *Camel 2.12* onwards you can also use
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-filter-eip.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-filter-eip.adoc
index eccdbcc..89a23d9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-filter-eip.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/content-filter-eip.adoc
@@ -27,8 +27,8 @@ In this example we add our own xref:latest@manual:ROOT:processor.adoc[Processor]
 For further examples of this pattern in use you could look at one of the
 JUnit tests
 
-* https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java[TransformTest]
-* https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java[TransformViaDSLTest]
+* https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java[TransformTest]
+* https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java[TransformViaDSLTest]
 
 == Using Spring XML
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/cxf-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/cxf-component.adoc
index dbcded7..13c1655 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/cxf-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/cxf-component.adoc
@@ -308,7 +308,7 @@ ambiguity in name spaces to relay instance mappings.
 Take a look at the tests that show how you'd be able to relay/drop
 headers here:
 
-https://github.com/apache/camel/blob/master/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java[https://github.com/apache/camel/blob/master/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java]
+https://github.com/apache/camel/blob/main/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java[https://github.com/apache/camel/blob/main/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java]
 
 * `POJO` and `PAYLOAD` modes are supported. In `POJO` mode, only
 out-of-band message headers are available for filtering as the in-band
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/cxfrs-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/cxfrs-component.adoc
index 1fd5257..338e068 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/cxfrs-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/cxfrs-component.adoc
@@ -141,14 +141,14 @@ You can also configure the CXF REST endpoint through the spring
 configuration. Since there are lots of difference between the CXF REST
 client and CXF REST Server, we provide different configuration for
 them. Please check out the
-https://github.com/apache/camel/blob/master/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[schema
+https://github.com/apache/camel/blob/main/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[schema
 file] and http://cxf.apache.org/docs/jax-rs.html[CXF JAX-RS
 documentation] for more information.
 
 == How to configure the REST endpoint in Camel
 
 In
-https://github.com/apache/camel/blob/master/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[camel-cxf
+https://github.com/apache/camel/blob/main/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[camel-cxf
 schema file], there are two elements for the REST endpoint definition.
 *cxf:rsServer* for REST consumer, *cxf:rsClient* for REST producer. +
  You can find a Camel REST service route configuration example here.
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/http-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/http-component.adoc
index 313092e..eb70653 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/http-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/http-component.adoc
@@ -412,7 +412,7 @@ And the equivalent Spring sample:
 == Using client timeout - SO_TIMEOUT
 
 See the
-https://github.com/apache/camel/blob/master/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java[HttpSOTimeoutTest]
+https://github.com/apache/camel/blob/main/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java[HttpSOTimeoutTest]
 unit test.
 
 == Configuring a Proxy
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/msv-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/msv-component.adoc
index 9819785..7fd22dd 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/msv-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/msv-component.adoc
@@ -124,7 +124,7 @@ with the following path and query parameters:
 == Example
 
 The following
-https://github.com/apache/camel/blob/master/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/camelContext.xml[example]
+https://github.com/apache/camel/blob/main/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/camelContext.xml[example]
 shows how to configure a route from endpoint *direct:start* which then
 goes to one of two endpoints, either *mock:valid* or *mock:invalid*
 based on whether or not the XML matches the given
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pgp-dataformat.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pgp-dataformat.adoc
index bb70fea..36fc4e6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pgp-dataformat.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/pgp-dataformat.adoc
@@ -280,15 +280,15 @@ above PGPDataFormat class selects in a certain predefined way the keys
 which should be used for signing/encryption or verifying/decryption. If
 you have special requirements how your keys should be selected you
 should use the
-https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java[PGPKeyAccessDataFormat]
+https://github.com/apache/camel/blob/main/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java[PGPKeyAccessDataFormat]
 class instead and implement the interfaces
-https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPublicKeyAccessor.java[PGPPublicKeyAccessor]
+https://github.com/apache/camel/blob/main/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPublicKeyAccessor.java[PGPPublicKeyAccessor]
 and
-https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPSecretKeyAccessor.java[PGPSecretKeyAccessor]
+https://github.com/apache/camel/blob/main/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPSecretKeyAccessor.java[PGPSecretKeyAccessor]
 as beans. There are default implementations
-https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java[DefaultPGPPublicKeyAccessor]
+https://github.com/apache/camel/blob/main/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java[DefaultPGPPublicKeyAccessor]
 and
-https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java[DefaultPGPSecretKeyAccessor]
+https://github.com/apache/camel/blob/main/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java[DefaultPGPSecretKeyAccessor]
 which cache the keys, so that not every time the keyring is parsed when
 the processor is called.
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
index b43c5a9..8522266 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/polling-consumer.adoc
@@ -5,9 +5,9 @@ Camel supports implementing the
 http://www.enterpriseintegrationpatterns.com/PollingConsumer.html[Polling
 Consumer] from the xref:enterprise-integration-patterns.adoc[EIP
 patterns] using the
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
 interface which can be created via the
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/Endpoint.java[Endpoint.createPollingConsumer()]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/Endpoint.java[Endpoint.createPollingConsumer()]
 method.
 
 image::eip/PollingConsumerSolution.gif[image]
@@ -24,21 +24,21 @@ Exchange exchange = consumer.receive();
 The *`ConsumerTemplate`* (discussed below) is also available.
 
 There are three main polling methods on
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
 
 [width="100%",cols="50%,50%",options="header",]
 |=======================================================================
 |Method name |Description
-|https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receive()]
+|https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receive()]
 |Waits until a message is available and then returns it; potentially
 blocking forever
 
-|https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receive(long)]
+|https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receive(long)]
 |Attempts to receive a message exchange, waiting up to the given timeout
 and returning null if no message exchange could be received within the
 time available
 
-|https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receiveNoWait()]
+|https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receiveNoWait()]
 |Attempts to receive a message exchange immediately without waiting and
 returning null if a message exchange is not available yet
 |=======================================================================
@@ -163,16 +163,16 @@ scheduled poll is used to monitor some kind of state or resource and
 then fire message exchanges.
 
 Since this a such a common pattern, polling components can extend the
-https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
+https://github.com/apache/camel/blob/main/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
 base class which makes it simpler to implement this pattern. There is
 also the xref:components::quartz-component.adoc[Quartz Component] which provides scheduled
 delivery of messages using the Quartz enterprise scheduler.
 
 For more details see:
 
-* https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
+* https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]
 * Scheduled Polling Components
-** https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
+** https://github.com/apache/camel/blob/main/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
 ** xref:components::scheduler-component.adoc[Scheduler]
 ** xref:components::atom-component.adoc[Atom]
 ** xref:components::beanstalk-component.adoc[Beanstalk]
@@ -316,7 +316,7 @@ kicking-in.
 [[PollingConsumer-AboutErrorHandlingandScheduledPollingConsumers]]
 === About Error Handling and Scheduled Polling Consumers
 
-https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
+https://github.com/apache/camel/blob/main/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java[ScheduledPollConsumer]
 is scheduled based and its *`run`* method is invoked periodically based
 on schedule settings. But errors can also occur when a poll is being
 executed. For instance if Camel should poll a file network, and this
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/return-address.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/return-address.adoc
index 45ee442..fa35d98 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/return-address.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/return-address.adoc
@@ -53,6 +53,6 @@ from("activemq:queue:bar?disableReplyTo=true").to("mock:bar");
 ----
 
 For a complete example of this pattern, see this
-https://github.com/apache/camel/blob/master/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToAsHeaderTest.java[junit
+https://github.com/apache/camel/blob/main/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToAsHeaderTest.java[junit
 test case]
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
index 28fa95d..dd54a8a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
@@ -146,7 +146,7 @@ And then refer to "required" from the route:
 In this sample we want to ensure that two endpoints is under transaction
 control. These two endpoints inserts data into a database. +
 The sample is in its full as a
-https://github.com/apache/camel/blob/master/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java[unit
+https://github.com/apache/camel/blob/main/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMinimalConfigurationTest.java[unit
 test].
 
 First of all we setup the usual spring stuff in its configuration file.
@@ -162,12 +162,12 @@ configure a transaction policy bean, so we do not have any
 `PROPAGATION_REQUIRED` beans. All the beans needed to be configured is
 *standard* Spring beans only, eg. there are no Camel specific
 configuration at
-all.https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml[springTransactionalClientDataSourceMinimalConfiguration]Then
+all.https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml[springTransactionalClientDataSourceMinimalConfiguration]Then
 we are ready to define our Camel routes. We have two routes: 1 for
 success conditions, and 1 for a forced rollback condition. +
 This is after all based on a unit test. Notice that we mark each route
 as transacted using the *transacted*
-tag.https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml[springTransactionalClientDataSourceMinimalConfiguration]That
+tag.https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml[springTransactionalClientDataSourceMinimalConfiguration]That
 is all that is needed to configure a Camel route as being transacted.
 Just remember to use the *transacted* DSL. The rest is standard Spring
 XML to setup the transaction manager.
@@ -176,15 +176,15 @@ XML to setup the transaction manager.
 
 In this sample we want to listen for messages on a queue and process the
 messages with our business logic java code and send them along. Since
-its based on a https://github.com/apache/camel/blob/master/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.java[TransactionMinimalConfigurationTest.java] the destination is a mock endpoint.
+its based on a https://github.com/apache/camel/blob/main/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.java[TransactionMinimalConfigurationTest.java] the destination is a mock endpoint.
 
 First we configure the standard Spring XML to declare a JMS connection
 factory, a JMS transaction manager and our ActiveMQ component that we
 use in our
-routing.https://github.com/apache/camel/blob/master/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml[TransactionMinimalConfigurationTest.xml]And
+routing.https://github.com/apache/camel/blob/main/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml[TransactionMinimalConfigurationTest.xml]And
 then we configure our routes. Notice that all we have to do is mark the
 route as transacted using the *transacted*
-tag.https://github.com/apache/camel/blob/master/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml[TransactionMinimalConfigurationTest.xml]
+tag.https://github.com/apache/camel/blob/main/components/camel-jms/src/test/resources/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.xml[TransactionMinimalConfigurationTest.xml]
 
 Transaction error handler
 
@@ -233,10 +233,10 @@ propagation behaviors for that where you configure it as follows:
 * The second route use `PROPAGATION_REQUIRES_NEW`
 
 This is configured in the Spring XML
-file.https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml[MixedTransactionPropagationTest.xml]Then
+file.https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml[MixedTransactionPropagationTest.xml]Then
 in the routes you use transacted DSL to indicate which of these two
 propagations it
-uses.https://github.com/apache/camel/blob/master/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java[MixedTransactionPropagationTest.java]Notice
+uses.https://github.com/apache/camel/blob/main/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java[MixedTransactionPropagationTest.java]Notice
 how we have configured the `onException` in the 2nd route to indicate in
 case of any exceptions we should handle it and just rollback this
 transaction. This is done using the `markRollbackOnlyLast` which tells
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/servlet-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/servlet-component.adoc
index 3be657a..d76a920 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/servlet-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/servlet-component.adoc
@@ -241,9 +241,9 @@ In this sample, we define a route that exposes a HTTP service at
 http://localhost:8080/camel/services/hello.
 
 First, you need to publish the
-https://github.com/apache/camel/blob/master/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
+https://github.com/apache/camel/blob/main/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
 through the normal Web Container, or OSGi Service. Use the `Web.xml` file to publish the
-https://github.com/apache/camel/blob/master/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
+https://github.com/apache/camel/blob/main/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
 as follows:
 
 [source,xml]
@@ -306,7 +306,7 @@ often required to load the Spring ApplicationContext _after_ the Servlet
 component has started. This can be accomplished by using Spring's
 `ContextLoaderServlet` instead of `ContextLoaderListener`. In that case
 you'll need to start `ContextLoaderServlet` after
-https://github.com/apache/camel/blob/master/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
+https://github.com/apache/camel/blob/main/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
 like this:
 
 [source,xml]
@@ -332,7 +332,7 @@ like this:
 === Sample when using OSGi
 
 You can publish the
-https://github.com/apache/camel/blob/master/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
+https://github.com/apache/camel/blob/main/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
 as an OSGi service with Blueprint like this:
 
 [source,xml]
@@ -402,7 +402,7 @@ Then use this service in your Camel route like this:
 
 You can use an `Activator` to publish
 the
-https://github.com/apache/camel/blob/master/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
+https://github.com/apache/camel/blob/main/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
 on the OSGi platform:
 
 [source,java]
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/validator-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/validator-component.adoc
index 8b01f80..e0ecf1e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/validator-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/validator-component.adoc
@@ -105,7 +105,7 @@ with the following path and query parameters:
 == Example
 
 The following
-https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml[example]
+https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml[example]
 shows how to configure a route from endpoint *direct:start* which then
 goes to one of two endpoints, either *mock:valid* or *mock:invalid*
 based on whether or not the XML matches the given schema (which is
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xmlsecurity-sign-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xmlsecurity-sign-component.adoc
index 279fd16..5a3e088 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xmlsecurity-sign-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xmlsecurity-sign-component.adoc
@@ -205,17 +205,17 @@ corresponding public key is necessary; you specify a key selector bean
 which provides this public key.
 
 The key accessor bean must implement the
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/KeyAccessor.java[`KeyAccessor`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/KeyAccessor.java[`KeyAccessor`]
 interface. The package `org.apache.camel.component.xmlsecurity.api`
 contains the default implementation class
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java[`DefaultKeyAccessor`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java[`DefaultKeyAccessor`]
 which reads the private key from a Java keystore.
 
 The key selector bean must implement the
 http://docs.oracle.com/javase/6/docs/api/javax/xml/crypto/KeySelector.html[`javax.xml.crypto.KeySelector`]
 interface. The package `org.apache.camel.component.xmlsecurity.api`
 contains the default implementation class
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeySelector.java[`DefaultKeySelector`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeySelector.java[`DefaultKeySelector`]
 which reads the public key from a keystore.
 
 In the example, the default signature algorithm
@@ -346,9 +346,9 @@ with the following path and query parameters:
 After the validation the node is extracted from the XML signature
 document which is finally returned to the output-message body. In the
 enveloping XML signature case, the default implementation
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java[`DefaultXmlSignature2Message`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java[`DefaultXmlSignature2Message`]
 of
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignature2Message.java[`XmlSignature2Message`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignature2Message.java[`XmlSignature2Message`]
 does this for the node search type `Default` in the following way (see
 option `xmlSignature2Message`):
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xmlsecurity-verify-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xmlsecurity-verify-component.adoc
index df46af6..23e7ac4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xmlsecurity-verify-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xmlsecurity-verify-component.adoc
@@ -205,17 +205,17 @@ corresponding public key is necessary; you specify a key selector bean
 which provides this public key.
 
 The key accessor bean must implement the
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/KeyAccessor.java[`KeyAccessor`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/KeyAccessor.java[`KeyAccessor`]
 interface. The package `org.apache.camel.component.xmlsecurity.api`
 contains the default implementation class
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java[`DefaultKeyAccessor`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java[`DefaultKeyAccessor`]
 which reads the private key from a Java keystore.
 
 The key selector bean must implement the
 http://docs.oracle.com/javase/6/docs/api/javax/xml/crypto/KeySelector.html[`javax.xml.crypto.KeySelector`]
 interface. The package `org.apache.camel.component.xmlsecurity.api`
 contains the default implementation class
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeySelector.java[`DefaultKeySelector`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeySelector.java[`DefaultKeySelector`]
 which reads the public key from a keystore.
 
 In the example, the default signature algorithm
@@ -326,9 +326,9 @@ with the following path and query parameters:
 After the validation the node is extracted from the XML signature
 document which is finally returned to the output-message body. In the
 enveloping XML signature case, the default implementation
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java[`DefaultXmlSignature2Message`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java[`DefaultXmlSignature2Message`]
 of
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignature2Message.java[`XmlSignature2Message`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignature2Message.java[`XmlSignature2Message`]
 does this for the node search type `Default` in the following way (see
 option `xmlSignature2Message`):
 
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xpath-language.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xpath-language.adoc
index 5e7d3c5..0f7f627 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xpath-language.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xpath-language.adoc
@@ -228,14 +228,14 @@ shown:
 == Examples
 
 Here is a simple
-https://github.com/apache/camel/blob/master/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java[example]
+https://github.com/apache/camel/blob/main/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java[example]
 using an XPath expression as a predicate in a
 Message Filter
 
 If you have a standard set of namespaces you wish to work with and wish
 to share them across many different XPath expressions you can use the
 NamespaceBuilder as shown
-https://github.com/apache/camel/blob/master/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java[in
+https://github.com/apache/camel/blob/main/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java[in
 this example]
 
 In this sample we have a choice construct. The first choice evaulates if
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 68a16b7..0750bea 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -2968,10 +2968,52 @@ Language, such as en for english.
     <xs:complexContent>
       <xs:extension base="tns:output">
         <xs:sequence>
-          <xs:element name="correlationExpression" type="tns:expressionSubElementDefinition"/>
-          <xs:element minOccurs="0" name="completionPredicate" type="tns:expressionSubElementDefinition"/>
-          <xs:element minOccurs="0" name="completionTimeoutExpression" type="tns:expressionSubElementDefinition"/>
-          <xs:element minOccurs="0" name="completionSizeExpression" type="tns:expressionSubElementDefinition"/>
+          <xs:element name="correlationExpression" type="tns:expressionSubElementDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+The expression used to calculate the correlation key to use for aggregation. The
+Exchange which has the same correlation key is aggregated together. If the
+correlation key could not be evaluated an Exception is thrown. You can disable
+this by using the ignoreBadCorrelationKeys option.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element minOccurs="0" name="completionPredicate" type="tns:expressionSubElementDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+A Predicate to indicate when an aggregated exchange is complete. If this is not
+specified and the AggregationStrategy object implements Predicate, the
+aggregationStrategy object will be used as the completionPredicate.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element minOccurs="0" name="completionTimeoutExpression" type="tns:expressionSubElementDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Time in millis that an aggregated exchange should be inactive before its
+complete (timeout). This option can be set as either a fixed value or using an
+Expression which allows you to evaluate a timeout dynamically - will use Long as
+result. If both are set Camel will fallback to use the fixed value if the
+Expression result was null or 0. You cannot use this option together with
+completionInterval, only one of the two can be used. By default the timeout
+checker runs every second, you can use the completionTimeoutCheckerInterval
+option to configure how frequently to run the checker. The timeout is an
+approximation and there is no guarantee that the a timeout is triggered exactly
+after the timeout value. It is not recommended to use very low timeout values or
+checker intervals.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element minOccurs="0" name="completionSizeExpression" type="tns:expressionSubElementDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Number of messages aggregated before the aggregation is complete. This option
+can be set as either a fixed value or using an Expression which allows you to
+evaluate a size dynamically - will use Integer as result. If both are set Camel
+will fallback to use the fixed value if the Expression result was null or 0.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element minOccurs="0" ref="tns:optimisticLockRetryPolicy"/>
           <xs:choice maxOccurs="unbounded" minOccurs="0">
             <xs:element ref="tns:aggregate"/>
@@ -3422,8 +3464,22 @@ implementation. Default value: Singleton
     <xs:complexContent>
       <xs:extension base="tns:output">
         <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="exception" type="xs:string"/>
-          <xs:element minOccurs="0" name="onWhen" type="tns:whenDefinition"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="exception" type="xs:string">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+The exception(s) to catch.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element minOccurs="0" name="onWhen" type="tns:whenDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Sets an additional predicate that should be true before the onCatch is
+triggered. To be used for fine grained controlling whether a thrown exception
+should be intercepted by this exception type or not.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:choice maxOccurs="unbounded" minOccurs="0">
             <xs:element ref="tns:aggregate"/>
             <xs:element ref="tns:bean"/>
@@ -4418,8 +4474,20 @@ POJOs as the AggregationStrategy.
 
   <xs:complexType name="contextScanDefinition">
     <xs:sequence>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="excludes" type="xs:string"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="includes" type="xs:string"/>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="excludes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Exclude finding route builder from these java package names.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="includes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Include finding route builder from these java package names.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
     </xs:sequence>
     <xs:attribute name="includeNonSingletons" type="xs:string">
       <xs:annotation>
@@ -5409,7 +5477,14 @@ specified using uri syntax, eg mynamecount=4&type=gold.
     <xs:complexContent>
       <xs:extension base="tns:loadBalancer">
         <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="exception" type="xs:string"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="exception" type="xs:string">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+A list of class names for specific exceptions to monitor. If no exceptions are
+configured then all exceptions are monitored.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
         <xs:attribute name="roundRobin" type="xs:string">
           <xs:annotation>
@@ -5496,7 +5571,13 @@ Refers to the custom load balancer to lookup from the registry.
     <xs:complexContent>
       <xs:extension base="tns:loadBalancer">
         <xs:sequence>
-          <xs:element name="correlationExpression" type="tns:expressionSubElementDefinition"/>
+          <xs:element name="correlationExpression" type="tns:expressionSubElementDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+The correlation expression to use to calculate the correlation key.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -5768,8 +5849,24 @@ it reaches the end when Camel is shut down. Default value: false
     <xs:complexContent>
       <xs:extension base="tns:dataFormat">
         <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="configuration" type="tns:propertyDefinition"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="extractors" type="xs:string"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="configuration" type="tns:propertyDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Configurations for Apache Any23 as key-value pairs in order to customize the
+extraction process. The list of supported parameters can be found here. If not
+provided, a default configuration is used.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="extractors" type="xs:string">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+List of Any23 extractors to be used in the unmarshal operation. A list of the
+available extractors can be found here here. If not provided, all the available
+extractors are used.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
         <xs:attribute name="outputFormat" type="xs:string">
           <xs:annotation>
@@ -6192,7 +6289,13 @@ stream. Is by default false. Default value: false
     <xs:complexContent>
       <xs:extension base="tns:dataFormat">
         <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="header" type="xs:string"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="header" type="xs:string">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+To configure the CSV headers.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
         <xs:attribute name="formatRef" type="xs:string">
           <xs:annotation>
@@ -7887,10 +7990,38 @@ value: false
     <xs:complexContent>
       <xs:extension base="tns:dataFormat">
         <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="converters" type="tns:propertyDefinition"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="aliases" type="tns:propertyDefinition"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="omitFields" type="tns:propertyDefinition"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="implicitCollections" type="tns:propertyDefinition"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="converters" type="tns:propertyDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+List of class names for using custom XStream converters. The classes must be of
+type com.thoughtworks.xstream.converters.Converter.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="aliases" type="tns:propertyDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Alias a Class to a shorter name to be used in XML elements.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="omitFields" type="tns:propertyDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Prevents a field from being serialized. To omit a field you must always provide
+the declaring type and not necessarily the type that is converted. Multiple
+values can be separated by comma.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="implicitCollections" type="tns:propertyDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Adds a default implicit collection which is used for any unmapped XML tag.
+Multiple values can be separated by comma.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
         <xs:attribute name="permissions" type="xs:string">
           <xs:annotation>
@@ -8467,7 +8598,15 @@ backward compatibility. Default value: false
     <xs:complexContent>
       <xs:extension base="tns:output">
         <xs:sequence>
-          <xs:element minOccurs="0" name="onWhen" type="tns:whenDefinition"/>
+          <xs:element minOccurs="0" name="onWhen" type="tns:whenDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Sets an additional predicate that should be true before the onCompletion is
+triggered. To be used for fine grained controlling whether a completion callback
+should be invoked or not.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:choice maxOccurs="unbounded" minOccurs="0">
             <xs:element ref="tns:aggregate"/>
             <xs:element ref="tns:bean"/>
@@ -8596,12 +8735,46 @@ this on completion. By default this feature is off. Default value: false
     <xs:complexContent>
       <xs:extension base="tns:output">
         <xs:sequence>
-          <xs:element maxOccurs="unbounded" name="exception" type="xs:string"/>
-          <xs:element minOccurs="0" name="onWhen" type="tns:whenDefinition"/>
-          <xs:element minOccurs="0" name="retryWhile" type="tns:expressionSubElementDefinition"/>
+          <xs:element maxOccurs="unbounded" name="exception" type="xs:string">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+A set of exceptions to react upon.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element minOccurs="0" name="onWhen" type="tns:whenDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Sets an additional predicate that should be true before the onException is
+triggered. To be used for fine grained controlling whether a thrown exception
+should be intercepted by this exception type or not.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element minOccurs="0" name="retryWhile" type="tns:expressionSubElementDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Sets the retry while predicate. Will continue retrying until predicate returns
+false.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element minOccurs="0" ref="tns:redeliveryPolicy"/>
-          <xs:element minOccurs="0" name="handled" type="tns:expressionSubElementDefinition"/>
-          <xs:element minOccurs="0" name="continued" type="tns:expressionSubElementDefinition"/>
+          <xs:element minOccurs="0" name="handled" type="tns:expressionSubElementDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Sets whether the exchange should be marked as handled or not.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element minOccurs="0" name="continued" type="tns:expressionSubElementDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Sets whether the exchange should handle and continue routing from the point of
+failure. If this option is enabled then its considered handled as well.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:choice maxOccurs="unbounded" minOccurs="0">
             <xs:element ref="tns:aggregate"/>
             <xs:element ref="tns:bean"/>
@@ -9073,9 +9246,27 @@ Set if validation is required for this output type. Default value: false
 
   <xs:complexType name="packageScanDefinition">
     <xs:sequence>
-      <xs:element maxOccurs="unbounded" name="package" type="xs:string"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="excludes" type="xs:string"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="includes" type="xs:string"/>
+      <xs:element maxOccurs="unbounded" name="package" type="xs:string">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Sets the java package names to use for scanning for route builder classes.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="excludes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Exclude finding route builder from these java package names.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="includes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Include finding route builder from these java package names.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
     </xs:sequence>
   </xs:complexType>
 
@@ -10233,9 +10424,37 @@ producers.
     <xs:complexContent>
       <xs:extension base="tns:output">
         <xs:sequence>
-          <xs:element minOccurs="0" name="compensation" type="tns:sagaActionUriDefinition"/>
-          <xs:element minOccurs="0" name="completion" type="tns:sagaActionUriDefinition"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="option" type="tns:sagaOptionDefinition"/>
+          <xs:element minOccurs="0" name="compensation" type="tns:sagaActionUriDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+The compensation endpoint URI that must be called to compensate all changes done
+in the route. The route corresponding to the compensation URI must perform
+compensation and complete without error. If errors occur during compensation,
+the saga service may call again the compensation URI to retry.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element minOccurs="0" name="completion" type="tns:sagaActionUriDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+The completion endpoint URI that will be called when the Saga is completed
+successfully. The route corresponding to the completion URI must perform
+completion tasks and terminate without error. If errors occur during completion,
+the saga service may call again the completion URI to retry.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="option" type="tns:sagaOptionDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Allows to save properties of the current exchange in order to re-use them in a
+compensation/completion callback route. Options are usually helpful e.g. to
+store and retrieve identifiers of objects that should be deleted in compensating
+actions. Option values will be transformed into input headers of the
+compensation/completion exchange.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:choice maxOccurs="unbounded" minOccurs="0">
             <xs:element ref="tns:aggregate"/>
             <xs:element ref="tns:bean"/>
@@ -11108,7 +11327,14 @@ rejection handler. Is by default true. Default value: true
             <xs:element ref="tns:xpath"/>
             <xs:element ref="tns:xquery"/>
           </xs:choice>
-          <xs:element minOccurs="0" name="correlationExpression" type="tns:expressionSubElementDefinition"/>
+          <xs:element minOccurs="0" name="correlationExpression" type="tns:expressionSubElementDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+The expression used to calculate the correlation key to use for throttle
+grouping. The Exchange which has the same correlation key is throttled together.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
         <xs:attribute name="executorServiceRef" type="xs:string">
           <xs:annotation>
@@ -11549,7 +11775,14 @@ Sets a reference to use for lookup the policy in the registry.
     <xs:complexContent>
       <xs:extension base="tns:toDynamicDefinition">
         <xs:sequence>
-          <xs:element minOccurs="0" name="body" type="tns:expressionSubElementDefinition"/>
+          <xs:element minOccurs="0" name="body" type="tns:expressionSubElementDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Uses the expression for creating a new body as the message to use for wire
+tapping.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:setHeader"/>
         </xs:sequence>
         <xs:attribute name="processorRef" type="xs:string">
@@ -11602,7 +11835,14 @@ needed before the exchange is send.
     <xs:complexContent>
       <xs:extension base="tns:serviceCallServiceFilterConfiguration">
         <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="servers" type="xs:string"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="servers" type="xs:string">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Sets the server blacklist. Each entry can be a list of servers separated by
+comma in the format: servicehost:port,servicehost2:port,servicehost3:port.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -11620,7 +11860,15 @@ needed before the exchange is send.
     <xs:complexContent>
       <xs:extension base="tns:identifiedType">
         <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" type="tns:propertyDefinition"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" type="tns:propertyDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Set client properties to use. These properties are specific to what service call
+implementation are in use. For example if using ribbon, then the client
+properties are define in com.netflix.client.config.CommonClientConfigKey.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -11984,7 +12232,14 @@ Default value: false
     <xs:complexContent>
       <xs:extension base="tns:serviceCallServiceDiscoveryConfiguration">
         <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="servers" type="xs:string"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="servers" type="xs:string">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Sets the server list. Each entry can be a list of servers separated by comma in
+the format: servicehost:port,servicehost2:port,servicehost3:port.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -12113,7 +12368,13 @@ Sets the Ribbon client name.
             <xs:element ref="tns:ribbonLoadBalancer"/>
             <xs:element ref="tns:defaultLoadBalancer"/>
           </xs:choice>
-          <xs:element minOccurs="0" name="expression" type="tns:serviceCallExpressionConfiguration"/>
+          <xs:element minOccurs="0" name="expression" type="tns:serviceCallExpressionConfiguration">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Configures the Expression using the given configuration.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
         <xs:attribute name="uri" type="xs:string">
           <xs:annotation>
@@ -12315,7 +12576,13 @@ ServiceCallConstants.SERVICE_PORT. Default value: CamelServiceCallServicePort
             <xs:element ref="tns:ribbonLoadBalancer"/>
             <xs:element ref="tns:defaultLoadBalancer"/>
           </xs:choice>
-          <xs:element minOccurs="0" name="expression" type="tns:serviceCallExpressionConfiguration"/>
+          <xs:element minOccurs="0" name="expression" type="tns:serviceCallExpressionConfiguration">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Configures the Expression using the given configuration.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
         <xs:attribute name="name" type="xs:string">
           <xs:annotation>
@@ -13088,11 +13355,23 @@ default value is true.
       <xs:element minOccurs="0" name="allowableValues">
         <xs:complexType>
           <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="value" type="xs:string"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="value" type="xs:string">
+              <xs:annotation>
+                <xs:documentation xml:lang="en"><![CDATA[
+Sets the Swagger Parameter list of allowable values (enum).
+                ]]></xs:documentation>
+              </xs:annotation>
+            </xs:element>
           </xs:sequence>
         </xs:complexType>
       </xs:element>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="examples" type="tns:restPropertyDefinition"/>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="examples" type="tns:restPropertyDefinition">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Sets the Swagger Parameter examples.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
     </xs:sequence>
     <xs:attribute name="name" type="xs:string" use="required">
       <xs:annotation>
@@ -13180,8 +13459,20 @@ Property value.
 
   <xs:complexType name="restOperationResponseMsgDefinition">
     <xs:sequence>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="header" type="tns:restOperationResponseHeaderDefinition"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="examples" type="tns:restPropertyDefinition"/>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="header" type="tns:restOperationResponseHeaderDefinition">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Adds a response header.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="examples" type="tns:restPropertyDefinition">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Examples of response messages.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
     </xs:sequence>
     <xs:attribute name="code" type="xs:string">
       <xs:annotation>
@@ -13211,7 +13502,13 @@ The response model.
       <xs:element minOccurs="0" name="allowableValues">
         <xs:complexType>
           <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="value" type="xs:string"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="value" type="xs:string">
+              <xs:annotation>
+                <xs:documentation xml:lang="en"><![CDATA[
+Sets the Swagger Parameter list of allowable values.
+                ]]></xs:documentation>
+              </xs:annotation>
+            </xs:element>
           </xs:sequence>
         </xs:complexType>
       </xs:element>
@@ -13411,12 +13708,55 @@ Sets the component name that this definition will apply to.
 
   <xs:complexType name="restConfigurationDefinition">
     <xs:sequence>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="componentProperty" type="tns:restPropertyDefinition"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="endpointProperty" type="tns:restPropertyDefinition"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="consumerProperty" type="tns:restPropertyDefinition"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="dataFormatProperty" type="tns:restPropertyDefinition"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="apiProperty" type="tns:restPropertyDefinition"/>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="corsHeaders" type="tns:restPropertyDefinition"/>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="componentProperty" type="tns:restPropertyDefinition">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Allows to configure as many additional properties for the rest component in use.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="endpointProperty" type="tns:restPropertyDefinition">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Allows to configure as many additional properties for the rest endpoint in use.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="consumerProperty" type="tns:restPropertyDefinition">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Allows to configure as many additional properties for the rest consumer in use.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="dataFormatProperty" type="tns:restPropertyDefinition">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Allows to configure as many additional properties for the data formats in use.
+For example set property prettyPrint to true to have json outputted in pretty
+mode. The properties can be prefixed to denote the option is only for either
+JSON or XML and for either the IN or the OUT. The prefixes are: json.in.
+json.out. xml.in. xml.out. For example a key with value
+xml.out.mustBeJAXBElement is only for the XML data format for the outgoing. A
+key without a prefix is a common key for all situations.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="apiProperty" type="tns:restPropertyDefinition">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Allows to configure as many additional properties for the api documentation
+(swagger). For example set property api.title to my cool stuff.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element maxOccurs="unbounded" minOccurs="0" name="corsHeaders" type="tns:restPropertyDefinition">
+        <xs:annotation>
+          <xs:documentation xml:lang="en"><![CDATA[
+Allows to configure custom CORS headers.
+          ]]></xs:documentation>
+        </xs:annotation>
+      </xs:element>
     </xs:sequence>
     <xs:attribute name="component" type="xs:string">
       <xs:annotation>
@@ -13790,7 +14130,13 @@ A short description for security scheme.
     <xs:complexContent>
       <xs:extension base="tns:restSecurityDefinition">
         <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="scopes" type="tns:restPropertyDefinition"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="scopes" type="tns:restPropertyDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+The available scopes for an OAuth2 security scheme.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
         <xs:attribute name="authorizationUrl" type="xs:string">
           <xs:annotation>
@@ -14003,7 +14349,17 @@ password, application or accessCode.
         <xs:sequence>
           <xs:element minOccurs="0" ref="tns:globalOptions"/>
           <xs:element minOccurs="0" ref="tns:propertyPlaceholder"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="package" type="xs:string"/>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="package" type="xs:string">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Sets the package names to be recursively searched for Java classes which extend
+org.apache.camel.builder.RouteBuilder to be auto-wired up to the CamelContext as
+a route. Note that classes are excluded if they are specifically configured in
+the spring.xml A more advanced configuration can be done using
+setPackageScan(org.apache.camel.model.PackageScanDefinition).
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element minOccurs="0" ref="tns:packageScan"/>
           <xs:element minOccurs="0" ref="tns:contextScan"/>
           <xs:element minOccurs="0" ref="tns:streamCaching"/>
@@ -14015,14 +14371,44 @@ password, application or accessCode.
             <xs:element ref="tns:consumerTemplate"/>
           </xs:choice>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:errorHandler"/>
-          <xs:element minOccurs="0" name="defaultServiceCallConfiguration" type="tns:serviceCallConfigurationDefinition"/>
+          <xs:element minOccurs="0" name="defaultServiceCallConfiguration" type="tns:serviceCallConfigurationDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+ServiceCall EIP default configuration.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:serviceCallConfiguration"/>
-          <xs:element minOccurs="0" name="defaultHystrixConfiguration" type="tns:hystrixConfigurationDefinition"/>
+          <xs:element minOccurs="0" name="defaultHystrixConfiguration" type="tns:hystrixConfigurationDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Hystrix EIP default configuration.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:hystrixConfiguration"/>
-          <xs:element minOccurs="0" name="defaultResilience4jConfiguration" type="tns:resilience4JConfigurationDefinition"/>
+          <xs:element minOccurs="0" name="defaultResilience4jConfiguration" type="tns:resilience4JConfigurationDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Resilience4j EIP default configuration.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:resilience4jConfiguration"/>
-          <xs:element minOccurs="0" name="defaultFaultToleranceConfiguration" type="tns:faultToleranceConfigurationDefinition"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="faultToleranceConfiguration" type="tns:resilience4JConfigurationDefinition"/>
+          <xs:element minOccurs="0" name="defaultFaultToleranceConfiguration" type="tns:faultToleranceConfigurationDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+MicroProfile Fault Tolerance EIP default configuration.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="faultToleranceConfiguration" type="tns:resilience4JConfigurationDefinition">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+MicroProfile Circuit Breaker EIP configurations.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:routeTemplateContextRef"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:routeBuilder"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:routeContextRef"/>
@@ -14361,7 +14747,13 @@ Default value: WARN
     <xs:complexContent>
       <xs:extension base="tns:identifiedType">
         <xs:sequence>
-          <xs:element minOccurs="0" name="redeliveryPolicy" type="tns:camelRedeliveryPolicyFactoryBean"/>
+          <xs:element minOccurs="0" name="redeliveryPolicy" type="tns:camelRedeliveryPolicyFactoryBean">
+            <xs:annotation>
+              <xs:documentation xml:lang="en"><![CDATA[
+Sets the redelivery settings.
+              ]]></xs:documentation>
+            </xs:annotation>
+          </xs:element>
         </xs:sequence>
         <xs:attribute name="type" type="tns:errorHandlerType">
           <xs:annotation>
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
index 319202c..13c79f5 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParser.java
@@ -3,476 +3,419 @@ package org.apache.camel.component.sql.stored.template.generated;
 
 import java.io.Reader;
 
-import org.apache.camel.component.sql.stored.template.ast.*;
 import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.component.sql.stored.template.ast.*;
 
 public class SSPTParser implements SSPTParserConstants {
-    int parameterNameCounter = 0;
-
-    ClassResolver classResolver;
-
-    public SSPTParser(Reader reader, ClassResolver classResolver) {
-        this(reader);
-        this.classResolver = classResolver;
-    }
-
-    String createNextParameterName() {
-        return "_" + (parameterNameCounter++);
-    }
-
-    final public Template parse() throws ParseException {
-        Token procedureName;
-        Template template = new Template();
-        Object parameter = null;
-        procedureName = jj_consume_token(IDENTIFIER);
-        jj_consume_token(PROCEDURE_BEGIN);
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case 2:
-            case 3:
-            case NUMBER:
-            case PARAMETER_NAME:
-            case IDENTIFIER:
-                parameter = Parameter();
-                template.addParameter(parameter);
-                label_1: while (true) {
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case SEPARATOR:
-                            ;
-                            break;
-                        default:
-                            jj_la1[0] = jj_gen;
-                            break label_1;
-                    }
-                    jj_consume_token(SEPARATOR);
-                    parameter = Parameter();
-                    template.addParameter(parameter);
-                }
-                break;
-            default:
-                jj_la1[1] = jj_gen;
-                ;
-        }
-        jj_consume_token(PROCEDURE_END);
-        jj_consume_token(0);
-        template.setProcedureName(procedureName.toString());
-        {
-            if (true)
-                return template;
+   int parameterNameCounter = 0;
+
+   ClassResolver classResolver;
+
+   public SSPTParser(Reader reader, ClassResolver classResolver) {
+     this(reader);
+     this.classResolver = classResolver;
+   }
+
+   String createNextParameterName() {
+      return "_"+(parameterNameCounter++);
+   }
+
+  final public Template parse() throws ParseException {
+    Token procedureName;
+    Template template = new Template();
+    Object parameter = null;
+    procedureName = jj_consume_token(IDENTIFIER);
+    jj_consume_token(PROCEDURE_BEGIN);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case 2:
+    case 3:
+    case NUMBER:
+    case PARAMETER_NAME:
+    case IDENTIFIER:
+      parameter = Parameter();
+                                                                               template.addParameter(parameter);
+      label_1:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case SEPARATOR:
+          ;
+          break;
+        default:
+          jj_la1[0] = jj_gen;
+          break label_1;
         }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Object Parameter() throws ParseException {
-        Object param;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case NUMBER:
-            case PARAMETER_NAME:
-            case IDENTIFIER:
-                param = InParameter(); {
-                if (true)
-                    return param;
-            }
-                break;
-            case 2:
-                param = OutParameter(); {
-                if (true)
-                    return param;
-            }
-                break;
-            case 3:
-                param = InOutParameter(); {
-                if (true)
-                    return param;
-            }
-                break;
-            default:
-                jj_la1[2] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public InParameter InParameter() throws ParseException {
-        Token sqlTypeToken;
-        String name = null;
-        Token valueSrcToken;
-        Integer scale = null;
-        String typeName = null;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case PARAMETER_NAME:
-                name = ParameterName();
-                jj_consume_token(1);
-                break;
-            default:
-                jj_la1[3] = jj_gen;
-                ;
-        }
-        sqlTypeToken = ParameterSqlType();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case SCALE:
-                scale = Scale();
-                break;
-            default:
-                jj_la1[4] = jj_gen;
-                ;
-        }
-        jj_consume_token(1);
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case PARAMETER_NAME:
-                typeName = ParameterName();
-                jj_consume_token(1);
-                break;
-            default:
-                jj_la1[5] = jj_gen;
-                ;
-        }
-        valueSrcToken = InParameterSrc();
-        int sqlType = ParseHelper.parseSqlType(sqlTypeToken, classResolver);
-
-        {
-            if (true)
-                return new InParameter(
-                        name == null ? createNextParameterName() : name, sqlType, valueSrcToken, scale, typeName);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public OutParameter OutParameter() throws ParseException {
-        Token sqlTypeToken;
-        String outValueMapKey;
-        Integer scale = null;
-        String typeName = null;
-        jj_consume_token(2);
-        sqlTypeToken = ParameterSqlType();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case SCALE:
-                scale = Scale();
-                break;
-            default:
-                jj_la1[6] = jj_gen;
-                ;
-        }
-        jj_consume_token(1);
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case PARAMETER_NAME:
-                typeName = ParameterName();
-                jj_consume_token(1);
-                break;
-            default:
-                jj_la1[7] = jj_gen;
-                ;
-        }
-        outValueMapKey = OutHeader();
-        {
-            if (true)
-                return new OutParameter(ParseHelper.parseSqlType(sqlTypeToken, classResolver), outValueMapKey, scale, typeName);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public InOutParameter InOutParameter() throws ParseException {
-        Token sqlTypeToken;
-        Token valueSrcToken;
-        Integer scale = null;
-        String typeName = null;
-        String outValueMapKey;
-        jj_consume_token(3);
-        sqlTypeToken = ParameterSqlType();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case SCALE:
-                scale = Scale();
-                break;
-            default:
-                jj_la1[8] = jj_gen;
-                ;
-        }
-        jj_consume_token(1);
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case PARAMETER_NAME:
-                typeName = ParameterName();
-                jj_consume_token(1);
-                break;
-            default:
-                jj_la1[9] = jj_gen;
-                ;
-        }
-        valueSrcToken = InParameterSrc();
-        jj_consume_token(1);
-        outValueMapKey = OutHeader();
-        int sqlType = ParseHelper.parseSqlType(sqlTypeToken, classResolver);
-
-        {
-            if (true)
-                return new InOutParameter(sqlType, valueSrcToken, scale, typeName, outValueMapKey);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public String ParameterName() throws ParseException {
-        Token t = null;
-        t = jj_consume_token(PARAMETER_NAME);
-        {
-            if (true)
-                return ParseHelper.removeQuotes(t.toString());
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Integer Scale() throws ParseException {
-        Token t;
-        t = jj_consume_token(SCALE);
-        {
-            if (true)
-                return ParseHelper.parseScale(t);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Token ParameterSqlType() throws ParseException {
-        Token t;
-        Token scaleToken;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case NUMBER:
-                t = jj_consume_token(NUMBER);
-                break;
-            case IDENTIFIER:
-                t = jj_consume_token(IDENTIFIER);
-                break;
-            default:
-                jj_la1[10] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true)
-                return t;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public String OutHeader() throws ParseException {
-        Token token;
-        token = jj_consume_token(IDENTIFIER);
-        {
-            if (true)
-                return token.toString();
-        }
-        throw new Error("Missing return statement in function");
+        jj_consume_token(SEPARATOR);
+        parameter = Parameter();
+                template.addParameter(parameter);
+      }
+      break;
+    default:
+      jj_la1[1] = jj_gen;
+      ;
     }
-
-    final public Token InParameterSrc() throws ParseException {
-        Token ret = null;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case SIMPLE_EXP_TOKEN:
-                ret = jj_consume_token(SIMPLE_EXP_TOKEN); {
-                if (true)
-                    return ret;
-            }
-                break;
-            case PARAMETER_POS_TOKEN:
-                ret = jj_consume_token(PARAMETER_POS_TOKEN); {
-                if (true)
-                    return ret;
-            }
-                break;
-            default:
-                jj_la1[11] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        throw new Error("Missing return statement in function");
+    jj_consume_token(PROCEDURE_END);
+    jj_consume_token(0);
+   template.setProcedureName(procedureName.toString());
+   {if (true) return template;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Object Parameter() throws ParseException {
+    Object param;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case NUMBER:
+    case PARAMETER_NAME:
+    case IDENTIFIER:
+      param = InParameter();
+                             {if (true) return param;}
+      break;
+    case 2:
+      param = OutParameter();
+                                                                       {if (true) return param;}
+      break;
+    case 3:
+      param = InOutParameter();
+                                                                                                                   {if (true) return param;}
+      break;
+    default:
+      jj_la1[2] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
-
-    /** Generated Token Manager. */
-    public SSPTParserTokenManager token_source;
-    SimpleCharStream jj_input_stream;
-    /** Current token. */
-    public Token token;
-    /** Next token. */
-    public Token jj_nt;
-    private int jj_ntk;
-    private int jj_gen;
-    final private int[] jj_la1 = new int[12];
-    static private int[] jj_la1_0;
-    static {
-        jj_la1_init_0();
+    throw new Error("Missing return statement in function");
+  }
+
+  final public InParameter InParameter() throws ParseException {
+     Token sqlTypeToken;
+     String name = null;
+     Token valueSrcToken;
+     Integer scale = null;
+     String typeName = null;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case PARAMETER_NAME:
+      name = ParameterName();
+      jj_consume_token(1);
+      break;
+    default:
+      jj_la1[3] = jj_gen;
+      ;
     }
-
-    private static void jj_la1_init_0() {
-        jj_la1_0 = new int[] {
-                0x800, 0x3002c, 0x3002c, 0x10000, 0x10, 0x10000, 0x10, 0x10000, 0x10, 0x10000, 0x20020, 0xc000, };
+    sqlTypeToken = ParameterSqlType();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case SCALE:
+      scale = Scale();
+      break;
+    default:
+      jj_la1[4] = jj_gen;
+      ;
     }
-
-    /** Constructor with InputStream. */
-    public SSPTParser(java.io.InputStream stream) {
-        this(stream, null);
+    jj_consume_token(1);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case PARAMETER_NAME:
+      typeName = ParameterName();
+      jj_consume_token(1);
+      break;
+    default:
+      jj_la1[5] = jj_gen;
+      ;
     }
+    valueSrcToken = InParameterSrc();
+        int sqlType = ParseHelper.parseSqlType(sqlTypeToken, classResolver);
 
-    /** Constructor with InputStream and supplied encoding */
-    public SSPTParser(java.io.InputStream stream, String encoding) {
-        try {
-            jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1);
-        } catch (java.io.UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-        token_source = new SSPTParserTokenManager(jj_input_stream);
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 12; i++)
-            jj_la1[i] = -1;
+        {if (true) return new InParameter(name == null ? createNextParameterName() : name, sqlType, valueSrcToken, scale, typeName);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public OutParameter OutParameter() throws ParseException {
+     Token sqlTypeToken;
+     String outValueMapKey;
+     Integer scale = null;
+     String typeName = null;
+    jj_consume_token(2);
+    sqlTypeToken = ParameterSqlType();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case SCALE:
+      scale = Scale();
+      break;
+    default:
+      jj_la1[6] = jj_gen;
+      ;
     }
-
-    /** Reinitialise. */
-    public void ReInit(java.io.InputStream stream) {
-        ReInit(stream, null);
+    jj_consume_token(1);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case PARAMETER_NAME:
+      typeName = ParameterName();
+      jj_consume_token(1);
+      break;
+    default:
+      jj_la1[7] = jj_gen;
+      ;
     }
-
-    /** Reinitialise. */
-    public void ReInit(java.io.InputStream stream, String encoding) {
-        try {
-            jj_input_stream.ReInit(stream, encoding, 1, 1);
-        } catch (java.io.UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-        token_source.ReInit(jj_input_stream);
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 12; i++)
-            jj_la1[i] = -1;
+    outValueMapKey = OutHeader();
+        {if (true) return new OutParameter(ParseHelper.parseSqlType(sqlTypeToken, classResolver), outValueMapKey, scale, typeName);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public InOutParameter InOutParameter() throws ParseException {
+     Token sqlTypeToken;
+     Token valueSrcToken;
+     Integer scale = null;
+     String typeName = null;
+     String outValueMapKey;
+    jj_consume_token(3);
+    sqlTypeToken = ParameterSqlType();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case SCALE:
+      scale = Scale();
+      break;
+    default:
+      jj_la1[8] = jj_gen;
+      ;
     }
-
-    /** Constructor. */
-    public SSPTParser(java.io.Reader stream) {
-        jj_input_stream = new SimpleCharStream(stream, 1, 1);
-        token_source = new SSPTParserTokenManager(jj_input_stream);
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 12; i++)
-            jj_la1[i] = -1;
+    jj_consume_token(1);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case PARAMETER_NAME:
+      typeName = ParameterName();
+      jj_consume_token(1);
+      break;
+    default:
+      jj_la1[9] = jj_gen;
+      ;
     }
+    valueSrcToken = InParameterSrc();
+    jj_consume_token(1);
+    outValueMapKey = OutHeader();
+        int sqlType = ParseHelper.parseSqlType(sqlTypeToken, classResolver);
 
-    /** Reinitialise. */
-    public void ReInit(java.io.Reader stream) {
-        jj_input_stream.ReInit(stream, 1, 1);
-        token_source.ReInit(jj_input_stream);
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 12; i++)
-            jj_la1[i] = -1;
+        {if (true) return new InOutParameter(sqlType, valueSrcToken, scale, typeName, outValueMapKey);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public String ParameterName() throws ParseException {
+    Token t = null;
+    t = jj_consume_token(PARAMETER_NAME);
+        {if (true) return ParseHelper.removeQuotes(t.toString()) ;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Integer Scale() throws ParseException {
+    Token t;
+    t = jj_consume_token(SCALE);
+        {if (true) return ParseHelper.parseScale(t);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Token ParameterSqlType() throws ParseException {
+    Token t;
+    Token scaleToken;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case NUMBER:
+      t = jj_consume_token(NUMBER);
+      break;
+    case IDENTIFIER:
+      t = jj_consume_token(IDENTIFIER);
+      break;
+    default:
+      jj_la1[10] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
-
-    /** Constructor with generated Token Manager. */
-    public SSPTParser(SSPTParserTokenManager tm) {
-        token_source = tm;
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 12; i++)
-            jj_la1[i] = -1;
+        {if (true) return t;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public String OutHeader() throws ParseException {
+ Token token;
+    token = jj_consume_token(IDENTIFIER);
+        {if (true) return token.toString();}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Token InParameterSrc() throws ParseException {
+    Token ret = null;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case SIMPLE_EXP_TOKEN:
+      ret = jj_consume_token(SIMPLE_EXP_TOKEN);
+        {if (true) return ret;}
+      break;
+    case PARAMETER_POS_TOKEN:
+      ret = jj_consume_token(PARAMETER_POS_TOKEN);
+            {if (true) return ret;}
+      break;
+    default:
+      jj_la1[11] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
-
-    /** Reinitialise. */
-    public void ReInit(SSPTParserTokenManager tm) {
-        token_source = tm;
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 12; i++)
-            jj_la1[i] = -1;
+    throw new Error("Missing return statement in function");
+  }
+
+  /** Generated Token Manager. */
+  public SSPTParserTokenManager token_source;
+  SimpleCharStream jj_input_stream;
+  /** Current token. */
+  public Token token;
+  /** Next token. */
+  public Token jj_nt;
+  private int jj_ntk;
+  private int jj_gen;
+  final private int[] jj_la1 = new int[12];
+  static private int[] jj_la1_0;
+  static {
+      jj_la1_init_0();
+   }
+   private static void jj_la1_init_0() {
+      jj_la1_0 = new int[] {0x800,0x3002c,0x3002c,0x10000,0x10,0x10000,0x10,0x10000,0x10,0x10000,0x20020,0xc000,};
+   }
+
+  /** Constructor with InputStream. */
+  public SSPTParser(java.io.InputStream stream) {
+     this(stream, null);
+  }
+  /** Constructor with InputStream and supplied encoding */
+  public SSPTParser(java.io.InputStream stream, String encoding) {
+    try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source = new SSPTParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
+  }
+
+  /** Reinitialise. */
+  public void ReInit(java.io.InputStream stream) {
+     ReInit(stream, null);
+  }
+  /** Reinitialise. */
+  public void ReInit(java.io.InputStream stream, String encoding) {
+    try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
+  }
+
+  /** Constructor. */
+  public SSPTParser(java.io.Reader stream) {
+    jj_input_stream = new SimpleCharStream(stream, 1, 1);
+    token_source = new SSPTParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
+  }
+
+  /** Reinitialise. */
+  public void ReInit(java.io.Reader stream) {
+    jj_input_stream.ReInit(stream, 1, 1);
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
+  }
+
+  /** Constructor with generated Token Manager. */
+  public SSPTParser(SSPTParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
+  }
+
+  /** Reinitialise. */
+  public void ReInit(SSPTParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 12; i++) jj_la1[i] = -1;
+  }
+
+  private Token jj_consume_token(int kind) throws ParseException {
+    Token oldToken;
+    if ((oldToken = token).next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    if (token.kind == kind) {
+      jj_gen++;
+      return token;
     }
-
-    private Token jj_consume_token(int kind) throws ParseException {
-        Token oldToken;
-        if ((oldToken = token).next != null)
-            token = token.next;
-        else
-            token = token.next = token_source.getNextToken();
-        jj_ntk = -1;
-        if (token.kind == kind) {
-            jj_gen++;
-            return token;
-        }
-        token = oldToken;
-        jj_kind = kind;
-        throw generateParseException();
+    token = oldToken;
+    jj_kind = kind;
+    throw generateParseException();
+  }
+
+
+/** Get the next Token. */
+  final public Token getNextToken() {
+    if (token.next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    jj_gen++;
+    return token;
+  }
+
+/** Get the specific Token. */
+  final public Token getToken(int index) {
+    Token t = token;
+    for (int i = 0; i < index; i++) {
+      if (t.next != null) t = t.next;
+      else t = t.next = token_source.getNextToken();
     }
-
-    /** Get the next Token. */
-    final public Token getNextToken() {
-        if (token.next != null)
-            token = token.next;
-        else
-            token = token.next = token_source.getNextToken();
-        jj_ntk = -1;
-        jj_gen++;
-        return token;
+    return t;
+  }
+
+  private int jj_ntk() {
+    if ((jj_nt=token.next) == null)
+      return (jj_ntk = (token.next=token_source.getNextToken()).kind);
+    else
+      return (jj_ntk = jj_nt.kind);
+  }
+
+  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
+  private int[] jj_expentry;
+  private int jj_kind = -1;
+
+  /** Generate ParseException. */
+  public ParseException generateParseException() {
+    jj_expentries.clear();
+    boolean[] la1tokens = new boolean[18];
+    if (jj_kind >= 0) {
+      la1tokens[jj_kind] = true;
+      jj_kind = -1;
     }
-
-    /** Get the specific Token. */
-    final public Token getToken(int index) {
-        Token t = token;
-        for (int i = 0; i < index; i++) {
-            if (t.next != null)
-                t = t.next;
-            else
-                t = t.next = token_source.getNextToken();
+    for (int i = 0; i < 12; i++) {
+      if (jj_la1[i] == jj_gen) {
+        for (int j = 0; j < 32; j++) {
+          if ((jj_la1_0[i] & (1<<j)) != 0) {
+            la1tokens[j] = true;
+          }
         }
-        return t;
+      }
     }
-
-    private int jj_ntk() {
-        if ((jj_nt = token.next) == null)
-            return (jj_ntk = (token.next = token_source.getNextToken()).kind);
-        else
-            return (jj_ntk = jj_nt.kind);
+    for (int i = 0; i < 18; i++) {
+      if (la1tokens[i]) {
+        jj_expentry = new int[1];
+        jj_expentry[0] = i;
+        jj_expentries.add(jj_expentry);
+      }
     }
-
-    private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
-    private int[] jj_expentry;
-    private int jj_kind = -1;
-
-    /** Generate ParseException. */
-    public ParseException generateParseException() {
-        jj_expentries.clear();
-        boolean[] la1tokens = new boolean[18];
-        if (jj_kind >= 0) {
-            la1tokens[jj_kind] = true;
-            jj_kind = -1;
-        }
-        for (int i = 0; i < 12; i++) {
-            if (jj_la1[i] == jj_gen) {
-                for (int j = 0; j < 32; j++) {
-                    if ((jj_la1_0[i] & (1 << j)) != 0) {
-                        la1tokens[j] = true;
-                    }
-                }
-            }
-        }
-        for (int i = 0; i < 18; i++) {
-            if (la1tokens[i]) {
-                jj_expentry = new int[1];
-                jj_expentry[0] = i;
-                jj_expentries.add(jj_expentry);
-            }
-        }
-        int[][] exptokseq = new int[jj_expentries.size()][];
-        for (int i = 0; i < jj_expentries.size(); i++) {
-            exptokseq[i] = jj_expentries.get(i);
-        }
-        return new ParseException(token, exptokseq, tokenImage);
+    int[][] exptokseq = new int[jj_expentries.size()][];
+    for (int i = 0; i < jj_expentries.size(); i++) {
+      exptokseq[i] = jj_expentries.get(i);
     }
+    return new ParseException(token, exptokseq, tokenImage);
+  }
 
-    /** Enable tracing. */
-    final public void enable_tracing() {
-    }
+  /** Enable tracing. */
+  final public void enable_tracing() {
+  }
 
-    /** Disable tracing. */
-    final public void disable_tracing() {
-    }
+  /** Disable tracing. */
+  final public void disable_tracing() {
+  }
 
 }
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
index b3363d9..f48d31d 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserConstants.java
@@ -1,65 +1,67 @@
 /* Generated By:JavaCC: Do not edit this line. SSPTParserConstants.java */
 package org.apache.camel.component.sql.stored.template.generated;
 
+
 /**
- * Token literal values and constants. Generated by org.javacc.parser.OtherFilesGen#start()
+ * Token literal values and constants.
+ * Generated by org.javacc.parser.OtherFilesGen#start()
  */
 public interface SSPTParserConstants {
 
-    /** End of File. */
-    int EOF = 0;
-    /** RegularExpression Id. */
-    int SCALE = 4;
-    /** RegularExpression Id. */
-    int NUMBER = 5;
-    /** RegularExpression Id. */
-    int DIGIT = 6;
-    /** RegularExpression Id. */
-    int LETTER = 7;
-    /** RegularExpression Id. */
-    int SPECIAL = 8;
-    /** RegularExpression Id. */
-    int WHITESPACE = 9;
-    /** RegularExpression Id. */
-    int COMMA = 10;
-    /** RegularExpression Id. */
-    int SEPARATOR = 11;
-    /** RegularExpression Id. */
-    int PROCEDURE_BEGIN = 12;
-    /** RegularExpression Id. */
-    int PROCEDURE_END = 13;
-    /** RegularExpression Id. */
-    int SIMPLE_EXP_TOKEN = 14;
-    /** RegularExpression Id. */
-    int PARAMETER_POS_TOKEN = 15;
-    /** RegularExpression Id. */
-    int PARAMETER_NAME = 16;
-    /** RegularExpression Id. */
-    int IDENTIFIER = 17;
+  /** End of File. */
+  int EOF = 0;
+  /** RegularExpression Id. */
+  int SCALE = 4;
+  /** RegularExpression Id. */
+  int NUMBER = 5;
+  /** RegularExpression Id. */
+  int DIGIT = 6;
+  /** RegularExpression Id. */
+  int LETTER = 7;
+  /** RegularExpression Id. */
+  int SPECIAL = 8;
+  /** RegularExpression Id. */
+  int WHITESPACE = 9;
+  /** RegularExpression Id. */
+  int COMMA = 10;
+  /** RegularExpression Id. */
+  int SEPARATOR = 11;
+  /** RegularExpression Id. */
+  int PROCEDURE_BEGIN = 12;
+  /** RegularExpression Id. */
+  int PROCEDURE_END = 13;
+  /** RegularExpression Id. */
+  int SIMPLE_EXP_TOKEN = 14;
+  /** RegularExpression Id. */
+  int PARAMETER_POS_TOKEN = 15;
+  /** RegularExpression Id. */
+  int PARAMETER_NAME = 16;
+  /** RegularExpression Id. */
+  int IDENTIFIER = 17;
 
-    /** Lexical state. */
-    int DEFAULT = 0;
+  /** Lexical state. */
+  int DEFAULT = 0;
 
-    /** Literal token values. */
-    String[] tokenImage = {
-            "<EOF>",
-            "\" \"",
-            "\"OUT \"",
-            "\"INOUT \"",
-            "<SCALE>",
-            "<NUMBER>",
-            "<DIGIT>",
-            "<LETTER>",
-            "<SPECIAL>",
-            "<WHITESPACE>",
-            "\",\"",
-            "<SEPARATOR>",
-            "<PROCEDURE_BEGIN>",
-            "<PROCEDURE_END>",
-            "<SIMPLE_EXP_TOKEN>",
-            "<PARAMETER_POS_TOKEN>",
-            "<PARAMETER_NAME>",
-            "<IDENTIFIER>",
-    };
+  /** Literal token values. */
+  String[] tokenImage = {
+    "<EOF>",
+    "\" \"",
+    "\"OUT \"",
+    "\"INOUT \"",
+    "<SCALE>",
+    "<NUMBER>",
+    "<DIGIT>",
+    "<LETTER>",
+    "<SPECIAL>",
+    "<WHITESPACE>",
+    "\",\"",
+    "<SEPARATOR>",
+    "<PROCEDURE_BEGIN>",
+    "<PROCEDURE_END>",
+    "<SIMPLE_EXP_TOKEN>",
+    "<PARAMETER_POS_TOKEN>",
+    "<PARAMETER_NAME>",
+    "<IDENTIFIER>",
+  };
 
 }
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
index db7f99c..ba002be 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java
@@ -1,612 +1,646 @@
 /* Generated By:JavaCC: Do not edit this line. SSPTParserTokenManager.java */
 package org.apache.camel.component.sql.stored.template.generated;
-
+import java.io.Reader;
+import org.apache.camel.spi.ClassResolver;
 import org.apache.camel.component.sql.stored.template.ast.*;
 
 /** Token Manager. */
-public class SSPTParserTokenManager implements SSPTParserConstants {
-
-    /** Debug output. */
-    public java.io.PrintStream debugStream = System.out;
-
-    /** Set debug output. */
-    public void setDebugStream(java.io.PrintStream ds) {
-        debugStream = ds;
-    }
-
-    private final int jjStopStringLiteralDfa_0(int pos, long active0) {
-        switch (pos) {
-            case 0:
-                if ((active0 & 0xcL) != 0L) {
-                    jjmatchedKind = 17;
-                    return 15;
-                }
-                if ((active0 & 0x2L) != 0L)
-                    return 25;
-                return -1;
-            case 1:
-                if ((active0 & 0xcL) != 0L) {
-                    jjmatchedKind = 17;
-                    jjmatchedPos = 1;
-                    return 15;
-                }
-                return -1;
-            case 2:
-                if ((active0 & 0xcL) != 0L) {
-                    jjmatchedKind = 17;
-                    jjmatchedPos = 2;
-                    return 15;
-                }
-                return -1;
-            case 3:
-                if ((active0 & 0x8L) != 0L) {
-                    jjmatchedKind = 17;
-                    jjmatchedPos = 3;
-                    return 15;
-                }
-                return -1;
-            case 4:
-                if ((active0 & 0x8L) != 0L) {
-                    jjmatchedKind = 17;
-                    jjmatchedPos = 4;
-                    return 15;
-                }
-                return -1;
-            default:
-                return -1;
-        }
-    }
-
-    private final int jjStartNfa_0(int pos, long active0) {
-        return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
-    }
-
-    private int jjStopAtPos(int pos, int kind) {
-        jjmatchedKind = kind;
-        jjmatchedPos = pos;
-        return pos + 1;
-    }
-
-    private int jjMoveStringLiteralDfa0_0() {
-        switch (curChar) {
-            case 32:
-                return jjStartNfaWithStates_0(0, 1, 25);
-            case 73:
-                return jjMoveStringLiteralDfa1_0(0x8L);
-            case 79:
-                return jjMoveStringLiteralDfa1_0(0x4L);
-            default:
-                return jjMoveNfa_0(8, 0);
-        }
-    }
-
-    private int jjMoveStringLiteralDfa1_0(long active0) {
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(0, active0);
-            return 1;
-        }
-        switch (curChar) {
-            case 78:
-                return jjMoveStringLiteralDfa2_0(active0, 0x8L);
-            case 85:
-                return jjMoveStringLiteralDfa2_0(active0, 0x4L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(0, active0);
-    }
-
-    private int jjMoveStringLiteralDfa2_0(long old0, long active0) {
-        if (((active0 &= old0)) == 0L)
-            return jjStartNfa_0(0, old0);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(1, active0);
-            return 2;
-        }
-        switch (curChar) {
-            case 79:
-                return jjMoveStringLiteralDfa3_0(active0, 0x8L);
-            case 84:
-                return jjMoveStringLiteralDfa3_0(active0, 0x4L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(1, active0);
-    }
-
-    private int jjMoveStringLiteralDfa3_0(long old0, long active0) {
-        if (((active0 &= old0)) == 0L)
-            return jjStartNfa_0(1, old0);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(2, active0);
-            return 3;
-        }
-        switch (curChar) {
-            case 32:
-                if ((active0 & 0x4L) != 0L)
-                    return jjStopAtPos(3, 2);
-                break;
-            case 85:
-                return jjMoveStringLiteralDfa4_0(active0, 0x8L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(2, active0);
-    }
-
-    private int jjMoveStringLiteralDfa4_0(long old0, long active0) {
-        if (((active0 &= old0)) == 0L)
-            return jjStartNfa_0(2, old0);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(3, active0);
-            return 4;
-        }
-        switch (curChar) {
-            case 84:
-                return jjMoveStringLiteralDfa5_0(active0, 0x8L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(3, active0);
-    }
-
-    private int jjMoveStringLiteralDfa5_0(long old0, long active0) {
-        if (((active0 &= old0)) == 0L)
-            return jjStartNfa_0(3, old0);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(4, active0);
-            return 5;
-        }
-        switch (curChar) {
-            case 32:
-                if ((active0 & 0x8L) != 0L)
-                    return jjStopAtPos(5, 3);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(4, active0);
-    }
-
-    private int jjStartNfaWithStates_0(int pos, int kind, int state) {
-        jjmatchedKind = kind;
-        jjmatchedPos = pos;
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            return pos + 1;
-        }
-        return jjMoveNfa_0(state, pos + 1);
-    }
-
-    private int jjMoveNfa_0(int startState, int curPos) {
-        int startsAt = 0;
-        jjnewStateCnt = 25;
-        int i = 1;
-        jjstateSet[0] = startState;
-        int kind = 0x7fffffff;
-        for (;;) {
-            if (++jjround == 0x7fffffff)
-                ReInitRounds();
-            if (curChar < 64) {
-                long l = 1L << curChar;
-                do {
-                    switch (jjstateSet[--i]) {
-                        case 8:
-                            if ((0x7ff609c00000000L & l) != 0L) {
-                                if (kind > 17)
-                                    kind = 17;
-                                jjCheckNAdd(15);
-                            } else if ((0x100002600L & l) != 0L) {
-                                if (kind > 9)
-                                    kind = 9;
-                                jjCheckNAddStates(0, 5);
-                            } else if (curChar == 40) {
-                                if (kind > 12)
-                                    kind = 12;
-                                jjCheckNAddTwoStates(17, 19);
-                            } else if (curChar == 41) {
-                                if (kind > 13)
-                                    kind = 13;
-                                jjCheckNAdd(4);
-                            } else if (curChar == 44) {
-                                if (kind > 11)
-                                    kind = 11;
-                                jjCheckNAdd(2);
-                            }
-                            if ((0x3ff200000000000L & l) != 0L) {
-                                if (kind > 5)
-                                    kind = 5;
-                                jjCheckNAdd(0);
-                            } else if (curChar == 39)
-                                jjCheckNAdd(13);
-                            else if (curChar == 58)
-                                jjstateSet[jjnewStateCnt++] = 9;
-                            else if (curChar == 36)
-                                jjstateSet[jjnewStateCnt++] = 5;
-                            break;
-                        case 25:
-                            if ((0x100002600L & l) != 0L)
-                                jjCheckNAddTwoStates(24, 3);
-                            else if (curChar == 41) {
-                                if (kind > 13)
-                                    kind = 13;
-                                jjCheckNAdd(4);
-                            } else if (curChar == 40) {
-                                if (kind > 12)
-                                    kind = 12;
-                                jjCheckNAdd(19);
-                            } else if (curChar == 44) {
-                                if (kind > 11)
-                                    kind = 11;
-                                jjCheckNAdd(2);
-                            }
-                            if ((0x100002600L & l) != 0L)
-                                jjCheckNAddTwoStates(22, 23);
-                            if ((0x100002600L & l) != 0L)
-                                jjCheckNAddTwoStates(21, 1);
-                            break;
-                        case 0:
-                            if ((0x3ff200000000000L & l) == 0L)
-                                break;
-                            if (kind > 5)
-                                kind = 5;
-                            jjCheckNAdd(0);
-                            break;
-                        case 1:
-                            if (curChar != 44)
-                                break;
-                            kind = 11;
-                            jjCheckNAdd(2);
-                            break;
-                        case 2:
-                            if ((0x100002600L & l) == 0L)
-                                break;
-                            if (kind > 11)
-                                kind = 11;
-                            jjCheckNAdd(2);
-                            break;
-                        case 3:
-                            if (curChar != 41)
-                                break;
-                            if (kind > 13)
-                                kind = 13;
-                            jjCheckNAdd(4);
-                            break;
-                        case 4:
-                            if ((0x100002600L & l) == 0L)
-                                break;
-                            if (kind > 13)
-                                kind = 13;
-                            jjCheckNAdd(4);
-                            break;
-                        case 6:
-                            if ((0x7ff609d00000000L & l) != 0L)
-                                jjAddStates(6, 7);
-                            break;
-                        case 9:
-                            if (curChar == 35)
-                                jjCheckNAdd(10);
-                            break;
-                        case 10:
-                            if ((0x7ff609c00000000L & l) == 0L)
-                                break;
-                            if (kind > 15)
-                                kind = 15;
-                            jjCheckNAdd(10);
-                            break;
-                        case 11:
-                            if (curChar == 58)
-                                jjstateSet[jjnewStateCnt++] = 9;
-                            break;
-                        case 12:
-                            if (curChar == 39)
-                                jjCheckNAdd(13);
-                            break;
-                        case 13:
-                            if ((0x7ff609c00000000L & l) != 0L)
-                                jjCheckNAddTwoStates(13, 14);
-                            break;
-                        case 14:
-                            if (curChar == 39 && kind > 16)
-                                kind = 16;
-                            break;
-                        case 15:
-                            if ((0x7ff609c00000000L & l) == 0L)
-                                break;
-                            if (kind > 17)
-                                kind = 17;
-                            jjCheckNAdd(15);
-                            break;
-                        case 16:
-                            if (curChar != 40)
-                                break;
-                            if (kind > 12)
-                                kind = 12;
-                            jjCheckNAddTwoStates(17, 19);
-                            break;
-                        case 17:
-                            if ((0x3ff200000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(17, 18);
-                            break;
-                        case 18:
-                            if (curChar == 41 && kind > 4)
-                                kind = 4;
-                            break;
-                        case 19:
-                            if ((0x100002600L & l) == 0L)
-                                break;
-                            if (kind > 12)
-                                kind = 12;
-                            jjCheckNAdd(19);
-                            break;
-                        case 20:
-                            if ((0x100002600L & l) == 0L)
-                                break;
-                            if (kind > 9)
-                                kind = 9;
-                            jjCheckNAddStates(0, 5);
-                            break;
-                        case 21:
-                            if ((0x100002600L & l) != 0L)
-                                jjCheckNAddTwoStates(21, 1);
-                            break;
-                        case 22:
-                            if ((0x100002600L & l) != 0L)
-                                jjCheckNAddTwoStates(22, 23);
-                            break;
-                        case 23:
-                            if (curChar != 40)
-                                break;
-                            if (kind > 12)
-                                kind = 12;
-                            jjCheckNAdd(19);
-                            break;
-                        case 24:
-                            if ((0x100002600L & l) != 0L)
-                                jjCheckNAddTwoStates(24, 3);
-                            break;
-                        default:
-                            break;
-                    }
-                } while (i != startsAt);
-            } else if (curChar < 128) {
-                long l = 1L << (curChar & 077);
-                do {
-                    switch (jjstateSet[--i]) {
-                        case 8:
-                        case 15:
-                            if ((0x2ffffffeaffffffeL & l) == 0L)
-                                break;
-                            if (kind > 17)
-                                kind = 17;
-                            jjCheckNAdd(15);
-                            break;
-                        case 5:
-                            if (curChar == 123)
-                                jjCheckNAdd(6);
-                            break;
-                        case 6:
-                            if ((0x2ffffffeaffffffeL & l) != 0L)
-                                jjCheckNAddTwoStates(6, 7);
-                            break;
-                        case 7:
-                            if (curChar == 125 && kind > 14)
-                                kind = 14;
-                            break;
-                        case 10:
-                            if ((0x2ffffffeaffffffeL & l) == 0L)
-                                break;
-                            if (kind > 15)
-                                kind = 15;
-                            jjstateSet[jjnewStateCnt++] = 10;
-                            break;
-                        case 13:
-                            if ((0x2ffffffeaffffffeL & l) != 0L)
-                                jjAddStates(8, 9);
-                            break;
-                        default:
-                            break;
-                    }
-                } while (i != startsAt);
-            } else {
-                int i2 = (curChar & 0xff) >> 6;
-                long l2 = 1L << (curChar & 077);
-                do {
-                    switch (jjstateSet[--i]) {
-                        default:
-                            break;
-                    }
-                } while (i != startsAt);
+public class SSPTParserTokenManager implements SSPTParserConstants
+{
+
+  /** Debug output. */
+  public  java.io.PrintStream debugStream = System.out;
+  /** Set debug output. */
+  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
+private final int jjStopStringLiteralDfa_0(int pos, long active0)
+{
+   switch (pos)
+   {
+      case 0:
+         if ((active0 & 0xcL) != 0L)
+         {
+            jjmatchedKind = 17;
+            return 15;
+         }
+         if ((active0 & 0x2L) != 0L)
+            return 25;
+         return -1;
+      case 1:
+         if ((active0 & 0xcL) != 0L)
+         {
+            jjmatchedKind = 17;
+            jjmatchedPos = 1;
+            return 15;
+         }
+         return -1;
+      case 2:
+         if ((active0 & 0xcL) != 0L)
+         {
+            jjmatchedKind = 17;
+            jjmatchedPos = 2;
+            return 15;
+         }
+         return -1;
+      case 3:
+         if ((active0 & 0x8L) != 0L)
+         {
+            jjmatchedKind = 17;
+            jjmatchedPos = 3;
+            return 15;
+         }
+         return -1;
+      case 4:
+         if ((active0 & 0x8L) != 0L)
+         {
+            jjmatchedKind = 17;
+            jjmatchedPos = 4;
+            return 15;
+         }
+         return -1;
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_0(int pos, long active0)
+{
+   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
+}
+private int jjStopAtPos(int pos, int kind)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   return pos + 1;
+}
+private int jjMoveStringLiteralDfa0_0()
+{
+   switch(curChar)
+   {
+      case 32:
+         return jjStartNfaWithStates_0(0, 1, 25);
+      case 73:
+         return jjMoveStringLiteralDfa1_0(0x8L);
+      case 79:
+         return jjMoveStringLiteralDfa1_0(0x4L);
+      default :
+         return jjMoveNfa_0(8, 0);
+   }
+}
+private int jjMoveStringLiteralDfa1_0(long active0)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(0, active0);
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 78:
+         return jjMoveStringLiteralDfa2_0(active0, 0x8L);
+      case 85:
+         return jjMoveStringLiteralDfa2_0(active0, 0x4L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(0, active0);
+}
+private int jjMoveStringLiteralDfa2_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(0, old0);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(1, active0);
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 79:
+         return jjMoveStringLiteralDfa3_0(active0, 0x8L);
+      case 84:
+         return jjMoveStringLiteralDfa3_0(active0, 0x4L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(1, active0);
+}
+private int jjMoveStringLiteralDfa3_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(1, old0);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(2, active0);
+      return 3;
+   }
+   switch(curChar)
+   {
+      case 32:
+         if ((active0 & 0x4L) != 0L)
+            return jjStopAtPos(3, 2);
+         break;
+      case 85:
+         return jjMoveStringLiteralDfa4_0(active0, 0x8L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(2, active0);
+}
+private int jjMoveStringLiteralDfa4_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(2, old0);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(3, active0);
+      return 4;
+   }
+   switch(curChar)
+   {
+      case 84:
+         return jjMoveStringLiteralDfa5_0(active0, 0x8L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(3, active0);
+}
+private int jjMoveStringLiteralDfa5_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(3, old0);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(4, active0);
+      return 5;
+   }
+   switch(curChar)
+   {
+      case 32:
+         if ((active0 & 0x8L) != 0L)
+            return jjStopAtPos(5, 3);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(4, active0);
+}
+private int jjStartNfaWithStates_0(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_0(state, pos + 1);
+}
+private int jjMoveNfa_0(int startState, int curPos)
+{
+   int startsAt = 0;
+   jjnewStateCnt = 25;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 8:
+                  if ((0x7ff609c00000000L & l) != 0L)
+                  {
+                     if (kind > 17)
+                        kind = 17;
+                     jjCheckNAdd(15);
+                  }
+                  else if ((0x100002600L & l) != 0L)
+                  {
+                     if (kind > 9)
+                        kind = 9;
+                     jjCheckNAddStates(0, 5);
+                  }
+                  else if (curChar == 40)
+                  {
+                     if (kind > 12)
+                        kind = 12;
+                     jjCheckNAddTwoStates(17, 19);
+                  }
+                  else if (curChar == 41)
+                  {
+                     if (kind > 13)
+                        kind = 13;
+                     jjCheckNAdd(4);
+                  }
+                  else if (curChar == 44)
+                  {
+                     if (kind > 11)
+                        kind = 11;
+                     jjCheckNAdd(2);
+                  }
+                  if ((0x3ff200000000000L & l) != 0L)
+                  {
+                     if (kind > 5)
+                        kind = 5;
+                     jjCheckNAdd(0);
+                  }
+                  else if (curChar == 39)
+                     jjCheckNAdd(13);
+                  else if (curChar == 58)
+                     jjstateSet[jjnewStateCnt++] = 9;
+                  else if (curChar == 36)
+                     jjstateSet[jjnewStateCnt++] = 5;
+                  break;
+               case 25:
+                  if ((0x100002600L & l) != 0L)
+                     jjCheckNAddTwoStates(24, 3);
+                  else if (curChar == 41)
+                  {
+                     if (kind > 13)
+                        kind = 13;
+                     jjCheckNAdd(4);
+                  }
+                  else if (curChar == 40)
+                  {
+                     if (kind > 12)
+                        kind = 12;
+                     jjCheckNAdd(19);
+                  }
+                  else if (curChar == 44)
+                  {
+                     if (kind > 11)
+                        kind = 11;
+                     jjCheckNAdd(2);
+                  }
+                  if ((0x100002600L & l) != 0L)
+                     jjCheckNAddTwoStates(22, 23);
+                  if ((0x100002600L & l) != 0L)
+                     jjCheckNAddTwoStates(21, 1);
+                  break;
+               case 0:
+                  if ((0x3ff200000000000L & l) == 0L)
+                     break;
+                  if (kind > 5)
+                     kind = 5;
+                  jjCheckNAdd(0);
+                  break;
+               case 1:
+                  if (curChar != 44)
+                     break;
+                  kind = 11;
+                  jjCheckNAdd(2);
+                  break;
+               case 2:
+                  if ((0x100002600L & l) == 0L)
+                     break;
+                  if (kind > 11)
+                     kind = 11;
+                  jjCheckNAdd(2);
+                  break;
+               case 3:
+                  if (curChar != 41)
+                     break;
+                  if (kind > 13)
+                     kind = 13;
+                  jjCheckNAdd(4);
+                  break;
+               case 4:
+                  if ((0x100002600L & l) == 0L)
+                     break;
+                  if (kind > 13)
+                     kind = 13;
+                  jjCheckNAdd(4);
+                  break;
+               case 6:
+                  if ((0x7ff609d00000000L & l) != 0L)
+                     jjAddStates(6, 7);
+                  break;
+               case 9:
+                  if (curChar == 35)
+                     jjCheckNAdd(10);
+                  break;
+               case 10:
+                  if ((0x7ff609c00000000L & l) == 0L)
+                     break;
+                  if (kind > 15)
+                     kind = 15;
+                  jjCheckNAdd(10);
+                  break;
+               case 11:
+                  if (curChar == 58)
+                     jjstateSet[jjnewStateCnt++] = 9;
+                  break;
+               case 12:
+                  if (curChar == 39)
+                     jjCheckNAdd(13);
+                  break;
+               case 13:
+                  if ((0x7ff609c00000000L & l) != 0L)
+                     jjCheckNAddTwoStates(13, 14);
+                  break;
+               case 14:
+                  if (curChar == 39 && kind > 16)
+                     kind = 16;
+                  break;
+               case 15:
+                  if ((0x7ff609c00000000L & l) == 0L)
+                     break;
+                  if (kind > 17)
+                     kind = 17;
+                  jjCheckNAdd(15);
+                  break;
+               case 16:
+                  if (curChar != 40)
+                     break;
+                  if (kind > 12)
+                     kind = 12;
+                  jjCheckNAddTwoStates(17, 19);
+                  break;
+               case 17:
+                  if ((0x3ff200000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(17, 18);
+                  break;
+               case 18:
+                  if (curChar == 41 && kind > 4)
+                     kind = 4;
+                  break;
+               case 19:
+                  if ((0x100002600L & l) == 0L)
+                     break;
+                  if (kind > 12)
+                     kind = 12;
+                  jjCheckNAdd(19);
+                  break;
+               case 20:
+                  if ((0x100002600L & l) == 0L)
+                     break;
+                  if (kind > 9)
+                     kind = 9;
+                  jjCheckNAddStates(0, 5);
+                  break;
+               case 21:
+                  if ((0x100002600L & l) != 0L)
+                     jjCheckNAddTwoStates(21, 1);
+                  break;
+               case 22:
+                  if ((0x100002600L & l) != 0L)
+                     jjCheckNAddTwoStates(22, 23);
+                  break;
+               case 23:
+                  if (curChar != 40)
+                     break;
+                  if (kind > 12)
+                     kind = 12;
+                  jjCheckNAdd(19);
+                  break;
+               case 24:
+                  if ((0x100002600L & l) != 0L)
+                     jjCheckNAddTwoStates(24, 3);
+                  break;
+               default : break;
             }
-            if (kind != 0x7fffffff) {
-                jjmatchedKind = kind;
-                jjmatchedPos = curPos;
-                kind = 0x7fffffff;
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 8:
+               case 15:
+                  if ((0x2ffffffeaffffffeL & l) == 0L)
+                     break;
+                  if (kind > 17)
+                     kind = 17;
+                  jjCheckNAdd(15);
+                  break;
+               case 5:
+                  if (curChar == 123)
+                     jjCheckNAdd(6);
+                  break;
+               case 6:
+                  if ((0x2ffffffeaffffffeL & l) != 0L)
+                     jjCheckNAddTwoStates(6, 7);
+                  break;
+               case 7:
+                  if (curChar == 125 && kind > 14)
+                     kind = 14;
+                  break;
+               case 10:
+                  if ((0x2ffffffeaffffffeL & l) == 0L)
+                     break;
+                  if (kind > 15)
+                     kind = 15;
+                  jjstateSet[jjnewStateCnt++] = 10;
+                  break;
+               case 13:
+                  if ((0x2ffffffeaffffffeL & l) != 0L)
+                     jjAddStates(8, 9);
+                  break;
+               default : break;
             }
-            ++curPos;
-            if ((i = jjnewStateCnt) == (startsAt = 25 - (jjnewStateCnt = startsAt)))
-                return curPos;
-            try {
-                curChar = input_stream.readChar();
-            } catch (java.io.IOException e) {
-                return curPos;
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               default : break;
             }
-        }
-    }
-
-    static final int[] jjnextStates = {
-            21, 1, 22, 23, 24, 3, 6, 7, 13, 14,
-    };
-
-    /** Token literal values. */
-    public static final String[] jjstrLiteralImages = {
-            "", "\40", "\117\125\124\40", "\111\116\117\125\124\40", null, null, null,
-            null, null, null, null, null, null, null, null, null, null, null, };
-
-    /** Lexer state names. */
-    public static final String[] lexStateNames = {
-            "DEFAULT",
-    };
-    protected SimpleCharStream input_stream;
-    private final int[] jjrounds = new int[25];
-    private final int[] jjstateSet = new int[50];
-    protected char curChar;
-
-    /** Constructor. */
-    public SSPTParserTokenManager(SimpleCharStream stream) {
-        if (SimpleCharStream.staticFlag)
-            throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
-        input_stream = stream;
-    }
-
-    /** Constructor. */
-    public SSPTParserTokenManager(SimpleCharStream stream, int lexState) {
-        this(stream);
-        SwitchTo(lexState);
-    }
-
-    /** Reinitialise parser. */
-    public void ReInit(SimpleCharStream stream) {
-        jjmatchedPos = jjnewStateCnt = 0;
-        curLexState = defaultLexState;
-        input_stream = stream;
-        ReInitRounds();
-    }
-
-    private void ReInitRounds() {
-        int i;
-        jjround = 0x80000001;
-        for (i = 25; i-- > 0;)
-            jjrounds[i] = 0x80000000;
-    }
-
-    /** Reinitialise parser. */
-    public void ReInit(SimpleCharStream stream, int lexState) {
-        ReInit(stream);
-        SwitchTo(lexState);
-    }
-
-    /** Switch to specified lex state. */
-    public void SwitchTo(int lexState) {
-        if (lexState >= 1 || lexState < 0)
-            throw new TokenMgrError(
-                    "Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.",
-                    TokenMgrError.INVALID_LEXICAL_STATE);
-        else
-            curLexState = lexState;
-    }
-
-    protected Token jjFillToken() {
-        final Token t;
-        final String curTokenImage;
-        final int beginLine;
-        final int endLine;
-        final int beginColumn;
-        final int endColumn;
-        String im = jjstrLiteralImages[jjmatchedKind];
-        curTokenImage = (im == null) ? input_stream.GetImage() : im;
-        beginLine = input_stream.getBeginLine();
-        beginColumn = input_stream.getBeginColumn();
-        endLine = input_stream.getEndLine();
-        endColumn = input_stream.getEndColumn();
-        t = Token.newToken(jjmatchedKind, curTokenImage);
-
-        t.beginLine = beginLine;
-        t.endLine = endLine;
-        t.beginColumn = beginColumn;
-        t.endColumn = endColumn;
-
-        return t;
-    }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 25 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+static final int[] jjnextStates = {
+   21, 1, 22, 23, 24, 3, 6, 7, 13, 14, 
+};
+
+/** Token literal values. */
+public static final String[] jjstrLiteralImages = {
+"", "\40", "\117\125\124\40", "\111\116\117\125\124\40", null, null, null, 
+null, null, null, null, null, null, null, null, null, null, null, };
+
+/** Lexer state names. */
+public static final String[] lexStateNames = {
+   "DEFAULT",
+};
+protected SimpleCharStream input_stream;
+private final int[] jjrounds = new int[25];
+private final int[] jjstateSet = new int[50];
+protected char curChar;
+/** Constructor. */
+public SSPTParserTokenManager(SimpleCharStream stream){
+   if (SimpleCharStream.staticFlag)
+      throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+   input_stream = stream;
+}
 
-    int curLexState = 0;
-    int defaultLexState = 0;
-    int jjnewStateCnt;
-    int jjround;
-    int jjmatchedPos;
-    int jjmatchedKind;
+/** Constructor. */
+public SSPTParserTokenManager(SimpleCharStream stream, int lexState){
+   this(stream);
+   SwitchTo(lexState);
+}
 
-    /** Get the next Token. */
-    public Token getNextToken() {
-        Token matchedToken;
-        int curPos = 0;
+/** Reinitialise parser. */
+public void ReInit(SimpleCharStream stream)
+{
+   jjmatchedPos = jjnewStateCnt = 0;
+   curLexState = defaultLexState;
+   input_stream = stream;
+   ReInitRounds();
+}
+private void ReInitRounds()
+{
+   int i;
+   jjround = 0x80000001;
+   for (i = 25; i-- > 0;)
+      jjrounds[i] = 0x80000000;
+}
 
-        EOFLoop: for (;;) {
-            try {
-                curChar = input_stream.BeginToken();
-            } catch (java.io.IOException e) {
-                jjmatchedKind = 0;
-                matchedToken = jjFillToken();
-                return matchedToken;
-            }
+/** Reinitialise parser. */
+public void ReInit(SimpleCharStream stream, int lexState)
+{
+   ReInit(stream);
+   SwitchTo(lexState);
+}
 
-            jjmatchedKind = 0x7fffffff;
-            jjmatchedPos = 0;
-            curPos = jjMoveStringLiteralDfa0_0();
-            if (jjmatchedKind != 0x7fffffff) {
-                if (jjmatchedPos + 1 < curPos)
-                    input_stream.backup(curPos - jjmatchedPos - 1);
-                matchedToken = jjFillToken();
-                return matchedToken;
-            }
-            int error_line = input_stream.getEndLine();
-            int error_column = input_stream.getEndColumn();
-            String error_after = null;
-            boolean EOFSeen = false;
-            try {
-                input_stream.readChar();
-                input_stream.backup(1);
-            } catch (java.io.IOException e1) {
-                EOFSeen = true;
-                error_after = curPos <= 1 ? "" : input_stream.GetImage();
-                if (curChar == '\n' || curChar == '\r') {
-                    error_line++;
-                    error_column = 0;
-                } else
-                    error_column++;
-            }
-            if (!EOFSeen) {
-                input_stream.backup(1);
-                error_after = curPos <= 1 ? "" : input_stream.GetImage();
-            }
-            throw new TokenMgrError(
-                    EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
-        }
-    }
+/** Switch to specified lex state. */
+public void SwitchTo(int lexState)
+{
+   if (lexState >= 1 || lexState < 0)
+      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+   else
+      curLexState = lexState;
+}
 
-    private void jjCheckNAdd(int state) {
-        if (jjrounds[state] != jjround) {
-            jjstateSet[jjnewStateCnt++] = state;
-            jjrounds[state] = jjround;
-        }
-    }
+protected Token jjFillToken()
+{
+   final Token t;
+   final String curTokenImage;
+   final int beginLine;
+   final int endLine;
+   final int beginColumn;
+   final int endColumn;
+   String im = jjstrLiteralImages[jjmatchedKind];
+   curTokenImage = (im == null) ? input_stream.GetImage() : im;
+   beginLine = input_stream.getBeginLine();
+   beginColumn = input_stream.getBeginColumn();
+   endLine = input_stream.getEndLine();
+   endColumn = input_stream.getEndColumn();
+   t = Token.newToken(jjmatchedKind, curTokenImage);
+
+   t.beginLine = beginLine;
+   t.endLine = endLine;
+   t.beginColumn = beginColumn;
+   t.endColumn = endColumn;
+
+   return t;
+}
 
-    private void jjAddStates(int start, int end) {
-        do {
-            jjstateSet[jjnewStateCnt++] = jjnextStates[start];
-        } while (start++ != end);
-    }
+int curLexState = 0;
+int defaultLexState = 0;
+int jjnewStateCnt;
+int jjround;
+int jjmatchedPos;
+int jjmatchedKind;
+
+/** Get the next Token. */
+public Token getNextToken() 
+{
+  Token matchedToken;
+  int curPos = 0;
+
+  EOFLoop :
+  for (;;)
+  {
+   try
+   {
+      curChar = input_stream.BeginToken();
+   }
+   catch(java.io.IOException e)
+   {
+      jjmatchedKind = 0;
+      matchedToken = jjFillToken();
+      return matchedToken;
+   }
+
+   jjmatchedKind = 0x7fffffff;
+   jjmatchedPos = 0;
+   curPos = jjMoveStringLiteralDfa0_0();
+   if (jjmatchedKind != 0x7fffffff)
+   {
+      if (jjmatchedPos + 1 < curPos)
+         input_stream.backup(curPos - jjmatchedPos - 1);
+         matchedToken = jjFillToken();
+         return matchedToken;
+   }
+   int error_line = input_stream.getEndLine();
+   int error_column = input_stream.getEndColumn();
+   String error_after = null;
+   boolean EOFSeen = false;
+   try { input_stream.readChar(); input_stream.backup(1); }
+   catch (java.io.IOException e1) {
+      EOFSeen = true;
+      error_after = curPos <= 1 ? "" : input_stream.GetImage();
+      if (curChar == '\n' || curChar == '\r') {
+         error_line++;
+         error_column = 0;
+      }
+      else
+         error_column++;
+   }
+   if (!EOFSeen) {
+      input_stream.backup(1);
+      error_after = curPos <= 1 ? "" : input_stream.GetImage();
+   }
+   throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
+  }
+}
 
-    private void jjCheckNAddTwoStates(int state1, int state2) {
-        jjCheckNAdd(state1);
-        jjCheckNAdd(state2);
-    }
+private void jjCheckNAdd(int state)
+{
+   if (jjrounds[state] != jjround)
+   {
+      jjstateSet[jjnewStateCnt++] = state;
+      jjrounds[state] = jjround;
+   }
+}
+private void jjAddStates(int start, int end)
+{
+   do {
+      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+   } while (start++ != end);
+}
+private void jjCheckNAddTwoStates(int state1, int state2)
+{
+   jjCheckNAdd(state1);
+   jjCheckNAdd(state2);
+}
 
-    private void jjCheckNAddStates(int start, int end) {
-        do {
-            jjCheckNAdd(jjnextStates[start]);
-        } while (start++ != end);
-    }
+private void jjCheckNAddStates(int start, int end)
+{
+   do {
+      jjCheckNAdd(jjnextStates[start]);
+   } while (start++ != end);
+}
 
 }
diff --git a/docs/components/modules/ROOT/pages/apns-component.adoc b/docs/components/modules/ROOT/pages/apns-component.adoc
index ec0e123..660b9b4 100644
--- a/docs/components/modules/ROOT/pages/apns-component.adoc
+++ b/docs/components/modules/ROOT/pages/apns-component.adoc
@@ -149,7 +149,7 @@ source code].
 In order to use secure connection, an instance of `org.apache.camel.support.jsse.SSLContextParameters`
  should be injected to `org.apache.camel.component.apns.factory.ApnsServiceFactory` which is
  used to configure the component. See the test resources for an example.
- https://github.com/apache/camel/blob/master/components/camel-apns/src/test/resources/org/apache/camel/component/apns/spring/SpringApnsConsumerTest-context.xml[ssl example]
+ https://github.com/apache/camel/blob/main/components/camel-apns/src/test/resources/org/apache/camel/component/apns/spring/SpringApnsConsumerTest-context.xml[ssl example]
 
 == Exchange data format
 
diff --git a/docs/components/modules/ROOT/pages/aws2-lambda-component.adoc b/docs/components/modules/ROOT/pages/aws2-lambda-component.adoc
index 21c7cbf..b0adcb5 100644
--- a/docs/components/modules/ROOT/pages/aws2-lambda-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-lambda-component.adoc
@@ -220,7 +220,7 @@ The default is 3 seconds.|No
 
 == Example
 
-To have a full understanding of how the component works, you may have a look at this https://github.com/apache/camel/blob/master/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentIntegrationTest.java[integration test]
+To have a full understanding of how the component works, you may have a look at this https://github.com/apache/camel/blob/main/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaComponentIntegrationTest.java[integration test]
 
 == Using a POJO as body
 
diff --git a/docs/components/modules/ROOT/pages/bean-validator-component.adoc b/docs/components/modules/ROOT/pages/bean-validator-component.adoc
index ccd7e3b..c021b5e 100644
--- a/docs/components/modules/ROOT/pages/bean-validator-component.adoc
+++ b/docs/components/modules/ROOT/pages/bean-validator-component.adoc
@@ -281,7 +281,7 @@ and the `constraints-car.xml` file
 </constraint-mappings>
 ----------------------------------------------------------------------------------------------------
 
-Here is the XML syntax for the example route definition where **OrderedChecks** can be https://github.com/apache/camel/blob/master/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java 
+Here is the XML syntax for the example route definition where **OrderedChecks** can be https://github.com/apache/camel/blob/main/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java 
 
 Note that the body should include an instance of a class to validate.
 
diff --git a/docs/components/modules/ROOT/pages/cxf-component.adoc b/docs/components/modules/ROOT/pages/cxf-component.adoc
index 2da5181..96f0c4b 100644
--- a/docs/components/modules/ROOT/pages/cxf-component.adoc
+++ b/docs/components/modules/ROOT/pages/cxf-component.adoc
@@ -310,7 +310,7 @@ ambiguity in name spaces to relay instance mappings.
 Take a look at the tests that show how you'd be able to relay/drop
 headers here:
 
-https://github.com/apache/camel/blob/master/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java[https://github.com/apache/camel/blob/master/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java]
+https://github.com/apache/camel/blob/main/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java[https://github.com/apache/camel/blob/main/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java]
 
 * `POJO` and `PAYLOAD` modes are supported. In `POJO` mode, only
 out-of-band message headers are available for filtering as the in-band
diff --git a/docs/components/modules/ROOT/pages/cxfrs-component.adoc b/docs/components/modules/ROOT/pages/cxfrs-component.adoc
index ad7cc60..223e4d8 100644
--- a/docs/components/modules/ROOT/pages/cxfrs-component.adoc
+++ b/docs/components/modules/ROOT/pages/cxfrs-component.adoc
@@ -143,14 +143,14 @@ You can also configure the CXF REST endpoint through the spring
 configuration. Since there are lots of difference between the CXF REST
 client and CXF REST Server, we provide different configuration for
 them. Please check out the
-https://github.com/apache/camel/blob/master/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[schema
+https://github.com/apache/camel/blob/main/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[schema
 file] and http://cxf.apache.org/docs/jax-rs.html[CXF JAX-RS
 documentation] for more information.
 
 == How to configure the REST endpoint in Camel
 
 In
-https://github.com/apache/camel/blob/master/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[camel-cxf
+https://github.com/apache/camel/blob/main/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd[camel-cxf
 schema file], there are two elements for the REST endpoint definition.
 *cxf:rsServer* for REST consumer, *cxf:rsClient* for REST producer. +
  You can find a Camel REST service route configuration example here.
diff --git a/docs/components/modules/ROOT/pages/http-component.adoc b/docs/components/modules/ROOT/pages/http-component.adoc
index 678af15..6fab808 100644
--- a/docs/components/modules/ROOT/pages/http-component.adoc
+++ b/docs/components/modules/ROOT/pages/http-component.adoc
@@ -414,7 +414,7 @@ And the equivalent Spring sample:
 == Using client timeout - SO_TIMEOUT
 
 See the
-https://github.com/apache/camel/blob/master/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java[HttpSOTimeoutTest]
+https://github.com/apache/camel/blob/main/components/camel-http/src/test/java/org/apache/camel/component/http/HttpSOTimeoutTest.java[HttpSOTimeoutTest]
 unit test.
 
 == Configuring a Proxy
diff --git a/docs/components/modules/ROOT/pages/msv-component.adoc b/docs/components/modules/ROOT/pages/msv-component.adoc
index 09ac2df..f39f875 100644
--- a/docs/components/modules/ROOT/pages/msv-component.adoc
+++ b/docs/components/modules/ROOT/pages/msv-component.adoc
@@ -126,7 +126,7 @@ with the following path and query parameters:
 == Example
 
 The following
-https://github.com/apache/camel/blob/master/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/camelContext.xml[example]
+https://github.com/apache/camel/blob/main/components/camel-msv/src/test/resources/org/apache/camel/component/validator/msv/camelContext.xml[example]
 shows how to configure a route from endpoint *direct:start* which then
 goes to one of two endpoints, either *mock:valid* or *mock:invalid*
 based on whether or not the XML matches the given
diff --git a/docs/components/modules/ROOT/pages/servlet-component.adoc b/docs/components/modules/ROOT/pages/servlet-component.adoc
index 530cb31..b796c9f 100644
--- a/docs/components/modules/ROOT/pages/servlet-component.adoc
+++ b/docs/components/modules/ROOT/pages/servlet-component.adoc
@@ -243,9 +243,9 @@ In this sample, we define a route that exposes a HTTP service at
 http://localhost:8080/camel/services/hello.
 
 First, you need to publish the
-https://github.com/apache/camel/blob/master/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
+https://github.com/apache/camel/blob/main/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
 through the normal Web Container, or OSGi Service. Use the `Web.xml` file to publish the
-https://github.com/apache/camel/blob/master/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
+https://github.com/apache/camel/blob/main/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
 as follows:
 
 [source,xml]
@@ -308,7 +308,7 @@ often required to load the Spring ApplicationContext _after_ the Servlet
 component has started. This can be accomplished by using Spring's
 `ContextLoaderServlet` instead of `ContextLoaderListener`. In that case
 you'll need to start `ContextLoaderServlet` after
-https://github.com/apache/camel/blob/master/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
+https://github.com/apache/camel/blob/main/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
 like this:
 
 [source,xml]
@@ -334,7 +334,7 @@ like this:
 === Sample when using OSGi
 
 You can publish the
-https://github.com/apache/camel/blob/master/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
+https://github.com/apache/camel/blob/main/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
 as an OSGi service with Blueprint like this:
 
 [source,xml]
@@ -404,7 +404,7 @@ Then use this service in your Camel route like this:
 
 You can use an `Activator` to publish
 the
-https://github.com/apache/camel/blob/master/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
+https://github.com/apache/camel/blob/main/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java[CamelHttpTransportServlet]
 on the OSGi platform:
 
 [source,java]
diff --git a/docs/components/modules/ROOT/pages/validator-component.adoc b/docs/components/modules/ROOT/pages/validator-component.adoc
index d5453bd..c581f1a 100644
--- a/docs/components/modules/ROOT/pages/validator-component.adoc
+++ b/docs/components/modules/ROOT/pages/validator-component.adoc
@@ -107,7 +107,7 @@ with the following path and query parameters:
 == Example
 
 The following
-https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml[example]
+https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/component/validator/camelContext.xml[example]
 shows how to configure a route from endpoint *direct:start* which then
 goes to one of two endpoints, either *mock:valid* or *mock:invalid*
 based on whether or not the XML matches the given schema (which is
diff --git a/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc b/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc
index 9300cba..2eccb45 100644
--- a/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc
+++ b/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc
@@ -207,17 +207,17 @@ corresponding public key is necessary; you specify a key selector bean
 which provides this public key.
 
 The key accessor bean must implement the
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/KeyAccessor.java[`KeyAccessor`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/KeyAccessor.java[`KeyAccessor`]
 interface. The package `org.apache.camel.component.xmlsecurity.api`
 contains the default implementation class
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java[`DefaultKeyAccessor`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java[`DefaultKeyAccessor`]
 which reads the private key from a Java keystore.
 
 The key selector bean must implement the
 http://docs.oracle.com/javase/6/docs/api/javax/xml/crypto/KeySelector.html[`javax.xml.crypto.KeySelector`]
 interface. The package `org.apache.camel.component.xmlsecurity.api`
 contains the default implementation class
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeySelector.java[`DefaultKeySelector`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeySelector.java[`DefaultKeySelector`]
 which reads the public key from a keystore.
 
 In the example, the default signature algorithm
@@ -348,9 +348,9 @@ with the following path and query parameters:
 After the validation the node is extracted from the XML signature
 document which is finally returned to the output-message body. In the
 enveloping XML signature case, the default implementation
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java[`DefaultXmlSignature2Message`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java[`DefaultXmlSignature2Message`]
 of
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignature2Message.java[`XmlSignature2Message`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignature2Message.java[`XmlSignature2Message`]
 does this for the node search type `Default` in the following way (see
 option `xmlSignature2Message`):
 
diff --git a/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc b/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
index 7300a98..39ad437 100644
--- a/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
+++ b/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
@@ -207,17 +207,17 @@ corresponding public key is necessary; you specify a key selector bean
 which provides this public key.
 
 The key accessor bean must implement the
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/KeyAccessor.java[`KeyAccessor`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/KeyAccessor.java[`KeyAccessor`]
 interface. The package `org.apache.camel.component.xmlsecurity.api`
 contains the default implementation class
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java[`DefaultKeyAccessor`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeyAccessor.java[`DefaultKeyAccessor`]
 which reads the private key from a Java keystore.
 
 The key selector bean must implement the
 http://docs.oracle.com/javase/6/docs/api/javax/xml/crypto/KeySelector.html[`javax.xml.crypto.KeySelector`]
 interface. The package `org.apache.camel.component.xmlsecurity.api`
 contains the default implementation class
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeySelector.java[`DefaultKeySelector`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultKeySelector.java[`DefaultKeySelector`]
 which reads the public key from a keystore.
 
 In the example, the default signature algorithm
@@ -328,9 +328,9 @@ with the following path and query parameters:
 After the validation the node is extracted from the XML signature
 document which is finally returned to the output-message body. In the
 enveloping XML signature case, the default implementation
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java[`DefaultXmlSignature2Message`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java[`DefaultXmlSignature2Message`]
 of
-https://github.com/apache/camel/blob/master/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignature2Message.java[`XmlSignature2Message`]
+https://github.com/apache/camel/blob/main/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignature2Message.java[`XmlSignature2Message`]
 does this for the node search type `Default` in the following way (see
 option `xmlSignature2Message`):
 
diff --git a/docs/components/modules/dataformats/pages/pgp-dataformat.adoc b/docs/components/modules/dataformats/pages/pgp-dataformat.adoc
index e6afc55..dac35ce 100644
--- a/docs/components/modules/dataformats/pages/pgp-dataformat.adoc
+++ b/docs/components/modules/dataformats/pages/pgp-dataformat.adoc
@@ -282,15 +282,15 @@ above PGPDataFormat class selects in a certain predefined way the keys
 which should be used for signing/encryption or verifying/decryption. If
 you have special requirements how your keys should be selected you
 should use the
-https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java[PGPKeyAccessDataFormat]
+https://github.com/apache/camel/blob/main/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java[PGPKeyAccessDataFormat]
 class instead and implement the interfaces
-https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPublicKeyAccessor.java[PGPPublicKeyAccessor]
+https://github.com/apache/camel/blob/main/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPublicKeyAccessor.java[PGPPublicKeyAccessor]
 and
-https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPSecretKeyAccessor.java[PGPSecretKeyAccessor]
+https://github.com/apache/camel/blob/main/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPSecretKeyAccessor.java[PGPSecretKeyAccessor]
 as beans. There are default implementations
-https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java[DefaultPGPPublicKeyAccessor]
+https://github.com/apache/camel/blob/main/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java[DefaultPGPPublicKeyAccessor]
 and
-https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java[DefaultPGPSecretKeyAccessor]
+https://github.com/apache/camel/blob/main/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java[DefaultPGPSecretKeyAccessor]
 which cache the keys, so that not every time the keyring is parsed when
 the processor is called.
 
diff --git a/docs/components/modules/languages/pages/bean-language.adoc b/docs/components/modules/languages/pages/bean-language.adoc
index 1de6089..085346c 100644
--- a/docs/components/modules/languages/pages/bean-language.adoc
+++ b/docs/components/modules/languages/pages/bean-language.adoc
@@ -182,10 +182,10 @@ from("activemq:topic:OrdersTopic")
 
 We have some test cases you can look at if it'll help
 
-* https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java[MethodFilterTest]
+* https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java[MethodFilterTest]
 is a JUnit test case showing the Java xref:manual::dsl.adoc[DSL] use of the bean
 expression being used in a filter
-* https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml[aggregator.xml]
+* https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml[aggregator.xml]
 is a Spring XML test case for the xref:{eip-vc}:eips:aggregate-eip.adoc[Aggregator] which
 uses a bean method call to test for the completion of the aggregation.
 
diff --git a/docs/components/modules/languages/pages/xpath-language.adoc b/docs/components/modules/languages/pages/xpath-language.adoc
index 799d06c..ba0f514 100644
--- a/docs/components/modules/languages/pages/xpath-language.adoc
+++ b/docs/components/modules/languages/pages/xpath-language.adoc
@@ -230,14 +230,14 @@ shown:
 == Examples
 
 Here is a simple
-https://github.com/apache/camel/blob/master/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java[example]
+https://github.com/apache/camel/blob/main/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java[example]
 using an XPath expression as a predicate in a
 Message Filter
 
 If you have a standard set of namespaces you wish to work with and wish
 to share them across many different XPath expressions you can use the
 NamespaceBuilder as shown
-https://github.com/apache/camel/blob/master/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java[in
+https://github.com/apache/camel/blob/main/camel-core/src/test/java/org/apache/camel/processor/XPathWithNamespaceBuilderFilterTest.java[in
 this example]
 
 In this sample we have a choice construct. The first choice evaulates if