camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [camel] 01/09: CAMEL-13792 - Rename components to default names, Camel-mina2 to camel-mina
Date Mon, 05 Aug 2019 14:26:37 GMT
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 <ancosen@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


Mime
View raw message