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 dd18f3bf0e4c3fbaf94ab65f804ecf10c44470a2
Author: nayananga@acerubuntu18.04 <nayanangamuhandi...@gmail.com>
AuthorDate: Thu Jul 18 10:57:07 2019 +0530
incorect paths fixed in faq directory
---
.../pages/faq/can-i-get-commercial-support.adoc | 2 +-
.../pages/faq/does-camel-work-on-ibms-jdk.adoc | 2 +-
...ption-javaxnamingnoinitialcontextexception.adoc | 4 +--
.../faq/exception-orgxmlsaxsaxparseexception.adoc | 2 +-
...an-i-create-a-custom-component-or-endpoint.adoc | 6 ++--
.../pages/faq/how-can-i-get-the-source-code.adoc | 2 +-
.../faq/how-can-i-stop-a-route-from-a-route.adoc | 16 +++++-----
.../pages/faq/how-do-i-become-a-committer.adoc | 6 ++--
.../ROOT/pages/faq/how-do-i-compile-the-code.adoc | 2 +-
.../pages/faq/how-do-i-configure-endpoints.adoc | 10 +++---
...-endpoints-without-the-value-being-encoded.adoc | 2 +-
...ximum-endpoint-cache-size-for-camelcontext.adoc | 6 ++--
.../ROOT/pages/faq/how-do-i-debug-my-route.adoc | 6 ++--
...en-consuming-for-example-from-a-ftp-server.adoc | 2 +-
...how-do-i-import-rests-from-other-xml-files.adoc | 2 +-
...ow-do-i-import-routes-from-other-xml-files.adoc | 2 +-
...ow-do-i-make-my-jms-endpoint-transactional.adoc | 4 +--
.../pages/faq/how-do-i-restart-camelcontext.adoc | 4 +--
...-contexttestsupport-class-in-my-unit-tests.adoc | 4 +--
...ify-time-period-in-a-human-friendly-syntax.adoc | 2 +-
...h-method-to-use-when-using-beans-in-routes.adoc | 2 +-
...spring-property-placeholder-with-camel-xml.adoc | 2 +-
.../how-do-i-use-uris-with-parameters-in-xml.adoc | 4 +--
.../pages/faq/how-does-camel-compare-to-mule.adoc | 6 ++--
.../how-does-camel-compare-to-servicemix-eip.adoc | 4 +--
.../faq/how-does-camel-compare-to-servicemix.adoc | 10 +++---
.../faq/how-does-camel-compare-to-synapse.adoc | 12 ++++----
...how-does-camel-look-up-beans-and-endpoints.adoc | 16 +++++-----
.../faq/how-does-camel-work-with-activemq.adoc | 6 ++--
.../faq/how-does-camel-work-with-servicemix.adoc | 6 ++--
.../ROOT/pages/faq/how-does-camel-work.adoc | 2 +-
.../faq/how-does-the-camel-api-compare-to.adoc | 4 +--
...hould-i-invoke-my-pojos-or-spring-services.adoc | 4 +--
...kage-applications-using-camel-and-activemq.adoc | 4 +--
...-avoid-sending-some-or-all-message-headers.adoc | 2 +-
.../pages/faq/how-to-use-a-dynamic-uri-in-to.adoc | 6 ++--
...f-i-use-servicemix-when-should-i-use-camel.adoc | 4 +--
.../ROOT/pages/faq/is-camel-ioc-friendly.adoc | 14 ++++-----
.../modules/ROOT/pages/faq/is-there-an-ide.adoc | 8 ++---
.../ROOT/pages/faq/running-camel-standalone.adoc | 16 +++++-----
...-activemq-broker-or-in-another-application.adoc | 2 +-
.../ROOT/pages/faq/using-camel-core-testsjar.adoc | 2 +-
.../using-getin-or-getout-methods-on-exchange.adoc | 18 +++++------
.../ROOT/pages/faq/what-are-the-dependencies.adoc | 2 +-
.../modules/ROOT/pages/faq/what-is-a-router.adoc | 10 +++---
.../modules/ROOT/pages/faq/what-is-camel.adoc | 36 +++++++++++-----------
.../pages/faq/what-platforms-are-supported.adoc | 2 +-
...se-when-or-otherwise-in-a-java-camel-route.adoc | 10 +++---
.../faq/why-cant-i-use-sign-in-my-password.adoc | 2 +-
...use-too-many-threads-with-producertemplate.adoc | 6 ++--
...-file-consumer-use-the-camel-error-handler.adoc | 12 ++++----
...ge-with-error-handler-not-work-as-expected.adoc | 8 ++---
.../modules/ROOT/pages/faq/why-the-name-camel.adoc | 4 +--
53 files changed, 166 insertions(+), 166 deletions(-)
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/can-i-get-commercial-support.adoc
b/docs/user-manual/modules/ROOT/pages/faq/can-i-get-commercial-support.adoc
index f0d3997..18a0458 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/can-i-get-commercial-support.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/can-i-get-commercial-support.adoc
@@ -1,4 +1,4 @@
[[CanIgetcommercialsupport-CanIgetcommercialsupport]]
=== Can I get commercial support?
-Absolutely, see our xref:../support.adoc[Support] page for more details.
+Absolutely, see our xref:support.adoc[Support] page for more details.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/does-camel-work-on-ibms-jdk.adoc
b/docs/user-manual/modules/ROOT/pages/faq/does-camel-work-on-ibms-jdk.adoc
index 65b2e55..66a5d81 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/does-camel-work-on-ibms-jdk.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/does-camel-work-on-ibms-jdk.adoc
@@ -27,6 +27,6 @@ camel-spring on another JDK (preferably a Sun JDK).
Ruby scripting on IBM's JDK works for Camel 2.0 and onward. For earlier
versions you'll need to use one of the other
-xref:../scripting-languages.adoc[Scripting Languages]. See
+xref:scripting-languages.adoc[Scripting Languages]. See
https://issues.apache.org/activemq/browse/CAMEL-1030[CAMEL-1030] for
more details.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/exception-javaxnamingnoinitialcontextexception.adoc
b/docs/user-manual/modules/ROOT/pages/faq/exception-javaxnamingnoinitialcontextexception.adoc
index ef77dd6..2df3ca4 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/exception-javaxnamingnoinitialcontextexception.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/exception-javaxnamingnoinitialcontextexception.adoc
@@ -1,7 +1,7 @@
[[Exception-javax.naming.NoInitialContextException-Exceptionjavax.naming.NoInitialContextException]]
=== Exception: `javax.naming.NoInitialContextException`
-If you try to use Camel without xref:../spring.adoc[Spring] using code
+If you try to use Camel without xref:spring.adoc[Spring] using code
something like this:
[source,java]
@@ -24,7 +24,7 @@ You might get an exception like this:
----
This is because if you are not using Spring then the default
-xref:../registry.adoc[Registry] implementation uses xref:../jndi.adoc[JNDI].
+xref:registry.adoc[Registry] implementation uses xref:jndi.adoc[JNDI].
A simple workaround for this is to specify a JNDI provider. An easy fix
is to create a file called `jndi.properties` on the classpath and give
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/exception-orgxmlsaxsaxparseexception.adoc
b/docs/user-manual/modules/ROOT/pages/faq/exception-orgxmlsaxsaxparseexception.adoc
index 646e7b2..77171f6 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/exception-orgxmlsaxsaxparseexception.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/exception-orgxmlsaxsaxparseexception.adoc
@@ -11,7 +11,7 @@ XML.
Because of this, you have to replace all & in your URIs by `+&+` when
using the Spring XML syntax to configure Camel routes.
-An example: this snippet of code in the xref:../dsl.adoc[DSL]...
+An example: this snippet of code in the xref:dsl.adoc[DSL]...
[source,java]
----
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-can-i-create-a-custom-component-or-endpoint.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-can-i-create-a-custom-component-or-endpoint.adoc
index a905edd..3d74423 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-can-i-create-a-custom-component-or-endpoint.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-can-i-create-a-custom-component-or-endpoint.adoc
@@ -1,13 +1,13 @@
[[HowcanIcreateacustomcomponentorendpoint-HowcanIcreateacustomcomponentorendpoint]]
=== How can I create a custom component or endpoint?
-Please read xref:../writing-components.adoc[Writing Components] for a
+Please read xref:writing-components.adoc[Writing Components] for a
background in how to implement a new component or endpoint. Its really
easy to do! :smile:
[[HowcanIcreateacustomcomponentorendpoint-SeeAlso]]
==== See Also
-* xref:../writing-components.adoc[Writing Components]
-* xref:../configuring-camel.adoc[How do I add a component?]
+* xref:writing-components.adoc[Writing Components]
+* xref:configuring-camel.adoc[How do I add a component?]
* xref:how-do-i-configure-endpoints.adoc[How do I configure endpoints?]
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-can-i-get-the-source-code.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-can-i-get-the-source-code.adoc
index 399f8b7..e5370ed 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-can-i-get-the-source-code.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-can-i-get-the-source-code.adoc
@@ -47,4 +47,4 @@ https://github.com/apache/camel/
[[HowcanIgetthesourcecode-Buildingthecode]]
==== Building the code
-To then build the code see xref:../building.adoc[Building].
+To then build the code see xref:building.adoc[Building].
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-can-i-stop-a-route-from-a-route.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-can-i-stop-a-route-from-a-route.adoc
index 66121a5..96fd13b 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-can-i-stop-a-route-from-a-route.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-can-i-stop-a-route-from-a-route.adoc
@@ -1,14 +1,14 @@
[[HowcanIstoparoutefromaroute-HowcanIstoparoutefromaroute]]
=== How can I stop a route from a route
-The xref:../camelcontext.adoc[CamelContext] provides API for managing
+The xref:camelcontext.adoc[CamelContext] provides API for managing
routes at runtime. It has a `stopRoute(id)` and `startRoute(id)`
methods.
Stopping a route during routing an existing message is a bit tricky. The
-reason for that is Camel will xref:../graceful-shutdown.adoc[Graceful
+reason for that is Camel will xref:graceful-shutdown.adoc[Graceful
Shutdown] the route you are stopping. And if you do that while a message
-is being routed the xref:../graceful-shutdown.adoc[Graceful Shutdown] will
+is being routed the xref:graceful-shutdown.adoc[Graceful Shutdown] will
try to wait until that message has been processed.
The best practice for stopping a route from a route, is to either:
@@ -45,18 +45,18 @@ shown:
Camel provides another feature for managing routes at runtime which is
xref:routepolicy.adoc[RoutePolicy].
-And xref:../camelcontext.adoc[CamelContext] also provides API for
+And xref:camelcontext.adoc[CamelContext] also provides API for
suspend/resume of routes, and shutdown as well.
* suspend/resume is faster than stop/start. For example a HTTP server
will still run but deny any incoming requests.
Whereas if it was stopped the HTTP listener would have been stopped.
* shutdown means the route is being removed from
-xref:../camelcontext.adoc[CamelContext] and cannot be started again. Its
+xref:camelcontext.adoc[CamelContext] and cannot be started again. Its
also removed from JMX.
A route must have been stopped prior to be shutdown.
-See more details about the xref:../lifecycle.adoc[Lifecycle].
+See more details about the xref:lifecycle.adoc[Lifecycle].
NOTE: You can also use the xref:controlbus-component.adoc[ControlBus]
component to let
it stop/start routes.
@@ -65,6 +65,6 @@ it stop/start routes.
==== See Also
* xref:routepolicy.adoc[RoutePolicy]
-* xref:../graceful-shutdown.adoc[Graceful Shutdown]
-* xref:../lifecycle.adoc[Lifecycle]
+* xref:graceful-shutdown.adoc[Graceful Shutdown]
+* xref:lifecycle.adoc[Lifecycle]
* xref:controlbus-component.adoc[ControlBus]
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 631eb35..c08720a 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
@@ -6,13 +6,13 @@
https://github.com/apache/camel/blob/master/CONTRIBUTING.md[Contribute] via the
documentation, work on the issue tracker and submit patches.
Once you're contributing and your work is good, one of our
-xref:../team.adoc[Team] may invite you to be a committer (after we've
+xref:team.adoc[Team] may invite you to be a committer (after we've
called a vote). When that happens, if you accept, the following process
kicks into place...
Note that becoming a committer is not just about submitting some
patches; its also about helping out on the development and user
-xref:../mailing-lists.adoc[Discussion Forums],
+xref:mailing-lists.adoc[Discussion Forums],
helping with documentation and the issue tracker.
[[HowdoIbecomeacommitter-Becomingacommittersteps]]
@@ -34,7 +34,7 @@ to have your account created; we'll also need to know
[[HowdoIbecomeacommitter-GettingstartedatApache]]
==== Getting started at Apache
-Firstly add yourself to the xref:../team.adoc[Team] page
+Firstly add yourself to the xref:team.adoc[Team] page
Now go read the instructions on the
http://www.apache.org/dev/new-committers-guide.html[new committers guide].
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-compile-the-code.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-compile-the-code.adoc
index 00c2463..ed4a027 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-compile-the-code.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-compile-the-code.adoc
@@ -1,4 +1,4 @@
[[HowdoIcompilethecode-HowdoIcompilefromthesourcecode]]
=== How do I compile from the source code?
-See the xref:../building.adoc[Building] page.
+See the xref:building.adoc[Building] page.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc
index 2f5a7b4..860325e 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-endpoints.adoc
@@ -79,7 +79,7 @@ class MyCdiBean {
==== Using Guice
You can also use Guice as the dependency injection
-framework. For example see the xref:../guice-jms-example.adoc[Guice JMS
+framework. For example see the xref:guice-jms-example.adoc[Guice JMS
Example].
[[HowdoIconfigureendpoints-UsingSpringXML]]
@@ -310,8 +310,8 @@ can have multiple options in one line, eg this is the same:
[[HowdoIconfigureendpoints-SeeAlso]]
==== See Also
-* xref:../configuring-camel.adoc[How do I add a component?]
+* xref:configuring-camel.adoc[How do I add a component?]
* xref:cdi-component.adoc[CDI]
-* xref:../spring.adoc[Spring]
-* xref:../uris.adoc[URIs]
-* xref:../using-propertyplaceholder.adoc[Using `PropertyPlaceholder`]
+* xref:spring.adoc[Spring]
+* xref:uris.adoc[URIs]
+* xref:using-propertyplaceholder.adoc[Using `PropertyPlaceholder`]
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-password-options-on-camel-endpoints-without-the-value-being-encoded.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-password-options-on-camel-endpoints-without-the-value-being-encoded.adoc
index f2fc8fc..055cca4 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-password-options-on-camel-endpoints-without-the-value-being-encoded.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-password-options-on-camel-endpoints-without-the-value-being-encoded.adoc
@@ -1,7 +1,7 @@
[[HowdoIconfigurepasswordoptionsonCamelendpointswithoutthevaluebeingencoded-HowdoIconfigurepasswordoptionsonCamelendpointswithoutthevaluebeingencoded]]
=== How do I configure password options on Camel endpoints without the value
being encoded?
-When you configure Camel endpoints using xref:../uris.adoc[URIs] then the
+When you configure Camel endpoints using xref:uris.adoc[URIs] then the
parameter values gets url encoded by default. +
This can be a problem when you want to configure passwords _as is_.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-the-maximum-endpoint-cache-size-for-camelcontext.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-the-maximum-endpoint-cache-size-for-camelcontext.adoc
index 7f58681..4f6fabd 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-the-maximum-endpoint-cache-size-for-camelcontext.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-configure-the-maximum-endpoint-cache-size-for-camelcontext.adoc
@@ -1,7 +1,7 @@
[[HowdoIconfigurethemaximumendpointcachesizeforCamelContext-HowdoIconfigurethemaximumendpointcachesizeforCamelContext?]
=== How do I configure the maximum endpoint cache size for CamelContext?
-xref:../camelcontext.adoc[CamelContext] will by default cache the last 1000
+xref:camelcontext.adoc[CamelContext] will by default cache the last 1000
used endpoints (based on a LRUCache).
[[HowdoIconfigurethemaximumendpointcachesizeforCamelContext-Configuringcachesize]]
@@ -11,14 +11,14 @@ used endpoints (based on a LRUCache).
You can configure the default maximum cache size by setting the
`Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE` property on
-xref:../camelcontext.adoc[CamelContext].
+xref:camelcontext.adoc[CamelContext].
[source,java]
----
getCamelContext().getProperties().put(Exchange.MAXIMUM_ENDPOINT_CACHE_SIZE,
"500");
----
-You need to configure this before xref:../camelcontext.adoc[CamelContext]
+You need to configure this before xref:camelcontext.adoc[CamelContext]
is started.
And in Spring XML its done as:
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-debug-my-route.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-debug-my-route.adoc
index 393e434..1de7ec1 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-debug-my-route.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-debug-my-route.adoc
@@ -2,13 +2,13 @@
=== How do I debug my route?
If you've created a route and its not doing what you think it is you
-could try using one of these features from xref:../download.adoc[version 1.4
onwards]:
+could try using one of these features from xref:download.adoc[version 1.4
onwards]:
* xref:tracer.adoc[Tracer] to trace in commons-logging / log4j each step
that Camel takes
-* xref:../debugger.adoc[Debugger] to let you set breakpoints at points in
+* xref:debugger.adoc[Debugger] to let you set breakpoints at points in
the route and examine historic message exchanges
-* xref:../debugger.adoc[Debug] from your unit test if you use the Camel
+* xref:debugger.adoc[Debug] from your unit test if you use the Camel
`camel-test` component
Some xref:user-stories.adoc[third party tools] offers Apache Camel route
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-handle-failures-when-consuming-for-example-from-a-ftp-server.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-handle-failures-when-consuming-for-example-from-a-ftp-server.adoc
index b644fe5..7ca91f4 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-handle-failures-when-consuming-for-example-from-a-ftp-server.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-handle-failures-when-consuming-for-example-from-a-ftp-server.adoc
@@ -9,7 +9,7 @@
from("ftp://f...@somesever.com?password=secret";).to("bean:logic?method=doSomethin
----
And there is a failure with connecting to the remote FTP server. The
-existing xref:../error-handling-in-camel.adoc[Error handling in Camel] is
+existing xref:error-handling-in-camel.adoc[Error handling in Camel] is
based on when a message is *being* routed.
In this case the error occurs *before* a message has been initiated and
routed. So how can I control the error handling?
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-import-rests-from-other-xml-files.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-import-rests-from-other-xml-files.adoc
index d365a42..a8c835a 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-import-rests-from-other-xml-files.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-import-rests-from-other-xml-files.adoc
@@ -3,7 +3,7 @@
*Available as of Camel 2.14*
-When defining rests in Camel using xref:../xml-configuration.adoc[Xml
+When defining rests in Camel using xref:xml-configuration.adoc[Xml
Configuration] you may want to define some rests in other XML files. For
example you may have many rest services and it may help to maintain the
application if some of the rests are in separate XML files. You may also
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-import-routes-from-other-xml-files.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-import-routes-from-other-xml-files.adoc
index dccbf04..394d288 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-import-routes-from-other-xml-files.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-import-routes-from-other-xml-files.adoc
@@ -3,7 +3,7 @@
*Available as of Camel 2.3*
-When defining routes in Camel using xref:../xml-configuration.adoc[XML
Configuration]
+When defining routes in Camel using xref:xml-configuration.adoc[XML
Configuration]
you may want to define some routes in other XML files.
For example you may have many routes and it may help to maintain the
application if some of the routes are in separate XML files. You may
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-make-my-jms-endpoint-transactional.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-make-my-jms-endpoint-transactional.adoc
index 57383e3..050be48 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-make-my-jms-endpoint-transactional.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-make-my-jms-endpoint-transactional.adoc
@@ -21,8 +21,8 @@ There are examples in the
xref:transactionalClient-eip.adoc[Transactional Client
and it is described in the _Enabling Transacted Consumption_
section of xref:jms-component.adoc[JMS]. To make a session transactional
set `transacted=true` flag on the JMS endpoint and configure
-a `transactionManager` on the xref:../component.adoc[Component] or
-xref:../endpoint.adoc[Endpoint].
+a `transactionManager` on the xref:component.adoc[Component] or
+xref:endpoint.adoc[Endpoint].
[[HowDoIMakeMyJMSEndpointTransactional-SeeAlso]]
==== See Also
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-restart-camelcontext.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-restart-camelcontext.adoc
index 741a4bb..fc014f2 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-restart-camelcontext.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-restart-camelcontext.adoc
@@ -1,8 +1,8 @@
[[HowdoIrestartCamelContext-HowdoIrestartCamelContext]]
=== How do I restart CamelContext?
-A xref:../camelcontext.adoc[CamelContext] provides operations to control
-its lifecycle, see more at xref:../camelcontext.adoc[CamelContext].
+A xref:camelcontext.adoc[CamelContext] provides operations to control
+its lifecycle, see more at xref:camelcontext.adoc[CamelContext].
NOTE: Obviously you can also restart a Camel application if its been
deployed in a server. For example a WAR application can be restarted
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-reuse-the-contexttestsupport-class-in-my-unit-tests.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-reuse-the-contexttestsupport-class-in-my-unit-tests.adoc
index fc9c75e..c41247a 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-reuse-the-contexttestsupport-class-in-my-unit-tests.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-reuse-the-contexttestsupport-class-in-my-unit-tests.adoc
@@ -1,9 +1,9 @@
[[HowdoIreusetheContextTestSupportclassinmyunittests-HowdoIreusetheContextTestSupportclassinmyunittests]]
=== How do I reuse the ContextTestSupport class in my unit tests?
-You might want to look at the various xref:../testing.adoc[Testing]
+You might want to look at the various xref:testing.adoc[Testing]
options, in particular xref:test-component.adoc[Camel Test] and
-xref:../spring-testing.adoc[Spring Testing] to see if those are better,
+xref:spring-testing.adoc[Spring Testing] to see if those are better,
more powerful options. We see `ContextTestSupport` as an older, less
powerful option.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-time-period-in-a-human-friendly-syntax.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-time-period-in-a-human-friendly-syntax.adoc
index a2bf601..ba3b709 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-time-period-in-a-human-friendly-syntax.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-time-period-in-a-human-friendly-syntax.adoc
@@ -3,7 +3,7 @@
*Available as of Camel 2.3*
-Some of the Camel xref:../component.adoc[components] offers options to
+Some of the Camel xref:component.adoc[components] offers options to
specify a time period, which must be entered in milli second as unit.
This may be unfriendly to read as a human when the value is large such
as 45min = 2700000 millis.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-which-method-to-use-when-using-beans-in-routes.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-which-method-to-use-when-using-beans-in-routes.adoc
index 677b264..049d312 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-which-method-to-use-when-using-beans-in-routes.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-specify-which-method-to-use-when-using-beans-in-routes.adoc
@@ -1,7 +1,7 @@
[[HodoIspecifywhichmethodtousewhenusingbeansinroutes-HodoIspecifywhichmethodtousewhenusingbeansinroutes]]
=== Ho do I specify which method to use when using beans in routes?
-See xref:bean-component.adoc[Bean], xref:../bean-integration.adoc[Bean
Integration]
+See xref:bean-component.adoc[Bean], xref:bean-integration.adoc[Bean
Integration]
and xref:bean-binding.adoc[Bean Binding]
However if you have overloaded methods you need to specify which of
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
index 5c77266..0d5e6bf 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc
@@ -65,7 +65,7 @@ http://jira.springframework.org/browse/SPR-4466[SPR-4466]
===== Bridge Spring and Camel property placeholders
From Camel 2.10 onwards you can bridge Spring and Camel property
-placeholders, see xref:../using-propertyplaceholder.adoc[Using
+placeholders, see xref:using-propertyplaceholder.adoc[Using
PropertyPlaceholder] for more details.
Here is a trick that you can use to define the uri in a property file
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-uris-with-parameters-in-xml.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-uris-with-parameters-in-xml.adoc
index e6cd9a9..aaf966f 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-uris-with-parameters-in-xml.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-do-i-use-uris-with-parameters-in-xml.adoc
@@ -1,8 +1,8 @@
[[HowdoIuseURIswithparametersinXML-HowdoIuseURIswithparametersinXML]]
=== How do I use URIs with parameters in XML?
-If you try and use one of the Camel xref:../uris.adoc[URIs] in an
-xref:../xml-configuration.adoc[XML Configuration] using the URI query
+If you try and use one of the Camel xref:uris.adoc[URIs] in an
+xref:xml-configuration.adoc[XML Configuration] using the URI query
parameter notation, such as:
[source,xml]
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 c434990..5937cd3 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
@@ -8,9 +8,9 @@ I guess from 30,000 feet they're kinda
xref:why-the-name-camel.adoc[similar beasts]; they're both kinds of
routing/mediation engines. The main differences are as follows:
-* Camel uses a Java xref:../dsl.adoc[Domain Specific Language] in addition
+* Camel uses a Java xref:dsl.adoc[Domain Specific Language] in addition
to Spring XML for configuring the routing rules and providing
- xref:../enterprise-integration-patterns.adoc[Enterprise Integration
+ xref:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns]
* Camel's API is smaller & cleaner (IMHO) and is closely aligned with
the APIs of JBI, xref:cxf-component.adoc[CXF] and
@@ -22,7 +22,7 @@ routing/mediation engines. The main differences are as
follows:
underlying transport information & behaviour if its required). See
xref:how-does-the-camel-api-compare-to.adoc[How does the Camel API
compare to]
-* Camel supports an implicit xref:../type-converter.adoc[Type Converter] in
+* 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
https://github.com/apache/camel/blob/master/docs/user-manual/en/notice.md[Apache
2 License] rather than Mule's more restrictive
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc
index b4e634d..78a66e1 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc
@@ -6,10 +6,10 @@ ancestor though they both do similar things.
The main difference with ServiceMix EIP is its integrated into the
existing ServiceMix XBean XML configuration whereas Camel has more
-xref:../enterprise-integration-patterns.adoc[Enterprise Integration
+xref:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns] and can be used outside of JBI (e.g. just with pure
xref:jms-component.adoc[JMS] or xref:mina-component.adoc[MINA]). Also Camel
supports a
-xref:../dsl.adoc[Java DSL] or xref:../spring.adoc[XML configuration].
+xref:dsl.adoc[Java DSL] or xref:spring.adoc[XML configuration].
[[HowdoesCamelcomparetoServiceMixEIP-ConvertingfromServiceMixEIPtoCamel]]
==== Converting from ServiceMix EIP to Camel
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix.adoc
index 5095c7b..a0e8922 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix.adoc
@@ -2,7 +2,7 @@
=== How does Camel compare to ServiceMix?
Camel is smart routing and mediation engine which implements the
-xref:../enterprise-integration-patterns.adoc[Enterprise Integration
+xref:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns] and is designed to be used either inside an ESB like
ServiceMix, in a Message Broker like ActiveMQ or in a smart endpoint or
web services framework like CXF. ServiceMix is an ESB, a JBI container
@@ -10,21 +10,21 @@ and an integration platform. So they both address different
needs though
they are both designed to work great together.
Camel can be deployed as a component within ServiceMix to provide
-xref:../enterprise-integration-patterns.adoc[EIP routing and mediation]
+xref:enterprise-integration-patterns.adoc[EIP routing and mediation]
between existing JBI components together with communicating with any of
-the other Camel xref:../component.adoc[Components] along with defining new
+the other Camel xref:component.adoc[Components] along with defining new
JBI components on the NMR. So Camel is similar to the
xref:how-does-camel-compare-to-servicemix-eip.adoc[ServiceMix EIP
component].
To work with Camel and ServiceMix you take your Camel
-xref:../spring.adoc[Spring] configuration and turn it into a JBI Service
+xref:spring.adoc[Spring] configuration and turn it into a JBI Service
Unit using the maven plugin or archetype. For more details see
http://incubator.apache.org/servicemix/servicemix-camel.html[ServiceMix
Camel plugin].
So you could start out using Camel routing inside your application via
-xref:../dsl.adoc[Java] or xref:../spring.adoc[Spring]; then later on if you
+xref:dsl.adoc[Java] or xref:spring.adoc[Spring]; then later on if you
choose to you could wrap up your routing and mediation rules as a JBI
deployment unit and drop it into your ServiceMix ESB. This provides a
nice agile approach to integration; start small & simple on an endpoint
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
index cc37b7a..b158f7e 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
@@ -20,13 +20,13 @@ middleware with EIP and
http://servicemix.apache.org/[Apache ServiceMix]
the ESB based around OSGi and JBI at Apache - both of which are
http://www.nabble.com/Apache-f90.html[very popular too].
* Camel is designed from the ground up around
-xref:../enterprise-integration-patterns.adoc[Enterprise Integration
+xref:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns] -- having an EIP pattern language implemented in
-xref:../dsl.adoc[Java], xref:../spring.adoc[Spring XML],
-xref:../scala-dsl.adoc[Scala] and xref:../groovy-dsl.adoc[Groovy] as well as
-xref:../visualisation.adoc[EIP Visualisations].
+xref:dsl.adoc[Java], xref:spring.adoc[Spring XML],
+xref:scala-dsl.adoc[Scala] and xref:groovy-dsl.adoc[Groovy] as well as
+xref:visualisation.adoc[EIP Visualisations].
* Camel is designed to work with pretty much all kinds of
-xref:../transport.adoc[transport] as well as working with any
-xref:../data-format.adoc[Data Format]. When we first looked at Synapse it
+xref:transport.adoc[transport] as well as working with any
+xref:data-format.adoc[Data Format]. When we first looked at Synapse it
was based around Axis 2 and WS-* though apparently thats no longer the
case.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-look-up-beans-and-endpoints.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-look-up-beans-and-endpoints.adoc
index c7d6331..3fe8b93 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-look-up-beans-and-endpoints.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-look-up-beans-and-endpoints.adoc
@@ -4,20 +4,20 @@
There are many times using Camel that a name is used for a bean such as
using the xref:bean-component.adoc[Bean] endpoint or using the
xref:bean-language.adoc[Bean Language] to create a
-xref:../expression.adoc[Expression] or xref:../predicate.adoc[Predicate] or
-referring to any xref:../component.adoc[Component] or
-xref:../endpoint.adoc[Endpoint].
+xref:expression.adoc[Expression] or xref:predicate.adoc[Predicate] or
+referring to any xref:component.adoc[Component] or
+xref:endpoint.adoc[Endpoint].
-Camel uses the xref:../registry.adoc[Registry] to resolve names when
+Camel uses the xref:registry.adoc[Registry] to resolve names when
looking up beans or components or endpoints. Typically this will be
-xref:../spring.adoc[Spring]; though you can use Camel without Spring in
-which case it will use the xref:../jndi.adoc[JNDI] registry implementation.
+xref:spring.adoc[Spring]; though you can use Camel without Spring in
+which case it will use the xref:jndi.adoc[JNDI] registry implementation.
Lots of test cases in the camel-core module don't use Spring (as
camel-core explicitly doesn't depend on spring) - though test cases in
camel-spring do.
So you can just define beans, components or endpoints in your
-xref:../registry.adoc[Registry] implementation then you can refer to them
-by name in the xref:../endpoint.adoc[Endpoint] URIs or
xref:bean-component.adoc[Bean]
+xref:registry.adoc[Registry] implementation then you can refer to them
+by name in the xref:endpoint.adoc[Endpoint] URIs or
xref:bean-component.adoc[Bean]
endpoints or xref:bean-language.adoc[Bean Language] expressions.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-activemq.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-activemq.adoc
index 8eab57f..351e5ee 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-activemq.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-activemq.adoc
@@ -2,7 +2,7 @@
=== How does Camel work with ActiveMQ?
You can use Camel to do smart routing and implement the
-xref:../enterprise-integration-patterns.adoc[Enterprise Integration
+xref:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns] inside:
* the ActiveMQ message broker
@@ -11,8 +11,8 @@ Patterns] inside:
So Camel can route messages to and from xref:mail-component.adoc[Mail],
xref:file-component.adoc[File], xref:ftp-component.adoc[FTP],
xref:jpa-component.adoc[JPA],
xref:xmpp-component.adoc[XMPP] other xref:jms-component.adoc[JMS] providers
and any of the
-other Camel xref:../component.adoc[Components] as well as implementating
-all of the xref:../enterprise-integration-patterns.adoc[Enterprise
+other Camel xref:component.adoc[Components] as well as implementating
+all of the xref:enterprise-integration-patterns.adoc[Enterprise
Integration Patterns] such as xref:content-based-router.adoc[Content
Based Router] or xref:messageTranslator-eip.adoc[Message Translator].
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-servicemix.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-servicemix.adoc
index 0cd70d1..02fc436 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-servicemix.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work-with-servicemix.adoc
@@ -2,12 +2,12 @@
=== How does Camel work with ServiceMix?
You can use Camel to do smart routing and implement the
-xref:../enterprise-integration-patterns.adoc[Enterprise Integration
+xref:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns] inside of the JBI container, routing between existing JBI
components together with communicating with any of the other Camel
-xref:../component.adoc[Components].
+xref:component.adoc[Components].
-To do this you take your Camel xref:../spring.adoc[Spring] configuration
+To do this you take your Camel xref:spring.adoc[Spring] configuration
and turn it into a JBI Service Unit using the maven plugin or archetype.
For more details see
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work.adoc
index abecdfd..c19fe6b 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-work.adoc
@@ -1,5 +1,5 @@
[[HowdoesCamelwork-HowdoesCamelwork]]
=== How does Camel work?
-Please see the xref:../architecture.adoc[Architecture] for details of how
+Please see the xref:architecture.adoc[Architecture] for details of how
things work.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc
index 8ba4e2e..33e63fa 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-does-the-camel-api-compare-to.adoc
@@ -9,7 +9,7 @@ map very closely to JBI in particular but also
xref:cxf-component.adoc[CXF], xref:http-component.adoc[HTTP],
xref:jms-component.adoc[JMS],
xref:mail-component.adoc[Mail], xref:xmpp-component.adoc[XMPP] and most other
integration
abstractions. We want to prevent leaky abstractions, so the Camel API
-exposes the underlying APIs so that a xref:../processor.adoc[Processor] can
+exposes the underlying APIs so that a xref:processor.adoc[Processor] can
make use of the underlying abstractions if they make sense.
For example:
@@ -38,6 +38,6 @@ has access to the underlying JMS Message objects
You can probably see a pattern forming now :smile:
For many routing and mediation components and
-xref:../processor.adoc[Processor] objects, you maybe don't care about the
+xref:processor.adoc[Processor] objects, you maybe don't care about the
underlying transport and can instead stick to the abstract Camel API.
But if you need to, the real transport APIs are there for you.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-should-i-invoke-my-pojos-or-spring-services.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-should-i-invoke-my-pojos-or-spring-services.adoc
index cdf3761..5237c6e 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-should-i-invoke-my-pojos-or-spring-services.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-should-i-invoke-my-pojos-or-spring-services.adoc
@@ -2,7 +2,7 @@
=== How should I invoke my POJOs or Spring Services?
The various options are described in detail in
-xref:../bean-integration.adoc[Bean Integration], in particular the
+xref:bean-integration.adoc[Bean Integration], in particular the
xref:bean-binding.adoc[Bean Binding] describes how we invoke a bean
inside a route.
@@ -17,6 +17,6 @@ from("jms:someQueue").bean(MyBean.class, "someMethod");
[[HowshouldIinvokemyPOJOsorSpringServices-SeeAlso]]
==== See Also
-* xref:../bean-integration.adoc[Bean Integration]
+* xref:bean-integration.adoc[Bean Integration]
* xref:bean-binding.adoc[Bean Binding]
* xref:pojo-consuming.adoc[POJO Consuming]
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-should-i-package-applications-using-camel-and-activemq.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-should-i-package-applications-using-camel-and-activemq.adoc
index b764494..291bd56 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-should-i-package-applications-using-camel-and-activemq.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-should-i-package-applications-using-camel-and-activemq.adoc
@@ -2,11 +2,11 @@
=== How should I package applications using Camel and ActiveMQ?
So you may wish to use Camel's
-xref:../enterprise-integration-patterns.adoc[Enterprise Integration Patterns]
+xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns]
inside the ActiveMQ Broker. In which case the
stand alone broker is already packaged to work with Camel out of the
box; just add your EIP routing rules to ActiveMQ's
-xref:../xml-configuration.adoc[XML Configuration] like the example
+xref:xml-configuration.adoc[XML Configuration] like the example
routing rule which ships with ActiveMQ
5.x or later. If you want to include some Java routing rules, then just
add your jar to somewhere inside ActiveMQ's lib directory.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc
index f812830..4971c9d 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-to-avoid-sending-some-or-all-message-headers.adoc
@@ -66,7 +66,7 @@ its name.
==== Use HeaderFilterStrategy
An alternative is that some of the Camel
-xref:../component.adoc[Components] supports configuring a custom header
+xref:component.adoc[Components] supports configuring a custom header
filter strategy.
This allows you to implement the
`org.apache.camel.spi.HeaderFilterStrategy` interface, where one can
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-to-use-a-dynamic-uri-in-to.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-to-use-a-dynamic-uri-in-to.adoc
index 13b043f..faaa0a9 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-to-use-a-dynamic-uri-in-to.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-to-use-a-dynamic-uri-in-to.adoc
@@ -31,7 +31,7 @@ This snippet is not valid code. Read on.
In this case, you must use an EIP (Enterprise Integration Pattern) that
is capable of computing a dynamic URI using
-an xref:../expression.adoc[Expression], such as
+an xref:expression.adoc[Expression], such as
the xref:recipientList-eip.adoc[Recipient List] EIP pattern.
For example, rewriting the snippet above to use the
@@ -49,13 +49,13 @@ This snippet is valid code.
.recipientList(simple("freemarker://templateHome/${body.templateName}.ftl"))
----
-Or you could use any other of Camel xref:../languages.adoc[Languages].
+Or you could use any other of Camel xref:languages.adoc[Languages].
[NOTE]
====
Notice that the xref:recipientList-eip.adoc[Recipient List] can send to
multiple
-xref:../endpoint.adoc[Endpoints]
+xref:endpoint.adoc[Endpoints]
if the expression returns either a `java.util.List`, array,
`java.util.Iteratable` or a `String`. If the returned value is a
`String` then you can specify multiple endpoints separated by comma. So
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/if-i-use-servicemix-when-should-i-use-camel.adoc
b/docs/user-manual/modules/ROOT/pages/faq/if-i-use-servicemix-when-should-i-use-camel.adoc
index ec543e8..e2fbe75 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/if-i-use-servicemix-when-should-i-use-camel.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/if-i-use-servicemix-when-should-i-use-camel.adoc
@@ -5,12 +5,12 @@ Camel is a routing and mediation engine which works great
inside JBI.
So if you are already using http://servicemix.apache.org/[ServiceMix]
then you can use Camel implement the
-xref:../enterprise-integration-patterns.adoc[Enterprise Integration Patterns]
+xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns]
inside JBI such as
xref:contentBasedRouter-eip.adoc[Content Based Router], routing messages
between your existing JBI endpoints.
-You can also reuse any of the Camel xref:../component.adoc[Components]
+You can also reuse any of the Camel xref:component.adoc[Components]
within JBI or expose Camel endpoints as JBI endpoints.
[[IfIuseServiceMixwhenshouldIuseCamel-SeeAlso]]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/is-camel-ioc-friendly.adoc
b/docs/user-manual/modules/ROOT/pages/faq/is-camel-ioc-friendly.adoc
index 73c84b5..cabe72c 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/is-camel-ioc-friendly.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/is-camel-ioc-friendly.adoc
@@ -8,7 +8,7 @@ Now for the longer answer...
==== Spring
In particular we've gone out of our way to make Camel work great with
-xref:../spring.adoc[Spring] and to reuse all of Spring 2.x's power. For
+xref:spring.adoc[Spring] and to reuse all of Spring 2.x's power. For
example:
* the CamelContext, Components and Endpoints and their dependent beans
@@ -16,12 +16,12 @@ can be configured in Spring using Spring custom XML
namespaces or
traditional bean/property elements
* we implement a spring BeanPostProcessor to allow POJOs to be injected
with Camel resources along with powerful
-xref:../bean-integration.adoc[Bean Integration] which allows any
+xref:bean-integration.adoc[Bean Integration] which allows any
spring-injected POJO to be used inside Camel along with full support
for Spring Remoting.
What we've tried to do is implement the
-xref:../inversion-of-control-with-smart-defaults.adoc[Inversion Of Control
With Smart Defaults]
+xref:inversion-of-control-with-smart-defaults.adoc[Inversion Of Control With
Smart Defaults]
pattern; namely that you can configure Camel in a
single XML element (or very small amont of XML) to get going, then you
can overload default configurations to add more explicit configuration
@@ -34,18 +34,18 @@ Spring is clearly the leading IoC container; though there
are some
others such as Guice, OSGi, Pico, HiveMind & Plexus so we have made the
IoC pluggable in Camel.
For example camel-core has no dependencies on anything other than
-commons-logging; camel-spring contains all the xref:../spring.adoc[Spring]
+commons-logging; camel-spring contains all the xref:spring.adoc[Spring]
integration, etc.
We hope to have closer integration to other IoC containers, particularly
with Guice. The current mechanism for hooking into other IoC containers
are:
-* xref:../injector.adoc[Injector] is used to perform dependency injection
+* xref:injector.adoc[Injector] is used to perform dependency injection
on a type when sing the
-xref:../inversion-of-control-with-smart-defaults.adoc[Inversion Of Control
+xref:inversion-of-control-with-smart-defaults.adoc[Inversion Of Control
With Smart Defaults] pattern
-* xref:../registry.adoc[Registry] this strategy is used to abstract away
+* xref:registry.adoc[Registry] this strategy is used to abstract away
the ApplicationContext such as to use JNDI or OSGi to lookup services on
demand
diff --git a/docs/user-manual/modules/ROOT/pages/faq/is-there-an-ide.adoc
b/docs/user-manual/modules/ROOT/pages/faq/is-there-an-ide.adoc
index 2f9c8cc..beadca3 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/is-there-an-ide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/is-there-an-ide.adoc
@@ -4,11 +4,11 @@
Apache Camel offers no IDE out of the box.
You could use your Java IDE for smart completion when creating
-xref:../routes.adoc[Java routing rules] via the xref:../dsl.adoc[DSL] which
+xref:routes.adoc[Java routing rules] via the xref:dsl.adoc[DSL] which
will give you smart completion in Java code.
Or you can use your XML IDE (with XSD smart completion) to edit the
-xref:../spring.adoc[routing rules in XML] using the
-xref:../xml-configuration.adoc[XML Configuration]
+xref:spring.adoc[routing rules in XML] using the
+xref:xml-configuration.adoc[XML Configuration]
-Some of the xref:../commercial-camel-offerings.adoc[Commercial Companies]
+Some of the xref:commercial-camel-offerings.adoc[Commercial Companies]
offers IDE's and other tooling for Camel.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/running-camel-standalone.adoc
b/docs/user-manual/modules/ROOT/pages/faq/running-camel-standalone.adoc
index 500c6ed..5bd507a 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/running-camel-standalone.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/running-camel-standalone.adoc
@@ -2,28 +2,28 @@
=== Is it possible to start Camel as a standalone application, without
embedding it in another application?
Yes, Camel can run standalone or in any container. Running Standalone is
-as simple just to create a xref:../camelcontext.adoc[CamelContext], add
+as simple just to create a xref:camelcontext.adoc[CamelContext], add
routes and start it. If you don't want to write your own Java main, you
-could use the one from xref:../spring.adoc[camel-spring]
+could use the one from xref:spring.adoc[camel-spring]
(http://camel.apache.org/maven/current/camel-spring/apidocs/) also used
-by the xref:../camel-maven-plugin.adoc[Camel Maven Plugin].
+by the xref:camel-maven-plugin.adoc[Camel Maven Plugin].
The starting guide is a good place to start: +
-xref:../getting-started.adoc[Getting Started]
+xref:getting-started.adoc[Getting Started]
And the concrete walk through a plain old java main example: +
xref:walk-through-an-example.adoc[Walk through an Example]
The FAQ have some more details: +
-xref:../faq.adoc[FAQ]
+xref:faq.adoc[FAQ]
And if you use Maven for your projects Camel has maven tools to boot up
in standalone mode and quickly run you Camel application: +
-xref:../camel-maven-plugin.adoc[Camel Maven Plugin]
+xref:camel-maven-plugin.adoc[Camel Maven Plugin]
-And check this xref:../cookbook.adoc[Cookbook] example: +
+And check this xref:cookbook.adoc[Cookbook] example: +
xref:running-camel-standalone-and-have-it-keep-running.adoc[Running
Camel standalone and have it keep running]
-This is how you can run the xref:../examples.adoc[Examples] that is
+This is how you can run the xref:examples.adoc[Examples] that is
included in the Camel distribution.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/should-i-deploy-camel-inside-the-activemq-broker-or-in-another-application.adoc
b/docs/user-manual/modules/ROOT/pages/faq/should-i-deploy-camel-inside-the-activemq-broker-or-in-another-application.adoc
index 94184b9..f4aac0c 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/should-i-deploy-camel-inside-the-activemq-broker-or-in-another-application.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/should-i-deploy-camel-inside-the-activemq-broker-or-in-another-application.adoc
@@ -2,7 +2,7 @@
=== Should I deploy Camel inside the ActiveMQ broker or in another application
Whether you deploy the
-xref:../enterprise-integration-patterns.adoc[Enterprise Integration Patterns]
+xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns]
inside the ActiveMQ Broker or in a separate application
depends on your requirements.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
b/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
index 5857e39..29b7549 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
@@ -7,4 +7,4 @@ tests using different DSL such as Spring XML, Blueprint XML,
Scala DSL,
etc.
End users who need a test kit should use `camel-test` or `camel-testng`
-JARs instead. See more here xref:../testing.adoc[Testing].
+JARs instead. See more here xref:testing.adoc[Testing].
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc
b/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc
index 4e91daf..a08b72b 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc
@@ -12,7 +12,7 @@ The MEP defines the messaging style used such as one-way
which means you have IN and optionally OUT messages. This closely maps
to other APIs such as WS, WSDL, REST, JBI and the likes.
-The xref:../exchange.adoc[Exchange] API provides two methods to get a
+The xref:exchange.adoc[Exchange] API provides two methods to get a
message, either `getIn` or `getOut`.
Obviously the `getIn` gets the IN message, and the `getOut` gets the OUT
message.
@@ -40,7 +40,7 @@ instead.
[[UsinggetInorgetOutmethodsonExchange-UsinggetInorgetOutmethodsonExchange]]
==== Using getIn or getOut methods on Exchange
-Now suppose you want to use a Camel xref:../processor.adoc[Processor] to
+Now suppose you want to use a Camel xref:processor.adoc[Processor] to
adjust a message. This can be done as follows:
[source,java]
@@ -53,7 +53,7 @@ public void process(Exchange exchange) throws Exception {
----
This seems intuitive and is what you would expect is the _right_
-approach to change a message from a xref:../processor.adoc[Processor].
+approach to change a message from a xref:processor.adoc[Processor].
However there is an big issue -- the `getOut` method will create a new
xref:message-eip.adoc[Message], which means any other information
from the IN message will not be propagated; which means you will lose
@@ -113,19 +113,19 @@ And therefore it's often easier just to adjust the IN
message directly.
====
Changing the IN message directly is possible in Camel as it doesn't
-mind. Camel will detect that the xref:../exchange.adoc[Exchange] has no OUT
+mind. Camel will detect that the xref:exchange.adoc[Exchange] has no OUT
message and therefore use the IN message instead.
[[UsinggetInorgetOutmethodsonExchange-AboutMessageExchangePatternandgetOut]]
==== About Message Exchange Pattern and getOut
-If the xref:../exchange.adoc[Exchange] is using `InOnly` as the MEP, then
-you may think that the xref:../exchange.adoc[Exchange] has no OUT
+If the xref:exchange.adoc[Exchange] is using `InOnly` as the MEP, then
+you may think that the xref:exchange.adoc[Exchange] has no OUT
message. But you can still invoke the `getOut` method on
-xref:../exchange.adoc[Exchange]; Camel will not barf.
+xref:exchange.adoc[Exchange]; Camel will not barf.
So the example code above is possible for any kind of MEP. The MEP is
-_just_ a flag on the xref:../exchange.adoc[Exchange] which the Consumer and
+_just_ a flag on the xref:exchange.adoc[Exchange] which the Consumer and
Producer adhere to.
-You can change the MEP on the xref:../exchange.adoc[Exchange] using the
+You can change the MEP on the xref:exchange.adoc[Exchange] using the
`setPattern` method. And likewise there is DSL to change it as well.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/what-are-the-dependencies.adoc
b/docs/user-manual/modules/ROOT/pages/faq/what-are-the-dependencies.adoc
index be2f673..5a4c1a8 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/what-are-the-dependencies.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/what-are-the-dependencies.adoc
@@ -58,7 +58,7 @@ From *Camel 2.9*: the Spring JARs are no longer required for
using JMX.
[[Whatarethedependencies-OtherComponents]]
==== Other Components
-All the other xref:../component.adoc[Components] have a range of 3rd party
+All the other xref:component.adoc[Components] have a range of 3rd party
.jars they depend on. They are listed in the maven pom files which files
they require.
diff --git a/docs/user-manual/modules/ROOT/pages/faq/what-is-a-router.adoc
b/docs/user-manual/modules/ROOT/pages/faq/what-is-a-router.adoc
index d90c8ed..80dfd98 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/what-is-a-router.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/what-is-a-router.adoc
@@ -5,19 +5,19 @@ We often talk about that Camel is a mediation and routing
framework; so
what exactly is a router and what does it do?
Basically a router just consumes xref:message-eip.adoc[Message] exchanges
-from some xref:../endpoint.adoc[Endpoint], then sends them on to some other
-xref:../endpoint.adoc[Endpoint] using some kind of
-xref:../enterprise-integration-patterns.adoc[Enterprise Integration
+from some xref:endpoint.adoc[Endpoint], then sends them on to some other
+xref:endpoint.adoc[Endpoint] using some kind of
+xref:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns].
For example a router could implement the
xref:contentBasedRouter-eip.adoc[Content Based Router] pattern, to route
from an endpoint to one or more destination endpoints using a
-xref:../predicate.adoc[Predicate] based on the message content.
+xref:predicate.adoc[Predicate] based on the message content.
Typically a route or router consists of one or more consumers; either an
xref:eventDrivenConsumer-eip.adoc[Event Driven Consumer] or a
xref:pollingConsumer-eip.adoc[Polling Consumer] or possibly a
xref:transactionalClient-eip.adoc[Transactional Client]. Then there are one
-or more xref:../processor.adoc[Processor] instances which could send the
+or more xref:processor.adoc[Processor] instances which could send the
message to one or more endpoints.
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 0995983..11f91bd 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
@@ -1,36 +1,36 @@
[[WhatisCamel-WhatisCamel]]
=== What is Camel?
Apache Camel (TM) is a versatile open-source integration framework based on
-known xref:../enterprise-integration-patterns.adoc[Enterprise Integration
+known xref:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns].
Camel empowers you to define routing and mediation rules in a variety of
-domain-specific languages, including a Java-based xref:../dsl.adoc[Fluent
-API], xref:../spring.adoc[Spring] or
-xref:../using-osgi-blueprint-with-camel.adoc[Blueprint]
-xref:../xml-configuration.adoc[XML Configuration] files, and a
-xref:../scala-dsl.adoc[Scala DSL]. This means you get smart completion of
+domain-specific languages, including a Java-based xref:dsl.adoc[Fluent
+API], xref:spring.adoc[Spring] or
+xref:using-osgi-blueprint-with-camel.adoc[Blueprint]
+xref:xml-configuration.adoc[XML Configuration] files, and a
+xref:scala-dsl.adoc[Scala DSL]. This means you get smart completion of
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],
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
+Apache Camel uses xref:uris.adoc[URIs] to work directly with any kind of
+xref:transport.adoc[Transport] or messaging model such as
+xref:components::http4-component.adoc[HTTP], xref:activemq.adoc[ActiveMQ],
xref:jms-component.adoc[JMS],
+JBI, SCA, xref:components::mina2-component.adoc[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]
for easy embedding in any Java application. Apache Camel lets you work
-with the same xref:../exchange.adoc[API] regardless which kind of
-xref:../transport.adoc[Transport] is used -- so learn the API once and you
+with the same xref:exchange.adoc[API] regardless which kind of
+xref:transport.adoc[Transport] is used -- so learn the API once and you
can interact with all the xref:components.adoc[Components] provided
out-of-box.
Apache Camel provides support for xref:bean-binding.adoc[Bean Binding]
and seamless integration with popular frameworks such as
-xref:cdi-component.adoc[CDI], xref:../spring.adoc[Spring],
-xref:../using-osgi-blueprint-with-camel.adoc[Blueprint] and
-xref:../guice.adoc[Guice]. Camel also has extensive support for
-xref:../testing.adoc[unit testing] your routes.
+xref:cdi-component.adoc[CDI], xref:spring.adoc[Spring],
+xref:using-osgi-blueprint-with-camel.adoc[Blueprint] and
+xref:guice.adoc[Guice]. Camel also has extensive support for
+xref:testing.adoc[unit testing] your routes.
The following projects can leverage Apache Camel as a routing and
mediation engine:
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/what-platforms-are-supported.adoc
b/docs/user-manual/modules/ROOT/pages/faq/what-platforms-are-supported.adoc
index b0a3118..09982d6 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/what-platforms-are-supported.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/what-platforms-are-supported.adoc
@@ -5,4 +5,4 @@ Any platform supporting JDK 6.
We regularly test Camel on Linux, Windows and OS X. If you have a
platform that is not listed contact one of the companies that provide
-xref:../support.adoc[commercial support].
+xref:support.adoc[commercial support].
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
b/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
index 15adf98..babd735 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
@@ -55,8 +55,8 @@ from("direct:start")
But the code will still not compile. The reason is we have stretched how
far we can take the good old Java language in terms of
-xref:../dsl.adoc[DSL]. In a more modern language such as
-xref:../scala-dsl.adoc[Scala] or xref:../groovy-dsl.adoc[Groovy] you would be
able
+xref:dsl.adoc[DSL]. In a more modern language such as
+xref:scala-dsl.adoc[Scala] or xref:groovy-dsl.adoc[Groovy] you would be able
to let it be stack based, so the `.end()` will pop the last type of the
stack, and you would return back to the scope of the
xref:contentBasedRouter-eip.adoc[Content Based Router]. However that's not
@@ -78,9 +78,9 @@ from("direct:start")
----
You only need to use `.endChoice()` when using certain
-xref:../enterprise-integration-patterns.adoc[EIP]s which often have additional
+xref:enterprise-integration-patterns.adoc[EIP]s which often have additional
methods to configure or as part of the
-xref:../enterprise-integration-patterns.adoc[EIP] itself. For example the
+xref:enterprise-integration-patterns.adoc[EIP] itself. For example the
xref:split-eip.adoc[Splitter] EIP has a sub-route which denotes the
routing of each splitted message. You would also have to use
`.endChoice()` to indicate the end of the sub-route and to return back
@@ -93,6 +93,6 @@ to the xref:contentBasedRouter-eip.adoc[Content Based
Router]. Note
If there are still problems, then you can split your route into multiple
routes, and link them together using the xref:direct-component.adoc[Direct]
component.
-There can be some combinations of
xref:../enterprise-integration-patterns.adoc[EIP]s
+There can be some combinations of
xref:enterprise-integration-patterns.adoc[EIP]s
that can hit limits in how far we can take the fluent builder DSL with
generics you can do in Java programming language (1.7 and below).
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/why-cant-i-use-sign-in-my-password.adoc
b/docs/user-manual/modules/ROOT/pages/faq/why-cant-i-use-sign-in-my-password.adoc
index e744fd5..b916bb7 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/why-cant-i-use-sign-in-my-password.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/why-cant-i-use-sign-in-my-password.adoc
@@ -3,7 +3,7 @@
How do I configure password options on Camel endpoints without the value being
encoded?
-When you configure Camel endpoints using xref:../uris.adoc[URIs] then the
+When you configure Camel endpoints using xref:uris.adoc[URIs] then the
parameter values gets url encoded by default.
This can be a problem when you want to configure passwords _as is_.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc
b/docs/user-manual/modules/ROOT/pages/faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc
index 5e3fb6e..f01d983 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc
@@ -2,7 +2,7 @@
=== Why does Camel use too many threads with `ProducerTemplate`?
A common reason is creating a new `ProducerTemplate` inside a `Processor` or
-xref:../bean-integration.adoc[bean method invocation].
+xref:bean-integration.adoc[bean method invocation].
You are not meant to create a `ProducerTemplate` for each message
invocation; you are meant to create a single instance on startup and
@@ -12,11 +12,11 @@ Also when you have finished using the `ProducerTemplate`
you should call
the `stop()` method to close down all the resources it has been using.
It's better to either explicitly create one on startup or get your IoC
-container (xref:../spring.adoc[Spring] or xref:../guice.adoc[Guice]) to inject
+container (xref:spring.adoc[Spring] or xref:guice.adoc[Guice]) to inject
it into your `Processor` or bean then it can take care of creating it and
destroying all the resources when you have finished with it.
-For instance using xref:../spring.adoc[Spring] you can define a template
+For instance using xref:spring.adoc[Spring] you can define a template
and have Spring handle the lifecycle of it:
[source,java]
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
b/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
index 4f8380c..83393b5 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/why-does-my-file-consumer-not-pick-up-the-file-and-how-do-i-let-the-file-consumer-use-the-camel-error-handler.adoc
@@ -4,7 +4,7 @@
There could be several reasons why the xref:file-component.adoc[File] consumer
is
not picking up files. For example it may not run at all, or it cannot
acquire a read lock on the file.
-xref:../faq.adoc#logging-questions[Check the logs] for any exceptions or other
+xref:faq.adoc#logging-questions[Check the logs] for any exceptions or other
informative messages. You can
xref:how-do-i-enable-debug-logging.adoc[turn on DEBUG logging] at
`org.apache.camel.component.file` to see more detail.
@@ -14,16 +14,16 @@ xref:how-do-i-enable-debug-logging.adoc[turn on DEBUG
logging] at
Well, this is really a
http://en.wikipedia.org/wiki/Chicken_or_the_egg["chicken or the egg"]
-question. The Camel xref:../error-handling-in-camel.adoc[error handler]
+question. The Camel xref:error-handling-in-camel.adoc[error handler]
(e.g., in the routes) only applies when a message is being routed by the
routing engine.
Before this happens, a consumer must successfully receive a message,
-create a Camel xref:../exchange.adoc[Exchange], populate the
-xref:../exchange.adoc[Exchange] with message details (e.g., body and
-headers), and then pass the xref:../exchange.adoc[Exchange] to the routing
+create a Camel xref:exchange.adoc[Exchange], populate the
+xref:exchange.adoc[Exchange] with message details (e.g., body and
+headers), and then pass the xref:exchange.adoc[Exchange] to the routing
engine. Only at this point can the routing error handler deal with
exceptions occurring. Before this point, any error handling is really
-xref:../component.adoc[component]-specific.
+xref:component.adoc[component]-specific.
[NOTE]
====
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/why-does-useoriginalmessage-with-error-handler-not-work-as-expected.adoc
b/docs/user-manual/modules/ROOT/pages/faq/why-does-useoriginalmessage-with-error-handler-not-work-as-expected.adoc
index 252beba..a1d1204 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/why-does-useoriginalmessage-with-error-handler-not-work-as-expected.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/why-does-useoriginalmessage-with-error-handler-not-work-as-expected.adoc
@@ -1,15 +1,15 @@
[[WhydoesuseOriginalMessagewitherrorhandlernotworkasexpected-WhydoesuseOriginalMessagewitherrorhandlernotworkasexpected]]
=== Why does useOriginalMessage with error handler not work as expected?
-If you use the xref:../exception-clause.adoc[useOriginalMessage] option
-from the Camel xref:../exception-clause.adoc[Error Handler] then it matters
-if you use this with xref:../enterprise-integration-patterns.adoc[EIP]s such
as:
+If you use the xref:exception-clause.adoc[useOriginalMessage] option
+from the Camel xref:exception-clause.adoc[Error Handler] then it matters
+if you use this with xref:enterprise-integration-patterns.adoc[EIP]s such as:
* xref:recipientList-eip.adoc[Recipient List]
* xref:split-eip.adoc[Splitter]
* xref:multicast-eip.adoc[Multicast]
-Then the option `shareUnitOfWork` on these
xref:../enterprise-integration-patterns.adoc[EIP]s
+Then the option `shareUnitOfWork` on these
xref:enterprise-integration-patterns.adoc[EIP]s
influence the message in use by the `useOriginalMessage` option.
See more details at xref:split-eip.adoc[Splitter] and further below with
diff --git a/docs/user-manual/modules/ROOT/pages/faq/why-the-name-camel.adoc
b/docs/user-manual/modules/ROOT/pages/faq/why-the-name-camel.adoc
index 6abac39..0326dee 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/why-the-name-camel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/why-the-name-camel.adoc
@@ -2,12 +2,12 @@
=== Why did you choose the name Camel?
* it stands for Concise Application Message Exchange Language (i.e. the
-Java xref:../dsl.adoc[DSL] for routing)
+Java xref:dsl.adoc[DSL] for routing)
* a Camel can carry http://www.fao.org/sd/EGdirect/EGan0006.htm[4 times
the load] of other beasts of burden
* a Camel can travel for great distances without water; similarly a
Camel does not require bucket loads of XML as you can use a pure Java
-xref:../dsl.adoc[DSL]
+xref:dsl.adoc[DSL]
* some members of the team used to love Camel cigarettes!
* it's short, simple and easy to remember name
* very fast, even when the going gets tough!
