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 ba72d513e330b438b23f4890dfafbd05065f2450
Author: nayananga@acerubuntu18.04 <nayanangamuhandi...@gmail.com>
AuthorDate: Sun Jul 21 16:36:01 2019 +0530
Fixes for CAMEL-13588
---
.../user-manual/modules/ROOT/pages/enrich-eip.adoc | 3 +-
.../modules/ROOT/pages/exception-clause.adoc | 2 +-
...tion-orgapachecamelnosuchendpointexception.adoc | 2 +-
...ximum-endpoint-cache-size-for-camelcontext.adoc | 2 +-
...spring-property-placeholder-with-camel-xml.adoc | 2 +-
.../modules/ROOT/pages/http-session-handling.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/languages.adoc | 4 +-
docs/user-manual/modules/ROOT/pages/predicate.adoc | 2 +-
.../modules/ROOT/pages/release-guide.adoc | 94 +++++++++++-----------
.../modules/ROOT/pages/route-policy.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/spring.adoc | 10 +--
docs/user-manual/modules/ROOT/pages/step-eip.adoc | 2 +-
.../modules/ROOT/pages/transactional-client.adoc | 4 +-
.../modules/ROOT/pages/try-catch-finally.adoc | 2 +-
.../ROOT/pages/using-propertyplaceholder.adoc | 4 +-
15 files changed, 68 insertions(+), 69 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc
b/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc
index 2098fff..f5ab883 100644
--- a/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/enrich-eip.adoc
@@ -89,9 +89,8 @@ The other one is `pollEnrich`
`enrich` uses a Producer to obtain the additional data. It is usually used for
Request Reply messaging, for instance to invoke an external web service.
Both `enrich` and `pollEnrich` supports dynamic endpoints that uses an
Expression to compute the uri, which allows to use data from the current
Exchange.
-====
-A little enrich example using Java:
+==== A little enrich example using Java:
[source,java]
----
diff --git a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc
b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc
index 860b15a..9f5e0a1 100644
--- a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc
+++ b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc
@@ -332,7 +332,7 @@ using a producer template from Exchange.
*Available as of Camel 1.5*
-===== Continued
+==== Continued
See also the section
xref:ExceptionClause-HandleandContinueExceptions.adoc[Handle and continue
exceptions] below.
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/exception-orgapachecamelnosuchendpointexception.adoc
b/docs/user-manual/modules/ROOT/pages/faq/exception-orgapachecamelnosuchendpointexception.adoc
index 9e66f53..8f3426e 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/exception-orgapachecamelnosuchendpointexception.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/exception-orgapachecamelnosuchendpointexception.adoc
@@ -6,7 +6,7 @@ classpath. The exception detail message will tell you what the
missing
component is. You can solve the issue by adding the required JAR files
to the classpath.
-===== Example:
+==== Example:
If you try to use the definition below without having `camel-jetty.jar` on
the classpath, you'll run into this exception:
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 4f6fabd..f195c17 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,4 +1,4 @@
-[[HowdoIconfigurethemaximumendpointcachesizeforCamelContext-HowdoIconfigurethemaximumendpointcachesizeforCamelContext?]
+[[HowdoIconfigurethemaximumendpointcachesizeforCamelContext-HowdoIconfigurethemaximumendpointcachesizeforCamelContext]]
=== How do I configure the maximum endpoint cache size for CamelContext?
xref:camelcontext.adoc[CamelContext] will by default cache the last 1000
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 46d3ea4..70cc165 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
@@ -62,7 +62,7 @@ Camel does not yet fully support property placeholders as
there is a
limitation in Spring. See JIRA
http://jira.springframework.org/browse/SPR-4466[SPR-4466]
-===== Bridge Spring and Camel property placeholders
+==== 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
diff --git a/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc
b/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc
index bfae9d5..e838bda 100644
--- a/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc
+++ b/docs/user-manual/modules/ROOT/pages/http-session-handling.adoc
@@ -1,4 +1,4 @@
-[[HTTP-SessionHandling-SessionScope]]
+[[HTTP-SessionHandling]]
=== HTTP Session Handling
*Available as of Camel 2.19*
diff --git a/docs/user-manual/modules/ROOT/pages/languages.adoc
b/docs/user-manual/modules/ROOT/pages/languages.adoc
index a668016..dc2efcf 100644
--- a/docs/user-manual/modules/ROOT/pages/languages.adoc
+++ b/docs/user-manual/modules/ROOT/pages/languages.adoc
@@ -15,9 +15,9 @@ When creating predicates (expressions that evaluate to `true`
or
`false`), you can combine several predicates -- regardless of the
language they are built with -- by using the `PredicateBuilder` class.
For more information, see xref:predicate.adoc[Compound Predicates].
-====
-The following is the list of currently supported languages:
+
+==== The following is the list of currently supported languages:
* xref:bean-language.adoc[Bean Language] for using Java for expressions
* xref:constant-language.adoc[Constant]
diff --git a/docs/user-manual/modules/ROOT/pages/predicate.adoc
b/docs/user-manual/modules/ROOT/pages/predicate.adoc
index 99475a4..8d95d65 100644
--- a/docs/user-manual/modules/ROOT/pages/predicate.adoc
+++ b/docs/user-manual/modules/ROOT/pages/predicate.adoc
@@ -105,7 +105,7 @@ based on logical operators and comparison operators:
Additionally, with `PredicateBuilder` you can create Regular Expressions
and use them as predicates, applying them to the result of an
-expression, e.g. `PredicateBuilder.regex(header("foo"), "\d{4}")`
+expression, e.g. `PredicateBuilder.regex(header("foo"), "\d\{4\}")`
applies the regular expression to the header = foo.
Combining different Expression Languages is also possible, e.g.:
diff --git a/docs/user-manual/modules/ROOT/pages/release-guide.adoc
b/docs/user-manual/modules/ROOT/pages/release-guide.adoc
index 0542c44..1554262 100644
--- a/docs/user-manual/modules/ROOT/pages/release-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/release-guide.adoc
@@ -80,73 +80,73 @@
http://maven.apache.org/guides/mini/guide-encryption.html[password encryption re
Complete the following steps to create a new Camel release:
-1. Grab the latest source from Git and checkout the target branch
(`BRANCH_NAME`) to build from:
+. Grab the latest source from Git and checkout the target branch
(`BRANCH_NAME`) to build from:
-----
-$ git clone https://git-wip-us.apache.org/repos/asf/camel.git
-$ cd camel
-$ git checkout BRANCH_NAME
-----
+
+ $ git clone https://git-wip-us.apache.org/repos/asf/camel.git
+ $ cd camel
+ $ git checkout BRANCH_NAME
+
-2. Perform a license check with
http://creadur.apache.org/rat/apache-rat-plugin[Apache Rat]:
+. Perform a license check with
http://creadur.apache.org/rat/apache-rat-plugin[Apache Rat]:
-----
-./mvnw -e org.apache.rat:apache-rat-plugin:check
-grep -e ' !?????' target/rat.txt
-----
+
+ ./mvnw -e org.apache.rat:apache-rat-plugin:check
+ grep -e ' !?????' target/rat.txt
+
-The latter command will provide a list of all files without valid license
headers.
-Ideally this list is empty, otherwise fix the issues by adding valid license
headers and rerun the above commands before
-proceeding with the next step.
+* The latter command will provide a list of all files without valid license
headers.
+ Ideally this list is empty, otherwise fix the issues by adding valid license
headers and rerun the above commands before
+ proceeding with the next step.
-3. Do a release dry run to check for problems:
+. Do a release dry run to check for problems:
-----
-./mvnw release:prepare -DdryRun -Prelease
-----
+
+ ./mvnw release:prepare -DdryRun -Prelease
+
-The release plugin will prompt for a release version, an SCM tag and next
release version.
+ * The release plugin will prompt for a release version, an SCM tag and next
release version.
-Use a three digit release version of the form: `MAJOR.MINOR.PATCH`, e.g.
`3.0.0`.
+* Use a three digit release version of the form: `MAJOR.MINOR.PATCH`, e.g.
`3.0.0`.
-For the tag use a string of the form: `camel-MAJOR.MINOR.PATCH`, e.g.
`camel-3.0.0`.
+* For the tag use a string of the form: `camel-MAJOR.MINOR.PATCH`, e.g.
`camel-3.0.0`.
-For the next version increase the patch version and append `-SNAPSHOT`, e.g.
`3.0.1-SNAPSHOT`.
+* For the next version increase the patch version and append `-SNAPSHOT`,
e.g. `3.0.1-SNAPSHOT`.
-Make sure to check the generated signature files:
+* Make sure to check the generated signature files:
-----
-$ gpg camel-core/target/camel-core-3.0.0-SNAPSHOT.jar.asc
-gpg: assuming signed data in `camel-core/target/camel-core-3.0.0.jar'
-gpg: Signature made Sat 06 Apr 2019 03:58:01 AM PDT using RSA key ID 5942C049
-gpg: Good signature from "Gregor Zurowski <gzurow...@apache.org>"
-----
+
+ $ gpg camel-core/target/camel-core-3.0.0-SNAPSHOT.jar.asc
+ gpg: assuming signed data in `camel-core/target/camel-core-3.0.0.jar'
+ gpg: Signature made Sat 06 Apr 2019 03:58:01 AM PDT using RSA key ID 5942C049
+ gpg: Good signature from "Gregor Zurowski <gzurow...@apache.org>"
+
-4. Prepare the release:
+. Prepare the release:
-First clean up the dry run results:
+* First clean up the dry run results:
-----
-$ ./mvnw release:clean -Prelease
-----
-Next prepare the release:
+ $ ./mvnw release:clean -Prelease
-----
-$ ./mvnw release:prepare -Prelease
-----
-This command will create the tag and update all pom files with the given
version number.
+* Next prepare the release:
-5. Perform the release and publish to the Apache staging repository:
-----
-$ ./mvnw release:perform -Prelease
-----
+ $ ./mvnw release:prepare -Prelease
+
+
+* This command will create the tag and update all pom files with the given
version number.
+
+. Perform the release and publish to the Apache staging repository:
+
+
+ $ ./mvnw release:perform -Prelease
+
-6. Close the Apache staging repository:
+. Close the Apache staging repository:
-Login to https://repository.apache.org using your Apache LDAP credentials.
+* Login to https://repository.apache.org using your Apache LDAP credentials.
Click on "Staging Repositories". Then select "org.apache.camel-xxx" in the
list of repositories, where xxx represents
your username and ip.
Click "Close" on the tool bar above.
@@ -155,9 +155,9 @@ If you are staging multiple releases together, skip this
step until you have sta
Enter the name and version of the artifact being released in the "Description"
field and then click "Close".
This will make it easier to identify it later.
-7. Verify staged artifacts:
+. Verify staged artifacts:
-If you click on your repository, a tree view will appear below.
+* If you click on your repository, a tree view will appear below.
You can then browse the contents to ensure the artifacts are as you expect
them.
Pay particular attention to the existence of *.asc (signature) files.
If the you don't like the content of the repository, right click your
repository and choose "Drop".
diff --git a/docs/user-manual/modules/ROOT/pages/route-policy.adoc
b/docs/user-manual/modules/ROOT/pages/route-policy.adoc
index 4253ce3..32485eb 100644
--- a/docs/user-manual/modules/ROOT/pages/route-policy.adoc
+++ b/docs/user-manual/modules/ROOT/pages/route-policy.adoc
@@ -88,7 +88,7 @@ again in case it has been suspended.
|`logger` |`ThrottlingInflightRoutePolicy` |The logger category.
|===
-[[RoutePolicy-ThrottlingInflightRoutePolicy]]
+[[RoutePolicy-ThrottlingInflightRoutePolicy-ComparedToTheThrottlerEIP]]
==== ThrottlingInflightRoutePolicy compared to the Throttler EIP
The *`ThrottlingInflightRoutePolicy`* compared to
diff --git a/docs/user-manual/modules/ROOT/pages/spring.adoc
b/docs/user-manual/modules/ROOT/pages/spring.adoc
index e60aadc..0f7a782 100644
--- a/docs/user-manual/modules/ROOT/pages/spring.adoc
+++ b/docs/user-manual/modules/ROOT/pages/spring.adoc
@@ -53,7 +53,7 @@ So the XML file looks like this:
">
--------------------------------------------------------------------------------------------------------------
-===== Using `camel:` Namespace
+==== Using `camel:` Namespace
Or you can refer to the camel XSD in the XML declaration:
....
xmlns:camel="http://camel.apache.org/schema/spring";
@@ -83,7 +83,7 @@ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/came
</camel:camelContext>
--------------------------------------------------------------------------------------------------------------
-===== Advanced Configuration Using Spring
+==== Advanced Configuration Using Spring
See more details at Advanced configuration of CamelContext using Spring
=== Using Java Code
@@ -111,7 +111,7 @@ Will ignore already instantiated classes
The *`<package>`* and *`<packageScan>`* will skip any classes which has
already been created by Spring etc. So if you define a route builder as a
spring bean tag then that class will be skipped. You can include those beans
using *`<routeBuilder ref="theBeanId"/>`* or the *`<contextScan>`* feature.
-===== Using `<packageScan>`
+==== Using `<packageScan>`
In Camel 2.0 this has been extended to allow selective inclusion and exclusion
of discovered route classes using Ant like path matching. In spring this is
specified by adding a *`<packageScan/>`* tag. The tag must contain one or more
*`package`* elements (similar to *`1.x`*), and optionally one or more
*`includes`* or *`excludes`* elements specifying patterns to be applied to the
fully qualified names of the discovered classes. e.g.,
@@ -146,7 +146,7 @@ For example:
*`org.simple.IncludedRoute`*, *`org.simple.Excluded`* but _not_ match
*`org.simple.PrecludedRoute`*.
-===== Using `contextScan`
+==== Using `contextScan`
*Available as of Camel 2.4*
@@ -180,7 +180,7 @@ You can also use the ANT style for inclusion and exclusion,
as mentioned above i
how do i import routes from other xml files
-===== Test Time Exclusion.
+==== Test Time Exclusion.
At test time it is often desirable to be able to selectively exclude matching
routes from being initialized that are not applicable or useful to the test
scenario. For instance you might a spring context file *`routes-context.xml`*
and three Route builders **`RouteA`, **`RouteB` and *`RouteC`* in the
*`org.example.routes`* package. The *`packageScan`* definition would discover
all three of these routes and initialize them.
Say *`RouteC`* is not applicable to our test scenario and generates a lot of
noise during test. It would be nice to be able to exclude this route from this
specific test. The *`SpringTestSupport`* class has been modified to allow this.
It provides two methods (*`excludedRoute`* and *`excludedRoutes`*) that may be
overridden to exclude a single class or an array of classes.
diff --git a/docs/user-manual/modules/ROOT/pages/step-eip.adoc
b/docs/user-manual/modules/ROOT/pages/step-eip.adoc
index a61726f..459c4a0 100644
--- a/docs/user-manual/modules/ROOT/pages/step-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/step-eip.adoc
@@ -24,7 +24,7 @@ This means you can monitor your Camel applications and gather
statistics at 4-ti
*** processor(s) level
-==== JMX Management
+=== JMX Management
Each Step EIP is registered in JMX under the `type=steps` tree, which allows
to monitor
all the steps in the CamelContext. Its also possible to dump statistics in XML
format
diff --git a/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
b/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
index 4bed40f..89df425 100644
--- a/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
+++ b/docs/user-manual/modules/ROOT/pages/transactional-client.adoc
@@ -13,7 +13,7 @@ transaction for both inbound and outbound message exchanges.
Endpoints
that support transactions will participate in the current transaction
context that they are called from.
-===== Configuration of Redelivery
+=== Configuration of Redelivery
The redelivery in transacted mode is *not* handled by Camel but by the
backing system (the transaction manager). In such cases you should
@@ -285,7 +285,7 @@ route as transacted using the *transacted* tag.
<bean id="myProcessor"
class="org.apache.camel.component.jms.tx.JMSTransactionalClientTest$MyProcessor"/>
----
-===== Transaction error handler
+==== Transaction error handler
When a route is marked as transacted using *transacted* Camel will
automatic use the
diff --git a/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc
b/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc
index 4dad4df..98247fe 100644
--- a/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc
+++ b/docs/user-manual/modules/ROOT/pages/try-catch-finally.adoc
@@ -18,7 +18,7 @@ Notice this document is based on how it works in Camel 2.0.
In Camel 1.x
this feature isn't as powerful and it uses a slight different keyword
names.
-===== Camel error handling is disabled
+==== Camel error handling is disabled
When using `doTry .. doCatch .. doFinally` then the regular Camel
xref:error-handler.adoc[Error Handler] does not apply. That means any
diff --git a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
index 97deef0..2a186ca 100644
--- a/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
+++ b/docs/user-manual/modules/ROOT/pages/using-propertyplaceholder.adoc
@@ -15,7 +15,7 @@
xref:faq/how-do-i-use-spring-property-placeholder-with-camel-xml.adoc[How do
I use Spring Property Placeholder with Camel XML].
[[UsingPropertyPlaceholder-BridgingSpringandCamelPropertyPlaceholders]]
-===== Bridging Spring and Camel Property Placeholders
+==== Bridging Spring and Camel Property Placeholders
From *Camel 2.10*: Spring's property placeholder can be bridged with
Camel's. See below for more details.
@@ -874,7 +874,7 @@ destination=mock:result
----
-[[UsingPropertyPlaceholder-BridgingSpringandCamelPropertyPlaceholders]]
+[[UsingPropertyPlaceholder-BridgingSpringandCamelPropertyPlaceholders-1]]
==== Bridging Spring and Camel Property Placeholders
*Available as of Camel 2.10*
