This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 441fe0092a1e94ff7077e13529e0c0dadeadc5e3
Author: nayananga@acerubuntu18.04 <nayanangamuhandi...@gmail.com>
AuthorDate: Wed Jul 24 23:13:13 2019 +0530
Revert "more fixes for anchor not found errors"
This reverts commit addba95ba72d704ba2b5b12ee7882584ac0bf28e.
---
.../camel-bean/src/main/docs/bean-language.adoc | 2 +-
.../src/main/docs/spring-boot.adoc | 2 +-
.../src/main/docs/test-spring.adoc | 15 +++++++-----
.../src/main/docs/eips/unmarshal-eip.adoc | 2 +-
.../modules/ROOT/pages/bean-language.adoc | 2 +-
.../components/modules/ROOT/pages/spring-boot.adoc | 2 +-
.../components/modules/ROOT/pages/test-spring.adoc | 15 +++++++-----
.../modules/ROOT/pages/contributing.adoc | 28 +++++++++++-----------
.../modules/ROOT/pages/unmarshal-eip.adoc | 2 +-
9 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/components/camel-bean/src/main/docs/bean-language.adoc
b/components/camel-bean/src/main/docs/bean-language.adoc
index c5b909e..ce5a1c4 100644
--- a/components/camel-bean/src/main/docs/bean-language.adoc
+++ b/components/camel-bean/src/main/docs/bean-language.adoc
@@ -19,7 +19,7 @@ methods.
The xref:manual::bean-binding.adoc[Bean Binding] rules are used to bind the
xref:manual::message.adoc[Message] Exchange to the method parameters; so you
can
annotate the bean to extract headers or other expressions such as
-xref:xpath-language.adoc[XPath] or xref:xquery-language.adoc[XQuery] from the
message.
+xref:components::xpath-language.adoc[XPath] or
xref:components::xquery-language.adoc[XQuery] from the message.
[[BeanLanguage-UsingBeanExpressionsinJava]]
=== Using Bean Expressions in Java
diff --git a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
index 57fe634..727d7cb 100644
--- a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -598,7 +598,7 @@
https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-tes
To get the `CamelContext` or `ProducerTemplate`, you can inject them into the
class in the normal Spring manner, using `@Autowired`.
-You can also use
xref:manual::spring-testing.adoc#SpringTesting-CamelEnhancedSpringTest[Camel
Spring test annotations] to configure tests declaratively. This example uses
the `@MockEndpoints` annotation to auto-mock an endpoint:
+You can also use xref:manual::spring-testing.adoc[Camel Spring test
annotations] to configure tests declaratively. This example uses the
`@MockEndpoints` annotation to auto-mock an endpoint:
[source,java]
----
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 2dd41e6..3df7963 100644
--- a/components/camel-test-spring/src/main/docs/test-spring.adoc
+++ b/components/camel-test-spring/src/main/docs/test-spring.adoc
@@ -15,7 +15,7 @@ We can use Spring for IoC and the Camel
xref:components::mock-component.adoc[Moc
[width="100%",cols="1,1,4,1",options="header",]
|=======================================================================
|Name |Testing Frameworks Supported |Description |Required Camel Test
Dependencies
-|<<CamelSpringTestSupport>> a|
+|<<camel-spring-test-support,Camel Spring Test Support>> a|
* JUnit 3.x (deprecated)
* JUnit 4.x
* TestNG
@@ -34,7 +34,7 @@ a|
* JUnit 4.x - camel-test-spring
* TestNG - camel-test-ng
-|<<Plain Spring Test>>> a|
+|<<plain-spring-test, Plain Spring Test>> a|
* JUnit 3.x
* JUnit 4.x
* TestNG
@@ -59,7 +59,7 @@ a|
* JUnit 4.x - None
* TestNG - None
-|<<Camel Enhanced Spring Test>> a|
+|<<camel-enhanced-spring-test,Camel Enhanced Spring Test>> a|
* JUnit 4.x
* TestNG
@@ -75,7 +75,8 @@ a|
* TestNG - camel-test-ng
|=======================================================================
-=== CamelSpringTestSupport
+[#camel-spring-test-support]
+### CamelSpringTestSupport
The following Spring test support classes:
@@ -98,7 +99,8 @@ protected abstract AbstractApplicationContext
createApplicationContext();
----
You are responsible for the instantiation of the Spring context in the method
implementation. All of the features available in the non-Spring aware
counterparts from http://camel.apache.org/camel-test.html[Camel Test] are
available in your test.
-=== Plain Spring Test
+[#plain-spring-test]
+### Plain Spring Test
In this approach, your test classes directly inherit from the Spring Test
abstract test classes or use the JUnit 4.x test runner provided in Spring Test.
This approach supports dependency injection into your test class and the full
suite of Spring Test annotations. However, it does not support the features
provided by the `CamelSpringTestSupport` classes.
@@ -289,7 +291,8 @@ public class MyCamelTest {
}
----
-=== Camel Enhanced Spring Test
+[#camel-enhanced-spring-test]
+### Camel Enhanced Spring Test
Using the `org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner` runner
with the `@RunWith` annotation or extending
`org.apache.camel.testng.AbstractCamelTestNGSpringContextTests` provides the
full feature set of Spring Test with support for the feature set provided in
the `CamelTestSupport` classes.
diff --git a/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
b/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
index 4e4becc..a917ff3 100644
--- a/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
@@ -1,7 +1,7 @@
[[unmarshal-eip]]
== Unmarshal EIP
-If you receive a message from one of the Camel
xref:components::index.adoc[Components] such as
xref:components::file-component.adoc[File],
xref:components::http4-component.adoc[HTTP] or
xref:components::jms-component.adoc[JMS] you often want to unmarshal the
payload into some bean so that you can process it using some
xref:bean-integration.adoc[Bean Integration] or perform
xref:predicate.adoc[Predicate] evaluation and so forth. To do this use the
*unmarshal* word in the xref:dsl.adoc[DSL [...]
+If you receive a message from one of the Camel
xref:components::index.adoc[Components] such as
xref:components::file-component.adoc[File],
xref:components::http4-component.adoc[HTTP] or
xref:components::jms-component.adoc[JMS] you often want to unmarshal the
payload into some bean so that you can process it using some
xref:bean-integration.adoc[Bean Integration] or perform
xref:predicate.adoc[Predicate] evaluation and so forth. To do this use the
*unmarshal* word in the xref:dsl.adoc[DSL [...]
== Options
diff --git a/docs/components/modules/ROOT/pages/bean-language.adoc
b/docs/components/modules/ROOT/pages/bean-language.adoc
index c5b909e..ce5a1c4 100644
--- a/docs/components/modules/ROOT/pages/bean-language.adoc
+++ b/docs/components/modules/ROOT/pages/bean-language.adoc
@@ -19,7 +19,7 @@ methods.
The xref:manual::bean-binding.adoc[Bean Binding] rules are used to bind the
xref:manual::message.adoc[Message] Exchange to the method parameters; so you
can
annotate the bean to extract headers or other expressions such as
-xref:xpath-language.adoc[XPath] or xref:xquery-language.adoc[XQuery] from the
message.
+xref:components::xpath-language.adoc[XPath] or
xref:components::xquery-language.adoc[XQuery] from the message.
[[BeanLanguage-UsingBeanExpressionsinJava]]
=== Using Bean Expressions in Java
diff --git a/docs/components/modules/ROOT/pages/spring-boot.adoc
b/docs/components/modules/ROOT/pages/spring-boot.adoc
index 57fe634..727d7cb 100644
--- a/docs/components/modules/ROOT/pages/spring-boot.adoc
+++ b/docs/components/modules/ROOT/pages/spring-boot.adoc
@@ -598,7 +598,7 @@
https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-tes
To get the `CamelContext` or `ProducerTemplate`, you can inject them into the
class in the normal Spring manner, using `@Autowired`.
-You can also use
xref:manual::spring-testing.adoc#SpringTesting-CamelEnhancedSpringTest[Camel
Spring test annotations] to configure tests declaratively. This example uses
the `@MockEndpoints` annotation to auto-mock an endpoint:
+You can also use xref:manual::spring-testing.adoc[Camel Spring test
annotations] to configure tests declaratively. This example uses the
`@MockEndpoints` annotation to auto-mock an endpoint:
[source,java]
----
diff --git a/docs/components/modules/ROOT/pages/test-spring.adoc
b/docs/components/modules/ROOT/pages/test-spring.adoc
index 2dd41e6..3df7963 100644
--- a/docs/components/modules/ROOT/pages/test-spring.adoc
+++ b/docs/components/modules/ROOT/pages/test-spring.adoc
@@ -15,7 +15,7 @@ We can use Spring for IoC and the Camel
xref:components::mock-component.adoc[Moc
[width="100%",cols="1,1,4,1",options="header",]
|=======================================================================
|Name |Testing Frameworks Supported |Description |Required Camel Test
Dependencies
-|<<CamelSpringTestSupport>> a|
+|<<camel-spring-test-support,Camel Spring Test Support>> a|
* JUnit 3.x (deprecated)
* JUnit 4.x
* TestNG
@@ -34,7 +34,7 @@ a|
* JUnit 4.x - camel-test-spring
* TestNG - camel-test-ng
-|<<Plain Spring Test>>> a|
+|<<plain-spring-test, Plain Spring Test>> a|
* JUnit 3.x
* JUnit 4.x
* TestNG
@@ -59,7 +59,7 @@ a|
* JUnit 4.x - None
* TestNG - None
-|<<Camel Enhanced Spring Test>> a|
+|<<camel-enhanced-spring-test,Camel Enhanced Spring Test>> a|
* JUnit 4.x
* TestNG
@@ -75,7 +75,8 @@ a|
* TestNG - camel-test-ng
|=======================================================================
-=== CamelSpringTestSupport
+[#camel-spring-test-support]
+### CamelSpringTestSupport
The following Spring test support classes:
@@ -98,7 +99,8 @@ protected abstract AbstractApplicationContext
createApplicationContext();
----
You are responsible for the instantiation of the Spring context in the method
implementation. All of the features available in the non-Spring aware
counterparts from http://camel.apache.org/camel-test.html[Camel Test] are
available in your test.
-=== Plain Spring Test
+[#plain-spring-test]
+### Plain Spring Test
In this approach, your test classes directly inherit from the Spring Test
abstract test classes or use the JUnit 4.x test runner provided in Spring Test.
This approach supports dependency injection into your test class and the full
suite of Spring Test annotations. However, it does not support the features
provided by the `CamelSpringTestSupport` classes.
@@ -289,7 +291,8 @@ public class MyCamelTest {
}
----
-=== Camel Enhanced Spring Test
+[#camel-enhanced-spring-test]
+### Camel Enhanced Spring Test
Using the `org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner` runner
with the `@RunWith` annotation or extending
`org.apache.camel.testng.AbstractCamelTestNGSpringContextTests` provides the
full feature set of Spring Test with support for the feature set provided in
the `CamelTestSupport` classes.
diff --git a/docs/user-manual/modules/ROOT/pages/contributing.adoc
b/docs/user-manual/modules/ROOT/pages/contributing.adoc
index e95c28c..652cc42 100644
--- a/docs/user-manual/modules/ROOT/pages/contributing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/contributing.adoc
@@ -11,20 +11,20 @@ There are many ways you can help make Camel a better piece
of software - please
== Table of Contents
-* <<Getting in touch>>
-* <<Improving the documentation>>
-* <<If you find a bug or problem>>
-* <<Working on the code>>
-* <<Running checkstyle>>
-* <<Checking Karaf and Spring Boot Integration Tests>>
-* <<Apache Camel committers should work on the ASF git repo>>
-* <<Creating patches>>
-* <<Pull request at Github>>
-* <<Manual patch files>>
-* <<Submitting patches>>
-* <<Using the issue tracker>>
-* <<Becoming a committer>>
-* <<More resources>>
+* <<getting-in-touch,Getting in touch>>
+* <<improving-the-documentation,Improving the documentation>>
+* <<if-you-find-a-bug-or-problem,If you find a bug or problem>>
+* <<working-on-the-code,Working on the code>>
+* <<running-checkstyle,Running checkstyle>>
+* <<checking-karaf-and-spring-boot-integration-tests,Checking Karaf and Spring
Boot Integration Tests>>
+* <<apache-camel-committers-should-work-on-the-asf-git-repo,Apache Camel
committers should work on the ASF git repo>>
+* <<creating-patches,Creating patches>>
+* <<pull-request-at-github,Pull request at Github>>
+* <<manual-patch-files,Manual patch files>>
+* <<submitting-patches,Submitting patches>>
+* <<using-the-issue-tracker,Using the issue tracker>>
+* <<becoming-a-committer,Becoming a committer>>
+* <<more-resources,More resources>>
[#getting-in-touch]
== Getting in touch
diff --git a/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc
b/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc
index 4e4becc..a917ff3 100644
--- a/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/unmarshal-eip.adoc
@@ -1,7 +1,7 @@
[[unmarshal-eip]]
== Unmarshal EIP
-If you receive a message from one of the Camel
xref:components::index.adoc[Components] such as
xref:components::file-component.adoc[File],
xref:components::http4-component.adoc[HTTP] or
xref:components::jms-component.adoc[JMS] you often want to unmarshal the
payload into some bean so that you can process it using some
xref:bean-integration.adoc[Bean Integration] or perform
xref:predicate.adoc[Predicate] evaluation and so forth. To do this use the
*unmarshal* word in the xref:dsl.adoc[DSL [...]
+If you receive a message from one of the Camel
xref:components::index.adoc[Components] such as
xref:components::file-component.adoc[File],
xref:components::http4-component.adoc[HTTP] or
xref:components::jms-component.adoc[JMS] you often want to unmarshal the
payload into some bean so that you can process it using some
xref:bean-integration.adoc[Bean Integration] or perform
xref:predicate.adoc[Predicate] evaluation and so forth. To do this use the
*unmarshal* word in the xref:dsl.adoc[DSL [...]
== Options
