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 7028caa0da4641c2b2ec59b7841c30514099270d Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Aug 7 12:41:50 2019 +0200 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Updated docs --- .../camel-hl7/src/main/docs/hl7-dataformat.adoc | 10 +- .../camel-mina/src/main/docs/mina-component.adoc | 4 +- .../camel-netty/src/main/docs/netty-component.adoc | 160 +++++++-------- .../src/main/docs/netty4-http-component.adoc | 12 +- .../src/main/docs/syslog-dataformat.adoc | 8 +- components/readme.adoc | 79 +++++++- docs/components/modules/ROOT/nav.adoc | 2 +- .../modules/ROOT/pages/hl7-dataformat.adoc | 10 +- .../modules/ROOT/pages/mina-component.adoc | 4 +- ...{netty4-component.adoc => netty-component.adoc} | 218 ++++++++++----------- .../modules/ROOT/pages/netty4-http-component.adoc | 12 +- .../modules/ROOT/pages/syslog-dataformat.adoc | 8 +- .../ROOT/pages/asynchronous-routing-engine.adoc | 2 +- .../ROOT/pages/camel-configuration-utilities.adoc | 2 +- docs/user-manual/modules/ROOT/pages/index.adoc | 2 +- docs/user-manual/modules/ROOT/pages/security.adoc | 2 +- .../camel-spring-boot-dependencies/pom.xml | 6 +- 17 files changed, 306 insertions(+), 235 deletions(-) diff --git a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc index 704913e..6279b9a 100644 --- a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc +++ b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc @@ -10,7 +10,7 @@ v2 messages] using the http://hl7api.sourceforge.net[HAPI library]. This component supports the following: * HL7 MLLP codec for xref:mina-component.adoc[Mina] -* HL7 MLLP codec for xref:netty4-component.adoc[Netty4] +* HL7 MLLP codec for xref:netty-component.adoc[Netty] * 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 @@ -36,9 +36,9 @@ 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:mina-component.adoc[camel-mina] or -xref:netty4-component.adoc[camel-netty4] component is used with the +xref:netty-component.adoc[camel-netty] component is used with the `HL7MLLPCodec` (mina) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder` -(Netty4). +(Netty). HL7 MLLP codec can be configured as follows: @@ -130,12 +130,12 @@ public class PatientLookupService { === Exposing an HL7 listener using Netty (available from Camel 2.15 onwards) -In the Spring XML file, we configure a netty4 endpoint to listen for HL7 +In the Spring XML file, we configure a netty endpoint to listen for HL7 requests using TCP on port `8888`: [source,xml] ---- -<endpoint id="hl7NettyListener" uri="netty4:tcp://localhost:8888?sync=true&encoder=#hl7encoder&decoder=#hl7decoder"/> +<endpoint id="hl7NettyListener" uri="netty:tcp://localhost:8888?sync=true&encoder=#hl7encoder&decoder=#hl7decoder"/> ---- *sync=true* indicates that this listener is synchronous and therefore diff --git a/components/camel-mina/src/main/docs/mina-component.adoc b/components/camel-mina/src/main/docs/mina-component.adoc index cca546d..c2bebdc 100644 --- a/components/camel-mina/src/main/docs/mina-component.adoc +++ b/components/camel-mina/src/main/docs/mina-component.adoc @@ -6,7 +6,7 @@ The Mina2 component is a transport for working with http://mina.apache.org/[Apache MINA 2.x] -TIP: Favor using xref:netty4-component.adoc[Netty] as Netty is a much more active +TIP: Favor using xref:netty-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-mina all @@ -331,4 +331,4 @@ is, after `codec` and `logger`. * Component * Endpoint * Getting Started -* xref:netty4-component.adoc[Netty] +* xref:netty-component.adoc[Netty] diff --git a/components/camel-netty/src/main/docs/netty-component.adoc b/components/camel-netty/src/main/docs/netty-component.adoc index 1be586b..1acff4e 100644 --- a/components/camel-netty/src/main/docs/netty-component.adoc +++ b/components/camel-netty/src/main/docs/netty-component.adoc @@ -180,7 +180,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-netty4-starter</artifactId> + <artifactId>camel-netty-starter</artifactId> <version>x.x.x</version> <!-- use the same version as your Camel core version --> </dependency> @@ -194,85 +194,85 @@ The component supports 79 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *camel.component.netty4.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.netty4.configuration.allow-default-codec* | The netty component installs a default codec if both, encoder/decoder is null and textline is false. Setting allowDefaultCodec to false prevents the netty component from installing a default codec as the first element in the filter chain. | true | Boolean -| *camel.component.netty4.configuration.allow-serialized-headers* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean -| *camel.component.netty4.configuration.auto-append-delimiter* | Whether or not to auto append missing end delimiter when sending using the textline codec. | true | Boolean -| *camel.component.netty4.configuration.backlog* | Allows to configure a backlog for netty consumer (server). Note the backlog is just a best effort depending on the OS. Setting this option to a value such as 200, 500 or 1000, tells the TCP stack how long the "accept" queue can be If this option is not configured, then the backlog depends on OS setting. | | Integer -| *camel.component.netty4.configuration.boss-count* | When netty works on nio mode, it uses default bossCount parameter from Netty, which is 1. User can use this operation to override the default bossCount from Netty | 1 | Integer -| *camel.component.netty4.configuration.boss-group* | Set the BossGroup which could be used for handling the new connection of the server side across the NettyEndpoint | | EventLoopGroup -| *camel.component.netty4.configuration.broadcast* | Setting to choose Multicast over UDP | false | Boolean -| *camel.component.netty4.configuration.channel-group* | To use a explicit ChannelGroup. | | ChannelGroup -| *camel.component.netty4.configuration.client-initializer-factory* | To use a custom ClientInitializerFactory | | ClientInitializer Factory -| *camel.component.netty4.configuration.client-mode* | If the clientMode is true, netty consumer will connect the address as a TCP client. | false | Boolean -| *camel.component.netty4.configuration.connect-timeout* | Time to wait for a socket connection to be available. Value is in milliseconds. | 10000 | Integer -| *camel.component.netty4.configuration.correlation-manager* | To use a custom correlation manager to manage how request and reply messages are mapped when using request/reply with the netty producer. This should only be used if you have a way to map requests together with replies such as if there is correlation ids in both the request and reply messages. This can be used if you want to multiplex concurrent messages on the same channel (aka connection) in netty. When doing this you must [...] -| *camel.component.netty4.configuration.decoder-max-line-length* | The max line length to use for the textline codec. | 1024 | Integer -| *camel.component.netty4.configuration.decoders* | A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List -| *camel.component.netty4.configuration.delimiter* | The delimiter to use for the textline codec. Possible values are LINE and NULL. | | TextLineDelimiter -| *camel.component.netty4.configuration.disconnect* | Whether or not to disconnect(close) from Netty Channel right after use. Can be used for both consumer and producer. | false | Boolean -| *camel.component.netty4.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates NettyConsumer if it should disconnect where there is no reply to send back. | true | Boolean -| *camel.component.netty4.configuration.enabled-protocols* | Which protocols to enable when using SSL | TLSv1,TLSv1.1,TLSv1.2 | String -| *camel.component.netty4.configuration.encoders* | A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List -| *camel.component.netty4.configuration.encoding* | The encoding (a charset name) to use for the textline codec. If not provided, Camel will use the JVM default Charset. | | String -| *camel.component.netty4.configuration.host* | The hostname. <p/> For the consumer the hostname is localhost or 0.0.0.0. For the producer the hostname is the remote host to connect to | | String -| *camel.component.netty4.configuration.keep-alive* | Setting to ensure socket is not closed due to inactivity | true | Boolean -| *camel.component.netty4.configuration.key-store-format* | Keystore format to be used for payload encryption. Defaults to "JKS" if not set | | String -| *camel.component.netty4.configuration.key-store-resource* | Client side certificate keystore to be used for encryption. Is loaded by default from classpath, but you can prefix with "classpath:", "file:", or "http:" to load the resource from different systems. | | String -| *camel.component.netty4.configuration.lazy-channel-creation* | Channels 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.netty4.configuration.native-transport* | Whether to use native transport instead of NIO. Native transport takes advantage of the host operating system and is only supported on some platforms. You need to add the netty JAR for the host operating system you are using. See more details at: \http://netty.io/wiki/native-transports.html | false | Boolean -| *camel.component.netty4.configuration.need-client-auth* | Configures whether the server needs client authentication when using SSL. | false | Boolean -| *camel.component.netty4.configuration.netty-server-bootstrap-factory* | To use a custom NettyServerBootstrapFactory | | NettyServerBootstrap Factory -| *camel.component.netty4.configuration.network-interface* | When using UDP then this option can be used to specify a network interface by its name, such as eth0 to join a multicast group. | | String -| *camel.component.netty4.configuration.no-reply-log-level* | If sync is enabled this option dictates NettyConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel -| *camel.component.netty4.configuration.options* | Allows to configure additional netty options using "option." as prefix. For example "option.child.keepAlive=false" to set the netty option "child.keepAlive=false". See the Netty documentation for possible options that can be used. | | Map -| *camel.component.netty4.configuration.passphrase* | Password setting to use in order to encrypt/decrypt payloads sent using SSH | | String -| *camel.component.netty4.configuration.port* | The host port number | | Integer -| *camel.component.netty4.configuration.producer-pool-enabled* | Whether producer pool is enabled or not. Important: If you turn this off then a single shared connection is used for the producer, also if you are doing request/reply. That means there is a potential issue with interleaved responses if replies comes back out-of-order. Therefore you need to have a correlation id in both the request and reply messages so you can properly correlate the replies to the Camel callback that is res [...] -| *camel.component.netty4.configuration.producer-pool-max-active* | Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. | -1 | Integer -| *camel.component.netty4.configuration.producer-pool-max-idle* | Sets the cap on the number of "idle" instances in the pool. | 100 | Integer -| *camel.component.netty4.configuration.producer-pool-min-evictable-idle* | Sets the minimum amount of time (value in millis) an object may sit idle in the pool before it is eligible for eviction by the idle object evictor. | 300000 | Long -| *camel.component.netty4.configuration.producer-pool-min-idle* | Sets the minimum number of instances allowed in the producer pool before the evictor thread (if active) spawns new objects. | | Integer -| *camel.component.netty4.configuration.protocol* | The protocol to use which can be tcp or udp. | | String -| *camel.component.netty4.configuration.receive-buffer-size* | The TCP/UDP buffer sizes to be used during inbound communication. Size is bytes. | 65536 | Integer -| *camel.component.netty4.configuration.receive-buffer-size-predictor* | Configures the buffer size predictor. See details at Jetty documentation and this mail thread. | | Integer -| *camel.component.netty4.configuration.reconnect* | Used only in clientMode in consumer, the consumer will attempt to reconnect on disconnection if this is enabled | true | Boolean -| *camel.component.netty4.configuration.reconnect-interval* | Used if reconnect and clientMode is enabled. The interval in milli seconds to attempt reconnection | 10000 | Integer -| *camel.component.netty4.configuration.request-timeout* | Allows to use a timeout for the Netty producer when calling a remote server. By default no timeout is in use. The value is in milli seconds, so eg 30000 is 30 seconds. The requestTimeout is using Netty's ReadTimeoutHandler to trigger the timeout. | | Long -| *camel.component.netty4.configuration.reuse-address* | Setting to facilitate socket multiplexing | true | Boolean -| *camel.component.netty4.configuration.reuse-channel* | This option allows producers and consumers (in client mode) to reuse the same Netty {@link Channel} for the lifecycle of processing the {@link Exchange}. This is useful if you need to call a server multiple times in a Camel route and want to use the same network connection. When using this, the channel is not returned to the connection pool until the {@link Exchange} is done; or disconnected if the disconnect option is set to true. [...] -| *camel.component.netty4.configuration.security-provider* | Security provider to be used for payload encryption. Defaults to "SunX509" if not set. | | String -| *camel.component.netty4.configuration.send-buffer-size* | The TCP/UDP buffer sizes to be used during outbound communication. Size is bytes. | 65536 | Integer -| *camel.component.netty4.configuration.server-closed-channel-exception-caught-log-level* | If the server (NettyConsumer) catches an java.nio.channels.ClosedChannelException then its logged using this logging level. This is used to avoid logging the closed channel exceptions, as clients can disconnect abruptly and then cause a flood of closed exceptions in the Netty server. | | LoggingLevel -| *camel.component.netty4.configuration.server-exception-caught-log-level* | If the server (NettyConsumer) catches an exception then its logged using this logging level. | | LoggingLevel -| *camel.component.netty4.configuration.server-initializer-factory* | To use a custom ServerInitializerFactory | | ServerInitializer Factory -| *camel.component.netty4.configuration.ssl* | Setting to specify whether SSL encryption is applied to this endpoint | false | Boolean -| *camel.component.netty4.configuration.ssl-client-cert-headers* | When enabled and in SSL mode, then the Netty consumer will enrich the Camel Message with headers having information about the client certificate such as subject name, issuer name, serial number, and the valid date range. | false | Boolean -| *camel.component.netty4.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters -| *camel.component.netty4.configuration.ssl-handler* | Reference to a class that could be used to return an SSL Handler | | SslHandler -| *camel.component.netty4.configuration.sync* | Setting to set endpoint as one-way or request-response | true | Boolean -| *camel.component.netty4.configuration.tcp-no-delay* | Setting to improve TCP protocol performance | true | Boolean -| *camel.component.netty4.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.netty4.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.netty4.configuration.trust-store-resource* | Server side certificate keystore to be used for encryption. Is loaded by default from classpath, but you can prefix with "classpath:", "file:", or "http:" to load the resource from different systems. | | String -| *camel.component.netty4.configuration.udp-byte-array-codec* | For UDP only. If enabled the using byte array codec instead of Java serialization protocol. | false | Boolean -| *camel.component.netty4.configuration.udp-connectionless-sending* | This option supports connection less udp sending which is a real fire and forget. A connected udp send receive the PortUnreachableException if no one is listen on the receiving port. | false | Boolean -| *camel.component.netty4.configuration.use-byte-buf* | If the useByteBuf is true, netty producer will turn the message body into {@link ByteBuf} before sending it out. | false | Boolean -| *camel.component.netty4.configuration.using-executor-service* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean -| *camel.component.netty4.configuration.worker-count* | When netty works on nio mode, it uses default workerCount parameter from Netty, which is cpu_core_threads x 2. User can use this operation to override the default workerCount from Netty. | | Integer -| *camel.component.netty4.configuration.worker-group* | To use a explicit EventLoopGroup as the boss thread pool. For example to share a thread pool with multiple consumers or producers. By default each consumer or producer has their own worker pool with 2 x cpu count core threads. | | EventLoopGroup -| *camel.component.netty4.enabled* | Enable netty4 component | true | Boolean -| *camel.component.netty4.executor-service* | To use the given EventExecutorGroup. The option is a io.netty.util.concurrent.EventExecutorGroup type. | | String -| *camel.component.netty4.maximum-pool-size* | The thread pool size for the EventExecutorGroup if its in use. The default value is 16. | 16 | Integer -| *camel.component.netty4.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.netty4.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String -| *camel.component.netty4.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean -| *camel.component.netty4.configuration.client-pipeline-factory* | *Deprecated* | | ClientInitializer Factory -| *camel.component.netty4.configuration.decoder* | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of inbound payloads. | | ChannelHandler -| *camel.component.netty4.configuration.encoder* | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of outbound payloads. | | ChannelHandler -| *camel.component.netty4.configuration.key-store-file* | *Deprecated* Client side certificate keystore to be used for encryption | | File -| *camel.component.netty4.configuration.server-pipeline-factory* | *Deprecated* | | ServerInitializer Factory -| *camel.component.netty4.configuration.trust-store-file* | *Deprecated* Server side certificate keystore to be used for encryption | | File +| *camel.component.netty.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.netty.configuration.allow-default-codec* | The netty component installs a default codec if both, encoder/decoder is null and textline is false. Setting allowDefaultCodec to false prevents the netty component from installing a default codec as the first element in the filter chain. | true | Boolean +| *camel.component.netty.configuration.allow-serialized-headers* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean +| *camel.component.netty.configuration.auto-append-delimiter* | Whether or not to auto append missing end delimiter when sending using the textline codec. | true | Boolean +| *camel.component.netty.configuration.backlog* | Allows to configure a backlog for netty consumer (server). Note the backlog is just a best effort depending on the OS. Setting this option to a value such as 200, 500 or 1000, tells the TCP stack how long the "accept" queue can be If this option is not configured, then the backlog depends on OS setting. | | Integer +| *camel.component.netty.configuration.boss-count* | When netty works on nio mode, it uses default bossCount parameter from Netty, which is 1. User can use this operation to override the default bossCount from Netty | 1 | Integer +| *camel.component.netty.configuration.boss-group* | Set the BossGroup which could be used for handling the new connection of the server side across the NettyEndpoint | | EventLoopGroup +| *camel.component.netty.configuration.broadcast* | Setting to choose Multicast over UDP | false | Boolean +| *camel.component.netty.configuration.channel-group* | To use a explicit ChannelGroup. | | ChannelGroup +| *camel.component.netty.configuration.client-initializer-factory* | To use a custom ClientInitializerFactory | | ClientInitializer Factory +| *camel.component.netty.configuration.client-mode* | If the clientMode is true, netty consumer will connect the address as a TCP client. | false | Boolean +| *camel.component.netty.configuration.connect-timeout* | Time to wait for a socket connection to be available. Value is in milliseconds. | 10000 | Integer +| *camel.component.netty.configuration.correlation-manager* | To use a custom correlation manager to manage how request and reply messages are mapped when using request/reply with the netty producer. This should only be used if you have a way to map requests together with replies such as if there is correlation ids in both the request and reply messages. This can be used if you want to multiplex concurrent messages on the same channel (aka connection) in netty. When doing this you must h [...] +| *camel.component.netty.configuration.decoder-max-line-length* | The max line length to use for the textline codec. | 1024 | Integer +| *camel.component.netty.configuration.decoders* | A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List +| *camel.component.netty.configuration.delimiter* | The delimiter to use for the textline codec. Possible values are LINE and NULL. | | TextLineDelimiter +| *camel.component.netty.configuration.disconnect* | Whether or not to disconnect(close) from Netty Channel right after use. Can be used for both consumer and producer. | false | Boolean +| *camel.component.netty.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates NettyConsumer if it should disconnect where there is no reply to send back. | true | Boolean +| *camel.component.netty.configuration.enabled-protocols* | Which protocols to enable when using SSL | TLSv1,TLSv1.1,TLSv1.2 | String +| *camel.component.netty.configuration.encoders* | A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List +| *camel.component.netty.configuration.encoding* | The encoding (a charset name) to use for the textline codec. If not provided, Camel will use the JVM default Charset. | | String +| *camel.component.netty.configuration.host* | The hostname. <p/> For the consumer the hostname is localhost or 0.0.0.0. For the producer the hostname is the remote host to connect to | | String +| *camel.component.netty.configuration.keep-alive* | Setting to ensure socket is not closed due to inactivity | true | Boolean +| *camel.component.netty.configuration.key-store-format* | Keystore format to be used for payload encryption. Defaults to "JKS" if not set | | String +| *camel.component.netty.configuration.key-store-resource* | Client side certificate keystore to be used for encryption. Is loaded by default from classpath, but you can prefix with "classpath:", "file:", or "http:" to load the resource from different systems. | | String +| *camel.component.netty.configuration.lazy-channel-creation* | Channels 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.netty.configuration.native-transport* | Whether to use native transport instead of NIO. Native transport takes advantage of the host operating system and is only supported on some platforms. You need to add the netty JAR for the host operating system you are using. See more details at: \http://netty.io/wiki/native-transports.html | false | Boolean +| *camel.component.netty.configuration.need-client-auth* | Configures whether the server needs client authentication when using SSL. | false | Boolean +| *camel.component.netty.configuration.netty-server-bootstrap-factory* | To use a custom NettyServerBootstrapFactory | | NettyServerBootstrap Factory +| *camel.component.netty.configuration.network-interface* | When using UDP then this option can be used to specify a network interface by its name, such as eth0 to join a multicast group. | | String +| *camel.component.netty.configuration.no-reply-log-level* | If sync is enabled this option dictates NettyConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel +| *camel.component.netty.configuration.options* | Allows to configure additional netty options using "option." as prefix. For example "option.child.keepAlive=false" to set the netty option "child.keepAlive=false". See the Netty documentation for possible options that can be used. | | Map +| *camel.component.netty.configuration.passphrase* | Password setting to use in order to encrypt/decrypt payloads sent using SSH | | String +| *camel.component.netty.configuration.port* | The host port number | | Integer +| *camel.component.netty.configuration.producer-pool-enabled* | Whether producer pool is enabled or not. Important: If you turn this off then a single shared connection is used for the producer, also if you are doing request/reply. That means there is a potential issue with interleaved responses if replies comes back out-of-order. Therefore you need to have a correlation id in both the request and reply messages so you can properly correlate the replies to the Camel callback that is resp [...] +| *camel.component.netty.configuration.producer-pool-max-active* | Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. | -1 | Integer +| *camel.component.netty.configuration.producer-pool-max-idle* | Sets the cap on the number of "idle" instances in the pool. | 100 | Integer +| *camel.component.netty.configuration.producer-pool-min-evictable-idle* | Sets the minimum amount of time (value in millis) an object may sit idle in the pool before it is eligible for eviction by the idle object evictor. | 300000 | Long +| *camel.component.netty.configuration.producer-pool-min-idle* | Sets the minimum number of instances allowed in the producer pool before the evictor thread (if active) spawns new objects. | | Integer +| *camel.component.netty.configuration.protocol* | The protocol to use which can be tcp or udp. | | String +| *camel.component.netty.configuration.receive-buffer-size* | The TCP/UDP buffer sizes to be used during inbound communication. Size is bytes. | 65536 | Integer +| *camel.component.netty.configuration.receive-buffer-size-predictor* | Configures the buffer size predictor. See details at Jetty documentation and this mail thread. | | Integer +| *camel.component.netty.configuration.reconnect* | Used only in clientMode in consumer, the consumer will attempt to reconnect on disconnection if this is enabled | true | Boolean +| *camel.component.netty.configuration.reconnect-interval* | Used if reconnect and clientMode is enabled. The interval in milli seconds to attempt reconnection | 10000 | Integer +| *camel.component.netty.configuration.request-timeout* | Allows to use a timeout for the Netty producer when calling a remote server. By default no timeout is in use. The value is in milli seconds, so eg 30000 is 30 seconds. The requestTimeout is using Netty's ReadTimeoutHandler to trigger the timeout. | | Long +| *camel.component.netty.configuration.reuse-address* | Setting to facilitate socket multiplexing | true | Boolean +| *camel.component.netty.configuration.reuse-channel* | This option allows producers and consumers (in client mode) to reuse the same Netty {@link Channel} for the lifecycle of processing the {@link Exchange}. This is useful if you need to call a server multiple times in a Camel route and want to use the same network connection. When using this, the channel is not returned to the connection pool until the {@link Exchange} is done; or disconnected if the disconnect option is set to true. [...] +| *camel.component.netty.configuration.security-provider* | Security provider to be used for payload encryption. Defaults to "SunX509" if not set. | | String +| *camel.component.netty.configuration.send-buffer-size* | The TCP/UDP buffer sizes to be used during outbound communication. Size is bytes. | 65536 | Integer +| *camel.component.netty.configuration.server-closed-channel-exception-caught-log-level* | If the server (NettyConsumer) catches an java.nio.channels.ClosedChannelException then its logged using this logging level. This is used to avoid logging the closed channel exceptions, as clients can disconnect abruptly and then cause a flood of closed exceptions in the Netty server. | | LoggingLevel +| *camel.component.netty.configuration.server-exception-caught-log-level* | If the server (NettyConsumer) catches an exception then its logged using this logging level. | | LoggingLevel +| *camel.component.netty.configuration.server-initializer-factory* | To use a custom ServerInitializerFactory | | ServerInitializer Factory +| *camel.component.netty.configuration.ssl* | Setting to specify whether SSL encryption is applied to this endpoint | false | Boolean +| *camel.component.netty.configuration.ssl-client-cert-headers* | When enabled and in SSL mode, then the Netty consumer will enrich the Camel Message with headers having information about the client certificate such as subject name, issuer name, serial number, and the valid date range. | false | Boolean +| *camel.component.netty.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters +| *camel.component.netty.configuration.ssl-handler* | Reference to a class that could be used to return an SSL Handler | | SslHandler +| *camel.component.netty.configuration.sync* | Setting to set endpoint as one-way or request-response | true | Boolean +| *camel.component.netty.configuration.tcp-no-delay* | Setting to improve TCP protocol performance | true | Boolean +| *camel.component.netty.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.netty.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.netty.configuration.trust-store-resource* | Server side certificate keystore to be used for encryption. Is loaded by default from classpath, but you can prefix with "classpath:", "file:", or "http:" to load the resource from different systems. | | String +| *camel.component.netty.configuration.udp-byte-array-codec* | For UDP only. If enabled the using byte array codec instead of Java serialization protocol. | false | Boolean +| *camel.component.netty.configuration.udp-connectionless-sending* | This option supports connection less udp sending which is a real fire and forget. A connected udp send receive the PortUnreachableException if no one is listen on the receiving port. | false | Boolean +| *camel.component.netty.configuration.use-byte-buf* | If the useByteBuf is true, netty producer will turn the message body into {@link ByteBuf} before sending it out. | false | Boolean +| *camel.component.netty.configuration.using-executor-service* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean +| *camel.component.netty.configuration.worker-count* | When netty works on nio mode, it uses default workerCount parameter from Netty, which is cpu_core_threads x 2. User can use this operation to override the default workerCount from Netty. | | Integer +| *camel.component.netty.configuration.worker-group* | To use a explicit EventLoopGroup as the boss thread pool. For example to share a thread pool with multiple consumers or producers. By default each consumer or producer has their own worker pool with 2 x cpu count core threads. | | EventLoopGroup +| *camel.component.netty.enabled* | Whether to enable auto configuration of the netty component. This is enabled by default. | | Boolean +| *camel.component.netty.executor-service* | To use the given EventExecutorGroup. The option is a io.netty.util.concurrent.EventExecutorGroup type. | | String +| *camel.component.netty.maximum-pool-size* | The thread pool size for the EventExecutorGroup if its in use. The default value is 16. | 16 | Integer +| *camel.component.netty.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.netty.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String +| *camel.component.netty.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean +| *camel.component.netty.configuration.client-pipeline-factory* | *Deprecated* | | ClientInitializer Factory +| *camel.component.netty.configuration.decoder* | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of inbound payloads. | | ChannelHandler +| *camel.component.netty.configuration.encoder* | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of outbound payloads. | | ChannelHandler +| *camel.component.netty.configuration.key-store-file* | *Deprecated* Client side certificate keystore to be used for encryption | | File +| *camel.component.netty.configuration.server-pipeline-factory* | *Deprecated* | | ServerInitializer Factory +| *camel.component.netty.configuration.trust-store-file* | *Deprecated* Server side certificate keystore to be used for encryption | | File |=== // spring-boot-auto-configure options: END diff --git a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc index 95be433..0c4d0b5 100644 --- a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc +++ b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc @@ -3,8 +3,8 @@ *Available as of Camel version 2.14* -The Netty4 HTTP component is an extension to xref:netty4-component.adoc[Netty4] -component to facilitiate HTTP transport with xref:netty4-component.adoc[Netty4]. +The Netty4 HTTP component is an extension to xref:netty-component.adoc[Netty] +component to facilitiate HTTP transport with xref:netty-component.adoc[Netty]. This camel component supports both producer and consumer endpoints. @@ -77,9 +77,9 @@ at the endpoint URI definition level (like `to` or `from` DSL elements). *A lot more options* This component inherits all the options from -xref:netty4-component.adoc[Netty4], so make sure to look at -the xref:netty4-component.adoc[Netty4] documentation as well. -Notice that some options from xref:netty4-component.adoc[Netty4] is not +xref:netty-component.adoc[Netty], so make sure to look at +the xref:netty-component.adoc[Netty] documentation as well. +Notice that some options from xref:netty-component.adoc[Netty] is not applicable when using this Netty4 HTTP component, such as options related to UDP transport. ==== @@ -633,6 +633,6 @@ below: * Endpoint * Getting Started -* xref:netty4-component.adoc[Netty] +* xref:netty-component.adoc[Netty] * Netty HTTP Server Example * xref:jetty-component.adoc[Jetty] diff --git a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc index 0258b0a..17ccb31 100644 --- a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc +++ b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc @@ -14,9 +14,9 @@ SyslogMessage model objects. * Type Converter from/to SyslogMessage and String * Integration with the xref:mina-component.adoc[camel-mina] component. -* Integration with the xref:netty4-component.adoc[camel-netty] component. +* Integration with the xref:netty-component.adoc[camel-netty] component. * Encoder and decoder for -the xref:netty4-component.adoc[Netty4 Component] component. +the xref:netty-component.adoc[Netty Component] component. * 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:mina-component.adoc[Mina Component] component or xref:netty4-component.adoc[Netty4 Component] +xref:mina-component.adoc[Mina Component] component or xref:netty-component.adoc[Netty 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`. @@ -93,7 +93,7 @@ ND To expose a Syslog listener service we reuse the existing xref:mina-component.adoc[Mina Component] component -or xref:netty4-component.adoc[Netty4 Component] where we just use +or xref:netty-component.adoc[Netty Component] where we just use the `SyslogDataFormat` to marshal and unmarshal messages === Exposing a Syslog listener diff --git a/components/readme.adoc b/components/readme.adoc index 30cb599..c4c46ab 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1,7 +1,7 @@ = Components // components: START -Number of Components: 278 in 218 JAR artifacts (0 deprecated) +Number of Components: 297 in 234 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -451,6 +451,9 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) | link:camel-jetty/src/main/docs/jetty-component.adoc[Jetty] (camel-jetty) + `jetty:httpUri` | 1.2 | The jetty component provides HTTP-based endpoints for consuming and producing HTTP requests. +| link:camel-websocket/src/main/docs/websocket-component.adoc[Jetty Websocket] (camel-websocket) + +`websocket:host:port/resourceUri` | 2.10 | The websocket component provides websocket endpoints with Jetty for communicating with clients using websocket. + | link:camel-jgroups/src/main/docs/jgroups-component.adoc[JGroups] (camel-jgroups) + `jgroups:clusterName` | 2.13 | The jgroups component provides exchange of messages between Camel and JGroups clusters. @@ -601,6 +604,9 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) | link:camel-nats/src/main/docs/nats-component.adoc[Nats] (camel-nats) + `nats:servers` | 2.17 | The nats component allows you produce and consume messages from NATS. +| link:camel-netty/src/main/docs/netty-component.adoc[Netty] (camel-netty) + +`netty:protocol:host:port` | 2.14 | Socket level networking using TCP or UDP with the Netty 4.x library. + | link:camel-netty4-http/src/main/docs/netty4-http-component.adoc[Netty4 HTTP] (camel-netty4-http) + `netty4-http:protocol:host:port/path` | 2.14 | Netty HTTP server and client using the Netty 4.x library. @@ -694,6 +700,9 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) | link:camel-rest/src/main/docs/rest-api-component.adoc[REST API] (camel-rest) + `rest-api:path/contextIdPattern` | 2.16 | The rest-api component is used for providing Swagger API of the REST services which has been defined using the rest-dsl in Camel. +| link:camel-rest-swagger/src/main/docs/rest-swagger-component.adoc[REST Swagger] (camel-rest-swagger) + +`rest-swagger:specificationUri#operationId` | 2.19 | An awesome REST endpoint backed by Swagger specifications. + | link:camel-restlet/src/main/docs/restlet-component.adoc[Restlet] (camel-restlet) + `restlet:protocol:host:port/uriPattern` | 2.0 | Component for consuming and producing Restful resources using Restlet. @@ -766,6 +775,9 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) | link:camel-splunk/src/main/docs/splunk-component.adoc[Splunk] (camel-splunk) + `splunk:name` | 2.13 | The splunk component allows to publish or search for events in Splunk. +| link:camel-spring-batch/src/main/docs/spring-batch-component.adoc[Spring Batch] (camel-spring-batch) + +`spring-batch:jobName` | 2.10 | The spring-batch component allows to send messages to Spring Batch for further processing. + | link:camel-spring/src/main/docs/spring-event-component.adoc[Spring Event] (camel-spring) + `spring-event:name` | 1.4 | The spring-event component allows to listen for Spring Application Events. @@ -775,6 +787,12 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) | link:camel-spring-ldap/src/main/docs/spring-ldap-component.adoc[Spring LDAP] (camel-spring-ldap) + `spring-ldap:templateName` | 2.11 | The spring-ldap component allows you to perform searches in LDAP servers using filters as the message payload. +| link:camel-spring-redis/src/main/docs/spring-redis-component.adoc[Spring Redis] (camel-spring-redis) + +`spring-redis:host:port` | 2.11 | The spring-redis component allows sending and receiving messages from Redis. + +| link:camel-spring-ws/src/main/docs/spring-ws-component.adoc[Spring WebService] (camel-spring-ws) + +`spring-ws:type:lookupKey:webServiceEndpointUri` | 2.6 | The spring-ws component is used for SOAP WebServices using Spring WebServices. + | link:camel-sql/src/main/docs/sql-component.adoc[SQL] (camel-sql) + `sql:query` | 1.4 | The sql component allows you to work with databases using JDBC SQL queries. @@ -784,6 +802,12 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) | link:camel-ssh/src/main/docs/ssh-component.adoc[SSH] (camel-ssh) + `ssh:host:port` | 2.10 | The ssh component enables access to SSH servers such that you can send an SSH command, and process the response. +| link:camel-stax/src/main/docs/stax-component.adoc[StAX] (camel-stax) + +`stax:contentHandlerClass` | 2.9 | The stax component allows messages to be process through a SAX ContentHandler. + +| link:camel-stomp/src/main/docs/stomp-component.adoc[Stomp] (camel-stomp) + +`stomp:destination` | 2.12 | The stomp component is used for communicating with Stomp compliant message brokers. + | link:camel-stream/src/main/docs/stream-component.adoc[Stream] (camel-stream) + `stream:kind` | 1.3 | The stream: component provides access to the system-in, system-out and system-err streams as well as allowing streaming of file and URL. @@ -796,12 +820,30 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) | link:camel-telegram/src/main/docs/telegram-component.adoc[Telegram] (camel-telegram) + `telegram:type/authorizationToken` | 2.18 | The telegram component provides access to the Telegram Bot API. +| link:camel-thrift/src/main/docs/thrift-component.adoc[Thrift] (camel-thrift) + +`thrift:host:port/service` | 2.20 | The Thrift component allows to call and expose remote procedures (RPC) with Apache Thrift data format and serialization mechanism + +| link:camel-tika/src/main/docs/tika-component.adoc[Tika] (camel-tika) + +`tika:operation` | 2.19 | This component integrates with Apache Tika to extract content and metadata from thousands of file types. + | link:camel-timer/src/main/docs/timer-component.adoc[Timer] (camel-timer) + `timer:timerName` | 1.0 | The timer component is used for generating message exchanges when a timer fires. | link:camel-twilio/src/main/docs/twilio-component.adoc[Twilio] (camel-twilio) + `twilio:apiName/methodName` | 2.20 | The Twilio component allows you to interact with the Twilio REST APIs using Twilio Java SDK. +| link:camel-twitter/src/main/docs/twitter-directmessage-component.adoc[Twitter Direct Message] (camel-twitter) + +`twitter-directmessage:user` | 2.10 | The Twitter Direct Message Component consumes/produces user's direct messages. + +| link:camel-twitter/src/main/docs/twitter-search-component.adoc[Twitter Search] (camel-twitter) + +`twitter-search:keywords` | 2.10 | The Twitter Search component consumes search results. + +| link:camel-twitter/src/main/docs/twitter-streaming-component.adoc[Twitter Streaming] (camel-twitter) + +`twitter-streaming:streamingType` | 2.10 | The Twitter Streaming component consumes twitter statuses using Streaming API. + +| link:camel-twitter/src/main/docs/twitter-timeline-component.adoc[Twitter Timeline] (camel-twitter) + +`twitter-timeline:timelineType` | 2.10 | The Twitter Timeline component consumes twitter timeline or update the status of specific user. + | link:camel-undertow/src/main/docs/undertow-component.adoc[Undertow] (camel-undertow) + `undertow:httpURI` | 2.16 | The undertow component provides HTTP and WebSocket based endpoints for consuming and producing HTTP/WebSocket requests. @@ -820,6 +862,9 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) | link:camel-weather/src/main/docs/weather-component.adoc[Weather] (camel-weather) + `weather:name` | 2.12 | Polls the weather information from Open Weather Map. +| link:camel-web3j/src/main/docs/web3j-component.adoc[Web3j Ethereum Blockchain] (camel-web3j) + +`web3j:nodeAddress` | 2.22 | The web3j component uses the Web3j client API and allows you to add/read nodes to/from a web3j compliant content repositories. + | link:camel-webhook/src/main/docs/webhook-component.adoc[Webhook] (camel-webhook) + `webhook:endpointUri` | 3.0 | The webhook component allows other Camel components that can receive push notifications to expose webhook endpoints and automatically register them with their own webhook provider. @@ -829,6 +874,15 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) | link:camel-xchange/src/main/docs/xchange-component.adoc[XChange] (camel-xchange) + `xchange:name` | 2.21 | The camel-xchange component provide access to many bitcoin and altcoin exchanges for trading and accessing market data. +| link:camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc[XML Security] (camel-xmlsecurity) + +`xmlsecurity:command:name` | 2.12 | Used to sign and verify exchanges using the XML signature specification. + +| link:camel-xmpp/src/main/docs/xmpp-component.adoc[XMPP] (camel-xmpp) + +`xmpp:host:port/participant` | 1.0 | To send and receive messages from a XMPP (chat) server. + +| link:camel-saxon/src/main/docs/xquery-component.adoc[XQuery] (camel-saxon) + +`xquery:resourceUri` | 1.0 | Transforms the message using a XQuery template using Saxon. + | link:camel-xslt/src/main/docs/xslt-component.adoc[XSLT] (camel-xslt) + `xslt:resourceUri` | 1.3 | Transforms the message using a XSLT template. @@ -838,6 +892,9 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) | link:camel-zendesk/src/main/docs/zendesk-component.adoc[Zendesk] (camel-zendesk) + `zendesk:methodName` | 2.19 | Allows producing messages to manage Zendesk ticket, user, organization, etc. +| link:camel-zookeeper/src/main/docs/zookeeper-component.adoc[ZooKeeper] (camel-zookeeper) + +`zookeeper:serverUrls/path` | 2.9 | The zookeeper component allows interaction with a ZooKeeper cluster. + | link:camel-zookeeper-master/src/main/docs/zookeeper-master-component.adoc[ZooKeeper Master] (camel-zookeeper-master) + `zookeeper-master:groupName:consumerEndpointUri` | 2.19 | Represents an endpoint which only becomes active when it obtains the master lock @@ -848,7 +905,7 @@ Number of Components: 278 in 218 JAR artifacts (0 deprecated) == Data Formats // dataformats: START -Number of Data Formats: 41 in 33 JAR artifacts (0 deprecated) +Number of Data Formats: 44 in 36 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -918,8 +975,12 @@ Number of Data Formats: 41 in 33 JAR artifacts (0 deprecated) | link:camel-soap/src/main/docs/soapjaxb-dataformat.adoc[SOAP] (camel-soap) | 2.3 | SOAP is a data format which uses JAXB2 and JAX-WS annotations to marshal and unmarshal SOAP payloads. +| link:camel-syslog/src/main/docs/syslog-dataformat.adoc[Syslog] (camel-syslog) | 2.6 | The Syslog dataformat is used for working with RFC3164 and RFC5424 messages (logging and monitoring). + | link:camel-tarfile/src/main/docs/tarfile-dataformat.adoc[Tar File] (camel-tarfile) | 2.16 | The Tar File data format is a message compression and de-compression format of tar files. +| link:camel-thrift/src/main/docs/thrift-dataformat.adoc[Thrift] (camel-thrift) | 2.20 | The Thrift data format is used for serialization and deserialization of messages using Apache Thrift binary dataformat. + | link:camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc[TidyMarkup] (camel-tagsoup) | 2.0 | TidyMarkup data format is used for parsing HTML and return it as pretty well-formed HTML. | link:camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc[uniVocity CSV] (camel-univocity-parsers) | 2.15 | The uniVocity CSV data format is used for working with CSV (Comma Separated Values) flat payloads. @@ -928,6 +989,8 @@ Number of Data Formats: 41 in 33 JAR artifacts (0 deprecated) | link:camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc[uniVocity TSV] (camel-univocity-parsers) | 2.15 | The uniVocity TSV data format is used for working with TSV (Tabular Separated Values) flat payloads. +| link:camel-xmlsecurity/src/main/docs/secureXML-dataformat.adoc[XML Security] (camel-xmlsecurity) | 2.0 | The XML Security data format facilitates encryption and decryption of XML payloads. + | link:camel-xstream/src/main/docs/xstream-dataformat.adoc[XStream] (camel-xstream) | 1.3 | XSTream data format is used for unmarshal a XML payload to POJO or to marshal POJO back to XML payload. | link:camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc[YAML SnakeYAML] (camel-snakeyaml) | 2.17 | YAML is a data format to marshal and unmarshal Java objects to and from YAML. @@ -942,7 +1005,7 @@ Number of Data Formats: 41 in 33 JAR artifacts (0 deprecated) == Expression Languages // languages: START -Number of Languages: 16 in 10 JAR artifacts (0 deprecated) +Number of Languages: 17 in 11 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -979,6 +1042,8 @@ Number of Languages: 16 in 10 JAR artifacts (0 deprecated) | link:camel-jaxp/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates. | link:camel-xpath/src/main/docs/xpath-language.adoc[XPath] (camel-xpath) | 1.1 | To use XPath (XML) in Camel expressions or predicates. + +| link:camel-saxon/src/main/docs/xquery-language.adoc[XQuery] (camel-saxon) | 1.0 | To use XQuery (XML) in Camel expressions or predicates. |=== // languages: END @@ -986,7 +1051,7 @@ Number of Languages: 16 in 10 JAR artifacts (0 deprecated) == Miscellaneous Components // others: START -Number of Miscellaneous Components: 30 in 30 JAR artifacts (0 deprecated) +Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -1012,12 +1077,16 @@ Number of Miscellaneous Components: 30 in 30 JAR artifacts (0 deprecated) | link:camel-microprofile-config/src/main/docs/microprofile-config.adoc[Microprofile Config] (camel-microprofile-config) | 3.0 | Bridging Eclipse MicroProfile Config with Camel properties +| link:camel-opentracing/src/main/docs/opentracing.adoc[OpenTracing] (camel-opentracing) | 2.19 | Distributed tracing using OpenTracing + | link:camel-reactive-executor-vertx/src/main/docs/reactive-executor-vertx.adoc[Reactive Executor Vertx] (camel-reactive-executor-vertx) | 3.0 | Reactive Executor for camel-core using Vert X | link:camel-reactor/src/main/docs/reactor.adoc[Reactor] (camel-reactor) | 2.20 | Reactor based back-end for Camel's reactive streams component | link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18 | Using Netflix Ribbon for client side load balancing +| link:camel-rxjava/src/main/docs/rxjava.adoc[Rxjava] (camel-rxjava) | 2.22 | RxJava2 based back-end for Camel's reactive streams component + | link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | 2.5 | Security using Shiro | link:camel-spring-boot/src/main/docs/spring-boot.adoc[Spring Boot] (camel-spring-boot) | 2.15 | Using Camel with Spring Boot @@ -1051,6 +1120,8 @@ Number of Miscellaneous Components: 30 in 30 JAR artifacts (0 deprecated) | link:camel-testcontainers-spring/src/main/docs/testcontainers-spring.adoc[Testcontainers Spring] (camel-testcontainers-spring) | 2.22 | Camel unit testing with Spring and testcontainers | link:camel-aws-xray/src/main/docs/aws-xray.adoc[XRay] (camel-aws-xray) | 2.21 | Distributed tracing using AWS XRay + +| link:camel-zipkin/src/main/docs/zipkin.adoc[Zipkin] (camel-zipkin) | 2.18 | Distributed message tracing using Zipkin |=== // others: END diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index 807cdff..e05259a 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -247,8 +247,8 @@ * xref:mybatis-component.adoc[MyBatis Component] * xref:nagios-component.adoc[Nagios Component] * xref:nats-component.adoc[Nats Component] +* xref:netty-component.adoc[Netty Component] * xref:netty4-http-component.adoc[Netty4 HTTP Component] -* xref:netty4-component.adoc[Netty4 Component] * xref:nsq-component.adoc[NSQ Component] * xref:ognl-language.adoc[OGNL Language] * xref:olingo2-component.adoc[Olingo2 Component] diff --git a/docs/components/modules/ROOT/pages/hl7-dataformat.adoc b/docs/components/modules/ROOT/pages/hl7-dataformat.adoc index 704913e..6279b9a 100644 --- a/docs/components/modules/ROOT/pages/hl7-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/hl7-dataformat.adoc @@ -10,7 +10,7 @@ v2 messages] using the http://hl7api.sourceforge.net[HAPI library]. This component supports the following: * HL7 MLLP codec for xref:mina-component.adoc[Mina] -* HL7 MLLP codec for xref:netty4-component.adoc[Netty4] +* HL7 MLLP codec for xref:netty-component.adoc[Netty] * 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 @@ -36,9 +36,9 @@ 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:mina-component.adoc[camel-mina] or -xref:netty4-component.adoc[camel-netty4] component is used with the +xref:netty-component.adoc[camel-netty] component is used with the `HL7MLLPCodec` (mina) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder` -(Netty4). +(Netty). HL7 MLLP codec can be configured as follows: @@ -130,12 +130,12 @@ public class PatientLookupService { === Exposing an HL7 listener using Netty (available from Camel 2.15 onwards) -In the Spring XML file, we configure a netty4 endpoint to listen for HL7 +In the Spring XML file, we configure a netty endpoint to listen for HL7 requests using TCP on port `8888`: [source,xml] ---- -<endpoint id="hl7NettyListener" uri="netty4:tcp://localhost:8888?sync=true&encoder=#hl7encoder&decoder=#hl7decoder"/> +<endpoint id="hl7NettyListener" uri="netty:tcp://localhost:8888?sync=true&encoder=#hl7encoder&decoder=#hl7decoder"/> ---- *sync=true* indicates that this listener is synchronous and therefore diff --git a/docs/components/modules/ROOT/pages/mina-component.adoc b/docs/components/modules/ROOT/pages/mina-component.adoc index cca546d..c2bebdc 100644 --- a/docs/components/modules/ROOT/pages/mina-component.adoc +++ b/docs/components/modules/ROOT/pages/mina-component.adoc @@ -6,7 +6,7 @@ The Mina2 component is a transport for working with http://mina.apache.org/[Apache MINA 2.x] -TIP: Favor using xref:netty4-component.adoc[Netty] as Netty is a much more active +TIP: Favor using xref:netty-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-mina all @@ -331,4 +331,4 @@ is, after `codec` and `logger`. * Component * Endpoint * Getting Started -* xref:netty4-component.adoc[Netty] +* xref:netty-component.adoc[Netty] diff --git a/docs/components/modules/ROOT/pages/netty4-component.adoc b/docs/components/modules/ROOT/pages/netty-component.adoc similarity index 66% rename from docs/components/modules/ROOT/pages/netty4-component.adoc rename to docs/components/modules/ROOT/pages/netty-component.adoc index 1781e1a..1acff4e 100644 --- a/docs/components/modules/ROOT/pages/netty4-component.adoc +++ b/docs/components/modules/ROOT/pages/netty-component.adoc @@ -1,9 +1,9 @@ -[[netty4-component]] -= Netty4 Component +[[netty-component]] += Netty Component *Available as of Camel version 2.14* -The Netty4 component in Camel is a socket communication component, +The Netty component in Camel is a socket communication component, based on the http://netty.io/[Netty] project version 4. + Netty is a NIO client server framework which enables quick and easy development of networkServerInitializerFactory applications such as @@ -25,7 +25,7 @@ for this component: ---- <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-netty4</artifactId> + <artifactId>camel-netty</artifactId> <version>x.x.x</version> <!-- use the same version as your Camel core version --> </dependency> @@ -37,8 +37,8 @@ The URI scheme for a netty component is as follows [source,text] ---- -netty4:tcp://0.0.0.0:99999[?options] -netty4:udp://remotehost:99999/[?options] +netty:tcp://0.0.0.0:99999[?options] +netty:udp://remotehost:99999/[?options] ---- This component supports producer and consumer endpoints for both TCP and @@ -50,7 +50,7 @@ You can append query options to the URI in the following format, == Options // component options: START -The Netty4 component supports 7 options, which are listed below. +The Netty component supports 7 options, which are listed below. @@ -69,10 +69,10 @@ The Netty4 component supports 7 options, which are listed below. // endpoint options: START -The Netty4 endpoint is configured using URI syntax: +The Netty endpoint is configured using URI syntax: ---- -netty4:protocol:host:port +netty:protocol:host:port ---- with the following path and query parameters: @@ -180,7 +180,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s ---- <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-netty4-starter</artifactId> + <artifactId>camel-netty-starter</artifactId> <version>x.x.x</version> <!-- use the same version as your Camel core version --> </dependency> @@ -194,85 +194,85 @@ The component supports 79 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *camel.component.netty4.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.netty4.configuration.allow-default-codec* | The netty component installs a default codec if both, encoder/decoder is null and textline is false. Setting allowDefaultCodec to false prevents the netty component from installing a default codec as the first element in the filter chain. | true | Boolean -| *camel.component.netty4.configuration.allow-serialized-headers* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean -| *camel.component.netty4.configuration.auto-append-delimiter* | Whether or not to auto append missing end delimiter when sending using the textline codec. | true | Boolean -| *camel.component.netty4.configuration.backlog* | Allows to configure a backlog for netty consumer (server). Note the backlog is just a best effort depending on the OS. Setting this option to a value such as 200, 500 or 1000, tells the TCP stack how long the "accept" queue can be If this option is not configured, then the backlog depends on OS setting. | | Integer -| *camel.component.netty4.configuration.boss-count* | When netty works on nio mode, it uses default bossCount parameter from Netty, which is 1. User can use this operation to override the default bossCount from Netty | 1 | Integer -| *camel.component.netty4.configuration.boss-group* | Set the BossGroup which could be used for handling the new connection of the server side across the NettyEndpoint | | EventLoopGroup -| *camel.component.netty4.configuration.broadcast* | Setting to choose Multicast over UDP | false | Boolean -| *camel.component.netty4.configuration.channel-group* | To use a explicit ChannelGroup. | | ChannelGroup -| *camel.component.netty4.configuration.client-initializer-factory* | To use a custom ClientInitializerFactory | | ClientInitializer Factory -| *camel.component.netty4.configuration.client-mode* | If the clientMode is true, netty consumer will connect the address as a TCP client. | false | Boolean -| *camel.component.netty4.configuration.connect-timeout* | Time to wait for a socket connection to be available. Value is in milliseconds. | 10000 | Integer -| *camel.component.netty4.configuration.correlation-manager* | To use a custom correlation manager to manage how request and reply messages are mapped when using request/reply with the netty producer. This should only be used if you have a way to map requests together with replies such as if there is correlation ids in both the request and reply messages. This can be used if you want to multiplex concurrent messages on the same channel (aka connection) in netty. When doing this you must [...] -| *camel.component.netty4.configuration.decoder-max-line-length* | The max line length to use for the textline codec. | 1024 | Integer -| *camel.component.netty4.configuration.decoders* | A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List -| *camel.component.netty4.configuration.delimiter* | The delimiter to use for the textline codec. Possible values are LINE and NULL. | | TextLineDelimiter -| *camel.component.netty4.configuration.disconnect* | Whether or not to disconnect(close) from Netty Channel right after use. Can be used for both consumer and producer. | false | Boolean -| *camel.component.netty4.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates NettyConsumer if it should disconnect where there is no reply to send back. | true | Boolean -| *camel.component.netty4.configuration.enabled-protocols* | Which protocols to enable when using SSL | TLSv1,TLSv1.1,TLSv1.2 | String -| *camel.component.netty4.configuration.encoders* | A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List -| *camel.component.netty4.configuration.encoding* | The encoding (a charset name) to use for the textline codec. If not provided, Camel will use the JVM default Charset. | | String -| *camel.component.netty4.configuration.host* | The hostname. <p/> For the consumer the hostname is localhost or 0.0.0.0. For the producer the hostname is the remote host to connect to | | String -| *camel.component.netty4.configuration.keep-alive* | Setting to ensure socket is not closed due to inactivity | true | Boolean -| *camel.component.netty4.configuration.key-store-format* | Keystore format to be used for payload encryption. Defaults to "JKS" if not set | | String -| *camel.component.netty4.configuration.key-store-resource* | Client side certificate keystore to be used for encryption. Is loaded by default from classpath, but you can prefix with "classpath:", "file:", or "http:" to load the resource from different systems. | | String -| *camel.component.netty4.configuration.lazy-channel-creation* | Channels 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.netty4.configuration.native-transport* | Whether to use native transport instead of NIO. Native transport takes advantage of the host operating system and is only supported on some platforms. You need to add the netty JAR for the host operating system you are using. See more details at: \http://netty.io/wiki/native-transports.html | false | Boolean -| *camel.component.netty4.configuration.need-client-auth* | Configures whether the server needs client authentication when using SSL. | false | Boolean -| *camel.component.netty4.configuration.netty-server-bootstrap-factory* | To use a custom NettyServerBootstrapFactory | | NettyServerBootstrap Factory -| *camel.component.netty4.configuration.network-interface* | When using UDP then this option can be used to specify a network interface by its name, such as eth0 to join a multicast group. | | String -| *camel.component.netty4.configuration.no-reply-log-level* | If sync is enabled this option dictates NettyConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel -| *camel.component.netty4.configuration.options* | Allows to configure additional netty options using "option." as prefix. For example "option.child.keepAlive=false" to set the netty option "child.keepAlive=false". See the Netty documentation for possible options that can be used. | | Map -| *camel.component.netty4.configuration.passphrase* | Password setting to use in order to encrypt/decrypt payloads sent using SSH | | String -| *camel.component.netty4.configuration.port* | The host port number | | Integer -| *camel.component.netty4.configuration.producer-pool-enabled* | Whether producer pool is enabled or not. Important: If you turn this off then a single shared connection is used for the producer, also if you are doing request/reply. That means there is a potential issue with interleaved responses if replies comes back out-of-order. Therefore you need to have a correlation id in both the request and reply messages so you can properly correlate the replies to the Camel callback that is res [...] -| *camel.component.netty4.configuration.producer-pool-max-active* | Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. | -1 | Integer -| *camel.component.netty4.configuration.producer-pool-max-idle* | Sets the cap on the number of "idle" instances in the pool. | 100 | Integer -| *camel.component.netty4.configuration.producer-pool-min-evictable-idle* | Sets the minimum amount of time (value in millis) an object may sit idle in the pool before it is eligible for eviction by the idle object evictor. | 300000 | Long -| *camel.component.netty4.configuration.producer-pool-min-idle* | Sets the minimum number of instances allowed in the producer pool before the evictor thread (if active) spawns new objects. | | Integer -| *camel.component.netty4.configuration.protocol* | The protocol to use which can be tcp or udp. | | String -| *camel.component.netty4.configuration.receive-buffer-size* | The TCP/UDP buffer sizes to be used during inbound communication. Size is bytes. | 65536 | Integer -| *camel.component.netty4.configuration.receive-buffer-size-predictor* | Configures the buffer size predictor. See details at Jetty documentation and this mail thread. | | Integer -| *camel.component.netty4.configuration.reconnect* | Used only in clientMode in consumer, the consumer will attempt to reconnect on disconnection if this is enabled | true | Boolean -| *camel.component.netty4.configuration.reconnect-interval* | Used if reconnect and clientMode is enabled. The interval in milli seconds to attempt reconnection | 10000 | Integer -| *camel.component.netty4.configuration.request-timeout* | Allows to use a timeout for the Netty producer when calling a remote server. By default no timeout is in use. The value is in milli seconds, so eg 30000 is 30 seconds. The requestTimeout is using Netty's ReadTimeoutHandler to trigger the timeout. | | Long -| *camel.component.netty4.configuration.reuse-address* | Setting to facilitate socket multiplexing | true | Boolean -| *camel.component.netty4.configuration.reuse-channel* | This option allows producers and consumers (in client mode) to reuse the same Netty {@link Channel} for the lifecycle of processing the {@link Exchange}. This is useful if you need to call a server multiple times in a Camel route and want to use the same network connection. When using this, the channel is not returned to the connection pool until the {@link Exchange} is done; or disconnected if the disconnect option is set to true. [...] -| *camel.component.netty4.configuration.security-provider* | Security provider to be used for payload encryption. Defaults to "SunX509" if not set. | | String -| *camel.component.netty4.configuration.send-buffer-size* | The TCP/UDP buffer sizes to be used during outbound communication. Size is bytes. | 65536 | Integer -| *camel.component.netty4.configuration.server-closed-channel-exception-caught-log-level* | If the server (NettyConsumer) catches an java.nio.channels.ClosedChannelException then its logged using this logging level. This is used to avoid logging the closed channel exceptions, as clients can disconnect abruptly and then cause a flood of closed exceptions in the Netty server. | | LoggingLevel -| *camel.component.netty4.configuration.server-exception-caught-log-level* | If the server (NettyConsumer) catches an exception then its logged using this logging level. | | LoggingLevel -| *camel.component.netty4.configuration.server-initializer-factory* | To use a custom ServerInitializerFactory | | ServerInitializer Factory -| *camel.component.netty4.configuration.ssl* | Setting to specify whether SSL encryption is applied to this endpoint | false | Boolean -| *camel.component.netty4.configuration.ssl-client-cert-headers* | When enabled and in SSL mode, then the Netty consumer will enrich the Camel Message with headers having information about the client certificate such as subject name, issuer name, serial number, and the valid date range. | false | Boolean -| *camel.component.netty4.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters -| *camel.component.netty4.configuration.ssl-handler* | Reference to a class that could be used to return an SSL Handler | | SslHandler -| *camel.component.netty4.configuration.sync* | Setting to set endpoint as one-way or request-response | true | Boolean -| *camel.component.netty4.configuration.tcp-no-delay* | Setting to improve TCP protocol performance | true | Boolean -| *camel.component.netty4.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.netty4.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.netty4.configuration.trust-store-resource* | Server side certificate keystore to be used for encryption. Is loaded by default from classpath, but you can prefix with "classpath:", "file:", or "http:" to load the resource from different systems. | | String -| *camel.component.netty4.configuration.udp-byte-array-codec* | For UDP only. If enabled the using byte array codec instead of Java serialization protocol. | false | Boolean -| *camel.component.netty4.configuration.udp-connectionless-sending* | This option supports connection less udp sending which is a real fire and forget. A connected udp send receive the PortUnreachableException if no one is listen on the receiving port. | false | Boolean -| *camel.component.netty4.configuration.use-byte-buf* | If the useByteBuf is true, netty producer will turn the message body into {@link ByteBuf} before sending it out. | false | Boolean -| *camel.component.netty4.configuration.using-executor-service* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean -| *camel.component.netty4.configuration.worker-count* | When netty works on nio mode, it uses default workerCount parameter from Netty, which is cpu_core_threads x 2. User can use this operation to override the default workerCount from Netty. | | Integer -| *camel.component.netty4.configuration.worker-group* | To use a explicit EventLoopGroup as the boss thread pool. For example to share a thread pool with multiple consumers or producers. By default each consumer or producer has their own worker pool with 2 x cpu count core threads. | | EventLoopGroup -| *camel.component.netty4.enabled* | Enable netty4 component | true | Boolean -| *camel.component.netty4.executor-service* | To use the given EventExecutorGroup. The option is a io.netty.util.concurrent.EventExecutorGroup type. | | String -| *camel.component.netty4.maximum-pool-size* | The thread pool size for the EventExecutorGroup if its in use. The default value is 16. | 16 | Integer -| *camel.component.netty4.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.netty4.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String -| *camel.component.netty4.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean -| *camel.component.netty4.configuration.client-pipeline-factory* | *Deprecated* | | ClientInitializer Factory -| *camel.component.netty4.configuration.decoder* | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of inbound payloads. | | ChannelHandler -| *camel.component.netty4.configuration.encoder* | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of outbound payloads. | | ChannelHandler -| *camel.component.netty4.configuration.key-store-file* | *Deprecated* Client side certificate keystore to be used for encryption | | File -| *camel.component.netty4.configuration.server-pipeline-factory* | *Deprecated* | | ServerInitializer Factory -| *camel.component.netty4.configuration.trust-store-file* | *Deprecated* Server side certificate keystore to be used for encryption | | File +| *camel.component.netty.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.netty.configuration.allow-default-codec* | The netty component installs a default codec if both, encoder/decoder is null and textline is false. Setting allowDefaultCodec to false prevents the netty component from installing a default codec as the first element in the filter chain. | true | Boolean +| *camel.component.netty.configuration.allow-serialized-headers* | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean +| *camel.component.netty.configuration.auto-append-delimiter* | Whether or not to auto append missing end delimiter when sending using the textline codec. | true | Boolean +| *camel.component.netty.configuration.backlog* | Allows to configure a backlog for netty consumer (server). Note the backlog is just a best effort depending on the OS. Setting this option to a value such as 200, 500 or 1000, tells the TCP stack how long the "accept" queue can be If this option is not configured, then the backlog depends on OS setting. | | Integer +| *camel.component.netty.configuration.boss-count* | When netty works on nio mode, it uses default bossCount parameter from Netty, which is 1. User can use this operation to override the default bossCount from Netty | 1 | Integer +| *camel.component.netty.configuration.boss-group* | Set the BossGroup which could be used for handling the new connection of the server side across the NettyEndpoint | | EventLoopGroup +| *camel.component.netty.configuration.broadcast* | Setting to choose Multicast over UDP | false | Boolean +| *camel.component.netty.configuration.channel-group* | To use a explicit ChannelGroup. | | ChannelGroup +| *camel.component.netty.configuration.client-initializer-factory* | To use a custom ClientInitializerFactory | | ClientInitializer Factory +| *camel.component.netty.configuration.client-mode* | If the clientMode is true, netty consumer will connect the address as a TCP client. | false | Boolean +| *camel.component.netty.configuration.connect-timeout* | Time to wait for a socket connection to be available. Value is in milliseconds. | 10000 | Integer +| *camel.component.netty.configuration.correlation-manager* | To use a custom correlation manager to manage how request and reply messages are mapped when using request/reply with the netty producer. This should only be used if you have a way to map requests together with replies such as if there is correlation ids in both the request and reply messages. This can be used if you want to multiplex concurrent messages on the same channel (aka connection) in netty. When doing this you must h [...] +| *camel.component.netty.configuration.decoder-max-line-length* | The max line length to use for the textline codec. | 1024 | Integer +| *camel.component.netty.configuration.decoders* | A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List +| *camel.component.netty.configuration.delimiter* | The delimiter to use for the textline codec. Possible values are LINE and NULL. | | TextLineDelimiter +| *camel.component.netty.configuration.disconnect* | Whether or not to disconnect(close) from Netty Channel right after use. Can be used for both consumer and producer. | false | Boolean +| *camel.component.netty.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates NettyConsumer if it should disconnect where there is no reply to send back. | true | Boolean +| *camel.component.netty.configuration.enabled-protocols* | Which protocols to enable when using SSL | TLSv1,TLSv1.1,TLSv1.2 | String +| *camel.component.netty.configuration.encoders* | A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List +| *camel.component.netty.configuration.encoding* | The encoding (a charset name) to use for the textline codec. If not provided, Camel will use the JVM default Charset. | | String +| *camel.component.netty.configuration.host* | The hostname. <p/> For the consumer the hostname is localhost or 0.0.0.0. For the producer the hostname is the remote host to connect to | | String +| *camel.component.netty.configuration.keep-alive* | Setting to ensure socket is not closed due to inactivity | true | Boolean +| *camel.component.netty.configuration.key-store-format* | Keystore format to be used for payload encryption. Defaults to "JKS" if not set | | String +| *camel.component.netty.configuration.key-store-resource* | Client side certificate keystore to be used for encryption. Is loaded by default from classpath, but you can prefix with "classpath:", "file:", or "http:" to load the resource from different systems. | | String +| *camel.component.netty.configuration.lazy-channel-creation* | Channels 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.netty.configuration.native-transport* | Whether to use native transport instead of NIO. Native transport takes advantage of the host operating system and is only supported on some platforms. You need to add the netty JAR for the host operating system you are using. See more details at: \http://netty.io/wiki/native-transports.html | false | Boolean +| *camel.component.netty.configuration.need-client-auth* | Configures whether the server needs client authentication when using SSL. | false | Boolean +| *camel.component.netty.configuration.netty-server-bootstrap-factory* | To use a custom NettyServerBootstrapFactory | | NettyServerBootstrap Factory +| *camel.component.netty.configuration.network-interface* | When using UDP then this option can be used to specify a network interface by its name, such as eth0 to join a multicast group. | | String +| *camel.component.netty.configuration.no-reply-log-level* | If sync is enabled this option dictates NettyConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel +| *camel.component.netty.configuration.options* | Allows to configure additional netty options using "option." as prefix. For example "option.child.keepAlive=false" to set the netty option "child.keepAlive=false". See the Netty documentation for possible options that can be used. | | Map +| *camel.component.netty.configuration.passphrase* | Password setting to use in order to encrypt/decrypt payloads sent using SSH | | String +| *camel.component.netty.configuration.port* | The host port number | | Integer +| *camel.component.netty.configuration.producer-pool-enabled* | Whether producer pool is enabled or not. Important: If you turn this off then a single shared connection is used for the producer, also if you are doing request/reply. That means there is a potential issue with interleaved responses if replies comes back out-of-order. Therefore you need to have a correlation id in both the request and reply messages so you can properly correlate the replies to the Camel callback that is resp [...] +| *camel.component.netty.configuration.producer-pool-max-active* | Sets the cap on the number of objects that can be allocated by the pool (checked out to clients, or idle awaiting checkout) at a given time. Use a negative value for no limit. | -1 | Integer +| *camel.component.netty.configuration.producer-pool-max-idle* | Sets the cap on the number of "idle" instances in the pool. | 100 | Integer +| *camel.component.netty.configuration.producer-pool-min-evictable-idle* | Sets the minimum amount of time (value in millis) an object may sit idle in the pool before it is eligible for eviction by the idle object evictor. | 300000 | Long +| *camel.component.netty.configuration.producer-pool-min-idle* | Sets the minimum number of instances allowed in the producer pool before the evictor thread (if active) spawns new objects. | | Integer +| *camel.component.netty.configuration.protocol* | The protocol to use which can be tcp or udp. | | String +| *camel.component.netty.configuration.receive-buffer-size* | The TCP/UDP buffer sizes to be used during inbound communication. Size is bytes. | 65536 | Integer +| *camel.component.netty.configuration.receive-buffer-size-predictor* | Configures the buffer size predictor. See details at Jetty documentation and this mail thread. | | Integer +| *camel.component.netty.configuration.reconnect* | Used only in clientMode in consumer, the consumer will attempt to reconnect on disconnection if this is enabled | true | Boolean +| *camel.component.netty.configuration.reconnect-interval* | Used if reconnect and clientMode is enabled. The interval in milli seconds to attempt reconnection | 10000 | Integer +| *camel.component.netty.configuration.request-timeout* | Allows to use a timeout for the Netty producer when calling a remote server. By default no timeout is in use. The value is in milli seconds, so eg 30000 is 30 seconds. The requestTimeout is using Netty's ReadTimeoutHandler to trigger the timeout. | | Long +| *camel.component.netty.configuration.reuse-address* | Setting to facilitate socket multiplexing | true | Boolean +| *camel.component.netty.configuration.reuse-channel* | This option allows producers and consumers (in client mode) to reuse the same Netty {@link Channel} for the lifecycle of processing the {@link Exchange}. This is useful if you need to call a server multiple times in a Camel route and want to use the same network connection. When using this, the channel is not returned to the connection pool until the {@link Exchange} is done; or disconnected if the disconnect option is set to true. [...] +| *camel.component.netty.configuration.security-provider* | Security provider to be used for payload encryption. Defaults to "SunX509" if not set. | | String +| *camel.component.netty.configuration.send-buffer-size* | The TCP/UDP buffer sizes to be used during outbound communication. Size is bytes. | 65536 | Integer +| *camel.component.netty.configuration.server-closed-channel-exception-caught-log-level* | If the server (NettyConsumer) catches an java.nio.channels.ClosedChannelException then its logged using this logging level. This is used to avoid logging the closed channel exceptions, as clients can disconnect abruptly and then cause a flood of closed exceptions in the Netty server. | | LoggingLevel +| *camel.component.netty.configuration.server-exception-caught-log-level* | If the server (NettyConsumer) catches an exception then its logged using this logging level. | | LoggingLevel +| *camel.component.netty.configuration.server-initializer-factory* | To use a custom ServerInitializerFactory | | ServerInitializer Factory +| *camel.component.netty.configuration.ssl* | Setting to specify whether SSL encryption is applied to this endpoint | false | Boolean +| *camel.component.netty.configuration.ssl-client-cert-headers* | When enabled and in SSL mode, then the Netty consumer will enrich the Camel Message with headers having information about the client certificate such as subject name, issuer name, serial number, and the valid date range. | false | Boolean +| *camel.component.netty.configuration.ssl-context-parameters* | To configure security using SSLContextParameters | | SSLContextParameters +| *camel.component.netty.configuration.ssl-handler* | Reference to a class that could be used to return an SSL Handler | | SslHandler +| *camel.component.netty.configuration.sync* | Setting to set endpoint as one-way or request-response | true | Boolean +| *camel.component.netty.configuration.tcp-no-delay* | Setting to improve TCP protocol performance | true | Boolean +| *camel.component.netty.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.netty.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.netty.configuration.trust-store-resource* | Server side certificate keystore to be used for encryption. Is loaded by default from classpath, but you can prefix with "classpath:", "file:", or "http:" to load the resource from different systems. | | String +| *camel.component.netty.configuration.udp-byte-array-codec* | For UDP only. If enabled the using byte array codec instead of Java serialization protocol. | false | Boolean +| *camel.component.netty.configuration.udp-connectionless-sending* | This option supports connection less udp sending which is a real fire and forget. A connected udp send receive the PortUnreachableException if no one is listen on the receiving port. | false | Boolean +| *camel.component.netty.configuration.use-byte-buf* | If the useByteBuf is true, netty producer will turn the message body into {@link ByteBuf} before sending it out. | false | Boolean +| *camel.component.netty.configuration.using-executor-service* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean +| *camel.component.netty.configuration.worker-count* | When netty works on nio mode, it uses default workerCount parameter from Netty, which is cpu_core_threads x 2. User can use this operation to override the default workerCount from Netty. | | Integer +| *camel.component.netty.configuration.worker-group* | To use a explicit EventLoopGroup as the boss thread pool. For example to share a thread pool with multiple consumers or producers. By default each consumer or producer has their own worker pool with 2 x cpu count core threads. | | EventLoopGroup +| *camel.component.netty.enabled* | Whether to enable auto configuration of the netty component. This is enabled by default. | | Boolean +| *camel.component.netty.executor-service* | To use the given EventExecutorGroup. The option is a io.netty.util.concurrent.EventExecutorGroup type. | | String +| *camel.component.netty.maximum-pool-size* | The thread pool size for the EventExecutorGroup if its in use. The default value is 16. | 16 | Integer +| *camel.component.netty.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.netty.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.support.jsse.SSLContextParameters type. | | String +| *camel.component.netty.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean +| *camel.component.netty.configuration.client-pipeline-factory* | *Deprecated* | | ClientInitializer Factory +| *camel.component.netty.configuration.decoder* | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of inbound payloads. | | ChannelHandler +| *camel.component.netty.configuration.encoder* | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of outbound payloads. | | ChannelHandler +| *camel.component.netty.configuration.key-store-file* | *Deprecated* Client side certificate keystore to be used for encryption | | File +| *camel.component.netty.configuration.server-pipeline-factory* | *Deprecated* | | ServerInitializer Factory +| *camel.component.netty.configuration.trust-store-file* | *Deprecated* Server side certificate keystore to be used for encryption | | File |=== // spring-boot-auto-configure options: END @@ -376,7 +376,7 @@ operations. ---- RouteBuilder builder = new RouteBuilder() { public void configure() { - from("netty4:udp://0.0.0.0:5155?sync=true") + from("netty:udp://0.0.0.0:5155?sync=true") .process(new Processor() { public void process(Exchange exchange) throws Exception { Poetry poetry = (Poetry) exchange.getIn().getBody(); @@ -394,7 +394,7 @@ RouteBuilder builder = new RouteBuilder() { ---- RouteBuilder builder = new RouteBuilder() { public void configure() { - from("netty4:tcp://0.0.0.0:5150") + from("netty:tcp://0.0.0.0:5150") .to("mock:result"); } }; @@ -402,7 +402,7 @@ RouteBuilder builder = new RouteBuilder() { === An SSL/TCP based Netty consumer endpoint using Request-Reply communication -[[Netty4-UsingtheJSSEConfigurationUtility]] +[[Netty-UsingtheJSSEConfigurationUtility]] Using the JSSE Configuration Utility The Netty component supports SSL/TLS configuration @@ -412,7 +412,7 @@ component specific code you need to write and is configurable at the endpoint and component levels. The following examples demonstrate how to use the utility with the Netty component. -[[Netty4-Programmaticconfigurationofthecomponent]] +[[Netty-Programmaticconfigurationofthecomponent]] Programmatic configuration of the component [source,java] @@ -428,11 +428,11 @@ kmp.setKeyPassword("keyPassword"); SSLContextParameters scp = new SSLContextParameters(); scp.setKeyManagers(kmp); -NettyComponent nettyComponent = getContext().getComponent("netty4", NettyComponent.class); +NettyComponent nettyComponent = getContext().getComponent("netty", NettyComponent.class); nettyComponent.setSslContextParameters(scp); ---- -[[Netty4-SpringDSLbasedconfigurationofendpoint]] +[[Netty-SpringDSLbasedconfigurationofendpoint]] Spring DSL based configuration of endpoint [source,xml] @@ -448,11 +448,11 @@ Spring DSL based configuration of endpoint </camel:keyManagers> </camel:sslContextParameters>... ... - <to uri="netty4:tcp://0.0.0.0:5150?sync=true&ssl=true&sslContextParameters=#sslContextParameters"/> + <to uri="netty:tcp://0.0.0.0:5150?sync=true&ssl=true&sslContextParameters=#sslContextParameters"/> ... ---- -[[Netty4-UsingBasicSSL/TLSconfigurationontheJettyComponent]] +[[Netty-UsingBasicSSL/TLSconfigurationontheJettyComponent]] Using Basic SSL/TLS configuration on the Jetty Component [source,java] @@ -465,7 +465,7 @@ registry.bind("tsf", new File("src/test/resources/keystore.jks")); context.addRoutes(new RouteBuilder() { public void configure() { String netty_ssl_endpoint = - "netty4:tcp://0.0.0.0:5150?sync=true&ssl=true&passphrase=#password" + "netty:tcp://0.0.0.0:5150?sync=true&ssl=true&passphrase=#password" + "&keyStoreFile=#ksf&trustStoreFile=#tsf"; String return_string = "When You Go Home, Tell Them Of Us And Say," @@ -481,12 +481,12 @@ context.addRoutes(new RouteBuilder() { }); ---- -[[Netty4-GettingaccesstoSSLSessionandtheclientcertificate]] +[[Netty-GettingaccesstoSSLSessionandtheclientcertificate]] Getting access to SSLSession and the client certificate You can get access to the `javax.net.ssl.SSLSession` if you eg need to get details about the client certificate. When `ssl=true` then the -xref:netty4-component.adoc[Netty4] component will store the `SSLSession` as a +xref:netty-component.adoc[Netty] component will store the `SSLSession` as a header on the Camel Message as shown below: [source,java] @@ -593,9 +593,9 @@ a comma separated list or contained in a List e.g. [source,java] ---- - from("direct:multiple-codec").to("netty4:tcp://0.0.0.0:{{port}}?encoders=#encoders&sync=false"); + from("direct:multiple-codec").to("netty:tcp://0.0.0.0:{{port}}?encoders=#encoders&sync=false"); - from("netty4:tcp://0.0.0.0:{{port}}?decoders=#length-decoder,#string-decoder&sync=false").to("mock:multiple-codec"); + from("netty:tcp://0.0.0.0:{{port}}?decoders=#length-decoder,#string-decoder&sync=false").to("mock:multiple-codec"); ---- or via XML. @@ -605,10 +605,10 @@ or via XML. <camelContext id="multiple-netty-codecs-context" xmlns="http://camel.apache.org/schema/spring";> <route> <from uri="direct:multiple-codec"/> - <to uri="netty4:tcp://0.0.0.0:5150?encoders=#encoders&sync=false"/> + <to uri="netty:tcp://0.0.0.0:5150?encoders=#encoders&sync=false"/> </route> <route> - <from uri="netty4:tcp://0.0.0.0:5150?decoders=#length-decoder,#string-decoder&sync=false"/> + <from uri="netty:tcp://0.0.0.0:5150?decoders=#length-decoder,#string-decoder&sync=false"/> <to uri="mock:multiple-codec"/> </route> </camelContext> @@ -630,7 +630,7 @@ written the bye message back to the client: [source,java] ---- -from("netty4:tcp://0.0.0.0:8080").process(new Processor() { +from("netty:tcp://0.0.0.0:8080").process(new Processor() { public void process(Exchange exchange) throws Exception { String body = exchange.getIn().getBody(String.class); exchange.getOut().setBody("Bye " + body); @@ -642,7 +642,7 @@ from("netty4:tcp://0.0.0.0:8080").process(new Processor() { }); ---- -[[Netty4-Addingcustomchannelpipelinefactoriestogaincompletecontroloveracreatedpipeline]] +[[Netty-Addingcustomchannelpipelinefactoriestogaincompletecontroloveracreatedpipeline]] Adding custom channel pipeline factories to gain complete control over a created pipeline == Custom pipeline @@ -700,7 +700,7 @@ registry.bind("spf", factory); context.addRoutes(new RouteBuilder() { public void configure() { String netty_ssl_endpoint = - "netty4:tcp://0.0.0.0:5150?serverInitializerFactory=#spf" + "netty:tcp://0.0.0.0:5150?serverInitializerFactory=#spf" String return_string = "When You Go Home, Tell Them Of Us And Say," + "For Your Tomorrow, We Gave Our Today."; @@ -753,7 +753,7 @@ as shown below: [source,xml] ---- <route> - <from uri="netty4:tcp://0.0.0.0:5021?textline=true&sync=true&workerPool=#sharedPool&usingExecutorService=false"/> + <from uri="netty:tcp://0.0.0.0:5021?textline=true&sync=true&workerPool=#sharedPool&usingExecutorService=false"/> <to uri="log:result"/> ... </route> @@ -764,7 +764,7 @@ And if we have another route we can refer to the shared worker pool: [source,xml] ---- <route> - <from uri="netty4:tcp://0.0.0.0:5022?textline=true&sync=true&workerPool=#sharedPool&usingExecutorService=false"/> + <from uri="netty:tcp://0.0.0.0:5022?textline=true&sync=true&workerPool=#sharedPool&usingExecutorService=false"/> <to uri="log:result"/> ... </route> diff --git a/docs/components/modules/ROOT/pages/netty4-http-component.adoc b/docs/components/modules/ROOT/pages/netty4-http-component.adoc index 95be433..0c4d0b5 100644 --- a/docs/components/modules/ROOT/pages/netty4-http-component.adoc +++ b/docs/components/modules/ROOT/pages/netty4-http-component.adoc @@ -3,8 +3,8 @@ *Available as of Camel version 2.14* -The Netty4 HTTP component is an extension to xref:netty4-component.adoc[Netty4] -component to facilitiate HTTP transport with xref:netty4-component.adoc[Netty4]. +The Netty4 HTTP component is an extension to xref:netty-component.adoc[Netty] +component to facilitiate HTTP transport with xref:netty-component.adoc[Netty]. This camel component supports both producer and consumer endpoints. @@ -77,9 +77,9 @@ at the endpoint URI definition level (like `to` or `from` DSL elements). *A lot more options* This component inherits all the options from -xref:netty4-component.adoc[Netty4], so make sure to look at -the xref:netty4-component.adoc[Netty4] documentation as well. -Notice that some options from xref:netty4-component.adoc[Netty4] is not +xref:netty-component.adoc[Netty], so make sure to look at +the xref:netty-component.adoc[Netty] documentation as well. +Notice that some options from xref:netty-component.adoc[Netty] is not applicable when using this Netty4 HTTP component, such as options related to UDP transport. ==== @@ -633,6 +633,6 @@ below: * Endpoint * Getting Started -* xref:netty4-component.adoc[Netty] +* xref:netty-component.adoc[Netty] * Netty HTTP Server Example * xref:jetty-component.adoc[Jetty] diff --git a/docs/components/modules/ROOT/pages/syslog-dataformat.adoc b/docs/components/modules/ROOT/pages/syslog-dataformat.adoc index 0258b0a..17ccb31 100644 --- a/docs/components/modules/ROOT/pages/syslog-dataformat.adoc +++ b/docs/components/modules/ROOT/pages/syslog-dataformat.adoc @@ -14,9 +14,9 @@ SyslogMessage model objects. * Type Converter from/to SyslogMessage and String * Integration with the xref:mina-component.adoc[camel-mina] component. -* Integration with the xref:netty4-component.adoc[camel-netty] component. +* Integration with the xref:netty-component.adoc[camel-netty] component. * Encoder and decoder for -the xref:netty4-component.adoc[Netty4 Component] component. +the xref:netty-component.adoc[Netty Component] component. * 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:mina-component.adoc[Mina Component] component or xref:netty4-component.adoc[Netty4 Component] +xref:mina-component.adoc[Mina Component] component or xref:netty-component.adoc[Netty 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`. @@ -93,7 +93,7 @@ ND To expose a Syslog listener service we reuse the existing xref:mina-component.adoc[Mina Component] component -or xref:netty4-component.adoc[Netty4 Component] where we just use +or xref:netty-component.adoc[Netty Component] where we just use the `SyslogDataFormat` to marshal and unmarshal messages === Exposing a Syslog listener diff --git a/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc b/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc index b0b379a..2c991ed 100644 --- a/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc +++ b/docs/user-manual/modules/ROOT/pages/asynchronous-routing-engine.adoc @@ -27,7 +27,7 @@ Request Reply messaging over JMS). *Camel 2.9:* * xref:components::jms-component.adoc[JMS] *Camel 2.9:* (also consumer) * xref:components::mqtt-component.adoc[MQTT] *Camel 2.10.2:* (only producer) * NMR (both consumer and producer) -* xref:components::netty4-component.adoc[Netty] only producer (*Camel 2.10:* also consumer) +* xref:components::netty-component.adoc[Netty] only producer (*Camel 2.10:* also consumer) * xref:components::restlet-component.adoc[Restlet] *Camel 2.8:* (only producer) * xref:components::seda-component.adoc[SEDA] (both consumer and producer) SEDA was mistakenly in this list until November 3rd 2012. As of Camel 2.10.x, it still does diff --git a/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc b/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc index 5b2fdac..528b72b 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-configuration-utilities.adoc @@ -16,7 +16,7 @@ configuration utility: * xref:components::http-component.adoc[HTTP] * xref:components::jetty-component.adoc[Jetty] * xref:components::ahc-component.adoc[AHC] -* xref:components::netty4-component.adoc[Netty] +* xref:components::netty-component.adoc[Netty] * xref:components::cometd-component.adoc[Cometd] * FTP2 * xref:components::irc-component.adoc[IRC] diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc index 647a9da..d224c0f 100644 --- a/docs/user-manual/modules/ROOT/pages/index.adoc +++ b/docs/user-manual/modules/ROOT/pages/index.adoc @@ -343,7 +343,7 @@ camel routes without them knowing ** xref:components::mybatis-bean-component.adoc[MyBatis Bean] ** xref:components::nagios-component.adoc[Nagios] ** xref:components::nats-component.adoc[Nats] -** xref:components::netty4-component.adoc[Netty4] +** xref:components::netty-component.adoc[Netty] ** xref:components::netty4-http-component.adoc[Netty4 HTTP] ** xref:components::nsq-component.adoc[NSQ] ** xref:components::olingo2-component.adoc[Olingo2] diff --git a/docs/user-manual/modules/ROOT/pages/security.adoc b/docs/user-manual/modules/ROOT/pages/security.adoc index aa8f42c..d08946e 100644 --- a/docs/user-manual/modules/ROOT/pages/security.adoc +++ b/docs/user-manual/modules/ROOT/pages/security.adoc @@ -65,7 +65,7 @@ support 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::netty-component.adoc[Netty] - 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 <--> diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index cf29609..1caf178 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -2240,17 +2240,17 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-netty4-http</artifactId> + <artifactId>camel-netty-starter</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-netty4-http-starter</artifactId> + <artifactId>camel-netty4-http</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-netty-starter</artifactId> + <artifactId>camel-netty4-http-starter</artifactId> <version>${project.version}</version> </dependency> <dependency>
