You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2019/07/12 08:58:34 UTC
[camel] branch master updated (c7a5d0a -> d0159e1)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from c7a5d0a Merge branch 'master' of github.com:apache/camel
new 124f4c0 more fixes for anchor not found errors
new 7a599f6 more fixes for anchor not found errors
new d66231b more fixes for anchor not found errors
new d0159e1 required changes done
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:
components/camel-cdi/src/main/docs/cdi.adoc | 1 +
.../camel-cxf/src/main/docs/cxf-component.adoc | 115 +++++++++------------
.../src/main/docs/micrometer-component.adoc | 6 +-
.../camel-test-cdi/src/main/docs/test-cdi.adoc | 4 +-
components/readme.adoc | 10 +-
.../src/main/docs/eips/content-filter-eip.adoc | 2 +-
.../src/main/docs/eips/pipeline-eip.adoc | 2 +-
.../src/main/docs/eips/recipientList-eip.adoc | 2 +-
docs/components/modules/ROOT/pages/cdi.adoc | 1 +
.../modules/ROOT/pages/cxf-component.adoc | 115 +++++++++------------
.../modules/ROOT/pages/micrometer-component.adoc | 6 +-
docs/components/modules/ROOT/pages/test-cdi.adoc | 4 +-
.../books/3151EN_Mastering_Apache_Camel.jpg | Bin
.../ROOT/assets/images}/books/3477OS.jpg | Bin
.../ROOT/assets/images}/books/3477OSmall.jpg | Bin
.../ROOT/assets/images}/books/5347OSmall.jpg | Bin
.../images}/books/B03507_MockupCover_Normal.jpg | Bin
.../assets/images}/books/CamelCookbookCover.png | Bin
.../ROOT/assets/images}/books/CiA-front-medium.png | Bin
.../assets/images}/books/camel-design-patterns.jpg | Bin
.../ROOT/assets/images}/books/cia2-cover-small.jpg | Bin
.../ROOT/assets/images}/books/cia_small.jpg | Bin
.../ROOT/assets/images}/books/eip_book_cover.jpg | Bin
.../ROOT/assets/images}/books/large.jpg | Bin
.../ROOT/assets/images}/books/rademakers.jpg | Bin
docs/user-manual/modules/ROOT/pages/books.adoc | 2 +-
.../modules/ROOT/pages/content-filter-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/faq.adoc | 2 +-
.../pages/faq/how-do-i-become-a-committer.adoc | 2 +-
.../ROOT/pages/faq/how-do-i-edit-the-website.adoc | 2 +-
.../pages/faq/how-does-camel-compare-to-mule.adoc | 2 +-
.../modules/ROOT/pages/faq/what-is-camel.adoc | 4 +-
.../modules/ROOT/pages/guaranteed-delivery.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 28 ++---
.../modules/ROOT/pages/pipeline-eip.adoc | 2 +-
.../modules/ROOT/pages/recipientList-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/support.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/testing.adoc | 18 ++--
.../modules/ROOT/pages/transactional-client.adoc | 4 +-
39 files changed, 154 insertions(+), 188 deletions(-)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/3151EN_Mastering_Apache_Camel.jpg (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/3477OS.jpg (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/3477OSmall.jpg (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/5347OSmall.jpg (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/B03507_MockupCover_Normal.jpg (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/CamelCookbookCover.png (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/CiA-front-medium.png (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/camel-design-patterns.jpg (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/cia2-cover-small.jpg (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/cia_small.jpg (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/eip_book_cover.jpg (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/large.jpg (100%)
rename docs/user-manual/{en => modules/ROOT/assets/images}/books/rademakers.jpg (100%)
[camel] 02/04: more fixes for anchor not found errors
Posted by zr...@apache.org.
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 7a599f6832c092ebecac77f9fc828704b93783b8
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Thu Jul 11 12:06:31 2019 +0530
more fixes for anchor not found errors
---
components/camel-cdi/src/main/docs/cdi.adoc | 1 +
.../src/main/docs/micrometer-component.adoc | 6 +++---
.../modules/ROOT/pages/micrometer-component.adoc | 6 +++---
docs/user-manual/modules/ROOT/pages/index.adoc | 14 +++++++-------
.../modules/ROOT/pages/scala-dsl-supported-languages.adoc | 2 +-
5 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/components/camel-cdi/src/main/docs/cdi.adoc b/components/camel-cdi/src/main/docs/cdi.adoc
index fcf0b33..d5e1fa3 100644
--- a/components/camel-cdi/src/main/docs/cdi.adoc
+++ b/components/camel-cdi/src/main/docs/cdi.adoc
@@ -47,6 +47,7 @@ type `DefaultCamelContext`.
Note that this bean can be customized programmatically and other Camel
context beans can be deployed in the application as well.
+[[CDI-Auto-detectingCamelroutes]]
=== Auto-detecting Camel routes
Camel CDI automatically collects all the `RoutesBuilder` beans in the
diff --git a/components/camel-micrometer/src/main/docs/micrometer-component.adoc b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
index 45f60db..164f4df 100644
--- a/components/camel-micrometer/src/main/docs/micrometer-component.adoc
+++ b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
@@ -14,7 +14,7 @@ endif::[]
The Micrometer component allows to collect various metrics directly
from Camel routes. Supported metric types
-are xref:#MicrometerComponent-counter[counter], xref:#MicrometerComponent-distributionSummary[summary],
+are xref:#MicrometerComponent-counter[counter], xref:#MicrometerComponent-summary[summary],
and xref:#MicrometerComponent-timer[timer]. http://micrometer.io/[Micrometer] provides
simple way to measure the behaviour of an application. Configurable
reporting backends (via Micrometer registries) enable different integration options for
@@ -307,7 +307,7 @@ from("direct:in")
----
-### [[MicrometerComponent-summary]]Distribution Summary
+=== [[MicrometerComponent-summary]]Distribution Summary
[source]
----
@@ -375,7 +375,7 @@ from("direct:in")
----
-### [[MicrometerComponent-timer]]Timer
+=== [[MicrometerComponent-timer]]Timer
[source]
----
diff --git a/docs/components/modules/ROOT/pages/micrometer-component.adoc b/docs/components/modules/ROOT/pages/micrometer-component.adoc
index 45f60db..164f4df 100644
--- a/docs/components/modules/ROOT/pages/micrometer-component.adoc
+++ b/docs/components/modules/ROOT/pages/micrometer-component.adoc
@@ -14,7 +14,7 @@ endif::[]
The Micrometer component allows to collect various metrics directly
from Camel routes. Supported metric types
-are xref:#MicrometerComponent-counter[counter], xref:#MicrometerComponent-distributionSummary[summary],
+are xref:#MicrometerComponent-counter[counter], xref:#MicrometerComponent-summary[summary],
and xref:#MicrometerComponent-timer[timer]. http://micrometer.io/[Micrometer] provides
simple way to measure the behaviour of an application. Configurable
reporting backends (via Micrometer registries) enable different integration options for
@@ -307,7 +307,7 @@ from("direct:in")
----
-### [[MicrometerComponent-summary]]Distribution Summary
+=== [[MicrometerComponent-summary]]Distribution Summary
[source]
----
@@ -375,7 +375,7 @@ from("direct:in")
----
-### [[MicrometerComponent-timer]]Timer
+=== [[MicrometerComponent-timer]]Timer
[source]
----
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index a3f5927..38b27df 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -1,9 +1,9 @@
= Summary
-* xref:#overview.adoc[Overview]
-* xref:#documentation.adoc[Documentation]
-* xref:#community.adoc[Community]
-* xref:#developers.adoc[Developers]
+* <<Overview>>
+* <<Documentation>>
+* <<Community>>
+* <<Developers>>
== Overview
@@ -16,7 +16,7 @@
== Documentation
-* xref:#user-guide.adoc[User Guide]
+* <<User Guide>>
* Manual
* xref:books.adoc[Books]
* Tutorials
@@ -25,8 +25,8 @@
* xref:architecture.adoc[Architecture]
* xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns]
* xref:dsl.adoc[DSL]
-* xref:#components.adoc[Components]
-* xref:#data-formats.adoc[Data Formats]
+* <<Components>>
+* <<Data Formats>>
* xref:languages.adoc[Languages]
=== User Guide
diff --git a/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc b/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
index 4bdd2f6..2c7772a 100644
--- a/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
+++ b/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
@@ -11,7 +11,7 @@ You can use any of the supported Camel Languages in
the Scala DSL; see below for a couple of examples:
[[ScalaDSL-Supportedlanguages-Using]]
-Using xref:components::xpath-language.adoc[XPath]
+Using xref:xpath-language.adoc[XPath]
----------------------------
With the XPath trait, you have an additional method available on an
[camel] 04/04: required changes done
Posted by zr...@apache.org.
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 d0159e1a3c12d7646ce5a24a389387a2942101e5
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Thu Jul 11 22:46:51 2019 +0530
required changes done
---
components/readme.adoc | 2 +-
.../camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java | 2 +-
examples/camel-example-cdi/README.md | 2 +-
.../rest/swagger/springboot/RestSwaggerComponentConfiguration.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/readme.adoc b/components/readme.adoc
index 3df3467..4cd95bd 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1051,7 +1051,7 @@ Number of Languages: 16 in 10 JAR artifacts (0 deprecated)
==== Miscellaneous Components
// others: START
-Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated)
+Number of Miscellaneous Components: 35 in 35 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
index 9213108..08eda72 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
@@ -120,7 +120,7 @@ public interface RestSwaggerEndpointBuilderFactory {
* tries to load swagger.json resource from the classpath. Note that the
* host defined on the component and endpoint of this Component should
* contain the scheme, hostname and optionally the port in the URI syntax
- * (i.e. \http://api.example.com:8080). Overrides component configuration.
+ * (i.e. http://api.example.com:8080). Overrides component configuration.
* The Swagger specification can be loaded from different sources by
* prefixing with file: classpath: http: https:. Support for https is
* limited to using the JDK installed UrlHandler, and as such it can be
diff --git a/examples/camel-example-cdi/README.md b/examples/camel-example-cdi/README.md
index 8ccbfa3..da83e75 100644
--- a/examples/camel-example-cdi/README.md
+++ b/examples/camel-example-cdi/README.md
@@ -16,7 +16,7 @@ You will need to compile this example first:
$ mvn compile
```
-scala-dsl-supported-languages### Run
+### Run
To run the example, type:
diff --git a/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java
index 36cda8c..abc6889 100644
--- a/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java
@@ -82,7 +82,7 @@ public class RestSwaggerComponentConfiguration
* load swagger.json resource. Note that the host defined on the component
* and endpoint of this Component should contain the scheme, hostname and
* optionally the port in the URI syntax (i.e.
- * \https://api.example.com:8080). Can be overridden in endpoint
+ * https://api.example.com:8080). Can be overridden in endpoint
* configuration.
*/
private URI specificationUri;
[camel] 01/04: more fixes for anchor not found errors
Posted by zr...@apache.org.
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 124f4c0939a1ccb9acc0e0a60c352e87a3823f69
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Thu Jul 11 09:53:36 2019 +0530
more fixes for anchor not found errors
---
.../camel-cxf/src/main/docs/cxf-component.adoc | 115 +++++++++------------
.../camel-test-cdi/src/main/docs/test-cdi.adoc | 4 +-
components/readme.adoc | 8 +-
.../src/main/docs/eips/content-filter-eip.adoc | 2 +-
.../src/main/docs/eips/pipeline-eip.adoc | 2 +-
.../src/main/docs/eips/recipientList-eip.adoc | 2 +-
.../dsl/RestSwaggerEndpointBuilderFactory.java | 2 +-
.../modules/ROOT/pages/cxf-component.adoc | 115 +++++++++------------
docs/components/modules/ROOT/pages/test-cdi.adoc | 4 +-
.../books/3151EN_Mastering_Apache_Camel.jpg | Bin
.../ROOT/assets/images}/books/3477OS.jpg | Bin
.../ROOT/assets/images}/books/3477OSmall.jpg | Bin
.../ROOT/assets/images}/books/5347OSmall.jpg | Bin
.../images}/books/B03507_MockupCover_Normal.jpg | Bin
.../assets/images}/books/CamelCookbookCover.png | Bin
.../ROOT/assets/images}/books/CiA-front-medium.png | Bin
.../assets/images}/books/camel-design-patterns.jpg | Bin
.../ROOT/assets/images}/books/cia2-cover-small.jpg | Bin
.../ROOT/assets/images}/books/cia_small.jpg | Bin
.../ROOT/assets/images}/books/eip_book_cover.jpg | Bin
.../ROOT/assets/images}/books/large.jpg | Bin
.../ROOT/assets/images}/books/rademakers.jpg | Bin
docs/user-manual/modules/ROOT/pages/books.adoc | 2 +-
.../modules/ROOT/pages/content-filter-eip.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/faq.adoc | 2 +-
.../pages/faq/how-do-i-become-a-committer.adoc | 2 +-
.../ROOT/pages/faq/how-do-i-edit-the-website.adoc | 2 +-
.../pages/faq/how-does-camel-compare-to-mule.adoc | 2 +-
.../modules/ROOT/pages/faq/what-is-camel.adoc | 4 +-
.../modules/ROOT/pages/guaranteed-delivery.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 14 +--
.../modules/ROOT/pages/pipeline-eip.adoc | 2 +-
.../modules/ROOT/pages/recipientList-eip.adoc | 2 +-
.../ROOT/pages/scala-dsl-supported-languages.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/support.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/testing.adoc | 18 ++--
.../modules/ROOT/pages/transactional-client.adoc | 4 +-
examples/camel-example-cdi/README.md | 2 +-
.../RestSwaggerComponentConfiguration.java | 2 +-
39 files changed, 142 insertions(+), 178 deletions(-)
diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc
index 74b06da..c4c5804 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -17,50 +17,31 @@ The CXF component provides integration with
http://cxf.apache.org[Apache CXF] for connecting to http://cxf.apache.org/docs/jax-ws.html[JAX-WS] services
hosted in CXF.
-* xref:#cxf-component[CXF Component]
-** xref:#uri-format[URI format]
-** xref:#options[Options]
-*** xref:#descriptions-of-the-dataformats[Descriptions of the
-dataformats]
-**** xref:#how-to-enable-cxfs-loggingoutinterceptor-in-message-mode[How to
-enable CXF's LoggingOutInterceptor in MESSAGE mode]
-*** xref:#description-of-relayheaders-option[Description of
-relayHeaders option]
-**** xref:#available-only-in-pojo-mode[Available only in POJO mode]
-**** xref:#changes-since-release20[Changes since Release 2.0]
-** xref:#configure-the-cxf-endpoints-with-spring[Configure the CXF
-endpoints with Spring]
-** xref:#configuring-the-cxf-endpoints-with-apache-aries-blueprint[Configuring
-the CXF Endpoints with Apache Aries Blueprint.]
-** xref:#how-to-make-the-camel-cxf-component-use-log4j-instead-of-javautillogging[How
-to make the camel-cxf component use log4j instead of java.util.logging]
-** xref:#how-to-let-camel-cxf-response-message-with-xml-start-document[How to
-let camel-cxf response message with xml start document]
-** xref:#how-to-override-the-cxf-producer-address-from-message-header[How to
-override the CXF producer address from message header]
-** xref:#how-to-consume-a-message-from-a-camel-cxf-endpoint-in-pojo-data-format[How
-to consume a message from a camel-cxf endpoint in POJO data format]
-** xref:#how-to-prepare-the-message-for-the-camel-cxf-endpoint-in-pojo-data-format[How
-to prepare the message for the camel-cxf endpoint in POJO data format]
-** xref:#how-to-deal-with-the-message-for-a-camel-cxf-endpoint-in-payload-dataformat[How
-to deal with the message for a camel-cxf endpoint in PAYLOAD data
-format]
-** xref:#how-to-get-and-set-soap-headers-in-pojo-mode[How to get and set SOAP
-headers in POJO mode]
-** xref:#how-to-get-and-set-soap-headers-in-payload-mode[How to get and set
-SOAP headers in PAYLOAD mode]
-** xref:#soap-headers-are-not-available-in-message-mode[SOAP headers are
-not available in MESSAGE mode]
-** xref:#how-to-throw-a-soap-fault-from-camel[How to throw a SOAP Fault
-from Camel]
-** xref:#how-to-propagate-a-camel-cxf-endpoints-request-and-response-context[How
-to propagate a camel-cxf endpoint's request and response context]
-** xref:#attachment-support[Attachment Support]
-** xref:#streaming-support-in-payload-mode[Streaming Support in PAYLOAD
-mode]
-** xref:#using-the-generic-cxf-dispatch-mode[Using the generic CXF
-Dispatch mode]
-** xref:#see-also[See Also]
+* <<CXF Component>>
+** <<URI format>>
+** <<Options>>
+*** <<Descriptions of the dataformats>>
+**** <<How to enable CXF's LoggingOutInterceptor in MESSAGE mode>>
+*** <<Description of relayHeaders option>>
+**** <<Available only in POJO mode>>
+**** <<Changes since Release 2.0>>
+** <<Configure the CXF endpoints with Spring>>
+** <<Configuring the CXF Endpoints with Apache Aries Blueprint>>
+** <<How to make the camel-cxf component use log4j instead of java.util.logging>>
+** <<How to let camel-cxf response message with xml start document>>
+** <<How to override the CXF producer address from message header>>
+** <<How to consume a message from a camel-cxf endpoint in POJO data format>>
+** <<How to prepare the message for the camel-cxf endpoint in POJO data format>>
+** <<How to deal with the message for a camel-cxf endpoint in PAYLOAD data format>>
+** <<How to get and set SOAP headers in POJO mode>>
+** <<How to get and set SOAP headers in PAYLOAD mode>>
+** <<SOAP headers are not available in MESSAGE mode>>
+** <<How to throw a SOAP Fault from Camel>>
+** <<How to propagate a camel-cxf endpoint's request and response context>>
+** <<Attachment Support>>
+** <<Streaming Support in PAYLOAD mode>>
+** <<Using the generic CXF Dispatch mode>>
+** <<See Also>>
Maven users must add the following dependency to their `pom.xml`
for this component:
@@ -76,7 +57,7 @@ for this component:
------------------------------------------------------------
-### URI format
+=== URI format
There are two URI formats for this endpoint: *cxfEndpoint* and *someAddress*.
[source,java]
@@ -104,7 +85,7 @@ For either style above, you can append options to the URI as follows:
cxf:bean:cxfEndpoint?wsdlURL=wsdl/hello_world.wsdl&dataFormat=PAYLOAD
---------------------------------------------------------------------
-### Options
+=== Options
@@ -231,7 +212,7 @@ http://en.wikipedia.org/wiki/QName[QNames], so if you provide them be
sure to prefix them with their \{namespace} as shown in the examples
above.
-#### Descriptions of the dataformats
+==== Descriptions of the dataformats
In Apache Camel, the Camel CXF component is the key to integrating routes with Web services. You can use the Camel CXF component to create a CXF endpoint, which can be used in either of the following ways:
* *Consumer* — (at the start of a route) represents a Web service instance, which integrates with the route. The type of payload injected into the route depends on the value of the endpoint's dataFormat option.
@@ -265,7 +246,7 @@ exchange property, `CamelCXFDataFormat`. The exchange key constant is
defined in
`org.apache.camel.component.cxf.common.message.CxfConstants.DATA_FORMAT_PROPERTY`.
-#### How to enable CXF's LoggingOutInterceptor in MESSAGE mode
+==== How to enable CXF's LoggingOutInterceptor in MESSAGE mode
CXF's `LoggingOutInterceptor` outputs outbound message that goes on the
wire to logging system (Java Util Logging). Since the
@@ -292,7 +273,7 @@ following is an example.
</cxf:cxfEndpoint>
-------------------------------------------------------------------------------------------------------
-#### Description of relayHeaders option
+==== Description of relayHeaders option
There are _in-band_ and _out-of-band_ on-the-wire headers from the
perspective of a JAXWS WSDL-first developer.
@@ -311,7 +292,7 @@ be consumed say by another JAXWS endpoint, then `relayHeaders` should be
set to `true`, which is the default value.
-#### Available only in POJO mode
+==== Available only in POJO mode
The `relayHeaders=true` express an intent to relay the headers. The
actual decision on whether a given header is relayed is delegated to a
@@ -432,7 +413,7 @@ value is `false`, it will throw an exception
_Default_: `false`
|=======================================================================
-### Configure the CXF endpoints with Spring
+=== Configure the CXF endpoints with Spring
You can configure the CXF endpoint with the Spring configuration file
shown below, and you can also embed the endpoint into the `camelContext`
@@ -562,7 +543,7 @@ and setDefaultBus properties from spring configuration file.
</cxf:cxfEndpoint>
-------------------------------------------------------------------------
-### Configuring the CXF Endpoints with Apache Aries Blueprint
+=== Configuring the CXF Endpoints with Apache Aries Blueprint
The component is capable of utilizing aries blueprint
dependency injection for your CXF endpoints.
@@ -638,7 +619,7 @@ You can also use the bean references just as in spring
</blueprint>
----------------------------------------------------------------------------------------------------------------
-### How to make the camel-cxf component use log4j instead of java.util.logging
+=== How to make the camel-cxf component use log4j instead of java.util.logging
CXF's default logger is `java.util.logging`. If you want to change it to
log4j, proceed as follows. Create a file, in the classpath, named
@@ -647,7 +628,7 @@ fully-qualified name of the class,
`org.apache.cxf.common.logging.Log4jLogger`, with no comments, on a
single line.
-### How to let camel-cxf response message with xml start document
+=== How to let camel-cxf response message with xml start document
If you are using some SOAP client such as PHP, you will get this kind of
error, because CXF doesn't add the XML start document "<?xml
@@ -672,7 +653,7 @@ camel-cxf endpont or add a message header for it like
exchange.getOut().setHeader(Client.RESPONSE_CONTEXT, map);
-------------------------------------------------------------------
-### How to override the CXF producer address from message header
+=== How to override the CXF producer address from message header
The `camel-cxf` producer supports to override the services address by
setting the message with the key of "CamelDestinationOverrideUrl".
@@ -683,7 +664,7 @@ setting the message with the key of "CamelDestinationOverrideUrl".
exchange.getIn().setHeader(Exchange.DESTINATION_OVERRIDE_URL, constant(getServiceAddress()));
----------------------------------------------------------------------------------------------
-### How to consume a message from a camel-cxf endpoint in POJO data format
+=== How to consume a message from a camel-cxf endpoint in POJO data format
The `camel-cxf` endpoint consumer POJO data format is based on the
http://cxf.apache.org/docs/invokers.html[CXF invoker], so the
@@ -691,7 +672,7 @@ message header has a property with the name of
`CxfConstants.OPERATION_NAME` and the message body is a list of the SEI
method parameters.
-### How to prepare the message for the camel-cxf endpoint in POJO data format
+=== How to prepare the message for the camel-cxf endpoint in POJO data format
The `camel-cxf` endpoint producer is based on the
https://github.com/apache/cxf/blob/master/core/src/main/java/org/apache/cxf/endpoint/Client.java[CXF
@@ -709,7 +690,7 @@ list.
If you want to get the object array from the message body, you can get
the body using `message.getbody(Object[].class)`, as follows:
-### How to deal with the message for a camel-cxf endpoint in PAYLOAD data format
+=== How to deal with the message for a camel-cxf endpoint in PAYLOAD data format
`PAYLOAD` means that you process the payload message from the SOAP
envelope. You can use the `Header.HEADER_LIST` as the key to set or get
@@ -720,7 +701,7 @@ elements.
for SOAP message headers and Body elements. This change enables
decoupling the native CXF message from the Camel message.
-### How to get and set SOAP headers in POJO mode
+=== How to get and set SOAP headers in POJO mode
`POJO` means that the data format is a "list of Java objects" when the
Camel-cxf endpoint produces or consumes Camel exchanges. Even though
@@ -749,7 +730,7 @@ InsertResponseOutHeaderProcessor and InsertRequestOutHeaderProcessor are
actually the same. The only difference between the two processors is
setting the direction of the inserted SOAP header.
-### How to get and set SOAP headers in PAYLOAD mode
+=== How to get and set SOAP headers in PAYLOAD mode
We've already shown how to access SOAP message (CxfPayload object) in
PAYLOAD mode (See "How to deal with the message for a camel-cxf endpoint
@@ -770,12 +751,12 @@ forwarded to the CXF service. If you do not want that these headers are
forwarded you have to remove them in the Camel header
"org.apache.cxf.headers.Header.list".
-### SOAP headers are not available in MESSAGE mode
+=== SOAP headers are not available in MESSAGE mode
SOAP headers are not available in MESSAGE mode as SOAP processing is
skipped.
-### How to throw a SOAP Fault from Camel
+=== How to throw a SOAP Fault from Camel
If you are using a `camel-cxf` endpoint to consume the SOAP request, you
may need to throw the SOAP Fault from the camel context. +
@@ -792,7 +773,7 @@ code in the message header.
Same for using POJO data format. You can set the SOAPFault on the out
body and also indicate it's a fault by calling Message.setFault(true):
-### How to propagate a camel-cxf endpoint's request and response context
+=== How to propagate a camel-cxf endpoint's request and response context
https://github.com/apache/cxf/blob/master/core/src/main/java/org/apache/cxf/endpoint/Client.java[CXF
client API] provides a way to invoke the operation with request and
@@ -825,7 +806,7 @@ response context with the following code:
responseContext.get("javax.xml.ws.wsdl.operation").toString());
-------------------------------------------------------------------------------------------------------------
-### Attachment Support
+=== Attachment Support
*POJO Mode:* Both SOAP with Attachment and MTOM are supported (see
example in Payload Mode for enabling MTOM). However, SOAP with
@@ -866,7 +847,7 @@ you require just the SOAP XML as a String, you can set the message body
with message.getSOAPPart(), and Camel convert can do the rest of work
for you.
-### Streaming Support in PAYLOAD mode
+=== Streaming Support in PAYLOAD mode
The camel-cxf component now supports streaming of incoming
messages when using PAYLOAD mode. Previously, the incoming messages
@@ -897,7 +878,7 @@ Global system property: you can add a system property of
That sets the global default, but setting the endpoint property above
will override this value for that endpoint.
-### Using the generic CXF Dispatch mode
+=== Using the generic CXF Dispatch mode
The camel-cxf component supports the generic
https://cxf.apache.org/docs/jax-ws-dispatch-api.html[CXF dispatch
@@ -921,7 +902,7 @@ the key SOAPAction (case-insensitive).
-### See Also
+=== See Also
* Configuring Camel
* Component
diff --git a/components/camel-test-cdi/src/main/docs/test-cdi.adoc b/components/camel-test-cdi/src/main/docs/test-cdi.adoc
index 33525a3..f3f9043 100644
--- a/components/camel-test-cdi/src/main/docs/test-cdi.adoc
+++ b/components/camel-test-cdi/src/main/docs/test-cdi.adoc
@@ -461,8 +461,8 @@ public class CamelCdiTest {
}
----
-You can find more information in <<cdi.adoc#CDI-Auto-detectingCamelroutes,auto-detecting Camel
-routes>>.
+You can find more information in xref:cdi.adoc#CDI-Auto-detectingCamelroutes[auto-detecting Camel
+routes].
In case you prefer declaring the `RouteBuilder` bean in a separate class,
for example to share it more easily across multiple test classes, you can use
diff --git a/components/readme.adoc b/components/readme.adoc
index 205b7b0..3df3467 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1007,7 +1007,7 @@ Number of Data Formats: 45 in 37 JAR artifacts (0 deprecated)
==== Expression Languages
// languages: START
-Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
+Number of Languages: 16 in 10 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1041,8 +1041,6 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
| link:camel-base/src/main/docs/tokenize-language.adoc[Tokenize] (camel-base) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
-| link:camel-jaxp/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates.
-
| link:camel-xpath/src/main/docs/xpath-language.adoc[XPath] (camel-xpath) | 1.1 | To use XPath (XML) in Camel expressions or predicates.
| link:camel-saxon/src/main/docs/xquery-language.adoc[XQuery] (camel-saxon) | 1.0 | To use XQuery (XML) in Camel expressions or predicates.
@@ -1069,6 +1067,8 @@ Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated)
| link:camel-hystrix/src/main/docs/hystrix.adoc[Hystrix] (camel-hystrix) | 2.18 | Circuit Breaker EIP using Netflix Hystrix
+| link:camel-ignite/src/main/docs/ignite.adoc[Ignite] (camel-ignite) | | Camel Ignite component
+
| link:camel-jasypt/src/main/docs/jasypt.adoc[Jasypt] (camel-jasypt) | 2.5 | Security using Jasypt
| link:camel-kura/src/main/docs/kura.adoc[Kura] (camel-kura) | 2.15 | Using Camel with Eclipse Kura (OSGi)
@@ -1081,6 +1081,8 @@ Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated)
| link:camel-opentracing/src/main/docs/opentracing.adoc[OpenTracing] (camel-opentracing) | 2.19 | Distributed tracing using OpenTracing
+| link:camel-pulsar/src/main/docs/pulsar.adoc[Pulsar] (camel-pulsar) | | Camel Apache Pulsar Component
+
| link:camel-reactive-executor-vertx/src/main/docs/reactive-executor-vertx.adoc[Reactive Executor Vertx] (camel-reactive-executor-vertx) | 3.0 | Reactive Executor for camel-core using Vert X
| link:camel-reactor/src/main/docs/reactor.adoc[Reactor] (camel-reactor) | 2.20 | Reactor based back-end for Camel's reactive streams component
diff --git a/core/camel-core/src/main/docs/eips/content-filter-eip.adoc b/core/camel-core/src/main/docs/eips/content-filter-eip.adoc
index dd93503..5832f00 100644
--- a/core/camel-core/src/main/docs/eips/content-filter-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/content-filter-eip.adoc
@@ -28,7 +28,7 @@ In this example we add our own xref:Processor-Processor.adoc[Processor]
For further examples of this pattern in use you could look at one of the
JUnit tests
-* xref:../../../test/java/org/apache/camel/processor/TransformTest.java?[TransformTest]
+* xref:../../../test/java/org/apache/camel/processor/TransformTest.java[TransformTest]
* xref:../../../test/java/org/apache/camel/processor/TransformViaDSLTest.java[TransformViaDSLTest]
=== Using Spring XML
diff --git a/core/camel-core/src/main/docs/eips/pipeline-eip.adoc b/core/camel-core/src/main/docs/eips/pipeline-eip.adoc
index 144d973..99791d5 100644
--- a/core/camel-core/src/main/docs/eips/pipeline-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/pipeline-eip.adoc
@@ -1,7 +1,7 @@
[[pipeline-eip]]
== Pipeline EIP
-Camel supports the xref:http://www.enterpriseintegrationpatterns.com/PipesAndFilters.html[Pipes and Filters] from the https://github.com/apache/camel/blob/master/docs/user-manual/en/enterprise-integration-patterns.adoc[EIP patterns] in various ways.
+Camel supports the http://www.enterpriseintegrationpatterns.com/PipesAndFilters.html[Pipes and Filters] from the https://github.com/apache/camel/blob/master/docs/user-manual/en/enterprise-integration-patterns.adoc[EIP patterns] in various ways.
image:http://www.enterpriseintegrationpatterns.com/img/PipesAndFilters.gif[image]
diff --git a/core/camel-core/src/main/docs/eips/recipientList-eip.adoc b/core/camel-core/src/main/docs/eips/recipientList-eip.adoc
index 4af9f6c..15410eb 100644
--- a/core/camel-core/src/main/docs/eips/recipientList-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/recipientList-eip.adoc
@@ -1,6 +1,6 @@
[[recipientList-eip]]
== Recipient List EIP
-The xref:http://www.enterpriseintegrationpatterns.com/RecipientList.html[Recipient List] from the EIP patterns allows you to route messages to a number of dynamically specified recipients.
+The http://www.enterpriseintegrationpatterns.com/RecipientList.html[Recipient List] from the EIP patterns allows you to route messages to a number of dynamically specified recipients.
image:http://www.enterpriseintegrationpatterns.com/img/RecipientList.gif[image]
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
index 08eda72..9213108 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
@@ -120,7 +120,7 @@ public interface RestSwaggerEndpointBuilderFactory {
* tries to load swagger.json resource from the classpath. Note that the
* host defined on the component and endpoint of this Component should
* contain the scheme, hostname and optionally the port in the URI syntax
- * (i.e. http://api.example.com:8080). Overrides component configuration.
+ * (i.e. \http://api.example.com:8080). Overrides component configuration.
* The Swagger specification can be loaded from different sources by
* prefixing with file: classpath: http: https:. Support for https is
* limited to using the JDK installed UrlHandler, and as such it can be
diff --git a/docs/components/modules/ROOT/pages/cxf-component.adoc b/docs/components/modules/ROOT/pages/cxf-component.adoc
index 74b06da..c4c5804 100644
--- a/docs/components/modules/ROOT/pages/cxf-component.adoc
+++ b/docs/components/modules/ROOT/pages/cxf-component.adoc
@@ -17,50 +17,31 @@ The CXF component provides integration with
http://cxf.apache.org[Apache CXF] for connecting to http://cxf.apache.org/docs/jax-ws.html[JAX-WS] services
hosted in CXF.
-* xref:#cxf-component[CXF Component]
-** xref:#uri-format[URI format]
-** xref:#options[Options]
-*** xref:#descriptions-of-the-dataformats[Descriptions of the
-dataformats]
-**** xref:#how-to-enable-cxfs-loggingoutinterceptor-in-message-mode[How to
-enable CXF's LoggingOutInterceptor in MESSAGE mode]
-*** xref:#description-of-relayheaders-option[Description of
-relayHeaders option]
-**** xref:#available-only-in-pojo-mode[Available only in POJO mode]
-**** xref:#changes-since-release20[Changes since Release 2.0]
-** xref:#configure-the-cxf-endpoints-with-spring[Configure the CXF
-endpoints with Spring]
-** xref:#configuring-the-cxf-endpoints-with-apache-aries-blueprint[Configuring
-the CXF Endpoints with Apache Aries Blueprint.]
-** xref:#how-to-make-the-camel-cxf-component-use-log4j-instead-of-javautillogging[How
-to make the camel-cxf component use log4j instead of java.util.logging]
-** xref:#how-to-let-camel-cxf-response-message-with-xml-start-document[How to
-let camel-cxf response message with xml start document]
-** xref:#how-to-override-the-cxf-producer-address-from-message-header[How to
-override the CXF producer address from message header]
-** xref:#how-to-consume-a-message-from-a-camel-cxf-endpoint-in-pojo-data-format[How
-to consume a message from a camel-cxf endpoint in POJO data format]
-** xref:#how-to-prepare-the-message-for-the-camel-cxf-endpoint-in-pojo-data-format[How
-to prepare the message for the camel-cxf endpoint in POJO data format]
-** xref:#how-to-deal-with-the-message-for-a-camel-cxf-endpoint-in-payload-dataformat[How
-to deal with the message for a camel-cxf endpoint in PAYLOAD data
-format]
-** xref:#how-to-get-and-set-soap-headers-in-pojo-mode[How to get and set SOAP
-headers in POJO mode]
-** xref:#how-to-get-and-set-soap-headers-in-payload-mode[How to get and set
-SOAP headers in PAYLOAD mode]
-** xref:#soap-headers-are-not-available-in-message-mode[SOAP headers are
-not available in MESSAGE mode]
-** xref:#how-to-throw-a-soap-fault-from-camel[How to throw a SOAP Fault
-from Camel]
-** xref:#how-to-propagate-a-camel-cxf-endpoints-request-and-response-context[How
-to propagate a camel-cxf endpoint's request and response context]
-** xref:#attachment-support[Attachment Support]
-** xref:#streaming-support-in-payload-mode[Streaming Support in PAYLOAD
-mode]
-** xref:#using-the-generic-cxf-dispatch-mode[Using the generic CXF
-Dispatch mode]
-** xref:#see-also[See Also]
+* <<CXF Component>>
+** <<URI format>>
+** <<Options>>
+*** <<Descriptions of the dataformats>>
+**** <<How to enable CXF's LoggingOutInterceptor in MESSAGE mode>>
+*** <<Description of relayHeaders option>>
+**** <<Available only in POJO mode>>
+**** <<Changes since Release 2.0>>
+** <<Configure the CXF endpoints with Spring>>
+** <<Configuring the CXF Endpoints with Apache Aries Blueprint>>
+** <<How to make the camel-cxf component use log4j instead of java.util.logging>>
+** <<How to let camel-cxf response message with xml start document>>
+** <<How to override the CXF producer address from message header>>
+** <<How to consume a message from a camel-cxf endpoint in POJO data format>>
+** <<How to prepare the message for the camel-cxf endpoint in POJO data format>>
+** <<How to deal with the message for a camel-cxf endpoint in PAYLOAD data format>>
+** <<How to get and set SOAP headers in POJO mode>>
+** <<How to get and set SOAP headers in PAYLOAD mode>>
+** <<SOAP headers are not available in MESSAGE mode>>
+** <<How to throw a SOAP Fault from Camel>>
+** <<How to propagate a camel-cxf endpoint's request and response context>>
+** <<Attachment Support>>
+** <<Streaming Support in PAYLOAD mode>>
+** <<Using the generic CXF Dispatch mode>>
+** <<See Also>>
Maven users must add the following dependency to their `pom.xml`
for this component:
@@ -76,7 +57,7 @@ for this component:
------------------------------------------------------------
-### URI format
+=== URI format
There are two URI formats for this endpoint: *cxfEndpoint* and *someAddress*.
[source,java]
@@ -104,7 +85,7 @@ For either style above, you can append options to the URI as follows:
cxf:bean:cxfEndpoint?wsdlURL=wsdl/hello_world.wsdl&dataFormat=PAYLOAD
---------------------------------------------------------------------
-### Options
+=== Options
@@ -231,7 +212,7 @@ http://en.wikipedia.org/wiki/QName[QNames], so if you provide them be
sure to prefix them with their \{namespace} as shown in the examples
above.
-#### Descriptions of the dataformats
+==== Descriptions of the dataformats
In Apache Camel, the Camel CXF component is the key to integrating routes with Web services. You can use the Camel CXF component to create a CXF endpoint, which can be used in either of the following ways:
* *Consumer* — (at the start of a route) represents a Web service instance, which integrates with the route. The type of payload injected into the route depends on the value of the endpoint's dataFormat option.
@@ -265,7 +246,7 @@ exchange property, `CamelCXFDataFormat`. The exchange key constant is
defined in
`org.apache.camel.component.cxf.common.message.CxfConstants.DATA_FORMAT_PROPERTY`.
-#### How to enable CXF's LoggingOutInterceptor in MESSAGE mode
+==== How to enable CXF's LoggingOutInterceptor in MESSAGE mode
CXF's `LoggingOutInterceptor` outputs outbound message that goes on the
wire to logging system (Java Util Logging). Since the
@@ -292,7 +273,7 @@ following is an example.
</cxf:cxfEndpoint>
-------------------------------------------------------------------------------------------------------
-#### Description of relayHeaders option
+==== Description of relayHeaders option
There are _in-band_ and _out-of-band_ on-the-wire headers from the
perspective of a JAXWS WSDL-first developer.
@@ -311,7 +292,7 @@ be consumed say by another JAXWS endpoint, then `relayHeaders` should be
set to `true`, which is the default value.
-#### Available only in POJO mode
+==== Available only in POJO mode
The `relayHeaders=true` express an intent to relay the headers. The
actual decision on whether a given header is relayed is delegated to a
@@ -432,7 +413,7 @@ value is `false`, it will throw an exception
_Default_: `false`
|=======================================================================
-### Configure the CXF endpoints with Spring
+=== Configure the CXF endpoints with Spring
You can configure the CXF endpoint with the Spring configuration file
shown below, and you can also embed the endpoint into the `camelContext`
@@ -562,7 +543,7 @@ and setDefaultBus properties from spring configuration file.
</cxf:cxfEndpoint>
-------------------------------------------------------------------------
-### Configuring the CXF Endpoints with Apache Aries Blueprint
+=== Configuring the CXF Endpoints with Apache Aries Blueprint
The component is capable of utilizing aries blueprint
dependency injection for your CXF endpoints.
@@ -638,7 +619,7 @@ You can also use the bean references just as in spring
</blueprint>
----------------------------------------------------------------------------------------------------------------
-### How to make the camel-cxf component use log4j instead of java.util.logging
+=== How to make the camel-cxf component use log4j instead of java.util.logging
CXF's default logger is `java.util.logging`. If you want to change it to
log4j, proceed as follows. Create a file, in the classpath, named
@@ -647,7 +628,7 @@ fully-qualified name of the class,
`org.apache.cxf.common.logging.Log4jLogger`, with no comments, on a
single line.
-### How to let camel-cxf response message with xml start document
+=== How to let camel-cxf response message with xml start document
If you are using some SOAP client such as PHP, you will get this kind of
error, because CXF doesn't add the XML start document "<?xml
@@ -672,7 +653,7 @@ camel-cxf endpont or add a message header for it like
exchange.getOut().setHeader(Client.RESPONSE_CONTEXT, map);
-------------------------------------------------------------------
-### How to override the CXF producer address from message header
+=== How to override the CXF producer address from message header
The `camel-cxf` producer supports to override the services address by
setting the message with the key of "CamelDestinationOverrideUrl".
@@ -683,7 +664,7 @@ setting the message with the key of "CamelDestinationOverrideUrl".
exchange.getIn().setHeader(Exchange.DESTINATION_OVERRIDE_URL, constant(getServiceAddress()));
----------------------------------------------------------------------------------------------
-### How to consume a message from a camel-cxf endpoint in POJO data format
+=== How to consume a message from a camel-cxf endpoint in POJO data format
The `camel-cxf` endpoint consumer POJO data format is based on the
http://cxf.apache.org/docs/invokers.html[CXF invoker], so the
@@ -691,7 +672,7 @@ message header has a property with the name of
`CxfConstants.OPERATION_NAME` and the message body is a list of the SEI
method parameters.
-### How to prepare the message for the camel-cxf endpoint in POJO data format
+=== How to prepare the message for the camel-cxf endpoint in POJO data format
The `camel-cxf` endpoint producer is based on the
https://github.com/apache/cxf/blob/master/core/src/main/java/org/apache/cxf/endpoint/Client.java[CXF
@@ -709,7 +690,7 @@ list.
If you want to get the object array from the message body, you can get
the body using `message.getbody(Object[].class)`, as follows:
-### How to deal with the message for a camel-cxf endpoint in PAYLOAD data format
+=== How to deal with the message for a camel-cxf endpoint in PAYLOAD data format
`PAYLOAD` means that you process the payload message from the SOAP
envelope. You can use the `Header.HEADER_LIST` as the key to set or get
@@ -720,7 +701,7 @@ elements.
for SOAP message headers and Body elements. This change enables
decoupling the native CXF message from the Camel message.
-### How to get and set SOAP headers in POJO mode
+=== How to get and set SOAP headers in POJO mode
`POJO` means that the data format is a "list of Java objects" when the
Camel-cxf endpoint produces or consumes Camel exchanges. Even though
@@ -749,7 +730,7 @@ InsertResponseOutHeaderProcessor and InsertRequestOutHeaderProcessor are
actually the same. The only difference between the two processors is
setting the direction of the inserted SOAP header.
-### How to get and set SOAP headers in PAYLOAD mode
+=== How to get and set SOAP headers in PAYLOAD mode
We've already shown how to access SOAP message (CxfPayload object) in
PAYLOAD mode (See "How to deal with the message for a camel-cxf endpoint
@@ -770,12 +751,12 @@ forwarded to the CXF service. If you do not want that these headers are
forwarded you have to remove them in the Camel header
"org.apache.cxf.headers.Header.list".
-### SOAP headers are not available in MESSAGE mode
+=== SOAP headers are not available in MESSAGE mode
SOAP headers are not available in MESSAGE mode as SOAP processing is
skipped.
-### How to throw a SOAP Fault from Camel
+=== How to throw a SOAP Fault from Camel
If you are using a `camel-cxf` endpoint to consume the SOAP request, you
may need to throw the SOAP Fault from the camel context. +
@@ -792,7 +773,7 @@ code in the message header.
Same for using POJO data format. You can set the SOAPFault on the out
body and also indicate it's a fault by calling Message.setFault(true):
-### How to propagate a camel-cxf endpoint's request and response context
+=== How to propagate a camel-cxf endpoint's request and response context
https://github.com/apache/cxf/blob/master/core/src/main/java/org/apache/cxf/endpoint/Client.java[CXF
client API] provides a way to invoke the operation with request and
@@ -825,7 +806,7 @@ response context with the following code:
responseContext.get("javax.xml.ws.wsdl.operation").toString());
-------------------------------------------------------------------------------------------------------------
-### Attachment Support
+=== Attachment Support
*POJO Mode:* Both SOAP with Attachment and MTOM are supported (see
example in Payload Mode for enabling MTOM). However, SOAP with
@@ -866,7 +847,7 @@ you require just the SOAP XML as a String, you can set the message body
with message.getSOAPPart(), and Camel convert can do the rest of work
for you.
-### Streaming Support in PAYLOAD mode
+=== Streaming Support in PAYLOAD mode
The camel-cxf component now supports streaming of incoming
messages when using PAYLOAD mode. Previously, the incoming messages
@@ -897,7 +878,7 @@ Global system property: you can add a system property of
That sets the global default, but setting the endpoint property above
will override this value for that endpoint.
-### Using the generic CXF Dispatch mode
+=== Using the generic CXF Dispatch mode
The camel-cxf component supports the generic
https://cxf.apache.org/docs/jax-ws-dispatch-api.html[CXF dispatch
@@ -921,7 +902,7 @@ the key SOAPAction (case-insensitive).
-### See Also
+=== See Also
* Configuring Camel
* Component
diff --git a/docs/components/modules/ROOT/pages/test-cdi.adoc b/docs/components/modules/ROOT/pages/test-cdi.adoc
index 33525a3..f3f9043 100644
--- a/docs/components/modules/ROOT/pages/test-cdi.adoc
+++ b/docs/components/modules/ROOT/pages/test-cdi.adoc
@@ -461,8 +461,8 @@ public class CamelCdiTest {
}
----
-You can find more information in <<cdi.adoc#CDI-Auto-detectingCamelroutes,auto-detecting Camel
-routes>>.
+You can find more information in xref:cdi.adoc#CDI-Auto-detectingCamelroutes[auto-detecting Camel
+routes].
In case you prefer declaring the `RouteBuilder` bean in a separate class,
for example to share it more easily across multiple test classes, you can use
diff --git a/docs/user-manual/en/books/3151EN_Mastering_Apache_Camel.jpg b/docs/user-manual/modules/ROOT/assets/images/books/3151EN_Mastering_Apache_Camel.jpg
similarity index 100%
rename from docs/user-manual/en/books/3151EN_Mastering_Apache_Camel.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/3151EN_Mastering_Apache_Camel.jpg
diff --git a/docs/user-manual/en/books/3477OS.jpg b/docs/user-manual/modules/ROOT/assets/images/books/3477OS.jpg
similarity index 100%
rename from docs/user-manual/en/books/3477OS.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/3477OS.jpg
diff --git a/docs/user-manual/en/books/3477OSmall.jpg b/docs/user-manual/modules/ROOT/assets/images/books/3477OSmall.jpg
similarity index 100%
rename from docs/user-manual/en/books/3477OSmall.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/3477OSmall.jpg
diff --git a/docs/user-manual/en/books/5347OSmall.jpg b/docs/user-manual/modules/ROOT/assets/images/books/5347OSmall.jpg
similarity index 100%
rename from docs/user-manual/en/books/5347OSmall.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/5347OSmall.jpg
diff --git a/docs/user-manual/en/books/B03507_MockupCover_Normal.jpg b/docs/user-manual/modules/ROOT/assets/images/books/B03507_MockupCover_Normal.jpg
similarity index 100%
rename from docs/user-manual/en/books/B03507_MockupCover_Normal.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/B03507_MockupCover_Normal.jpg
diff --git a/docs/user-manual/en/books/CamelCookbookCover.png b/docs/user-manual/modules/ROOT/assets/images/books/CamelCookbookCover.png
similarity index 100%
rename from docs/user-manual/en/books/CamelCookbookCover.png
rename to docs/user-manual/modules/ROOT/assets/images/books/CamelCookbookCover.png
diff --git a/docs/user-manual/en/books/CiA-front-medium.png b/docs/user-manual/modules/ROOT/assets/images/books/CiA-front-medium.png
similarity index 100%
rename from docs/user-manual/en/books/CiA-front-medium.png
rename to docs/user-manual/modules/ROOT/assets/images/books/CiA-front-medium.png
diff --git a/docs/user-manual/en/books/camel-design-patterns.jpg b/docs/user-manual/modules/ROOT/assets/images/books/camel-design-patterns.jpg
similarity index 100%
rename from docs/user-manual/en/books/camel-design-patterns.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/camel-design-patterns.jpg
diff --git a/docs/user-manual/en/books/cia2-cover-small.jpg b/docs/user-manual/modules/ROOT/assets/images/books/cia2-cover-small.jpg
similarity index 100%
rename from docs/user-manual/en/books/cia2-cover-small.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/cia2-cover-small.jpg
diff --git a/docs/user-manual/en/books/cia_small.jpg b/docs/user-manual/modules/ROOT/assets/images/books/cia_small.jpg
similarity index 100%
rename from docs/user-manual/en/books/cia_small.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/cia_small.jpg
diff --git a/docs/user-manual/en/books/eip_book_cover.jpg b/docs/user-manual/modules/ROOT/assets/images/books/eip_book_cover.jpg
similarity index 100%
rename from docs/user-manual/en/books/eip_book_cover.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/eip_book_cover.jpg
diff --git a/docs/user-manual/en/books/large.jpg b/docs/user-manual/modules/ROOT/assets/images/books/large.jpg
similarity index 100%
rename from docs/user-manual/en/books/large.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/large.jpg
diff --git a/docs/user-manual/en/books/rademakers.jpg b/docs/user-manual/modules/ROOT/assets/images/books/rademakers.jpg
similarity index 100%
rename from docs/user-manual/en/books/rademakers.jpg
rename to docs/user-manual/modules/ROOT/assets/images/books/rademakers.jpg
diff --git a/docs/user-manual/modules/ROOT/pages/books.adoc b/docs/user-manual/modules/ROOT/pages/books.adoc
index eab129c..6e211e4 100644
--- a/docs/user-manual/modules/ROOT/pages/books.adoc
+++ b/docs/user-manual/modules/ROOT/pages/books.adoc
@@ -131,7 +131,7 @@ https://www.packtpub.com/application-development/mastering-apache-camel[Masterin
Apache Camel] by https://twitter.com/jbonofre[Jean-Baptiste Onofré].
Published by http://www.packtpub.com/[Packt publishing] in June 2015.
-xref:books/3151EN_Mastering_Apache_Camel.jpg?version=1&modificationDate=1453112264000&api=v2[image:books/3151EN_Mastering_Apache_Camel.jpg[image]]
+image:books/3151EN_Mastering_Apache_Camel.jpg[image]
This book will provide you with the skills you need to efficiently
create routes using Apache Camel.
diff --git a/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc b/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc
index dd93503..5832f00 100644
--- a/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/content-filter-eip.adoc
@@ -28,7 +28,7 @@ In this example we add our own xref:Processor-Processor.adoc[Processor]
For further examples of this pattern in use you could look at one of the
JUnit tests
-* xref:../../../test/java/org/apache/camel/processor/TransformTest.java?[TransformTest]
+* xref:../../../test/java/org/apache/camel/processor/TransformTest.java[TransformTest]
* xref:../../../test/java/org/apache/camel/processor/TransformViaDSLTest.java[TransformViaDSLTest]
=== Using Spring XML
diff --git a/docs/user-manual/modules/ROOT/pages/faq.adoc b/docs/user-manual/modules/ROOT/pages/faq.adoc
index 1f2a8c8..7d1b5ea 100644
--- a/docs/user-manual/modules/ROOT/pages/faq.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq.adoc
@@ -5,7 +5,7 @@ Here are a list of commonly asked questions and answers. If you have any
questions which are not on this list, please talk to us on the
xref:mailing-lists.adoc[Mailing Lists].
-We xref:../../../CONTRIBUTING.md[welcome contributions] and
+We https://github.com/apache/camel/blob/master/CONTRIBUTING.md[welcome contributions] and
this entire website is in
xref:faq/how-does-the-website-work.adoc[the GitHub repository you can send a pull request],
so please join in and help us make the documentation better!
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-become-a-committer.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-become-a-committer.adoc
index 535591a..631eb35 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-become-a-committer.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-become-a-committer.adoc
@@ -2,7 +2,7 @@
=== How can I become a committer
First of all you need to get involved and
-xref:../../../../CONTRIBUTING.md[Contribute] via the mail list, forums, edit the
+https://github.com/apache/camel/blob/master/CONTRIBUTING.md[Contribute] via the mail list, forums, edit the
documentation, work on the issue tracker and submit patches.
Once you're contributing and your work is good, one of our
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-edit-the-website.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-edit-the-website.adoc
index c1a45d8..55aadae 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-edit-the-website.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-edit-the-website.adoc
@@ -3,7 +3,7 @@
The website is all contained in
https://github.com/apache/camel/[the GitHub repository] so that you can
-xref:../../../../CONTRIBUTING.md[contribute] providing you are happy to license
+https://github.com/apache/camel/blob/master/CONTRIBUTING.md[contribute] providing you are happy to license
all your contributions under the
http://www.apache.org/licenses/LICENSE-2.0[Apache Software License version 2.0]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-mule.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-mule.adoc
index 23d57a6..c434990 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-mule.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-mule.adoc
@@ -25,5 +25,5 @@ routing/mediation engines. The main differences are as follows:
* Camel supports an implicit xref:../type-converter.adoc[Type Converter] in
the core API to make it simpler to connect components together requiring
different types of payload & headers
-* Camel uses the xref:../notice.md[Apache 2 License] rather than Mule's more restrictive
+* Camel uses the https://github.com/apache/camel/blob/master/docs/user-manual/en/notice.md[Apache 2 License] rather than Mule's more restrictive
commercial license
diff --git a/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc b/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
index e95f1d6..0995983 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
@@ -14,8 +14,8 @@ routing rules in your IDE, whether in a Java, Scala or XML editor.
Apache Camel uses xref:../uris.adoc[URIs] to work directly with any kind of
xref:../transport.adoc[Transport] or messaging model such as
-xref:http-component,HTTP>>, xref:activemq.adoc[ActiveMQ], <<jms-component.adoc[JMS],
-JBI, SCA, xref:mina-component,MINA>> or <<cxf-component.adoc[CXF], as
+xref:http-component[HTTP], xref:activemq.adoc[ActiveMQ], xref:jms-component.adoc[JMS],
+JBI, SCA, xref:mina-component[MINA] or xref:cxf-component.adoc[CXF], as
well as pluggable xref:../component.adoc[Components] and
xref:../data-format.adoc[Data Format] options. Apache Camel is a small
library with minimal xref:what-are-the-dependencies.adoc[dependencies]
diff --git a/docs/user-manual/modules/ROOT/pages/guaranteed-delivery.adoc b/docs/user-manual/modules/ROOT/pages/guaranteed-delivery.adoc
index 1030601..9f36d79 100644
--- a/docs/user-manual/modules/ROOT/pages/guaranteed-delivery.adoc
+++ b/docs/user-manual/modules/ROOT/pages/guaranteed-delivery.adoc
@@ -3,7 +3,7 @@
Camel supports the
http://www.enterpriseintegrationpatterns.com/GuaranteedMessaging.html[Guaranteed
-Delivery] from the xref:enterprise-integration-patterns.html[EIP
+Delivery] from the xref:enterprise-integration-patterns.adoc[EIP
patterns] using among others the following components:
* xref:file2.adoc[File] for using file systems as a persistent store of
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index f5f77cb..a3f5927 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -7,12 +7,12 @@
== Overview
-* xref:README.md[Introduction]
+* https://github.com/apache/camel/blob/master/README.md[Introduction]
* xref:download.adoc[Download]
* xref:getting-started.adoc[Getting Started]
* xref:book-getting-started.adoc[Longer Getting Started Guide]
* xref:faq.adoc[FAQ]
-* xref:notice.md[Legal Notice]
+* https://github.com/apache/camel/blob/master/docs/user-manual/en/notice.md[Legal Notice]
== Documentation
@@ -20,14 +20,14 @@
* Manual
* xref:books.adoc[Books]
* Tutorials
-* xref:#examples.adoc[Examples]
+* xref:examples.adoc[Examples]
* Cookbook
-* xref:#architecture.adoc[Architecture]
+* xref:architecture.adoc[Architecture]
* xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns]
-* xref:#dsl.adoc[DSL]
+* xref:dsl.adoc[DSL]
* xref:#components.adoc[Components]
* xref:#data-formats.adoc[Data Formats]
-* xref:#languages.adoc[Languages]
+* xref:languages.adoc[Languages]
=== User Guide
@@ -557,7 +557,7 @@ camel routes without them knowing
== Community
* xref:support.adoc[Support]
-* xref:../../../CONTRIBUTING.md[Contributing]
+* https://github.com/apache/camel/blob/master/CONTRIBUTING.md[Contributing]
* xref:mailing-lists.adoc[Mailing Lists]
* Gitter / IRC Chat
* xref:user-stories.adoc[User Stories]
diff --git a/docs/user-manual/modules/ROOT/pages/pipeline-eip.adoc b/docs/user-manual/modules/ROOT/pages/pipeline-eip.adoc
index 144d973..99791d5 100644
--- a/docs/user-manual/modules/ROOT/pages/pipeline-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/pipeline-eip.adoc
@@ -1,7 +1,7 @@
[[pipeline-eip]]
== Pipeline EIP
-Camel supports the xref:http://www.enterpriseintegrationpatterns.com/PipesAndFilters.html[Pipes and Filters] from the https://github.com/apache/camel/blob/master/docs/user-manual/en/enterprise-integration-patterns.adoc[EIP patterns] in various ways.
+Camel supports the http://www.enterpriseintegrationpatterns.com/PipesAndFilters.html[Pipes and Filters] from the https://github.com/apache/camel/blob/master/docs/user-manual/en/enterprise-integration-patterns.adoc[EIP patterns] in various ways.
image:http://www.enterpriseintegrationpatterns.com/img/PipesAndFilters.gif[image]
diff --git a/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc b/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc
index 4af9f6c..15410eb 100644
--- a/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc
@@ -1,6 +1,6 @@
[[recipientList-eip]]
== Recipient List EIP
-The xref:http://www.enterpriseintegrationpatterns.com/RecipientList.html[Recipient List] from the EIP patterns allows you to route messages to a number of dynamically specified recipients.
+The http://www.enterpriseintegrationpatterns.com/RecipientList.html[Recipient List] from the EIP patterns allows you to route messages to a number of dynamically specified recipients.
image:http://www.enterpriseintegrationpatterns.com/img/RecipientList.gif[image]
diff --git a/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc b/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
index 2c7772a..4bdd2f6 100644
--- a/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
+++ b/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
@@ -11,7 +11,7 @@ You can use any of the supported Camel Languages in
the Scala DSL; see below for a couple of examples:
[[ScalaDSL-Supportedlanguages-Using]]
-Using xref:xpath-language.adoc[XPath]
+Using xref:components::xpath-language.adoc[XPath]
----------------------------
With the XPath trait, you have an additional method available on an
diff --git a/docs/user-manual/modules/ROOT/pages/support.adoc b/docs/user-manual/modules/ROOT/pages/support.adoc
index 2be2498..c0f45f2 100644
--- a/docs/user-manual/modules/ROOT/pages/support.adoc
+++ b/docs/user-manual/modules/ROOT/pages/support.adoc
@@ -110,7 +110,7 @@ We can help you much quicker if you try the following:
* provide us with a JUnit test case that demonstrates your issue. e.g.
if you think you've found a bug, can you create a test case to
demonstrate the bug?
-* xref:../../../CONTRIBUTING.md[submit a patch] fixing the
+* https://github.com/apache/camel/blob/master/CONTRIBUTING.md[submit a patch] fixing the
bug! (We also buy you beer when we meet you if you submit bug fixes
:smile:)
* for memory leak or performance related issues, if you can run a
diff --git a/docs/user-manual/modules/ROOT/pages/testing.adoc b/docs/user-manual/modules/ROOT/pages/testing.adoc
index 6e921c6..8d603e0 100644
--- a/docs/user-manual/modules/ROOT/pages/testing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/testing.adoc
@@ -88,7 +88,7 @@ injection annotations].
===== Camel Test Example
Here is the Camel Test
-xref:../../../components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java[example]:
+xref:../../../../../components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java[example]:
[source,java]
----
@@ -103,7 +103,7 @@ overrides the `createRouteBuilder()` method.
===== CDI Test Example
Here is the CDI Testing
-xref:../../../components/camel-test-cdi/src/test/java/org/apache/camel/test/cdi/FilterTest.java[example]:
+xref:../../../../../components/camel-test-cdi/src/test/java/org/apache/camel/test/cdi/FilterTest.java[example]:
[source,java]
----
@@ -117,7 +117,7 @@ and the test classes that come with it.
===== Spring Test with XML Config Example
Here is the Spring Testing
-xref:../../../components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java[example
+xref:../../../../../components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java[example
using XML Config]:
[source,java]
@@ -133,7 +133,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
-xref:../../../components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml[`FilterTest-context.xml`
+xref:../../../../../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]
@@ -145,7 +145,7 @@ include::../../../components/camel-spring/src/test/resources/org/apache/camel/sp
===== Spring Test with Java Config Example
Here is the Spring Testing
-xref:../../../components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java[example
+xref:../../../../../components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java[example
using Java Config]:
[source,java]
@@ -171,7 +171,7 @@ register the RouteBuilder we create.
Since *Camel 2.11.0* you can use the `CamelSpringJUnit4ClassRunner` with
`CamelSpringDelegatingTestContextLoader` like
-xref:../../../components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java[example
+xref:../../../../../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`
@@ -185,7 +185,7 @@ include::../../../components/camel-spring-javaconfig/src/test/java/org/apache/ca
===== Spring Test with XML Config and Declarative Configuration Example
Here is a Camel test support enhanced xref:spring-testing.adoc[Spring
-Testing] xref:../../../components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java[example
+Testing] xref:../../../../../components/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]:
@@ -203,7 +203,7 @@ of annotations you can use in your tests.
===== Blueprint Test
Here is the Blueprint Testing
-xref:../../../components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java[example
+xref:../../../../../components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java[example
using XML Config]:
[source,java]
@@ -213,7 +213,7 @@ include::../../../components/camel-test-blueprint/src/test/java/org/apache/camel
Also notice the use of `getBlueprintDescriptors` to indicate that by
default we should look for the
-xref:camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml[`camelContext.xml`
+xref:../../../../../components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml[`camelContext.xml`
in the package] to configure the test case which looks like this:
[source,xml]
diff --git a/docs/user-manual/modules/ROOT/pages/transactional-client.adoc b/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
index a60c93a..d88688e 100644
--- a/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
+++ b/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
@@ -3,7 +3,7 @@
Camel recommends supporting the
http://www.enterpriseintegrationpatterns.com/TransactionalClient.html[Transactional
-Client] from the xref:enterprise-integration-patterns.html[EIP patterns]
+Client] from the xref:enterprise-integration-patterns.adoc[EIP patterns]
using spring transactions.
image:http://www.enterpriseintegrationpatterns.com/img/TransactionalClientSolution.gif[image]
@@ -390,4 +390,4 @@ Camel to only do it for the current transaction and not globally.
* xref:TransactionErrorHandler-TransactionErrorHandler.adoc[TransactionErrorHandler]
* xref:ErrorHandler-ErrorHandler.adoc[Error Handler]
* xref:jms-component.adoc[JMS]
-* xref:using-this-pattern.html[Using This Pattern]
+* xref:using-this-pattern.adoc[Using This Pattern]
diff --git a/examples/camel-example-cdi/README.md b/examples/camel-example-cdi/README.md
index da83e75..8ccbfa3 100644
--- a/examples/camel-example-cdi/README.md
+++ b/examples/camel-example-cdi/README.md
@@ -16,7 +16,7 @@ You will need to compile this example first:
$ mvn compile
```
-### Run
+scala-dsl-supported-languages### Run
To run the example, type:
diff --git a/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java
index abc6889..36cda8c 100644
--- a/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java
@@ -82,7 +82,7 @@ public class RestSwaggerComponentConfiguration
* load swagger.json resource. Note that the host defined on the component
* and endpoint of this Component should contain the scheme, hostname and
* optionally the port in the URI syntax (i.e.
- * https://api.example.com:8080). Can be overridden in endpoint
+ * \https://api.example.com:8080). Can be overridden in endpoint
* configuration.
*/
private URI specificationUri;
[camel] 03/04: more fixes for anchor not found errors
Posted by zr...@apache.org.
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 d66231baa04762094129d005c8340168489ea8a5
Author: nayananga@acerubuntu18.04 <na...@gmail.com>
AuthorDate: Thu Jul 11 12:29:07 2019 +0530
more fixes for anchor not found errors
---
docs/components/modules/ROOT/pages/cdi.adoc | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/components/modules/ROOT/pages/cdi.adoc b/docs/components/modules/ROOT/pages/cdi.adoc
index fcf0b33..d5e1fa3 100644
--- a/docs/components/modules/ROOT/pages/cdi.adoc
+++ b/docs/components/modules/ROOT/pages/cdi.adoc
@@ -47,6 +47,7 @@ type `DefaultCamelContext`.
Note that this bean can be customized programmatically and other Camel
context beans can be deployed in the application as well.
+[[CDI-Auto-detectingCamelroutes]]
=== Auto-detecting Camel routes
Camel CDI automatically collects all the `RoutesBuilder` beans in the