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 25fb17e7e1c CAMEL-16335 Create a middle folder for Camel Spring
components
25fb17e7e1c is described below
commit 25fb17e7e1c2de147fb2245d9fc7712ffe62adb4
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Feb 27 11:10:38 2025 +0100
CAMEL-16335 Create a middle folder for Camel Spring components
---
components/camel-mock/src/main/docs/mock-component.adoc | 4 ++--
.../camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml | 1 +
.../src/test/resources/org/apache/camel/spring/mock/camel-route.xml | 1 +
.../camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml | 1 -
.../src/test/resources/org/apache/camel/spring/mock/camel-route.xml | 1 -
docs/gulpfile.js | 2 +-
.../faq/pages/how-do-i-import-routes-from-other-xml-files.adoc | 4 ++--
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/camel-mock/src/main/docs/mock-component.adoc
b/components/camel-mock/src/main/docs/mock-component.adoc
index 5832fae8f43..9dea0338588 100644
--- a/components/camel-mock/src/main/docs/mock-component.adoc
+++ b/components/camel-mock/src/main/docs/mock-component.adoc
@@ -404,7 +404,7 @@ Suppose we have the route in the `camel-route.xml` file:
[source,xml]
.*camel-route.xml*
----
-include::{examplesdir}/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml[tags=e1]
+include::{examplesdir}/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml[tags=e1]
----
Then we create a new XML file as follows, where we include the
@@ -415,7 +415,7 @@ Camel to mock all endpoints:
[source,xml]
.*test-camel-route.xml*
----
-include::{examplesdir}/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml[tags=e1]
+include::{examplesdir}/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml[tags=e1]
----
Then in your unit test you load the new XML file
diff --git
a/docs/components/modules/ROOT/examples/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
b/docs/components/modules/ROOT/examples/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
new file mode 120000
index 00000000000..6e778617a61
--- /dev/null
+++
b/docs/components/modules/ROOT/examples/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
@@ -0,0 +1 @@
+../../../../../../../../../../../../../../../../components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
\ No newline at end of file
diff --git
a/docs/components/modules/ROOT/examples/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
b/docs/components/modules/ROOT/examples/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
new file mode 120000
index 00000000000..ef8cca83eab
--- /dev/null
+++
b/docs/components/modules/ROOT/examples/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
@@ -0,0 +1 @@
+../../../../../../../../../../../../../../../../components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
\ No newline at end of file
diff --git
a/docs/components/modules/ROOT/examples/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
b/docs/components/modules/ROOT/examples/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
deleted file mode 120000
index a3a655e4a92..00000000000
---
a/docs/components/modules/ROOT/examples/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../../../../../../../components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml
\ No newline at end of file
diff --git
a/docs/components/modules/ROOT/examples/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
b/docs/components/modules/ROOT/examples/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
deleted file mode 120000
index b40cc82752b..00000000000
---
a/docs/components/modules/ROOT/examples/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../../../../../../../components/camel-spring-xml/src/test/resources/org/apache/camel/spring/mock/camel-route.xml
\ No newline at end of file
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index 0d835eaa6ab..70b127a1eda 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -108,7 +108,7 @@ const sources = {
source: [
'../core/camel-base/src/main/docs/*.adoc',
'../core/camel-main/src/main/docs/*.adoc',
- '../components/{*,*/*}/src/main/docs/*.adoc',
+ '../components/{*,*/*,*/*/*}/src/main/docs/*.adoc',
],
destination: 'components/modules/ROOT/examples',
},
diff --git
a/docs/user-manual/modules/faq/pages/how-do-i-import-routes-from-other-xml-files.adoc
b/docs/user-manual/modules/faq/pages/how-do-i-import-routes-from-other-xml-files.adoc
index 35735fb563e..b17b627a46f 100644
---
a/docs/user-manual/modules/faq/pages/how-do-i-import-routes-from-other-xml-files.adoc
+++
b/docs/user-manual/modules/faq/pages/how-do-i-import-routes-from-other-xml-files.adoc
@@ -23,12 +23,12 @@ the `<routeContext>` is currently isolated. This may change
in Camel
====
For example, we could have a file named `myCoolRoutes.xml` which
-contains a couple of routes as shown in
https://github.com/apache/camel/tree/main/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/myCoolRoutes.xml[this
example].
+contains a couple of routes as shown in
https://github.com/apache/camel/tree/main/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/myCoolRoutes.xml[this
example].
Then in your XML file which contains the CamelContext you can use Spring to
import the `myCoolRoute.xml` file. And then inside `<camelContext/>`
-you can refer to the `<routeContext/>` by its `id` as shown below in
https://github.com/apache/camel/tree/main/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.xml[this
example].
+you can refer to the `<routeContext/>` by its `id` as shown below in
https://github.com/apache/camel/tree/main/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/config/RouteRefIncludeXmlFileTest.xml[this
example].
Also notice that you can mix and match, having routes inside `CamelContext`
