You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/05 14:26:43 UTC
[camel] 07/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina - Updated references in docs and regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d16290b896a0cb1526ada58eef90361460ccc5bb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 16:21:50 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Updated references in docs and regen
---
.../camel-mina/src/main/docs/mina-component.adoc | 68 +++++++--------
.../src/main/docs/netty4-component.adoc | 2 +-
.../src/main/docs/syslog-dataformat.adoc | 2 +-
components/readme.adoc | 4 +-
docs/components/modules/ROOT/nav.adoc | 2 +-
.../modules/ROOT/pages/hl7-dataformat.adoc | 12 +--
.../{mina2-component.adoc => mina-component.adoc} | 96 +++++++++++-----------
.../modules/ROOT/pages/netty4-component.adoc | 2 +-
.../modules/ROOT/pages/syslog-dataformat.adoc | 8 +-
docs/user-manual/modules/ROOT/pages/async.adoc | 8 +-
.../how-does-camel-compare-to-servicemix-eip.adoc | 2 +-
.../modules/ROOT/pages/faq/what-is-camel.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/security.adoc | 2 +-
.../modules/ROOT/pages/servicepool.adoc | 2 +-
.../ROOT/pages/walk-through-another-example.adoc | 2 +-
16 files changed, 108 insertions(+), 108 deletions(-)
diff --git a/components/camel-mina/src/main/docs/mina-component.adoc b/components/camel-mina/src/main/docs/mina-component.adoc
index 166f977..cca546d 100644
--- a/components/camel-mina/src/main/docs/mina-component.adoc
+++ b/components/camel-mina/src/main/docs/mina-component.adoc
@@ -64,7 +64,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Mina2 component supports 4 options, which are listed below.
+The Mina component supports 4 options, which are listed below.
@@ -86,10 +86,10 @@ The Mina2 component supports 4 options, which are listed below.
// endpoint options: START
-The Mina2 endpoint is configured using URI syntax:
+The Mina endpoint is configured using URI syntax:
----
-mina2:protocol:host:port
+mina:protocol:host:port
----
with the following path and query parameters:
@@ -152,7 +152,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
@@ -166,36 +166,36 @@ The component supports 30 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.component.mina2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
-| *camel.component.mina2.configuration.allow-default-codec* | The mina component installs a default codec if both, codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain, like the SSL filter. | true | Boolean
-| *camel.component.mina2.configuration.auto-start-tls* | Whether to auto start SSL handshake. | true | Boolean
-| *camel.component.mina2.configuration.cached-address* | Whether to create the InetAddress once and reuse. Setting this to false allows to pickup DNS changes in the network. | true | Boolean
-| *camel.component.mina2.configuration.client-mode* | If the clientMode is true, mina consumer will connect the address as a TCP client. | false | Boolean
-| *camel.component.mina2.configuration.codec* | To use a custom minda codec implementation. | | ProtocolCodecFactory
-| *camel.component.mina2.configuration.decoder-max-line-length* | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. | 1024 | Integer
-| *camel.component.mina2.configuration.disconnect* | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer. | false | Boolean
-| *camel.component.mina2.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. | true | Boolean
-| *camel.component.mina2.configuration.encoder-max-line-length* | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE. | -1 | Integer
-| *camel.component.mina2.configuration.encoding* | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset | | String
-| *camel.component.mina2.configuration.filters* | You can set a list of Mina IoFilters to use. | | List
-| *camel.component.mina2.configuration.host* | Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server. | | String
-| *camel.component.mina2.configuration.lazy-session-creation* | Sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. | true | Boolean
-| *camel.component.mina2.configuration.maximum-pool-size* | Number of worker threads in the worker pool for TCP and UDP | 16 | Integer
-| *camel.component.mina2.configuration.mina-logger* | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. | false | Boolean
-| *camel.component.mina2.configuration.no-reply-log-level* | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel
-| *camel.component.mina2.configuration.ordered-thread-pool-executor* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean
-| *camel.component.mina2.configuration.port* | Port number | | Integer
-| *camel.component.mina2.configuration.protocol* | Protocol to use | | String
-| *camel.component.mina2.configuration.ssl-context-parameters* | To configure SSL security. | | SSLContextParameters
-| *camel.component.mina2.configuration.sync* | Setting to set endpoint as one-way or request-response. | true | Boolean
-| *camel.component.mina2.configuration.textline* | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | Boolean
-| *camel.component.mina2.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
-| *camel.component.mina2.configuration.timeout* | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. | 30000 | Long
-| *camel.component.mina2.configuration.transfer-exchange* | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean
-| *camel.component.mina2.configuration.write-timeout* | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | Long
-| *camel.component.mina2.enabled* | Enable mina2 component | true | Boolean
-| *camel.component.mina2.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
-| *camel.component.mina2.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
+| *camel.component.mina.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
+| *camel.component.mina.configuration.allow-default-codec* | The mina component installs a default codec if both, codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain, like the SSL filter. | true | Boolean
+| *camel.component.mina.configuration.auto-start-tls* | Whether to auto start SSL handshake. | true | Boolean
+| *camel.component.mina.configuration.cached-address* | Whether to create the InetAddress once and reuse. Setting this to false allows to pickup DNS changes in the network. | true | Boolean
+| *camel.component.mina.configuration.client-mode* | If the clientMode is true, mina consumer will connect the address as a TCP client. | false | Boolean
+| *camel.component.mina.configuration.codec* | To use a custom minda codec implementation. | | ProtocolCodecFactory
+| *camel.component.mina.configuration.decoder-max-line-length* | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. | 1024 | Integer
+| *camel.component.mina.configuration.disconnect* | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer. | false | Boolean
+| *camel.component.mina.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. | true | Boolean
+| *camel.component.mina.configuration.encoder-max-line-length* | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE. | -1 | Integer
+| *camel.component.mina.configuration.encoding* | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset | | String
+| *camel.component.mina.configuration.filters* | You can set a list of Mina IoFilters to use. | | List
+| *camel.component.mina.configuration.host* | Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server. | | String
+| *camel.component.mina.configuration.lazy-session-creation* | Sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. | true | Boolean
+| *camel.component.mina.configuration.maximum-pool-size* | Number of worker threads in the worker pool for TCP and UDP | 16 | Integer
+| *camel.component.mina.configuration.mina-logger* | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. | false | Boolean
+| *camel.component.mina.configuration.no-reply-log-level* | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel
+| *camel.component.mina.configuration.ordered-thread-pool-executor* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean
+| *camel.component.mina.configuration.port* | Port number | | Integer
+| *camel.component.mina.configuration.protocol* | Protocol to use | | String
+| *camel.component.mina.configuration.ssl-context-parameters* | To configure SSL security. | | SSLContextParameters
+| *camel.component.mina.configuration.sync* | Setting to set endpoint as one-way or request-response. | true | Boolean
+| *camel.component.mina.configuration.textline* | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | Boolean
+| *camel.component.mina.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
+| *camel.component.mina.configuration.timeout* | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. | 30000 | Long
+| *camel.component.mina.configuration.transfer-exchange* | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean
+| *camel.component.mina.configuration.write-timeout* | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | Long
+| *camel.component.mina.enabled* | Whether to enable auto configuration of the mina component. This is enabled by default. | | Boolean
+| *camel.component.mina.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+| *camel.component.mina.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc b/components/camel-netty4/src/main/docs/netty4-component.adoc
index ac1e4a1..1781e1a 100644
--- a/components/camel-netty4/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty4/src/main/docs/netty4-component.adoc
@@ -799,4 +799,4 @@ under the `camel-example-netty-custom-correlation` directory.
== See Also
* xref:netty4-http-component.adoc[Netty HTTP]
-* xref:mina2-component.adoc[MINA]
+* xref:mina-component.adoc[MINA]
diff --git a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
index b1fc768..0258b0a 100644
--- a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
+++ b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
@@ -92,7 +92,7 @@ ND
*Available as of Camel 2.14*
To expose a Syslog listener service we reuse the
-existing xref:mina2-component.adoc[Mina2 Component] component
+existing xref:mina-component.adoc[Mina Component] component
or xref:netty4-component.adoc[Netty4 Component] where we just use
the `SyslogDataFormat` to marshal and unmarshal messages
diff --git a/components/readme.adoc b/components/readme.adoc
index 333eba1..c4c26b7 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -565,8 +565,8 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated)
| link:camel-micrometer/src/main/docs/micrometer-component.adoc[Micrometer] (camel-micrometer) +
`micrometer:metricsType:metricsName` | 2.22 | To collect various metrics directly from Camel routes using the Micrometer library.
-| link:camel-mina2/src/main/docs/mina2-component.adoc[Mina2] (camel-mina2) +
-`mina2:protocol:host:port` | 2.10 | Socket level networking using TCP or UDP with the Apache Mina 2.x library.
+| link:camel-mina/src/main/docs/mina-component.adoc[Mina] (camel-mina) +
+`mina:protocol:host:port` | 2.10 | Socket level networking using TCP or UDP with the Apache Mina 2.x library.
| link:camel-mllp/src/main/docs/mllp-component.adoc[MLLP] (camel-mllp) +
`mllp:hostname:port` | 2.17 | Provides functionality required by Healthcare providers to communicate with other systems using the MLLP protocol.
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index 204a2b7..da5e605 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -233,7 +233,7 @@
* xref:microprofile-config.adoc[MicroProfile Config Component]
* xref:milo-client-component.adoc[OPC UA Client Component]
* xref:milo-server-component.adoc[OPC UA Server Component]
-* xref:mina2-component.adoc[Mina2 Component]
+* xref:mina-component.adoc[Mina Component]
* xref:mllp-component.adoc[MLLP Component]
* xref:mock-component.adoc[Mock Component]
* xref:mongodb-gridfs-component.adoc[MongoDB GridFS Component]
diff --git a/docs/components/modules/ROOT/pages/hl7-dataformat.adoc b/docs/components/modules/ROOT/pages/hl7-dataformat.adoc
index c3d98ab..704913e 100644
--- a/docs/components/modules/ROOT/pages/hl7-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/hl7-dataformat.adoc
@@ -9,12 +9,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]
+* HL7 MLLP codec for xref:mina-component.adoc[Mina]
* HL7 MLLP codec for xref:netty4-component.adoc[Netty4]
* 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[camel-mina2] component.
+xref:mina-component.adoc[camel-mina] component.
Maven users will need to add the following dependency to their `pom.xml`
for this component:
@@ -35,9 +35,9 @@ 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[camel-mina2] or
+a HL7 listener service, the xref:mina-component.adoc[camel-mina] or
xref:netty4-component.adoc[camel-netty4] component is used with the
-`HL7MLLPCodec` (mina2) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder`
+`HL7MLLPCodec` (mina) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder`
(Netty4).
HL7 MLLP codec can be configured as follows:
@@ -69,12 +69,12 @@ segment terminators. The HAPI library requires the use of `\r`.
=== Exposing an HL7 listener using Mina
-In the Spring XML file, we configure a mina2 endpoint to listen for HL7
+In the Spring XML file, we configure a mina endpoint to listen for HL7
requests using TCP on port `8888`:
[source,xml]
----
-<endpoint id="hl7MinaListener" uri="mina2:tcp://localhost:8888?sync=true&codec=#hl7codec"/>
+<endpoint id="hl7MinaListener" uri="mina:tcp://localhost:8888?sync=true&codec=#hl7codec"/>
----
*sync=true* indicates that this listener is synchronous and therefore
diff --git a/docs/components/modules/ROOT/pages/mina2-component.adoc b/docs/components/modules/ROOT/pages/mina-component.adoc
similarity index 68%
rename from docs/components/modules/ROOT/pages/mina2-component.adoc
rename to docs/components/modules/ROOT/pages/mina-component.adoc
index 1860506..cca546d 100644
--- a/docs/components/modules/ROOT/pages/mina2-component.adoc
+++ b/docs/components/modules/ROOT/pages/mina-component.adoc
@@ -1,5 +1,5 @@
-[[mina2-component]]
-= Mina2 Component
+[[mina-component]]
+= Mina Component
*Available as of Camel version 2.10*
@@ -9,7 +9,7 @@ http://mina.apache.org/[Apache MINA 2.x]
TIP: Favor using xref:netty4-component.adoc[Netty] as Netty is a much more active
maintained and popular project than Apache Mina currently is.
-WARNING: Be careful with `sync=false` on consumer endpoints. Since camel-mina2 all
+WARNING: Be careful with `sync=false` on consumer endpoints. Since camel-mina all
consumer exchanges are InOut. This is different to camel-mina.
Maven users will need to add the following dependency to their `pom.xml`
@@ -19,7 +19,7 @@ for this component:
------------------------------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
@@ -29,9 +29,9 @@ for this component:
[source,java]
-------------------------------------
-mina2:tcp://hostname[:port][?options]
-mina2:udp://hostname[:port][?options]
-mina2:vm://hostname[:port][?options]
+mina:tcp://hostname[:port][?options]
+mina:udp://hostname[:port][?options]
+mina:vm://hostname[:port][?options]
-------------------------------------
You can specify a codec in the Registry using the
@@ -64,7 +64,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Mina2 component supports 4 options, which are listed below.
+The Mina component supports 4 options, which are listed below.
@@ -86,10 +86,10 @@ The Mina2 component supports 4 options, which are listed below.
// endpoint options: START
-The Mina2 endpoint is configured using URI syntax:
+The Mina endpoint is configured using URI syntax:
----
-mina2:protocol:host:port
+mina:protocol:host:port
----
with the following path and query parameters:
@@ -152,7 +152,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
@@ -166,36 +166,36 @@ The component supports 30 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.component.mina2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
-| *camel.component.mina2.configuration.allow-default-codec* | The mina component installs a default codec if both, codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain, like the SSL filter. | true | Boolean
-| *camel.component.mina2.configuration.auto-start-tls* | Whether to auto start SSL handshake. | true | Boolean
-| *camel.component.mina2.configuration.cached-address* | Whether to create the InetAddress once and reuse. Setting this to false allows to pickup DNS changes in the network. | true | Boolean
-| *camel.component.mina2.configuration.client-mode* | If the clientMode is true, mina consumer will connect the address as a TCP client. | false | Boolean
-| *camel.component.mina2.configuration.codec* | To use a custom minda codec implementation. | | ProtocolCodecFactory
-| *camel.component.mina2.configuration.decoder-max-line-length* | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. | 1024 | Integer
-| *camel.component.mina2.configuration.disconnect* | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer. | false | Boolean
-| *camel.component.mina2.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. | true | Boolean
-| *camel.component.mina2.configuration.encoder-max-line-length* | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE. | -1 | Integer
-| *camel.component.mina2.configuration.encoding* | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset | | String
-| *camel.component.mina2.configuration.filters* | You can set a list of Mina IoFilters to use. | | List
-| *camel.component.mina2.configuration.host* | Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server. | | String
-| *camel.component.mina2.configuration.lazy-session-creation* | Sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. | true | Boolean
-| *camel.component.mina2.configuration.maximum-pool-size* | Number of worker threads in the worker pool for TCP and UDP | 16 | Integer
-| *camel.component.mina2.configuration.mina-logger* | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. | false | Boolean
-| *camel.component.mina2.configuration.no-reply-log-level* | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel
-| *camel.component.mina2.configuration.ordered-thread-pool-executor* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean
-| *camel.component.mina2.configuration.port* | Port number | | Integer
-| *camel.component.mina2.configuration.protocol* | Protocol to use | | String
-| *camel.component.mina2.configuration.ssl-context-parameters* | To configure SSL security. | | SSLContextParameters
-| *camel.component.mina2.configuration.sync* | Setting to set endpoint as one-way or request-response. | true | Boolean
-| *camel.component.mina2.configuration.textline* | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | Boolean
-| *camel.component.mina2.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
-| *camel.component.mina2.configuration.timeout* | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. | 30000 | Long
-| *camel.component.mina2.configuration.transfer-exchange* | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean
-| *camel.component.mina2.configuration.write-timeout* | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | Long
-| *camel.component.mina2.enabled* | Enable mina2 component | true | Boolean
-| *camel.component.mina2.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
-| *camel.component.mina2.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
+| *camel.component.mina.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
+| *camel.component.mina.configuration.allow-default-codec* | The mina component installs a default codec if both, codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain, like the SSL filter. | true | Boolean
+| *camel.component.mina.configuration.auto-start-tls* | Whether to auto start SSL handshake. | true | Boolean
+| *camel.component.mina.configuration.cached-address* | Whether to create the InetAddress once and reuse. Setting this to false allows to pickup DNS changes in the network. | true | Boolean
+| *camel.component.mina.configuration.client-mode* | If the clientMode is true, mina consumer will connect the address as a TCP client. | false | Boolean
+| *camel.component.mina.configuration.codec* | To use a custom minda codec implementation. | | ProtocolCodecFactory
+| *camel.component.mina.configuration.decoder-max-line-length* | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. | 1024 | Integer
+| *camel.component.mina.configuration.disconnect* | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer. | false | Boolean
+| *camel.component.mina.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. | true | Boolean
+| *camel.component.mina.configuration.encoder-max-line-length* | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE. | -1 | Integer
+| *camel.component.mina.configuration.encoding* | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset | | String
+| *camel.component.mina.configuration.filters* | You can set a list of Mina IoFilters to use. | | List
+| *camel.component.mina.configuration.host* | Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server. | | String
+| *camel.component.mina.configuration.lazy-session-creation* | Sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. | true | Boolean
+| *camel.component.mina.configuration.maximum-pool-size* | Number of worker threads in the worker pool for TCP and UDP | 16 | Integer
+| *camel.component.mina.configuration.mina-logger* | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. | false | Boolean
+| *camel.component.mina.configuration.no-reply-log-level* | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel
+| *camel.component.mina.configuration.ordered-thread-pool-executor* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean
+| *camel.component.mina.configuration.port* | Port number | | Integer
+| *camel.component.mina.configuration.protocol* | Protocol to use | | String
+| *camel.component.mina.configuration.ssl-context-parameters* | To configure SSL security. | | SSLContextParameters
+| *camel.component.mina.configuration.sync* | Setting to set endpoint as one-way or request-response. | true | Boolean
+| *camel.component.mina.configuration.textline* | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | Boolean
+| *camel.component.mina.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
+| *camel.component.mina.configuration.timeout* | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. | 30000 | Long
+| *camel.component.mina.configuration.transfer-exchange* | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean
+| *camel.component.mina.configuration.write-timeout* | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | Long
+| *camel.component.mina.enabled* | Whether to enable auto configuration of the mina component. This is enabled by default. | | Boolean
+| *camel.component.mina.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+| *camel.component.mina.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
|===
// spring-boot-auto-configure options: END
@@ -219,7 +219,7 @@ Mina consumer endpoint that listens on port 6200:
[source,java]
---------------------------------------------------------------------------------------
-from("mina2:tcp://localhost:" + port1 + "?textline=true&sync=false").to("mock:result");
+from("mina:tcp://localhost:" + port1 + "?textline=true&sync=false").to("mock:result");
---------------------------------------------------------------------------------------
As the sample is part of a unit test, we test it by sending some data to
@@ -230,7 +230,7 @@ it on port 6200.
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
-template.sendBody("mina2:tcp://localhost:" + port1 + "?textline=true&sync=false", "Hello World");
+template.sendBody("mina:tcp://localhost:" + port1 + "?textline=true&sync=false", "Hello World");
assertMockEndpointsSatisfied();
-------------------------------------------------------------------------------------------------
@@ -244,7 +244,7 @@ consumer.
[source,java]
---------------------------------------------------------------------------------------------
-from("mina2:tcp://localhost:" + port2 + "?textline=true&sync=true").process(new Processor() {
+from("mina:tcp://localhost:" + port2 + "?textline=true&sync=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
@@ -259,19 +259,19 @@ fact, something we have dynamically set in our processor code logic.
[source,java]
-----------------------------------------------------------------------------------------------------------------------
-String response = (String)template.requestBody("mina2:tcp://localhost:" + port2 + "?textline=true&sync=true", "World");
+String response = (String)template.requestBody("mina:tcp://localhost:" + port2 + "?textline=true&sync=true", "World");
assertEquals("Bye World", response);
-----------------------------------------------------------------------------------------------------------------------
== Sample with Spring DSL
-Spring DSL can, of course, also be used for xref:mina2-component.adoc[MINA]. In the
+Spring DSL can, of course, also be used for xref:mina-component.adoc[MINA]. In the
sample below we expose a TCP server on port 5555:
[source,xml]
-----------------------------------------------------------
<route>
- <from uri="mina2:tcp://localhost:5555?textline=true"/>
+ <from uri="mina:tcp://localhost:5555?textline=true"/>
<to uri="bean:myTCPOrderHandler"/>
</route>
-----------------------------------------------------------
@@ -301,7 +301,7 @@ written the `bye` message back to the client:
[source,java]
---------------------------------------------------------------------------------------------------
- from("mina2:tcp://localhost:8080?sync=true&textline=true").process(new Processor() {
+ from("mina:tcp://localhost:8080?sync=true&textline=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
diff --git a/docs/components/modules/ROOT/pages/netty4-component.adoc b/docs/components/modules/ROOT/pages/netty4-component.adoc
index ac1e4a1..1781e1a 100644
--- a/docs/components/modules/ROOT/pages/netty4-component.adoc
+++ b/docs/components/modules/ROOT/pages/netty4-component.adoc
@@ -799,4 +799,4 @@ under the `camel-example-netty-custom-correlation` directory.
== See Also
* xref:netty4-http-component.adoc[Netty HTTP]
-* xref:mina2-component.adoc[MINA]
+* xref:mina-component.adoc[MINA]
diff --git a/docs/components/modules/ROOT/pages/syslog-dataformat.adoc b/docs/components/modules/ROOT/pages/syslog-dataformat.adoc
index ec2fb45..0258b0a 100644
--- a/docs/components/modules/ROOT/pages/syslog-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/syslog-dataformat.adoc
@@ -13,7 +13,7 @@ This component supports the following:
SyslogMessage model objects.
* Type Converter from/to SyslogMessage and
String
-* Integration with the xref:mina2-component.adoc[camel-mina] component.
+* Integration with the xref:mina-component.adoc[camel-mina] component.
* Integration with the xref:netty4-component.adoc[camel-netty] component.
* Encoder and decoder for
the xref:netty4-component.adoc[Netty4 Component] component.
@@ -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[Mina2 Component] component or xref:netty4-component.adoc[Netty4 Component]
+xref:mina-component.adoc[Mina Component] component or xref:netty4-component.adoc[Netty4 Component]
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,7 +92,7 @@ ND
*Available as of Camel 2.14*
To expose a Syslog listener service we reuse the
-existing xref:mina2-component.adoc[Mina2 Component] component
+existing xref:mina-component.adoc[Mina Component] component
or xref:netty4-component.adoc[Netty4 Component] where we just use
the `SyslogDataFormat` to marshal and unmarshal messages
@@ -121,7 +121,7 @@ as an InputStream:
</camelContext>
------------------------------------------------------------------------------------------
-The same route using xref:mina2-component.adoc[Mina2 Component]
+The same route using xref:mina-component.adoc[Mina Component]
[source,xml]
-------------------------------------------------------------------------
diff --git a/docs/user-manual/modules/ROOT/pages/async.adoc b/docs/user-manual/modules/ROOT/pages/async.adoc
index 4def400..79d5452 100644
--- a/docs/user-manual/modules/ROOT/pages/async.adoc
+++ b/docs/user-manual/modules/ROOT/pages/async.adoc
@@ -74,7 +74,7 @@ image:async.data/camel_sync_request_reply.png[image]
\1. The client sends a sync Request Reply
message over xref:components::http-component.adoc[HTTP] to Camel. The client application will
wait for the response that Camel routes and processes. +
- 2. The message invokes an external xref:components::mina2-component.adoc[TCP] service using
+ 2. The message invokes an external xref:components::mina-component.adoc[TCP] service using
synchronous Request Reply. The client
application still waits for the response. +
3. The response is send back to the client.
@@ -95,7 +95,7 @@ image:async.data/camel_async_request_reply.png[image]
Request Reply message over HTTP
to Camel. The control is immediately returned to the client application,
that can continue and do other work while Camel routes the message. +
- 2. Camel invokes an external xref:components::mina2-component.adoc[TCP] service using
+ 2. Camel invokes an external xref:components::mina-component.adoc[TCP] service using
synchronous Request Reply. The client
application can do other work simultaneously. +
3. The client wants to get the reply so it uses the Future handle it
@@ -115,7 +115,7 @@ image:async.data/camel_sync_request_only.png[image]
\1. The client sends a Request only and we can
still use xref:components::http-component.adoc[HTTP] despite http being
Request Reply by nature. +
- 2. Camel invokes an external xref:components::mina2-component.adoc[TCP] service using
+ 2. Camel invokes an external xref:components::mina-component.adoc[TCP] service using
synchronous Request Reply. The client
application is still waiting. +
3. The message is processed completely and the control is returned to
@@ -145,7 +145,7 @@ still use xref:components::http-component.adoc[HTTP] despite http being
Request Reply by nature. The control is
immediately returned to the client application, that can continue and do
other work while Camel routes the message. +
- 2. Camel invokes an external xref:components::mina2-component.adoc[TCP] service using
+ 2. Camel invokes an external xref:components::mina-component.adoc[TCP] service using
synchronous Request Reply. The client
application can do other work simultaneously. +
3. The message completes but no result is returned to the client.
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 d77addc..a74a492 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
@@ -8,7 +8,7 @@ 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
Patterns] and can be used outside of JBI (e.g. just with pure
-xref:components::jms-component.adoc[JMS] or xref:components::mina2-component.adoc[MINA]). Also Camel supports a
+xref:components::jms-component.adoc[JMS] or xref:components::mina-component.adoc[MINA]). Also Camel supports a
xref:dsl.adoc[Java DSL] or xref:spring.adoc[XML configuration].
[[HowdoesCamelcomparetoServiceMixEIP-ConvertingfromServiceMixEIPtoCamel]]
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 e9ee7c9..fd129f3 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
@@ -15,7 +15,7 @@ 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:components::http-component.adoc[HTTP], xref:components::activemq-component.adoc[ActiveMQ], xref:components::jms-component.adoc[JMS],
-JBI, SCA, xref:components::mina2-component.adoc[MINA] or xref:components::cxf-component.adoc[CXF], as
+JBI, SCA, xref:components::mina-component.adoc[MINA] or xref:components::cxf-component.adoc[CXF], as
well as pluggable xref:component.adoc[Components] and
xref:data-format.adoc[Data Format] options. Apache Camel is a small
library with minimal xref:what-are-the-dependencies.adoc[dependencies]
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index 84e80b3..6bffa59 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -331,7 +331,7 @@ camel routes without them knowing
** xref:components::master-component.adoc[Master]
** xref:components::metrics-component.adoc[Metrics]
** xref:components::micrometer-component.adoc[Micrometer]
-** xref:components::mina2-component.adoc[Mina2]
+** xref:components::mina-component.adoc[Mina]
** xref:components::mllp-component.adoc[MLLP]
** xref:components::mongodb-component.adoc[MongoDB]
** xref:components::mongodb-gridfs-component.adoc[MongoDB GridFS]
diff --git a/docs/user-manual/modules/ROOT/pages/security.adoc b/docs/user-manual/modules/ROOT/pages/security.adoc
index 242f287f..aa8f42c 100644
--- a/docs/user-manual/modules/ROOT/pages/security.adoc
+++ b/docs/user-manual/modules/ROOT/pages/security.adoc
@@ -66,7 +66,7 @@ using the CXF Bus driven interceptor chain
* xref:components::spring-ws-component.adoc[Spring Web Services] - HTTP Basic
Authentication & WS-Security support
* xref:components::netty4-component.adoc[Netty] - SSL support
-* xref:components::mina2-component.adoc[MINA] - SSL support
+* xref:components::mina-component.adoc[MINA] - SSL support
* xref:components::cometd-component.adoc[Cometd] - SSL support
* xref:components::jms-component.adoc[JMS] - JAAS and SSL based security for client <-->
broker communication
diff --git a/docs/user-manual/modules/ROOT/pages/servicepool.adoc b/docs/user-manual/modules/ROOT/pages/servicepool.adoc
index 694de24..2fc8c64 100644
--- a/docs/user-manual/modules/ROOT/pages/servicepool.adoc
+++ b/docs/user-manual/modules/ROOT/pages/servicepool.adoc
@@ -20,7 +20,7 @@ stopping the Producer at each invocation. So where is it needed then?
Well these components uses pooled producers:
* xref:components::ftp-component.adoc[FTP]
-* xref:components::mina2-component.adoc[Mina]
+* xref:components::mina-component.adoc[Mina]
[[ServicePool-Usage]]
== Usage
diff --git a/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc b/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc
index 655f641..4c6d0dc 100644
--- a/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc
+++ b/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc
@@ -132,7 +132,7 @@ sendConfirmEmail bean
In the route lets imagine that the registration of the order has to be
done by sending data to a TCP socket that could be a big mainframe. As
Camel has many xref:components::index.adoc[Components] we will use the
-camel-mina component that supports xref:components::mina2-component.adoc[TCP] connectivity. So
+camel-mina component that supports xref:components::mina-component.adoc[TCP] connectivity. So
we change the route to:
[source,syntaxhighlighter-pre]