You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/05 14:26:36 UTC
[camel] branch master updated (42b8149 -> aeda49a)
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 42b8149 CAMEL-7444: Fixed TODO for MDC test
new 799f829 CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina
new 7bc8f30 CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Spring Boot Starter Mojo should consider camel-mina now
new 4bf22d6 CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Added camel-mina starter
new 22ac72d CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Updated references
new b865a68 CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Updated docs
new c53bbda CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Fixed tests for camel-hl7 and camel-syslog
new d16290b CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Updated references in docs and regen
new 32a71e2 CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Karaf integration test and feature updated
new aeda49a CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - SB integration test updated
The 9 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:
apache-camel/pom.xml | 4 +-
apache-camel/src/main/descriptors/common-bin.xml | 4 +-
bom/camel-bom/pom.xml | 4 +-
components/camel-hl7/pom.xml | 4 +-
.../camel-hl7/src/main/docs/hl7-dataformat.adoc | 12 +-
.../camel/component/hl7/HL7ByteArrayRouteTest.java | 8 +-
.../component/hl7/HL7MLLPCodecBoundaryTest.java | 4 +-
.../camel/component/hl7/HL7MLLPCodecLongTest.java | 4 +-
.../hl7/HL7MLLPCodecMessageFloodingTest.java | 2 +-
.../component/hl7/HL7MLLPCodecPlainStringTest.java | 4 +-
.../hl7/HL7MLLPCodecStandAndEndBytesTest.java | 4 +-
.../camel/component/hl7/HL7MLLPCodecTest.java | 4 +-
.../apache/camel/component/hl7/HL7RouteTest.java | 8 +-
components/{camel-mina2 => camel-mina}/pom.xml | 6 +-
.../src/main/docs/mina-component.adoc} | 96 +++++-----
.../camel/component/mina2/Mina2Component.java | 2 +-
.../camel/component/mina2/Mina2Configuration.java | 2 +-
.../camel/component/mina2/Mina2Constants.java | 0
.../camel/component/mina2/Mina2Consumer.java | 0
.../camel/component/mina2/Mina2Converter.java | 0
.../camel/component/mina2/Mina2Endpoint.java | 2 +-
.../apache/camel/component/mina2/Mina2Helper.java | 0
.../camel/component/mina2/Mina2PayloadHelper.java | 0
.../camel/component/mina2/Mina2Producer.java | 0
.../component/mina2/Mina2TextLineCodecFactory.java | 0
.../component/mina2/Mina2TextLineDelimiter.java | 0
.../mina2/Mina2UdpProtocolCodecFactory.java | 0
.../src/test/data/message1.txt | 0
.../camel/component/mina2/BaseMina2Test.java | 0
.../component/mina2/MessageIOSessionTest.java | 6 +-
.../Mina2ClientModeTcpTextlineDelimiterTest.java | 2 +-
.../component/mina2/Mina2ClientServerTest.java | 4 +-
.../camel/component/mina2/Mina2ComponentTest.java | 8 +-
.../mina2/Mina2ComponentWithConfigurationTest.java | 2 +-
.../camel/component/mina2/Mina2ConsumerTest.java | 8 +-
.../camel/component/mina2/Mina2ConverterTest.java | 0
.../component/mina2/Mina2CustomCodecTest.java | 10 +-
.../mina2/Mina2DisconnectRaceConditionTest.java | 4 +-
.../camel/component/mina2/Mina2DisconnectTest.java | 4 +-
.../camel/component/mina2/Mina2EncodingTest.java | 14 +-
.../mina2/Mina2ExchangeDefaultTimeOutTest.java | 4 +-
.../component/mina2/Mina2ExchangeTimeOutTest.java | 4 +-
.../camel/component/mina2/Mina2FileTcpTest.java} | 6 +-
.../camel/component/mina2/Mina2FileUdpTest.java | 4 +-
.../camel/component/mina2/Mina2FiltersTest.java | 4 +-
.../component/mina2/Mina2InOnlyRouteTest.java | 4 +-
.../Mina2InOutCloseSessionWhenCompleteTest.java | 4 +-
.../camel/component/mina2/Mina2InOutRouteTest.java | 4 +-
.../Mina2InOutRouteTextLineDelimiterTest.java | 4 +-
.../mina2/Mina2InOutWithForcedNoResponseTest.java | 8 +-
.../component/mina2/Mina2MaxLineLengthTest.java | 4 +-
.../component/mina2/Mina2NoDefaultCodecTest.java | 4 +-
.../mina2/Mina2NoResponseFromServerTest.java | 4 +-
.../mina2/Mina2ProducerAnotherConcurrentTest.java | 4 +-
.../mina2/Mina2ProducerConcurrentTest.java | 4 +-
.../mina2/Mina2ProducerShutdownMockTest.java | 4 +-
.../component/mina2/Mina2ProducerShutdownTest.java | 2 +-
.../mina2/Mina2ReverseProtocolHandler.java | 0
.../camel/component/mina2/Mina2ReverserServer.java | 0
.../component/mina2/Mina2SendToProcessorTest.java | 4 +-
.../mina2/Mina2SpringMinaEndpointTest.java | 2 +-
.../mina2/Mina2SpringMinaEndpointUDPTest.java | 0
.../mina2/Mina2SpringMultipleUDPTest.java | 0
.../mina2/Mina2SslContextParametersTcpTest.java | 4 +-
.../mina2/Mina2SslContextParametersUdpTest.java | 2 +-
.../mina2/Mina2SslContextParametersVmTest.java | 4 +-
.../Mina2SslGlobalContextParametersTcpTest.java | 6 +-
.../Mina2TcpLineDelimiterUsingPlainSocketTest.java | 2 +-
.../apache/camel/component/mina2/Mina2TcpTest.java | 6 +-
.../mina2/Mina2TcpTextlineDelimiterTest.java | 4 +-
.../mina2/Mina2TcpTextlineProtocolTest.java} | 9 +-
.../component/mina2/Mina2TcpWithInOutTest.java | 4 +-
.../Mina2TcpWithInOutUsingPlainSocketTest.java | 2 +-
.../Mina2TcpWithIoOutProcessorExceptionTest.java | 4 +-
.../mina2/Mina2TransferExchangeOptionTest.java | 4 +-
.../component/mina2/Mina2UdpConcurrentTest.java | 2 +-
.../camel/component/mina2/Mina2UdpNoCamelTest.java | 0
.../apache/camel/component/mina2/Mina2UdpTest.java | 2 +-
.../component/mina2/Mina2UdpUsingTemplateTest.java | 8 +-
.../Mina2UdpWithInOutUsingPlainSocketTest.java | 2 +-
.../component/mina2/Mina2VMCustomCodecTest.java | 8 +-
.../camel/component/mina2/Mina2VMFileTcpTest.java} | 6 +-
.../mina2/Mina2VMTextlineProtocolTest.java} | 9 +-
.../mina2/Mina2VMTransferExchangeOptionTest.java | 4 +-
.../apache/camel/component/mina2/Mina2VmTest.java | 4 +-
.../src/test/resources/jndi-example.properties | 0
.../src/test/resources/jsse/localhost.ks | Bin
.../src/test/resources/log4j2.properties | 2 +-
.../mina2/SpringMinaEndpointTest-context.xml | 0
.../mina2/SpringMinaEndpointUDPTest-context.xml | 0
.../mina2/SpringMultipleUDPTest-context.xml | 0
components/camel-mllp/README.md | 4 +-
.../src/main/docs/netty4-component.adoc | 2 +-
components/camel-syslog/pom.xml | 2 +-
.../src/main/docs/syslog-dataformat.adoc | 8 +-
.../component/syslog/AutomatedConversionTest.java | 2 +-
.../camel/component/syslog/MinaDataFormatTest.java | 2 +-
.../component/syslog/MinaManyUDPMessagesTest.java | 2 +-
components/pom.xml | 2 +-
components/readme.adoc | 4 +-
.../endpoint/dsl/Mina2EndpointBuilderFactory.java | 16 +-
docs/components/modules/ROOT/nav.adoc | 2 +-
.../modules/ROOT/pages/hl7-dataformat.adoc | 12 +-
.../{mina2-component.adoc => mina-component.adoc} | 96 +++++-----
.../modules/ROOT/pages/netty4-component.adoc | 2 +-
.../modules/ROOT/pages/syslog-dataformat.adoc | 8 +-
docs/user-manual/modules/ROOT/pages/async.adoc | 8 +-
.../how-does-camel-compare-to-servicemix-eip.adoc | 2 +-
.../modules/ROOT/pages/faq/what-is-camel.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/security.adoc | 2 +-
.../modules/ROOT/pages/servicepool.adoc | 2 +-
.../ROOT/pages/walk-through-another-example.adoc | 2 +-
examples/camel-example-loadbalancing/pom.xml | 2 +-
parent/pom.xml | 4 +-
.../karaf/features/src/main/resources/features.xml | 4 +-
.../spring-boot/components-starter/README.adoc | 1 -
.../pom.xml | 8 +-
.../Mina2ComponentAutoConfiguration.java | 8 +-
.../springboot/Mina2ComponentConfiguration.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 | 4 +-
.../{CamelMina2Test.java => CamelMinaTest.java} | 6 +-
.../{CamelMina2Test.java => CamelMinaTest.java} | 4 +-
.../maven/packaging/SpringBootStarterMojo.java | 2 +-
132 files changed, 324 insertions(+), 548 deletions(-)
rename components/{camel-mina2 => camel-mina}/pom.xml (96%)
rename components/{camel-mina2/src/main/docs/mina2-component.adoc => camel-mina/src/main/docs/mina-component.adoc} (68%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2Component.java (99%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java (99%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2Constants.java (100%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java (100%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2Converter.java (100%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java (95%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java (100%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2PayloadHelper.java (100%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java (100%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2TextLineCodecFactory.java (100%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2TextLineDelimiter.java (100%)
rename components/{camel-mina2 => camel-mina}/src/main/java/org/apache/camel/component/mina2/Mina2UdpProtocolCodecFactory.java (100%)
rename components/{camel-mina2 => camel-mina}/src/test/data/message1.txt (100%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java (100%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/MessageIOSessionTest.java (88%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java (96%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ClientServerTest.java (91%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ComponentTest.java (86%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ComponentWithConfigurationTest.java (95%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ConsumerTest.java (83%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ConverterTest.java (100%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java (89%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectRaceConditionTest.java (90%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectTest.java (85%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java (88%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java (90%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeTimeOutTest.java (93%)
rename components/{camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java => camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java} (89%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2FileUdpTest.java (87%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java (92%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2InOnlyRouteTest.java (90%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2InOutCloseSessionWhenCompleteTest.java (87%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTest.java (89%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTextLineDelimiterTest.java (87%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2InOutWithForcedNoResponseTest.java (85%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java (87%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2NoDefaultCodecTest.java (92%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java (92%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java (93%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java (94%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownMockTest.java (93%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownTest.java (97%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java (100%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2ReverserServer.java (100%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2SendToProcessorTest.java (88%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java (95%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointUDPTest.java (100%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java (100%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java (84%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java (94%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java (84%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java (86%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java (97%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2TcpTest.java (78%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineDelimiterTest.java (84%)
rename components/{camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java => camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java} (89%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java (95%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java (98%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithIoOutProcessorExceptionTest.java (91%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java (95%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java (95%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java (100%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java (95%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java (89%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java (96%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java (89%)
rename components/{camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java => camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java} (84%)
rename components/{camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java => camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java} (83%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java (95%)
rename components/{camel-mina2 => camel-mina}/src/test/java/org/apache/camel/component/mina2/Mina2VmTest.java (81%)
rename components/{camel-mina2 => camel-mina}/src/test/resources/jndi-example.properties (100%)
rename components/{camel-mina2 => camel-mina}/src/test/resources/jsse/localhost.ks (100%)
rename components/{camel-mina2 => camel-mina}/src/test/resources/log4j2.properties (96%)
rename components/{camel-mina2 => camel-mina}/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointTest-context.xml (100%)
rename components/{camel-mina2 => camel-mina}/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointUDPTest-context.xml (100%)
rename components/{camel-mina2 => camel-mina}/src/test/resources/org/apache/camel/component/mina2/SpringMultipleUDPTest-context.xml (100%)
rename docs/components/modules/ROOT/pages/{mina2-component.adoc => mina-component.adoc} (68%)
rename platforms/spring-boot/components-starter/{camel-mina2-starter => camel-mina-starter}/pom.xml (89%)
rename platforms/spring-boot/components-starter/{camel-mina2-starter => camel-mina-starter}/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java (95%)
rename platforms/spring-boot/components-starter/{camel-mina2-starter => camel-mina-starter}/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java (99%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-mina-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
copy {tooling/maven/camel-package-maven-plugin => platforms/spring-boot/components-starter/camel-mina-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
rename platforms/spring-boot/components-starter/{camel-mina2-starter => camel-mina-starter}/src/main/resources/META-INF/spring.factories (99%)
rename platforms/spring-boot/components-starter/{camel-mina2-starter => camel-mina-starter}/src/main/resources/META-INF/spring.provides (97%)
delete mode 100644 platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/LICENSE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/NOTICE.txt
delete mode 100644 platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
rename tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/{CamelMina2Test.java => CamelMinaTest.java} (94%)
rename tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/{CamelMina2Test.java => CamelMinaTest.java} (92%)
[camel] 01/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina
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 799f829ddab48453042e4128ba004aa435c03083
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 15:17:36 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina
---
components/{camel-mina2 => camel-mina}/pom.xml | 6 +-
.../src/main/docs/mina2-component.adoc | 0
.../camel/component/mina2/Mina2Component.java | 2 +-
.../camel/component/mina2/Mina2Configuration.java | 2 +-
.../camel/component/mina2/Mina2Constants.java | 0
.../camel/component/mina2/Mina2Consumer.java | 0
.../camel/component/mina2/Mina2Converter.java | 0
.../camel/component/mina2/Mina2Endpoint.java | 2 +-
.../apache/camel/component/mina2/Mina2Helper.java | 0
.../camel/component/mina2/Mina2PayloadHelper.java | 0
.../camel/component/mina2/Mina2Producer.java | 0
.../component/mina2/Mina2TextLineCodecFactory.java | 0
.../component/mina2/Mina2TextLineDelimiter.java | 0
.../mina2/Mina2UdpProtocolCodecFactory.java | 0
.../src/test/data/message1.txt | 0
.../camel/component/mina2/BaseMina2Test.java | 0
.../component/mina2/MessageIOSessionTest.java | 6 +-
.../Mina2ClientModeTcpTextlineDelimiterTest.java | 2 +-
.../component/mina2/Mina2ClientServerTest.java | 4 +-
.../camel/component/mina2/Mina2ComponentTest.java | 8 +-
.../mina2/Mina2ComponentWithConfigurationTest.java | 2 +-
.../camel/component/mina2/Mina2ConsumerTest.java | 8 +-
.../camel/component/mina2/Mina2ConverterTest.java | 0
.../component/mina2/Mina2CustomCodecTest.java | 10 +-
.../mina2/Mina2DisconnectRaceConditionTest.java | 4 +-
.../camel/component/mina2/Mina2DisconnectTest.java | 4 +-
.../camel/component/mina2/Mina2EncodingTest.java | 14 +-
.../mina2/Mina2ExchangeDefaultTimeOutTest.java | 4 +-
.../component/mina2/Mina2ExchangeTimeOutTest.java | 4 +-
.../camel/component/mina2/Mina2FileTcpTest.java} | 6 +-
.../camel/component/mina2/Mina2FileUdpTest.java | 4 +-
.../camel/component/mina2/Mina2FiltersTest.java | 4 +-
.../component/mina2/Mina2InOnlyRouteTest.java | 4 +-
.../Mina2InOutCloseSessionWhenCompleteTest.java | 4 +-
.../camel/component/mina2/Mina2InOutRouteTest.java | 4 +-
.../Mina2InOutRouteTextLineDelimiterTest.java | 4 +-
.../mina2/Mina2InOutWithForcedNoResponseTest.java | 8 +-
.../component/mina2/Mina2MaxLineLengthTest.java | 4 +-
.../component/mina2/Mina2NoDefaultCodecTest.java | 4 +-
.../mina2/Mina2NoResponseFromServerTest.java | 4 +-
.../mina2/Mina2ProducerAnotherConcurrentTest.java | 4 +-
.../mina2/Mina2ProducerConcurrentTest.java | 4 +-
.../mina2/Mina2ProducerShutdownMockTest.java | 4 +-
.../component/mina2/Mina2ProducerShutdownTest.java | 2 +-
.../mina2/Mina2ReverseProtocolHandler.java | 0
.../camel/component/mina2/Mina2ReverserServer.java | 0
.../component/mina2/Mina2SendToProcessorTest.java | 4 +-
.../mina2/Mina2SpringMinaEndpointTest.java | 2 +-
.../mina2/Mina2SpringMinaEndpointUDPTest.java | 0
.../mina2/Mina2SpringMultipleUDPTest.java | 0
.../mina2/Mina2SslContextParametersTcpTest.java | 4 +-
.../mina2/Mina2SslContextParametersUdpTest.java | 2 +-
.../mina2/Mina2SslContextParametersVmTest.java | 4 +-
.../Mina2SslGlobalContextParametersTcpTest.java | 6 +-
.../Mina2TcpLineDelimiterUsingPlainSocketTest.java | 2 +-
.../apache/camel/component/mina2/Mina2TcpTest.java | 6 +-
.../mina2/Mina2TcpTextlineDelimiterTest.java | 4 +-
.../mina2/Mina2TcpTextlineProtocolTest.java} | 9 +-
.../component/mina2/Mina2TcpWithInOutTest.java | 4 +-
.../Mina2TcpWithInOutUsingPlainSocketTest.java | 2 +-
.../Mina2TcpWithIoOutProcessorExceptionTest.java | 4 +-
.../mina2/Mina2TransferExchangeOptionTest.java | 4 +-
.../component/mina2/Mina2UdpConcurrentTest.java | 2 +-
.../camel/component/mina2/Mina2UdpNoCamelTest.java | 0
.../apache/camel/component/mina2/Mina2UdpTest.java | 2 +-
.../component/mina2/Mina2UdpUsingTemplateTest.java | 8 +-
.../Mina2UdpWithInOutUsingPlainSocketTest.java | 2 +-
.../component/mina2/Mina2VMCustomCodecTest.java | 8 +-
.../camel/component/mina2/Mina2VMFileTcpTest.java} | 6 +-
.../mina2/Mina2VMTextlineProtocolTest.java} | 9 +-
.../mina2/Mina2VMTransferExchangeOptionTest.java | 4 +-
.../apache/camel/component/mina2/Mina2VmTest.java | 4 +-
.../src/test/resources/jndi-example.properties | 0
.../src/test/resources/jsse/localhost.ks | Bin
.../src/test/resources/log4j2.properties | 2 +-
.../mina2/SpringMinaEndpointTest-context.xml | 0
.../mina2/SpringMinaEndpointUDPTest-context.xml | 0
.../mina2/SpringMultipleUDPTest-context.xml | 0
.../endpoint/dsl/Mina2EndpointBuilderFactory.java | 16 +-
.../components-starter/camel-mina2-starter/pom.xml | 53 ---
.../Mina2ComponentAutoConfiguration.java | 128 ------
.../springboot/Mina2ComponentConfiguration.java | 448 ---------------------
.../src/main/resources/META-INF/LICENSE.txt | 203 ----------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../additional-spring-configuration-metadata.json | 10 -
.../src/main/resources/META-INF/spring.factories | 18 -
.../src/main/resources/META-INF/spring.provides | 17 -
87 files changed, 133 insertions(+), 1021 deletions(-)
diff --git a/components/camel-mina2/pom.xml b/components/camel-mina/pom.xml
similarity index 96%
rename from components/camel-mina2/pom.xml
rename to components/camel-mina/pom.xml
index d827c46..fd8d5c30 100644
--- a/components/camel-mina2/pom.xml
+++ b/components/camel-mina/pom.xml
@@ -27,10 +27,10 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<packaging>jar</packaging>
- <name>Camel :: MINA-2</name>
- <description>Camel MINA 2.x support</description>
+ <name>Camel :: MINA</name>
+ <description>Camel MINA support</description>
<properties>
<camel.osgi.import.before.defaults>org.apache.mina.*;version="[2.0,3.0)"</camel.osgi.import.before.defaults>
diff --git a/components/camel-mina2/src/main/docs/mina2-component.adoc b/components/camel-mina/src/main/docs/mina2-component.adoc
similarity index 100%
rename from components/camel-mina2/src/main/docs/mina2-component.adoc
rename to components/camel-mina/src/main/docs/mina2-component.adoc
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
similarity index 99%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
index f954874..4362864 100644
--- a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
@@ -32,7 +32,7 @@ import org.apache.mina.core.filterchain.IoFilter;
/**
* Component for Apache MINA 2.x.
*/
-@Component("mina,mina2")
+@Component("mina")
public class Mina2Component extends DefaultComponent implements SSLContextParametersAware {
@Metadata(label = "advanced")
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
similarity index 99%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
index 5d4abf5..ec5055a 100644
--- a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Configuration.java
@@ -411,6 +411,6 @@ public class Mina2Configuration implements Cloneable {
// here we just shows the option setting of host, port, protocol
public String getUriString() {
- return "mina2:" + getProtocol() + ":" + getHost() + ":" + getPort();
+ return "mina:" + getProtocol() + ":" + getHost() + ":" + getPort();
}
}
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Constants.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Constants.java
similarity index 100%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Constants.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Constants.java
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
similarity index 100%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Converter.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Converter.java
similarity index 100%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Converter.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Converter.java
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
similarity index 95%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
index 2455ff6..e5799ec 100644
--- a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
@@ -31,7 +31,7 @@ import org.apache.mina.core.session.IoSession;
/**
* Socket level networking using TCP or UDP with the Apache Mina 2.x library.
*/
-@UriEndpoint(firstVersion = "2.10.0", scheme = "mina2,mina", title = "Mina2", syntax = "mina2:protocol:host:port", label = "networking,tcp,udp")
+@UriEndpoint(firstVersion = "2.10.0", scheme = "mina", title = "Mina", syntax = "mina:protocol:host:port", label = "networking,tcp,udp")
public class Mina2Endpoint extends DefaultEndpoint implements MultipleConsumersSupport {
@UriParam
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
similarity index 100%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2PayloadHelper.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2PayloadHelper.java
similarity index 100%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2PayloadHelper.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2PayloadHelper.java
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
similarity index 100%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2TextLineCodecFactory.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2TextLineCodecFactory.java
similarity index 100%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2TextLineCodecFactory.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2TextLineCodecFactory.java
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2TextLineDelimiter.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2TextLineDelimiter.java
similarity index 100%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2TextLineDelimiter.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2TextLineDelimiter.java
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2UdpProtocolCodecFactory.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2UdpProtocolCodecFactory.java
similarity index 100%
rename from components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2UdpProtocolCodecFactory.java
rename to components/camel-mina/src/main/java/org/apache/camel/component/mina2/Mina2UdpProtocolCodecFactory.java
diff --git a/components/camel-mina2/src/test/data/message1.txt b/components/camel-mina/src/test/data/message1.txt
similarity index 100%
rename from components/camel-mina2/src/test/data/message1.txt
rename to components/camel-mina/src/test/data/message1.txt
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
similarity index 100%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/MessageIOSessionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/MessageIOSessionTest.java
similarity index 88%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/MessageIOSessionTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/MessageIOSessionTest.java
index 326e492..129d4bc 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/MessageIOSessionTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/MessageIOSessionTest.java
@@ -34,7 +34,7 @@ public class MessageIOSessionTest extends BaseMina2Test {
public void testIoSession() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- template.sendBody(String.format("mina2:tcp://localhost:%1$s?textline=true", getPort()), "Hello World");
+ template.sendBody(String.format("mina:tcp://localhost:%1$s?textline=true", getPort()), "Hello World");
assertMockEndpointsSatisfied();
Exchange exchange = mock.getExchanges().get(0);
@@ -47,7 +47,7 @@ public class MessageIOSessionTest extends BaseMina2Test {
public void testLocalAndRemoteAddressHeaders() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- template.sendBody(String.format("mina2:tcp://localhost:%1$s?textline=true", getPort()), "Hello World");
+ template.sendBody(String.format("mina:tcp://localhost:%1$s?textline=true", getPort()), "Hello World");
assertMockEndpointsSatisfied();
Message message = mock.getExchanges().get(0).getIn();
@@ -63,7 +63,7 @@ public class MessageIOSessionTest extends BaseMina2Test {
@Override
public void configure() throws Exception {
- from(String.format("mina2:tcp://localhost:%1$s?textline=true", getPort()))
+ from(String.format("mina:tcp://localhost:%1$s?textline=true", getPort()))
.to("log://mytest")
.to("mock:result");
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java
similarity index 96%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java
index 20597b6..edeaa47 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientModeTcpTextlineDelimiterTest.java
@@ -52,7 +52,7 @@ public class Mina2ClientModeTcpTextlineDelimiterTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:tcp://127.0.0.1:%1$s?sync=false&textline=true&textlineDelimiter=UNIX&clientMode=true", getPort()))
+ from(String.format("mina:tcp://127.0.0.1:%1$s?sync=false&textline=true&textlineDelimiter=UNIX&clientMode=true", getPort()))
.id("minaRoute")
.noAutoStartup()
.to("log:before?showAll=true")
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientServerTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientServerTest.java
similarity index 91%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientServerTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientServerTest.java
index e2971a7..a464bd6 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ClientServerTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ClientServerTest.java
@@ -26,7 +26,7 @@ public class Mina2ClientServerTest extends BaseMina2Test {
@Test
public void testSendToServer() throws InterruptedException {
// START SNIPPET: e3
- String out = (String) template.requestBody(String.format("mina2:tcp://localhost:%1$s?textline=true", getPort()), "Chad");
+ String out = (String) template.requestBody(String.format("mina:tcp://localhost:%1$s?textline=true", getPort()), "Chad");
assertEquals("Hello Chad", out);
// END SNIPPET: e3
}
@@ -40,7 +40,7 @@ public class Mina2ClientServerTest extends BaseMina2Test {
// START SNIPPET: e1
// lets setup a server on port %1$s
// and we let the request-reply be processed in the MyServerProcessor
- from(String.format("mina2:tcp://localhost:%1$s?textline=true", getPort())).process(new MyServerProcessor());
+ from(String.format("mina:tcp://localhost:%1$s?textline=true", getPort())).process(new MyServerProcessor());
// END SNIPPET: e1
}
};
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ComponentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentTest.java
similarity index 86%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ComponentTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentTest.java
index 0bb951e..384524a 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ComponentTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentTest.java
@@ -28,11 +28,11 @@ public class Mina2ComponentTest extends CamelTestSupport {
@Test
public void testUnknownProtocol() {
try {
- template.sendBody("mina2:xxx://localhost:8080", "mina2:xxx://localhost:8080");
+ template.sendBody("mina:xxx://localhost:8080", "mina:xxx://localhost:8080");
fail("Should have thrown a ResolveEndpointFailedException");
} catch (ResolveEndpointFailedException e) {
assertTrue("Should be an IAE exception", e.getCause() instanceof IllegalArgumentException);
- assertEquals("Unrecognised MINA protocol: xxx for uri: mina2://xxx://localhost:8080", e.getCause().getMessage());
+ assertEquals("Unrecognised MINA protocol: xxx for uri: mina://xxx://localhost:8080", e.getCause().getMessage());
}
}
@@ -40,11 +40,11 @@ public class Mina2ComponentTest extends CamelTestSupport {
public void testMistypedProtocol() {
try {
// the protocol is mistyped as a colon is missing after tcp
- template.sendBody("mina2:tcp//localhost:8080", "mina2:tcp//localhost:8080");
+ template.sendBody("mina:tcp//localhost:8080", "mina:tcp//localhost:8080");
fail("Should have thrown a ResolveEndpointFailedException");
} catch (ResolveEndpointFailedException e) {
assertTrue("Should be an IAE exception", e.getCause() instanceof IllegalArgumentException);
- assertEquals("Unrecognised MINA protocol: null for uri: mina2://tcp//localhost:8080", e.getCause().getMessage());
+ assertEquals("Unrecognised MINA protocol: null for uri: mina://tcp//localhost:8080", e.getCause().getMessage());
}
}
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ComponentWithConfigurationTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentWithConfigurationTest.java
similarity index 95%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ComponentWithConfigurationTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentWithConfigurationTest.java
index a111ecd..cf650e8 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ComponentWithConfigurationTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ComponentWithConfigurationTest.java
@@ -23,7 +23,7 @@ public class Mina2ComponentWithConfigurationTest extends CamelTestSupport {
@Test
public void testMinaComponentWithConfiguration() throws Exception {
- Mina2Component comp = context.getComponent("mina2", Mina2Component.class);
+ Mina2Component comp = context.getComponent("mina", Mina2Component.class);
Mina2Configuration cfg1 = new Mina2Configuration();
cfg1.setHost("abc");
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ConsumerTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConsumerTest.java
similarity index 83%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ConsumerTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConsumerTest.java
index 251e450..4e1c299 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ConsumerTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConsumerTest.java
@@ -36,7 +36,7 @@ public class Mina2ConsumerTest extends BaseMina2Test {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- template.sendBody("mina2:tcp://localhost:" + port1 + "?textline=true&sync=false", "Hello World");
+ template.sendBody("mina:tcp://localhost:" + port1 + "?textline=true&sync=false", "Hello World");
assertMockEndpointsSatisfied();
// END SNIPPET: e2
@@ -45,7 +45,7 @@ public class Mina2ConsumerTest extends BaseMina2Test {
@Test
public void testSendTextlineSyncText() throws Exception {
// START SNIPPET: e4
- String response = (String) template.requestBody("mina2:tcp://localhost:" + port2 + "?textline=true&sync=true", "World");
+ String response = (String) template.requestBody("mina:tcp://localhost:" + port2 + "?textline=true&sync=true", "World");
assertEquals("Bye World", response);
// END SNIPPET: e4
}
@@ -59,11 +59,11 @@ public class Mina2ConsumerTest extends BaseMina2Test {
port2 = getNextPort();
// START SNIPPET: e1
- from("mina2:tcp://localhost:" + port1 + "?textline=true&sync=false").to("mock:result");
+ from("mina:tcp://localhost:" + port1 + "?textline=true&sync=false").to("mock:result");
// END SNIPPET: e1
// START SNIPPET: e3
- from("mina2:tcp://localhost:" + port2 + "?textline=true&sync=true").process(new Processor() {
+ from("mina:tcp://localhost:" + port2 + "?textline=true&sync=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ConverterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConverterTest.java
similarity index 100%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ConverterTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ConverterTest.java
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
similarity index 89%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
index 0a2dbcc..c93d070 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
@@ -48,7 +48,7 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Bye World");
- Object out = template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true&codec=#myCodec", getPort()), "Hello World");
+ Object out = template.requestBody(String.format("mina:tcp://localhost:%1$s?sync=true&codec=#myCodec", getPort()), "Hello World");
assertEquals("Bye World", out);
mock.assertIsSatisfied();
@@ -60,7 +60,7 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
mock.expectedMessageCount(1);
try {
- template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true&codec=#failingCodec", getPort()), "Hello World");
+ template.requestBody(String.format("mina:tcp://localhost:%1$s?sync=true&codec=#failingCodec", getPort()), "Hello World");
fail("Expecting that decode of result fails");
} catch (Exception e) {
assertTrue(e instanceof CamelExecutionException);
@@ -77,7 +77,7 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
@Test
public void testTCPEncodeUTF8InputIsString() throws Exception {
- final String myUri = String.format("mina2:tcp://localhost:%1$s?encoding=UTF-8&sync=false", getNextPort());
+ final String myUri = String.format("mina:tcp://localhost:%1$s?encoding=UTF-8&sync=false", getNextPort());
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
@@ -100,7 +100,7 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
@Test
public void testBadConfiguration() throws Exception {
try {
- template.sendBody(String.format("mina2:tcp://localhost:%1$s?sync=true&codec=#XXX", getPort()), "Hello World");
+ template.sendBody(String.format("mina:tcp://localhost:%1$s?sync=true&codec=#XXX", getPort()), "Hello World");
fail("Should have thrown a ResolveEndpointFailedException");
} catch (ResolveEndpointFailedException e) {
// ok
@@ -113,7 +113,7 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
@Override
public void configure() throws Exception {
- from(String.format("mina2:tcp://localhost:%1$s?sync=true&codec=#myCodec", getPort())).transform(constant("Bye World")).to("mock:result");
+ from(String.format("mina:tcp://localhost:%1$s?sync=true&codec=#myCodec", getPort())).transform(constant("Bye World")).to("mock:result");
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectRaceConditionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectRaceConditionTest.java
similarity index 90%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectRaceConditionTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectRaceConditionTest.java
index e7dc403..12b2695 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectRaceConditionTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectRaceConditionTest.java
@@ -35,7 +35,7 @@ public class Mina2DisconnectRaceConditionTest extends BaseMina2Test {
*/
@Test
public void testCloseSessionWhenCompleteManyTimes() throws Exception {
- final String endpointUri = String.format("mina2:tcp://localhost:%1$s?sync=true&textline=true&disconnect=true&minaLogger=true", getPort());
+ final String endpointUri = String.format("mina:tcp://localhost:%1$s?sync=true&textline=true&disconnect=true&minaLogger=true", getPort());
Mina2Producer producer = (Mina2Producer) context.getEndpoint(endpointUri).createProducer();
// Access session to check that the session is really closed
Field field = producer.getClass().getDeclaredField("session");
@@ -57,7 +57,7 @@ public class Mina2DisconnectRaceConditionTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() throws Exception {
- from(String.format("mina2:tcp://localhost:%1$s?sync=true&textline=true", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?sync=true&textline=true", getPort())).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectTest.java
similarity index 85%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectTest.java
index ffa2eb3..6cf1321 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2DisconnectTest.java
@@ -28,7 +28,7 @@ public class Mina2DisconnectTest extends BaseMina2Test {
@Test
public void testCloseSessionWhenComplete() throws Exception {
- Object out = template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true&textline=true&disconnect=true", getPort()), "Chad");
+ Object out = template.requestBody(String.format("mina:tcp://localhost:%1$s?sync=true&textline=true&disconnect=true", getPort()), "Chad");
assertEquals("Bye Chad", out);
}
@@ -37,7 +37,7 @@ public class Mina2DisconnectTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() throws Exception {
- from(String.format("mina2:tcp://localhost:%1$s?sync=true&textline=true&disconnect=true", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?sync=true&textline=true&disconnect=true", getPort())).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java
similarity index 88%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java
index 741ad1f..9618c56 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java
@@ -32,7 +32,7 @@ public class Mina2EncodingTest extends BaseMina2Test {
@Test
public void testTCPEncodeUTF8InputIsBytes() throws Exception {
- final String uri = String.format("mina2:tcp://localhost:%1$s?encoding=UTF-8&sync=false", getPort());
+ final String uri = String.format("mina:tcp://localhost:%1$s?encoding=UTF-8&sync=false", getPort());
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -54,7 +54,7 @@ public class Mina2EncodingTest extends BaseMina2Test {
@Test
public void testTCPEncodeUTF8InputIsString() throws Exception {
- final String uri = String.format("mina2:tcp://localhost:%1$s?encoding=UTF-8&sync=false", getPort());
+ final String uri = String.format("mina:tcp://localhost:%1$s?encoding=UTF-8&sync=false", getPort());
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -76,7 +76,7 @@ public class Mina2EncodingTest extends BaseMina2Test {
@Test
public void testTCPEncodeUTF8TextLineInputIsString() throws Exception {
- final String uri = String.format("mina2:tcp://localhost:%1$s?textline=true&encoding=UTF-8&sync=false", getPort());
+ final String uri = String.format("mina:tcp://localhost:%1$s?textline=true&encoding=UTF-8&sync=false", getPort());
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -100,7 +100,7 @@ public class Mina2EncodingTest extends BaseMina2Test {
// See TextLineEncoder#encode where the message is converted to String using .toString()
@Test
public void testUDPEncodeUTF8InputIsBytes() throws Exception {
- final String uri = String.format("mina2:udp://localhost:%1$s?encoding=UTF-8&sync=false", getPort());
+ final String uri = String.format("mina:udp://localhost:%1$s?encoding=UTF-8&sync=false", getPort());
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -122,7 +122,7 @@ public class Mina2EncodingTest extends BaseMina2Test {
@Test
public void testUDPEncodeUTF8InputIsString() throws Exception {
- final String uri = String.format("mina2:udp://localhost:%1$s?encoding=UTF-8&sync=false", getPort());
+ final String uri = String.format("mina:udp://localhost:%1$s?encoding=UTF-8&sync=false", getPort());
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -152,7 +152,7 @@ public class Mina2EncodingTest extends BaseMina2Test {
final String hello = "Hello Thai Elephant \u0E08";
final String bye = "Hello Thai Elephant \u0E08";
- final String uri = String.format("mina2:udp://localhost:%1$s?sync=true&encoding=UTF-8", getPort());
+ final String uri = String.format("mina:udp://localhost:%1$s?sync=true&encoding=UTF-8", getPort());
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -183,7 +183,7 @@ public class Mina2EncodingTest extends BaseMina2Test {
@Test
public void testInvalidEncoding() throws Exception {
- final String uri = String.format("mina2:tcp://localhost:%1$s?textline=true&encoding=XXX&sync=false", getPort());
+ final String uri = String.format("mina:tcp://localhost:%1$s?textline=true&encoding=XXX&sync=false", getPort());
try {
context.addRoutes(new RouteBuilder() {
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java
similarity index 90%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java
index 7839b04..d396d0d 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeDefaultTimeOutTest.java
@@ -30,7 +30,7 @@ public class Mina2ExchangeDefaultTimeOutTest extends BaseMina2Test {
@Test
public void testDefaultTimeOut() {
try {
- String result = (String) template.requestBody(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=true", getPort()), "Hello World");
+ String result = (String) template.requestBody(String.format("mina:tcp://localhost:%1$s?textline=true&sync=true", getPort()), "Hello World");
assertEquals("Okay I will be faster in the future", result);
} catch (RuntimeCamelException e) {
fail("Should not get a RuntimeCamelException");
@@ -42,7 +42,7 @@ public class Mina2ExchangeDefaultTimeOutTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=true", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?textline=true&sync=true", getPort())).process(new Processor() {
public void process(Exchange e) throws Exception {
assertEquals("Hello World", e.getIn().getBody(String.class));
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeTimeOutTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeTimeOutTest.java
similarity index 93%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeTimeOutTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeTimeOutTest.java
index e722ff1..d5b7fc6 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeTimeOutTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ExchangeTimeOutTest.java
@@ -32,7 +32,7 @@ public class Mina2ExchangeTimeOutTest extends BaseMina2Test {
@Test
public void testUsingTimeoutParameter() throws Exception {
// use a timeout value of 2 seconds (timeout is in millis) so we should actually get a response in this test
- Endpoint endpoint = context.getEndpoint(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=true&timeout=500", getPort()));
+ Endpoint endpoint = context.getEndpoint(String.format("mina:tcp://localhost:%1$s?textline=true&sync=true&timeout=500", getPort()));
Producer producer = endpoint.createProducer();
producer.start();
Exchange exchange = endpoint.createExchange();
@@ -51,7 +51,7 @@ public class Mina2ExchangeTimeOutTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=true&timeout=30000", getPort()))
+ from(String.format("mina:tcp://localhost:%1$s?textline=true&sync=true&timeout=30000", getPort()))
.process(new Processor() {
public void process(Exchange e) throws Exception {
assertEquals("Hello World", e.getIn().getBody(String.class));
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java
similarity index 89%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java
index 3a877a1..fa33bb6 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2VMFileTcpTest extends BaseMina2Test {
+public class Mina2FileTcpTest extends BaseMina2Test {
@Test
public void testMinaRoute() throws Exception {
@@ -37,10 +37,10 @@ public class Mina2VMFileTcpTest extends BaseMina2Test {
public void configure() {
// lets setup a server
- from(String.format("mina2:vm://localhost:%1$s?sync=false&textline=true", getPort())).to("mock:results");
+ from(String.format("mina:tcp://localhost:%1$s?sync=false&textline=true", getPort())).to("mock:results");
from("file:src/test/data?noop=true&fileName=message1.txt").
- to(String.format("mina2:vm://localhost:%1$s?sync=false&textline=true", getPort()));
+ to(String.format("mina:tcp://localhost:%1$s?sync=false&textline=true", getPort()));
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FileUdpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileUdpTest.java
similarity index 87%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FileUdpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileUdpTest.java
index dda1da4..e9d5db9 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FileUdpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FileUdpTest.java
@@ -37,10 +37,10 @@ public class Mina2FileUdpTest extends BaseMina2Test {
public void configure() {
// lets setup a server
- from(String.format("mina2:udp://localhost:%1$s?sync=false&textline=true", getPort())).to("mock:results");
+ from(String.format("mina:udp://localhost:%1$s?sync=false&textline=true", getPort())).to("mock:results");
from("file:src/test/data?noop=true").
- to(String.format("mina2:udp://localhost:%1$s?sync=false&textline=true", getPort()));
+ to(String.format("mina:udp://localhost:%1$s?sync=false&textline=true", getPort()));
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
similarity index 92%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
index 17e52c4..db23eca 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2FiltersTest.java
@@ -38,12 +38,12 @@ public class Mina2FiltersTest extends BaseMina2Test {
@Test
public void testFilterListRef() throws Exception {
- testFilter(String.format("mina2:tcp://localhost:%1$s?textline=true&minaLogger=true&sync=false&filters=#myFilters", getPort()));
+ testFilter(String.format("mina:tcp://localhost:%1$s?textline=true&minaLogger=true&sync=false&filters=#myFilters", getPort()));
}
@Test
public void testFilterElementRef() throws Exception {
- testFilter(String.format("mina2:tcp://localhost:%1$s?textline=true&minaLogger=true&sync=false&filters=#myFilter", getPort()));
+ testFilter(String.format("mina:tcp://localhost:%1$s?textline=true&minaLogger=true&sync=false&filters=#myFilter", getPort()));
}
@Override
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOnlyRouteTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOnlyRouteTest.java
similarity index 90%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOnlyRouteTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOnlyRouteTest.java
index 6dae72e..e760963 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOnlyRouteTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOnlyRouteTest.java
@@ -42,7 +42,7 @@ public class Mina2InOnlyRouteTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() throws Exception {
- from(String.format("mina2:tcp://localhost:%1$s?sync=true", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?sync=true", getPort())).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
@@ -52,7 +52,7 @@ public class Mina2InOnlyRouteTest extends BaseMina2Test {
from("timer://start?period=10000&delay=2000")
.setBody(constant("Chad"))
- .to(String.format("mina2:tcp://localhost:%1$s?sync=true&lazySessionCreation=true", getPort()))
+ .to(String.format("mina:tcp://localhost:%1$s?sync=true&lazySessionCreation=true", getPort()))
.to("mock:result");
}
};
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutCloseSessionWhenCompleteTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutCloseSessionWhenCompleteTest.java
similarity index 87%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutCloseSessionWhenCompleteTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutCloseSessionWhenCompleteTest.java
index 343dc25..19636b7 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutCloseSessionWhenCompleteTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutCloseSessionWhenCompleteTest.java
@@ -28,7 +28,7 @@ public class Mina2InOutCloseSessionWhenCompleteTest extends BaseMina2Test {
@Test
public void testCloseSessionWhenComplete() throws Exception {
- Object out = template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true&textline=true", getPort()), "Chad");
+ Object out = template.requestBody(String.format("mina:tcp://localhost:%1$s?sync=true&textline=true", getPort()), "Chad");
assertEquals("Bye Chad", out);
}
@@ -37,7 +37,7 @@ public class Mina2InOutCloseSessionWhenCompleteTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() throws Exception {
- from(String.format("mina2:tcp://localhost:%1$s?sync=true&textline=true", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?sync=true&textline=true", getPort())).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTest.java
similarity index 89%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTest.java
index c70b346..3510dc2 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTest.java
@@ -47,7 +47,7 @@ public class Mina2InOutRouteTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() throws Exception {
- from(String.format("mina2:tcp://localhost:%1$s?sync=true", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?sync=true", getPort())).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
@@ -55,7 +55,7 @@ public class Mina2InOutRouteTest extends BaseMina2Test {
}
});
- from("direct:in").to(String.format("mina2:tcp://localhost:%1$s?sync=true&lazySessionCreation=true", getPort())).to("mock:result");
+ from("direct:in").to(String.format("mina:tcp://localhost:%1$s?sync=true&lazySessionCreation=true", getPort())).to("mock:result");
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTextLineDelimiterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTextLineDelimiterTest.java
similarity index 87%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTextLineDelimiterTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTextLineDelimiterTest.java
index 9a2e11d..aa7f0b0 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTextLineDelimiterTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutRouteTextLineDelimiterTest.java
@@ -35,7 +35,7 @@ public class Mina2InOutRouteTextLineDelimiterTest extends BaseMina2Test {
// we should preserve headers
mock.setResultWaitTime(5000);
- Object out = template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true&textline=true&textlineDelimiter=MAC", getPort()), "Chad");
+ Object out = template.requestBody(String.format("mina:tcp://localhost:%1$s?sync=true&textline=true&textlineDelimiter=MAC", getPort()), "Chad");
assertMockEndpointsSatisfied();
assertEquals("Bye Chad", out);
@@ -46,7 +46,7 @@ public class Mina2InOutRouteTextLineDelimiterTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() throws Exception {
- from(String.format("mina2:tcp://localhost:%1$s?sync=true&textline=true&textlineDelimiter=MAC", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?sync=true&textline=true&textlineDelimiter=MAC", getPort())).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutWithForcedNoResponseTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutWithForcedNoResponseTest.java
similarity index 85%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutWithForcedNoResponseTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutWithForcedNoResponseTest.java
index d6f5f1e..3c14d1b 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2InOutWithForcedNoResponseTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2InOutWithForcedNoResponseTest.java
@@ -31,14 +31,14 @@ public class Mina2InOutWithForcedNoResponseTest extends BaseMina2Test {
@Test
public void testResponse() throws Exception {
- Object out = template.requestBody("mina2:tcp://localhost:" + port1 + "?sync=true", "Woodbine");
+ Object out = template.requestBody("mina:tcp://localhost:" + port1 + "?sync=true", "Woodbine");
assertEquals("Hello Chad", out);
}
@Test
public void testNoResponseDisconnectOnNoReplyFalse() throws Exception {
try {
- template.requestBody("mina2:tcp://localhost:" + port2 + "?sync=true&timeout=100", "London");
+ template.requestBody("mina:tcp://localhost:" + port2 + "?sync=true&timeout=100", "London");
Thread.sleep(1000);
fail("Should throw an exception");
} catch (RuntimeCamelException e) {
@@ -54,14 +54,14 @@ public class Mina2InOutWithForcedNoResponseTest extends BaseMina2Test {
port1 = getPort();
port2 = getNextPort();
- from("mina2:tcp://localhost:" + port1 + "?sync=true")
+ from("mina:tcp://localhost:" + port1 + "?sync=true")
.choice()
.when(body().isEqualTo("Woodbine"))
.transform(constant("Hello Chad"))
.otherwise()
.transform(constant(null));
- from("mina2:tcp://localhost:" + port2 + "?sync=true&disconnectOnNoReply=false&noReplyLogLevel=OFF").
+ from("mina:tcp://localhost:" + port2 + "?sync=true&disconnectOnNoReply=false&noReplyLogLevel=OFF").
choice()
.when(body().isEqualTo("Woodbine"))
.transform(constant("Hello Chad")).
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java
similarity index 87%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java
index 21adc6d..c795a17 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2MaxLineLengthTest.java
@@ -31,7 +31,7 @@ public class Mina2MaxLineLengthTest extends BaseMina2Test {
}
// START SNIPPET: e3
- String out = (String) template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true&textline=true&encoderMaxLineLength=5000&decoderMaxLineLength=5000", getPort()), request);
+ String out = (String) template.requestBody(String.format("mina:tcp://localhost:%1$s?sync=true&textline=true&encoderMaxLineLength=5000&decoderMaxLineLength=5000", getPort()), request);
assertEquals(request, out);
// END SNIPPET: e3
}
@@ -46,7 +46,7 @@ public class Mina2MaxLineLengthTest extends BaseMina2Test {
// lets setup a server on port %1$s
// we set the sync option so we will send a reply
// and we let the request-reply be processed in the MyServerProcessor
- from(String.format("mina2:tcp://localhost:%1$s?sync=true&textline=true&encoderMaxLineLength=5000&decoderMaxLineLength=5000", getPort())).process(new MyServerProcessor());
+ from(String.format("mina:tcp://localhost:%1$s?sync=true&textline=true&encoderMaxLineLength=5000&decoderMaxLineLength=5000", getPort())).process(new MyServerProcessor());
// END SNIPPET: e1
}
};
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2NoDefaultCodecTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoDefaultCodecTest.java
similarity index 92%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2NoDefaultCodecTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoDefaultCodecTest.java
index 998a279..5107b7e 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2NoDefaultCodecTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoDefaultCodecTest.java
@@ -35,8 +35,8 @@ public class Mina2NoDefaultCodecTest extends BaseMina2Test {
port1 = getPort();
port2 = getNextPort();
- final String uri1 = "mina2:tcp://localhost:" + port1 + "?allowDefaultCodec=false";
- final String uri2 = "mina2:tcp://localhost:" + port2;
+ final String uri1 = "mina:tcp://localhost:" + port1 + "?allowDefaultCodec=false";
+ final String uri2 = "mina:tcp://localhost:" + port2;
context.addRoutes(new RouteBuilder() {
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
similarity index 92%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
index 8b281b0..588bf84 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
@@ -45,7 +45,7 @@ public class Mina2NoResponseFromServerTest extends BaseMina2Test {
mock.expectedMessageCount(0);
try {
- template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true&codec=#myCodec", getPort()), "Hello World");
+ template.requestBody(String.format("mina:tcp://localhost:%1$s?sync=true&codec=#myCodec", getPort()), "Hello World");
fail("Should throw a CamelExchangeException");
} catch (RuntimeCamelException e) {
assertIsInstanceOf(CamelExchangeException.class, e.getCause());
@@ -59,7 +59,7 @@ public class Mina2NoResponseFromServerTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() throws Exception {
- from(String.format("mina2:tcp://localhost:%1$s?sync=true&codec=#myCodec", getPort())).transform(constant("Bye World")).to("mock:result");
+ from(String.format("mina:tcp://localhost:%1$s?sync=true&codec=#myCodec", getPort())).transform(constant("Bye World")).to("mock:result");
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
similarity index 93%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
index afd0e9e..086fe0a 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerAnotherConcurrentTest.java
@@ -80,9 +80,9 @@ public class Mina2ProducerAnotherConcurrentTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:start").to(String.format("mina2:tcp://localhost:%1$s?sync=true", getPort()));
+ from("direct:start").to(String.format("mina:tcp://localhost:%1$s?sync=true", getPort()));
- from(String.format("mina2:tcp://localhost:%1$s?sync=true", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?sync=true", getPort())).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
similarity index 94%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
index a394bbc..fda6a77 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerConcurrentTest.java
@@ -53,7 +53,7 @@ public class Mina2ProducerConcurrentTest extends BaseMina2Test {
final int index = i;
Future<String> out = executor.submit(new Callable<String>() {
public String call() throws Exception {
- return template.requestBody(String.format("mina2:tcp://localhost:%1$s?sync=true", getPort()), index, String.class);
+ return template.requestBody(String.format("mina:tcp://localhost:%1$s?sync=true", getPort()), index, String.class);
}
});
responses.put(index, out);
@@ -78,7 +78,7 @@ public class Mina2ProducerConcurrentTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() throws Exception {
- from(String.format("mina2:tcp://localhost:%1$s?sync=true", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?sync=true", getPort())).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownMockTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownMockTest.java
similarity index 93%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownMockTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownMockTest.java
index 878a9d5..dda503b 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownMockTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownMockTest.java
@@ -43,7 +43,7 @@ public class Mina2ProducerShutdownMockTest extends BaseMina2Test {
SocketConnector mockConnector = mock(SocketConnector.class);
// normal camel code to get a producer
- Endpoint endpoint = context.getEndpoint(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=false", getPort()));
+ Endpoint endpoint = context.getEndpoint(String.format("mina:tcp://localhost:%1$s?textline=true&sync=false", getPort()));
Exchange exchange = endpoint.createExchange();
Producer producer = endpoint.createProducer();
producer.start();
@@ -75,7 +75,7 @@ public class Mina2ProducerShutdownMockTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=false", getPort())).to("mock:result");
+ from(String.format("mina:tcp://localhost:%1$s?textline=true&sync=false", getPort())).to("mock:result");
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownTest.java
similarity index 97%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownTest.java
index 868d2f9..d98de15 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ProducerShutdownTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
@Ignore
public class Mina2ProducerShutdownTest extends TestSupport {
- private static final String URI = "mina2:tcp://localhost:6321?textline=true&sync=false";
+ private static final String URI = "mina:tcp://localhost:6321?textline=true&sync=false";
private long start;
private CamelContext context;
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java
similarity index 100%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ReverseProtocolHandler.java
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ReverserServer.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ReverserServer.java
similarity index 100%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2ReverserServer.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2ReverserServer.java
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SendToProcessorTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SendToProcessorTest.java
similarity index 88%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SendToProcessorTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SendToProcessorTest.java
index 4552639..18331ac 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SendToProcessorTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SendToProcessorTest.java
@@ -27,7 +27,7 @@ public class Mina2SendToProcessorTest extends BaseMina2Test {
@Override
public void configure() throws Exception {
- from("direct:start").to(String.format("mina2:tcp://localhost:%1$s?sync=false&lazySessionCreation=false", getPort()));
+ from("direct:start").to(String.format("mina:tcp://localhost:%1$s?sync=false&lazySessionCreation=false", getPort()));
}
});
@@ -45,7 +45,7 @@ public class Mina2SendToProcessorTest extends BaseMina2Test {
@Override
public void configure() throws Exception {
- from("direct:start").to(String.format("mina2:tcp://localhost:%1$s?sync=false", getPort()));
+ from("direct:start").to(String.format("mina:tcp://localhost:%1$s?sync=false", getPort()));
}
});
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
similarity index 95%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
index b6c1c70..bae8062 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointTest.java
@@ -38,7 +38,7 @@ public class Mina2SpringMinaEndpointTest extends CamelSpringTestSupport {
// checking the endpoint uri
Mina2Endpoint endpoint = applicationContext.getBean("myMinaEndpoint", Mina2Endpoint.class);
Integer port = applicationContext.getBean("port", Integer.class);
- assertEquals("mina2:tcp:localhost:" + port, endpoint.getEndpointUri());
+ assertEquals("mina:tcp:localhost:" + port, endpoint.getEndpointUri());
}
@Override
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointUDPTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointUDPTest.java
similarity index 100%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointUDPTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMinaEndpointUDPTest.java
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java
similarity index 100%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SpringMultipleUDPTest.java
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
similarity index 84%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
index 199c826..e16b121 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersTcpTest.java
@@ -28,7 +28,7 @@ public class Mina2SslContextParametersTcpTest extends BaseMina2Test {
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
- template.sendBodyAndHeader("mina2:tcp://localhost:" + getPort() + "?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters", body, "cheese", 123);
+ template.sendBodyAndHeader("mina:tcp://localhost:" + getPort() + "?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters", body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -43,7 +43,7 @@ public class Mina2SslContextParametersTcpTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- fromF("mina2:tcp://localhost:%s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters", getPort())
+ fromF("mina:tcp://localhost:%s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters", getPort())
.to("log:before?showAll=true")
.to("mock:result").to("log:after?showAll=true");
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
similarity index 94%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
index 16d6bb6..ae45b9f 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersUdpTest.java
@@ -68,7 +68,7 @@ public class Mina2SslContextParametersUdpTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from("mina2:udp://127.0.0.1:" + getPort() + "?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters").to("mock:result");
+ from("mina:udp://127.0.0.1:" + getPort() + "?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters").to("mock:result");
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
similarity index 84%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
index 3881976..8720588 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslContextParametersVmTest.java
@@ -28,7 +28,7 @@ public class Mina2SslContextParametersVmTest extends BaseMina2Test {
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
- template.sendBodyAndHeader("mina2:vm://localhost:" + getPort() + "?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters", body, "cheese", 123);
+ template.sendBodyAndHeader("mina:vm://localhost:" + getPort() + "?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters", body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -43,7 +43,7 @@ public class Mina2SslContextParametersVmTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- fromF("mina2:vm://localhost:%s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters", getPort())
+ fromF("mina:vm://localhost:%s?sync=false&minaLogger=true&sslContextParameters=#sslContextParameters", getPort())
.to("log:before?showAll=true").to("mock:result")
.to("log:after?showAll=true");
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
similarity index 86%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
index 4f87976..80188de 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
@@ -28,7 +28,7 @@ public class Mina2SslGlobalContextParametersTcpTest extends BaseMina2Test {
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
context.setSSLContextParameters(createSslContextParameters());
- ((SSLContextParametersAware) context.getComponent("mina2")).setUseGlobalSslContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("mina")).setUseGlobalSslContextParameters(true);
return context;
}
@@ -38,7 +38,7 @@ public class Mina2SslGlobalContextParametersTcpTest extends BaseMina2Test {
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
- template.sendBodyAndHeader("mina2:tcp://localhost:" + getPort() + "?sync=false&minaLogger=true", body, "cheese", 123);
+ template.sendBodyAndHeader("mina:tcp://localhost:" + getPort() + "?sync=false&minaLogger=true", body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -53,7 +53,7 @@ public class Mina2SslGlobalContextParametersTcpTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- fromF("mina2:tcp://localhost:%s?sync=false&minaLogger=true", getPort())
+ fromF("mina:tcp://localhost:%s?sync=false&minaLogger=true", getPort())
.to("log:before?showAll=true")
.to("mock:result").to("log:after?showAll=true");
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
similarity index 97%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
index f0d970d..02bb649 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpLineDelimiterUsingPlainSocketTest.java
@@ -122,7 +122,7 @@ public class Mina2TcpLineDelimiterUsingPlainSocketTest extends BaseMina2Test {
// use no delay for fast unit testing
errorHandler(defaultErrorHandler().maximumRedeliveries(2));
- from(String.format("mina2:tcp://localhost:%1$s?textline=true&minaLogger=true&textlineDelimiter=MAC&sync=true", getPort()))
+ from(String.format("mina:tcp://localhost:%1$s?textline=true&minaLogger=true&textlineDelimiter=MAC&sync=true", getPort()))
.process(new Processor() {
public void process(Exchange e) {
String in = e.getIn().getBody(String.class);
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTest.java
similarity index 78%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTest.java
index 1f7a8a6..f499894 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTest.java
@@ -28,7 +28,7 @@ public class Mina2TcpTest extends BaseMina2Test {
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
- template.sendBodyAndHeader(String.format("mina2:tcp://localhost:%1$s?sync=false&minaLogger=true", getPort()), body, "cheese", 123);
+ template.sendBodyAndHeader(String.format("mina:tcp://localhost:%1$s?sync=false&minaLogger=true", getPort()), body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -39,7 +39,7 @@ public class Mina2TcpTest extends BaseMina2Test {
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
- template.sendBodyAndHeader(String.format("mina2:tcp://localhost:%1$s?sync=false&minaLogger=true", getPort()), body, "cheese", 123);
+ template.sendBodyAndHeader(String.format("mina:tcp://localhost:%1$s?sync=false&minaLogger=true", getPort()), body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -49,7 +49,7 @@ public class Mina2TcpTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:tcp://0.0.0.0:%1$s?sync=false&minaLogger=true", getPort())).to("log:before?showAll=true").to("mock:result").to("log:after?showAll=true");
+ from(String.format("mina:tcp://0.0.0.0:%1$s?sync=false&minaLogger=true", getPort())).to("log:before?showAll=true").to("mock:result").to("log:after?showAll=true");
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineDelimiterTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineDelimiterTest.java
similarity index 84%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineDelimiterTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineDelimiterTest.java
index d6c25ba..49c7cb0 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineDelimiterTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineDelimiterTest.java
@@ -28,7 +28,7 @@ public class Mina2TcpTextlineDelimiterTest extends BaseMina2Test {
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
- template.sendBodyAndHeader(String.format("mina2:tcp://localhost:%1$s?sync=false&textline=true&textlineDelimiter=UNIX", getPort()), body, "cheese", 123);
+ template.sendBodyAndHeader(String.format("mina:tcp://localhost:%1$s?sync=false&textline=true&textlineDelimiter=UNIX", getPort()), body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -38,7 +38,7 @@ public class Mina2TcpTextlineDelimiterTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:tcp://localhost:%1$s?sync=false&textline=true&textlineDelimiter=UNIX", getPort()))
+ from(String.format("mina:tcp://localhost:%1$s?sync=false&textline=true&textlineDelimiter=UNIX", getPort()))
.to("log:before?showAll=true")
.to("mock:result")
.to("log:after?showAll=true");
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java
similarity index 89%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java
index edc3413..3ed00dc 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2VMTextlineProtocolTest extends BaseMina2Test {
+public class Mina2TcpTextlineProtocolTest extends BaseMina2Test {
@Test
public void testMinaRoute() throws Exception {
@@ -28,7 +28,7 @@ public class Mina2VMTextlineProtocolTest extends BaseMina2Test {
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
- template.sendBodyAndHeader(String.format("mina2:vm://localhost:%1$s?textline=true&sync=false", getPort()), body, "cheese", 123);
+ template.sendBodyAndHeader(String.format("mina:tcp://localhost:%1$s?textline=true&sync=false", getPort()), body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -36,12 +36,13 @@ public class Mina2VMTextlineProtocolTest extends BaseMina2Test {
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
+
public void configure() {
- from(String.format("mina2:vm://localhost:%1$s?textline=true&sync=false", getPort()))
+ from(String.format("mina:tcp://localhost:%1$s?textline=true&sync=false", getPort()))
.to("log:before?showAll=true")
.to("mock:result")
.to("log:after?showAll=true");
}
};
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java
similarity index 95%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java
index 9d31967..4ddae5d 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutTest.java
@@ -37,7 +37,7 @@ public class Mina2TcpWithInOutTest extends BaseMina2Test {
@Test
public void testMinaRouteWithInOut() throws Exception {
latch = new CountDownLatch(1);
- uri = String.format("mina2:tcp://localhost:%1$s?textline=true", getPort());
+ uri = String.format("mina:tcp://localhost:%1$s?textline=true", getPort());
Mina2ReverserServer server = new Mina2ReverserServer(getPort());
server.start();
@@ -81,7 +81,7 @@ public class Mina2TcpWithInOutTest extends BaseMina2Test {
@Test
public void testMinaRouteWithInOutLazy() throws Exception {
latch = new CountDownLatch(1);
- uri = String.format("mina2:tcp://localhost:%1$s?textline=true&lazySessionCreation=true", getPort());
+ uri = String.format("mina:tcp://localhost:%1$s?textline=true&lazySessionCreation=true", getPort());
// The server is activated after Camel to check if the lazyness is working
Mina2ReverserServer server = new Mina2ReverserServer(getPort());
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
similarity index 98%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
index dd2fe58..667b6f3 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithInOutUsingPlainSocketTest.java
@@ -129,7 +129,7 @@ public class Mina2TcpWithInOutUsingPlainSocketTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=true", getPort()))
+ from(String.format("mina:tcp://localhost:%1$s?textline=true&sync=true", getPort()))
.process(new Processor() {
public void process(Exchange e) {
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithIoOutProcessorExceptionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithIoOutProcessorExceptionTest.java
similarity index 91%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithIoOutProcessorExceptionTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithIoOutProcessorExceptionTest.java
index 8dc5e58..764a8dc 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithIoOutProcessorExceptionTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TcpWithIoOutProcessorExceptionTest.java
@@ -29,7 +29,7 @@ public class Mina2TcpWithIoOutProcessorExceptionTest extends BaseMina2Test {
@Test
public void testExceptionThrownInProcessor() {
String body = "Hello World";
- Object result = template.requestBody(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=true", getPort()), body);
+ Object result = template.requestBody(String.format("mina:tcp://localhost:%1$s?textline=true&sync=true", getPort()), body);
// The exception should be passed to the client
assertNotNull("the result should not be null", result);
assertEquals("result is IllegalArgumentException", result, "java.lang.IllegalArgumentException: Forced exception");
@@ -43,7 +43,7 @@ public class Mina2TcpWithIoOutProcessorExceptionTest extends BaseMina2Test {
// use no delay for fast unit testing
errorHandler(defaultErrorHandler().maximumRedeliveries(2));
- from(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=true", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?textline=true&sync=true", getPort())).process(new Processor() {
public void process(Exchange e) {
assertEquals("Hello World", e.getIn().getBody(String.class));
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java
similarity index 95%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java
index 2fd542e..019bbe2 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2TransferExchangeOptionTest.java
@@ -49,7 +49,7 @@ public class Mina2TransferExchangeOptionTest extends BaseMina2Test {
}
private Exchange sendExchange(boolean setException) throws Exception {
- Endpoint endpoint = context.getEndpoint(String.format("mina2:tcp://localhost:%1$s?sync=true&encoding=UTF-8&transferExchange=true", getPort()));
+ Endpoint endpoint = context.getEndpoint(String.format("mina:tcp://localhost:%1$s?sync=true&encoding=UTF-8&transferExchange=true", getPort()));
Producer producer = endpoint.createProducer();
Exchange exchange = endpoint.createExchange();
//Exchange exchange = endpoint.createExchange();
@@ -96,7 +96,7 @@ public class Mina2TransferExchangeOptionTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:tcp://localhost:%1$s?sync=true&encoding=UTF-8&transferExchange=true", getPort())).process(new Processor() {
+ from(String.format("mina:tcp://localhost:%1$s?sync=true&encoding=UTF-8&transferExchange=true", getPort())).process(new Processor() {
public void process(Exchange e) throws InterruptedException {
LOG.debug("Enter Processor...");
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
similarity index 95%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
index 82e5ac9..3bd8130 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpConcurrentTest.java
@@ -63,7 +63,7 @@ public class Mina2UdpConcurrentTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
// we use un-ordered to allow processing the UDP messages in any order from same client
- from("mina2:udp://127.0.0.1:" + getPort() + "?sync=false&minaLogger=true&orderedThreadPoolExecutor=false")
+ from("mina:udp://127.0.0.1:" + getPort() + "?sync=false&minaLogger=true&orderedThreadPoolExecutor=false")
.delay(1000)
.to("mock:result");
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
similarity index 100%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpNoCamelTest.java
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
similarity index 95%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
index 9bb4f5b..95dab06 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpTest.java
@@ -62,7 +62,7 @@ public class Mina2UdpTest extends BaseMina2Test {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("mina2:udp://127.0.0.1:" + getPort() + "?sync=false&minaLogger=true").to("mock:result");
+ from("mina:udp://127.0.0.1:" + getPort() + "?sync=false&minaLogger=true").to("mock:result");
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java
similarity index 89%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java
index 8c110ff..03116b7 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpUsingTemplateTest.java
@@ -40,7 +40,7 @@ public class Mina2UdpUsingTemplateTest extends BaseMina2Test {
protected void sendUdpMessages() throws Exception {
for (int i = 0; i < messageCount; i++) {
- template.sendBody(String.format("mina2:udp://127.0.0.1:%1$s?sync=false", getPort()), "Hello Message: " + i);
+ template.sendBody(String.format("mina:udp://127.0.0.1:%1$s?sync=false", getPort()), "Hello Message: " + i);
}
}
@@ -50,7 +50,7 @@ public class Mina2UdpUsingTemplateTest extends BaseMina2Test {
endpoint.expectedMessageCount(1);
byte[] in = "Hello from bytes".getBytes();
- template.sendBody(String.format("mina2:udp://127.0.0.1:%1$s?sync=false", getPort()), in);
+ template.sendBody(String.format("mina:udp://127.0.0.1:%1$s?sync=false", getPort()), in);
assertMockEndpointsSatisfied();
List<Exchange> list = endpoint.getReceivedExchanges();
@@ -69,7 +69,7 @@ public class Mina2UdpUsingTemplateTest extends BaseMina2Test {
String toSend = "ef3e00559f5faf0262f5ff0962d9008daa91001cd46b0fa9330ef0f3030fff250e46f72444d1cc501678c351e04b8004c"
+ "4000002080000fe850bbe011030000008031b031bfe9251305441593830354720020800050440ff";
byte[] in = fromHexString(toSend);
- template.sendBody(String.format("mina2:udp://127.0.0.1:%1$s?sync=false", getPort()), in);
+ template.sendBody(String.format("mina:udp://127.0.0.1:%1$s?sync=false", getPort()), in);
assertMockEndpointsSatisfied();
List<Exchange> list = endpoint.getReceivedExchanges();
@@ -103,7 +103,7 @@ public class Mina2UdpUsingTemplateTest extends BaseMina2Test {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:udp://127.0.0.1:%1$s?sync=false&minaLogger=true", getPort()))
+ from(String.format("mina:udp://127.0.0.1:%1$s?sync=false&minaLogger=true", getPort()))
.to("mock:result");
}
};
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
similarity index 96%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
index e9c7ae6..3e90b1d 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2UdpWithInOutUsingPlainSocketTest.java
@@ -68,7 +68,7 @@ public class Mina2UdpWithInOutUsingPlainSocketTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:udp://127.0.0.1:%1$s?sync=true", getPort())).process(new Processor() {
+ from(String.format("mina:udp://127.0.0.1:%1$s?sync=true", getPort())).process(new Processor() {
public void process(Exchange exchange) throws Exception {
String s = exchange.getIn().getBody(String.class);
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
similarity index 89%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
index 9ce2281..96d32fb 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
@@ -44,7 +44,7 @@ public class Mina2VMCustomCodecTest extends BaseMina2Test {
mock.expectedMessageCount(1);
mock.expectedBodiesReceived("Bye World");
- Object out = template.requestBody(String.format("mina2:vm://localhost:%1$s?sync=true&codec=#myCodec", getPort()), "Hello World");
+ Object out = template.requestBody(String.format("mina:vm://localhost:%1$s?sync=true&codec=#myCodec", getPort()), "Hello World");
assertEquals("Bye World", out);
mock.assertIsSatisfied();
@@ -52,7 +52,7 @@ public class Mina2VMCustomCodecTest extends BaseMina2Test {
@Test
public void testTCPEncodeUTF8InputIsString() throws Exception {
- final String myUri = String.format("mina2:vm://localhost:%1$s?encoding=UTF-8&sync=false", getNextPort());
+ final String myUri = String.format("mina:vm://localhost:%1$s?encoding=UTF-8&sync=false", getNextPort());
context.addRoutes(new RouteBuilder() {
public void configure() {
from(myUri).to("mock:result");
@@ -74,7 +74,7 @@ public class Mina2VMCustomCodecTest extends BaseMina2Test {
@Test
public void testBadConfiguration() throws Exception {
try {
- template.sendBody(String.format("mina2:vm://localhost:%1$s?sync=true&codec=#XXX", getPort()), "Hello World");
+ template.sendBody(String.format("mina:vm://localhost:%1$s?sync=true&codec=#XXX", getPort()), "Hello World");
fail("Should have thrown a ResolveEndpointFailedException");
} catch (ResolveEndpointFailedException e) {
// ok
@@ -86,7 +86,7 @@ public class Mina2VMCustomCodecTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() throws Exception {
- from(String.format("mina2:vm://localhost:%1$s?sync=true&codec=#myCodec", getPort())).transform(constant("Bye World")).to("mock:result");
+ from(String.format("mina:vm://localhost:%1$s?sync=true&codec=#myCodec", getPort())).transform(constant("Bye World")).to("mock:result");
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java
similarity index 84%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java
index f3403e6..d60428c 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2FileTcpTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMFileTcpTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2FileTcpTest extends BaseMina2Test {
+public class Mina2VMFileTcpTest extends BaseMina2Test {
@Test
public void testMinaRoute() throws Exception {
@@ -37,10 +37,10 @@ public class Mina2FileTcpTest extends BaseMina2Test {
public void configure() {
// lets setup a server
- from(String.format("mina2:tcp://localhost:%1$s?sync=false&textline=true", getPort())).to("mock:results");
+ from(String.format("mina:vm://localhost:%1$s?sync=false&textline=true", getPort())).to("mock:results");
from("file:src/test/data?noop=true&fileName=message1.txt").
- to(String.format("mina2:tcp://localhost:%1$s?sync=false&textline=true", getPort()));
+ to(String.format("mina:vm://localhost:%1$s?sync=false&textline=true", getPort()));
}
};
}
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java
similarity index 83%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java
index 0736473..5ba7d47 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2TcpTextlineProtocolTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTextlineProtocolTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
-public class Mina2TcpTextlineProtocolTest extends BaseMina2Test {
+public class Mina2VMTextlineProtocolTest extends BaseMina2Test {
@Test
public void testMinaRoute() throws Exception {
@@ -28,7 +28,7 @@ public class Mina2TcpTextlineProtocolTest extends BaseMina2Test {
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
- template.sendBodyAndHeader(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=false", getPort()), body, "cheese", 123);
+ template.sendBodyAndHeader(String.format("mina:vm://localhost:%1$s?textline=true&sync=false", getPort()), body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -36,13 +36,12 @@ public class Mina2TcpTextlineProtocolTest extends BaseMina2Test {
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
-
public void configure() {
- from(String.format("mina2:tcp://localhost:%1$s?textline=true&sync=false", getPort()))
+ from(String.format("mina:vm://localhost:%1$s?textline=true&sync=false", getPort()))
.to("log:before?showAll=true")
.to("mock:result")
.to("log:after?showAll=true");
}
};
}
-}
+}
\ No newline at end of file
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java
similarity index 95%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java
index 3045704..a339204 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VMTransferExchangeOptionTest.java
@@ -45,7 +45,7 @@ public class Mina2VMTransferExchangeOptionTest extends BaseMina2Test {
}
private Exchange sendExchange(boolean setException) throws Exception {
- Endpoint endpoint = context.getEndpoint(String.format("mina2:vm://localhost:%1$s?sync=true&encoding=UTF-8&transferExchange=true", getPort()));
+ Endpoint endpoint = context.getEndpoint(String.format("mina:vm://localhost:%1$s?sync=true&encoding=UTF-8&transferExchange=true", getPort()));
Exchange exchange = endpoint.createExchange();
Message message = exchange.getIn();
@@ -91,7 +91,7 @@ public class Mina2VMTransferExchangeOptionTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:vm://localhost:%1$s?sync=true&encoding=UTF-8&transferExchange=true", getPort())).process(new Processor() {
+ from(String.format("mina:vm://localhost:%1$s?sync=true&encoding=UTF-8&transferExchange=true", getPort())).process(new Processor() {
public void process(Exchange e) throws InterruptedException {
assertNotNull(e.getIn().getBody());
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VmTest.java b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VmTest.java
similarity index 81%
rename from components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VmTest.java
rename to components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VmTest.java
index a4ea1de..129a7cd 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VmTest.java
+++ b/components/camel-mina/src/test/java/org/apache/camel/component/mina2/Mina2VmTest.java
@@ -28,7 +28,7 @@ public class Mina2VmTest extends BaseMina2Test {
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
- template.sendBodyAndHeader(String.format("mina2:vm://localhost:%1$s?sync=false&minaLogger=true", getPort()), body, "cheese", 123);
+ template.sendBodyAndHeader(String.format("mina:vm://localhost:%1$s?sync=false&minaLogger=true", getPort()), body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -38,7 +38,7 @@ public class Mina2VmTest extends BaseMina2Test {
return new RouteBuilder() {
public void configure() {
- from(String.format("mina2:vm://localhost:%1$s?sync=false&minaLogger=true", getPort())).to("log:before?showAll=true").to("mock:result").to("log:after?showAll=true");
+ from(String.format("mina:vm://localhost:%1$s?sync=false&minaLogger=true", getPort())).to("log:before?showAll=true").to("mock:result").to("log:after?showAll=true");
}
};
}
diff --git a/components/camel-mina2/src/test/resources/jndi-example.properties b/components/camel-mina/src/test/resources/jndi-example.properties
similarity index 100%
rename from components/camel-mina2/src/test/resources/jndi-example.properties
rename to components/camel-mina/src/test/resources/jndi-example.properties
diff --git a/components/camel-mina2/src/test/resources/jsse/localhost.ks b/components/camel-mina/src/test/resources/jsse/localhost.ks
similarity index 100%
rename from components/camel-mina2/src/test/resources/jsse/localhost.ks
rename to components/camel-mina/src/test/resources/jsse/localhost.ks
diff --git a/components/camel-mina2/src/test/resources/log4j2.properties b/components/camel-mina/src/test/resources/log4j2.properties
similarity index 96%
rename from components/camel-mina2/src/test/resources/log4j2.properties
rename to components/camel-mina/src/test/resources/log4j2.properties
index 44f0478..f81ac82 100644
--- a/components/camel-mina2/src/test/resources/log4j2.properties
+++ b/components/camel-mina/src/test/resources/log4j2.properties
@@ -17,7 +17,7 @@
appender.file.type = File
appender.file.name = file
-appender.file.fileName = target/camel-mina2-test.log
+appender.file.fileName = target/camel-mina-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-mina2/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointTest-context.xml b/components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointTest-context.xml
similarity index 100%
rename from components/camel-mina2/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointTest-context.xml
rename to components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointTest-context.xml
diff --git a/components/camel-mina2/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointUDPTest-context.xml b/components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointUDPTest-context.xml
similarity index 100%
rename from components/camel-mina2/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointUDPTest-context.xml
rename to components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMinaEndpointUDPTest-context.xml
diff --git a/components/camel-mina2/src/test/resources/org/apache/camel/component/mina2/SpringMultipleUDPTest-context.xml b/components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMultipleUDPTest-context.xml
similarity index 100%
rename from components/camel-mina2/src/test/resources/org/apache/camel/component/mina2/SpringMultipleUDPTest-context.xml
rename to components/camel-mina/src/test/resources/org/apache/camel/component/mina2/SpringMultipleUDPTest-context.xml
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Mina2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Mina2EndpointBuilderFactory.java
index 1cccf41..b0b2bc2 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Mina2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/Mina2EndpointBuilderFactory.java
@@ -35,7 +35,7 @@ public interface Mina2EndpointBuilderFactory {
/**
- * Builder for endpoint consumers for the Mina2 component.
+ * Builder for endpoint consumers for the Mina component.
*/
public interface Mina2EndpointConsumerBuilder
extends
@@ -479,7 +479,7 @@ public interface Mina2EndpointBuilderFactory {
}
/**
- * Advanced builder for endpoint consumers for the Mina2 component.
+ * Advanced builder for endpoint consumers for the Mina component.
*/
public interface AdvancedMina2EndpointConsumerBuilder
extends
@@ -736,7 +736,7 @@ public interface Mina2EndpointBuilderFactory {
}
/**
- * Builder for endpoint producers for the Mina2 component.
+ * Builder for endpoint producers for the Mina component.
*/
public interface Mina2EndpointProducerBuilder
extends
@@ -1160,7 +1160,7 @@ public interface Mina2EndpointBuilderFactory {
}
/**
- * Advanced builder for endpoint producers for the Mina2 component.
+ * Advanced builder for endpoint producers for the Mina component.
*/
public interface AdvancedMina2EndpointProducerBuilder
extends
@@ -1359,7 +1359,7 @@ public interface Mina2EndpointBuilderFactory {
}
/**
- * Builder for endpoint for the Mina2 component.
+ * Builder for endpoint for the Mina component.
*/
public interface Mina2EndpointBuilder
extends
@@ -1740,7 +1740,7 @@ public interface Mina2EndpointBuilderFactory {
}
/**
- * Advanced builder for endpoint for the Mina2 component.
+ * Advanced builder for endpoint for the Mina component.
*/
public interface AdvancedMina2EndpointBuilder
extends
@@ -1896,13 +1896,13 @@ public interface Mina2EndpointBuilderFactory {
MAC;
}
/**
- * Mina2 (camel-mina2)
+ * Mina (camel-mina)
* Socket level networking using TCP or UDP with the Apache Mina 2.x
* library.
*
* Category: networking,tcp,udp
* Available as of version: 2.10
- * Maven coordinates: org.apache.camel:camel-mina2
+ * Maven coordinates: org.apache.camel:camel-mina
*
* Syntax: <code>mina:protocol:host:port</code>
*
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mina2-starter/pom.xml
deleted file mode 100644
index 571cdb0..0000000
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components-starter</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-mina2-starter</artifactId>
- <packaging>jar</packaging>
- <name>Spring-Boot Starter :: Camel :: MINA-2</name>
- <description>Spring-Boot Starter for Camel MINA 2.x support</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java
deleted file mode 100644
index dfcd8ec..0000000
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.mina2.springboot;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.mina2.Mina2Component;
-import org.apache.camel.spi.ComponentCustomizer;
-import org.apache.camel.spi.HasId;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ComponentConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.apache.camel.support.IntrospectionSupport;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@Configuration
-@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
- Mina2ComponentAutoConfiguration.GroupConditions.class})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,
- Mina2ComponentConfiguration.class})
-public class Mina2ComponentAutoConfiguration {
-
- private static final Logger LOGGER = LoggerFactory
- .getLogger(Mina2ComponentAutoConfiguration.class);
- @Autowired
- private ApplicationContext applicationContext;
- @Autowired
- private CamelContext camelContext;
- @Autowired
- private Mina2ComponentConfiguration configuration;
- @Autowired(required = false)
- private List<ComponentCustomizer<Mina2Component>> customizers;
-
- static class GroupConditions extends GroupCondition {
- public GroupConditions() {
- super("camel.component", "camel.component.mina2");
- }
- }
-
- @Lazy
- @Bean({"mina-component", "mina2-component"})
- @ConditionalOnMissingBean(Mina2Component.class)
- public Mina2Component configureMina2Component() throws Exception {
- Mina2Component component = new Mina2Component();
- component.setCamelContext(camelContext);
- Map<String, Object> parameters = new HashMap<>();
- IntrospectionSupport.getProperties(configuration, parameters, null,
- false);
- for (Map.Entry<String, Object> entry : parameters.entrySet()) {
- Object value = entry.getValue();
- Class<?> paramClass = value.getClass();
- if (paramClass.getName().endsWith("NestedConfiguration")) {
- Class nestedClass = null;
- try {
- nestedClass = (Class) paramClass.getDeclaredField(
- "CAMEL_NESTED_CLASS").get(null);
- HashMap<String, Object> nestedParameters = new HashMap<>();
- IntrospectionSupport.getProperties(value, nestedParameters,
- null, false);
- Object nestedProperty = nestedClass.newInstance();
- CamelPropertiesHelper.setCamelProperties(camelContext,
- nestedProperty, nestedParameters, false);
- entry.setValue(nestedProperty);
- } catch (NoSuchFieldException e) {
- }
- }
- }
- CamelPropertiesHelper.setCamelProperties(camelContext, component,
- parameters, false);
- if (ObjectHelper.isNotEmpty(customizers)) {
- for (ComponentCustomizer<Mina2Component> customizer : customizers) {
- boolean useCustomizer = (customizer instanceof HasId)
- ? HierarchicalPropertiesEvaluator.evaluate(
- applicationContext.getEnvironment(),
- "camel.component.customizer",
- "camel.component.mina2.customizer",
- ((HasId) customizer).getId())
- : HierarchicalPropertiesEvaluator.evaluate(
- applicationContext.getEnvironment(),
- "camel.component.customizer",
- "camel.component.mina2.customizer");
- if (useCustomizer) {
- LOGGER.debug("Configure component {}, with customizer {}",
- component, customizer);
- customizer.customize(component);
- }
- }
- }
- return component;
- }
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
deleted file mode 100644
index 02cf37e..0000000
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.mina2.springboot;
-
-import java.util.List;
-import javax.annotation.Generated;
-import org.apache.camel.LoggingLevel;
-import org.apache.camel.component.mina2.Mina2TextLineDelimiter;
-import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.apache.camel.support.jsse.SSLContextParameters;
-import org.apache.mina.filter.codec.ProtocolCodecFactory;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Socket level networking using TCP or UDP with the Apache Mina 2.x library.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.mina2")
-public class Mina2ComponentConfiguration
- extends
- ComponentConfigurationPropertiesCommon {
-
- /**
- * Whether to enable auto configuration of the mina2 component. This is
- * enabled by default.
- */
- private Boolean enabled;
- /**
- * To use the shared mina configuration.
- */
- private Mina2ConfigurationNestedConfiguration configuration;
- /**
- * Enable usage of global SSL context parameters.
- */
- private Boolean useGlobalSslContextParameters = false;
- /**
- * Whether the component should resolve property placeholders on itself when
- * starting. Only properties which are of String type can use property
- * placeholders.
- */
- private Boolean resolvePropertyPlaceholders = true;
- /**
- * Whether the component should use basic property binding (Camel 2.x) or
- * the newer property binding with additional capabilities
- */
- private Boolean basicPropertyBinding = false;
-
- public Mina2ConfigurationNestedConfiguration getConfiguration() {
- return configuration;
- }
-
- public void setConfiguration(
- Mina2ConfigurationNestedConfiguration configuration) {
- this.configuration = configuration;
- }
-
- public Boolean getUseGlobalSslContextParameters() {
- return useGlobalSslContextParameters;
- }
-
- public void setUseGlobalSslContextParameters(
- Boolean useGlobalSslContextParameters) {
- this.useGlobalSslContextParameters = useGlobalSslContextParameters;
- }
-
- public Boolean getResolvePropertyPlaceholders() {
- return resolvePropertyPlaceholders;
- }
-
- public void setResolvePropertyPlaceholders(
- Boolean resolvePropertyPlaceholders) {
- this.resolvePropertyPlaceholders = resolvePropertyPlaceholders;
- }
-
- public Boolean getBasicPropertyBinding() {
- return basicPropertyBinding;
- }
-
- public void setBasicPropertyBinding(Boolean basicPropertyBinding) {
- this.basicPropertyBinding = basicPropertyBinding;
- }
-
- public static class Mina2ConfigurationNestedConfiguration {
- public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.mina2.Mina2Configuration.class;
- /**
- * Protocol to use
- */
- private String protocol;
- /**
- * Hostname to use. Use localhost or 0.0.0.0 for local server as
- * consumer. For producer use the hostname or ip address of the remote
- * server.
- */
- private String host;
- /**
- * Port number
- */
- private Integer port;
- /**
- * Setting to set endpoint as one-way or request-response.
- */
- private Boolean sync = true;
- /**
- * 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.
- */
- private Boolean textline = false;
- /**
- * Only used for TCP and if textline=true. Sets the text line delimiter
- * to use. If none provided, Camel will use DEFAULT. This delimiter is
- * used to mark the end of text.
- */
- private Mina2TextLineDelimiter textlineDelimiter;
- /**
- * To use a custom minda codec implementation.
- */
- private ProtocolCodecFactory codec;
- /**
- * You can configure the encoding (a charset name) to use for the TCP
- * textline codec and the UDP protocol. If not provided, Camel will use
- * the JVM default Charset
- */
- private String encoding;
- /**
- * Maximum amount of time it should take to send data to the MINA
- * session. Default is 10000 milliseconds.
- */
- private Long writeTimeout = 10000L;
- /**
- * You can configure the timeout that specifies how long to wait for a
- * response from a remote server. The timeout unit is in milliseconds,
- * so 60000 is 60 seconds.
- */
- private Long timeout = 30000L;
- /**
- * Sessions can be lazily created to avoid exceptions, if the remote
- * server is not up and running when the Camel producer is started.
- */
- private Boolean lazySessionCreation = true;
- /**
- * 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.
- */
- private Boolean transferExchange = false;
- /**
- * To set the textline protocol encoder max line length. By default the
- * default value of Mina itself is used which are Integer.MAX_VALUE.
- */
- private Integer encoderMaxLineLength = -1;
- /**
- * To set the textline protocol decoder max line length. By default the
- * default value of Mina itself is used which are 1024.
- */
- private Integer decoderMaxLineLength = 1024;
- /**
- * You can enable the Apache MINA logging filter. Apache MINA uses slf4j
- * logging at INFO level to log all input and output.
- */
- private Boolean minaLogger = false;
- /**
- * You can set a list of Mina IoFilters to use.
- */
- private List filters;
- /**
- * The mina component installs a default codec if both, codec is null
- * and textline is false. Setting allowDefaultCodec to false prevents
- * the mina component from installing a default codec as the first
- * element in the filter chain. This is useful in scenarios where
- * another filter must be the first in the filter chain, like the SSL
- * filter.
- */
- private Boolean allowDefaultCodec = true;
- /**
- * Whether or not to disconnect(close) from Mina session right after
- * use. Can be used for both consumer and producer.
- */
- private Boolean disconnect = false;
- /**
- * If sync is enabled then this option dictates MinaConsumer if it
- * should disconnect where there is no reply to send back.
- */
- private Boolean disconnectOnNoReply = true;
- /**
- * If sync is enabled this option dictates MinaConsumer which logging
- * level to use when logging a there is no reply to send back.
- */
- private LoggingLevel noReplyLogLevel = LoggingLevel.WARN;
- /**
- * To configure SSL security.
- */
- private SSLContextParameters sslContextParameters;
- /**
- * Whether to auto start SSL handshake.
- */
- private Boolean autoStartTls = true;
- /**
- * Number of worker threads in the worker pool for TCP and UDP
- */
- private Integer maximumPoolSize = 16;
- /**
- * Whether to use ordered thread pool, to ensure events are processed
- * orderly on the same channel.
- */
- private Boolean orderedThreadPoolExecutor = true;
- /**
- * Whether to create the InetAddress once and reuse. Setting this to
- * false allows to pickup DNS changes in the network.
- */
- private Boolean cachedAddress = true;
- /**
- * If the clientMode is true, mina consumer will connect the address as
- * a TCP client.
- */
- private Boolean clientMode = false;
-
- public String getProtocol() {
- return protocol;
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-
- public String getHost() {
- return host;
- }
-
- public void setHost(String host) {
- this.host = host;
- }
-
- public Integer getPort() {
- return port;
- }
-
- public void setPort(Integer port) {
- this.port = port;
- }
-
- public Boolean getSync() {
- return sync;
- }
-
- public void setSync(Boolean sync) {
- this.sync = sync;
- }
-
- public Boolean getTextline() {
- return textline;
- }
-
- public void setTextline(Boolean textline) {
- this.textline = textline;
- }
-
- public Mina2TextLineDelimiter getTextlineDelimiter() {
- return textlineDelimiter;
- }
-
- public void setTextlineDelimiter(
- Mina2TextLineDelimiter textlineDelimiter) {
- this.textlineDelimiter = textlineDelimiter;
- }
-
- public ProtocolCodecFactory getCodec() {
- return codec;
- }
-
- public void setCodec(ProtocolCodecFactory codec) {
- this.codec = codec;
- }
-
- public String getEncoding() {
- return encoding;
- }
-
- public void setEncoding(String encoding) {
- this.encoding = encoding;
- }
-
- public Long getWriteTimeout() {
- return writeTimeout;
- }
-
- public void setWriteTimeout(Long writeTimeout) {
- this.writeTimeout = writeTimeout;
- }
-
- public Long getTimeout() {
- return timeout;
- }
-
- public void setTimeout(Long timeout) {
- this.timeout = timeout;
- }
-
- public Boolean getLazySessionCreation() {
- return lazySessionCreation;
- }
-
- public void setLazySessionCreation(Boolean lazySessionCreation) {
- this.lazySessionCreation = lazySessionCreation;
- }
-
- public Boolean getTransferExchange() {
- return transferExchange;
- }
-
- public void setTransferExchange(Boolean transferExchange) {
- this.transferExchange = transferExchange;
- }
-
- public Integer getEncoderMaxLineLength() {
- return encoderMaxLineLength;
- }
-
- public void setEncoderMaxLineLength(Integer encoderMaxLineLength) {
- this.encoderMaxLineLength = encoderMaxLineLength;
- }
-
- public Integer getDecoderMaxLineLength() {
- return decoderMaxLineLength;
- }
-
- public void setDecoderMaxLineLength(Integer decoderMaxLineLength) {
- this.decoderMaxLineLength = decoderMaxLineLength;
- }
-
- public Boolean getMinaLogger() {
- return minaLogger;
- }
-
- public void setMinaLogger(Boolean minaLogger) {
- this.minaLogger = minaLogger;
- }
-
- public List getFilters() {
- return filters;
- }
-
- public void setFilters(List filters) {
- this.filters = filters;
- }
-
- public Boolean getAllowDefaultCodec() {
- return allowDefaultCodec;
- }
-
- public void setAllowDefaultCodec(Boolean allowDefaultCodec) {
- this.allowDefaultCodec = allowDefaultCodec;
- }
-
- public Boolean getDisconnect() {
- return disconnect;
- }
-
- public void setDisconnect(Boolean disconnect) {
- this.disconnect = disconnect;
- }
-
- public Boolean getDisconnectOnNoReply() {
- return disconnectOnNoReply;
- }
-
- public void setDisconnectOnNoReply(Boolean disconnectOnNoReply) {
- this.disconnectOnNoReply = disconnectOnNoReply;
- }
-
- public LoggingLevel getNoReplyLogLevel() {
- return noReplyLogLevel;
- }
-
- public void setNoReplyLogLevel(LoggingLevel noReplyLogLevel) {
- this.noReplyLogLevel = noReplyLogLevel;
- }
-
- public SSLContextParameters getSslContextParameters() {
- return sslContextParameters;
- }
-
- public void setSslContextParameters(
- SSLContextParameters sslContextParameters) {
- this.sslContextParameters = sslContextParameters;
- }
-
- public Boolean getAutoStartTls() {
- return autoStartTls;
- }
-
- public void setAutoStartTls(Boolean autoStartTls) {
- this.autoStartTls = autoStartTls;
- }
-
- public Integer getMaximumPoolSize() {
- return maximumPoolSize;
- }
-
- public void setMaximumPoolSize(Integer maximumPoolSize) {
- this.maximumPoolSize = maximumPoolSize;
- }
-
- public Boolean getOrderedThreadPoolExecutor() {
- return orderedThreadPoolExecutor;
- }
-
- public void setOrderedThreadPoolExecutor(
- Boolean orderedThreadPoolExecutor) {
- this.orderedThreadPoolExecutor = orderedThreadPoolExecutor;
- }
-
- public Boolean getCachedAddress() {
- return cachedAddress;
- }
-
- public void setCachedAddress(Boolean cachedAddress) {
- this.cachedAddress = cachedAddress;
- }
-
- public Boolean getClientMode() {
- return clientMode;
- }
-
- public void setClientMode(Boolean clientMode) {
- this.clientMode = clientMode;
- }
- }
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
deleted file mode 100644
index 7456aef..0000000
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "properties": [
- {
- "defaultValue": true,
- "name": "camel.component.mina2.enabled",
- "description": "Enable mina2 component",
- "type": "java.lang.Boolean"
- }
- ]
-}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 98b3be6..0000000
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,18 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.mina2.springboot.Mina2ComponentAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index 22ab315..0000000
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1,17 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-provides: camel-mina2
[camel] 07/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina - Updated references in docs and 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 d16290b896a0cb1526ada58eef90361460ccc5bb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 16:21:50 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Updated references in docs and regen
---
.../camel-mina/src/main/docs/mina-component.adoc | 68 +++++++--------
.../src/main/docs/netty4-component.adoc | 2 +-
.../src/main/docs/syslog-dataformat.adoc | 2 +-
components/readme.adoc | 4 +-
docs/components/modules/ROOT/nav.adoc | 2 +-
.../modules/ROOT/pages/hl7-dataformat.adoc | 12 +--
.../{mina2-component.adoc => mina-component.adoc} | 96 +++++++++++-----------
.../modules/ROOT/pages/netty4-component.adoc | 2 +-
.../modules/ROOT/pages/syslog-dataformat.adoc | 8 +-
docs/user-manual/modules/ROOT/pages/async.adoc | 8 +-
.../how-does-camel-compare-to-servicemix-eip.adoc | 2 +-
.../modules/ROOT/pages/faq/what-is-camel.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/security.adoc | 2 +-
.../modules/ROOT/pages/servicepool.adoc | 2 +-
.../ROOT/pages/walk-through-another-example.adoc | 2 +-
16 files changed, 108 insertions(+), 108 deletions(-)
diff --git a/components/camel-mina/src/main/docs/mina-component.adoc b/components/camel-mina/src/main/docs/mina-component.adoc
index 166f977..cca546d 100644
--- a/components/camel-mina/src/main/docs/mina-component.adoc
+++ b/components/camel-mina/src/main/docs/mina-component.adoc
@@ -64,7 +64,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Mina2 component supports 4 options, which are listed below.
+The Mina component supports 4 options, which are listed below.
@@ -86,10 +86,10 @@ The Mina2 component supports 4 options, which are listed below.
// endpoint options: START
-The Mina2 endpoint is configured using URI syntax:
+The Mina endpoint is configured using URI syntax:
----
-mina2:protocol:host:port
+mina:protocol:host:port
----
with the following path and query parameters:
@@ -152,7 +152,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
@@ -166,36 +166,36 @@ The component supports 30 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.component.mina2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
-| *camel.component.mina2.configuration.allow-default-codec* | The mina component installs a default codec if both, codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain, like the SSL filter. | true | Boolean
-| *camel.component.mina2.configuration.auto-start-tls* | Whether to auto start SSL handshake. | true | Boolean
-| *camel.component.mina2.configuration.cached-address* | Whether to create the InetAddress once and reuse. Setting this to false allows to pickup DNS changes in the network. | true | Boolean
-| *camel.component.mina2.configuration.client-mode* | If the clientMode is true, mina consumer will connect the address as a TCP client. | false | Boolean
-| *camel.component.mina2.configuration.codec* | To use a custom minda codec implementation. | | ProtocolCodecFactory
-| *camel.component.mina2.configuration.decoder-max-line-length* | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. | 1024 | Integer
-| *camel.component.mina2.configuration.disconnect* | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer. | false | Boolean
-| *camel.component.mina2.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. | true | Boolean
-| *camel.component.mina2.configuration.encoder-max-line-length* | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE. | -1 | Integer
-| *camel.component.mina2.configuration.encoding* | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset | | String
-| *camel.component.mina2.configuration.filters* | You can set a list of Mina IoFilters to use. | | List
-| *camel.component.mina2.configuration.host* | Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server. | | String
-| *camel.component.mina2.configuration.lazy-session-creation* | Sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. | true | Boolean
-| *camel.component.mina2.configuration.maximum-pool-size* | Number of worker threads in the worker pool for TCP and UDP | 16 | Integer
-| *camel.component.mina2.configuration.mina-logger* | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. | false | Boolean
-| *camel.component.mina2.configuration.no-reply-log-level* | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel
-| *camel.component.mina2.configuration.ordered-thread-pool-executor* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean
-| *camel.component.mina2.configuration.port* | Port number | | Integer
-| *camel.component.mina2.configuration.protocol* | Protocol to use | | String
-| *camel.component.mina2.configuration.ssl-context-parameters* | To configure SSL security. | | SSLContextParameters
-| *camel.component.mina2.configuration.sync* | Setting to set endpoint as one-way or request-response. | true | Boolean
-| *camel.component.mina2.configuration.textline* | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | Boolean
-| *camel.component.mina2.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
-| *camel.component.mina2.configuration.timeout* | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. | 30000 | Long
-| *camel.component.mina2.configuration.transfer-exchange* | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean
-| *camel.component.mina2.configuration.write-timeout* | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | Long
-| *camel.component.mina2.enabled* | Enable mina2 component | true | Boolean
-| *camel.component.mina2.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
-| *camel.component.mina2.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
+| *camel.component.mina.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
+| *camel.component.mina.configuration.allow-default-codec* | The mina component installs a default codec if both, codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain, like the SSL filter. | true | Boolean
+| *camel.component.mina.configuration.auto-start-tls* | Whether to auto start SSL handshake. | true | Boolean
+| *camel.component.mina.configuration.cached-address* | Whether to create the InetAddress once and reuse. Setting this to false allows to pickup DNS changes in the network. | true | Boolean
+| *camel.component.mina.configuration.client-mode* | If the clientMode is true, mina consumer will connect the address as a TCP client. | false | Boolean
+| *camel.component.mina.configuration.codec* | To use a custom minda codec implementation. | | ProtocolCodecFactory
+| *camel.component.mina.configuration.decoder-max-line-length* | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. | 1024 | Integer
+| *camel.component.mina.configuration.disconnect* | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer. | false | Boolean
+| *camel.component.mina.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. | true | Boolean
+| *camel.component.mina.configuration.encoder-max-line-length* | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE. | -1 | Integer
+| *camel.component.mina.configuration.encoding* | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset | | String
+| *camel.component.mina.configuration.filters* | You can set a list of Mina IoFilters to use. | | List
+| *camel.component.mina.configuration.host* | Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server. | | String
+| *camel.component.mina.configuration.lazy-session-creation* | Sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. | true | Boolean
+| *camel.component.mina.configuration.maximum-pool-size* | Number of worker threads in the worker pool for TCP and UDP | 16 | Integer
+| *camel.component.mina.configuration.mina-logger* | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. | false | Boolean
+| *camel.component.mina.configuration.no-reply-log-level* | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel
+| *camel.component.mina.configuration.ordered-thread-pool-executor* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean
+| *camel.component.mina.configuration.port* | Port number | | Integer
+| *camel.component.mina.configuration.protocol* | Protocol to use | | String
+| *camel.component.mina.configuration.ssl-context-parameters* | To configure SSL security. | | SSLContextParameters
+| *camel.component.mina.configuration.sync* | Setting to set endpoint as one-way or request-response. | true | Boolean
+| *camel.component.mina.configuration.textline* | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | Boolean
+| *camel.component.mina.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
+| *camel.component.mina.configuration.timeout* | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. | 30000 | Long
+| *camel.component.mina.configuration.transfer-exchange* | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean
+| *camel.component.mina.configuration.write-timeout* | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | Long
+| *camel.component.mina.enabled* | Whether to enable auto configuration of the mina component. This is enabled by default. | | Boolean
+| *camel.component.mina.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+| *camel.component.mina.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc b/components/camel-netty4/src/main/docs/netty4-component.adoc
index ac1e4a1..1781e1a 100644
--- a/components/camel-netty4/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty4/src/main/docs/netty4-component.adoc
@@ -799,4 +799,4 @@ under the `camel-example-netty-custom-correlation` directory.
== See Also
* xref:netty4-http-component.adoc[Netty HTTP]
-* xref:mina2-component.adoc[MINA]
+* xref:mina-component.adoc[MINA]
diff --git a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
index b1fc768..0258b0a 100644
--- a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
+++ b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
@@ -92,7 +92,7 @@ ND
*Available as of Camel 2.14*
To expose a Syslog listener service we reuse the
-existing xref:mina2-component.adoc[Mina2 Component] component
+existing xref:mina-component.adoc[Mina Component] component
or xref:netty4-component.adoc[Netty4 Component] where we just use
the `SyslogDataFormat` to marshal and unmarshal messages
diff --git a/components/readme.adoc b/components/readme.adoc
index 333eba1..c4c26b7 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -565,8 +565,8 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated)
| link:camel-micrometer/src/main/docs/micrometer-component.adoc[Micrometer] (camel-micrometer) +
`micrometer:metricsType:metricsName` | 2.22 | To collect various metrics directly from Camel routes using the Micrometer library.
-| link:camel-mina2/src/main/docs/mina2-component.adoc[Mina2] (camel-mina2) +
-`mina2:protocol:host:port` | 2.10 | Socket level networking using TCP or UDP with the Apache Mina 2.x library.
+| link:camel-mina/src/main/docs/mina-component.adoc[Mina] (camel-mina) +
+`mina:protocol:host:port` | 2.10 | Socket level networking using TCP or UDP with the Apache Mina 2.x library.
| link:camel-mllp/src/main/docs/mllp-component.adoc[MLLP] (camel-mllp) +
`mllp:hostname:port` | 2.17 | Provides functionality required by Healthcare providers to communicate with other systems using the MLLP protocol.
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index 204a2b7..da5e605 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -233,7 +233,7 @@
* xref:microprofile-config.adoc[MicroProfile Config Component]
* xref:milo-client-component.adoc[OPC UA Client Component]
* xref:milo-server-component.adoc[OPC UA Server Component]
-* xref:mina2-component.adoc[Mina2 Component]
+* xref:mina-component.adoc[Mina Component]
* xref:mllp-component.adoc[MLLP Component]
* xref:mock-component.adoc[Mock Component]
* xref:mongodb-gridfs-component.adoc[MongoDB GridFS Component]
diff --git a/docs/components/modules/ROOT/pages/hl7-dataformat.adoc b/docs/components/modules/ROOT/pages/hl7-dataformat.adoc
index c3d98ab..704913e 100644
--- a/docs/components/modules/ROOT/pages/hl7-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/hl7-dataformat.adoc
@@ -9,12 +9,12 @@ v2 messages] using the http://hl7api.sourceforge.net[HAPI library].
This component supports the following:
-* HL7 MLLP codec for xref:mina2-component.adoc[Mina]
+* HL7 MLLP codec for xref:mina-component.adoc[Mina]
* HL7 MLLP codec for xref:netty4-component.adoc[Netty4]
* Type Converter from/to HAPI and String
* HL7 DataFormat using the HAPI library
* Even more ease-of-use as it's integrated well with the
-xref:mina2-component.adoc[camel-mina2] component.
+xref:mina-component.adoc[camel-mina] component.
Maven users will need to add the following dependency to their `pom.xml`
for this component:
@@ -35,9 +35,9 @@ HL7 is often used with the HL7 MLLP protocol, which is a text based TCP
socket based protocol. This component ships with a Mina and Netty4 Codec
that conforms to the MLLP protocol so you can easily expose an HL7
listener accepting HL7 requests over the TCP transport layer. To expose
-a HL7 listener service, the xref:mina2-component.adoc[camel-mina2] or
+a HL7 listener service, the xref:mina-component.adoc[camel-mina] or
xref:netty4-component.adoc[camel-netty4] component is used with the
-`HL7MLLPCodec` (mina2) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder`
+`HL7MLLPCodec` (mina) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder`
(Netty4).
HL7 MLLP codec can be configured as follows:
@@ -69,12 +69,12 @@ segment terminators. The HAPI library requires the use of `\r`.
=== Exposing an HL7 listener using Mina
-In the Spring XML file, we configure a mina2 endpoint to listen for HL7
+In the Spring XML file, we configure a mina endpoint to listen for HL7
requests using TCP on port `8888`:
[source,xml]
----
-<endpoint id="hl7MinaListener" uri="mina2:tcp://localhost:8888?sync=true&codec=#hl7codec"/>
+<endpoint id="hl7MinaListener" uri="mina:tcp://localhost:8888?sync=true&codec=#hl7codec"/>
----
*sync=true* indicates that this listener is synchronous and therefore
diff --git a/docs/components/modules/ROOT/pages/mina2-component.adoc b/docs/components/modules/ROOT/pages/mina-component.adoc
similarity index 68%
rename from docs/components/modules/ROOT/pages/mina2-component.adoc
rename to docs/components/modules/ROOT/pages/mina-component.adoc
index 1860506..cca546d 100644
--- a/docs/components/modules/ROOT/pages/mina2-component.adoc
+++ b/docs/components/modules/ROOT/pages/mina-component.adoc
@@ -1,5 +1,5 @@
-[[mina2-component]]
-= Mina2 Component
+[[mina-component]]
+= Mina Component
*Available as of Camel version 2.10*
@@ -9,7 +9,7 @@ http://mina.apache.org/[Apache MINA 2.x]
TIP: Favor using xref:netty4-component.adoc[Netty] as Netty is a much more active
maintained and popular project than Apache Mina currently is.
-WARNING: Be careful with `sync=false` on consumer endpoints. Since camel-mina2 all
+WARNING: Be careful with `sync=false` on consumer endpoints. Since camel-mina all
consumer exchanges are InOut. This is different to camel-mina.
Maven users will need to add the following dependency to their `pom.xml`
@@ -19,7 +19,7 @@ for this component:
------------------------------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
@@ -29,9 +29,9 @@ for this component:
[source,java]
-------------------------------------
-mina2:tcp://hostname[:port][?options]
-mina2:udp://hostname[:port][?options]
-mina2:vm://hostname[:port][?options]
+mina:tcp://hostname[:port][?options]
+mina:udp://hostname[:port][?options]
+mina:vm://hostname[:port][?options]
-------------------------------------
You can specify a codec in the Registry using the
@@ -64,7 +64,7 @@ You can append query options to the URI in the following format,
// component options: START
-The Mina2 component supports 4 options, which are listed below.
+The Mina component supports 4 options, which are listed below.
@@ -86,10 +86,10 @@ The Mina2 component supports 4 options, which are listed below.
// endpoint options: START
-The Mina2 endpoint is configured using URI syntax:
+The Mina endpoint is configured using URI syntax:
----
-mina2:protocol:host:port
+mina:protocol:host:port
----
with the following path and query parameters:
@@ -152,7 +152,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
@@ -166,36 +166,36 @@ The component supports 30 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *camel.component.mina2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
-| *camel.component.mina2.configuration.allow-default-codec* | The mina component installs a default codec if both, codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain, like the SSL filter. | true | Boolean
-| *camel.component.mina2.configuration.auto-start-tls* | Whether to auto start SSL handshake. | true | Boolean
-| *camel.component.mina2.configuration.cached-address* | Whether to create the InetAddress once and reuse. Setting this to false allows to pickup DNS changes in the network. | true | Boolean
-| *camel.component.mina2.configuration.client-mode* | If the clientMode is true, mina consumer will connect the address as a TCP client. | false | Boolean
-| *camel.component.mina2.configuration.codec* | To use a custom minda codec implementation. | | ProtocolCodecFactory
-| *camel.component.mina2.configuration.decoder-max-line-length* | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. | 1024 | Integer
-| *camel.component.mina2.configuration.disconnect* | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer. | false | Boolean
-| *camel.component.mina2.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. | true | Boolean
-| *camel.component.mina2.configuration.encoder-max-line-length* | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE. | -1 | Integer
-| *camel.component.mina2.configuration.encoding* | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset | | String
-| *camel.component.mina2.configuration.filters* | You can set a list of Mina IoFilters to use. | | List
-| *camel.component.mina2.configuration.host* | Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server. | | String
-| *camel.component.mina2.configuration.lazy-session-creation* | Sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. | true | Boolean
-| *camel.component.mina2.configuration.maximum-pool-size* | Number of worker threads in the worker pool for TCP and UDP | 16 | Integer
-| *camel.component.mina2.configuration.mina-logger* | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. | false | Boolean
-| *camel.component.mina2.configuration.no-reply-log-level* | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel
-| *camel.component.mina2.configuration.ordered-thread-pool-executor* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean
-| *camel.component.mina2.configuration.port* | Port number | | Integer
-| *camel.component.mina2.configuration.protocol* | Protocol to use | | String
-| *camel.component.mina2.configuration.ssl-context-parameters* | To configure SSL security. | | SSLContextParameters
-| *camel.component.mina2.configuration.sync* | Setting to set endpoint as one-way or request-response. | true | Boolean
-| *camel.component.mina2.configuration.textline* | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | Boolean
-| *camel.component.mina2.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
-| *camel.component.mina2.configuration.timeout* | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. | 30000 | Long
-| *camel.component.mina2.configuration.transfer-exchange* | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean
-| *camel.component.mina2.configuration.write-timeout* | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | Long
-| *camel.component.mina2.enabled* | Enable mina2 component | true | Boolean
-| *camel.component.mina2.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
-| *camel.component.mina2.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
+| *camel.component.mina.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
+| *camel.component.mina.configuration.allow-default-codec* | The mina component installs a default codec if both, codec is null and textline is false. Setting allowDefaultCodec to false prevents the mina component from installing a default codec as the first element in the filter chain. This is useful in scenarios where another filter must be the first in the filter chain, like the SSL filter. | true | Boolean
+| *camel.component.mina.configuration.auto-start-tls* | Whether to auto start SSL handshake. | true | Boolean
+| *camel.component.mina.configuration.cached-address* | Whether to create the InetAddress once and reuse. Setting this to false allows to pickup DNS changes in the network. | true | Boolean
+| *camel.component.mina.configuration.client-mode* | If the clientMode is true, mina consumer will connect the address as a TCP client. | false | Boolean
+| *camel.component.mina.configuration.codec* | To use a custom minda codec implementation. | | ProtocolCodecFactory
+| *camel.component.mina.configuration.decoder-max-line-length* | To set the textline protocol decoder max line length. By default the default value of Mina itself is used which are 1024. | 1024 | Integer
+| *camel.component.mina.configuration.disconnect* | Whether or not to disconnect(close) from Mina session right after use. Can be used for both consumer and producer. | false | Boolean
+| *camel.component.mina.configuration.disconnect-on-no-reply* | If sync is enabled then this option dictates MinaConsumer if it should disconnect where there is no reply to send back. | true | Boolean
+| *camel.component.mina.configuration.encoder-max-line-length* | To set the textline protocol encoder max line length. By default the default value of Mina itself is used which are Integer.MAX_VALUE. | -1 | Integer
+| *camel.component.mina.configuration.encoding* | You can configure the encoding (a charset name) to use for the TCP textline codec and the UDP protocol. If not provided, Camel will use the JVM default Charset | | String
+| *camel.component.mina.configuration.filters* | You can set a list of Mina IoFilters to use. | | List
+| *camel.component.mina.configuration.host* | Hostname to use. Use localhost or 0.0.0.0 for local server as consumer. For producer use the hostname or ip address of the remote server. | | String
+| *camel.component.mina.configuration.lazy-session-creation* | Sessions can be lazily created to avoid exceptions, if the remote server is not up and running when the Camel producer is started. | true | Boolean
+| *camel.component.mina.configuration.maximum-pool-size* | Number of worker threads in the worker pool for TCP and UDP | 16 | Integer
+| *camel.component.mina.configuration.mina-logger* | You can enable the Apache MINA logging filter. Apache MINA uses slf4j logging at INFO level to log all input and output. | false | Boolean
+| *camel.component.mina.configuration.no-reply-log-level* | If sync is enabled this option dictates MinaConsumer which logging level to use when logging a there is no reply to send back. | | LoggingLevel
+| *camel.component.mina.configuration.ordered-thread-pool-executor* | Whether to use ordered thread pool, to ensure events are processed orderly on the same channel. | true | Boolean
+| *camel.component.mina.configuration.port* | Port number | | Integer
+| *camel.component.mina.configuration.protocol* | Protocol to use | | String
+| *camel.component.mina.configuration.ssl-context-parameters* | To configure SSL security. | | SSLContextParameters
+| *camel.component.mina.configuration.sync* | Setting to set endpoint as one-way or request-response. | true | Boolean
+| *camel.component.mina.configuration.textline* | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | Boolean
+| *camel.component.mina.configuration.textline-delimiter* | Only used for TCP and if textline=true. Sets the text line delimiter to use. If none provided, Camel will use DEFAULT. This delimiter is used to mark the end of text. | | Mina2TextLineDelimiter
+| *camel.component.mina.configuration.timeout* | You can configure the timeout that specifies how long to wait for a response from a remote server. The timeout unit is in milliseconds, so 60000 is 60 seconds. | 30000 | Long
+| *camel.component.mina.configuration.transfer-exchange* | Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are transferred: In body, Out body, fault body, In headers, Out headers, fault headers, exchange properties, exchange exception. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | Boolean
+| *camel.component.mina.configuration.write-timeout* | Maximum amount of time it should take to send data to the MINA session. Default is 10000 milliseconds. | 10000 | Long
+| *camel.component.mina.enabled* | Whether to enable auto configuration of the mina component. This is enabled by default. | | Boolean
+| *camel.component.mina.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+| *camel.component.mina.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
|===
// spring-boot-auto-configure options: END
@@ -219,7 +219,7 @@ Mina consumer endpoint that listens on port 6200:
[source,java]
---------------------------------------------------------------------------------------
-from("mina2:tcp://localhost:" + port1 + "?textline=true&sync=false").to("mock:result");
+from("mina:tcp://localhost:" + port1 + "?textline=true&sync=false").to("mock:result");
---------------------------------------------------------------------------------------
As the sample is part of a unit test, we test it by sending some data to
@@ -230,7 +230,7 @@ it on port 6200.
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
-template.sendBody("mina2:tcp://localhost:" + port1 + "?textline=true&sync=false", "Hello World");
+template.sendBody("mina:tcp://localhost:" + port1 + "?textline=true&sync=false", "Hello World");
assertMockEndpointsSatisfied();
-------------------------------------------------------------------------------------------------
@@ -244,7 +244,7 @@ consumer.
[source,java]
---------------------------------------------------------------------------------------------
-from("mina2:tcp://localhost:" + port2 + "?textline=true&sync=true").process(new Processor() {
+from("mina:tcp://localhost:" + port2 + "?textline=true&sync=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
@@ -259,19 +259,19 @@ fact, something we have dynamically set in our processor code logic.
[source,java]
-----------------------------------------------------------------------------------------------------------------------
-String response = (String)template.requestBody("mina2:tcp://localhost:" + port2 + "?textline=true&sync=true", "World");
+String response = (String)template.requestBody("mina:tcp://localhost:" + port2 + "?textline=true&sync=true", "World");
assertEquals("Bye World", response);
-----------------------------------------------------------------------------------------------------------------------
== Sample with Spring DSL
-Spring DSL can, of course, also be used for xref:mina2-component.adoc[MINA]. In the
+Spring DSL can, of course, also be used for xref:mina-component.adoc[MINA]. In the
sample below we expose a TCP server on port 5555:
[source,xml]
-----------------------------------------------------------
<route>
- <from uri="mina2:tcp://localhost:5555?textline=true"/>
+ <from uri="mina:tcp://localhost:5555?textline=true"/>
<to uri="bean:myTCPOrderHandler"/>
</route>
-----------------------------------------------------------
@@ -301,7 +301,7 @@ written the `bye` message back to the client:
[source,java]
---------------------------------------------------------------------------------------------------
- from("mina2:tcp://localhost:8080?sync=true&textline=true").process(new Processor() {
+ from("mina:tcp://localhost:8080?sync=true&textline=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
diff --git a/docs/components/modules/ROOT/pages/netty4-component.adoc b/docs/components/modules/ROOT/pages/netty4-component.adoc
index ac1e4a1..1781e1a 100644
--- a/docs/components/modules/ROOT/pages/netty4-component.adoc
+++ b/docs/components/modules/ROOT/pages/netty4-component.adoc
@@ -799,4 +799,4 @@ under the `camel-example-netty-custom-correlation` directory.
== See Also
* xref:netty4-http-component.adoc[Netty HTTP]
-* xref:mina2-component.adoc[MINA]
+* xref:mina-component.adoc[MINA]
diff --git a/docs/components/modules/ROOT/pages/syslog-dataformat.adoc b/docs/components/modules/ROOT/pages/syslog-dataformat.adoc
index ec2fb45..0258b0a 100644
--- a/docs/components/modules/ROOT/pages/syslog-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/syslog-dataformat.adoc
@@ -13,7 +13,7 @@ This component supports the following:
SyslogMessage model objects.
* Type Converter from/to SyslogMessage and
String
-* Integration with the xref:mina2-component.adoc[camel-mina] component.
+* Integration with the xref:mina-component.adoc[camel-mina] component.
* Integration with the xref:netty4-component.adoc[camel-netty] component.
* Encoder and decoder for
the xref:netty4-component.adoc[Netty4 Component] component.
@@ -40,7 +40,7 @@ as its underlying transport layer mechanism.
The UDP port that has been assigned to syslog is 514.
To expose a Syslog listener service we reuse the existing
-xref:mina2-component.adoc[Mina2 Component] component or xref:netty4-component.adoc[Netty4 Component]
+xref:mina-component.adoc[Mina Component] component or xref:netty4-component.adoc[Netty4 Component]
where we just use the `Rfc3164SyslogDataFormat` to marshal and unmarshal
messages. Notice that from *Camel 2.14* onwards the syslog dataformat is
renamed to `SyslogDataFormat`.
@@ -92,7 +92,7 @@ ND
*Available as of Camel 2.14*
To expose a Syslog listener service we reuse the
-existing xref:mina2-component.adoc[Mina2 Component] component
+existing xref:mina-component.adoc[Mina Component] component
or xref:netty4-component.adoc[Netty4 Component] where we just use
the `SyslogDataFormat` to marshal and unmarshal messages
@@ -121,7 +121,7 @@ as an InputStream:
</camelContext>
------------------------------------------------------------------------------------------
-The same route using xref:mina2-component.adoc[Mina2 Component]
+The same route using xref:mina-component.adoc[Mina Component]
[source,xml]
-------------------------------------------------------------------------
diff --git a/docs/user-manual/modules/ROOT/pages/async.adoc b/docs/user-manual/modules/ROOT/pages/async.adoc
index 4def400..79d5452 100644
--- a/docs/user-manual/modules/ROOT/pages/async.adoc
+++ b/docs/user-manual/modules/ROOT/pages/async.adoc
@@ -74,7 +74,7 @@ image:async.data/camel_sync_request_reply.png[image]
\1. The client sends a sync Request Reply
message over xref:components::http-component.adoc[HTTP] to Camel. The client application will
wait for the response that Camel routes and processes. +
- 2. The message invokes an external xref:components::mina2-component.adoc[TCP] service using
+ 2. The message invokes an external xref:components::mina-component.adoc[TCP] service using
synchronous Request Reply. The client
application still waits for the response. +
3. The response is send back to the client.
@@ -95,7 +95,7 @@ image:async.data/camel_async_request_reply.png[image]
Request Reply message over HTTP
to Camel. The control is immediately returned to the client application,
that can continue and do other work while Camel routes the message. +
- 2. Camel invokes an external xref:components::mina2-component.adoc[TCP] service using
+ 2. Camel invokes an external xref:components::mina-component.adoc[TCP] service using
synchronous Request Reply. The client
application can do other work simultaneously. +
3. The client wants to get the reply so it uses the Future handle it
@@ -115,7 +115,7 @@ image:async.data/camel_sync_request_only.png[image]
\1. The client sends a Request only and we can
still use xref:components::http-component.adoc[HTTP] despite http being
Request Reply by nature. +
- 2. Camel invokes an external xref:components::mina2-component.adoc[TCP] service using
+ 2. Camel invokes an external xref:components::mina-component.adoc[TCP] service using
synchronous Request Reply. The client
application is still waiting. +
3. The message is processed completely and the control is returned to
@@ -145,7 +145,7 @@ still use xref:components::http-component.adoc[HTTP] despite http being
Request Reply by nature. The control is
immediately returned to the client application, that can continue and do
other work while Camel routes the message. +
- 2. Camel invokes an external xref:components::mina2-component.adoc[TCP] service using
+ 2. Camel invokes an external xref:components::mina-component.adoc[TCP] service using
synchronous Request Reply. The client
application can do other work simultaneously. +
3. The message completes but no result is returned to the client.
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc
index d77addc..a74a492 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-servicemix-eip.adoc
@@ -8,7 +8,7 @@ The main difference with ServiceMix EIP is its integrated into the
existing ServiceMix XBean XML configuration whereas Camel has more
xref:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns] and can be used outside of JBI (e.g. just with pure
-xref:components::jms-component.adoc[JMS] or xref:components::mina2-component.adoc[MINA]). Also Camel supports a
+xref:components::jms-component.adoc[JMS] or xref:components::mina-component.adoc[MINA]). Also Camel supports a
xref:dsl.adoc[Java DSL] or xref:spring.adoc[XML configuration].
[[HowdoesCamelcomparetoServiceMixEIP-ConvertingfromServiceMixEIPtoCamel]]
diff --git a/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc b/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
index e9ee7c9..fd129f3 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
@@ -15,7 +15,7 @@ routing rules in your IDE, whether in a Java, Scala or XML editor.
Apache Camel uses xref:uris.adoc[URIs] to work directly with any kind of
xref:transport.adoc[Transport] or messaging model such as
xref:components::http-component.adoc[HTTP], xref:components::activemq-component.adoc[ActiveMQ], xref:components::jms-component.adoc[JMS],
-JBI, SCA, xref:components::mina2-component.adoc[MINA] or xref:components::cxf-component.adoc[CXF], as
+JBI, SCA, xref:components::mina-component.adoc[MINA] or xref:components::cxf-component.adoc[CXF], as
well as pluggable xref:component.adoc[Components] and
xref:data-format.adoc[Data Format] options. Apache Camel is a small
library with minimal xref:what-are-the-dependencies.adoc[dependencies]
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index 84e80b3..6bffa59 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -331,7 +331,7 @@ camel routes without them knowing
** xref:components::master-component.adoc[Master]
** xref:components::metrics-component.adoc[Metrics]
** xref:components::micrometer-component.adoc[Micrometer]
-** xref:components::mina2-component.adoc[Mina2]
+** xref:components::mina-component.adoc[Mina]
** xref:components::mllp-component.adoc[MLLP]
** xref:components::mongodb-component.adoc[MongoDB]
** xref:components::mongodb-gridfs-component.adoc[MongoDB GridFS]
diff --git a/docs/user-manual/modules/ROOT/pages/security.adoc b/docs/user-manual/modules/ROOT/pages/security.adoc
index 242f287f..aa8f42c 100644
--- a/docs/user-manual/modules/ROOT/pages/security.adoc
+++ b/docs/user-manual/modules/ROOT/pages/security.adoc
@@ -66,7 +66,7 @@ using the CXF Bus driven interceptor chain
* xref:components::spring-ws-component.adoc[Spring Web Services] - HTTP Basic
Authentication & WS-Security support
* xref:components::netty4-component.adoc[Netty] - SSL support
-* xref:components::mina2-component.adoc[MINA] - SSL support
+* xref:components::mina-component.adoc[MINA] - SSL support
* xref:components::cometd-component.adoc[Cometd] - SSL support
* xref:components::jms-component.adoc[JMS] - JAAS and SSL based security for client <-->
broker communication
diff --git a/docs/user-manual/modules/ROOT/pages/servicepool.adoc b/docs/user-manual/modules/ROOT/pages/servicepool.adoc
index 694de24..2fc8c64 100644
--- a/docs/user-manual/modules/ROOT/pages/servicepool.adoc
+++ b/docs/user-manual/modules/ROOT/pages/servicepool.adoc
@@ -20,7 +20,7 @@ stopping the Producer at each invocation. So where is it needed then?
Well these components uses pooled producers:
* xref:components::ftp-component.adoc[FTP]
-* xref:components::mina2-component.adoc[Mina]
+* xref:components::mina-component.adoc[Mina]
[[ServicePool-Usage]]
== Usage
diff --git a/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc b/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc
index 655f641..4c6d0dc 100644
--- a/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc
+++ b/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc
@@ -132,7 +132,7 @@ sendConfirmEmail bean
In the route lets imagine that the registration of the order has to be
done by sending data to a TCP socket that could be a big mainframe. As
Camel has many xref:components::index.adoc[Components] we will use the
-camel-mina component that supports xref:components::mina2-component.adoc[TCP] connectivity. So
+camel-mina component that supports xref:components::mina-component.adoc[TCP] connectivity. So
we change the route to:
[source,syntaxhighlighter-pre]
[camel] 05/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina - 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 b865a68ee0797cee77f88e21474a46e3c1d44626
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 15:29:04 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Updated docs
---
.../camel-hl7/src/main/docs/hl7-dataformat.adoc | 12 +++++-----
.../{mina2-component.adoc => mina-component.adoc} | 28 +++++++++++-----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
index c3d98ab..704913e 100644
--- a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
+++ b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
@@ -9,12 +9,12 @@ v2 messages] using the http://hl7api.sourceforge.net[HAPI library].
This component supports the following:
-* HL7 MLLP codec for xref:mina2-component.adoc[Mina]
+* HL7 MLLP codec for xref:mina-component.adoc[Mina]
* HL7 MLLP codec for xref:netty4-component.adoc[Netty4]
* Type Converter from/to HAPI and String
* HL7 DataFormat using the HAPI library
* Even more ease-of-use as it's integrated well with the
-xref:mina2-component.adoc[camel-mina2] component.
+xref:mina-component.adoc[camel-mina] component.
Maven users will need to add the following dependency to their `pom.xml`
for this component:
@@ -35,9 +35,9 @@ HL7 is often used with the HL7 MLLP protocol, which is a text based TCP
socket based protocol. This component ships with a Mina and Netty4 Codec
that conforms to the MLLP protocol so you can easily expose an HL7
listener accepting HL7 requests over the TCP transport layer. To expose
-a HL7 listener service, the xref:mina2-component.adoc[camel-mina2] or
+a HL7 listener service, the xref:mina-component.adoc[camel-mina] or
xref:netty4-component.adoc[camel-netty4] component is used with the
-`HL7MLLPCodec` (mina2) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder`
+`HL7MLLPCodec` (mina) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder`
(Netty4).
HL7 MLLP codec can be configured as follows:
@@ -69,12 +69,12 @@ segment terminators. The HAPI library requires the use of `\r`.
=== Exposing an HL7 listener using Mina
-In the Spring XML file, we configure a mina2 endpoint to listen for HL7
+In the Spring XML file, we configure a mina endpoint to listen for HL7
requests using TCP on port `8888`:
[source,xml]
----
-<endpoint id="hl7MinaListener" uri="mina2:tcp://localhost:8888?sync=true&codec=#hl7codec"/>
+<endpoint id="hl7MinaListener" uri="mina:tcp://localhost:8888?sync=true&codec=#hl7codec"/>
----
*sync=true* indicates that this listener is synchronous and therefore
diff --git a/components/camel-mina/src/main/docs/mina2-component.adoc b/components/camel-mina/src/main/docs/mina-component.adoc
similarity index 96%
rename from components/camel-mina/src/main/docs/mina2-component.adoc
rename to components/camel-mina/src/main/docs/mina-component.adoc
index 1860506..166f977 100644
--- a/components/camel-mina/src/main/docs/mina2-component.adoc
+++ b/components/camel-mina/src/main/docs/mina-component.adoc
@@ -1,5 +1,5 @@
-[[mina2-component]]
-= Mina2 Component
+[[mina-component]]
+= Mina Component
*Available as of Camel version 2.10*
@@ -9,7 +9,7 @@ http://mina.apache.org/[Apache MINA 2.x]
TIP: Favor using xref:netty4-component.adoc[Netty] as Netty is a much more active
maintained and popular project than Apache Mina currently is.
-WARNING: Be careful with `sync=false` on consumer endpoints. Since camel-mina2 all
+WARNING: Be careful with `sync=false` on consumer endpoints. Since camel-mina all
consumer exchanges are InOut. This is different to camel-mina.
Maven users will need to add the following dependency to their `pom.xml`
@@ -19,7 +19,7 @@ for this component:
------------------------------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
@@ -29,9 +29,9 @@ for this component:
[source,java]
-------------------------------------
-mina2:tcp://hostname[:port][?options]
-mina2:udp://hostname[:port][?options]
-mina2:vm://hostname[:port][?options]
+mina:tcp://hostname[:port][?options]
+mina:udp://hostname[:port][?options]
+mina:vm://hostname[:port][?options]
-------------------------------------
You can specify a codec in the Registry using the
@@ -219,7 +219,7 @@ Mina consumer endpoint that listens on port 6200:
[source,java]
---------------------------------------------------------------------------------------
-from("mina2:tcp://localhost:" + port1 + "?textline=true&sync=false").to("mock:result");
+from("mina:tcp://localhost:" + port1 + "?textline=true&sync=false").to("mock:result");
---------------------------------------------------------------------------------------
As the sample is part of a unit test, we test it by sending some data to
@@ -230,7 +230,7 @@ it on port 6200.
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
-template.sendBody("mina2:tcp://localhost:" + port1 + "?textline=true&sync=false", "Hello World");
+template.sendBody("mina:tcp://localhost:" + port1 + "?textline=true&sync=false", "Hello World");
assertMockEndpointsSatisfied();
-------------------------------------------------------------------------------------------------
@@ -244,7 +244,7 @@ consumer.
[source,java]
---------------------------------------------------------------------------------------------
-from("mina2:tcp://localhost:" + port2 + "?textline=true&sync=true").process(new Processor() {
+from("mina:tcp://localhost:" + port2 + "?textline=true&sync=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
@@ -259,19 +259,19 @@ fact, something we have dynamically set in our processor code logic.
[source,java]
-----------------------------------------------------------------------------------------------------------------------
-String response = (String)template.requestBody("mina2:tcp://localhost:" + port2 + "?textline=true&sync=true", "World");
+String response = (String)template.requestBody("mina:tcp://localhost:" + port2 + "?textline=true&sync=true", "World");
assertEquals("Bye World", response);
-----------------------------------------------------------------------------------------------------------------------
== Sample with Spring DSL
-Spring DSL can, of course, also be used for xref:mina2-component.adoc[MINA]. In the
+Spring DSL can, of course, also be used for xref:mina-component.adoc[MINA]. In the
sample below we expose a TCP server on port 5555:
[source,xml]
-----------------------------------------------------------
<route>
- <from uri="mina2:tcp://localhost:5555?textline=true"/>
+ <from uri="mina:tcp://localhost:5555?textline=true"/>
<to uri="bean:myTCPOrderHandler"/>
</route>
-----------------------------------------------------------
@@ -301,7 +301,7 @@ written the `bye` message back to the client:
[source,java]
---------------------------------------------------------------------------------------------------
- from("mina2:tcp://localhost:8080?sync=true&textline=true").process(new Processor() {
+ from("mina:tcp://localhost:8080?sync=true&textline=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String body = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Bye " + body);
[camel] 04/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina - 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 22ac72db51780283339a3c1e6352fabb42969d18
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 15:25:23 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Updated references
---
apache-camel/pom.xml | 4 ++--
apache-camel/src/main/descriptors/common-bin.xml | 4 ++--
bom/camel-bom/pom.xml | 4 ++--
components/camel-hl7/pom.xml | 4 ++--
components/camel-syslog/pom.xml | 2 +-
components/pom.xml | 2 +-
examples/camel-example-loadbalancing/pom.xml | 2 +-
parent/pom.xml | 4 ++--
platforms/spring-boot/components-starter/README.adoc | 1 -
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 4 ++--
10 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index bf322aa..158609f 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -984,7 +984,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2488,7 +2488,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-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 9bcdafa..077c358 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -217,7 +217,7 @@
<include>org.apache.camel:camel-micrometer</include>
<include>org.apache.camel:camel-microprofile-config</include>
<include>org.apache.camel:camel-milo</include>
- <include>org.apache.camel:camel-mina2</include>
+ <include>org.apache.camel:camel-mina</include>
<include>org.apache.camel:camel-mllp</include>
<include>org.apache.camel:camel-mock</include>
<include>org.apache.camel:camel-mongodb</include>
@@ -557,7 +557,7 @@
<include>org.apache.camel:camel-metrics-starter</include>
<include>org.apache.camel:camel-micrometer-starter</include>
<include>org.apache.camel:camel-milo-starter</include>
- <include>org.apache.camel:camel-mina2-starter</include>
+ <include>org.apache.camel:camel-mina-starter</include>
<include>org.apache.camel:camel-mllp-starter</include>
<include>org.apache.camel:camel-mock-starter</include>
<include>org.apache.camel:camel-mongodb-gridfs-starter</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 39c28f9..d3874c3 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1890,12 +1890,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 402687e..650c66e 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 mina2 or camel-netty4 -->
+ <!-- for MLLP either use mina or camel-netty4 -->
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
@@ -120,7 +120,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index edc2ed5..89b7ae6 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/pom.xml b/components/pom.xml
index 18773aa..82aae97 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -235,7 +235,7 @@
<module>camel-micrometer</module>
<module>camel-microprofile-config</module>
<module>camel-milo</module>
- <module>camel-mina2</module>
+ <module>camel-mina</module>
<module>camel-mllp</module>
<module>camel-mongodb</module>
<module>camel-mongodb-gridfs</module>
diff --git a/examples/camel-example-loadbalancing/pom.xml b/examples/camel-example-loadbalancing/pom.xml
index d24ff4b..44dedfe 100644
--- a/examples/camel-example-loadbalancing/pom.xml
+++ b/examples/camel-example-loadbalancing/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
</dependency>
<!-- logging -->
diff --git a/parent/pom.xml b/parent/pom.xml
index 65fe4b6..7f15d6e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1699,7 +1699,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -3233,7 +3233,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/platforms/spring-boot/components-starter/README.adoc b/platforms/spring-boot/components-starter/README.adoc
index fe5a480..f8db999 100644
--- a/platforms/spring-boot/components-starter/README.adoc
+++ b/platforms/spring-boot/components-starter/README.adoc
@@ -19,7 +19,6 @@ The following components do not have a starter because of compatibility issues:
* **camel-core-xml**
* **camel-eventadmin** (intended for OSGi only)
* **camel-ibatis** (`camel-mybatis-starter` is included)
-* **camel-mina** (`camel-mina2-starter` is included)
* **camel-paxlogging** (intended for OSGi only)
* **camel-quartz** (`camel-quartz2-starter` is included)
* **camel-scala**
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 a05920e..c6a83b6 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
@@ -2115,12 +2115,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2</artifactId>
+ <artifactId>camel-mina</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-mina2-starter</artifactId>
+ <artifactId>camel-mina-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
[camel] 08/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina - Karaf integration test and feature
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 32a71e28992c1461bf3353c39207229be500203f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 16:23:57 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Karaf integration test and feature updated
---
platforms/karaf/features/src/main/resources/features.xml | 4 ++--
.../camel/itest/karaf/{CamelMina2Test.java => CamelMinaTest.java} | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 6a4b85b..ccf2ef8 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1770,10 +1770,10 @@
<bundle dependency='true'>mvn:org.eclipse.milo/bsd-parser-gson/${milo-version}</bundle>
<bundle>mvn:org.apache.camel/camel-milo/${project.version}</bundle>
</feature>
- <feature name='camel-mina2' version='${project.version}' start-level='50'>
+ <feature name='camel-mina' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.mina/mina-core/${mina2-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-mina2/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-mina/${project.version}</bundle>
</feature>
<feature name='camel-mllp' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java
similarity index 94%
rename from tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java
rename to tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java
index e6488cb..58ef3a3 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMina2Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMinaTest.java
@@ -21,9 +21,9 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-public class CamelMina2Test extends BaseKarafTest {
+public class CamelMinaTest extends BaseKarafTest {
- public static final String COMPONENT = extractName(CamelMina2Test.class);
+ public static final String COMPONENT = extractName(CamelMinaTest.class);
@Test
public void test() throws Exception {
@@ -31,4 +31,4 @@ public class CamelMina2Test extends BaseKarafTest {
}
-}
\ No newline at end of file
+}
[camel] 02/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina - Spring Boot Starter Mojo should
consider camel-mina now
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 7bc8f30be98d2c94731a6413c73f32a822dbc7bb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 15:20:01 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Spring Boot Starter Mojo should consider camel-mina now
---
.../java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
index 925a48a..dfb1d59 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
@@ -78,7 +78,7 @@ public class SpringBootStarterMojo extends AbstractMojo {
/* extended core */ "camel-attachments",
/* Java EE -> */ "camel-cdi",
/* Microprofile -> */ "camel-microprofile-config",
- /* deprecated (and not working perfectly) -> */ "camel-swagger", "camel-mina", "camel-ibatis",
+ /* deprecated (and not working perfectly) -> */ "camel-swagger", "camel-ibatis",
/* currently incompatible */ "camel-spark-rest",
/* others (not managed) -> */ "camel-core-xml"};
[camel] 03/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina - Added camel-mina starter
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 4bf22d6d4c87e8c59b07c15231f0f6fcad175e71
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 15:21:51 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Added camel-mina starter
---
.../components-starter/camel-mina-starter/pom.xml | 53 +++
.../Mina2ComponentAutoConfiguration.java | 128 ++++++
.../springboot/Mina2ComponentConfiguration.java | 448 +++++++++++++++++++++
.../src/main/resources/META-INF/LICENSE.txt | 203 ++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/META-INF/spring.factories | 19 +
.../src/main/resources/META-INF/spring.provides | 17 +
platforms/spring-boot/components-starter/pom.xml | 2 +-
8 files changed, 880 insertions(+), 1 deletion(-)
diff --git a/platforms/spring-boot/components-starter/camel-mina-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mina-starter/pom.xml
new file mode 100644
index 0000000..4f310e2
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-mina-starter/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components-starter</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>camel-mina-starter</artifactId>
+ <packaging>jar</packaging>
+ <name>Spring-Boot Starter :: Camel :: MINA</name>
+ <description>Spring-Boot Starter for Camel MINA support</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <version>${spring-boot-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-mina</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!--START OF GENERATED CODE-->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-boot-starter</artifactId>
+ </dependency>
+ <!--END OF GENERATED CODE-->
+ </dependencies>
+</project>
diff --git a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java
new file mode 100644
index 0000000..ce3100c
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mina2.springboot;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.mina2.Mina2Component;
+import org.apache.camel.spi.ComponentCustomizer;
+import org.apache.camel.spi.HasId;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
+import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
+import org.apache.camel.spring.boot.util.GroupCondition;
+import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
+import org.apache.camel.support.IntrospectionSupport;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@Configuration
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+ Mina2ComponentAutoConfiguration.GroupConditions.class})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
+@EnableConfigurationProperties({ComponentConfigurationProperties.class,
+ Mina2ComponentConfiguration.class})
+public class Mina2ComponentAutoConfiguration {
+
+ private static final Logger LOGGER = LoggerFactory
+ .getLogger(Mina2ComponentAutoConfiguration.class);
+ @Autowired
+ private ApplicationContext applicationContext;
+ @Autowired
+ private CamelContext camelContext;
+ @Autowired
+ private Mina2ComponentConfiguration configuration;
+ @Autowired(required = false)
+ private List<ComponentCustomizer<Mina2Component>> customizers;
+
+ static class GroupConditions extends GroupCondition {
+ public GroupConditions() {
+ super("camel.component", "camel.component.mina");
+ }
+ }
+
+ @Lazy
+ @Bean(name = "mina-component")
+ @ConditionalOnMissingBean(Mina2Component.class)
+ public Mina2Component configureMina2Component() throws Exception {
+ Mina2Component component = new Mina2Component();
+ component.setCamelContext(camelContext);
+ Map<String, Object> parameters = new HashMap<>();
+ IntrospectionSupport.getProperties(configuration, parameters, null,
+ false);
+ for (Map.Entry<String, Object> entry : parameters.entrySet()) {
+ Object value = entry.getValue();
+ Class<?> paramClass = value.getClass();
+ if (paramClass.getName().endsWith("NestedConfiguration")) {
+ Class nestedClass = null;
+ try {
+ nestedClass = (Class) paramClass.getDeclaredField(
+ "CAMEL_NESTED_CLASS").get(null);
+ HashMap<String, Object> nestedParameters = new HashMap<>();
+ IntrospectionSupport.getProperties(value, nestedParameters,
+ null, false);
+ Object nestedProperty = nestedClass.newInstance();
+ CamelPropertiesHelper.setCamelProperties(camelContext,
+ nestedProperty, nestedParameters, false);
+ entry.setValue(nestedProperty);
+ } catch (NoSuchFieldException e) {
+ }
+ }
+ }
+ CamelPropertiesHelper.setCamelProperties(camelContext, component,
+ parameters, false);
+ if (ObjectHelper.isNotEmpty(customizers)) {
+ for (ComponentCustomizer<Mina2Component> customizer : customizers) {
+ boolean useCustomizer = (customizer instanceof HasId)
+ ? HierarchicalPropertiesEvaluator.evaluate(
+ applicationContext.getEnvironment(),
+ "camel.component.customizer",
+ "camel.component.mina.customizer",
+ ((HasId) customizer).getId())
+ : HierarchicalPropertiesEvaluator.evaluate(
+ applicationContext.getEnvironment(),
+ "camel.component.customizer",
+ "camel.component.mina.customizer");
+ if (useCustomizer) {
+ LOGGER.debug("Configure component {}, with customizer {}",
+ component, customizer);
+ customizer.customize(component);
+ }
+ }
+ }
+ return component;
+ }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
new file mode 100644
index 0000000..ae2204f
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentConfiguration.java
@@ -0,0 +1,448 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mina2.springboot;
+
+import java.util.List;
+import javax.annotation.Generated;
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.component.mina2.Mina2TextLineDelimiter;
+import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
+import org.apache.camel.support.jsse.SSLContextParameters;
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Socket level networking using TCP or UDP with the Apache Mina 2.x library.
+ *
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@ConfigurationProperties(prefix = "camel.component.mina")
+public class Mina2ComponentConfiguration
+ extends
+ ComponentConfigurationPropertiesCommon {
+
+ /**
+ * Whether to enable auto configuration of the mina component. This is
+ * enabled by default.
+ */
+ private Boolean enabled;
+ /**
+ * To use the shared mina configuration.
+ */
+ private Mina2ConfigurationNestedConfiguration configuration;
+ /**
+ * Enable usage of global SSL context parameters.
+ */
+ private Boolean useGlobalSslContextParameters = false;
+ /**
+ * Whether the component should resolve property placeholders on itself when
+ * starting. Only properties which are of String type can use property
+ * placeholders.
+ */
+ private Boolean resolvePropertyPlaceholders = true;
+ /**
+ * Whether the component should use basic property binding (Camel 2.x) or
+ * the newer property binding with additional capabilities
+ */
+ private Boolean basicPropertyBinding = false;
+
+ public Mina2ConfigurationNestedConfiguration getConfiguration() {
+ return configuration;
+ }
+
+ public void setConfiguration(
+ Mina2ConfigurationNestedConfiguration configuration) {
+ this.configuration = configuration;
+ }
+
+ public Boolean getUseGlobalSslContextParameters() {
+ return useGlobalSslContextParameters;
+ }
+
+ public void setUseGlobalSslContextParameters(
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
+ }
+
+ public Boolean getResolvePropertyPlaceholders() {
+ return resolvePropertyPlaceholders;
+ }
+
+ public void setResolvePropertyPlaceholders(
+ Boolean resolvePropertyPlaceholders) {
+ this.resolvePropertyPlaceholders = resolvePropertyPlaceholders;
+ }
+
+ public Boolean getBasicPropertyBinding() {
+ return basicPropertyBinding;
+ }
+
+ public void setBasicPropertyBinding(Boolean basicPropertyBinding) {
+ this.basicPropertyBinding = basicPropertyBinding;
+ }
+
+ public static class Mina2ConfigurationNestedConfiguration {
+ public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.mina2.Mina2Configuration.class;
+ /**
+ * Protocol to use
+ */
+ private String protocol;
+ /**
+ * Hostname to use. Use localhost or 0.0.0.0 for local server as
+ * consumer. For producer use the hostname or ip address of the remote
+ * server.
+ */
+ private String host;
+ /**
+ * Port number
+ */
+ private Integer port;
+ /**
+ * Setting to set endpoint as one-way or request-response.
+ */
+ private Boolean sync = true;
+ /**
+ * 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.
+ */
+ private Boolean textline = false;
+ /**
+ * Only used for TCP and if textline=true. Sets the text line delimiter
+ * to use. If none provided, Camel will use DEFAULT. This delimiter is
+ * used to mark the end of text.
+ */
+ private Mina2TextLineDelimiter textlineDelimiter;
+ /**
+ * To use a custom minda codec implementation.
+ */
+ private ProtocolCodecFactory codec;
+ /**
+ * You can configure the encoding (a charset name) to use for the TCP
+ * textline codec and the UDP protocol. If not provided, Camel will use
+ * the JVM default Charset
+ */
+ private String encoding;
+ /**
+ * Maximum amount of time it should take to send data to the MINA
+ * session. Default is 10000 milliseconds.
+ */
+ private Long writeTimeout = 10000L;
+ /**
+ * You can configure the timeout that specifies how long to wait for a
+ * response from a remote server. The timeout unit is in milliseconds,
+ * so 60000 is 60 seconds.
+ */
+ private Long timeout = 30000L;
+ /**
+ * Sessions can be lazily created to avoid exceptions, if the remote
+ * server is not up and running when the Camel producer is started.
+ */
+ private Boolean lazySessionCreation = true;
+ /**
+ * 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.
+ */
+ private Boolean transferExchange = false;
+ /**
+ * To set the textline protocol encoder max line length. By default the
+ * default value of Mina itself is used which are Integer.MAX_VALUE.
+ */
+ private Integer encoderMaxLineLength = -1;
+ /**
+ * To set the textline protocol decoder max line length. By default the
+ * default value of Mina itself is used which are 1024.
+ */
+ private Integer decoderMaxLineLength = 1024;
+ /**
+ * You can enable the Apache MINA logging filter. Apache MINA uses slf4j
+ * logging at INFO level to log all input and output.
+ */
+ private Boolean minaLogger = false;
+ /**
+ * You can set a list of Mina IoFilters to use.
+ */
+ private List filters;
+ /**
+ * The mina component installs a default codec if both, codec is null
+ * and textline is false. Setting allowDefaultCodec to false prevents
+ * the mina component from installing a default codec as the first
+ * element in the filter chain. This is useful in scenarios where
+ * another filter must be the first in the filter chain, like the SSL
+ * filter.
+ */
+ private Boolean allowDefaultCodec = true;
+ /**
+ * Whether or not to disconnect(close) from Mina session right after
+ * use. Can be used for both consumer and producer.
+ */
+ private Boolean disconnect = false;
+ /**
+ * If sync is enabled then this option dictates MinaConsumer if it
+ * should disconnect where there is no reply to send back.
+ */
+ private Boolean disconnectOnNoReply = true;
+ /**
+ * If sync is enabled this option dictates MinaConsumer which logging
+ * level to use when logging a there is no reply to send back.
+ */
+ private LoggingLevel noReplyLogLevel = LoggingLevel.WARN;
+ /**
+ * To configure SSL security.
+ */
+ private SSLContextParameters sslContextParameters;
+ /**
+ * Whether to auto start SSL handshake.
+ */
+ private Boolean autoStartTls = true;
+ /**
+ * Number of worker threads in the worker pool for TCP and UDP
+ */
+ private Integer maximumPoolSize = 16;
+ /**
+ * Whether to use ordered thread pool, to ensure events are processed
+ * orderly on the same channel.
+ */
+ private Boolean orderedThreadPoolExecutor = true;
+ /**
+ * Whether to create the InetAddress once and reuse. Setting this to
+ * false allows to pickup DNS changes in the network.
+ */
+ private Boolean cachedAddress = true;
+ /**
+ * If the clientMode is true, mina consumer will connect the address as
+ * a TCP client.
+ */
+ private Boolean clientMode = false;
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public Integer getPort() {
+ return port;
+ }
+
+ public void setPort(Integer port) {
+ this.port = port;
+ }
+
+ public Boolean getSync() {
+ return sync;
+ }
+
+ public void setSync(Boolean sync) {
+ this.sync = sync;
+ }
+
+ public Boolean getTextline() {
+ return textline;
+ }
+
+ public void setTextline(Boolean textline) {
+ this.textline = textline;
+ }
+
+ public Mina2TextLineDelimiter getTextlineDelimiter() {
+ return textlineDelimiter;
+ }
+
+ public void setTextlineDelimiter(
+ Mina2TextLineDelimiter textlineDelimiter) {
+ this.textlineDelimiter = textlineDelimiter;
+ }
+
+ public ProtocolCodecFactory getCodec() {
+ return codec;
+ }
+
+ public void setCodec(ProtocolCodecFactory codec) {
+ this.codec = codec;
+ }
+
+ public String getEncoding() {
+ return encoding;
+ }
+
+ public void setEncoding(String encoding) {
+ this.encoding = encoding;
+ }
+
+ public Long getWriteTimeout() {
+ return writeTimeout;
+ }
+
+ public void setWriteTimeout(Long writeTimeout) {
+ this.writeTimeout = writeTimeout;
+ }
+
+ public Long getTimeout() {
+ return timeout;
+ }
+
+ public void setTimeout(Long timeout) {
+ this.timeout = timeout;
+ }
+
+ public Boolean getLazySessionCreation() {
+ return lazySessionCreation;
+ }
+
+ public void setLazySessionCreation(Boolean lazySessionCreation) {
+ this.lazySessionCreation = lazySessionCreation;
+ }
+
+ public Boolean getTransferExchange() {
+ return transferExchange;
+ }
+
+ public void setTransferExchange(Boolean transferExchange) {
+ this.transferExchange = transferExchange;
+ }
+
+ public Integer getEncoderMaxLineLength() {
+ return encoderMaxLineLength;
+ }
+
+ public void setEncoderMaxLineLength(Integer encoderMaxLineLength) {
+ this.encoderMaxLineLength = encoderMaxLineLength;
+ }
+
+ public Integer getDecoderMaxLineLength() {
+ return decoderMaxLineLength;
+ }
+
+ public void setDecoderMaxLineLength(Integer decoderMaxLineLength) {
+ this.decoderMaxLineLength = decoderMaxLineLength;
+ }
+
+ public Boolean getMinaLogger() {
+ return minaLogger;
+ }
+
+ public void setMinaLogger(Boolean minaLogger) {
+ this.minaLogger = minaLogger;
+ }
+
+ public List getFilters() {
+ return filters;
+ }
+
+ public void setFilters(List filters) {
+ this.filters = filters;
+ }
+
+ public Boolean getAllowDefaultCodec() {
+ return allowDefaultCodec;
+ }
+
+ public void setAllowDefaultCodec(Boolean allowDefaultCodec) {
+ this.allowDefaultCodec = allowDefaultCodec;
+ }
+
+ public Boolean getDisconnect() {
+ return disconnect;
+ }
+
+ public void setDisconnect(Boolean disconnect) {
+ this.disconnect = disconnect;
+ }
+
+ public Boolean getDisconnectOnNoReply() {
+ return disconnectOnNoReply;
+ }
+
+ public void setDisconnectOnNoReply(Boolean disconnectOnNoReply) {
+ this.disconnectOnNoReply = disconnectOnNoReply;
+ }
+
+ public LoggingLevel getNoReplyLogLevel() {
+ return noReplyLogLevel;
+ }
+
+ public void setNoReplyLogLevel(LoggingLevel noReplyLogLevel) {
+ this.noReplyLogLevel = noReplyLogLevel;
+ }
+
+ public SSLContextParameters getSslContextParameters() {
+ return sslContextParameters;
+ }
+
+ public void setSslContextParameters(
+ SSLContextParameters sslContextParameters) {
+ this.sslContextParameters = sslContextParameters;
+ }
+
+ public Boolean getAutoStartTls() {
+ return autoStartTls;
+ }
+
+ public void setAutoStartTls(Boolean autoStartTls) {
+ this.autoStartTls = autoStartTls;
+ }
+
+ public Integer getMaximumPoolSize() {
+ return maximumPoolSize;
+ }
+
+ public void setMaximumPoolSize(Integer maximumPoolSize) {
+ this.maximumPoolSize = maximumPoolSize;
+ }
+
+ public Boolean getOrderedThreadPoolExecutor() {
+ return orderedThreadPoolExecutor;
+ }
+
+ public void setOrderedThreadPoolExecutor(
+ Boolean orderedThreadPoolExecutor) {
+ this.orderedThreadPoolExecutor = orderedThreadPoolExecutor;
+ }
+
+ public Boolean getCachedAddress() {
+ return cachedAddress;
+ }
+
+ public void setCachedAddress(Boolean cachedAddress) {
+ this.cachedAddress = cachedAddress;
+ }
+
+ public Boolean getClientMode() {
+ return clientMode;
+ }
+
+ public void setClientMode(Boolean clientMode) {
+ this.clientMode = clientMode;
+ }
+ }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
diff --git a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
diff --git a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..c5b6d65
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,19 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.camel.component.mina2.springboot.Mina2ComponentAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000..6a3fca3
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-mina-starter/src/main/resources/META-INF/spring.provides
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+provides: camel-mina
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index be30897..350a6cc 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -269,7 +269,7 @@
<module>camel-metrics-starter</module>
<module>camel-micrometer-starter</module>
<module>camel-milo-starter</module>
- <module>camel-mina2-starter</module>
+ <module>camel-mina-starter</module>
<module>camel-mllp-starter</module>
<module>camel-mock-starter</module>
<module>camel-mongodb-gridfs-starter</module>
[camel] 06/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina - Fixed tests for camel-hl7 and
camel-syslog
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 c53bbda407ed6bb0d0d91647cbffb4459a278479
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 15:45:31 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - Fixed tests for camel-hl7 and camel-syslog
---
.../org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java | 8 ++++----
.../org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java | 4 ++--
.../java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java | 4 ++--
.../camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java | 2 +-
.../apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java | 4 ++--
.../camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java | 4 ++--
.../java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java | 4 ++--
.../test/java/org/apache/camel/component/hl7/HL7RouteTest.java | 8 ++++----
components/camel-mllp/README.md | 4 ++--
components/camel-syslog/src/main/docs/syslog-dataformat.adoc | 6 +++---
.../apache/camel/component/syslog/AutomatedConversionTest.java | 2 +-
.../org/apache/camel/component/syslog/MinaDataFormatTest.java | 2 +-
.../apache/camel/component/syslog/MinaManyUDPMessagesTest.java | 2 +-
13 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
index 5c0c632..d5a61db 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7ByteArrayRouteTest.java
@@ -64,7 +64,7 @@ public class HL7ByteArrayRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString(), String.class);
+ String out = template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString(), String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123|||||UNICODE UTF-8", lines[0]);
@@ -87,7 +87,7 @@ public class HL7ByteArrayRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString(), String.class);
+ String out = template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", 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]);
@@ -109,7 +109,7 @@ public class HL7ByteArrayRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString());
+ template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString());
assertMockEndpointsSatisfied();
}
@@ -122,7 +122,7 @@ public class HL7ByteArrayRouteTest 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("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec")
+ from("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec")
// 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/HL7MLLPCodecBoundaryTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java
index c1f63cf..02418e3 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecBoundaryTest.java
@@ -47,7 +47,7 @@ public class HL7MLLPCodecBoundaryTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").process(new Processor() {
+ from("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").process(new Processor() {
public void process(Exchange exchange) throws Exception {
// check presence of correct message type
exchange.getIn().getBody(MDM_T02.class);
@@ -71,7 +71,7 @@ public class HL7MLLPCodecBoundaryTest extends HL7TestSupport {
assertEquals(1022, message.length());
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(1);
- template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", message);
+ template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", message);
mockEndpoint.assertIsSatisfied();
}
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java
index ce776fb..b612e38 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecLongTest.java
@@ -46,7 +46,7 @@ public class HL7MLLPCodecLongTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").process(new Processor() {
+ from("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").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);
@@ -73,7 +73,7 @@ public class HL7MLLPCodecLongTest extends HL7TestSupport {
}
message = message.substring(0, message.length() - 1);
assertEquals(70010, message.length());
- String out = template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", message, String.class);
+ String out = template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", message, String.class);
assertEquals("some response", out);
// END SNIPPET: e2
}
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java
index 01c83d2..651d84c 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecMessageFloodingTest.java
@@ -50,7 +50,7 @@ public class HL7MLLPCodecMessageFloodingTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").unmarshal().hl7().process(new Processor() {
+ from("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").unmarshal().hl7().process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input = exchange.getIn().getBody(Message.class);
Message response = input.generateACK();
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java
index beaec49..e4a8263 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java
@@ -45,7 +45,7 @@ public class HL7MLLPCodecPlainStringTest extends HL7TestSupport {
mock.expectedBodiesReceived("Bye World");
// send plain hello world as String
- Object out = template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", "Hello World", String.class);
+ Object out = template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", "Hello World", String.class);
assertMockEndpointsSatisfied();
@@ -59,7 +59,7 @@ public class HL7MLLPCodecPlainStringTest extends HL7TestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
// START SNIPPET: e2
- from("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").process(new Processor() {
+ from("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").process(new Processor() {
public void process(Exchange exchange) throws Exception {
// use plain String as message format
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
index d350778..acf2f83 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecStandAndEndBytesTest.java
@@ -50,7 +50,7 @@ public class HL7MLLPCodecStandAndEndBytesTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").process(new Processor() {
+ from("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input = exchange.getIn().getBody(Message.class);
@@ -76,7 +76,7 @@ public class HL7MLLPCodecStandAndEndBytesTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString(), String.class);
+ String out = template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", 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/HL7MLLPCodecTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
index e3e8dd4..9ef97ef 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecTest.java
@@ -46,7 +46,7 @@ public class HL7MLLPCodecTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").process(new Processor() {
+ from("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input = exchange.getIn().getBody(Message.class);
@@ -73,7 +73,7 @@ public class HL7MLLPCodecTest extends HL7TestSupport {
in.append("\n");
in.append(line2);
- String out = template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString(), String.class);
+ String out = template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", 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/HL7RouteTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
index 9929897..978b3d2 100644
--- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
+++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
@@ -61,7 +61,7 @@ public class HL7RouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString(), String.class);
+ String out = template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString(), String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123", lines[0]);
@@ -84,7 +84,7 @@ public class HL7RouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString(), String.class);
+ String out = template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", 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]);
@@ -106,7 +106,7 @@ public class HL7RouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- template.requestBody("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString());
+ template.requestBody("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec", in.toString());
assertMockEndpointsSatisfied();
}
@@ -119,7 +119,7 @@ public class HL7RouteTest 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("mina2:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec")
+ from("mina:tcp://127.0.0.1:" + getPort() + "?sync=true&codec=#hl7codec")
// 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-mllp/README.md b/components/camel-mllp/README.md
index 1546e24..a35fdc4 100644
--- a/components/camel-mllp/README.md
+++ b/components/camel-mllp/README.md
@@ -55,7 +55,7 @@ provide all of the functionality required to effectively handle the MLLP protoco
The camel-hl7 Mina2 codec and Netty4 decoder do not handle MLLP Framing errors very well - the component will hang waiting
for frames to complete in some instances.
-While both camel-mina2 and camel-netty4 provide a "timeout" function, it is only applied to Producers. MLLP Consumers
+While both camel-mina and camel-netty4 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
timeouts after the first messages is received.
@@ -64,7 +64,7 @@ Also, neither the Mina2 codec nor the Netty4 decoder interrogate HL7 Acknowledgm
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-mina2 are designed to handle a large number of concurrent connections, rapid connect/disconnect
+Both camel-netty4 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.
diff --git a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
index ec2fb45..b1fc768 100644
--- a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
+++ b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
@@ -13,7 +13,7 @@ This component supports the following:
SyslogMessage model objects.
* Type Converter from/to SyslogMessage and
String
-* Integration with the xref:mina2-component.adoc[camel-mina] component.
+* Integration with the xref:mina-component.adoc[camel-mina] component.
* Integration with the xref:netty4-component.adoc[camel-netty] component.
* Encoder and decoder for
the xref:netty4-component.adoc[Netty4 Component] component.
@@ -40,7 +40,7 @@ as its underlying transport layer mechanism.
The UDP port that has been assigned to syslog is 514.
To expose a Syslog listener service we reuse the existing
-xref:mina2-component.adoc[Mina2 Component] component or xref:netty4-component.adoc[Netty4 Component]
+xref:mina-component.adoc[Mina Component] component or xref:netty4-component.adoc[Netty4 Component]
where we just use the `Rfc3164SyslogDataFormat` to marshal and unmarshal
messages. Notice that from *Camel 2.14* onwards the syslog dataformat is
renamed to `SyslogDataFormat`.
@@ -121,7 +121,7 @@ as an InputStream:
</camelContext>
------------------------------------------------------------------------------------------
-The same route using xref:mina2-component.adoc[Mina2 Component]
+The same route using xref:mina-component.adoc[Mina Component]
[source,xml]
-------------------------------------------------------------------------
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
index e76a179..0e68fa2 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
@@ -79,7 +79,7 @@ public class AutomatedConversionTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// we setup a Syslog listener on a random port.
- from("mina2:udp://127.0.0.1:" + serverPort).unmarshal().syslog().process(new Processor() {
+ from("mina:udp://127.0.0.1:" + serverPort).unmarshal().syslog().process(new Processor() {
@Override
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/MinaDataFormatTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
index a6ac82f..fc886c4 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
@@ -78,7 +78,7 @@ public class MinaDataFormatTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("mina2:udp://127.0.0.1:" + serverPort).unmarshal(syslogDataFormat).process(new Processor() {
+ from("mina:udp://127.0.0.1:" + serverPort).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/MinaManyUDPMessagesTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
index b19191d..2bedbfc 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
@@ -75,7 +75,7 @@ public class MinaManyUDPMessagesTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("mina2:udp://127.0.0.1:" + serverPort).unmarshal(syslogDataFormat).process(new Processor() {
+ from("mina:udp://127.0.0.1:" + serverPort).unmarshal(syslogDataFormat).process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof SyslogMessage);
}
[camel] 09/09: CAMEL-13792 - Rename components to default names,
Camel-mina2 to camel-mina - 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 aeda49a5f8cc59b2fd4f14e8b97a16aa68f55c0e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 16:25:36 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina - SB integration test updated
---
.../itest/springboot/{CamelMina2Test.java => CamelMinaTest.java} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMina2Test.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMinaTest.java
similarity index 92%
rename from tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMina2Test.java
rename to tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMinaTest.java
index 7da37d7..abc2af6 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMina2Test.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelMinaTest.java
@@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
@RunWith(Arquillian.class)
-public class CamelMina2Test extends AbstractSpringBootTestSupport {
+public class CamelMinaTest extends AbstractSpringBootTestSupport {
@Deployment
public static Archive<?> createSpringBootPackage() throws Exception {
@@ -34,7 +34,7 @@ public class CamelMina2Test extends AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
- .module(inferModuleName(CamelMina2Test.class))
+ .module(inferModuleName(CamelMinaTest.class))
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseMina2Test$)")
.build();
}