This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 157721f5e0eb CAMEL-24773: docs - the remaining example kinds: Camel
1.x XML namespace, Camel 2 XML elements, malformed XML fragments, wrong Java
imports, and user-manual YAML (#26512)
157721f5e0eb is described below
commit 157721f5e0eb5db86b2cc5d04f74395d613ff2c4
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Sep 16 16:13:46 2026 +0200
CAMEL-24773: docs - the remaining example kinds: Camel 1.x XML namespace,
Camel 2 XML elements, malformed XML fragments, wrong Java imports, and
user-manual YAML (#26512)
CAMEL-24773: docs - the remaining example kinds corrected: the Camel 1.x
XML namespace on 11 blocks, Camel 2 XML elements and attributes (properties,
executorServiceRef, instanceClass, namespacePrefixRef, typeFilter children),
malformed XML fragments (unclosed and mismatched tags, text in from, unescaped
entities, a Java comment), Spring XSD element order and required attributes,
the removed adapt() and eight wrong Java imports, a wrong artifactId, and the
saga and routeTemplate YAML [...]
Signed-off-by: Claus Ibsen <[email protected]>
Co-authored-by: Claude Opus 5 (1M context) <[email protected]>
---
.../apache/camel/catalog/docs/avro-dataformat.adoc | 2 +-
.../catalog/docs/aws2-redshift-data-component.adoc | 2 +-
.../apache/camel/catalog/docs/http-component.adoc | 8 ++++----
.../org/apache/camel/catalog/docs/intercept.adoc | 6 +++---
.../apache/camel/catalog/docs/java-xml-io-dsl.adoc | 2 +-
.../apache/camel/catalog/docs/jaxb-dataformat.adoc | 8 ++++----
.../camel/catalog/docs/keyValueRepository.adoc | 14 +++++++-------
.../org/apache/camel/catalog/docs/log-eip.adoc | 6 +++---
.../org/apache/camel/catalog/docs/poll-eip.adoc | 2 +-
.../camel/catalog/docs/properties-component.adoc | 1 +
.../apache/camel/catalog/docs/ref-component.adoc | 2 +-
.../apache/camel/catalog/docs/seda-component.adoc | 2 +-
.../apache/camel/catalog/docs/simple-advanced.adoc | 4 ++--
.../apache/camel/catalog/docs/simple-operators.adoc | 13 +++++++------
.../camel/catalog/docs/snakeYaml-dataformat.adoc | 7 ++-----
.../apache/camel/catalog/docs/xpath-language.adoc | 2 +-
.../apache/camel/catalog/docs/xquery-component.adoc | 2 +-
.../apache/camel/catalog/docs/xquery-language.adoc | 2 +-
.../apache/camel/catalog/docs/xslt-component.adoc | 2 +-
.../camel/catalog/docs/xslt-saxon-component.adoc | 2 +-
.../camel-avro/src/main/docs/avro-dataformat.adoc | 2 +-
.../src/main/docs/aws2-redshift-data-component.adoc | 2 +-
.../src/main/docs/cxf-transport.adoc | 4 ++--
.../camel-http/src/main/docs/http-component.adoc | 8 ++++----
.../camel-jaxb/src/main/docs/jaxb-dataformat.adoc | 8 ++++----
.../camel-ref/src/main/docs/ref-component.adoc | 2 +-
.../camel-saxon/src/main/docs/xquery-component.adoc | 2 +-
.../camel-saxon/src/main/docs/xquery-language.adoc | 2 +-
.../camel-seda/src/main/docs/seda-component.adoc | 2 +-
.../src/main/docs/snakeYaml-dataformat.adoc | 7 ++-----
.../camel-xpath/src/main/docs/xpath-language.adoc | 2 +-
.../src/main/docs/xslt-saxon-component.adoc | 2 +-
.../camel-xslt/src/main/docs/xslt-component.adoc | 2 +-
.../src/main/docs/properties-component.adoc | 1 +
.../src/main/docs/modules/eips/pages/intercept.adoc | 6 +++---
.../docs/modules/eips/pages/keyValueRepository.adoc | 14 +++++++-------
.../src/main/docs/modules/eips/pages/log-eip.adoc | 6 +++---
.../src/main/docs/modules/eips/pages/poll-eip.adoc | 2 +-
.../modules/languages/pages/simple-advanced.adoc | 4 ++--
.../modules/languages/pages/simple-operators.adoc | 13 +++++++------
.../ROOT/pages/camel-4x-upgrade-guide-4_18.adoc | 20 ++++++++++++++++++--
.../ROOT/pages/camel-4x-upgrade-guide-4_19.adoc | 20 ++++++++++++++++++--
.../ROOT/pages/camel-4x-upgrade-guide-4_23.adoc | 10 ++++++++--
.../modules/ROOT/pages/delay-interceptor.adoc | 2 +-
.../modules/ROOT/pages/exception-advanced.adoc | 4 ++--
.../modules/ROOT/pages/exchange-pooling.adoc | 21 +++------------------
.../pages/langchain4j-spring-boot-integration.adoc | 2 +-
.../modules/ROOT/pages/oncompletion.adoc | 4 ++--
.../modules/ROOT/pages/rest-dsl-openapi.adoc | 4 ++--
.../modules/ROOT/pages/rest-dsl-validation.adoc | 2 +-
.../modules/ROOT/pages/threading-model.adoc | 3 ++-
docs/user-manual/modules/ROOT/pages/tracer.adoc | 4 ++--
.../src/main/docs/java-xml-io-dsl.adoc | 2 +-
53 files changed, 150 insertions(+), 128 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-dataformat.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-dataformat.adoc
index 1e3abae670cb..88cdafa53a10 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-dataformat.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-dataformat.adoc
@@ -109,7 +109,7 @@ reference it from your route.
----
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<dataFormats>
- <avro id="avro"
instanceClass="org.apache.camel.dataformat.avro.Message" library="ApacheAvro"/>
+ <avro id="avro"
instanceClassName="org.apache.camel.dataformat.avro.Message"
library="ApacheAvro"/>
</dataFormats>
<route>
<from uri="direct:in"/>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-redshift-data-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-redshift-data-component.adoc
index 493be5ff37d7..253c3fdb6186 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-redshift-data-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/aws2-redshift-data-component.adoc
@@ -154,7 +154,7 @@ Maven users will need to add the following dependency to
their pom.xml.
----
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-redshift-data</artifactId>
+ <artifactId>camel-aws2-redshift</artifactId>
<version>${camel-version}</version>
</dependency>
----
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 cc2053e9256e..d8f448e0316c 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
@@ -431,10 +431,10 @@ Spring XML
[source,xml]
----
<camelContext>
- <properties>
- <property key="http.proxyHost" value="172.168.18.9"/>
- <property key="http.proxyPort" value="8080"/>
- </properties>
+ <globalOptions>
+ <globalOption key="http.proxyHost" value="172.168.18.9"/>
+ <globalOption key="http.proxyPort" value="8080"/>
+ </globalOptions>
</camelContext>
----
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/intercept.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/intercept.adoc
index 9f824cb496f7..02bb30045552 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/intercept.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/intercept.adoc
@@ -259,9 +259,9 @@ XML::
<intercept>
<onWhen>
<simple>${body} contains 'Hello'</simple>
- <to uri="log:test"/>
- <stop/> <!-- stop continue routing -->
</onWhen>
+ <to uri="log:test"/>
+ <stop/> <!-- stop continue routing -->
</intercept>
<route>
@@ -386,7 +386,7 @@ XML::
----
<interceptFrom uri="jms*">
<to uri="log:incoming"/>
- </intercept>
+ </interceptFrom>
<route>
<from uri="jms:queue:order"/>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/java-xml-io-dsl.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/java-xml-io-dsl.adoc
index 32b12847b5c9..fc8ff5948d1e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/java-xml-io-dsl.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/java-xml-io-dsl.adoc
@@ -198,7 +198,7 @@ A bean can also be created from another builder class as
shown below:
<properties>
<property key="id" value="123"/>
<property key="name" value="Acme"/>
- </constructors>
+ </properties>
</bean>
----
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jaxb-dataformat.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jaxb-dataformat.adoc
index 3a37dcbd991c..dc89f967a355 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jaxb-dataformat.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jaxb-dataformat.adoc
@@ -205,14 +205,14 @@ namespace `http://www.mycompany.com/foo/2` is not using
any prefix.
----
To use this in JAXB or SOAP data formats, you refer to
-this map, using the `namespacePrefixRef` attribute as shown below. Then
+this map, using the `namespacePrefix` attribute as shown below. Then
Camel will look up in the Registry a `java.util.Map`
with the id `myMap`, which was what we defined above.
[source,xml]
----
<marshal>
- <soap version="1.2" contextPath="com.mycompany.foo"
namespacePrefixRef="myMap"/>
+ <soap version="1.2" contextPath="com.mycompany.foo"
namespacePrefix="myMap"/>
</marshal>
----
@@ -242,7 +242,7 @@ You can do the same using the XML DSL:
[source,xml]
----
<marshal>
- <jaxb id="jaxb" schema="classpath:person.xsd,classpath:address.xsd"
+ <jaxb id="jaxb" contextPath="com.acme.model"
schema="classpath:person.xsd,classpath:address.xsd"
accessExternalSchemaProtocols="file"/>
</marshal>
----
@@ -266,7 +266,7 @@ You can do the same using the XML DSL:
[source,xml]
----
<marshal>
- <jaxb id="jaxb" schemaLocation="schema/person.xsd"/>
+ <jaxb id="jaxb" contextPath="com.acme.model"
schemaLocation="schema/person.xsd"/>
</marshal>
----
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/keyValueRepository.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/keyValueRepository.adoc
index 7f552096ffe1..c8398fe57026 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/keyValueRepository.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/keyValueRepository.adoc
@@ -159,7 +159,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.caffeine.cache.CaffeineKeyValueRepository;
+import
org.apache.camel.component.caffeine.processor.CaffeineKeyValueRepository;
@BindToRegistry("caffeineKvr")
public KeyValueRepository caffeineKvr() {
@@ -208,7 +208,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.ehcache.EhcacheKeyValueRepository;
+import org.apache.camel.component.ehcache.processor.EhcacheKeyValueRepository;
import org.ehcache.CacheManager;
import org.ehcache.config.builders.CacheConfigurationBuilder;
import org.ehcache.config.builders.CacheManagerBuilder;
@@ -281,7 +281,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.jcache.JCacheKeyValueRepository;
+import org.apache.camel.component.jcache.processor.JCacheKeyValueRepository;
import javax.cache.configuration.MutableConfiguration;
import javax.cache.expiry.CreatedExpiryPolicy;
import javax.cache.expiry.Duration;
@@ -558,7 +558,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.sql.JdbcKeyValueRepository;
+import org.apache.camel.processor.keyvalue.jdbc.JdbcKeyValueRepository;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
import javax.sql.DataSource;
@@ -626,7 +626,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.jpa.JpaKeyValueRepository;
+import org.apache.camel.processor.keyvalue.jpa.JpaKeyValueRepository;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -687,7 +687,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.cassandra.CassandraKeyValueRepository;
+import
org.apache.camel.processor.keyvalue.cassandra.CassandraKeyValueRepository;
import com.datastax.oss.driver.api.core.CqlSession;
import com.datastax.oss.driver.api.core.ConsistencyLevel;
import java.net.InetSocketAddress;
@@ -764,7 +764,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.kafka.KafkaKeyValueRepository;
+import org.apache.camel.processor.keyvalue.kafka.KafkaKeyValueRepository;
@BindToRegistry("kafkaKvr")
public KeyValueRepository kafkaKvr() {
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/log-eip.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/log-eip.adoc
index 4e11a93b03c6..41980bb8df0e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/log-eip.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/log-eip.adoc
@@ -396,9 +396,9 @@ Spring XML::
[source,xml]
----
<camelContext>
- <properties>
- <property key="CamelLogEipName" value="com.foo.myapp"/>
- </properties>
+ <globalOptions>
+ <globalOption key="CamelLogEipName" value="com.foo.myapp"/>
+ </globalOptions>
</camelContext>
----
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/poll-eip.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/poll-eip.adoc
index 0745b9b1cb92..f29e63ad8d7c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/poll-eip.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/poll-eip.adoc
@@ -161,7 +161,7 @@ XML::
+
[source,xml]
----
-<rest path="/report" desription="Report REST API">
+<rest path="/report" description="Report REST API">
<get path="/{id}/payload">
<to uri="direct:payload"/>
</get>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
index a7942e46035d..2f22143d1bdc 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/properties-component.adoc
@@ -113,6 +113,7 @@ For fine-grained configuration of the location, then this
can be done as follows
resolver = "classpath"
path = "com/my/company/something/my-properties-2.properties"
optional = "false"/>
+ </propertyPlaceholder>
</camelContext>
----
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/ref-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/ref-component.adoc
index 9bdb0ef4803a..539dfaf01d1a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/ref-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/ref-component.adoc
@@ -61,7 +61,7 @@ Registry such as:
._XML-only: Spring XML endpoint registry definitions_
[source,xml]
----
-<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<endpoint id="normalOrder" uri="activemq:order.slow"/>
<endpoint id="bigspenderOrder" uri="activemq:order.high"/>
</camelContext>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/seda-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/seda-component.adoc
index fca80b8cedfc..31b66db65857 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/seda-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/seda-component.adoc
@@ -89,7 +89,7 @@ Three implementations are provided:
</bean>
<!-- ... and later -->
-<from>seda:priority?queueFactory=#priorityQueueFactory&size=100</from>
+<from uri="seda:priority?queueFactory=#priorityQueueFactory&size=100"/>
----
=== Use of Request Reply
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/simple-advanced.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/simple-advanced.adoc
index b6a06a051e6b..58c5c2057aed 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/simple-advanced.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/simple-advanced.adoc
@@ -606,7 +606,7 @@ And to replace all single quotes with double quotes:
[source,xml]
----
<setBody>
- <simple>${replace(' , ")}</simple>
+ <simple>${replace(&apos; , &quot;)}</simple>
</setBody>
----
@@ -615,7 +615,7 @@ Or to remove all double quotes:
[source,xml]
----
<setBody>
- <simple>${replace(" , ∅)}</simple>
+ <simple>${replace(&quot; , &empty;)}</simple>
</setBody>
----
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/simple-operators.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/simple-operators.adoc
index 76eebd96b0d7..c14250e36dfb 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/simple-operators.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/simple-operators.adoc
@@ -357,12 +357,13 @@ order:
._XML-only:_
[source,xml]
----
-<from uri="seda:orders">
- <filter>
- <simple>${header.type} == 'widget'</simple>
- <to uri="bean:orderService?method=handleWidget"/>
- </filter>
-</from>
+<route>
+ <from uri="seda:orders"/>
+ <filter>
+ <simple>${header.type} == 'widget'</simple>
+ <to uri="bean:orderService?method=handleWidget"/>
+ </filter>
+</route>
----
=== Combining multiple expression using AND / OR Operator
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/snakeYaml-dataformat.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/snakeYaml-dataformat.adoc
index a669c00f648a..c237eef43f23 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/snakeYaml-dataformat.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/snakeYaml-dataformat.adoc
@@ -117,12 +117,9 @@ tag.
<!--
here we define a YAML data format with the id snake-safe which restricts
the
classes to be loaded from YAML to TestPojo and those belonging to package
- com.mycompany
+ com.mycompany (comma-separated names, wildcards or regular expressions)
-->
- <yaml id="snake-safe">
- <typeFilter value="org.apache.camel.component.yaml.model.TestPojo"/>
- <typeFilter value="com.mycompany\..*" type="regexp"/>
- </yaml>
+ <yaml id="snake-safe"
typeFilter="org.apache.camel.component.yaml.model.TestPojo,com.mycompany.*"/>
</dataFormats>
----
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 4276c3626747..b539d1cd17d9 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
@@ -217,7 +217,7 @@ XML::
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";
xmlns:foo="http://example.com/person";>
<route>
<from uri="activemq:MyQueue"/>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-component.adoc
index 95a04dda0054..a2d941eb0734 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-component.adoc
@@ -132,7 +132,7 @@ XML::
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="activemq:MyQueue"/>
<filter>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-language.adoc
index 03246085d3b7..587f2c96ac40 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xquery-language.adoc
@@ -184,7 +184,7 @@ in the line with `xmlns:foo="http://example.com/person"`:
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="activemq:MyQueue"/>
<filter>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xslt-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xslt-component.adoc
index 7617f18b3533..eaf816691199 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xslt-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xslt-component.adoc
@@ -243,7 +243,7 @@ XML::
+
[source,xml]
----
-<camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
+<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="activemq:My.Queue"/>
<to uri="xslt:org/apache/camel/spring/processor/example.xsl"/>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xslt-saxon-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xslt-saxon-component.adoc
index a59cc7c9295b..bf721054871a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xslt-saxon-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/xslt-saxon-component.adoc
@@ -246,7 +246,7 @@ XML::
+
[source,xml]
----
-<camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
+<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="activemq:My.Queue"/>
<to uri="xslt-saxon:org/apache/camel/spring/processor/example.xsl"/>
diff --git a/components/camel-avro/src/main/docs/avro-dataformat.adoc
b/components/camel-avro/src/main/docs/avro-dataformat.adoc
index 1e3abae670cb..88cdafa53a10 100644
--- a/components/camel-avro/src/main/docs/avro-dataformat.adoc
+++ b/components/camel-avro/src/main/docs/avro-dataformat.adoc
@@ -109,7 +109,7 @@ reference it from your route.
----
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<dataFormats>
- <avro id="avro"
instanceClass="org.apache.camel.dataformat.avro.Message" library="ApacheAvro"/>
+ <avro id="avro"
instanceClassName="org.apache.camel.dataformat.avro.Message"
library="ApacheAvro"/>
</dataFormats>
<route>
<from uri="direct:in"/>
diff --git
a/components/camel-aws/camel-aws2-redshift/src/main/docs/aws2-redshift-data-component.adoc
b/components/camel-aws/camel-aws2-redshift/src/main/docs/aws2-redshift-data-component.adoc
index 493be5ff37d7..253c3fdb6186 100644
---
a/components/camel-aws/camel-aws2-redshift/src/main/docs/aws2-redshift-data-component.adoc
+++
b/components/camel-aws/camel-aws2-redshift/src/main/docs/aws2-redshift-data-component.adoc
@@ -154,7 +154,7 @@ Maven users will need to add the following dependency to
their pom.xml.
----
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-redshift-data</artifactId>
+ <artifactId>camel-aws2-redshift</artifactId>
<version>${camel-version}</version>
</dependency>
----
diff --git
a/components/camel-cxf/camel-cxf-transport/src/main/docs/cxf-transport.adoc
b/components/camel-cxf/camel-cxf-transport/src/main/docs/cxf-transport.adoc
index d47a476ef398..61867afe4dc7 100644
--- a/components/camel-cxf/camel-cxf-transport/src/main/docs/cxf-transport.adoc
+++ b/components/camel-cxf/camel-cxf-transport/src/main/docs/cxf-transport.adoc
@@ -146,7 +146,7 @@ endpoint's target namespace was
`\http://widgets.widgetvendor.net`.
----
...
<camel:destination
name="{http://widgets/widgetvendor.net}widgetSOAPPort.http-destination>
- <camelContext id="context"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <camelContext id="context" xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="direct:EndpointC" />
<to uri="direct:EndpointD" />
@@ -194,7 +194,7 @@ endpoint's target namespace was
`\http://widgets.widgetvendor.net`.
[source,xml]
----
...
- <camelContext id="conduit_context"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <camelContext id="conduit_context"
xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="direct:EndpointA" />
<to uri="direct:EndpointB" />
diff --git a/components/camel-http/src/main/docs/http-component.adoc
b/components/camel-http/src/main/docs/http-component.adoc
index cc2053e9256e..d8f448e0316c 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -431,10 +431,10 @@ Spring XML
[source,xml]
----
<camelContext>
- <properties>
- <property key="http.proxyHost" value="172.168.18.9"/>
- <property key="http.proxyPort" value="8080"/>
- </properties>
+ <globalOptions>
+ <globalOption key="http.proxyHost" value="172.168.18.9"/>
+ <globalOption key="http.proxyPort" value="8080"/>
+ </globalOptions>
</camelContext>
----
diff --git a/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
index 3a37dcbd991c..dc89f967a355 100644
--- a/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
+++ b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
@@ -205,14 +205,14 @@ namespace `http://www.mycompany.com/foo/2` is not using
any prefix.
----
To use this in JAXB or SOAP data formats, you refer to
-this map, using the `namespacePrefixRef` attribute as shown below. Then
+this map, using the `namespacePrefix` attribute as shown below. Then
Camel will look up in the Registry a `java.util.Map`
with the id `myMap`, which was what we defined above.
[source,xml]
----
<marshal>
- <soap version="1.2" contextPath="com.mycompany.foo"
namespacePrefixRef="myMap"/>
+ <soap version="1.2" contextPath="com.mycompany.foo"
namespacePrefix="myMap"/>
</marshal>
----
@@ -242,7 +242,7 @@ You can do the same using the XML DSL:
[source,xml]
----
<marshal>
- <jaxb id="jaxb" schema="classpath:person.xsd,classpath:address.xsd"
+ <jaxb id="jaxb" contextPath="com.acme.model"
schema="classpath:person.xsd,classpath:address.xsd"
accessExternalSchemaProtocols="file"/>
</marshal>
----
@@ -266,7 +266,7 @@ You can do the same using the XML DSL:
[source,xml]
----
<marshal>
- <jaxb id="jaxb" schemaLocation="schema/person.xsd"/>
+ <jaxb id="jaxb" contextPath="com.acme.model"
schemaLocation="schema/person.xsd"/>
</marshal>
----
diff --git a/components/camel-ref/src/main/docs/ref-component.adoc
b/components/camel-ref/src/main/docs/ref-component.adoc
index 9bdb0ef4803a..539dfaf01d1a 100644
--- a/components/camel-ref/src/main/docs/ref-component.adoc
+++ b/components/camel-ref/src/main/docs/ref-component.adoc
@@ -61,7 +61,7 @@ Registry such as:
._XML-only: Spring XML endpoint registry definitions_
[source,xml]
----
-<camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<endpoint id="normalOrder" uri="activemq:order.slow"/>
<endpoint id="bigspenderOrder" uri="activemq:order.high"/>
</camelContext>
diff --git a/components/camel-saxon/src/main/docs/xquery-component.adoc
b/components/camel-saxon/src/main/docs/xquery-component.adoc
index 95a04dda0054..a2d941eb0734 100644
--- a/components/camel-saxon/src/main/docs/xquery-component.adoc
+++ b/components/camel-saxon/src/main/docs/xquery-component.adoc
@@ -132,7 +132,7 @@ XML::
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="activemq:MyQueue"/>
<filter>
diff --git a/components/camel-saxon/src/main/docs/xquery-language.adoc
b/components/camel-saxon/src/main/docs/xquery-language.adoc
index 03246085d3b7..587f2c96ac40 100644
--- a/components/camel-saxon/src/main/docs/xquery-language.adoc
+++ b/components/camel-saxon/src/main/docs/xquery-language.adoc
@@ -184,7 +184,7 @@ in the line with `xmlns:foo="http://example.com/person"`:
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="activemq:MyQueue"/>
<filter>
diff --git a/components/camel-seda/src/main/docs/seda-component.adoc
b/components/camel-seda/src/main/docs/seda-component.adoc
index fca80b8cedfc..31b66db65857 100644
--- a/components/camel-seda/src/main/docs/seda-component.adoc
+++ b/components/camel-seda/src/main/docs/seda-component.adoc
@@ -89,7 +89,7 @@ Three implementations are provided:
</bean>
<!-- ... and later -->
-<from>seda:priority?queueFactory=#priorityQueueFactory&size=100</from>
+<from uri="seda:priority?queueFactory=#priorityQueueFactory&size=100"/>
----
=== Use of Request Reply
diff --git a/components/camel-snakeyaml/src/main/docs/snakeYaml-dataformat.adoc
b/components/camel-snakeyaml/src/main/docs/snakeYaml-dataformat.adoc
index a669c00f648a..c237eef43f23 100644
--- a/components/camel-snakeyaml/src/main/docs/snakeYaml-dataformat.adoc
+++ b/components/camel-snakeyaml/src/main/docs/snakeYaml-dataformat.adoc
@@ -117,12 +117,9 @@ tag.
<!--
here we define a YAML data format with the id snake-safe which restricts
the
classes to be loaded from YAML to TestPojo and those belonging to package
- com.mycompany
+ com.mycompany (comma-separated names, wildcards or regular expressions)
-->
- <yaml id="snake-safe">
- <typeFilter value="org.apache.camel.component.yaml.model.TestPojo"/>
- <typeFilter value="com.mycompany\..*" type="regexp"/>
- </yaml>
+ <yaml id="snake-safe"
typeFilter="org.apache.camel.component.yaml.model.TestPojo,com.mycompany.*"/>
</dataFormats>
----
diff --git a/components/camel-xpath/src/main/docs/xpath-language.adoc
b/components/camel-xpath/src/main/docs/xpath-language.adoc
index 4276c3626747..b539d1cd17d9 100644
--- a/components/camel-xpath/src/main/docs/xpath-language.adoc
+++ b/components/camel-xpath/src/main/docs/xpath-language.adoc
@@ -217,7 +217,7 @@ XML::
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <camelContext id="camel"
xmlns="http://activemq.apache.org/camel/schema/spring";
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";
xmlns:foo="http://example.com/person";>
<route>
<from uri="activemq:MyQueue"/>
diff --git
a/components/camel-xslt-saxon/src/main/docs/xslt-saxon-component.adoc
b/components/camel-xslt-saxon/src/main/docs/xslt-saxon-component.adoc
index a59cc7c9295b..bf721054871a 100644
--- a/components/camel-xslt-saxon/src/main/docs/xslt-saxon-component.adoc
+++ b/components/camel-xslt-saxon/src/main/docs/xslt-saxon-component.adoc
@@ -246,7 +246,7 @@ XML::
+
[source,xml]
----
-<camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
+<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="activemq:My.Queue"/>
<to uri="xslt-saxon:org/apache/camel/spring/processor/example.xsl"/>
diff --git a/components/camel-xslt/src/main/docs/xslt-component.adoc
b/components/camel-xslt/src/main/docs/xslt-component.adoc
index 7617f18b3533..eaf816691199 100644
--- a/components/camel-xslt/src/main/docs/xslt-component.adoc
+++ b/components/camel-xslt/src/main/docs/xslt-component.adoc
@@ -243,7 +243,7 @@ XML::
+
[source,xml]
----
-<camelContext xmlns="http://activemq.apache.org/camel/schema/spring";>
+<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="activemq:My.Queue"/>
<to uri="xslt:org/apache/camel/spring/processor/example.xsl"/>
diff --git a/core/camel-base/src/main/docs/properties-component.adoc
b/core/camel-base/src/main/docs/properties-component.adoc
index a7942e46035d..2f22143d1bdc 100644
--- a/core/camel-base/src/main/docs/properties-component.adoc
+++ b/core/camel-base/src/main/docs/properties-component.adoc
@@ -113,6 +113,7 @@ For fine-grained configuration of the location, then this
can be done as follows
resolver = "classpath"
path = "com/my/company/something/my-properties-2.properties"
optional = "false"/>
+ </propertyPlaceholder>
</camelContext>
----
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc
index 9f824cb496f7..02bb30045552 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc
@@ -259,9 +259,9 @@ XML::
<intercept>
<onWhen>
<simple>${body} contains 'Hello'</simple>
- <to uri="log:test"/>
- <stop/> <!-- stop continue routing -->
</onWhen>
+ <to uri="log:test"/>
+ <stop/> <!-- stop continue routing -->
</intercept>
<route>
@@ -386,7 +386,7 @@ XML::
----
<interceptFrom uri="jms*">
<to uri="log:incoming"/>
- </intercept>
+ </interceptFrom>
<route>
<from uri="jms:queue:order"/>
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/keyValueRepository.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/keyValueRepository.adoc
index 7f552096ffe1..c8398fe57026 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/keyValueRepository.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/keyValueRepository.adoc
@@ -159,7 +159,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.caffeine.cache.CaffeineKeyValueRepository;
+import
org.apache.camel.component.caffeine.processor.CaffeineKeyValueRepository;
@BindToRegistry("caffeineKvr")
public KeyValueRepository caffeineKvr() {
@@ -208,7 +208,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.ehcache.EhcacheKeyValueRepository;
+import org.apache.camel.component.ehcache.processor.EhcacheKeyValueRepository;
import org.ehcache.CacheManager;
import org.ehcache.config.builders.CacheConfigurationBuilder;
import org.ehcache.config.builders.CacheManagerBuilder;
@@ -281,7 +281,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.jcache.JCacheKeyValueRepository;
+import org.apache.camel.component.jcache.processor.JCacheKeyValueRepository;
import javax.cache.configuration.MutableConfiguration;
import javax.cache.expiry.CreatedExpiryPolicy;
import javax.cache.expiry.Duration;
@@ -558,7 +558,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.sql.JdbcKeyValueRepository;
+import org.apache.camel.processor.keyvalue.jdbc.JdbcKeyValueRepository;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
import javax.sql.DataSource;
@@ -626,7 +626,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.jpa.JpaKeyValueRepository;
+import org.apache.camel.processor.keyvalue.jpa.JpaKeyValueRepository;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -687,7 +687,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.cassandra.CassandraKeyValueRepository;
+import
org.apache.camel.processor.keyvalue.cassandra.CassandraKeyValueRepository;
import com.datastax.oss.driver.api.core.CqlSession;
import com.datastax.oss.driver.api.core.ConsistencyLevel;
import java.net.InetSocketAddress;
@@ -764,7 +764,7 @@ Java DSL::
+
[source,java]
----
-import org.apache.camel.component.kafka.KafkaKeyValueRepository;
+import org.apache.camel.processor.keyvalue.kafka.KafkaKeyValueRepository;
@BindToRegistry("kafkaKvr")
public KeyValueRepository kafkaKvr() {
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
index 4e11a93b03c6..41980bb8df0e 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
@@ -396,9 +396,9 @@ Spring XML::
[source,xml]
----
<camelContext>
- <properties>
- <property key="CamelLogEipName" value="com.foo.myapp"/>
- </properties>
+ <globalOptions>
+ <globalOption key="CamelLogEipName" value="com.foo.myapp"/>
+ </globalOptions>
</camelContext>
----
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/poll-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/poll-eip.adoc
index 0745b9b1cb92..f29e63ad8d7c 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/poll-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/poll-eip.adoc
@@ -161,7 +161,7 @@ XML::
+
[source,xml]
----
-<rest path="/report" desription="Report REST API">
+<rest path="/report" description="Report REST API">
<get path="/{id}/payload">
<to uri="direct:payload"/>
</get>
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-advanced.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-advanced.adoc
index b6a06a051e6b..58c5c2057aed 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-advanced.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-advanced.adoc
@@ -606,7 +606,7 @@ And to replace all single quotes with double quotes:
[source,xml]
----
<setBody>
- <simple>${replace(' , ")}</simple>
+ <simple>${replace(&apos; , &quot;)}</simple>
</setBody>
----
@@ -615,7 +615,7 @@ Or to remove all double quotes:
[source,xml]
----
<setBody>
- <simple>${replace(" , ∅)}</simple>
+ <simple>${replace(&quot; , &empty;)}</simple>
</setBody>
----
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-operators.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-operators.adoc
index 76eebd96b0d7..c14250e36dfb 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-operators.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-operators.adoc
@@ -357,12 +357,13 @@ order:
._XML-only:_
[source,xml]
----
-<from uri="seda:orders">
- <filter>
- <simple>${header.type} == 'widget'</simple>
- <to uri="bean:orderService?method=handleWidget"/>
- </filter>
-</from>
+<route>
+ <from uri="seda:orders"/>
+ <filter>
+ <simple>${header.type} == 'widget'</simple>
+ <to uri="bean:orderService?method=handleWidget"/>
+ </filter>
+</route>
----
=== Combining multiple expression using AND / OR Operator
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
index c4923b32658c..c9b3b666d0d8 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
@@ -1508,7 +1508,15 @@ In YAML DSL the changes are even simpler as the endpoint
is moved from `uri` to
uri: mock:compensation
completion:
uri: mock:completion
- key: myOptionKey2
+ option:
+ - key: myOptionKey
+ expression:
+ constant:
+ expression: myOptionValue
+ - key: myOptionKey2
+ expression:
+ constant:
+ expression: myOptionValue2
- choice:
when:
- expression:
@@ -1557,7 +1565,15 @@ After:
sagaService: mySagaService
compensation: mock:compensation
completion: mock:completion
- key: myOptionKey2
+ option:
+ - key: myOptionKey
+ expression:
+ constant:
+ expression: myOptionValue
+ - key: myOptionKey2
+ expression:
+ constant:
+ expression: myOptionValue2
- choice:
when:
- expression:
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
index ffb0c2d2daa4..10596f077ee6 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
@@ -106,7 +106,15 @@ In YAML DSL the changes are even simpler as the endpoint
is moved from `uri` to
uri: mock:compensation
completion:
uri: mock:completion
- key: myOptionKey2
+ option:
+ - key: myOptionKey
+ expression:
+ constant:
+ expression: myOptionValue
+ - key: myOptionKey2
+ expression:
+ constant:
+ expression: myOptionValue2
- choice:
when:
- expression:
@@ -155,7 +163,15 @@ After:
sagaService: mySagaService
compensation: mock:compensation
completion: mock:completion
- key: myOptionKey2
+ option:
+ - key: myOptionKey
+ expression:
+ constant:
+ expression: myOptionValue
+ - key: myOptionKey2
+ expression:
+ constant:
+ expression: myOptionValue2
- choice:
when:
- expression:
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc
index 119b3b93aaab..b01b9bcc8dea 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc
@@ -2066,10 +2066,16 @@ placeholder to be used, which is resolved when the
route starts:
[source,yaml]
----
-- route:
- templateParameters:
+- routeTemplate:
+ id: myTemplate
+ parameters:
- name: greeting
required: "{{myRequiredFlag}}"
+ from:
+ uri: direct:start
+ steps:
+ - log:
+ message: "{{greeting}}"
----
Before this change the value was converted to a `Boolean` while the route was
being loaded, so
diff --git a/docs/user-manual/modules/ROOT/pages/delay-interceptor.adoc
b/docs/user-manual/modules/ROOT/pages/delay-interceptor.adoc
index 85bd57a780ec..b97a80aabac9 100644
--- a/docs/user-manual/modules/ROOT/pages/delay-interceptor.adoc
+++ b/docs/user-manual/modules/ROOT/pages/delay-interceptor.adoc
@@ -21,7 +21,7 @@ Set the `delayer` attribute of the `<camelContext>` tag as
shown below:
.Spring XML
[source,xml]
--------------------------------------------------------------------------------------------------
-<camelContext id="camel" delayer="500"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+<camelContext id="camel" delayer="500"
xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="direct:start"/>
<to uri="mock:result"/>
diff --git a/docs/user-manual/modules/ROOT/pages/exception-advanced.adoc
b/docs/user-manual/modules/ROOT/pages/exception-advanced.adoc
index 144861f65914..2356967142d3 100644
--- a/docs/user-manual/modules/ROOT/pages/exception-advanced.adoc
+++ b/docs/user-manual/modules/ROOT/pages/exception-advanced.adoc
@@ -185,10 +185,10 @@ XML::
----
<onException>
<exception>com.foo.MyUserException</exception>
- <redeliveryPolicy maximumRedeliveries="1" redeliveryDelay="0"/>
<onWhen>
<simple>${header.user} != null</simple>
</onWhen>
+ <redeliveryPolicy maximumRedeliveries="1" redeliveryDelay="0"/>
<to uri="mock:error"/>
</onException>
@@ -280,8 +280,8 @@ In XML then you refer to the redelivery process using
`onRedeliveryRef` which is
[source,xml]
----
<onException onRedeliveryRef="myIORedeliverProcessor">
- <redeliveryPolicy maximumRedeliveries="3" redeliveryDelay="0"/>
<exception>java.io.IOException</exception>
+ <redeliveryPolicy maximumRedeliveries="3" redeliveryDelay="0"/>
</onException>
----
diff --git a/docs/user-manual/modules/ROOT/pages/exchange-pooling.adoc
b/docs/user-manual/modules/ROOT/pages/exchange-pooling.adoc
index b771f1be2442..ea51101c87d1 100644
--- a/docs/user-manual/modules/ROOT/pages/exchange-pooling.adoc
+++ b/docs/user-manual/modules/ROOT/pages/exchange-pooling.adoc
@@ -28,31 +28,16 @@ The _object pooling_ is currently disabled by default. If
you are using Camel Ma
camel.main.exchange-factory = pooled
----
-=== Enabling Exchange Pooling on Camel 3.x
+=== Enabling Exchange Pooling programmatically
-If you are using a different runtime or want to do that programmatically, you
can do so in Camel version 3 (Camel 3.x) using the `setExchangeFactory` method
from the `ExtendedCamelContext`. Here's an example of how to do that using Java:
+If you are using a different runtime or if you want to do that
programmatically, you can do so using the `setExchangeFactory` method from the
`ExtendedCamelContext`. Here's an example of how to do that using Java:
[source,java]
----
// suppose a Camel context object declared in the scope
CamelContext context = ...
-context.adapt(ExtendedCamelContext.class).setExchangeFactory(new
PooledExchangeFactory());
-----
-
-[NOTE]
-====
-The `ExtendedCamelContext` is an internal API of Camel and, as such, may not
offer the same level of backward compatibility as the public APIs. Whenever
possible, configure the exchange pooling via application properties.
-====
-
-=== Enabling Exchange Pooling on Camel 4.x
-
-If you are using a different runtime or if you want to do that
programmatically, you can do so in Camel 4 and newer versions using the
`setExchangeFactory` method from the `ExtendedCamelContext`. Here's an example
of how to do that using Java:
-
-[source,java]
-----
-CamelContext context = ...
-context.getExchangeExtension().setExchangeFactory(new PooledExchangeFactory());
+context.getCamelContextExtension().setExchangeFactory(new
PooledExchangeFactory());
----
[NOTE]
diff --git
a/docs/user-manual/modules/ROOT/pages/langchain4j-spring-boot-integration.adoc
b/docs/user-manual/modules/ROOT/pages/langchain4j-spring-boot-integration.adoc
index 1e93b26e80b1..f0e8748b0b03 100644
---
a/docs/user-manual/modules/ROOT/pages/langchain4j-spring-boot-integration.adoc
+++
b/docs/user-manual/modules/ROOT/pages/langchain4j-spring-boot-integration.adoc
@@ -228,7 +228,7 @@ langchain4j:
[source,java]
----
import org.apache.camel.builder.RouteBuilder;
-import
org.apache.camel.component.langchain4j.chat.LangChain4jRagAggregatorStrategy;
+import
org.apache.camel.component.langchain4j.chat.rag.LangChain4jRagAggregatorStrategy;
import org.springframework.stereotype.Component;
@Component
diff --git a/docs/user-manual/modules/ROOT/pages/oncompletion.adoc
b/docs/user-manual/modules/ROOT/pages/oncompletion.adoc
index 58d590981be0..f7d3301e9c3d 100644
--- a/docs/user-manual/modules/ROOT/pages/oncompletion.adoc
+++ b/docs/user-manual/modules/ROOT/pages/oncompletion.adoc
@@ -353,11 +353,11 @@ XML::
----
+
You can also refer to a specific thread pool
-to be used, using the `executorServiceRef` option
+to be used, using the `executorService` option
+
[source,xml]
----
-<onCompletion executorServiceRef="myThreadPool">
+<onCompletion executorService="myThreadPool">
<to uri="mock:before"/>
<delay><constant>1000</constant></delay>
<setBody><simple>OnComplete:${body}</simple></setBody>
diff --git a/docs/user-manual/modules/ROOT/pages/rest-dsl-openapi.adoc
b/docs/user-manual/modules/ROOT/pages/rest-dsl-openapi.adoc
index 88d138fd57af..97c4f1fc8a4d 100644
--- a/docs/user-manual/modules/ROOT/pages/rest-dsl-openapi.adoc
+++ b/docs/user-manual/modules/ROOT/pages/rest-dsl-openapi.adoc
@@ -164,7 +164,7 @@ XML::
</rest>
<route>
<from uri="direct:getUserByName"/>
- // do something here
+ <!-- do something here -->
</route>
----
YAML::
@@ -447,7 +447,7 @@ XML::
+
[source,xml]
----
-<restConfiguration bindingMode="true"
bindingPackageScan="sample.petstore.model"/>
+<restConfiguration bindingMode="json"
bindingPackageScan="sample.petstore.model"/>
----
YAML::
diff --git a/docs/user-manual/modules/ROOT/pages/rest-dsl-validation.adoc
b/docs/user-manual/modules/ROOT/pages/rest-dsl-validation.adoc
index 99369be67331..b90e7c8c0eb5 100644
--- a/docs/user-manual/modules/ROOT/pages/rest-dsl-validation.adoc
+++ b/docs/user-manual/modules/ROOT/pages/rest-dsl-validation.adoc
@@ -279,7 +279,7 @@ XML::
----
<rest path="/customers/">
<get path="/{id}">
- <param name="id"/>
+ <param name="id" type="path"/>
<to uri="direct:customerDetail"/>
</get>
<get path="/{id}/orders">
diff --git a/docs/user-manual/modules/ROOT/pages/threading-model.adoc
b/docs/user-manual/modules/ROOT/pages/threading-model.adoc
index 11c2e8f46733..1452aecf2e16 100644
--- a/docs/user-manual/modules/ROOT/pages/threading-model.adoc
+++ b/docs/user-manual/modules/ROOT/pages/threading-model.adoc
@@ -176,9 +176,10 @@ Spring XML::
----
<camelContext>
- <threadPool id="nyPool" poolSize="20" maxPoolSize="50"/>
+ <threadPool id="myPool" threadName="myPool" poolSize="20"
maxPoolSize="50"/>
<route>
+ <from uri="direct:start"/>
<multicast aggregationStrategy="myStrategy" executorService="myPool">
...
</multicast>
diff --git a/docs/user-manual/modules/ROOT/pages/tracer.adoc
b/docs/user-manual/modules/ROOT/pages/tracer.adoc
index 3008371b484a..723311913125 100644
--- a/docs/user-manual/modules/ROOT/pages/tracer.adoc
+++ b/docs/user-manual/modules/ROOT/pages/tracer.adoc
@@ -25,7 +25,7 @@ Spring XML::
+
[source,xml]
----
-<camelContext trace="true"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+<camelContext trace="true" xmlns="http://camel.apache.org/schema/spring";>
...
</camelContext>
----
@@ -64,7 +64,7 @@ Spring XML::
+
[source,xml]
----
-<camelContext trace="standby"
xmlns="http://activemq.apache.org/camel/schema/spring";>
+<camelContext trace="standby" xmlns="http://camel.apache.org/schema/spring";>
...
</camelContext>
----
diff --git a/dsl/camel-xml-io-dsl/src/main/docs/java-xml-io-dsl.adoc
b/dsl/camel-xml-io-dsl/src/main/docs/java-xml-io-dsl.adoc
index 32b12847b5c9..fc8ff5948d1e 100644
--- a/dsl/camel-xml-io-dsl/src/main/docs/java-xml-io-dsl.adoc
+++ b/dsl/camel-xml-io-dsl/src/main/docs/java-xml-io-dsl.adoc
@@ -198,7 +198,7 @@ A bean can also be created from another builder class as
shown below:
<properties>
<property key="id" value="123"/>
<property key="name" value="Acme"/>
- </constructors>
+ </properties>
</bean>
----
