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 2017/07/09 18:05:34 UTC
camel git commit: CAMEL-11526 Several files in user manual issue ...
Repository: camel
Updated Branches:
refs/heads/master 838c1ac4a -> 220be66af
CAMEL-11526 Several files in user manual issue ...
...warnings when processing with asciidoctor
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/220be66a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/220be66a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/220be66a
Branch: refs/heads/master
Commit: 220be66af7be9f13199c5c91daafb2fcede08071
Parents: 838c1ac
Author: Zoran Regvart <zr...@apache.org>
Authored: Sun Jul 9 19:58:11 2017 +0200
Committer: Zoran Regvart <zr...@apache.org>
Committed: Sun Jul 9 20:05:07 2017 +0200
----------------------------------------------------------------------
docs/user-manual/en/camel-core.adoc | 5 +----
docs/user-manual/en/dozer-type-conversion.adoc | 8 +++----
docs/user-manual/en/error-handler.adoc | 11 +++++-----
docs/user-manual/en/scala-dsl-eip.adoc | 22 +++++++++++++-------
.../en/scala-dsl-getting-started.adoc | 9 +++++---
.../en/scala-dsl-supported-languages.adoc | 7 +++++--
6 files changed, 35 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/220be66a/docs/user-manual/en/camel-core.adoc
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/camel-core.adoc b/docs/user-manual/en/camel-core.adoc
index dcca0c2..12ecdda 100644
--- a/docs/user-manual/en/camel-core.adoc
+++ b/docs/user-manual/en/camel-core.adoc
@@ -1,9 +1,6 @@
-[Tip]
+[TIP]
====
-
-
This page is work in progress. The layering is probably not yet correct
-
====
Camel-core is the basic module of apache camel. It contains the public
http://git-wip-us.apache.org/repos/asf/camel/blob/220be66a/docs/user-manual/en/dozer-type-conversion.adoc
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/dozer-type-conversion.adoc b/docs/user-manual/en/dozer-type-conversion.adoc
index 186cba8..5ef1044 100644
--- a/docs/user-manual/en/dozer-type-conversion.adoc
+++ b/docs/user-manual/en/dozer-type-conversion.adoc
@@ -142,7 +142,7 @@ be searched for suitable instances. The loader will query the Dozer
Mapper for the the types it converts and a register them with Camel's
type conversion framework to be handled by the mapper.
-[Info]
+[NOTE]
====
*Limitation*
@@ -164,7 +164,7 @@ Or in Spring
----------------------------------------------------------------------------------------------------
<!-- the registry will be scanned and 'mapper' below will be found and installed -->
<bean id="dozerConverterLoader" class="org.apache.camel.converter.dozer.DozerTypeConverterLoader" />
-
+
<bean id="mapper" class="org.dozer.DozerBeanMapper">
<property name="mappingFiles">
<list>
@@ -176,7 +176,7 @@ Or in Spring
[[DozerTypeConversion-ConfiguringinOSGiblueprint]]
Configuring in OSGi blueprint
-+++++++++++++++++++++++++++++
+-----------------------------
*Available as of Camel 2.12*
@@ -191,7 +191,7 @@ of `org.dozer.DozerBeanMapper`, as shown below:
<argument index="0" ref="myCamel"/>
<argument index="1" ref="mapper"/>
</bean>
-
+
<bean id="mapper" class="org.apache.camel.converter.dozer.DozerBeanMapperConfiguration">
<property name="mappingFiles">
<list>
http://git-wip-us.apache.org/repos/asf/camel/blob/220be66a/docs/user-manual/en/error-handler.adoc
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/error-handler.adoc b/docs/user-manual/en/error-handler.adoc
index b9e4281..70ee960 100644
--- a/docs/user-manual/en/error-handler.adoc
+++ b/docs/user-manual/en/error-handler.adoc
@@ -31,7 +31,7 @@ The current implementations Camel provides out of the box are:
[[ErrorHandler-Nontransacted]]
Non transacted
-++++++++++++++
+~~~~~~~~~~~~~~
* link:defaulterrorhandler.html[DefaultErrorHandler] is the default
error handler in Camel. This error handler does not support a dead
@@ -45,7 +45,7 @@ sending it to a dead letter endpoint
[[ErrorHandler-Transacted]]
Transacted
-++++++++++
+~~~~~~~~~~
* link:transactionerrorhandler.html[TransactionErrorHandler] is the
default error handler in Camel for transacted routes. See the
@@ -211,7 +211,7 @@ link:error-handler.html[Error Handler](s):
[width="100%",cols="20%,80%",options="header",]
|=======================================================================
-Feature |Supported by the following link:error-handler.html[Error Handler]
+|Feature |Supported by the following link:error-handler.html[Error Handler]
|all scopes |link:defaulterrorhandler.html[DefaultErrorHandler],
link:transactionerrorhandler.html[TransactionErrorHandler],
@@ -289,7 +289,7 @@ RouteBuilder builder = new RouteBuilder() {
public void configure() {
// use logging error handler
errorHandler(loggingErrorHandler("com.mycompany.foo"));
-
+
// here is our regular route
from("seda:a").to("seda:b");
}
@@ -310,7 +310,7 @@ RouteBuilder builder = new RouteBuilder() {
.errorHandler(loggingErrorHandler("com.mycompany.foo"))
// and we continue with the routing here
.to("seda:b");
-
+
// this route will use the default error handler (DeadLetterChannel)
from("seda:b").to("seda:c");
}
@@ -387,4 +387,3 @@ behavior
thrown exceptions
* link:try-catch-finally.html[Try Catch Finally] for try ... catch ...
finally as DSL you can use in the routing
-
http://git-wip-us.apache.org/repos/asf/camel/blob/220be66a/docs/user-manual/en/scala-dsl-eip.adoc
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/scala-dsl-eip.adoc b/docs/user-manual/en/scala-dsl-eip.adoc
index 9c44469..2f28636 100644
--- a/docs/user-manual/en/scala-dsl-eip.adoc
+++ b/docs/user-manual/en/scala-dsl-eip.adoc
@@ -1,3 +1,8 @@
+Scala DSL - EIP
+===============
+
+[TIP]
+====
*DSL supported*
The link:scala-dsl.html[Scala DSL] supports *every* DSL from the
@@ -7,6 +12,7 @@ On this page we have examples for a number of the link:eip.html[EIP]s. +
You can check the
https://svn.apache.org/repos/asf/camel/trunk/components/camel-scala/src/test/scala/[unit
test source code] for the Scala Component to find more examples.
+====
* 1 link:#ScalaDSL-EIP-Messagingsystems[Messaging systems]
** 1.1 link:#ScalaDSL-EIP-Pipelinepipeline[Pipeline]
@@ -28,11 +34,11 @@ test source code] for the Scala Component to find more examples.
[[ScalaDSL-EIP-Messagingsystems]]
Messaging systems
-^^^^^^^^^^^^^^^^^
+-----------------
[[ScalaDSL-EIP-Pipelinepipeline]]
Pipeline
-++++++++
+~~~~~~~~
There is a simple syntax available for specifying pipeline, by simple
putting `to` or `→` between the different steps in the pipeline.
@@ -52,7 +58,7 @@ where every step in the pipeline starts with either `to` or `→`.
--> ("mock:e")
--> ("mock:f")
}
-
+
"direct:g" ==> {
to ("mock:g")
to ("mock:h")
@@ -61,7 +67,7 @@ where every step in the pipeline starts with either `to` or `→`.
[[ScalaDSL-EIP-Filterfilter]]
Filter
-++++++
+~~~~~~
For a message filter, use the `when()` method with a parameter of type
The `Exchange ⇒ Boolean`. In the example below, we use a Scala
@@ -157,7 +163,7 @@ language of the message body.
when (_.in == "<hallo/>") {
to ("mock:dutch")
to ("mock:german")
- }
+ }
otherwise to ("mock:french")
}
}
@@ -391,8 +397,8 @@ val myProcessor = (exchange: Exchange) => {
case "hallo" => exchange.in = "hallo vanuit Belgie"
case "bonjour" => exchange.in = "bonjour de la douce France"
}
-}
-
+}
+
"direct:b" process(myProcessor) to ("mock:b")
----------------------------------------------------------------------------------------------------------------
@@ -403,5 +409,5 @@ pipeline
[source,java]
----------------------------------------------------------------------------------------------------------------
-"direct:c" to ("velocity:org/apache/camel/scala/dsl/enricher.vm") to ("mock:c")
+"direct:c" to ("velocity:org/apache/camel/scala/dsl/enricher.vm") to ("mock:c")
----------------------------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/220be66a/docs/user-manual/en/scala-dsl-getting-started.adoc
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/scala-dsl-getting-started.adoc b/docs/user-manual/en/scala-dsl-getting-started.adoc
index 8db7b26..0427f75 100644
--- a/docs/user-manual/en/scala-dsl-getting-started.adoc
+++ b/docs/user-manual/en/scala-dsl-getting-started.adoc
@@ -1,3 +1,6 @@
+Scala DSL - Getting Started
+===========================
+
Just like the link:dsl.html[Java DSL], the Scala DSL has a RouteBuilder
class (`org.apache.camel.scala.dsl.builder.RouteBuilder`) that you can
extend to implement your own routes. This example shows two very simple
@@ -7,7 +10,7 @@ routes:
----------------------------------------------------------
class MyRouteBuilder extends RouteBuilder {
"direct:a" --> "mock:a"
- "direct:b" to "mock:b"
+ "direct:b" to "mock:b"
}
----------------------------------------------------------
@@ -25,7 +28,7 @@ If you compare this to the Java link:dsl.html[DSL], you notice:
[[ScalaDSL-GettingStarted-SettingtherouteID]]
Setting the route ID
-^^^^^^^^^^^^^^^^^^^^
+--------------------
To assign the unique ID to the Scala route, insert the `routeId` method
invocation after the "from" part of the DSL.
@@ -37,7 +40,7 @@ invocation after the "from" part of the DSL.
[[ScalaDSL-GettingStarted-CreatinganewCamelScalaproject]]
Creating a new Camel Scala project
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+----------------------------------
Camel offers link:camel-maven-archetypes.html[Maven archetypes] that
allow you to quickly setup a new project.
http://git-wip-us.apache.org/repos/asf/camel/blob/220be66a/docs/user-manual/en/scala-dsl-supported-languages.adoc
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/scala-dsl-supported-languages.adoc b/docs/user-manual/en/scala-dsl-supported-languages.adoc
index 5d74b17..76d402a 100644
--- a/docs/user-manual/en/scala-dsl-supported-languages.adoc
+++ b/docs/user-manual/en/scala-dsl-supported-languages.adoc
@@ -1,3 +1,6 @@
+Scala DSL - Supported languages
+===============================
+
Support for link:languages.html[other languages] inside the Scala DSL
routes is delivered through traits. The
`org.apache.camel.scala.dsl.languages` package currently offers traits
@@ -9,7 +12,7 @@ the link:scala-dsl.html[Scala DSL]; see below for a couple of examples:
[[ScalaDSL-Supportedlanguages-Using]]
Using link:xpath.html[XPath]
-++++++++++++++++++++++++++++
+----------------------------
With the XPath trait, you have an additional method available on an
`Exchange` to do XPath queries against the message. Just look at this
@@ -29,7 +32,7 @@ Splitter example, where the `xpath` method is used in a
[[ScalaDSL-Supportedlanguages-Using.1]]
Using link:jxpath.html[JXPath]
-++++++++++++++++++++++++++++++
+------------------------------
With the `org.apache.camel.scala.dsl.languages.JXPath` trait, you can an
additional `jxpath` method on the `Exchange`. In the Recipient List