This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push: new 4b179fb fix xrefs new df4e3db Merge pull request #3674 from djencks/camel-2.x-issue-14782-task-14784 4b179fb is described below commit 4b179fb4e5e99c73c97a91a908155afc18438793 Author: David Jencks <djen...@apache.org> AuthorDate: Tue Mar 24 15:35:36 2020 -0700 fix xrefs --- .../src/main/docs/crypto-dataformat.adoc | 2 +- .../src/main/docs/flatpack-dataformat.adoc | 2 +- .../camel-hl7/src/main/docs/hl7-dataformat.adoc | 10 ++++----- .../src/main/docs/jetty-component.adoc | 4 ++-- .../camel-josql/src/main/docs/sql-language.adoc | 8 ++++---- .../camel-mina/src/main/docs/mina-component.adoc | 2 +- .../camel-mina2/src/main/docs/mina2-component.adoc | 2 +- .../src/main/docs/quickfix-component.adoc | 2 +- .../src/main/docs/salesforce-component.adoc | 2 +- .../src/main/docs/syslog-dataformat.adoc | 14 ++++++------- components/fix-eip-xrefs.sh | 24 ++++++++++++++++++++++ docs/components/modules/ROOT/pages/index.adoc | 4 ---- .../modules/ROOT/pages/jetty-component.adoc | 4 ++-- .../modules/ROOT/pages/mina-component.adoc | 2 +- .../modules/ROOT/pages/mina2-component.adoc | 2 +- .../modules/ROOT/pages/quickfix-component.adoc | 2 +- .../modules/ROOT/pages/salesforce-component.adoc | 2 +- .../dataformats/pages/crypto-dataformat.adoc | 2 +- .../dataformats/pages/flatpack-dataformat.adoc | 2 +- .../modules/dataformats/pages/hl7-dataformat.adoc | 10 ++++----- .../dataformats/pages/syslog-dataformat.adoc | 14 ++++++------- .../modules/languages/pages/sql-language.adoc | 8 ++++---- 22 files changed, 72 insertions(+), 52 deletions(-) diff --git a/components/camel-crypto/src/main/docs/crypto-dataformat.adoc b/components/camel-crypto/src/main/docs/crypto-dataformat.adoc index df77a6a..3e3a258 100644 --- a/components/camel-crypto/src/main/docs/crypto-dataformat.adoc +++ b/components/camel-crypto/src/main/docs/crypto-dataformat.adoc @@ -322,7 +322,7 @@ or with spring. == Dependencies -To use the xref:crypto-component.adoc[Crypto] dataformat in your camel routes you +To use the xref:ROOT:crypto-component.adoc[Crypto] dataformat in your camel routes you need to add the following dependency to your pom. [source,xml] diff --git a/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc b/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc index b4619a3..53d6863 100644 --- a/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc +++ b/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc @@ -4,7 +4,7 @@ *Available as of Camel version 2.1* -The xref:flatpack-component.adoc[Flatpack] component ships with the Flatpack data +The xref:ROOT:flatpack-component.adoc[Flatpack] component ships with the Flatpack data format that can be used to format between fixed width or delimited text messages to a `List` of rows as `Map`. diff --git a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc index 5d31f50..77560c8 100644 --- a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc +++ b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc @@ -10,12 +10,12 @@ v2 messages] using the http://hl7api.sourceforge.net[HAPI library]. This component supports the following: -* HL7 MLLP codec for xref:mina2-component.adoc[Mina 2] -* HL7 MLLP codec for xref:netty4-component.adoc[Netty4] from *Camel 2.15* onwards +* HL7 MLLP codec for xref:ROOT:mina2-component.adoc[Mina 2] +* HL7 MLLP codec for xref:ROOT:netty4-component.adoc[Netty4] from *Camel 2.15* onwards * Type Converter from/to HAPI and String * HL7 DataFormat using the HAPI library * Even more ease-of-use as it's integrated well with the -xref:mina2-component.adoc[Mina 2] component. +xref:ROOT:mina2-component.adoc[Mina 2] component. Maven users will need to add the following dependency to their `pom.xml` for this component: @@ -36,8 +36,8 @@ HL7 is often used with the HL7 MLLP protocol, which is a text based TCP socket based protocol. This component ships with a Mina and Netty4 Codec that conforms to the MLLP protocol so you can easily expose an HL7 listener accepting HL7 requests over the TCP transport layer. To expose -a HL7 listener service, the xref:mina2-component.adoc[Mina 2] or -xref:netty4-component.adoc[Netty4] component is used with the +a HL7 listener service, the xref:ROOT:mina2-component.adoc[Mina 2] or +xref:ROOT:netty4-component.adoc[Netty4] component is used with the `HL7MLLPCodec` (mina2) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder` (Netty4). diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc b/components/camel-jetty9/src/main/docs/jetty-component.adoc index 6ff2717..5a7ca3b 100644 --- a/components/camel-jetty9/src/main/docs/jetty-component.adoc +++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc @@ -338,8 +338,8 @@ Jetty component will copy the HTTP request parameter, `one` to the exchange's `in.header`. We can then use the `simple` language to route exchanges that contain this header to a specific endpoint and all others to another. If we used a language more powerful than -xref:latest@components:languages:simple-language.adoc[Simple] (such as xref:el-language.adoc[EL] or -xref:ognl-language.adoc[OGNL]) we could also test for the parameter value and do +xref:languages:simple-language.adoc[Simple] (such as xref:languages:el-language.adoc[EL] or +xref:languages:ognl-language.adoc[OGNL]) we could also test for the parameter value and do routing based on the header value as well. === Session Support diff --git a/components/camel-josql/src/main/docs/sql-language.adoc b/components/camel-josql/src/main/docs/sql-language.adoc index ba55c0f..2da9057 100644 --- a/components/camel-josql/src/main/docs/sql-language.adoc +++ b/components/camel-josql/src/main/docs/sql-language.adoc @@ -7,13 +7,13 @@ The SQL support is added by http://josql.sourceforge.net/[JoSQL] and is primarily used for performing SQL queries on in-memory objects. If you prefer to perform actual database queries then check out the -xref:jpa-component.adoc[JPA] component. +xref:ROOT:jpa-component.adoc[JPA] component. *Looking for the SQL component* -Camel has both a xref:sql-component.adoc[SQL] language and a -xref:sql-component.adoc[SQL Component]. This page is about the SQL -language. Click on xref:sql-component.adoc[SQL Component] if you are +Camel has both a xref:ROOT:sql-component.adoc[SQL] language and a +xref:ROOT:sql-component.adoc[SQL Component]. This page is about the SQL +language. Click on xref:ROOT:sql-component.adoc[SQL Component] if you are looking for the component instead. To use SQL in your camel routes you need to add the a dependency on diff --git a/components/camel-mina/src/main/docs/mina-component.adoc b/components/camel-mina/src/main/docs/mina-component.adoc index 780c874..f03cab3 100644 --- a/components/camel-mina/src/main/docs/mina-component.adoc +++ b/components/camel-mina/src/main/docs/mina-component.adoc @@ -148,7 +148,7 @@ documentation] how to write your own codec. To use your custom codec with `camel-mina`, you should register your codec in the Registry; for example, by creating a bean in the Spring XML file. Then use the `codec` option to specify the bean ID of -your codec. See xref:hl7-dataformat.adoc[HL7] that has a custom codec. +your codec. See xref:dataformats:hl7-dataformat.adoc[HL7] that has a custom codec. == Sample with sync=false diff --git a/components/camel-mina2/src/main/docs/mina2-component.adoc b/components/camel-mina2/src/main/docs/mina2-component.adoc index b83a9b8..f6f9e3d 100644 --- a/components/camel-mina2/src/main/docs/mina2-component.adoc +++ b/components/camel-mina2/src/main/docs/mina2-component.adoc @@ -207,7 +207,7 @@ See the Mina how to write your own codec. To use your custom codec with `camel-mina`, you should register your codec in the Registry; for example, by creating a bean in the Spring XML file. Then use the `codec` option to specify the bean ID of -your codec. See xref:hl7-dataformat.adoc[HL7] that has a custom codec. +your codec. See xref:dataformats:hl7-dataformat.adoc[HL7] that has a custom codec. == Sample with sync=false diff --git a/components/camel-quickfix/src/main/docs/quickfix-component.adoc b/components/camel-quickfix/src/main/docs/quickfix-component.adoc index 20c6408..f6df2d0 100644 --- a/components/camel-quickfix/src/main/docs/quickfix-component.adoc +++ b/components/camel-quickfix/src/main/docs/quickfix-component.adoc @@ -589,7 +589,7 @@ initially as a collection of key value pairs data. You can use this object or you can use the method 'toString' to retrieve the original FIX message. -*Note:* Alternatively, you can use xref:bindy-dataformat.adoc[camel bindy dataformat] to transform the FIX message into your own java POJO +*Note:* Alternatively, you can use xref:dataformats:bindy-dataformat.adoc[camel bindy dataformat] to transform the FIX message into your own java POJO When a message must be send to QuickFix, then you must create a QuickFix.Message instance. diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc index f46918c..a41199a 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc +++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc @@ -333,7 +333,7 @@ For instance, consider that you need to limit the API usage of Salesforce so tha other routes. The body of output message contains an instance of `org.apache.camel.component.salesforce.api.dto.Limits` object that can be used in conjunction with Content Based Router and Content Based Router and -xref:spel-language.adoc[Spring Expression Language (SpEL)] to choose when to perform queries. +xref:languages:spel-language.adoc[Spring Expression Language (SpEL)] to choose when to perform queries. Notice how multiplying `1.0` with the integer value held in `body.dailyApiRequests.remaining` makes the expression evaluate as with floating point arithmetic, without it - it would end up making integral division which would result diff --git a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc index 745f8e6..f9c41bb 100644 --- a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc +++ b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc @@ -14,10 +14,10 @@ This component supports the following: SyslogMessage model objects. * Type Converter from/to SyslogMessage and String -* Integration with the xref:mina2-component.adoc[Mina 2] component. -* Integration with the xref:netty-component.adoc[Netty] component. +* Integration with the xref:ROOT:mina2-component.adoc[Mina 2] component. +* Integration with the xref:ROOT:netty-component.adoc[Netty] component. * *Camel 2.14:* Encoder and decoder for -the xref:netty-component.adoc[Netty] component. +the xref:ROOT:netty-component.adoc[Netty] component. * *Camel 2.14:* Support for RFC5424 also. Maven users will need to add the following dependency to their `pom.xml` @@ -40,7 +40,7 @@ as its underlying transport layer mechanism. The UDP port that has been assigned to syslog is 514. To expose a Syslog listener service we reuse the existing -xref:mina2-component.adoc[Mina 2] component or xref:mina2-component.adoc[Mina 2] +xref:ROOT:mina2-component.adoc[Mina 2] component or xref:ROOT:mina2-component.adoc[Mina 2] where we just use the `Rfc3164SyslogDataFormat` to marshal and unmarshal messages. Notice that from *Camel 2.14* onwards the syslog dataformat is renamed to `SyslogDataFormat`. @@ -92,8 +92,8 @@ ND *Available as of Camel 2.14* To expose a Syslog listener service we reuse the -existing xref:mina2-component.adoc[Mina 2] component -or xref:netty-component.adoc[Netty] where we just use +existing xref:ROOT:mina2-component.adoc[Mina 2] component +or xref:ROOT:netty-component.adoc[Netty] where we just use the `SyslogDataFormat` to marshal and unmarshal messages === Exposing a Syslog listener @@ -122,7 +122,7 @@ as an InputStream: </camelContext> ------------------------------------------------------------------------------------------ -The same route using xref:mina2-component.adoc[Mina 2] +The same route using xref:ROOT:mina2-component.adoc[Mina 2] [source,xml] ------------------------------------------------------------------------- diff --git a/components/fix-eip-xrefs.sh b/components/fix-eip-xrefs.sh new file mode 100755 index 0000000..79c05ab --- /dev/null +++ b/components/fix-eip-xrefs.sh @@ -0,0 +1,24 @@ +#bin/sh + +#version: 2.x component: components file: undefined path modules/ROOT/pages/bam.adoc"` lineno: undefined message: manual::correlation-identifier +sed -i -e 's/xref:manual::correlation-identifier/xref:{eip-vc}:eips:correlation-identifier/g' `find . -name "bam.adoc"` +#version: 2.x component: components file: undefined path modules/ROOT/pages/beanstalk-component.adoc"` lineno: undefined message: latest@manual::polling-consumer +sed -i -e 's/xref:latest@manual::polling-consumer/xref:{eip-vc}:eips:polling-consumer/g' `find . -name "beanstalk-component.adoc"` +#version: 2.x component: components file: undefined path modules/ROOT/pages/facebook-component.adoc"` lineno: undefined message: latest@manual::polling-consumer +sed -i -e 's/xref:latest@manual::polling-consumer/xref:{eip-vc}:eips:polling-consumer/g' `find . -name "facebook-component.adoc"` +#version: 2.x component: components file: undefined path modules/ROOT/pages/jms-component.adoc"` lineno: undefined message: latest@manual::dead-letter-channel +sed -i -e 's/xref:latest@manual::dead-letter-channel/xref:{eip-vc}:eips:dead-letter-channel/g' `find . -name "jms-component.adoc"` +#version: 2.x component: components file: undefined path modules/ROOT/pages/jpa-component.adoc"` lineno: undefined message: latest@manual::enterprise-integration-patterns +sed -i -e 's/xref:latest@manual::enterprise-integration-patterns/xref:{eip-vc}:eips:enterprise-integration-patterns/g' `find . -name "jpa-component.adoc"` +#version: 2.x component: components file: undefined path modules/ROOT/pages/quartz-component.adoc"` lineno: undefined message: latest@manual::polling-consumer +sed -i -e 's/xref:latest@manual::polling-consumer/xref:{eip-vc}:eips:polling-consumer/g' `find . -name "quartz-component.adoc"` +#version: 2.x component: components file: undefined path modules/ROOT/pages/quartz2-component.adoc"` lineno: undefined message: latest@manual::polling-consumer +sed -i -e 's/xref:latest@manual::polling-consumer/xref:{eip-vc}:eips:polling-consumer/g' `find . -name "quartz2-component.adoc"` +#version: 2.x component: components file: undefined path modules/ROOT/pages/spring-event-component.adoc"` lineno: undefined message: latest@manual::enterprise-integration-patterns +sed -i -e 's/xref:latest@manual::enterprise-integration-patterns/xref:{eip-vc}:eips:enterprise-integration-patterns/g' `find . -name "spring-event-component.adoc"` +#version: 2.x component: components file: undefined path modules/ROOT/pages/spring.adoc"` lineno: undefined message: latest@manual::enterprise-integration-patterns +sed -i -e 's/xref:latest@manual::enterprise-integration-patterns/xref:{eip-vc}:eips:enterprise-integration-patterns/g' `find . -name "spring.adoc"` +#version: 2.x component: components file: undefined path modules/ROOT/pages/test-spring.adoc"` lineno: undefined message: latest@manual::enterprise-integration-patterns +sed -i -e 's/xref:latest@manual::enterprise-integration-patterns/xref:{eip-vc}:eips:enterprise-integration-patterns/g' `find . -name "test-spring.adoc"` +#version: 2.x component: components file: undefined path modules/ROOT/pages/test.adoc"` lineno: undefined message: latest@manual::enterprise-integration-patterns +sed -i -e 's/xref:latest@manual::enterprise-integration-patterns/xref:{eip-vc}:eips:enterprise-integration-patterns/g' `find . -name "test.adoc"` diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc index dfe1ae8..f49a193 100644 --- a/docs/components/modules/ROOT/pages/index.adoc +++ b/docs/components/modules/ROOT/pages/index.adoc @@ -121,8 +121,6 @@ Number of Components: 310 in 210 JAR artifacts (27 deprecated) | xref:class-component.adoc[Class] (camel-core) | 2.4 | The Class Component is for invoking Java Classes (Java beans) from Camel. -| xref:cm-sms-component.adoc[CM SMS Gateway] (camel-cm-sms) | 2.18 | The cm-sms component allows to integrate with CM SMS Gateway. - | xref:cmis-component.adoc[CMIS] (camel-cmis) | 2.11 | The cmis component uses the Apache Chemistry client API and allows you to add/read nodes to/from a CMIS compliant content repositories. | xref:coap-component.adoc[CoAP] (camel-coap) | 2.16 | The coap component is used for sending and receiving messages from COAP capable devices. @@ -680,8 +678,6 @@ Number of Miscellaneous Components: 44 in 44 JAR artifacts (13 deprecated) | xref:opentracing.adoc[OpenTracing] (camel-opentracing) | 2.19 | Distributed tracing using OpenTracing -| xref:reactor.adoc[Reactor] (camel-reactor) | 2.20 | Reactor based back-end for Camel's reactive streams component - | xref:ribbon.adoc[Ribbon] (camel-ribbon) | 2.18 | Using Netflix Ribbon for client side load balancing | xref:ruby.adoc[Ruby] (camel-ruby) | 1.0 | *deprecated* Camel Ruby DSL diff --git a/docs/components/modules/ROOT/pages/jetty-component.adoc b/docs/components/modules/ROOT/pages/jetty-component.adoc index 50a5f17..cb6820f 100644 --- a/docs/components/modules/ROOT/pages/jetty-component.adoc +++ b/docs/components/modules/ROOT/pages/jetty-component.adoc @@ -339,8 +339,8 @@ Jetty component will copy the HTTP request parameter, `one` to the exchange's `in.header`. We can then use the `simple` language to route exchanges that contain this header to a specific endpoint and all others to another. If we used a language more powerful than -xref:latest@components:languages:simple-language.adoc[Simple] (such as xref:el-language.adoc[EL] or -xref:ognl-language.adoc[OGNL]) we could also test for the parameter value and do +xref:languages:simple-language.adoc[Simple] (such as xref:languages:el-language.adoc[EL] or +xref:languages:ognl-language.adoc[OGNL]) we could also test for the parameter value and do routing based on the header value as well. === Session Support diff --git a/docs/components/modules/ROOT/pages/mina-component.adoc b/docs/components/modules/ROOT/pages/mina-component.adoc index c1f8d66..6c236b5 100644 --- a/docs/components/modules/ROOT/pages/mina-component.adoc +++ b/docs/components/modules/ROOT/pages/mina-component.adoc @@ -149,7 +149,7 @@ documentation] how to write your own codec. To use your custom codec with `camel-mina`, you should register your codec in the Registry; for example, by creating a bean in the Spring XML file. Then use the `codec` option to specify the bean ID of -your codec. See xref:hl7-dataformat.adoc[HL7] that has a custom codec. +your codec. See xref:dataformats:hl7-dataformat.adoc[HL7] that has a custom codec. == Sample with sync=false diff --git a/docs/components/modules/ROOT/pages/mina2-component.adoc b/docs/components/modules/ROOT/pages/mina2-component.adoc index 8a6f9cf..d98abc7 100644 --- a/docs/components/modules/ROOT/pages/mina2-component.adoc +++ b/docs/components/modules/ROOT/pages/mina2-component.adoc @@ -208,7 +208,7 @@ See the Mina how to write your own codec. To use your custom codec with `camel-mina`, you should register your codec in the Registry; for example, by creating a bean in the Spring XML file. Then use the `codec` option to specify the bean ID of -your codec. See xref:hl7-dataformat.adoc[HL7] that has a custom codec. +your codec. See xref:dataformats:hl7-dataformat.adoc[HL7] that has a custom codec. == Sample with sync=false diff --git a/docs/components/modules/ROOT/pages/quickfix-component.adoc b/docs/components/modules/ROOT/pages/quickfix-component.adoc index 37aa88f..b1dbdb6 100644 --- a/docs/components/modules/ROOT/pages/quickfix-component.adoc +++ b/docs/components/modules/ROOT/pages/quickfix-component.adoc @@ -590,7 +590,7 @@ initially as a collection of key value pairs data. You can use this object or you can use the method 'toString' to retrieve the original FIX message. -*Note:* Alternatively, you can use xref:bindy-dataformat.adoc[camel bindy dataformat] to transform the FIX message into your own java POJO +*Note:* Alternatively, you can use xref:dataformats:bindy-dataformat.adoc[camel bindy dataformat] to transform the FIX message into your own java POJO When a message must be send to QuickFix, then you must create a QuickFix.Message instance. diff --git a/docs/components/modules/ROOT/pages/salesforce-component.adoc b/docs/components/modules/ROOT/pages/salesforce-component.adoc index 4078ed4..825f937 100644 --- a/docs/components/modules/ROOT/pages/salesforce-component.adoc +++ b/docs/components/modules/ROOT/pages/salesforce-component.adoc @@ -334,7 +334,7 @@ For instance, consider that you need to limit the API usage of Salesforce so tha other routes. The body of output message contains an instance of `org.apache.camel.component.salesforce.api.dto.Limits` object that can be used in conjunction with Content Based Router and Content Based Router and -xref:spel-language.adoc[Spring Expression Language (SpEL)] to choose when to perform queries. +xref:languages:spel-language.adoc[Spring Expression Language (SpEL)] to choose when to perform queries. Notice how multiplying `1.0` with the integer value held in `body.dailyApiRequests.remaining` makes the expression evaluate as with floating point arithmetic, without it - it would end up making integral division which would result diff --git a/docs/components/modules/dataformats/pages/crypto-dataformat.adoc b/docs/components/modules/dataformats/pages/crypto-dataformat.adoc index f2ad966..38470cd 100644 --- a/docs/components/modules/dataformats/pages/crypto-dataformat.adoc +++ b/docs/components/modules/dataformats/pages/crypto-dataformat.adoc @@ -323,7 +323,7 @@ or with spring. == Dependencies -To use the xref:crypto-component.adoc[Crypto] dataformat in your camel routes you +To use the xref:ROOT:crypto-component.adoc[Crypto] dataformat in your camel routes you need to add the following dependency to your pom. [source,xml] diff --git a/docs/components/modules/dataformats/pages/flatpack-dataformat.adoc b/docs/components/modules/dataformats/pages/flatpack-dataformat.adoc index 9e2854d..c491646 100644 --- a/docs/components/modules/dataformats/pages/flatpack-dataformat.adoc +++ b/docs/components/modules/dataformats/pages/flatpack-dataformat.adoc @@ -5,7 +5,7 @@ *Available as of Camel version 2.1* -The xref:flatpack-component.adoc[Flatpack] component ships with the Flatpack data +The xref:ROOT:flatpack-component.adoc[Flatpack] component ships with the Flatpack data format that can be used to format between fixed width or delimited text messages to a `List` of rows as `Map`. diff --git a/docs/components/modules/dataformats/pages/hl7-dataformat.adoc b/docs/components/modules/dataformats/pages/hl7-dataformat.adoc index befa267..76ee013 100644 --- a/docs/components/modules/dataformats/pages/hl7-dataformat.adoc +++ b/docs/components/modules/dataformats/pages/hl7-dataformat.adoc @@ -11,12 +11,12 @@ v2 messages] using the http://hl7api.sourceforge.net[HAPI library]. This component supports the following: -* HL7 MLLP codec for xref:mina2-component.adoc[Mina 2] -* HL7 MLLP codec for xref:netty4-component.adoc[Netty4] from *Camel 2.15* onwards +* HL7 MLLP codec for xref:ROOT:mina2-component.adoc[Mina 2] +* HL7 MLLP codec for xref:ROOT:netty4-component.adoc[Netty4] from *Camel 2.15* onwards * Type Converter from/to HAPI and String * HL7 DataFormat using the HAPI library * Even more ease-of-use as it's integrated well with the -xref:mina2-component.adoc[Mina 2] component. +xref:ROOT:mina2-component.adoc[Mina 2] component. Maven users will need to add the following dependency to their `pom.xml` for this component: @@ -37,8 +37,8 @@ HL7 is often used with the HL7 MLLP protocol, which is a text based TCP socket based protocol. This component ships with a Mina and Netty4 Codec that conforms to the MLLP protocol so you can easily expose an HL7 listener accepting HL7 requests over the TCP transport layer. To expose -a HL7 listener service, the xref:mina2-component.adoc[Mina 2] or -xref:netty4-component.adoc[Netty4] component is used with the +a HL7 listener service, the xref:ROOT:mina2-component.adoc[Mina 2] or +xref:ROOT:netty4-component.adoc[Netty4] component is used with the `HL7MLLPCodec` (mina2) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder` (Netty4). diff --git a/docs/components/modules/dataformats/pages/syslog-dataformat.adoc b/docs/components/modules/dataformats/pages/syslog-dataformat.adoc index cf46dd3..4b71241 100644 --- a/docs/components/modules/dataformats/pages/syslog-dataformat.adoc +++ b/docs/components/modules/dataformats/pages/syslog-dataformat.adoc @@ -15,10 +15,10 @@ This component supports the following: SyslogMessage model objects. * Type Converter from/to SyslogMessage and String -* Integration with the xref:mina2-component.adoc[Mina 2] component. -* Integration with the xref:netty-component.adoc[Netty] component. +* Integration with the xref:ROOT:mina2-component.adoc[Mina 2] component. +* Integration with the xref:ROOT:netty-component.adoc[Netty] component. * *Camel 2.14:* Encoder and decoder for -the xref:netty-component.adoc[Netty] component. +the xref:ROOT:netty-component.adoc[Netty] component. * *Camel 2.14:* Support for RFC5424 also. Maven users will need to add the following dependency to their `pom.xml` @@ -41,7 +41,7 @@ as its underlying transport layer mechanism. The UDP port that has been assigned to syslog is 514. To expose a Syslog listener service we reuse the existing -xref:mina2-component.adoc[Mina 2] component or xref:mina2-component.adoc[Mina 2] +xref:ROOT:mina2-component.adoc[Mina 2] component or xref:ROOT:mina2-component.adoc[Mina 2] where we just use the `Rfc3164SyslogDataFormat` to marshal and unmarshal messages. Notice that from *Camel 2.14* onwards the syslog dataformat is renamed to `SyslogDataFormat`. @@ -93,8 +93,8 @@ ND *Available as of Camel 2.14* To expose a Syslog listener service we reuse the -existing xref:mina2-component.adoc[Mina 2] component -or xref:netty-component.adoc[Netty] where we just use +existing xref:ROOT:mina2-component.adoc[Mina 2] component +or xref:ROOT:netty-component.adoc[Netty] where we just use the `SyslogDataFormat` to marshal and unmarshal messages === Exposing a Syslog listener @@ -123,7 +123,7 @@ as an InputStream: </camelContext> ------------------------------------------------------------------------------------------ -The same route using xref:mina2-component.adoc[Mina 2] +The same route using xref:ROOT:mina2-component.adoc[Mina 2] [source,xml] ------------------------------------------------------------------------- diff --git a/docs/components/modules/languages/pages/sql-language.adoc b/docs/components/modules/languages/pages/sql-language.adoc index 5a714f7..b996dd1 100644 --- a/docs/components/modules/languages/pages/sql-language.adoc +++ b/docs/components/modules/languages/pages/sql-language.adoc @@ -8,13 +8,13 @@ The SQL support is added by http://josql.sourceforge.net/[JoSQL] and is primarily used for performing SQL queries on in-memory objects. If you prefer to perform actual database queries then check out the -xref:jpa-component.adoc[JPA] component. +xref:ROOT:jpa-component.adoc[JPA] component. *Looking for the SQL component* -Camel has both a xref:sql-component.adoc[SQL] language and a -xref:sql-component.adoc[SQL Component]. This page is about the SQL -language. Click on xref:sql-component.adoc[SQL Component] if you are +Camel has both a xref:ROOT:sql-component.adoc[SQL] language and a +xref:ROOT:sql-component.adoc[SQL Component]. This page is about the SQL +language. Click on xref:ROOT:sql-component.adoc[SQL Component] if you are looking for the component instead. To use SQL in your camel routes you need to add the a dependency on