This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit ec1384b3aa652358eef46a0a2c164068337b0380 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Tue Jul 23 19:00:49 2019 +0200 Removed the links for the moment (bean-language and test-spring adoc) --- components/camel-bean/src/main/docs/bean-language.adoc | 7 +++---- components/camel-test-spring/src/main/docs/test-spring.adoc | 2 +- docs/components/modules/ROOT/pages/bean-language.adoc | 7 +++---- docs/components/modules/ROOT/pages/test-spring.adoc | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/components/camel-bean/src/main/docs/bean-language.adoc b/components/camel-bean/src/main/docs/bean-language.adoc index bd92fb5..f1f58bf 100644 --- a/components/camel-bean/src/main/docs/bean-language.adoc +++ b/components/camel-bean/src/main/docs/bean-language.adoc @@ -8,8 +8,7 @@ The purpose of the Bean Language is to be able to implement an xref:manual::expression.adoc[Expression] or xref:manual::predicate.adoc[Predicate] using -a simple method on a bean. The bean name is resolved using a -xref:registry.adoc[Registry], such as the +a simple method on a bean. The bean name is resolved using a Registry, such as the xref:manual::spring.adoc[Spring] *`ApplicationContext`*, then a method is invoked to evaluate the xref:manual::expression.adoc[Expression] or xref:manual::predicate.adoc[Predicate]. If no method name is provided then one @@ -99,9 +98,9 @@ or other expressions. === Non-Registry Beans The xref:bean-language.adoc[Bean Language] also supports invoking beans -that isn't registered in the xref:registry.adoc[Registry]. This is +that isn't registered in the Registry. This is usable for quickly to invoke a bean from Java DSL where you don't need -to register the bean in the xref:registry.adoc[Registry] such as the +to register the bean in the Registry such as the xref:spring.adoc[Spring] *`ApplicationContext`*. Camel can instantiate the bean and invoke the method if given a class or invoke an already existing instance. diff --git a/components/camel-test-spring/src/main/docs/test-spring.adoc b/components/camel-test-spring/src/main/docs/test-spring.adoc index e665089..1e7d45c 100644 --- a/components/camel-test-spring/src/main/docs/test-spring.adoc +++ b/components/camel-test-spring/src/main/docs/test-spring.adoc @@ -9,7 +9,7 @@ Allows to test Camel with Spring applications such as Spring XML files or Spring This documentation is old and needs to be updated ==== -xref:testing.adoc[Testing] is a crucial part of any development or integration work. The Spring Framework offers a number of features that makes it easy to test while using Spring for Inversion of Control which works with JUnit 3.x, JUnit 4.x, and http://testng.org[TestNG]. +Testing is a crucial part of any development or integration work. The Spring Framework offers a number of features that makes it easy to test while using Spring for Inversion of Control which works with JUnit 3.x, JUnit 4.x, and http://testng.org[TestNG]. We can use Spring for IoC and the Camel xref:components::mock-component.adoc[Mock] and xref:components::test.adoc[Test] endpoints to create sophisticated integration/unit tests that are easy to run and debug inside your IDE. There are three supported approaches for testing with Spring in Camel. [width="100%",cols="1,1,4,1",options="header",] diff --git a/docs/components/modules/ROOT/pages/bean-language.adoc b/docs/components/modules/ROOT/pages/bean-language.adoc index 12a80f2..f1f58bf 100644 --- a/docs/components/modules/ROOT/pages/bean-language.adoc +++ b/docs/components/modules/ROOT/pages/bean-language.adoc @@ -8,8 +8,7 @@ The purpose of the Bean Language is to be able to implement an xref:manual::expression.adoc[Expression] or xref:manual::predicate.adoc[Predicate] using -a simple method on a bean. The bean name is resolved using a -xref:manual::registry.adoc[Registry], such as the +a simple method on a bean. The bean name is resolved using a Registry, such as the xref:manual::spring.adoc[Spring] *`ApplicationContext`*, then a method is invoked to evaluate the xref:manual::expression.adoc[Expression] or xref:manual::predicate.adoc[Predicate]. If no method name is provided then one @@ -99,9 +98,9 @@ or other expressions. === Non-Registry Beans The xref:bean-language.adoc[Bean Language] also supports invoking beans -that isn't registered in the xref:manual::registry.adoc[Registry]. This is +that isn't registered in the Registry. This is usable for quickly to invoke a bean from Java DSL where you don't need -to register the bean in the xref:manual::registry.adoc[Registry] such as the +to register the bean in the Registry such as the xref:spring.adoc[Spring] *`ApplicationContext`*. Camel can instantiate the bean and invoke the method if given a class or invoke an already existing instance. diff --git a/docs/components/modules/ROOT/pages/test-spring.adoc b/docs/components/modules/ROOT/pages/test-spring.adoc index 3df7963..1e7d45c 100644 --- a/docs/components/modules/ROOT/pages/test-spring.adoc +++ b/docs/components/modules/ROOT/pages/test-spring.adoc @@ -9,7 +9,7 @@ Allows to test Camel with Spring applications such as Spring XML files or Spring This documentation is old and needs to be updated ==== -xref:manual::testing.adoc[Testing] is a crucial part of any development or integration work. The Spring Framework offers a number of features that makes it easy to test while using Spring for Inversion of Control which works with JUnit 3.x, JUnit 4.x, and http://testng.org[TestNG]. +Testing is a crucial part of any development or integration work. The Spring Framework offers a number of features that makes it easy to test while using Spring for Inversion of Control which works with JUnit 3.x, JUnit 4.x, and http://testng.org[TestNG]. We can use Spring for IoC and the Camel xref:components::mock-component.adoc[Mock] and xref:components::test.adoc[Test] endpoints to create sophisticated integration/unit tests that are easy to run and debug inside your IDE. There are three supported approaches for testing with Spring in Camel. [width="100%",cols="1,1,4,1",options="header",]