You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/07 13:10:32 UTC
[camel] branch master updated (b8cd499 -> 8477380)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b8cd499 CAMEL-13774: camel-zipfile now supports marshal an iterator to zipfile. And made it more general with a type converter so we can also write directly to a file via the file component.
new 60f1d55 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty
new b3d8e32 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - updated docs
new 2e6a710 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - updated references
new 06e4248 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - updated references to netty4-http
new 90354bb CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - DocumentationHelper class needs to point to new netty.json
new 7028caa CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Updated docs
new 24b727c CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed Camel-ganglia test
new db32370 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed refs in camel-mllp
new 99df195 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Removed refs in netty4-http component
new f9680c6 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned REST DSL stuff to point to netty4-http only
new dc410a7 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed syslog tests
new aa9a4dc CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned camel-netty-correlation example
new ef7e19a CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Karaf integration tests and features updated
new 3020344 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - SB integration test updated
new 29bd41b CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed hl7 tests
new 1705731 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned camel-netty tests
new c4fe00d CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned camel-netty4-http tests
new cffec58 CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Removed last refs
new 3d2701d CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Added note on MIGRATION guide
new 8477380 Super Regen!
The 20 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MIGRATION.md | 2 +
apache-camel/pom.xml | 6 +-
apache-camel/src/main/descriptors/common-bin.xml | 4 +-
bom/camel-bom/pom.xml | 8 +-
.../src/main/docs/activemq-component.adoc | 2 +-
.../camel-amqp/src/main/docs/amqp-component.adoc | 8 +-
components/camel-ganglia/pom.xml | 2 +-
.../ganglia/GangliaProtocolV30CamelTest.java | 4 +-
.../ganglia/GangliaProtocolV31CamelTest.java | 4 +-
components/camel-hl7/pom.xml | 4 +-
.../camel-hl7/src/main/docs/hl7-dataformat.adoc | 10 +-
.../hl7/HL7MLLPNettyCodecBoundaryTest.java | 4 +-
.../hl7/HL7MLLPNettyCodecByteArrayRouteTest.java | 10 +-
.../component/hl7/HL7MLLPNettyCodecLongTest.java | 4 +-
.../hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java | 4 +-
.../camel/component/hl7/HL7MLLPNettyCodecTest.java | 4 +-
.../hl7/HL7MLLPNettyDecoderResourceLeakTest.java | 4 +-
.../component/hl7/HL7MLLPNettyRouteToTest.java | 4 +-
.../camel/component/hl7/HL7NettyRouteTest.java | 8 +-
.../camel-jms/src/main/docs/jms-component.adoc | 6 +-
.../camel-mina/src/main/docs/mina-component.adoc | 4 +-
components/camel-mllp/README.md | 12 +-
components/{camel-netty4 => camel-netty}/pom.xml | 4 +-
.../src/main/docs/netty-component.adoc} | 218 ++++++++++-----------
.../component/netty4/ChannelHandlerFactories.java | 0
.../component/netty4/ChannelHandlerFactory.java | 0
.../component/netty4/ClientInitializerFactory.java | 0
.../ClientModeTCPNettyServerBootstrapFactory.java | 0
.../netty4/DefaultChannelHandlerFactory.java | 0
.../netty4/DefaultClientInitializerFactory.java | 0
.../DefaultNettyCamelStateCorrelationManager.java | 0
.../netty4/DefaultServerInitializerFactory.java | 0
.../camel/component/netty4/NettyCamelState.java | 0
.../netty4/NettyCamelStateCorrelationManager.java | 0
.../camel/component/netty4/NettyComponent.java | 2 +-
.../camel/component/netty4/NettyConfiguration.java | 0
.../camel/component/netty4/NettyConstants.java | 0
.../camel/component/netty4/NettyConsumer.java | 0
.../netty4/NettyConsumerExceptionHandler.java | 0
.../camel/component/netty4/NettyConverter.java | 0
.../camel/component/netty4/NettyEndpoint.java | 4 +-
.../apache/camel/component/netty4/NettyHelper.java | 0
.../camel/component/netty4/NettyPayloadHelper.java | 0
.../camel/component/netty4/NettyProducer.java | 0
.../netty4/NettyServerBootstrapConfiguration.java | 0
.../netty4/NettyServerBootstrapFactory.java | 0
.../netty4/NettyServerBossPoolBuilder.java | 0
.../component/netty4/NettyWorkerPoolBuilder.java | 0
.../component/netty4/ServerInitializerFactory.java | 0
.../netty4/ShareableChannelHandlerFactory.java | 0
.../netty4/SharedSingletonObjectPool.java | 0
.../SingleTCPNettyServerBootstrapFactory.java | 0
.../SingleUDPNettyServerBootstrapFactory.java | 0
.../camel/component/netty4/TextLineDelimiter.java | 0
.../netty4/TimeoutCorrelationManagerSupport.java | 0
.../codec/DatagramPacketByteArrayDecoder.java | 0
.../codec/DatagramPacketByteArrayEncoder.java | 0
.../netty4/codec/DatagramPacketDecoder.java | 0
.../codec/DatagramPacketDelimiterDecoder.java | 0
.../netty4/codec/DatagramPacketEncoder.java | 0
.../netty4/codec/DatagramPacketObjectDecoder.java | 0
.../netty4/codec/DatagramPacketObjectEncoder.java | 0
.../netty4/codec/DatagramPacketStringDecoder.java | 0
.../netty4/codec/DatagramPacketStringEncoder.java | 0
.../netty4/codec/DelegateByteArrayDecoder.java | 0
.../netty4/codec/DelegateByteArrayEncoder.java | 0
.../netty4/codec/DelimiterBasedFrameDecoder.java | 0
.../netty4/codec/LineBasedFrameDecoder.java | 0
.../component/netty4/codec/ObjectDecoder.java | 0
.../component/netty4/codec/ObjectEncoder.java | 0
.../netty4/handlers/ClientChannelHandler.java | 0
.../netty4/handlers/ServerChannelHandler.java | 0
.../handlers/ServerResponseFutureListener.java | 0
.../component/netty4/ssl/SSLEngineFactory.java | 0
.../camel/component/netty4/util/SubnetUtils.java | 0
.../src/test/data/message1.txt | 0
.../camel/component/netty4/BaseNettyTest.java | 0
.../netty4/DatagramPacketByteArrayCodecTest.java | 0
.../camel/component/netty4/LogCaptureAppender.java | 0
.../camel/component/netty4/LogCaptureTest.java | 0
.../component/netty4/MultipleCodecsSpringTest.java | 0
.../camel/component/netty4/MultipleCodecsTest.java | 4 +-
.../camel/component/netty4/MyCustomCodec.java | 0
.../camel/component/netty4/Netty2978IssueTest.java | 4 +-
.../camel/component/netty4/NettyBacklogTest.java | 2 +-
.../NettyComponentWithConfigurationTest.java | 12 +-
.../component/netty4/NettyConcurrentTest.java | 4 +-
.../NettyConsumerClientModeReconnectTest.java | 2 +-
.../NettyConsumerClientModeReuseChannelTest.java | 2 +-
.../netty4/NettyConsumerClientModeTest.java | 2 +-
.../camel/component/netty4/NettyConverterTest.java | 0
.../component/netty4/NettyCustomCodecTest.java | 2 +-
.../netty4/NettyCustomCorrelationManagerTest.java | 4 +-
.../NettyCustomPipelineFactoryAsynchTest.java | 4 +-
.../NettyCustomPipelineFactorySynchTest.java | 4 +-
.../component/netty4/NettyDisconnectTest.java | 4 +-
.../camel/component/netty4/NettyFileTcpTest.java | 4 +-
.../NettyGlobalSSLContextParametersTest.java | 6 +-
.../NettyInOutCloseChannelWhenCompleteTest.java | 4 +-
.../component/netty4/NettyInOutFromSedaTest.java | 4 +-
.../netty4/NettyInOutWithForcedNoResponseTest.java | 6 +-
.../component/netty4/NettyManualEndpointTest.java | 4 +-
.../NettyMultipleSimultaneousClientsTest.java | 2 +-
.../camel/component/netty4/NettyOptionTest.java | 2 +-
.../netty4/NettyProducerAsyncEndpointTest.java | 4 +-
.../component/netty4/NettyProducerHangTest.java | 8 +-
.../netty4/NettyProducerPoolDisabledTest.java | 4 +-
.../camel/component/netty4/NettyProxyTest.java | 8 +-
.../component/netty4/NettyRedeliveryTest.java | 2 +-
.../netty4/NettyRequestTimeoutIssueTest.java | 4 +-
.../component/netty4/NettyRequestTimeoutTest.java | 12 +-
.../component/netty4/NettyReuseChannelTest.java | 6 +-
.../component/netty4/NettyReuseConnectionTest.java | 2 +-
.../component/netty4/NettySSLClasspathTest.java | 4 +-
.../netty4/NettySSLClientCertHeadersTest.java | 4 +-
.../netty4/NettySSLConsumerClientModeTest.java | 2 +-
.../netty4/NettySSLContextParametersTest.java | 4 +-
.../netty4/NettySSLPassphaseBeanTest.java | 4 +-
.../camel/component/netty4/NettySSLTest.java | 4 +-
.../component/netty4/NettySingleCodecTest.java | 4 +-
.../component/netty4/NettySuspendResumeTest.java | 8 +-
.../camel/component/netty4/NettyTCPAsyncTest.java | 4 +-
.../component/netty4/NettyTCPChainedTest.java | 4 +-
.../netty4/NettyTCPSyncNotLazyChannelTest.java | 6 +-
.../camel/component/netty4/NettyTCPSyncTest.java | 10 +-
.../NettyTcpWithInOutUsingPlainSocketTest.java | 2 +-
.../NettyTextlineInOnlyNullDelimiterTest.java | 4 +-
.../component/netty4/NettyTextlineInOnlyTest.java | 8 +-
.../netty4/NettyTextlineInOutNonBlockingTest.java | 4 +-
.../NettyTextlineInOutSynchronousFalseTest.java | 4 +-
.../netty4/NettyTextlineInOutSynchronousTest.java | 4 +-
.../component/netty4/NettyTextlineInOutTest.java | 4 +-
.../netty4/NettyTransferExchangeOptionTest.java | 4 +-
.../camel/component/netty4/NettyUDPAsyncTest.java | 4 +-
.../netty4/NettyUDPByteArrayConsumerTest.java | 6 +-
.../netty4/NettyUDPByteArrayProviderTest.java | 2 +-
.../netty4/NettyUDPLargeMessageInOnlyTest.java | 4 +-
...yUDPMessageLargerThanDefaultBufferSizeTest.java | 4 +-
.../netty4/NettyUDPMulticastAsyncTest.java | 4 +-
.../component/netty4/NettyUDPObjectSyncTest.java | 4 +-
.../camel/component/netty4/NettyUDPSyncTest.java | 4 +-
.../netty4/NettyUdpConnectedSendTest.java | 2 +-
.../netty4/NettyUdpConnectionlessSendTest.java | 2 +-
.../NettyUdpWithInOutUsingPlainSocketTest.java | 2 +-
...ttyUseSharedWorkerThreadPoolManyRoutesTest.java | 2 +-
.../netty4/NettyUseSharedWorkerThreadPoolTest.java | 12 +-
.../org/apache/camel/component/netty4/Poetry.java | 0
.../SpringNettyUseSharedWorkerThreadPoolTest.java | 6 +-
.../netty4/UnsharableCodecsConflicts2Test.java | 2 +-
.../netty4/UnsharableCodecsConflictsTest.java | 4 +-
.../src/test/resources/keystore.jks | Bin
.../src/test/resources/log4j2.properties | 2 +-
.../SpringNettyUseSharedWorkerThreadPoolTest.xml | 6 +-
.../camel/component/netty4/multiple-codecs.xml | 4 +-
.../src/test/resources/test.txt | 0
components/camel-netty4-http/pom.xml | 2 +-
.../src/main/docs/netty4-http-component.adoc | 12 +-
.../component/netty4/http/NettyHttpEndpoint.java | 2 +-
.../netty4/http/NettyHttpSendDynamicAware.java | 2 +-
.../http/NettyHttpGetWithInvalidMessageTest.java | 2 +-
.../camel-rest/src/main/docs/rest-component.adoc | 1 -
.../src/main/docs/salesforce-component.adoc | 4 +-
components/camel-syslog/pom.xml | 2 +-
.../src/main/docs/syslog-dataformat.adoc | 8 +-
.../component/syslog/NettyDataFormatTest.java | 4 +-
.../component/syslog/NettyManyUDPMessagesTest.java | 2 +-
.../syslog/NettyRfc5425LongMessageTest.java | 2 +-
.../camel/component/syslog/NettyRfc5425Test.java | 2 +-
.../component/syslog/applicationContext-Netty.xml | 2 +-
components/pom.xml | 2 +-
components/readme.adoc | 4 +-
.../endpoint/dsl/AMQPEndpointBuilderFactory.java | 60 +++++-
.../endpoint/dsl/NettyEndpointBuilderFactory.java | 16 +-
docs/components/modules/ROOT/nav.adoc | 2 +-
.../modules/ROOT/pages/activemq-component.adoc | 8 +-
.../modules/ROOT/pages/amqp-component.adoc | 8 +-
.../modules/ROOT/pages/hl7-dataformat.adoc | 10 +-
.../modules/ROOT/pages/jms-component.adoc | 12 +-
.../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/rest-component.adoc | 1 -
.../modules/ROOT/pages/salesforce-component.adoc | 8 +-
.../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-example-netty-custom-correlation/pom.xml | 2 +-
.../org/apache/camel/example/netty/MyClient.java | 2 +-
.../org/apache/camel/example/netty/MyServer.java | 2 +-
parent/pom.xml | 6 +-
.../karaf/features/src/main/resources/features.xml | 10 +-
.../springboot/AMQPComponentConfiguration.java | 5 +-
.../components-starter/camel-hl7-starter/pom.xml | 2 +-
.../pom.xml | 6 +-
.../NettyComponentAutoConfiguration.java | 8 +-
.../springboot/NettyComponentConfiguration.java | 4 +-
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 1 +
.../src/main/resources/META-INF/spring.provides | 2 +-
.../src/main/resources/META-INF/LICENSE.txt | 203 -------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
.../additional-spring-configuration-metadata.json | 10 -
platforms/spring-boot/components-starter/pom.xml | 2 +-
.../camel-spring-boot-dependencies/pom.xml | 8 +-
.../{CamelNetty4Test.java => CamelNettyTest.java} | 6 +-
.../camel/itest/springboot/CamelHl7Test.java | 1 -
.../{CamelNetty4Test.java => CamelNettyTest.java} | 4 +-
tests/camel-itest/pom.xml | 2 +-
tests/camel-jmh/pom.xml | 2 +-
.../camel/tools/apt/DocumentationHelper.java | 4 +-
.../spring-boot-fix-dependencies.properties | 4 +-
214 files changed, 606 insertions(+), 775 deletions(-)
rename components/{camel-netty4 => camel-netty}/pom.xml (97%)
rename components/{camel-netty4/src/main/docs/netty4-component.adoc => camel-netty/src/main/docs/netty-component.adoc} (66%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactories.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ClientInitializerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/DefaultChannelHandlerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/DefaultNettyCamelStateCorrelationManager.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyCamelState.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyCamelStateCorrelationManager.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyComponent.java (99%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyConstants.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyConsumer.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyConsumerExceptionHandler.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyConverter.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java (95%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyHelper.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyPayloadHelper.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyProducer.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyServerBossPoolBuilder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/NettyWorkerPoolBuilder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ServerInitializerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ShareableChannelHandlerFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/SharedSingletonObjectPool.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/TextLineDelimiter.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/TimeoutCorrelationManagerSupport.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDelimiterDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/DelimiterBasedFrameDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/LineBasedFrameDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/ObjectDecoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/codec/ObjectEncoder.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/handlers/ServerResponseFutureListener.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/ssl/SSLEngineFactory.java (100%)
rename components/{camel-netty4 => camel-netty}/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/data/message1.txt (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/DatagramPacketByteArrayCodecTest.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/LogCaptureAppender.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/LogCaptureTest.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java (92%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java (89%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java (97%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java (98%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java (98%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java (88%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java (91%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java (88%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java (85%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java (83%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java (99%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java (93%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java (78%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java (91%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java (85%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java (97%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java (92%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java (86%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java (89%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java (80%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java (97%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java (87%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java (83%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java (93%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java (93%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java (88%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java (95%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java (88%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java (92%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java (90%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java (91%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java (94%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java (97%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java (93%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java (77%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/Poetry.java (100%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java (82%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java (96%)
rename components/{camel-netty4 => camel-netty}/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java (93%)
rename components/{camel-netty4 => camel-netty}/src/test/resources/keystore.jks (100%)
rename components/{camel-netty4 => camel-netty}/src/test/resources/log4j2.properties (96%)
rename components/{camel-netty4 => camel-netty}/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml (83%)
rename components/{camel-netty4 => camel-netty}/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml (94%)
rename components/{camel-netty4 => camel-netty}/src/test/resources/test.txt (100%)
rename docs/components/modules/ROOT/pages/{netty4-component.adoc => netty-component.adoc} (66%)
rename platforms/spring-boot/components-starter/{camel-netty4-starter => camel-netty-starter}/pom.xml (93%)
rename platforms/spring-boot/components-starter/{camel-netty4-starter => camel-netty-starter}/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java (95%)
rename platforms/spring-boot/components-starter/{camel-netty4-starter => camel-netty-starter}/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java (99%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-netty-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-netty-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
rename platforms/spring-boot/components-starter/{camel-netty4-starter => camel-netty-starter}/src/main/resources/META-INF/spring.factories (99%)
rename platforms/spring-boot/components-starter/{camel-netty4-starter => camel-netty-starter}/src/main/resources/META-INF/spring.provides (97%)
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/LICENSE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/NOTICE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
rename tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/{CamelNetty4Test.java => CamelNettyTest.java} (94%)
rename tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelNetty4Test.java => CamelNettyTest.java} (92%)
[camel] 14/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - SB integration test updated
Posted by ac...@apache.org.
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 3020344bfb2aaa9d7899f1f07fc5f3f893699038
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 14:05:29 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - SB integration test updated
---
.../src/test/java/org/apache/camel/itest/springboot/CamelHl7Test.java | 1 -
.../itest/springboot/{CamelNetty4Test.java => CamelNettyTest.java} | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHl7Test.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHl7Test.java
index bb1163b..c26675b 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHl7Test.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelHl7Test.java
@@ -35,7 +35,6 @@ public class CamelHl7Test extends AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelHl7Test.class))
- //.dependency(DependencyResolver.withVersion("org.apache.camel:camel-netty4"))
.build();
}
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4Test.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNettyTest.java
similarity index 92%
rename from tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4Test.java
rename to tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNettyTest.java
index 4b7c1de..dc427cb 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4Test.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNettyTest.java
@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
@RunWith(Arquillian.class)
-public class CamelNetty4Test extends AbstractSpringBootTestSupport {
+public class CamelNettyTest extends AbstractSpringBootTestSupport {
@Deployment
public static Archive<?> createSpringBootPackage() throws Exception {
@@ -34,7 +34,7 @@ public class CamelNetty4Test extends AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
- .module(inferModuleName(CamelNetty4Test.class))
+ .module(inferModuleName(CamelNettyTest.class))
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseNettyTest$)")
.build();
}
[camel] 16/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Aligned camel-netty tests
Posted by ac...@apache.org.
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 17057316fa62b952b8a702e8757f0b52e7088ded
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 14:23:01 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned camel-netty tests
---
.../test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
index aee0440..49409ab 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
@@ -88,7 +88,7 @@ public class Netty2978IssueTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=true")
+ from("netty:tcp://localhost:{{port}}?sync=true")
.process(new Processor() {
public void process(final Exchange exchange) {
String body = exchange.getIn().getBody(String.class);
[camel] 08/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Fixed refs in camel-mllp
Posted by ac...@apache.org.
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 db3237042b4d15913fd41b5272b22cceb21e2da2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 12:58:11 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed refs in camel-mllp
---
components/camel-mllp/README.md | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/components/camel-mllp/README.md b/components/camel-mllp/README.md
index a35fdc4..e398040 100644
--- a/components/camel-mllp/README.md
+++ b/components/camel-mllp/README.md
@@ -52,23 +52,23 @@ eliminates the dependencies on other camel components.
While Camel already includes some of this functionality in the camel-hl7 component, the implementation does not
provide all of the functionality required to effectively handle the MLLP protocol - especially under adverse conditions.
-The camel-hl7 Mina2 codec and Netty4 decoder do not handle MLLP Framing errors very well - the component will hang waiting
+The camel-hl7 Mina2 codec and Netty decoder do not handle MLLP Framing errors very well - the component will hang waiting
for frames to complete in some instances.
-While both camel-mina and camel-netty4 provide a "timeout" function, it is only applied to Producers. MLLP Consumers
+While both camel-mina and camel-netty provide a "timeout" function, it is only applied to Producers. MLLP Consumers
also need to be able to timeout to recover from MLLP framing errors. Additionally, the timeout functionality of the
-camel-netty4 component is disable after any data is received on the connection, making in ineffective for detecting
+camel-netty component is disable after any data is received on the connection, making in ineffective for detecting
timeouts after the first messages is received.
-Also, neither the Mina2 codec nor the Netty4 decoder interrogate HL7 Acknowledgments. Therefore, it is much more
+Also, neither the Mina2 codec nor the Netty decoder interrogate HL7 Acknowledgments. Therefore, it is much more
difficult to use the redelivery and error handling features Camel provides.
The above issues may be addressable by updating/patching the existing components, but there is one more that is not.
-Both camel-netty4 and camel-mina are designed to handle a large number of concurrent connections, rapid connect/disconnect
+Both camel-netty and camel-mina are designed to handle a large number of concurrent connections, rapid connect/disconnect
rates, and asynchronous communication. Forcing, these components to deal with the small number of stateful connections
inherent to the MLLP protocol seems inappropriate.
-An attempt was made to update the camel-netty4 decoder provided by the camel-hl7 component to deal with the nuances of
+An attempt was made to update the camel-netty decoder provided by the camel-hl7 component to deal with the nuances of
the MLLP protocol, but it quickly became very complicated. The decoder was updated to correctly deal with the MLLP
frame. The current implementation is based on the Netty DelimiterBasedFrameDecoder, but this decoder only looks for a
single byte terminator and MLLP uses two bytes to terminate it's frame. Additionally, the second terminating byte of the
[camel] 06/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Updated docs
Posted by ac...@apache.org.
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 <an...@gmail.com>
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>
[camel] 15/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Fixed hl7 tests
Posted by ac...@apache.org.
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 29bd41b11f50e9b06c20b2effd48e2970ff5b5fc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 14:21:36 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed hl7 tests
---
.../camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java | 4 ++--
.../component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java | 10 +++++-----
.../apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java | 4 ++--
.../component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java | 4 ++--
.../org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java | 4 ++--
.../component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java | 4 ++--
.../apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java | 4 ++--
.../java/org/apache/camel/component/hl7/HL7NettyRouteTest.java | 8 ++++----
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
index 2f606c6..f785287 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
@@ -56,7 +56,7 @@ public class HL7MLLPNettyCodecBoundaryTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
// check presence of correct message type
exchange.getIn().getBody(MDM_T02.class);
@@ -80,7 +80,7 @@ public class HL7MLLPNettyCodecBoundaryTest extends HL7TestSupport {
assertEquals(1022, message.length());
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(1);
- template.requestBody("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", message);
+ template.requestBody("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", message);
mockEndpoint.assertIsSatisfied();
}
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
index 3742064..4f9b451 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.spi.DataFormat;
import org.junit.Test;
/**
- * Unit test for HL7 routing where the netty4 endpoint passes on a byte array
+ * Unit test for HL7 routing where the netty endpoint passes on a byte array
* instead of a string and leaves charset interpretation to the dataformat.
*/
public class HL7MLLPNettyCodecByteArrayRouteTest extends HL7TestSupport {
@@ -65,7 +65,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString(), String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123|||||UNICODE UTF-8", lines[0]);
@@ -88,7 +88,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString(), String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADT^A01||||123|||||UNICODE UTF-8", lines[0]);
assertEquals("PID|||123||Döe^John", lines[1]);
@@ -110,7 +110,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- template.requestBody("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString());
+ template.requestBody("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString());
assertMockEndpointsSatisfied();
}
@@ -123,7 +123,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends HL7TestSupport {
DataFormat hl7 = new HL7DataFormat();
// we setup or HL7 listener on port 8888 (using the hl7codec)
// and in sync mode so we can return a response
- from("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder")
+ from("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder")
// we use the HL7 data format to unmarshal from HL7 stream
// to the HAPI Message model
// this ensures that the camel message has been enriched
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
index f61a884..801d7b5 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
@@ -55,7 +55,7 @@ public class HL7MLLPNettyCodecLongTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
assertEquals(70010, exchange.getIn().getBody(byte[].class).length);
MDM_T02 input = (MDM_T02)exchange.getIn().getBody(Message.class);
@@ -82,7 +82,7 @@ public class HL7MLLPNettyCodecLongTest extends HL7TestSupport {
}
message = message.substring(0, message.length() - 1);
assertEquals(70010, message.length());
- String out = template.requestBody("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", message, String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", message, String.class);
assertEquals("some response", out);
// END SNIPPET: e2
}
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
index b877a92..07ee84b 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
@@ -63,7 +63,7 @@ public class HL7MLLPNettyCodecStandAndEndBytesTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input = exchange.getIn().getBody(Message.class);
@@ -89,7 +89,7 @@ public class HL7MLLPNettyCodecStandAndEndBytesTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(), String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123", lines[0]);
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
index a226455..f7da10e1 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
@@ -55,7 +55,7 @@ public class HL7MLLPNettyCodecTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input = exchange.getIn().getBody(Message.class);
@@ -82,7 +82,7 @@ public class HL7MLLPNettyCodecTest extends HL7TestSupport {
in.append("\n");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(), String.class);
// END SNIPPET: e2
String[] lines = out.split("\r");
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
index a2e5173..28ca0a1 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
@@ -45,7 +45,7 @@ public class HL7MLLPNettyDecoderResourceLeakTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://127.0.0.1:" + getPort() + "?decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() + "?decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input = exchange.getIn().getBody(Message.class);
exchange.getOut().setBody(input.generateACK());
@@ -60,7 +60,7 @@ public class HL7MLLPNettyDecoderResourceLeakTest extends HL7TestSupport {
String message = "MSH|^~\\&|MYSENDER|MYRECEIVER|MYAPPLICATION||200612211200||QRY^A19|1234|P|2.4";
for (int i = 0; i < 10; i++) {
- template.sendBody("netty4:tcp://127.0.0.1:" + getPort() + "?decoder=#hl7decoder&encoder=#hl7encoder", message);
+ template.sendBody("netty:tcp://127.0.0.1:" + getPort() + "?decoder=#hl7decoder&encoder=#hl7encoder", message);
}
}
}
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
index 6ced122..681d940 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
@@ -55,12 +55,12 @@ public class HL7MLLPNettyRouteToTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:start").to("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder")
+ from("direct:start").to("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder")
// because HL7 message contains a bunch of control chars
// then the logger do not log all of the data
.log("HL7 message: ${body}").to("mock:result");
- from("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input = exchange.getIn().getBody(Message.class);
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
index d85bc71..ec5dcbb 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
@@ -69,7 +69,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(), String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123", lines[0]);
@@ -92,7 +92,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(), String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADT^A01||||123", lines[0]);
assertEquals("PID|||123||Doe^John", lines[1]);
@@ -114,7 +114,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- template.requestBody("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString());
+ template.requestBody("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString());
assertMockEndpointsSatisfied();
}
@@ -127,7 +127,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
DataFormat hl7 = new HL7DataFormat();
// we setup or HL7 listener on port 8888 (using the hl7codec)
// and in sync mode so we can return a response
- from("netty4:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder")
+ from("netty:tcp://127.0.0.1:" + getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder")
// we use the HL7 data format to unmarshal from HL7 stream
// to the HAPI Message model
// this ensures that the camel message has been enriched
[camel] 17/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Aligned camel-netty4-http tests
Posted by ac...@apache.org.
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 c4fe00d4d07b40fae462b3dd48ff21342e66577b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 14:29:51 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned camel-netty4-http tests
---
.../camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
index c843ffa..08b4491 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java
@@ -71,7 +71,7 @@ public class NettyHttpGetWithInvalidMessageTest extends CamelTestSupport {
}
private void invokeService(int port) {
- Exchange out = template.request("netty4:tcp://localhost:" + port + "?encoders=#encoders&decoders=#decoders&sync=true", new Processor() {
+ Exchange out = template.request("netty:tcp://localhost:" + port + "?encoders=#encoders&decoders=#decoders&sync=true", new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody(REQUEST_STRING);
[camel] 18/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Removed last refs
Posted by ac...@apache.org.
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 cffec5810be9c64452319d52a1f20d03d2d044cd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 14:35:22 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Removed last refs
---
.../src/main/resources/spring-boot-fix-dependencies.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
index cccb344..1a93742 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
@@ -29,7 +29,7 @@ camel-cassandraql=com.google.guava:guava:${cassandra-driver-guava-version}
camel-github=org.eclipse.mylyn.github:org.eclipse.egit.github.core:${egit-github-core-version}
camel-guava-eventbus=com.google.guava:guava:${google-guava-version}
-# Defaulting to netty4 in the starter
+# Defaulting to netty in the starter
camel-hl7=org.apache.camel:camel-netty:${project.version}
# Camel Core requires on APT for the usage of CollectionStringBuffer.
[camel] 04/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - updated references to netty4-http
Posted by ac...@apache.org.
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 06e4248d0c3df46ac3784df086e4739b9a0d2fae
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 11:33:36 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - updated references to netty4-http
---
bom/camel-bom/pom.xml | 6 +++---
.../org/apache/camel/component/netty4/http/NettyHttpEndpoint.java | 2 +-
platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 7cbe43f..872384d 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2015,17 +2015,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>
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
index 87e8a56..ca6fdcb 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
@@ -41,7 +41,7 @@ import org.apache.camel.util.StringHelper;
/**
* Netty HTTP server and client using the Netty 4.x library.
*/
-@UriEndpoint(firstVersion = "2.14.0", scheme = "netty4-http,netty-http", extendsScheme = "netty4", title = "Netty4 HTTP",
+@UriEndpoint(firstVersion = "2.14.0", scheme = "netty4-http,netty-http", extendsScheme = "netty", title = "Netty4 HTTP",
syntax = "netty4-http:protocol:host:port/path", label = "http", lenientProperties = true,
excludeProperties = "textline,delimiter,autoAppendDelimiter,decoderMaxLineLength,encoding,allowDefaultCodec,udpConnectionlessSending,networkInterface"
+ ",clientMode,reconnect,reconnectInterval,useByteBuf,udpByteArrayCodec,broadcast,correlationManager")
diff --git a/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml
index d48a912..00732fd 100644
--- a/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
[camel] 11/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Fixed syslog tests
Posted by ac...@apache.org.
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 dc410a7b3984623824653f1dcd1534607a537798
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 13:06:34 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed syslog tests
---
.../java/org/apache/camel/component/syslog/NettyDataFormatTest.java | 4 ++--
.../org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java | 2 +-
.../apache/camel/component/syslog/NettyRfc5425LongMessageTest.java | 2 +-
.../test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java | 2 +-
.../org/apache/camel/component/syslog/applicationContext-Netty.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
index ab2bd2d..244089e 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
@@ -78,7 +78,7 @@ public class NettyDataFormatTest extends CamelTestSupport {
mock2.expectedMessageCount(1);
mock2.expectedBodiesReceived(message);
- template.sendBody("netty4:udp://127.0.0.1:" + serverPort + "?sync=false&allowDefaultCodec=false&useByteBuf=true", message);
+ template.sendBody("netty:udp://127.0.0.1:" + serverPort + "?sync=false&allowDefaultCodec=false&useByteBuf=true", message);
assertMockEndpointsSatisfied();
}
@@ -92,7 +92,7 @@ public class NettyDataFormatTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("netty4:udp://127.0.0.1:" + serverPort + "?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
+ from("netty:udp://127.0.0.1:" + serverPort + "?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
.process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
index 50f4943..48cb9aa 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
@@ -75,7 +75,7 @@ public class NettyManyUDPMessagesTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("netty4:udp://127.0.0.1:" + serverPort + "?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
+ from("netty:udp://127.0.0.1:" + serverPort + "?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
.process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
index f9340d0..35715c9 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
@@ -56,7 +56,7 @@ public class NettyRfc5425LongMessageTest extends CamelTestSupport {
@BeforeClass
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
- uri = "netty4:tcp://localhost:" + serverPort + "?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder";
+ uri = "netty:tcp://localhost:" + serverPort + "?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder";
}
@Test
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
index 4a37351..f99fb9a 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
@@ -48,7 +48,7 @@ public class NettyRfc5425Test extends CamelTestSupport {
@BeforeClass
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
- uri = "netty4:tcp://localhost:" + serverPort + "?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder";
+ uri = "netty:tcp://localhost:" + serverPort + "?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder";
uriClient = uri + "&useByteBuf=true";
}
diff --git a/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml b/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
index b0e175f..08506d4 100644
--- a/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
+++ b/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
@@ -33,7 +33,7 @@
</dataFormats>
<route>
- <from uri="netty4:udp://localhost:{{server-port}}?sync=false&allowDefaultCodec=false"/>
+ <from uri="netty:udp://localhost:{{server-port}}?sync=false&allowDefaultCodec=false"/>
<unmarshal><custom ref="mySyslog"/></unmarshal>
<to uri="mock:stop1"/>
<marshal><custom ref="mySyslog"/></marshal>
[camel] 20/20: Super Regen!
Posted by ac...@apache.org.
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 84773805a40cc0c5f9e7be65d9f3bb232f5a4ba0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 15:09:37 2019 +0200
Super Regen!
---
.../src/main/docs/activemq-component.adoc | 2 +-
.../camel-amqp/src/main/docs/amqp-component.adoc | 8 +--
.../camel-jms/src/main/docs/jms-component.adoc | 6 +--
.../src/main/docs/salesforce-component.adoc | 4 +-
.../endpoint/dsl/AMQPEndpointBuilderFactory.java | 60 +++++++++++++++++++---
.../modules/ROOT/pages/activemq-component.adoc | 8 +--
.../modules/ROOT/pages/amqp-component.adoc | 8 +--
.../modules/ROOT/pages/jms-component.adoc | 12 ++---
.../modules/ROOT/pages/rest-component.adoc | 1 -
.../modules/ROOT/pages/salesforce-component.adoc | 8 ++-
.../springboot/AMQPComponentConfiguration.java | 5 +-
11 files changed, 89 insertions(+), 33 deletions(-)
diff --git a/components/camel-activemq/src/main/docs/activemq-component.adoc b/components/camel-activemq/src/main/docs/activemq-component.adoc
index f357782..9fd81ea 100644
--- a/components/camel-activemq/src/main/docs/activemq-component.adoc
+++ b/components/camel-activemq/src/main/docs/activemq-component.adoc
@@ -363,7 +363,7 @@ The component supports 86 options, which are listed below.
| *camel.component.activemq.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String
| *camel.component.activemq.transaction-name* | The name of the transaction to use. | | String
| *camel.component.activemq.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
-| *camel.component.activemq.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this opti [...]
+| *camel.component.activemq.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this opti [...]
| *camel.component.activemq.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the p [...]
| *camel.component.activemq.trust-all-packages* | Define if all packages are trusted or not | false | Boolean
| *camel.component.activemq.use-message-i-d-as-correlation-i-d* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc
index 9abe610..f0c6f43 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -98,7 +98,7 @@ The AMQP component supports 80 options, which are listed below.
| *requestTimeout* (producer) | The timeout for waiting for a reply when using the InOut Exchange Pattern (in milliseconds). The default is 20 seconds. You can include the header CamelJmsRequestTimeout to override this endpoint configured timeout value, and thus have per message individual timeout values. See also the requestTimeoutCheckerInterval option. | 20000 | long
| *requestTimeoutChecker Interval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
-| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
| *jmsOperations* (advanced) | Allows you to use your own implementation of the org.springframework.jms.core.JmsOperations interface. Camel uses JmsTemplate as default. Can be used for testing purpose, but not used much as stated in the spring API docs. | | JmsOperations
| *destinationResolver* (advanced) | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | | DestinationResolver
| *replyToType* (producer) | Allows for explicitly specifying which kind of strategy to use for replyTo queues when doing request/reply over JMS. Possible values are: Temporary, Shared, or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured, then Shared is used by default. This option allows you to use exclusive queues instead of shared ones. See Camel JMS documentation for more details, and especially the notes about the implications if running [...]
@@ -236,8 +236,8 @@ with the following path and query parameters:
| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
| *requestTimeoutChecker Interval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
-| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
+| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
| *useMessageIDAsCorrelation ID* (advanced) | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | boolean
| *waitForProvisionCorrelation ToBeUpdatedCounter* (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int
| *waitForProvisionCorrelation ToBeUpdatedThreadSleeping Time* (advanced) | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | long
@@ -350,7 +350,7 @@ The component supports 81 options, which are listed below.
| *camel.component.amqp.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String
| *camel.component.amqp.transaction-name* | The name of the transaction to use. | | String
| *camel.component.amqp.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
-| *camel.component.amqp.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option t [...]
+| *camel.component.amqp.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option t [...]
| *camel.component.amqp.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the paylo [...]
| *camel.component.amqp.use-message-i-d-as-correlation-i-d* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
| *camel.component.amqp.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index 0bdd271..4a9a7b6 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -541,8 +541,8 @@ The component supports 169 options, which are listed below.
| *camel.component.jms.configuration.transaction-manager* | The Spring transaction manager to use. | | PlatformTransaction Manager
| *camel.component.jms.configuration.transaction-name* | The name of the transaction to use. | | String
| *camel.component.jms.configuration.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
-| *camel.component.jms.configuration.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, [...]
-| *camel.component.jms.configuration.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel kn [...]
+| *camel.component.jms.configuration.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, [...]
+| *camel.component.jms.configuration.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel kn [...]
| *camel.component.jms.configuration.use-message-i-d-as-correlation-i-d* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
| *camel.component.jms.configuration.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
| *camel.component.jms.configuration.wait-for-provision-correlation-to-be-updated-counter* | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | Integer
@@ -605,7 +605,7 @@ The component supports 169 options, which are listed below.
| *camel.component.jms.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String
| *camel.component.jms.transaction-name* | The name of the transaction to use. | | String
| *camel.component.jms.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
-| *camel.component.jms.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option ta [...]
+| *camel.component.jms.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option ta [...]
| *camel.component.jms.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloa [...]
| *camel.component.jms.use-message-i-d-as-correlation-i-d* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
| *camel.component.jms.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index 4091fc8..510c479 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -760,7 +760,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 86 options, which are listed below.
+The component supports 88 options, which are listed below.
@@ -819,6 +819,8 @@ The component supports 86 options, which are listed below.
| *camel.component.salesforce.config.serialize-nulls* | Should the NULL values of given DTO be serialized with empty (NULL) values. This affects only JSON data format. | false | Boolean
| *camel.component.salesforce.config.update-topic* | Whether to update an existing Push Topic when using the Streaming API, defaults to false | false | Boolean
| *camel.component.salesforce.enabled* | Enable salesforce component | true | Boolean
+| *camel.component.salesforce.http-client-connection-timeout* | Connection timeout used by the HttpClient when connecting to the Salesforce server. | 60000 | Long
+| *camel.component.salesforce.http-client-idle-timeout* | Timeout used by the HttpClient when waiting for response from the Salesforce server. | 10000 | Long
| *camel.component.salesforce.http-client-properties* | Used to set any properties that can be configured on the underlying HTTP client. Have a look at properties of SalesforceHttpClient and the Jetty HttpClient for all available options. | | Map
| *camel.component.salesforce.http-proxy-auth-uri* | Used in authentication against the HTTP proxy server, needs to match the URI of the proxy server in order for the httpProxyUsername and httpProxyPassword to be used for authentication. | | String
| *camel.component.salesforce.http-proxy-excluded-addresses* | A list of addresses for which HTTP proxy server should not be used. | | Set
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
index fd25f75..4700246 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
@@ -1758,6 +1758,10 @@ public interface AMQPEndpointBuilderFactory {
* exception is required to be serializable. The original Exception on
* the consumer side can be wrapped in an outer exception such as
* org.apache.camel.RuntimeCamelException when returned to the producer.
+ * Use this with caution as the data is using Java Object serialization
+ * and requires the received to be able to deserialize the data at Class
+ * level, which forces a strong coupling between the producers and
+ * consumer!.
*
* The option is a: <code>boolean</code> type.
*
@@ -1779,6 +1783,10 @@ public interface AMQPEndpointBuilderFactory {
* exception is required to be serializable. The original Exception on
* the consumer side can be wrapped in an outer exception such as
* org.apache.camel.RuntimeCamelException when returned to the producer.
+ * Use this with caution as the data is using Java Object serialization
+ * and requires the received to be able to deserialize the data at Class
+ * level, which forces a strong coupling between the producers and
+ * consumer!.
*
* The option will be converted to a <code>boolean</code> type.
*
@@ -1797,7 +1805,11 @@ public interface AMQPEndpointBuilderFactory {
* serializable. Camel will exclude any non-serializable objects and log
* it at WARN level. You must enable this option on both the producer
* and consumer side, so Camel knows the payloads is an Exchange and not
- * a regular payload.
+ * a regular payload. Use this with caution as the data is using Java
+ * Object serialization and requires the received to be able to
+ * deserialize the data at Class level, which forces a strong coupling
+ * between the producers and consumer having to use compatible Camel
+ * versions!.
*
* The option is a: <code>boolean</code> type.
*
@@ -1816,7 +1828,11 @@ public interface AMQPEndpointBuilderFactory {
* serializable. Camel will exclude any non-serializable objects and log
* it at WARN level. You must enable this option on both the producer
* and consumer side, so Camel knows the payloads is an Exchange and not
- * a regular payload.
+ * a regular payload. Use this with caution as the data is using Java
+ * Object serialization and requires the received to be able to
+ * deserialize the data at Class level, which forces a strong coupling
+ * between the producers and consumer having to use compatible Camel
+ * versions!.
*
* The option will be converted to a <code>boolean</code> type.
*
@@ -3646,6 +3662,10 @@ public interface AMQPEndpointBuilderFactory {
* exception is required to be serializable. The original Exception on
* the consumer side can be wrapped in an outer exception such as
* org.apache.camel.RuntimeCamelException when returned to the producer.
+ * Use this with caution as the data is using Java Object serialization
+ * and requires the received to be able to deserialize the data at Class
+ * level, which forces a strong coupling between the producers and
+ * consumer!.
*
* The option is a: <code>boolean</code> type.
*
@@ -3667,6 +3687,10 @@ public interface AMQPEndpointBuilderFactory {
* exception is required to be serializable. The original Exception on
* the consumer side can be wrapped in an outer exception such as
* org.apache.camel.RuntimeCamelException when returned to the producer.
+ * Use this with caution as the data is using Java Object serialization
+ * and requires the received to be able to deserialize the data at Class
+ * level, which forces a strong coupling between the producers and
+ * consumer!.
*
* The option will be converted to a <code>boolean</code> type.
*
@@ -3685,7 +3709,11 @@ public interface AMQPEndpointBuilderFactory {
* serializable. Camel will exclude any non-serializable objects and log
* it at WARN level. You must enable this option on both the producer
* and consumer side, so Camel knows the payloads is an Exchange and not
- * a regular payload.
+ * a regular payload. Use this with caution as the data is using Java
+ * Object serialization and requires the received to be able to
+ * deserialize the data at Class level, which forces a strong coupling
+ * between the producers and consumer having to use compatible Camel
+ * versions!.
*
* The option is a: <code>boolean</code> type.
*
@@ -3704,7 +3732,11 @@ public interface AMQPEndpointBuilderFactory {
* serializable. Camel will exclude any non-serializable objects and log
* it at WARN level. You must enable this option on both the producer
* and consumer side, so Camel knows the payloads is an Exchange and not
- * a regular payload.
+ * a regular payload. Use this with caution as the data is using Java
+ * Object serialization and requires the received to be able to
+ * deserialize the data at Class level, which forces a strong coupling
+ * between the producers and consumer having to use compatible Camel
+ * versions!.
*
* The option will be converted to a <code>boolean</code> type.
*
@@ -4844,6 +4876,10 @@ public interface AMQPEndpointBuilderFactory {
* exception is required to be serializable. The original Exception on
* the consumer side can be wrapped in an outer exception such as
* org.apache.camel.RuntimeCamelException when returned to the producer.
+ * Use this with caution as the data is using Java Object serialization
+ * and requires the received to be able to deserialize the data at Class
+ * level, which forces a strong coupling between the producers and
+ * consumer!.
*
* The option is a: <code>boolean</code> type.
*
@@ -4865,6 +4901,10 @@ public interface AMQPEndpointBuilderFactory {
* exception is required to be serializable. The original Exception on
* the consumer side can be wrapped in an outer exception such as
* org.apache.camel.RuntimeCamelException when returned to the producer.
+ * Use this with caution as the data is using Java Object serialization
+ * and requires the received to be able to deserialize the data at Class
+ * level, which forces a strong coupling between the producers and
+ * consumer!.
*
* The option will be converted to a <code>boolean</code> type.
*
@@ -4883,7 +4923,11 @@ public interface AMQPEndpointBuilderFactory {
* serializable. Camel will exclude any non-serializable objects and log
* it at WARN level. You must enable this option on both the producer
* and consumer side, so Camel knows the payloads is an Exchange and not
- * a regular payload.
+ * a regular payload. Use this with caution as the data is using Java
+ * Object serialization and requires the received to be able to
+ * deserialize the data at Class level, which forces a strong coupling
+ * between the producers and consumer having to use compatible Camel
+ * versions!.
*
* The option is a: <code>boolean</code> type.
*
@@ -4902,7 +4946,11 @@ public interface AMQPEndpointBuilderFactory {
* serializable. Camel will exclude any non-serializable objects and log
* it at WARN level. You must enable this option on both the producer
* and consumer side, so Camel knows the payloads is an Exchange and not
- * a regular payload.
+ * a regular payload. Use this with caution as the data is using Java
+ * Object serialization and requires the received to be able to
+ * deserialize the data at Class level, which forces a strong coupling
+ * between the producers and consumer having to use compatible Camel
+ * versions!.
*
* The option will be converted to a <code>boolean</code> type.
*
diff --git a/docs/components/modules/ROOT/pages/activemq-component.adoc b/docs/components/modules/ROOT/pages/activemq-component.adoc
index ab5fc9a..9fd81ea 100644
--- a/docs/components/modules/ROOT/pages/activemq-component.adoc
+++ b/docs/components/modules/ROOT/pages/activemq-component.adoc
@@ -111,7 +111,7 @@ The ActiveMQ component supports 85 options, which are listed below.
| *requestTimeout* (producer) | The timeout for waiting for a reply when using the InOut Exchange Pattern (in milliseconds). The default is 20 seconds. You can include the header CamelJmsRequestTimeout to override this endpoint configured timeout value, and thus have per message individual timeout values. See also the requestTimeoutCheckerInterval option. | 20000 | long
| *requestTimeoutChecker Interval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
-| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
| *jmsOperations* (advanced) | Allows you to use your own implementation of the org.springframework.jms.core.JmsOperations interface. Camel uses JmsTemplate as default. Can be used for testing purpose, but not used much as stated in the spring API docs. | | JmsOperations
| *destinationResolver* (advanced) | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | | DestinationResolver
| *replyToType* (producer) | Allows for explicitly specifying which kind of strategy to use for replyTo queues when doing request/reply over JMS. Possible values are: Temporary, Shared, or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured, then Shared is used by default. This option allows you to use exclusive queues instead of shared ones. See Camel JMS documentation for more details, and especially the notes about the implications if running [...]
@@ -246,8 +246,8 @@ with the following path and query parameters:
| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
| *requestTimeoutChecker Interval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
-| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
+| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
| *useMessageIDAsCorrelation ID* (advanced) | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | boolean
| *waitForProvisionCorrelation ToBeUpdatedCounter* (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int
| *waitForProvisionCorrelation ToBeUpdatedThreadSleeping Time* (advanced) | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | long
@@ -363,7 +363,7 @@ The component supports 86 options, which are listed below.
| *camel.component.activemq.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String
| *camel.component.activemq.transaction-name* | The name of the transaction to use. | | String
| *camel.component.activemq.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
-| *camel.component.activemq.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this opti [...]
+| *camel.component.activemq.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this opti [...]
| *camel.component.activemq.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the p [...]
| *camel.component.activemq.trust-all-packages* | Define if all packages are trusted or not | false | Boolean
| *camel.component.activemq.use-message-i-d-as-correlation-i-d* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc b/docs/components/modules/ROOT/pages/amqp-component.adoc
index 9abe610..f0c6f43 100644
--- a/docs/components/modules/ROOT/pages/amqp-component.adoc
+++ b/docs/components/modules/ROOT/pages/amqp-component.adoc
@@ -98,7 +98,7 @@ The AMQP component supports 80 options, which are listed below.
| *requestTimeout* (producer) | The timeout for waiting for a reply when using the InOut Exchange Pattern (in milliseconds). The default is 20 seconds. You can include the header CamelJmsRequestTimeout to override this endpoint configured timeout value, and thus have per message individual timeout values. See also the requestTimeoutCheckerInterval option. | 20000 | long
| *requestTimeoutChecker Interval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
-| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
| *jmsOperations* (advanced) | Allows you to use your own implementation of the org.springframework.jms.core.JmsOperations interface. Camel uses JmsTemplate as default. Can be used for testing purpose, but not used much as stated in the spring API docs. | | JmsOperations
| *destinationResolver* (advanced) | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | | DestinationResolver
| *replyToType* (producer) | Allows for explicitly specifying which kind of strategy to use for replyTo queues when doing request/reply over JMS. Possible values are: Temporary, Shared, or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured, then Shared is used by default. This option allows you to use exclusive queues instead of shared ones. See Camel JMS documentation for more details, and especially the notes about the implications if running [...]
@@ -236,8 +236,8 @@ with the following path and query parameters:
| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
| *requestTimeoutChecker Interval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
-| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
+| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
| *useMessageIDAsCorrelation ID* (advanced) | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | boolean
| *waitForProvisionCorrelation ToBeUpdatedCounter* (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int
| *waitForProvisionCorrelation ToBeUpdatedThreadSleeping Time* (advanced) | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | long
@@ -350,7 +350,7 @@ The component supports 81 options, which are listed below.
| *camel.component.amqp.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String
| *camel.component.amqp.transaction-name* | The name of the transaction to use. | | String
| *camel.component.amqp.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
-| *camel.component.amqp.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option t [...]
+| *camel.component.amqp.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option t [...]
| *camel.component.amqp.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the paylo [...]
| *camel.component.amqp.use-message-i-d-as-correlation-i-d* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
| *camel.component.amqp.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
diff --git a/docs/components/modules/ROOT/pages/jms-component.adoc b/docs/components/modules/ROOT/pages/jms-component.adoc
index 95ee60a..4a9a7b6 100644
--- a/docs/components/modules/ROOT/pages/jms-component.adoc
+++ b/docs/components/modules/ROOT/pages/jms-component.adoc
@@ -254,7 +254,7 @@ The JMS component supports 80 options, which are listed below.
| *requestTimeout* (producer) | The timeout for waiting for a reply when using the InOut Exchange Pattern (in milliseconds). The default is 20 seconds. You can include the header CamelJmsRequestTimeout to override this endpoint configured timeout value, and thus have per message individual timeout values. See also the requestTimeoutCheckerInterval option. | 20000 | long
| *requestTimeoutChecker Interval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
-| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
| *jmsOperations* (advanced) | Allows you to use your own implementation of the org.springframework.jms.core.JmsOperations interface. Camel uses JmsTemplate as default. Can be used for testing purpose, but not used much as stated in the spring API docs. | | JmsOperations
| *destinationResolver* (advanced) | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). | | DestinationResolver
| *replyToType* (producer) | Allows for explicitly specifying which kind of strategy to use for replyTo queues when doing request/reply over JMS. Possible values are: Temporary, Shared, or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured, then Shared is used by default. This option allows you to use exclusive queues instead of shared ones. See Camel JMS documentation for more details, and especially the notes about the implications if running [...]
@@ -403,8 +403,8 @@ with the following path and query parameters:
| *recoveryInterval* (advanced) | Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds. | 5000 | long
| *requestTimeoutChecker Interval* (advanced) | Configures how often Camel should check for timed out Exchanges when doing request/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeout occurs, then you can lower this interval, to check more frequently. The timeout is determined by the option requestTimeout. | 1000 | long
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
-| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
+| *transferException* (advanced) | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option takes preced [...]
+| *transferExchange* (advanced) | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloads is an E [...]
| *useMessageIDAsCorrelation ID* (advanced) | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | boolean
| *waitForProvisionCorrelation ToBeUpdatedCounter* (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int
| *waitForProvisionCorrelation ToBeUpdatedThreadSleeping Time* (advanced) | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | long
@@ -541,8 +541,8 @@ The component supports 169 options, which are listed below.
| *camel.component.jms.configuration.transaction-manager* | The Spring transaction manager to use. | | PlatformTransaction Manager
| *camel.component.jms.configuration.transaction-name* | The name of the transaction to use. | | String
| *camel.component.jms.configuration.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
-| *camel.component.jms.configuration.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, [...]
-| *camel.component.jms.configuration.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel kn [...]
+| *camel.component.jms.configuration.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, [...]
+| *camel.component.jms.configuration.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel kn [...]
| *camel.component.jms.configuration.use-message-i-d-as-correlation-i-d* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
| *camel.component.jms.configuration.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
| *camel.component.jms.configuration.wait-for-provision-correlation-to-be-updated-counter* | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | Integer
@@ -605,7 +605,7 @@ The component supports 169 options, which are listed below.
| *camel.component.jms.transaction-manager* | The Spring transaction manager to use. The option is a org.springframework.transaction.PlatformTransactionManager type. | | String
| *camel.component.jms.transaction-name* | The name of the transaction to use. | | String
| *camel.component.jms.transaction-timeout* | The timeout value of the transaction (in seconds), if using transacted mode. | -1 | Integer
-| *camel.component.jms.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option ta [...]
+| *camel.component.jms.transfer-exception* | If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client is Camel, the returned Exception is rethrown. This allows you to use Camel JMS as a bridge in your routing - for example, using persistent queues to enable robust routing. Notice that if you also have transferExchange enabled, this option ta [...]
| *camel.component.jms.transfer-exchange* | You can transfer the exchange over the wire instead of just the body and headers. 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. You must enable this option on both the producer and consumer side, so Camel knows the payloa [...]
| *camel.component.jms.use-message-i-d-as-correlation-i-d* | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | Boolean
| *camel.component.jms.username* | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. | | String
diff --git a/docs/components/modules/ROOT/pages/rest-component.adoc b/docs/components/modules/ROOT/pages/rest-component.adoc
index 46d150b..6c31c4c 100644
--- a/docs/components/modules/ROOT/pages/rest-component.adoc
+++ b/docs/components/modules/ROOT/pages/rest-component.adoc
@@ -123,7 +123,6 @@ The component supports 8 options, which are listed below.
The following components support rest consumer (Rest DSL):
* camel-coap
-* camel-netty-http
* camel-netty4-http
* camel-jetty
* camel-restlet
diff --git a/docs/components/modules/ROOT/pages/salesforce-component.adoc b/docs/components/modules/ROOT/pages/salesforce-component.adoc
index aa0f9fe..510c479 100644
--- a/docs/components/modules/ROOT/pages/salesforce-component.adoc
+++ b/docs/components/modules/ROOT/pages/salesforce-component.adoc
@@ -619,7 +619,7 @@ for details on how to generate the DTO.
// component options: START
-The Salesforce component supports 30 options, which are listed below.
+The Salesforce component supports 32 options, which are listed below.
@@ -642,6 +642,8 @@ The Salesforce component supports 30 options, which are listed below.
| *longPollingTransport Properties* (common) | Used to set any properties that can be configured on the LongPollingTransport used by the BayeuxClient (CometD) used by the streaming api | | Map
| *sslContextParameters* (security) | SSL parameters to use, see SSLContextParameters class for all available options. | | SSLContextParameters
| *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters | false | boolean
+| *httpClientIdleTimeout* (common) | Timeout used by the HttpClient when waiting for response from the Salesforce server. | 10000 | long
+| *httpClientConnection Timeout* (common) | Connection timeout used by the HttpClient when connecting to the Salesforce server. | 60000 | long
| *httpProxyHost* (proxy) | Hostname of the HTTP proxy server to use. | | String
| *httpProxyPort* (proxy) | Port number of the HTTP proxy server to use. | | Integer
| *httpProxyUsername* (security) | Username to use to authenticate against the HTTP proxy server. | | String
@@ -758,7 +760,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 86 options, which are listed below.
+The component supports 88 options, which are listed below.
@@ -817,6 +819,8 @@ The component supports 86 options, which are listed below.
| *camel.component.salesforce.config.serialize-nulls* | Should the NULL values of given DTO be serialized with empty (NULL) values. This affects only JSON data format. | false | Boolean
| *camel.component.salesforce.config.update-topic* | Whether to update an existing Push Topic when using the Streaming API, defaults to false | false | Boolean
| *camel.component.salesforce.enabled* | Enable salesforce component | true | Boolean
+| *camel.component.salesforce.http-client-connection-timeout* | Connection timeout used by the HttpClient when connecting to the Salesforce server. | 60000 | Long
+| *camel.component.salesforce.http-client-idle-timeout* | Timeout used by the HttpClient when waiting for response from the Salesforce server. | 10000 | Long
| *camel.component.salesforce.http-client-properties* | Used to set any properties that can be configured on the underlying HTTP client. Have a look at properties of SalesforceHttpClient and the Jetty HttpClient for all available options. | | Map
| *camel.component.salesforce.http-proxy-auth-uri* | Used in authentication against the HTTP proxy server, needs to match the URI of the proxy server in order for the httpProxyUsername and httpProxyPassword to be used for authentication. | | String
| *camel.component.salesforce.http-proxy-excluded-addresses* | A list of addresses for which HTTP proxy server should not be used. | | Set
diff --git a/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
index 2d7397f..4f1f463 100644
--- a/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
@@ -407,7 +407,10 @@ public class AMQPComponentConfiguration
* enabled, this option takes precedence. The caught exception is required
* to be serializable. The original Exception on the consumer side can be
* wrapped in an outer exception such as
- * org.apache.camel.RuntimeCamelException when returned to the producer.
+ * org.apache.camel.RuntimeCamelException when returned to the producer. Use
+ * this with caution as the data is using Java Object serialization and
+ * requires the received to be able to deserialize the data at Class level,
+ * which forces a strong coupling between the producers and consumer!
*/
private Boolean transferException = false;
/**
[camel] 19/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Added note on MIGRATION guide
Posted by ac...@apache.org.
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 3d2701d022bff36521cecde9136784f664e6d458
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 14:38:15 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Added note on MIGRATION guide
---
MIGRATION.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MIGRATION.md b/MIGRATION.md
index 728eb2f..01cff3c 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -126,6 +126,8 @@ The `mina2` component has been renamed to `mina`. The supported scheme is now `m
The `mongodb3` component has been renamed to `mongodb`. The supported scheme is now `mongodb`.
+The `netty4` component has been renamed to `netty`. The supported scheme is now `netty`.
+
The `quartz2` component has been renamed to `quartz`. The supported scheme is now `quartz`.
The `rxjava2` component has been renamed to `rxjava`.
[camel] 05/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - DocumentationHelper class needs to
point to new netty.json
Posted by ac...@apache.org.
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 90354bbf4233b6f4275b5034bfeee750cccf4882
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 12:10:07 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - DocumentationHelper class needs to point to new netty.json
---
apache-camel/pom.xml | 4 +-
apache-camel/src/main/descriptors/common-bin.xml | 2 +-
components/readme.adoc | 79 ++--------------------
parent/pom.xml | 4 +-
.../camel/tools/apt/DocumentationHelper.java | 2 +-
5 files changed, 10 insertions(+), 81 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index ef569f0..06efea4 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -2548,12 +2548,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-http-starter</artifactId>
+ <artifactId>camel-netty-starter</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>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 35560aa..35ad033 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -569,8 +569,8 @@
<include>org.apache.camel:camel-mybatis-starter</include>
<include>org.apache.camel:camel-nagios-starter</include>
<include>org.apache.camel:camel-nats-starter</include>
- <include>org.apache.camel:camel-netty4-http-starter</include>
<include>org.apache.camel:camel-netty-starter</include>
+ <include>org.apache.camel:camel-netty4-http-starter</include>
<include>org.apache.camel:camel-nsq-starter</include>
<include>org.apache.camel:camel-ognl-starter</include>
<include>org.apache.camel:camel-olingo2-starter</include>
diff --git a/components/readme.adoc b/components/readme.adoc
index ec107ac..30cb599 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1,7 +1,7 @@
= Components
// components: START
-Number of Components: 297 in 234 JAR artifacts (0 deprecated)
+Number of Components: 278 in 218 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -451,9 +451,6 @@ Number of Components: 297 in 234 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.
@@ -604,9 +601,6 @@ Number of Components: 297 in 234 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-netty4/src/main/docs/netty4-component.adoc[Netty4] (camel-netty4) +
-`netty4: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.
@@ -700,9 +694,6 @@ Number of Components: 297 in 234 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.
@@ -775,9 +766,6 @@ Number of Components: 297 in 234 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.
@@ -787,12 +775,6 @@ Number of Components: 297 in 234 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.
@@ -802,12 +784,6 @@ Number of Components: 297 in 234 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.
@@ -820,30 +796,12 @@ Number of Components: 297 in 234 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.
@@ -862,9 +820,6 @@ Number of Components: 297 in 234 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.
@@ -874,15 +829,6 @@ Number of Components: 297 in 234 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.
@@ -892,9 +838,6 @@ Number of Components: 297 in 234 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
@@ -905,7 +848,7 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated)
== Data Formats
// dataformats: START
-Number of Data Formats: 44 in 36 JAR artifacts (0 deprecated)
+Number of Data Formats: 41 in 33 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -975,12 +918,8 @@ Number of Data Formats: 44 in 36 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.
@@ -989,8 +928,6 @@ Number of Data Formats: 44 in 36 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.
@@ -1005,7 +942,7 @@ Number of Data Formats: 44 in 36 JAR artifacts (0 deprecated)
== Expression Languages
// languages: START
-Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
+Number of Languages: 16 in 10 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1042,8 +979,6 @@ Number of Languages: 17 in 11 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
@@ -1051,7 +986,7 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
== Miscellaneous Components
// others: START
-Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated)
+Number of Miscellaneous Components: 30 in 30 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1077,16 +1012,12 @@ Number of Miscellaneous Components: 33 in 33 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
@@ -1120,8 +1051,6 @@ Number of Miscellaneous Components: 33 in 33 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/parent/pom.xml b/parent/pom.xml
index c2e6374..b1b4ecb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3293,12 +3293,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-http-starter</artifactId>
+ <artifactId>camel-netty-starter</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>
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
index fb243e3..f0bee58 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
@@ -103,7 +103,7 @@ public final class DocumentationHelper {
} else if ("https".equals(extendsScheme)) {
return new File("../camel-http/target/classes/org/apache/camel/component/http/https.json");
} else if ("netty".equals(extendsScheme)) {
- return new File("../camel-netty/target/classes/org/apache/camel/component/netty/netty.json");
+ return new File("../camel-netty/target/classes/org/apache/camel/component/netty4/netty.json");
} else if ("servlet".equals(extendsScheme)) {
return new File("../camel-servlet/target/classes/org/apache/camel/component/servlet/servlet.json");
}
[camel] 09/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Removed refs in netty4-http component
Posted by ac...@apache.org.
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 99df1952ee9300067a63a324d587b55e854dbdd5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 12:59:18 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Removed refs in netty4-http component
---
.../apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java
index a04bd0a..59ea2c0 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpSendDynamicAware.java
@@ -24,7 +24,7 @@ public class NettyHttpSendDynamicAware extends HttpSendDynamicAware {
@Override
protected String[] parseUri(DynamicAwareEntry entry) {
- // camel-netty4 parses the uri a bit differently than camel-http-common base class
+ // camel-netty parses the uri a bit differently than camel-http-common base class
String scheme = entry.getProperties().get("protocol");
String host = entry.getProperties().get("host");
[camel] 07/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Fixed Camel-ganglia test
Posted by ac...@apache.org.
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 24b727c851c27519704d18f2636fdeab4979d5c8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 12:45:23 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Fixed Camel-ganglia test
---
.../apache/camel/component/ganglia/GangliaProtocolV30CamelTest.java | 4 ++--
.../apache/camel/component/ganglia/GangliaProtocolV31CamelTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProtocolV30CamelTest.java b/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProtocolV30CamelTest.java
index abd1667..af734c2 100644
--- a/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProtocolV30CamelTest.java
+++ b/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProtocolV30CamelTest.java
@@ -59,7 +59,7 @@ import static org.apache.camel.component.ganglia.GangliaConstants.METRIC_UNITS;
/**
* {@code GangliaProtocolV30CamelTest} is not shipped with an embedded gmond
- * agent. The gmond agent is mocked with the help of camel-netty4 codecs and a
+ * agent. The gmond agent is mocked with the help of camel-netty codecs and a
* mock endpoint. As underlying UDP packets are not guaranteed to be delivered,
* loose assertions are performed.
*/
@@ -140,7 +140,7 @@ public class GangliaProtocolV30CamelTest extends CamelGangliaTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("netty4:udp://localhost:" + getTestPort() + "/?decoders=#protocolV30Decoder").to(mockGmond);
+ from("netty:udp://localhost:" + getTestPort() + "/?decoders=#protocolV30Decoder").to(mockGmond);
}
};
}
diff --git a/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProtocolV31CamelTest.java b/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProtocolV31CamelTest.java
index c0f4fa0..c6eb815 100644
--- a/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProtocolV31CamelTest.java
+++ b/components/camel-ganglia/src/test/java/org/apache/camel/component/ganglia/GangliaProtocolV31CamelTest.java
@@ -66,7 +66,7 @@ import static org.apache.camel.component.ganglia.GangliaConstants.METRIC_UNITS;
/**
* {@code GangliaProtocolV31CamelTest} is not shipped with an embedded gmond
- * agent. The gmond agent is mocked with the help of camel-netty4 codecs and a
+ * agent. The gmond agent is mocked with the help of camel-netty codecs and a
* mock endpoint. As underlying UDP packets are not guaranteed to be delivered,
* loose assertions are performed.
*/
@@ -218,7 +218,7 @@ public class GangliaProtocolV31CamelTest extends CamelGangliaTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("netty4:udp://localhost:" + getTestPort() + "/?decoders=#protocolV31Decoder").to(mockGmond);
+ from("netty:udp://localhost:" + getTestPort() + "/?decoders=#protocolV31Decoder").to(mockGmond);
}
};
}
[camel] 02/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - updated docs
Posted by ac...@apache.org.
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 b3d8e3275b4880dd12adfcdcb0c9db2285fb3e9f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 10:46:31 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - updated docs
---
...{netty4-component.adoc => netty-component.adoc} | 58 +++++++++++-----------
platforms/spring-boot/components-starter/pom.xml | 1 -
2 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/components/camel-netty/src/main/docs/netty4-component.adoc b/components/camel-netty/src/main/docs/netty-component.adoc
similarity index 96%
rename from components/camel-netty/src/main/docs/netty4-component.adoc
rename to components/camel-netty/src/main/docs/netty-component.adoc
index 1781e1a..1be586b 100644
--- a/components/camel-netty/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty/src/main/docs/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:
@@ -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/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 4f60202..37356c9 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -283,7 +283,6 @@
<module>camel-nats-starter</module>
<module>camel-netty-starter</module>
<module>camel-netty4-http-starter</module>
- <module>camel-netty4-starter</module>
<module>camel-nsq-starter</module>
<module>camel-ognl-starter</module>
<module>camel-olingo2-starter</module>
[camel] 01/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty
Posted by ac...@apache.org.
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 60f1d55fea26a47505c2e2bb6df22b41896862dc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 10:42:47 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty
---
components/{camel-netty4 => camel-netty}/pom.xml | 4 ++--
.../src/main/docs/netty4-component.adoc | 0
.../camel/component/netty4/ChannelHandlerFactories.java | 0
.../camel/component/netty4/ChannelHandlerFactory.java | 0
.../component/netty4/ClientInitializerFactory.java | 0
.../ClientModeTCPNettyServerBootstrapFactory.java | 0
.../component/netty4/DefaultChannelHandlerFactory.java | 0
.../netty4/DefaultClientInitializerFactory.java | 0
.../DefaultNettyCamelStateCorrelationManager.java | 0
.../netty4/DefaultServerInitializerFactory.java | 0
.../apache/camel/component/netty4/NettyCamelState.java | 0
.../netty4/NettyCamelStateCorrelationManager.java | 0
.../apache/camel/component/netty4/NettyComponent.java | 2 +-
.../camel/component/netty4/NettyConfiguration.java | 0
.../apache/camel/component/netty4/NettyConstants.java | 0
.../apache/camel/component/netty4/NettyConsumer.java | 0
.../component/netty4/NettyConsumerExceptionHandler.java | 0
.../apache/camel/component/netty4/NettyConverter.java | 0
.../apache/camel/component/netty4/NettyEndpoint.java | 4 ++--
.../org/apache/camel/component/netty4/NettyHelper.java | 0
.../camel/component/netty4/NettyPayloadHelper.java | 0
.../apache/camel/component/netty4/NettyProducer.java | 0
.../netty4/NettyServerBootstrapConfiguration.java | 0
.../component/netty4/NettyServerBootstrapFactory.java | 0
.../component/netty4/NettyServerBossPoolBuilder.java | 0
.../camel/component/netty4/NettyWorkerPoolBuilder.java | 0
.../component/netty4/ServerInitializerFactory.java | 0
.../netty4/ShareableChannelHandlerFactory.java | 0
.../component/netty4/SharedSingletonObjectPool.java | 0
.../netty4/SingleTCPNettyServerBootstrapFactory.java | 0
.../netty4/SingleUDPNettyServerBootstrapFactory.java | 0
.../camel/component/netty4/TextLineDelimiter.java | 0
.../netty4/TimeoutCorrelationManagerSupport.java | 0
.../netty4/codec/DatagramPacketByteArrayDecoder.java | 0
.../netty4/codec/DatagramPacketByteArrayEncoder.java | 0
.../component/netty4/codec/DatagramPacketDecoder.java | 0
.../netty4/codec/DatagramPacketDelimiterDecoder.java | 0
.../component/netty4/codec/DatagramPacketEncoder.java | 0
.../netty4/codec/DatagramPacketObjectDecoder.java | 0
.../netty4/codec/DatagramPacketObjectEncoder.java | 0
.../netty4/codec/DatagramPacketStringDecoder.java | 0
.../netty4/codec/DatagramPacketStringEncoder.java | 0
.../netty4/codec/DelegateByteArrayDecoder.java | 0
.../netty4/codec/DelegateByteArrayEncoder.java | 0
.../netty4/codec/DelimiterBasedFrameDecoder.java | 0
.../component/netty4/codec/LineBasedFrameDecoder.java | 0
.../camel/component/netty4/codec/ObjectDecoder.java | 0
.../camel/component/netty4/codec/ObjectEncoder.java | 0
.../component/netty4/handlers/ClientChannelHandler.java | 0
.../component/netty4/handlers/ServerChannelHandler.java | 0
.../netty4/handlers/ServerResponseFutureListener.java | 0
.../camel/component/netty4/ssl/SSLEngineFactory.java | 0
.../apache/camel/component/netty4/util/SubnetUtils.java | 0
.../src/test/data/message1.txt | 0
.../apache/camel/component/netty4/BaseNettyTest.java | 0
.../netty4/DatagramPacketByteArrayCodecTest.java | 0
.../camel/component/netty4/LogCaptureAppender.java | 0
.../apache/camel/component/netty4/LogCaptureTest.java | 0
.../component/netty4/MultipleCodecsSpringTest.java | 0
.../camel/component/netty4/MultipleCodecsTest.java | 4 ++--
.../apache/camel/component/netty4/MyCustomCodec.java | 0
.../camel/component/netty4/Netty2978IssueTest.java | 2 +-
.../apache/camel/component/netty4/NettyBacklogTest.java | 2 +-
.../netty4/NettyComponentWithConfigurationTest.java | 12 ++++++------
.../camel/component/netty4/NettyConcurrentTest.java | 4 ++--
.../netty4/NettyConsumerClientModeReconnectTest.java | 2 +-
.../netty4/NettyConsumerClientModeReuseChannelTest.java | 2 +-
.../component/netty4/NettyConsumerClientModeTest.java | 2 +-
.../camel/component/netty4/NettyConverterTest.java | 0
.../camel/component/netty4/NettyCustomCodecTest.java | 2 +-
.../netty4/NettyCustomCorrelationManagerTest.java | 4 ++--
.../netty4/NettyCustomPipelineFactoryAsynchTest.java | 4 ++--
.../netty4/NettyCustomPipelineFactorySynchTest.java | 4 ++--
.../camel/component/netty4/NettyDisconnectTest.java | 4 ++--
.../apache/camel/component/netty4/NettyFileTcpTest.java | 4 ++--
.../netty4/NettyGlobalSSLContextParametersTest.java | 6 +++---
.../netty4/NettyInOutCloseChannelWhenCompleteTest.java | 4 ++--
.../camel/component/netty4/NettyInOutFromSedaTest.java | 4 ++--
.../netty4/NettyInOutWithForcedNoResponseTest.java | 6 +++---
.../camel/component/netty4/NettyManualEndpointTest.java | 4 ++--
.../netty4/NettyMultipleSimultaneousClientsTest.java | 2 +-
.../apache/camel/component/netty4/NettyOptionTest.java | 2 +-
.../netty4/NettyProducerAsyncEndpointTest.java | 4 ++--
.../camel/component/netty4/NettyProducerHangTest.java | 8 ++++----
.../component/netty4/NettyProducerPoolDisabledTest.java | 4 ++--
.../apache/camel/component/netty4/NettyProxyTest.java | 8 ++++----
.../camel/component/netty4/NettyRedeliveryTest.java | 2 +-
.../component/netty4/NettyRequestTimeoutIssueTest.java | 4 ++--
.../camel/component/netty4/NettyRequestTimeoutTest.java | 12 ++++++------
.../camel/component/netty4/NettyReuseChannelTest.java | 6 +++---
.../component/netty4/NettyReuseConnectionTest.java | 2 +-
.../camel/component/netty4/NettySSLClasspathTest.java | 4 ++--
.../component/netty4/NettySSLClientCertHeadersTest.java | 4 ++--
.../netty4/NettySSLConsumerClientModeTest.java | 2 +-
.../component/netty4/NettySSLContextParametersTest.java | 4 ++--
.../component/netty4/NettySSLPassphaseBeanTest.java | 4 ++--
.../org/apache/camel/component/netty4/NettySSLTest.java | 4 ++--
.../camel/component/netty4/NettySingleCodecTest.java | 4 ++--
.../camel/component/netty4/NettySuspendResumeTest.java | 8 ++++----
.../camel/component/netty4/NettyTCPAsyncTest.java | 4 ++--
.../camel/component/netty4/NettyTCPChainedTest.java | 4 ++--
.../netty4/NettyTCPSyncNotLazyChannelTest.java | 6 +++---
.../apache/camel/component/netty4/NettyTCPSyncTest.java | 10 +++++-----
.../netty4/NettyTcpWithInOutUsingPlainSocketTest.java | 2 +-
.../netty4/NettyTextlineInOnlyNullDelimiterTest.java | 4 ++--
.../camel/component/netty4/NettyTextlineInOnlyTest.java | 8 ++++----
.../netty4/NettyTextlineInOutNonBlockingTest.java | 4 ++--
.../netty4/NettyTextlineInOutSynchronousFalseTest.java | 4 ++--
.../netty4/NettyTextlineInOutSynchronousTest.java | 4 ++--
.../camel/component/netty4/NettyTextlineInOutTest.java | 4 ++--
.../netty4/NettyTransferExchangeOptionTest.java | 4 ++--
.../camel/component/netty4/NettyUDPAsyncTest.java | 4 ++--
.../component/netty4/NettyUDPByteArrayConsumerTest.java | 6 +++---
.../component/netty4/NettyUDPByteArrayProviderTest.java | 2 +-
.../netty4/NettyUDPLargeMessageInOnlyTest.java | 4 ++--
.../NettyUDPMessageLargerThanDefaultBufferSizeTest.java | 4 ++--
.../component/netty4/NettyUDPMulticastAsyncTest.java | 4 ++--
.../camel/component/netty4/NettyUDPObjectSyncTest.java | 4 ++--
.../apache/camel/component/netty4/NettyUDPSyncTest.java | 4 ++--
.../component/netty4/NettyUdpConnectedSendTest.java | 2 +-
.../netty4/NettyUdpConnectionlessSendTest.java | 2 +-
.../netty4/NettyUdpWithInOutUsingPlainSocketTest.java | 2 +-
.../NettyUseSharedWorkerThreadPoolManyRoutesTest.java | 2 +-
.../netty4/NettyUseSharedWorkerThreadPoolTest.java | 12 ++++++------
.../java/org/apache/camel/component/netty4/Poetry.java | 0
.../SpringNettyUseSharedWorkerThreadPoolTest.java | 6 +++---
.../netty4/UnsharableCodecsConflicts2Test.java | 2 +-
.../component/netty4/UnsharableCodecsConflictsTest.java | 4 ++--
.../src/test/resources/keystore.jks | Bin
.../src/test/resources/log4j2.properties | 2 +-
.../netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml | 6 +++---
.../apache/camel/component/netty4/multiple-codecs.xml | 4 ++--
.../src/test/resources/test.txt | 0
.../endpoint/dsl/NettyEndpointBuilderFactory.java | 16 ++++++++--------
.../pom.xml | 6 +++---
.../springboot/NettyComponentAutoConfiguration.java | 8 ++++----
.../netty4/springboot/NettyComponentConfiguration.java | 4 ++--
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 1 +
.../src/main/resources/META-INF/spring.provides | 2 +-
.../additional-spring-configuration-metadata.json | 10 ----------
platforms/spring-boot/components-starter/pom.xml | 1 +
143 files changed, 174 insertions(+), 182 deletions(-)
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty/pom.xml
similarity index 97%
rename from components/camel-netty4/pom.xml
rename to components/camel-netty/pom.xml
index d146079..b0fdcfb 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty/pom.xml
@@ -27,9 +27,9 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Netty4</name>
+ <name>Camel :: Netty</name>
<description>Camel Netty NIO based socket communication component</description>
<properties>
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc b/components/camel-netty/src/main/docs/netty4-component.adoc
similarity index 100%
rename from components/camel-netty4/src/main/docs/netty4-component.adoc
rename to components/camel-netty/src/main/docs/netty4-component.adoc
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactories.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactories.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactories.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactories.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ChannelHandlerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientInitializerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ClientInitializerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientInitializerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ClientInitializerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ClientModeTCPNettyServerBootstrapFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultChannelHandlerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultChannelHandlerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultChannelHandlerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultChannelHandlerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultClientInitializerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultNettyCamelStateCorrelationManager.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultNettyCamelStateCorrelationManager.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultNettyCamelStateCorrelationManager.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultNettyCamelStateCorrelationManager.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/DefaultServerInitializerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyCamelState.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyCamelState.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyCamelState.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyCamelState.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyCamelStateCorrelationManager.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyCamelStateCorrelationManager.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyCamelStateCorrelationManager.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyCamelStateCorrelationManager.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
similarity index 99%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
index cd7fa96..95668a9 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
@@ -34,7 +34,7 @@ import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.util.concurrent.CamelThreadFactory;
-@Component("netty,netty4")
+@Component("netty")
public class NettyComponent extends DefaultComponent implements SSLContextParametersAware {
@Metadata(label = "advanced")
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConstants.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConstants.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConstants.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConstants.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConsumer.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConsumer.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConsumer.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConsumer.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConsumerExceptionHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConsumerExceptionHandler.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConsumerExceptionHandler.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConsumerExceptionHandler.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConverter.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyConverter.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
similarity index 95%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
index 421b5c5..bb672c4 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyEndpoint.java
@@ -40,7 +40,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* Socket level networking using TCP or UDP with the Netty 4.x library.
*/
-@UriEndpoint(firstVersion = "2.14.0", scheme = "netty4,netty", title = "Netty4", syntax = "netty4:protocol:host:port", label = "networking,tcp,udp")
+@UriEndpoint(firstVersion = "2.14.0", scheme = "netty", title = "Netty", syntax = "netty:protocol:host:port", label = "networking,tcp,udp")
public class NettyEndpoint extends DefaultEndpoint implements AsyncEndpoint {
@UriParam
private NettyConfiguration configuration;
@@ -93,7 +93,7 @@ public class NettyEndpoint extends DefaultEndpoint implements AsyncEndpoint {
@Override
protected String createEndpointUri() {
ObjectHelper.notNull(configuration, "configuration");
- return "netty4:" + getConfiguration().getProtocol() + "://" + getConfiguration().getHost() + ":" + getConfiguration().getPort();
+ return "netty:" + getConfiguration().getProtocol() + "://" + getConfiguration().getHost() + ":" + getConfiguration().getPort();
}
protected SSLSession getSSLSession(ChannelHandlerContext ctx) {
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyHelper.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyHelper.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyHelper.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyHelper.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyPayloadHelper.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyPayloadHelper.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyPayloadHelper.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyPayloadHelper.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyProducer.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBossPoolBuilder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBossPoolBuilder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBossPoolBuilder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyServerBossPoolBuilder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyWorkerPoolBuilder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyWorkerPoolBuilder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyWorkerPoolBuilder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/NettyWorkerPoolBuilder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ServerInitializerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ServerInitializerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ServerInitializerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ServerInitializerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ShareableChannelHandlerFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ShareableChannelHandlerFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ShareableChannelHandlerFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ShareableChannelHandlerFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SharedSingletonObjectPool.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/SharedSingletonObjectPool.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SharedSingletonObjectPool.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/SharedSingletonObjectPool.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/TextLineDelimiter.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/TextLineDelimiter.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/TextLineDelimiter.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/TextLineDelimiter.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/TimeoutCorrelationManagerSupport.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/TimeoutCorrelationManagerSupport.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/TimeoutCorrelationManagerSupport.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/TimeoutCorrelationManagerSupport.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketByteArrayEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDelimiterDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDelimiterDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDelimiterDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketDelimiterDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketObjectEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DatagramPacketStringEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelegateByteArrayEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelimiterBasedFrameDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelimiterBasedFrameDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/DelimiterBasedFrameDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/DelimiterBasedFrameDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/LineBasedFrameDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/LineBasedFrameDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/LineBasedFrameDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/LineBasedFrameDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/ObjectDecoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/ObjectDecoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/ObjectDecoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/ObjectDecoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/ObjectEncoder.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/ObjectEncoder.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/codec/ObjectEncoder.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/codec/ObjectEncoder.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerResponseFutureListener.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ServerResponseFutureListener.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerResponseFutureListener.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/handlers/ServerResponseFutureListener.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ssl/SSLEngineFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/ssl/SSLEngineFactory.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/ssl/SSLEngineFactory.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/ssl/SSLEngineFactory.java
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
similarity index 100%
rename from components/camel-netty4/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
rename to components/camel-netty/src/main/java/org/apache/camel/component/netty4/util/SubnetUtils.java
diff --git a/components/camel-netty4/src/test/data/message1.txt b/components/camel-netty/src/test/data/message1.txt
similarity index 100%
rename from components/camel-netty4/src/test/data/message1.txt
rename to components/camel-netty/src/test/data/message1.txt
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/BaseNettyTest.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/DatagramPacketByteArrayCodecTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/DatagramPacketByteArrayCodecTest.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/DatagramPacketByteArrayCodecTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/DatagramPacketByteArrayCodecTest.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/LogCaptureAppender.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/LogCaptureAppender.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/LogCaptureAppender.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/LogCaptureAppender.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/LogCaptureTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/LogCaptureTest.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/LogCaptureTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/LogCaptureTest.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
similarity index 92%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
index b021f9d..8cae9ff 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
@@ -80,9 +80,9 @@ public class MultipleCodecsTest extends BaseNettyTest {
return new RouteBuilder() {
public void configure() throws Exception {
// START SNIPPET: routes
- from("direct:multiple-codec").to("netty4:tcp://localhost:{{port}}?encoders=#encoders&sync=false");
+ from("direct:multiple-codec").to("netty:tcp://localhost:{{port}}?encoders=#encoders&sync=false");
- from("netty4:tcp://localhost:{{port}}?decoders=#length-decoder,#string-decoder&sync=false").to("mock:multiple-codec");
+ from("netty:tcp://localhost:{{port}}?decoders=#length-decoder,#string-decoder&sync=false").to("mock:multiple-codec");
// START SNIPPET: routes
}
};
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/MyCustomCodec.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
similarity index 97%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
index d967c94..aee0440 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
@@ -104,7 +104,7 @@ public class Netty2978IssueTest extends BaseNettyTest {
private final ProducerTemplate producerTemplate;
CamelClient(CamelContext camelContext) {
- this.endpoint = camelContext.getEndpoint("netty4:tcp://localhost:{{port}}?sync=true");
+ this.endpoint = camelContext.getEndpoint("netty:tcp://localhost:{{port}}?sync=true");
this.producerTemplate = camelContext.createProducerTemplate();
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
index 2cd8960..9fb5479 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
@@ -27,7 +27,7 @@ public class NettyBacklogTest extends NettyTCPSyncTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=true&backlog=500")
+ from("netty:tcp://localhost:{{port}}?sync=true&backlog=500")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
if (exchange.getIn().getBody() instanceof Poetry) {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
similarity index 89%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
index 27aaa39..c3e6357 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
@@ -23,15 +23,15 @@ public class NettyComponentWithConfigurationTest extends CamelTestSupport {
@Test
public void testNettyComponentWithConfiguration() throws Exception {
- NettyComponent comp = context.getComponent("netty4", NettyComponent.class);
+ NettyComponent comp = context.getComponent("netty", NettyComponent.class);
NettyConfiguration cfg = new NettyConfiguration();
comp.setConfiguration(cfg);
assertSame(cfg, comp.getConfiguration());
- NettyEndpoint e1 = (NettyEndpoint) comp.createEndpoint("netty4://tcp://localhost:4455");
- NettyEndpoint e2 = (NettyEndpoint) comp.createEndpoint("netty4://tcp://localhost:5566?sync=false&needClientAuth=true");
+ NettyEndpoint e1 = (NettyEndpoint) comp.createEndpoint("netty://tcp://localhost:4455");
+ NettyEndpoint e2 = (NettyEndpoint) comp.createEndpoint("netty://tcp://localhost:5566?sync=false&needClientAuth=true");
// should not be same
assertNotSame(e1, e2);
@@ -53,15 +53,15 @@ public class NettyComponentWithConfigurationTest extends CamelTestSupport {
@Test
public void testNettyComponentUdpWithConfiguration() throws Exception {
- NettyComponent comp = context.getComponent("netty4", NettyComponent.class);
+ NettyComponent comp = context.getComponent("netty", NettyComponent.class);
NettyConfiguration cfg = new NettyConfiguration();
comp.setConfiguration(cfg);
assertSame(cfg, comp.getConfiguration());
- NettyEndpoint e1 = (NettyEndpoint) comp.createEndpoint("netty4://udp://localhost:8601?sync=false");
- NettyEndpoint e2 = (NettyEndpoint) comp.createEndpoint("netty4://udp://localhost:8602?sync=false&udpConnectionlessSending=true");
+ NettyEndpoint e1 = (NettyEndpoint) comp.createEndpoint("netty://udp://localhost:8601?sync=false");
+ NettyEndpoint e2 = (NettyEndpoint) comp.createEndpoint("netty://udp://localhost:8602?sync=false&udpConnectionlessSending=true");
// should not be same
assertNotSame(e1, e2);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
index 606d373..eaf1434 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
@@ -64,7 +64,7 @@ public class NettyConcurrentTest extends BaseNettyTest {
final int index = i;
Future<String> out = executor.submit(new Callable<String>() {
public String call() throws Exception {
- String reply = template.requestBody("netty4:tcp://localhost:{{port}}", index, String.class);
+ String reply = template.requestBody("netty:tcp://localhost:{{port}}", index, String.class);
log.debug("Sent {} received {}", index, reply);
assertEquals("Bye " + index, reply);
return reply;
@@ -92,7 +92,7 @@ public class NettyConcurrentTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=true").process(new Processor() {
+ from("netty:tcp://localhost:{{port}}?sync=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java
similarity index 97%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java
index a6cec2e..256c9c2 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReconnectTest.java
@@ -81,7 +81,7 @@ public class NettyConsumerClientModeReconnectTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?textline=true&clientMode=true&reconnect=true&reconnectInterval=200").id("client")
+ from("netty:tcp://localhost:{{port}}?textline=true&clientMode=true&reconnect=true&reconnectInterval=200").id("client")
.process(new Processor() {
public void process(final Exchange exchange) {
log.info("Processing exchange in Netty server {}", exchange);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java
similarity index 98%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java
index 633b732..6fb169f 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeReuseChannelTest.java
@@ -78,7 +78,7 @@ public class NettyConsumerClientModeReuseChannelTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?textline=true&clientMode=true&reuseChannel=true").id("client")
+ from("netty:tcp://localhost:{{port}}?textline=true&clientMode=true&reuseChannel=true").id("client")
.process(new Processor() {
public void process(final Exchange exchange) {
final Channel channel = exchange.getProperty(NettyConstants.NETTY_CHANNEL, Channel.class);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java
similarity index 98%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java
index e59d6ea..b38f046 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConsumerClientModeTest.java
@@ -71,7 +71,7 @@ public class NettyConsumerClientModeTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?textline=true&clientMode=true").id("client")
+ from("netty:tcp://localhost:{{port}}?textline=true&clientMode=true").id("client")
.process(new Processor() {
public void process(final Exchange exchange) {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
index 03daedb..fcd286d 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
@@ -34,7 +34,7 @@ public class NettyCustomCodecTest extends BaseNettyTest {
@BindToRegistry("myCustomEncoder")
private ChannelHandler customEnc = MyCustomCodec.createMyCustomEncoder();
- private String uri = "netty4:tcp://localhost:{{port}}?disconnect=true&sync=false"
+ private String uri = "netty:tcp://localhost:{{port}}?disconnect=true&sync=false"
+ "&allowDefaultCodec=false&decoders=#myCustomDecoder,#myCustomDecoder2&encoders=#myCustomEncoder";
// use reaadble bytes
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java
index f7f3efa..2342126 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomCorrelationManagerTest.java
@@ -55,10 +55,10 @@ public class NettyCustomCorrelationManagerTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("seda:start").log("before ${body}").to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&producerPoolEnabled=false&correlationManager=#myManager")
+ from("seda:start").log("before ${body}").to("netty:tcp://localhost:{{port}}?textline=true&sync=true&producerPoolEnabled=false&correlationManager=#myManager")
.log("after ${body}").to("mock:result");
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true").transform(body().prepend("Bye "));
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true").transform(body().prepend("Bye "));
}
};
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
index 72b7f20..3b8bb7d 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
@@ -48,7 +48,7 @@ public class NettyCustomPipelineFactoryAsynchTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?serverInitializerFactory=#spf&textline=true").process(new Processor() {
+ from("netty:tcp://localhost:{{port}}?serverInitializerFactory=#spf&textline=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'");
}
@@ -59,7 +59,7 @@ public class NettyCustomPipelineFactoryAsynchTest extends BaseNettyTest {
@Test
public void testCustomClientInitializerFactory() throws Exception {
- String response = (String)template.requestBody("netty4:tcp://localhost:{{port}}?clientInitializerFactory=#cpf&textline=true", "Forest Gump describing Vietnam...");
+ String response = (String)template.requestBody("netty:tcp://localhost:{{port}}?clientInitializerFactory=#cpf&textline=true", "Forest Gump describing Vietnam...");
assertEquals("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'", response);
assertEquals(true, clientInvoked);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
index e15f30e..195261a 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
@@ -48,7 +48,7 @@ public class NettyCustomPipelineFactorySynchTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?serverInitializerFactory=#spf&sync=true&textline=true").process(new Processor() {
+ from("netty:tcp://localhost:{{port}}?serverInitializerFactory=#spf&sync=true&textline=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'");
}
@@ -59,7 +59,7 @@ public class NettyCustomPipelineFactorySynchTest extends BaseNettyTest {
@Test
public void testCustomClientPipelineFactory() throws Exception {
- String response = (String)template.requestBody("netty4:tcp://localhost:{{port}}?clientInitializerFactory=#cpf&sync=true&textline=true",
+ String response = (String)template.requestBody("netty:tcp://localhost:{{port}}?clientInitializerFactory=#cpf&sync=true&textline=true",
"Forest Gump describing Vietnam...");
assertEquals("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'", response);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
similarity index 88%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
index 68585c6..86af6a5 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
@@ -25,7 +25,7 @@ public class NettyDisconnectTest extends BaseNettyTest {
@Test
public void testCloseSessionWhenComplete() throws Exception {
- Object out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "Claus");
+ Object out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "Claus");
assertEquals("Bye Claus", out);
}
@@ -33,7 +33,7 @@ public class NettyDisconnectTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true").process(new Processor() {
+ from("netty:tcp://localhost:{{port}}?sync=true&disconnect=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
index a0fd6fc..f179c36 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
@@ -36,11 +36,11 @@ public class NettyFileTcpTest extends BaseNettyTest {
return new RouteBuilder() {
public void configure() {
// lets setup a server
- from("netty4:tcp://localhost:{{port}}?sync=false&textline=true")
+ from("netty:tcp://localhost:{{port}}?sync=false&textline=true")
.to("mock:results");
from("file:src/test/data?noop=true&fileName=message1.txt").
- to("netty4:tcp://localhost:{{port}}?sync=false&textline=true");
+ to("netty:tcp://localhost:{{port}}?sync=false&textline=true");
}
};
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
index d1b1d41..54d131b 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
@@ -56,7 +56,7 @@ public class NettyGlobalSSLContextParametersTest extends BaseNettyTest {
sslContextParameters.setServerParameters(scsp);
context.setSSLContextParameters(sslContextParameters);
- ((SSLContextParametersAware) context.getComponent("netty4")).setUseGlobalSslContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("netty")).setUseGlobalSslContextParameters(true);
return context;
}
@@ -74,7 +74,7 @@ public class NettyGlobalSSLContextParametersTest extends BaseNettyTest {
context.addRoutes(new RouteBuilder() {
public void configure() {
- from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true")
+ from("netty:tcp://localhost:{{port}}?sync=true&ssl=true")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");
@@ -85,7 +85,7 @@ public class NettyGlobalSSLContextParametersTest extends BaseNettyTest {
context.start();
String response = template.requestBody(
- "netty4:tcp://localhost:{{port}}?sync=true&ssl=true",
+ "netty:tcp://localhost:{{port}}?sync=true&ssl=true",
"Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
index a5c53ed..0924c3d 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
@@ -25,7 +25,7 @@ public class NettyInOutCloseChannelWhenCompleteTest extends BaseNettyTest {
@Test
public void testCloseSessionWhenComplete() throws Exception {
- Object out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true", "Claus");
+ Object out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true", "Claus");
assertEquals("Bye Claus", out);
}
@@ -33,7 +33,7 @@ public class NettyInOutCloseChannelWhenCompleteTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=true").process(new Processor() {
+ from("netty:tcp://localhost:{{port}}?sync=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
similarity index 91%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
index 94cc0c3..1541acd 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
@@ -41,11 +41,11 @@ public class NettyInOutFromSedaTest extends BaseNettyTest {
public void configure() throws Exception {
from("seda:start")
.log("before ${body}")
- .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+ .to("netty:tcp://localhost:{{port}}?textline=true&sync=true")
.log("after ${body}")
.to("mock:result");
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
.transform(body().prepend("Bye "));
}
};
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
similarity index 88%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
index f65c7bf..17a6ac9 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
@@ -24,14 +24,14 @@ public class NettyInOutWithForcedNoResponseTest extends BaseNettyTest {
@Test
public void testResponse() throws Exception {
- Object out = template.requestBody("netty4:tcp://localhost:{{port}}", "Copenhagen");
+ Object out = template.requestBody("netty:tcp://localhost:{{port}}", "Copenhagen");
assertEquals("Hello Claus", out);
}
@Test
public void testNoResponse() throws Exception {
try {
- template.requestBody("netty4:tcp://localhost:{{port}}", "London");
+ template.requestBody("netty:tcp://localhost:{{port}}", "London");
fail("Should throw an exception");
} catch (RuntimeCamelException e) {
assertTrue(e.getCause().getMessage().startsWith("No response"));
@@ -42,7 +42,7 @@ public class NettyInOutWithForcedNoResponseTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}")
+ from("netty:tcp://localhost:{{port}}")
.choice()
.when(body().isEqualTo("Copenhagen")).transform(constant("Hello Claus"))
.otherwise().transform(constant(null));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
index c7bd637..9f8a0fe 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
@@ -39,7 +39,7 @@ public class NettyManualEndpointTest extends BaseNettyTest {
assertMockEndpointsSatisfied();
- assertEquals("netty4:tcp://localhost:" + getPort(), endpoint.getEndpointUri());
+ assertEquals("netty:tcp://localhost:" + getPort(), endpoint.getEndpointUri());
}
@Override
@@ -63,7 +63,7 @@ public class NettyManualEndpointTest extends BaseNettyTest {
// create and start component
NettyComponent component = new NettyComponent(getContext());
component.setConfiguration(nettyConfig);
- getContext().addComponent("netty4", component);
+ getContext().addComponent("netty", component);
component.start();
// create and start endpoint, pass in null as endpoint uri
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
index 1fa2f65..d379ee3 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
@Ignore("TODO: investigate for Camel 3.0")
public class NettyMultipleSimultaneousClientsTest extends BaseNettyTest {
- private String uri = "netty4:tcp://localhost:{{port}}?sync=true&reuseAddress=true&synchronous=false";
+ private String uri = "netty:tcp://localhost:{{port}}?sync=true&reuseAddress=true&synchronous=false";
private int clientCount = 20;
private CountDownLatch startLatch = new CountDownLatch(1);
private CountDownLatch finishLatch = new CountDownLatch(clientCount);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
index 0e25d30..10df704 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
@@ -27,7 +27,7 @@ public class NettyOptionTest extends NettyTCPSyncTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=true&option.child.keepAlive=false")
+ from("netty:tcp://localhost:{{port}}?sync=true&option.child.keepAlive=false")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
if (exchange.getIn().getBody() instanceof Poetry) {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
index 6bfe022..c13c6a2 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
@@ -53,7 +53,7 @@ public class NettyProducerAsyncEndpointTest extends BaseNettyTest {
beforeThreadName = Thread.currentThread().getName();
}
})
- .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+ .to("netty:tcp://localhost:{{port}}?textline=true&sync=true")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
@@ -63,7 +63,7 @@ public class NettyProducerAsyncEndpointTest extends BaseNettyTest {
.to("mock:after")
.to("mock:result");
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
.delay(1000)
.validate(body().isInstanceOf(String.class))
.transform(body().regexReplaceAll("Hello", "Bye"));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java
similarity index 85%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java
index b5c0acc..9426d48 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java
@@ -43,22 +43,22 @@ public class NettyProducerHangTest extends CamelTestSupport {
}
}).start();
- String response1 = template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true&sync=true", "request1", String.class);
+ String response1 = template.requestBody("netty:tcp://localhost:" + PORT + "?textline=true&sync=true", "request1", String.class);
log.info("Received first response <" + response1 + ">");
try {
// our test server will close the socket now so we should get an error
- template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true&sync=true", "request2", String.class);
+ template.requestBody("netty:tcp://localhost:" + PORT + "?textline=true&sync=true", "request2", String.class);
} catch (Exception e) {
assertStringContains(e.getCause().getMessage(), "No response received from remote server");
}
- String response2 = template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true&sync=true", "request3", String.class);
+ String response2 = template.requestBody("netty:tcp://localhost:" + PORT + "?textline=true&sync=true", "request3", String.class);
log.info("Received 2nd response <" + response2 + ">");
try {
// our test server will close the socket now so we should get an error
- template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true&sync=true", "request4", String.class);
+ template.requestBody("netty:tcp://localhost:" + PORT + "?textline=true&sync=true", "request4", String.class);
} catch (Exception e) {
assertStringContains(e.getCause().getMessage(), "No response received from remote server");
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
index 84b9188..29893fb 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
@@ -35,9 +35,9 @@ public class NettyProducerPoolDisabledTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
from("direct:start")
- .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&producerPoolEnabled=false");
+ .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&producerPoolEnabled=false");
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
// body should be a String when using textline codec
.validate(body().isInstanceOf(String.class))
.transform(body().regexReplaceAll("Hello", "Bye"));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
similarity index 83%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
index b23e2e8..70855df 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
@@ -33,7 +33,7 @@ public class NettyProxyTest extends BaseNettyTest {
getMockEndpoint("mock:proxy").expectedBodiesReceived("Camel");
getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
- Object body = template.requestBody("netty4:tcp://localhost:" + port1 + "?sync=true&textline=true", "Camel\n");
+ Object body = template.requestBody("netty:tcp://localhost:" + port1 + "?sync=true&textline=true", "Camel\n");
assertEquals("Bye Camel", body);
assertMockEndpointsSatisfied();
@@ -47,12 +47,12 @@ public class NettyProxyTest extends BaseNettyTest {
port1 = getPort();
port2 = getNextPort();
- fromF("netty4:tcp://localhost:%s?sync=true&textline=true", port1)
+ fromF("netty:tcp://localhost:%s?sync=true&textline=true", port1)
.to("mock:before")
- .toF("netty4:tcp://localhost:%s?sync=true&textline=true", port2)
+ .toF("netty:tcp://localhost:%s?sync=true&textline=true", port2)
.to("mock:after");
- fromF("netty4:tcp://localhost:%s?sync=true&textline=true", port2)
+ fromF("netty:tcp://localhost:%s?sync=true&textline=true", port2)
.to("mock:proxy")
.transform().simple("Bye ${body}\n");
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java
similarity index 99%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java
index 0ffdbc3..183b7a7 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRedeliveryTest.java
@@ -88,7 +88,7 @@ public class NettyRedeliveryTest extends CamelTestSupport {
from("direct:start")
.routeId("start")
- .to("netty4:tcp://localhost:" + port)
+ .to("netty:tcp://localhost:" + port)
.to("log:downstream")
.to("mock:downstream");
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
similarity index 93%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
index 89869a9..0b5744e 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
@@ -31,9 +31,9 @@ public class NettyRequestTimeoutIssueTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
from("direct:out")
- .to("netty4:tcp://localhost:8080?requestTimeout=5000");
+ .to("netty:tcp://localhost:8080?requestTimeout=5000");
- from("netty4:tcp://localhost:8080")
+ from("netty:tcp://localhost:8080")
.to("log:nettyCase?showAll=true&multiline=true");
}
};
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
similarity index 78%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
index 365d22c..50f5f12 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
@@ -27,14 +27,14 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
@Test
public void testRequestTimeoutOK() throws Exception {
- String out = template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=500", "Hello Camel", String.class);
+ String out = template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=500", "Hello Camel", String.class);
assertEquals("Bye World", out);
}
@Test
public void testRequestTimeout() throws Exception {
try {
- template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello Camel", String.class);
+ template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello Camel", String.class);
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
ReadTimeoutException cause = assertIsInstanceOf(ReadTimeoutException.class, e.getCause());
@@ -45,7 +45,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
@Test
public void testRequestTimeoutViaHeader() throws Exception {
try {
- template.requestBodyAndHeader("netty4:tcp://localhost:{{port}}?textline=true&sync=true", "Hello Camel", NettyConstants.NETTY_REQUEST_TIMEOUT, 100, String.class);
+ template.requestBodyAndHeader("netty:tcp://localhost:{{port}}?textline=true&sync=true", "Hello Camel", NettyConstants.NETTY_REQUEST_TIMEOUT, 100, String.class);
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
ReadTimeoutException cause = assertIsInstanceOf(ReadTimeoutException.class, e.getCause());
@@ -56,7 +56,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
@Test
public void testRequestTimeoutAndOk() throws Exception {
try {
- template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello Camel", String.class);
+ template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello Camel", String.class);
fail("Should have thrown exception");
} catch (CamelExecutionException e) {
ReadTimeoutException cause = assertIsInstanceOf(ReadTimeoutException.class, e.getCause());
@@ -64,7 +64,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
}
// now we try again but this time the is no delay on server and thus faster
- String out = template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello World", String.class);
+ String out = template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=100", "Hello World", String.class);
assertEquals("Bye World", out);
}
@@ -73,7 +73,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java
similarity index 91%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java
index 7168c9f..e6ab685 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseChannelTest.java
@@ -56,7 +56,7 @@ public class NettyReuseChannelTest extends BaseNettyTest {
@Override
public void configure() throws Exception {
from("direct:start")
- .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&reuseChannel=true&disconnect=true")
+ .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&reuseChannel=true&disconnect=true")
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
@@ -66,7 +66,7 @@ public class NettyReuseChannelTest extends BaseNettyTest {
}
})
.to("mock:a")
- .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&reuseChannel=true&disconnect=true")
+ .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&reuseChannel=true&disconnect=true")
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
@@ -77,7 +77,7 @@ public class NettyReuseChannelTest extends BaseNettyTest {
})
.to("mock:b");
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
.transform(body().prepend("Hello "))
.to("mock:result");
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
index 3ba175c..5c0b4a8 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
*/
public class NettyReuseConnectionTest extends BaseNettyTest {
- private String uri = "netty4:tcp://localhost:{{port}}?sync=true&disconnect=false";
+ private String uri = "netty:tcp://localhost:{{port}}?sync=true&disconnect=false";
@Test
public void testReuseConnection() throws Exception {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
similarity index 85%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
index 41f9492..d8943ae 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
@@ -37,7 +37,7 @@ public class NettySSLClasspathTest extends BaseNettyTest {
context.addRoutes(new RouteBuilder() {
public void configure() {
- from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
+ from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");
@@ -48,7 +48,7 @@ public class NettySSLClasspathTest extends BaseNettyTest {
context.start();
String response = template.requestBody(
- "netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
+ "netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
"Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
index b903c2a..af37080 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
@@ -58,13 +58,13 @@ public class NettySSLClientCertHeadersTest extends BaseNettyTest {
public void configure() {
// needClientAuth=true so we can get the client certificate
// details
- from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf"
+ from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf"
+ "&needClientAuth=true&sslClientCertHeaders=true").to("mock:input").transform().constant("Bye World");
}
});
context.start();
- String response = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf",
+ String response = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf",
"Hello World", String.class);
assertEquals("Bye World", response);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
similarity index 97%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
index f316092..91c0241 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLConsumerClientModeTest.java
@@ -99,7 +99,7 @@ public class NettySSLConsumerClientModeTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?textline=true&clientMode=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf").id("sslclient")
+ from("netty:tcp://localhost:{{port}}?textline=true&clientMode=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf").id("sslclient")
.process(new Processor() {
public void process(final Exchange exchange) {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
similarity index 92%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
index 4311b80..36f40fb 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
@@ -73,7 +73,7 @@ public class NettySSLContextParametersTest extends BaseNettyTest {
context.addRoutes(new RouteBuilder() {
public void configure() {
- from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters").process(new Processor() {
+ from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters").process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");
}
@@ -82,7 +82,7 @@ public class NettySSLContextParametersTest extends BaseNettyTest {
});
context.start();
- String response = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters",
+ String response = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters",
"Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds",
String.class);
assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
similarity index 86%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
index 1061f9b..5e71966 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
@@ -41,7 +41,7 @@ public class NettySSLPassphaseBeanTest extends BaseNettyTest {
context.addRoutes(new RouteBuilder() {
public void configure() {
- from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
+ from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");
@@ -52,7 +52,7 @@ public class NettySSLPassphaseBeanTest extends BaseNettyTest {
context.start();
String response = template
- .requestBody("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
+ .requestBody("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
"Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
index 90f7e8b..6ad8f80 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
@@ -55,7 +55,7 @@ public class NettySSLTest extends BaseNettyTest {
public void configure() {
// needClientAuth=true so we can get the client certificate
// details
- from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf&needClientAuth=true")
+ from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf&needClientAuth=true")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
SSLSession session = exchange.getIn().getHeader(NettyConstants.NETTY_SSL_SESSION, SSLSession.class);
@@ -73,7 +73,7 @@ public class NettySSLTest extends BaseNettyTest {
});
context.start();
- String response = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf",
+ String response = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=#ksf&trustStoreResource=#tsf",
"Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds",
String.class);
assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
similarity index 89%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
index f13e96d..c155699 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
@@ -49,9 +49,9 @@ public class NettySingleCodecTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:single-codec").to("netty4:tcp://localhost:{{port}}?encoders=#encoder&sync=false");
+ from("direct:single-codec").to("netty:tcp://localhost:{{port}}?encoders=#encoder&sync=false");
- from("netty4:tcp://localhost:{{port}}?decoders=#decoder&sync=false").to("mock:single-codec");
+ from("netty:tcp://localhost:{{port}}?decoders=#decoder&sync=false").to("mock:single-codec");
}
};
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
similarity index 80%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
index 8d1c64e..9f4f3a1 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
@@ -25,13 +25,13 @@ public class NettySuspendResumeTest extends BaseNettyTest {
public void testSuspendResume() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Camel", "Again");
- String out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "Camel", String.class);
+ String out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "Camel", String.class);
assertEquals("Bye Camel", out);
context.getRouteController().suspendRoute("foo");
try {
- template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "World", String.class);
+ template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "World", String.class);
fail("Should not allow connecting as its suspended");
} catch (Exception e) {
// expected
@@ -39,7 +39,7 @@ public class NettySuspendResumeTest extends BaseNettyTest {
context.getRouteController().resumeRoute("foo");
- out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "Again", String.class);
+ out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "Again", String.class);
assertEquals("Bye Again", out);
assertMockEndpointsSatisfied();
@@ -50,7 +50,7 @@ public class NettySuspendResumeTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=true").routeId("foo")
+ from("netty:tcp://localhost:{{port}}?sync=true").routeId("foo")
.to("log:result")
.to("mock:result")
.transform(body().prepend("Bye "));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
index 00e97ad..fff7574 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
@@ -54,7 +54,7 @@ public class NettyTCPAsyncTest extends BaseNettyTest {
public void testTCPInOnlyWithNettyConsumer() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- sendFile("netty4:tcp://localhost:{{port}}?sync=false");
+ sendFile("netty:tcp://localhost:{{port}}?sync=false");
mock.assertIsSatisfied();
}
@@ -64,7 +64,7 @@ public class NettyTCPAsyncTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=false")
+ from("netty:tcp://localhost:{{port}}?sync=false")
.to("log:result")
.to("mock:result");
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java
index 7dc2b0d..134c184 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPChainedTest.java
@@ -74,11 +74,11 @@ public class NettyTCPChainedTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=false")
+ from("netty:tcp://localhost:{{port}}?sync=false")
.to("log:result")
.to("mock:result");
from("direct:nettyCall")
- .to("netty4:tcp://localhost:{{port}}?sync=false&disconnect=true&workerCount=1");
+ .to("netty:tcp://localhost:{{port}}?sync=false&disconnect=true&workerCount=1");
from("direct:chainedCalls")
.to("direct:nettyCall")
.to("direct:nettyCall");
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
index 05f76f8..ecce11b 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
@@ -26,7 +26,7 @@ public class NettyTCPSyncNotLazyChannelTest extends BaseNettyTest {
@Test
public void testTCPStringInOutWithNettyConsumer() throws Exception {
String response = template.requestBody(
- "netty4:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false",
+ "netty:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false",
"Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
}
@@ -34,7 +34,7 @@ public class NettyTCPSyncNotLazyChannelTest extends BaseNettyTest {
@Test
public void testTCPObjectInOutWithNettyConsumer() throws Exception {
Poetry poetry = new Poetry();
- Poetry response = (Poetry) template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false", poetry);
+ Poetry response = (Poetry) template.requestBody("netty:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false", poetry);
assertEquals("Dr. Sarojini Naidu", response.getPoet());
}
@@ -43,7 +43,7 @@ public class NettyTCPSyncNotLazyChannelTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=true")
+ from("netty:tcp://localhost:{{port}}?sync=true")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
if (exchange.getIn().getBody() instanceof Poetry) {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
index 447be36..b92e8f4 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
@@ -26,7 +26,7 @@ public class NettyTCPSyncTest extends BaseNettyTest {
@Test
public void testTCPStringInOutWithNettyConsumer() throws Exception {
String response = template.requestBody(
- "netty4:tcp://localhost:{{port}}?sync=true",
+ "netty:tcp://localhost:{{port}}?sync=true",
"Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
}
@@ -34,12 +34,12 @@ public class NettyTCPSyncTest extends BaseNettyTest {
@Test
public void testTCPStringInOutWithNettyConsumer2Times() throws Exception {
String response = template.requestBody(
- "netty4:tcp://localhost:{{port}}?sync=true",
+ "netty:tcp://localhost:{{port}}?sync=true",
"Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
response = template.requestBody(
- "netty4:tcp://localhost:{{port}}?sync=true",
+ "netty:tcp://localhost:{{port}}?sync=true",
"Hello World", String.class);
assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
}
@@ -47,7 +47,7 @@ public class NettyTCPSyncTest extends BaseNettyTest {
@Test
public void testTCPObjectInOutWithNettyConsumer() throws Exception {
Poetry poetry = new Poetry();
- Poetry response = (Poetry) template.requestBody("netty4:tcp://localhost:{{port}}?sync=true", poetry);
+ Poetry response = (Poetry) template.requestBody("netty:tcp://localhost:{{port}}?sync=true", poetry);
assertEquals("Dr. Sarojini Naidu", response.getPoet());
}
@@ -56,7 +56,7 @@ public class NettyTCPSyncTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?sync=true")
+ from("netty:tcp://localhost:{{port}}?sync=true")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
if (exchange.getIn().getBody() instanceof Poetry) {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
similarity index 97%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
index bc090e9..b63c4ba 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
@@ -119,7 +119,7 @@ public class NettyTcpWithInOutUsingPlainSocketTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true").process(new Processor() {
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true").process(new Processor() {
public void process(Exchange e) {
String in = e.getIn().getBody(String.class);
if ("force-null-out-body".equals(in)) {
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
similarity index 87%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
index ab597c6..9e3b3a7 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
@@ -25,7 +25,7 @@ public class NettyTextlineInOnlyNullDelimiterTest extends BaseNettyTest {
public void testTextlineInOnlyNull() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
- template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false", "Hello World\u0000");
+ template.sendBody("netty:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false", "Hello World\u0000");
assertMockEndpointsSatisfied();
}
@@ -35,7 +35,7 @@ public class NettyTextlineInOnlyNullDelimiterTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false")
+ from("netty:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false")
// body should be a String when using textline codec
.validate(body().isInstanceOf(String.class))
.to("mock:result");
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
similarity index 83%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
index 82b1566..501e131 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
@@ -25,7 +25,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
public void testTextlineInOnlyDual() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "how are you?");
- template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\nhow are you?\n");
+ template.sendBody("netty:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\nhow are you?\n");
assertMockEndpointsSatisfied();
}
@@ -34,7 +34,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
public void testTextlineInOnlyAutoAppend() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
- template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World");
+ template.sendBody("netty:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World");
assertMockEndpointsSatisfied();
}
@@ -43,7 +43,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
public void testTextlineInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
- template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\n");
+ template.sendBody("netty:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\n");
assertMockEndpointsSatisfied();
}
@@ -53,7 +53,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=false")
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=false")
// body should be a String when using textline codec
.validate(body().isInstanceOf(String.class))
.to("mock:result");
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
index cd2779d..b046bbf 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
@@ -53,7 +53,7 @@ public class NettyTextlineInOutNonBlockingTest extends BaseNettyTest {
beforeThreadName = Thread.currentThread().getName();
}
})
- .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+ .to("netty:tcp://localhost:{{port}}?textline=true&sync=true")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
@@ -62,7 +62,7 @@ public class NettyTextlineInOutNonBlockingTest extends BaseNettyTest {
.to("log:after")
.to("mock:result");
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
beforeThreadName2 = Thread.currentThread().getName();
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
similarity index 93%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
index 9ed53f5..9824503 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
@@ -50,7 +50,7 @@ public class NettyTextlineInOutSynchronousFalseTest extends BaseNettyTest {
beforeThreadName = Thread.currentThread().getName();
}
})
- .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
+ .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
@@ -59,7 +59,7 @@ public class NettyTextlineInOutSynchronousFalseTest extends BaseNettyTest {
.to("log:after")
.to("mock:result");
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
// body should be a String when using textline codec
.validate(body().isInstanceOf(String.class))
.transform(body().regexReplaceAll("Hello", "Bye"));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
similarity index 93%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
index 24b8c1d..a7f9cc7 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
@@ -50,7 +50,7 @@ public class NettyTextlineInOutSynchronousTest extends BaseNettyTest {
beforeThreadName = Thread.currentThread().getName();
}
})
- .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
+ .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
afterThreadName = Thread.currentThread().getName();
@@ -59,7 +59,7 @@ public class NettyTextlineInOutSynchronousTest extends BaseNettyTest {
.to("log:after")
.to("mock:result");
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
// body should be a String when using textline codec
.validate(body().isInstanceOf(String.class))
.transform(body().regexReplaceAll("Hello", "Bye"));
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
similarity index 88%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
index c1043e6..14d4bda 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
@@ -25,7 +25,7 @@ public class NettyTextlineInOutTest extends BaseNettyTest {
public void testTextlineInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
- String reply = template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true", "Hello World", String.class);
+ String reply = template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true", "Hello World", String.class);
assertEquals("Bye World", reply);
assertMockEndpointsSatisfied();
@@ -36,7 +36,7 @@ public class NettyTextlineInOutTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
+ from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
// body should be a String when using textline codec
.validate(body().isInstanceOf(String.class))
.to("mock:result")
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
similarity index 95%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
index db656e9..d64c582 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
@@ -42,7 +42,7 @@ public class NettyTransferExchangeOptionTest extends BaseNettyTest {
}
private Exchange sendExchange(boolean setException) throws Exception {
- Endpoint endpoint = context.getEndpoint("netty4:tcp://localhost:{{port}}?transferExchange=true");
+ Endpoint endpoint = context.getEndpoint("netty:tcp://localhost:{{port}}?transferExchange=true");
Exchange exchange = endpoint.createExchange();
Message message = exchange.getIn();
@@ -93,7 +93,7 @@ public class NettyTransferExchangeOptionTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("netty4:tcp://localhost:{{port}}?transferExchange=true").process(new Processor() {
+ from("netty:tcp://localhost:{{port}}?transferExchange=true").process(new Processor() {
public void process(Exchange e) throws InterruptedException {
assertNotNull(e.getIn().getBody());
assertNotNull(e.getIn().getHeaders());
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
index 4f16051..7c2f2f2 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
@@ -42,7 +42,7 @@ public class NettyUDPAsyncTest extends BaseNettyTest {
mock.expectedMessageCount(1);
mock.message(0).body().startsWith("Song Of A Dream".getBytes());
- sendFile("netty4:udp://localhost:{{port}}?sync=false");
+ sendFile("netty:udp://localhost:{{port}}?sync=false");
mock.assertIsSatisfied();
}
@@ -52,7 +52,7 @@ public class NettyUDPAsyncTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:udp://localhost:{{port}}?sync=false")
+ from("netty:udp://localhost:{{port}}?sync=false")
.to("mock:result")
.to("log:Message");
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java
similarity index 88%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java
index 4fb8df3..10f15ca 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayConsumerTest.java
@@ -31,7 +31,7 @@ public class NettyUDPByteArrayConsumerTest extends BaseNettyTest {
mock.expectedMessageCount(1);
mock.message(0).body().isEqualTo("***Camel rocks ?=)".getBytes());
- template.sendBody("netty4:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true", "***Camel rocks ?=)".getBytes());
+ template.sendBody("netty:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true", "***Camel rocks ?=)".getBytes());
mock.assertIsSatisfied();
}
@@ -44,7 +44,7 @@ public class NettyUDPByteArrayConsumerTest extends BaseNettyTest {
String toSend = "ef3e00559f5faf0262f5ff0962d9008daa91001cd46b0fa9330ef0f3030fff250e46f72444d1cc501678c351e04b8004c"
+ "4000002080000fe850bbe011030000008031b031bfe9251305441593830354720020800050440ff";
byte[] in = fromHexString(toSend);
- template.sendBody("netty4:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true", in);
+ template.sendBody("netty:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true", in);
assertMockEndpointsSatisfied();
List<Exchange> list = endpoint.getReceivedExchanges();
@@ -61,7 +61,7 @@ public class NettyUDPByteArrayConsumerTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true")
+ from("netty:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true")
.to("mock:result");
}
};
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java
index a897102..d402b6b 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPByteArrayProviderTest.java
@@ -81,7 +81,7 @@ public class NettyUDPByteArrayProviderTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:in").to("netty4:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true&udpConnectionlessSending=true");
+ from("direct:in").to("netty:udp://localhost:{{port}}?sync=false&udpByteArrayCodec=true&udpConnectionlessSending=true");
}
};
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
similarity index 92%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
index 838b15c..22d4572 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
@@ -36,7 +36,7 @@ public class NettyUDPLargeMessageInOnlyTest extends BaseNettyTest {
String message = new String(msgBytes);
getMockEndpoint("mock:result").expectedBodiesReceived(message);
- template.sendBody("netty4:udp://localhost:{{port}}?sync=false", message);
+ template.sendBody("netty:udp://localhost:{{port}}?sync=false", message);
assertMockEndpointsSatisfied();
}
@@ -60,7 +60,7 @@ public class NettyUDPLargeMessageInOnlyTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:udp://localhost:{{port}}?receiveBufferSizePredictor=2048&sync=false")
+ from("netty:udp://localhost:{{port}}?receiveBufferSizePredictor=2048&sync=false")
.to("mock:result");
}
};
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java
similarity index 90%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java
index be1e2fd..8401de9 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMessageLargerThanDefaultBufferSizeTest.java
@@ -40,7 +40,7 @@ public class NettyUDPMessageLargerThanDefaultBufferSizeTest extends BaseNettyTes
String message = new String(msgBytes);
getMockEndpoint("mock:result").expectedBodiesReceived(message);
- template.sendBody("netty4:udp://localhost:{{port}}?sync=false", message);
+ template.sendBody("netty:udp://localhost:{{port}}?sync=false", message);
assertMockEndpointsSatisfied();
}
@@ -61,7 +61,7 @@ public class NettyUDPMessageLargerThanDefaultBufferSizeTest extends BaseNettyTes
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:udp://localhost:{{port}}?option." + ChannelOption.RCVBUF_ALLOCATOR.name() + "=#" + ChannelOption.RCVBUF_ALLOCATOR.name()).to("mock:result");
+ from("netty:udp://localhost:{{port}}?option." + ChannelOption.RCVBUF_ALLOCATOR.name() + "=#" + ChannelOption.RCVBUF_ALLOCATOR.name()).to("mock:result");
}
};
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java
index ad01a17..5c843c6 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPMulticastAsyncTest.java
@@ -70,7 +70,7 @@ public class NettyUDPMulticastAsyncTest extends BaseNettyTest {
mock.message(0).body().startsWith("Song Of A Dream".getBytes());
// any IP in the range of 224.0.0.0 through 239.255.255.255 does the job
- sendFile("netty4:udp://224.1.2.3:{{port}}?sync=false");
+ sendFile("netty:udp://224.1.2.3:{{port}}?sync=false");
mock.assertIsSatisfied();
}
@@ -80,7 +80,7 @@ public class NettyUDPMulticastAsyncTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:udp://224.1.2.3:{{port}}?sync=false&networkInterface=en0")
+ from("netty:udp://224.1.2.3:{{port}}?sync=false&networkInterface=en0")
.to("mock:result")
.to("log:Message");
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java
similarity index 91%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java
index 3c07284..cc9ef9d 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPObjectSyncTest.java
@@ -26,7 +26,7 @@ public class NettyUDPObjectSyncTest extends BaseNettyTest {
@Test
public void testUDPObjectInOutWithNettyConsumer() throws Exception {
Poetry poetry = new Poetry();
- Poetry response = template.requestBody("netty4:udp://localhost:{{port}}?sync=true", poetry, Poetry.class);
+ Poetry response = template.requestBody("netty:udp://localhost:{{port}}?sync=true", poetry, Poetry.class);
assertEquals("Dr. Sarojini Naidu", response.getPoet());
}
@@ -35,7 +35,7 @@ public class NettyUDPObjectSyncTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:udp://localhost:{{port}}?sync=true")
+ from("netty:udp://localhost:{{port}}?sync=true")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
Poetry poetry = (Poetry) exchange.getIn().getBody();
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java
similarity index 94%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java
index 439d0fa..9f8cd8f 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUDPSyncTest.java
@@ -29,7 +29,7 @@ public class NettyUDPSyncTest extends BaseNettyTest {
public void testUDPStringInOutWithNettyConsumer() throws Exception {
for (int i = 0; i < 5; i++) {
String response = template.requestBody(
- "netty4:udp://localhost:{{port}}?sync=true",
+ "netty:udp://localhost:{{port}}?sync=true",
REQUEST, String.class);
assertEquals(RESPONSE, response);
}
@@ -40,7 +40,7 @@ public class NettyUDPSyncTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("netty4:udp://localhost:{{port}}?sync=true")
+ from("netty:udp://localhost:{{port}}?sync=true")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody(RESPONSE);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
similarity index 97%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
index 8255128..a8e6087 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectedSendTest.java
@@ -101,7 +101,7 @@ public class NettyUdpConnectedSendTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:in").to("netty4:udp://localhost:{{port}}?sync=false&textline=true");
+ from("direct:in").to("netty:udp://localhost:{{port}}?sync=false&textline=true");
}
};
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
index 79f2b1b..b975465 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpConnectionlessSendTest.java
@@ -93,7 +93,7 @@ public class NettyUdpConnectionlessSendTest extends BaseNettyTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:in").to("netty4:udp://localhost:{{port}}?sync=false&textline=true&udpConnectionlessSending=true");
+ from("direct:in").to("netty:udp://localhost:{{port}}?sync=false&textline=true&udpConnectionlessSending=true");
}
};
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java
index f9a4b85..6ffa801 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUdpWithInOutUsingPlainSocketTest.java
@@ -64,7 +64,7 @@ public class NettyUdpWithInOutUsingPlainSocketTest extends BaseNettyTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("netty4:udp://127.0.0.1:{{port}}?textline=true&sync=true").process(new Processor() {
+ from("netty:udp://127.0.0.1:{{port}}?textline=true&sync=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String s = exchange.getIn().getBody(String.class);
LOG.debug("Server got: " + s);
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
similarity index 93%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
index 769961d..e78cc02 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolManyRoutesTest.java
@@ -61,7 +61,7 @@ public class NettyUseSharedWorkerThreadPoolManyRoutesTest extends BaseNettyTest
public void configure() throws Exception {
for (int i = 0; i < 60; i++) {
- from("netty4:tcp://localhost:" + getNextPort() + "?textline=true&sync=true&usingExecutorService=false" + "&bossGroup=#sharedBoss&workerGroup=#sharedWorker")
+ from("netty:tcp://localhost:" + getNextPort() + "?textline=true&sync=true&usingExecutorService=false" + "&bossGroup=#sharedBoss&workerGroup=#sharedWorker")
.validate(body().isInstanceOf(String.class)).to("log:result").to("mock:result").transform(body().regexReplaceAll("Hello", "Bye"));
}
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java
similarity index 77%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java
index 5db4e32..328f1e5 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/NettyUseSharedWorkerThreadPoolTest.java
@@ -42,13 +42,13 @@ public class NettyUseSharedWorkerThreadPoolTest extends BaseNettyTest {
getMockEndpoint("mock:result").expectedMessageCount(30);
for (int i = 0; i < 10; i++) {
- String reply = template.requestBody("netty4:tcp://localhost:" + port + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello World", String.class);
+ String reply = template.requestBody("netty:tcp://localhost:" + port + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello World", String.class);
assertEquals("Bye World", reply);
- reply = template.requestBody("netty4:tcp://localhost:" + port2 + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello Camel", String.class);
+ reply = template.requestBody("netty:tcp://localhost:" + port2 + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello Camel", String.class);
assertEquals("Hi Camel", reply);
- reply = template.requestBody("netty4:tcp://localhost:" + port3 + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello Claus", String.class);
+ reply = template.requestBody("netty:tcp://localhost:" + port3 + "?textline=true&sync=true&workerGroup=#sharedClientPool", "Hello Claus", String.class);
assertEquals("Hej Claus", reply);
}
@@ -68,13 +68,13 @@ public class NettyUseSharedWorkerThreadPoolTest extends BaseNettyTest {
port2 = getNextPort();
port3 = getNextPort();
- from("netty4:tcp://localhost:" + port + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
+ from("netty:tcp://localhost:" + port + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
.validate(body().isInstanceOf(String.class)).to("log:result").to("mock:result").transform(body().regexReplaceAll("Hello", "Bye"));
- from("netty4:tcp://localhost:" + port2 + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
+ from("netty:tcp://localhost:" + port2 + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
.validate(body().isInstanceOf(String.class)).to("log:result").to("mock:result").transform(body().regexReplaceAll("Hello", "Hi"));
- from("netty4:tcp://localhost:" + port3 + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
+ from("netty:tcp://localhost:" + port3 + "?textline=true&sync=true&workerGroup=#sharedServerPool&usingExecutorService=false")
.validate(body().isInstanceOf(String.class)).to("log:result").to("mock:result").transform(body().regexReplaceAll("Hello", "Hej"));
}
};
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Poetry.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/Poetry.java
similarity index 100%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Poetry.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/Poetry.java
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java
similarity index 82%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java
index da4647c..4c45012 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.java
@@ -28,13 +28,13 @@ public class SpringNettyUseSharedWorkerThreadPoolTest extends CamelSpringTestSup
getMockEndpoint("mock:result").expectedMessageCount(30);
for (int i = 0; i < 10; i++) {
- String reply = template.requestBody("netty4:tcp://localhost:5021?textline=true&sync=true", "Hello World", String.class);
+ String reply = template.requestBody("netty:tcp://localhost:5021?textline=true&sync=true", "Hello World", String.class);
assertEquals("Hello World", reply);
- reply = template.requestBody("netty4:tcp://localhost:5022?textline=true&sync=true", "Hello Camel", String.class);
+ reply = template.requestBody("netty:tcp://localhost:5022?textline=true&sync=true", "Hello Camel", String.class);
assertEquals("Hello Camel", reply);
- reply = template.requestBody("netty4:tcp://localhost:5023?textline=true&sync=true", "Hello Claus", String.class);
+ reply = template.requestBody("netty:tcp://localhost:5023?textline=true&sync=true", "Hello Claus", String.class);
assertEquals("Hello Claus", reply);
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java
similarity index 96%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java
index 2795092..6e14917 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflicts2Test.java
@@ -78,7 +78,7 @@ public class UnsharableCodecsConflicts2Test extends BaseNettyTest {
public void configure() throws Exception {
port = getPort();
- from("netty4:tcp://localhost:{{port}}?decoders=#length-decoder&sync=false").process(processor).to("mock:result");
+ from("netty:tcp://localhost:{{port}}?decoders=#length-decoder&sync=false").process(processor).to("mock:result");
}
};
}
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java
similarity index 93%
rename from components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java
rename to components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java
index 3ead263..18debed 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty4/UnsharableCodecsConflictsTest.java
@@ -83,9 +83,9 @@ public class UnsharableCodecsConflictsTest extends BaseNettyTest {
port1 = getPort();
port2 = getNextPort();
- from("netty4:tcp://localhost:" + port1 + "?decoders=#length-decoder&sync=false").process(processor);
+ from("netty:tcp://localhost:" + port1 + "?decoders=#length-decoder&sync=false").process(processor);
- from("netty4:tcp://localhost:" + port2 + "?decoders=#length-decoder2&sync=false").process(processor).to("mock:result");
+ from("netty:tcp://localhost:" + port2 + "?decoders=#length-decoder2&sync=false").process(processor).to("mock:result");
}
};
}
diff --git a/components/camel-netty4/src/test/resources/keystore.jks b/components/camel-netty/src/test/resources/keystore.jks
similarity index 100%
rename from components/camel-netty4/src/test/resources/keystore.jks
rename to components/camel-netty/src/test/resources/keystore.jks
diff --git a/components/camel-netty4/src/test/resources/log4j2.properties b/components/camel-netty/src/test/resources/log4j2.properties
similarity index 96%
rename from components/camel-netty4/src/test/resources/log4j2.properties
rename to components/camel-netty/src/test/resources/log4j2.properties
index d3e9737..05d847e 100644
--- a/components/camel-netty4/src/test/resources/log4j2.properties
+++ b/components/camel-netty/src/test/resources/log4j2.properties
@@ -18,7 +18,7 @@
configuration.packages=org.apache.camel.component.netty4
appender.file.type = File
appender.file.name = file
-appender.file.fileName = target/camel-netty4-test.log
+appender.file.fileName = target/camel-netty-test.log
appender.file.layout.type = PatternLayout
appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
appender.out.type = Console
diff --git a/components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml b/components/camel-netty/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml
similarity index 83%
rename from components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml
rename to components/camel-netty/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml
index 3d56222..7a53960 100644
--- a/components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml
+++ b/components/camel-netty/src/test/resources/org/apache/camel/component/netty4/SpringNettyUseSharedWorkerThreadPoolTest.xml
@@ -33,19 +33,19 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>
- <from uri="netty4:tcp://localhost:5021?textline=true&sync=true&workerGroup=#sharedPool&usingExecutorService=false"/>
+ <from uri="netty:tcp://localhost:5021?textline=true&sync=true&workerGroup=#sharedPool&usingExecutorService=false"/>
<to uri="log:result"/>
<to uri="mock:result"/>
</route>
<route>
- <from uri="netty4:tcp://localhost:5022?textline=true&sync=true&workerGroup=#sharedPool&usingExecutorService=false"/>
+ <from uri="netty:tcp://localhost:5022?textline=true&sync=true&workerGroup=#sharedPool&usingExecutorService=false"/>
<to uri="log:result"/>
<to uri="mock:result"/>
</route>
<route>
- <from uri="netty4:tcp://localhost:5023?textline=true&sync=true&workerGroup=#sharedPool&usingExecutorService=false"/>
+ <from uri="netty:tcp://localhost:5023?textline=true&sync=true&workerGroup=#sharedPool&usingExecutorService=false"/>
<to uri="log:result"/>
<to uri="mock:result"/>
</route>
diff --git a/components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml b/components/camel-netty/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml
similarity index 94%
rename from components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml
rename to components/camel-netty/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml
index 18adda5..581c14a 100644
--- a/components/camel-netty4/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml
+++ b/components/camel-netty/src/test/resources/org/apache/camel/component/netty4/multiple-codecs.xml
@@ -28,10 +28,10 @@
<camelContext id="multiple-netty-codecs-context" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:multiple-codec"/>
- <to uri="netty4:tcp://localhost:5150?encoders=#encoders&sync=false"/>
+ <to uri="netty:tcp://localhost:5150?encoders=#encoders&sync=false"/>
</route>
<route>
- <from uri="netty4:tcp://localhost:5150?decoders=#length-decoder,#string-decoder&sync=false"/>
+ <from uri="netty:tcp://localhost:5150?decoders=#length-decoder,#string-decoder&sync=false"/>
<to uri="mock:multiple-codec"/>
</route>
</camelContext>
diff --git a/components/camel-netty4/src/test/resources/test.txt b/components/camel-netty/src/test/resources/test.txt
similarity index 100%
rename from components/camel-netty4/src/test/resources/test.txt
rename to components/camel-netty/src/test/resources/test.txt
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
index 82d3508..89a2669 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
@@ -37,7 +37,7 @@ public interface NettyEndpointBuilderFactory {
/**
- * Builder for endpoint consumers for the Netty4 component.
+ * Builder for endpoint consumers for the Netty component.
*/
public interface NettyEndpointConsumerBuilder
extends
@@ -847,7 +847,7 @@ public interface NettyEndpointBuilderFactory {
}
/**
- * Advanced builder for endpoint consumers for the Netty4 component.
+ * Advanced builder for endpoint consumers for the Netty component.
*/
public interface AdvancedNettyEndpointConsumerBuilder
extends
@@ -1594,7 +1594,7 @@ public interface NettyEndpointBuilderFactory {
}
/**
- * Builder for endpoint producers for the Netty4 component.
+ * Builder for endpoint producers for the Netty component.
*/
public interface NettyEndpointProducerBuilder
extends
@@ -2340,7 +2340,7 @@ public interface NettyEndpointBuilderFactory {
}
/**
- * Advanced builder for endpoint producers for the Netty4 component.
+ * Advanced builder for endpoint producers for the Netty component.
*/
public interface AdvancedNettyEndpointProducerBuilder
extends
@@ -3051,7 +3051,7 @@ public interface NettyEndpointBuilderFactory {
}
/**
- * Builder for endpoint for the Netty4 component.
+ * Builder for endpoint for the Netty component.
*/
public interface NettyEndpointBuilder
extends
@@ -3695,7 +3695,7 @@ public interface NettyEndpointBuilderFactory {
}
/**
- * Advanced builder for endpoint for the Netty4 component.
+ * Advanced builder for endpoint for the Netty component.
*/
public interface AdvancedNettyEndpointBuilder
extends
@@ -4099,12 +4099,12 @@ public interface NettyEndpointBuilderFactory {
NULL;
}
/**
- * Netty4 (camel-netty4)
+ * Netty (camel-netty)
* Socket level networking using TCP or UDP with the Netty 4.x library.
*
* Category: networking,tcp,udp
* Available as of version: 2.14
- * Maven coordinates: org.apache.camel:camel-netty4
+ * Maven coordinates: org.apache.camel:camel-netty
*
* Syntax: <code>netty:protocol:host:port</code>
*
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty-starter/pom.xml
similarity index 93%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
rename to platforms/spring-boot/components-starter/camel-netty-starter/pom.xml
index 232ef9b..cf843fd 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/pom.xml
@@ -24,9 +24,9 @@
<artifactId>components-starter</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-netty4-starter</artifactId>
+ <artifactId>camel-netty-starter</artifactId>
<packaging>jar</packaging>
- <name>Spring-Boot Starter :: Camel :: Netty4</name>
+ <name>Spring-Boot Starter :: Camel :: Netty</name>
<description>Spring-Boot Starter for Camel Netty NIO based socket communication component</description>
<dependencies>
<dependency>
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
<!--START OF GENERATED CODE-->
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
similarity index 95%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
index bbedeb7..96b55c7 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
@@ -70,12 +70,12 @@ public class NettyComponentAutoConfiguration {
static class GroupConditions extends GroupCondition {
public GroupConditions() {
- super("camel.component", "camel.component.netty4");
+ super("camel.component", "camel.component.netty");
}
}
@Lazy
- @Bean({"netty-component", "netty4-component"})
+ @Bean(name = "netty-component")
@ConditionalOnMissingBean(NettyComponent.class)
public NettyComponent configureNettyComponent() throws Exception {
NettyComponent component = new NettyComponent();
@@ -110,12 +110,12 @@ public class NettyComponentAutoConfiguration {
? HierarchicalPropertiesEvaluator.evaluate(
applicationContext.getEnvironment(),
"camel.component.customizer",
- "camel.component.netty4.customizer",
+ "camel.component.netty.customizer",
((HasId) customizer).getId())
: HierarchicalPropertiesEvaluator.evaluate(
applicationContext.getEnvironment(),
"camel.component.customizer",
- "camel.component.netty4.customizer");
+ "camel.component.netty.customizer");
if (useCustomizer) {
LOGGER.debug("Configure component {}, with customizer {}",
component, customizer);
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
similarity index 99%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
index 1e543ff..d42b078 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentConfiguration.java
@@ -41,13 +41,13 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.netty4")
+@ConfigurationProperties(prefix = "camel.component.netty")
public class NettyComponentConfiguration
extends
ComponentConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the netty4 component. This is
+ * Whether to enable auto configuration of the netty component. This is
* enabled by default.
*/
private Boolean enabled;
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/LICENSE.txt
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/LICENSE.txt
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/NOTICE.txt
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/NOTICE.txt
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.factories
similarity index 99%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.factories
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.factories
index f0a9b6a..4c1bf9b 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.factories
@@ -14,5 +14,6 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
+
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.netty4.springboot.NettyComponentAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.provides
similarity index 97%
rename from platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.provides
rename to platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.provides
index af59282..8690e05 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/spring.provides
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/resources/META-INF/spring.provides
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-provides: camel-netty4
+provides: camel-netty
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 52c632e..0000000
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "properties": [
- {
- "defaultValue": true,
- "name": "camel.component.netty4.enabled",
- "description": "Enable netty4 component",
- "type": "java.lang.Boolean"
- }
- ]
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 9401240..4f60202 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -281,6 +281,7 @@
<module>camel-mybatis-starter</module>
<module>camel-nagios-starter</module>
<module>camel-nats-starter</module>
+ <module>camel-netty-starter</module>
<module>camel-netty4-http-starter</module>
<module>camel-netty4-starter</module>
<module>camel-nsq-starter</module>
[camel] 12/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Aligned camel-netty-correlation
example
Posted by ac...@apache.org.
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 aa9a4dc5eefaafa989e59650fb78fbca803ad869
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 13:39:37 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned camel-netty-correlation example
---
.../src/main/java/org/apache/camel/example/netty/MyClient.java | 2 +-
.../src/main/java/org/apache/camel/example/netty/MyServer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/camel-example-netty-custom-correlation/src/main/java/org/apache/camel/example/netty/MyClient.java b/examples/camel-example-netty-custom-correlation/src/main/java/org/apache/camel/example/netty/MyClient.java
index 4c0342b..4ce7c6a 100644
--- a/examples/camel-example-netty-custom-correlation/src/main/java/org/apache/camel/example/netty/MyClient.java
+++ b/examples/camel-example-netty-custom-correlation/src/main/java/org/apache/camel/example/netty/MyClient.java
@@ -82,7 +82,7 @@ public final class MyClient {
.log("Request: ${id}:${body}")
// call netty server using a single shared connection and using custom correlation manager
// to ensure we can correltly map the request and response pairs
- .to("netty4:tcp://localhost:4444?sync=true&encoders=#myEncoder&decoders=#myDecoder"
+ .to("netty:tcp://localhost:4444?sync=true&encoders=#myEncoder&decoders=#myDecoder"
+ "&producerPoolEnabled=false&correlationManager=#myManager")
// log response after
.log("Response: ${id}:${body}");
diff --git a/examples/camel-example-netty-custom-correlation/src/main/java/org/apache/camel/example/netty/MyServer.java b/examples/camel-example-netty-custom-correlation/src/main/java/org/apache/camel/example/netty/MyServer.java
index d56cb74..2953af8 100644
--- a/examples/camel-example-netty-custom-correlation/src/main/java/org/apache/camel/example/netty/MyServer.java
+++ b/examples/camel-example-netty-custom-correlation/src/main/java/org/apache/camel/example/netty/MyServer.java
@@ -39,7 +39,7 @@ public final class MyServer {
@Override
public void configure() throws Exception {
- from("netty4:tcp://localhost:4444?sync=true&encoders=#myEncoder&decoders=#myDecoder")
+ from("netty:tcp://localhost:4444?sync=true&encoders=#myEncoder&decoders=#myDecoder")
.log("Request: ${id}:${body}")
.filter(simple("${body} contains 'beer'"))
// use some delay when its beer to make responses interleaved
[camel] 03/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - updated references
Posted by ac...@apache.org.
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 2e6a71059562ab3ee7d1184e7b698a635aebcada
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 11:05:45 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - updated references
---
apache-camel/pom.xml | 4 ++--
apache-camel/src/main/descriptors/common-bin.xml | 4 ++--
bom/camel-bom/pom.xml | 4 ++--
components/camel-ganglia/pom.xml | 2 +-
components/camel-hl7/pom.xml | 4 ++--
components/camel-netty4-http/pom.xml | 2 +-
components/camel-syslog/pom.xml | 2 +-
components/pom.xml | 2 +-
examples/camel-example-netty-custom-correlation/pom.xml | 2 +-
parent/pom.xml | 4 ++--
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 4 ++--
tests/camel-itest/pom.xml | 2 +-
tests/camel-jmh/pom.xml | 2 +-
.../src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java | 2 --
.../src/main/resources/spring-boot-fix-dependencies.properties | 2 +-
15 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 8ceec78..ef569f0 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1044,7 +1044,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2553,7 +2553,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-starter</artifactId>
+ <artifactId>camel-netty-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 37992cb..35560aa 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -229,7 +229,7 @@
<include>org.apache.camel:camel-mybatis</include>
<include>org.apache.camel:camel-nagios</include>
<include>org.apache.camel:camel-nats</include>
- <include>org.apache.camel:camel-netty4</include>
+ <include>org.apache.camel:camel-netty</include>
<include>org.apache.camel:camel-netty4-http</include>
<include>org.apache.camel:camel-nsq</include>
<include>org.apache.camel:camel-ognl</include>
@@ -570,7 +570,7 @@
<include>org.apache.camel:camel-nagios-starter</include>
<include>org.apache.camel:camel-nats-starter</include>
<include>org.apache.camel:camel-netty4-http-starter</include>
- <include>org.apache.camel:camel-netty4-starter</include>
+ <include>org.apache.camel:camel-netty-starter</include>
<include>org.apache.camel:camel-nsq-starter</include>
<include>org.apache.camel:camel-ognl-starter</include>
<include>org.apache.camel:camel-olingo2-starter</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 1bf35f8..7cbe43f 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2010,7 +2010,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2025,7 +2025,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-starter</artifactId>
+ <artifactId>camel-netty-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/components/camel-ganglia/pom.xml b/components/camel-ganglia/pom.xml
index 0110d93..39757a0 100644
--- a/components/camel-ganglia/pom.xml
+++ b/components/camel-ganglia/pom.xml
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 650c66e..2a1085e 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -100,7 +100,7 @@
<optional>true</optional>
</dependency>
- <!-- for MLLP either use mina or camel-netty4 -->
+ <!-- for MLLP either use mina or camel-netty -->
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
@@ -108,7 +108,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<optional>true</optional>
</dependency>
diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml
index c1ef35f..e0f1e77 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
</dependency>
<!-- we use netty-all as dependency which has HTTP included -->
<dependency>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index 89b7ae6..e724633 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
</dependency>
<!-- test dependencies -->
diff --git a/components/pom.xml b/components/pom.xml
index eb3529f..ca6efcf 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -246,7 +246,7 @@
<module>camel-mybatis</module>
<module>camel-nagios</module>
<module>camel-nats</module>
- <module>camel-netty4</module>
+ <module>camel-netty</module>
<module>camel-netty4-http</module>
<module>camel-nsq</module>
<module>camel-ognl</module>
diff --git a/examples/camel-example-netty-custom-correlation/pom.xml b/examples/camel-example-netty-custom-correlation/pom.xml
index ee12ffd..14f6f5a 100644
--- a/examples/camel-example-netty-custom-correlation/pom.xml
+++ b/examples/camel-example-netty-custom-correlation/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
</dependency>
<!-- logging -->
diff --git a/parent/pom.xml b/parent/pom.xml
index d31dff4..c2e6374 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1759,7 +1759,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -3298,7 +3298,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-starter</artifactId>
+ <artifactId>camel-netty-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
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 37fbfe8..cf29609 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
@@ -2235,7 +2235,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2250,7 +2250,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-starter</artifactId>
+ <artifactId>camel-netty-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 6c70a47..b06809d 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -155,7 +155,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/camel-jmh/pom.xml b/tests/camel-jmh/pom.xml
index 66c1ed8..140a7a9 100644
--- a/tests/camel-jmh/pom.xml
+++ b/tests/camel-jmh/pom.xml
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4</artifactId>
+ <artifactId>camel-netty</artifactId>
<scope>test</scope>
</dependency>
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
index 2d51171..fb243e3 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
@@ -104,8 +104,6 @@ public final class DocumentationHelper {
return new File("../camel-http/target/classes/org/apache/camel/component/http/https.json");
} else if ("netty".equals(extendsScheme)) {
return new File("../camel-netty/target/classes/org/apache/camel/component/netty/netty.json");
- } else if ("netty4".equals(extendsScheme)) {
- return new File("../camel-netty4/target/classes/org/apache/camel/component/netty4/netty4.json");
} else if ("servlet".equals(extendsScheme)) {
return new File("../camel-servlet/target/classes/org/apache/camel/component/servlet/servlet.json");
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
index 5f579af..cccb344 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
@@ -30,7 +30,7 @@ camel-github=org.eclipse.mylyn.github:org.eclipse.egit.github.core:${egit-github
camel-guava-eventbus=com.google.guava:guava:${google-guava-version}
# Defaulting to netty4 in the starter
-camel-hl7=org.apache.camel:camel-netty4:${project.version}
+camel-hl7=org.apache.camel:camel-netty:${project.version}
# Camel Core requires on APT for the usage of CollectionStringBuffer.
# Remove this dependency if it was a mistake
[camel] 13/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Karaf integration tests and features
updated
Posted by ac...@apache.org.
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 ef7e19a82acc24b851364a4707340e34b3f38ef2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 14:01:53 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Karaf integration tests and features updated
---
platforms/karaf/features/src/main/resources/features.xml | 10 +++++-----
.../itest/karaf/{CamelNetty4Test.java => CamelNettyTest.java} | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 58ac0fe..384ba35 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1251,7 +1251,7 @@
<bundle>mvn:org.apache.camel/camel-hipchat/${project.version}</bundle>
</feature>
<feature name='camel-hl7' version='${project.version}' start-level='50'>
- <feature version='${project.version}'>camel-netty4</feature>
+ <feature version='${project.version}'>camel-netty</feature>
<bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
<bundle dependency='true'>mvn:ca.uhn.hapi/hapi-osgi-base/${hapi-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hl7/${project.version}</bundle>
@@ -1838,7 +1838,7 @@
<bundle dependency='true'>mvn:net.i2p.crypto/eddsa/${eddsa-version}</bundle>
<bundle>mvn:org.apache.camel/camel-nats/${project.version}</bundle>
</feature>
- <feature name='camel-netty4' version='${project.version}' start-level='50'>
+ <feature name='camel-netty' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
@@ -1852,10 +1852,10 @@
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
- <bundle>mvn:org.apache.camel/camel-netty4/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-netty/${project.version}</bundle>
</feature>
<feature name='camel-netty4-http' version='${project.version}' start-level='50'>
- <feature version='${project.version}'>camel-netty4</feature>
+ <feature version='${project.version}'>camel-netty</feature>
<bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
<bundle>mvn:org.apache.camel/camel-netty4-http/${project.version}</bundle>
</feature>
@@ -2492,7 +2492,7 @@
</feature>
<feature name='camel-syslog' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <feature version='${project.version}'>camel-netty4</feature>
+ <feature version='${project.version}'>camel-netty</feature>
<bundle>mvn:org.apache.camel/camel-syslog/${project.version}</bundle>
</feature>
<feature name='camel-tagsoup' version='${project.version}' start-level='50'>
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
similarity index 94%
rename from tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java
rename to tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
index dbbe05e..3fba8d3 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
@@ -21,9 +21,9 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-public class CamelNetty4Test extends BaseKarafTest {
+public class CamelNettyTest extends BaseKarafTest {
- public static final String COMPONENT = extractName(CamelNetty4Test.class);
+ public static final String COMPONENT = extractName(CamelNettyTest.class);
@Test
public void test() throws Exception {
@@ -31,4 +31,4 @@ public class CamelNetty4Test extends BaseKarafTest {
}
-}
\ No newline at end of file
+}
[camel] 10/20: CAMEL-13792 - Rename components to default names,
Camel-netty4 to camel-netty - Aligned REST DSL stuff to point to
netty4-http only
Posted by ac...@apache.org.
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 f9680c6fbb03136198a97414738b57b18993591a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Aug 7 13:00:02 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to camel-netty - Aligned REST DSL stuff to point to netty4-http only
---
components/camel-rest/src/main/docs/rest-component.adoc | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/camel-rest/src/main/docs/rest-component.adoc b/components/camel-rest/src/main/docs/rest-component.adoc
index 46d150b..6c31c4c 100644
--- a/components/camel-rest/src/main/docs/rest-component.adoc
+++ b/components/camel-rest/src/main/docs/rest-component.adoc
@@ -123,7 +123,6 @@ The component supports 8 options, which are listed below.
The following components support rest consumer (Rest DSL):
* camel-coap
-* camel-netty-http
* camel-netty4-http
* camel-jetty
* camel-restlet