You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/07/22 15:53:03 UTC

[15/26] git commit: CAMEL-6555 Updated the scheme of camel-netty4

CAMEL-6555 Updated the scheme of camel-netty4


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e166efcd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e166efcd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e166efcd

Branch: refs/heads/master
Commit: e166efcd3aca127164206fafa1320822b4a8bc41
Parents: 6d50640
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Jul 20 16:10:07 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Jul 22 21:25:18 2014 +0800

----------------------------------------------------------------------
 .../SingleTCPNettyServerBootstrapFactory.java   |  2 +-
 .../SingleUDPNettyServerBootstrapFactory.java   |  1 -
 .../netty4/MultipleCodecsSpringTest.java        |  2 +-
 .../component/netty4/MultipleCodecsTest.java    |  4 ++--
 .../component/netty4/Netty2978IssueTest.java    |  4 ++--
 .../component/netty4/NettyBacklogTest.java      |  2 +-
 ...ponentConfigurationAndDocumentationTest.java |  6 +++---
 .../NettyComponentWithConfigurationTest.java    |  6 +++---
 .../component/netty4/NettyConcurrentTest.java   |  4 ++--
 .../component/netty4/NettyConverterTest.java    |  3 ++-
 .../component/netty4/NettyCustomCodecTest.java  |  2 +-
 .../NettyCustomPipelineFactoryAsynchTest.java   |  4 ++--
 .../NettyCustomPipelineFactorySynchTest.java    |  6 ++----
 .../component/netty4/NettyDisconnectTest.java   |  4 ++--
 .../component/netty4/NettyFileTcpTest.java      |  2 +-
 .../NettyInOutCloseChannelWhenCompleteTest.java |  4 ++--
 .../netty4/NettyInOutFromSedaTest.java          |  4 ++--
 .../NettyInOutWithForcedNoResponseTest.java     |  6 +++---
 .../netty4/NettyManualEndpointTest.java         |  4 ++--
 .../NettyMultipleSimultaneousClientsTest.java   |  2 +-
 .../camel/component/netty4/NettyOptionTest.java |  2 +-
 .../netty4/NettyProducerAsyncEndpointTest.java  |  4 ++--
 .../netty4/NettyProducerPoolDisabledTest.java   |  4 ++--
 .../camel/component/netty4/NettyProxyTest.java  |  6 +++---
 .../netty4/NettyRequestTimeoutIssueTest.java    |  4 ++--
 .../netty4/NettyRequestTimeoutTest.java         | 10 +++++-----
 .../netty4/NettyReuseConnectionTest.java        |  2 +-
 .../component/netty4/NettySSLClasspathTest.java |  4 ++--
 .../netty4/NettySSLClientCertHeadersTest.java   |  4 ++--
 .../netty4/NettySSLContextParametersTest.java   |  4 ++--
 .../netty4/NettySSLPassphaseBeanTest.java       |  4 ++--
 .../camel/component/netty4/NettySSLTest.java    |  4 ++--
 .../component/netty4/NettySingleCodecTest.java  |  4 ++--
 .../netty4/NettySuspendResumeTest.java          |  8 ++++----
 .../component/netty4/NettyTCPAsyncTest.java     |  4 ++--
 .../netty4/NettyTCPSyncNotLazyChannelTest.java  |  6 +++---
 .../component/netty4/NettyTCPSyncTest.java      | 10 +++++-----
 .../NettyTcpWithInOutUsingPlainSocketTest.java  |  2 +-
 .../NettyTextlineInOnlyNullDelimiterTest.java   |  4 ++--
 .../netty4/NettyTextlineInOnlyTest.java         |  8 ++++----
 .../NettyTextlineInOutNonBlockingTest.java      |  4 ++--
 .../NettyTextlineInOutSynchronousFalseTest.java |  4 ++--
 .../NettyTextlineInOutSynchronousTest.java      |  4 ++--
 .../netty4/NettyTextlineInOutTest.java          |  4 ++--
 .../netty4/NettyTransferExchangeOptionTest.java |  4 ++--
 .../component/netty4/NettyUDPAsyncTest.java     |  4 ++--
 .../netty4/NettyUDPLargeMessageInOnlyTest.java  |  4 ++--
 .../netty4/NettyUDPMulticastAsyncTest.java      |  4 ++--
 .../netty4/NettyUDPObjectSyncTest.java          |  4 ++--
 .../component/netty4/NettyUDPSyncTest.java      |  4 ++--
 .../NettyUdpWithInOutUsingPlainSocketTest.java  |  2 +-
 ...UseSharedWorkerThreadPoolManyRoutesTest.java |  2 +-
 .../NettyUseSharedWorkerThreadPoolTest.java     | 12 ++++++------
 ...pringNettyUseSharedWorkerThreadPoolTest.java |  6 +++---
 .../netty4/UnsharableCodecsConflicts2Test.java  |  2 +-
 .../netty4/UnsharableCodecsConflictsTest.java   |  4 ++--
 .../src/test/resources/log4j.properties         |  2 +-
 ...SpringNettyUseSharedWorkerThreadPoolTest.xml | 10 +++++-----
 .../camel/component/netty4/multiple-codecs.xml  | 20 ++++++++++----------
 59 files changed, 134 insertions(+), 136 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java
index bb1921e..6ae3534 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleTCPNettyServerBootstrapFactory.java
@@ -168,7 +168,7 @@ public class SingleTCPNettyServerBootstrapFactory extends ServiceSupport impleme
         }*/
 
         // set the pipeline factory, which creates the pipeline for each newly created channels
-        serverBootstrap.handler(pipelineFactory);
+        serverBootstrap.childHandler(pipelineFactory);
 
         LOG.debug("Created ServerBootstrap {}", serverBootstrap);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
index b7a3875..c6b63a8 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
@@ -115,7 +115,6 @@ public class SingleUDPNettyServerBootstrapFactory extends ServiceSupport impleme
 
     protected void startServerBootstrap() throws Exception {
         // create non-shared worker pool
-        int count = configuration.getWorkerCount() > 0 ? configuration.getWorkerCount() : NettyHelper.DEFAULT_IO_THREADS;
         EventLoopGroup wg = configuration.getWorkerGroup();
         if (wg == null) {
             // create new pool which we should shutdown when stopping as its not shared

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java
index 5b553ef..f2a89e4 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsSpringTest.java
@@ -28,7 +28,7 @@ public class MultipleCodecsSpringTest extends CamelSpringTestSupport {
 
     @Override
     protected AbstractXmlApplicationContext createApplicationContext() {
-        return new ClassPathXmlApplicationContext("/org/apache/camel/component/netty/multiple-codecs.xml");
+        return new ClassPathXmlApplicationContext("/org/apache/camel/component/netty4/multiple-codecs.xml");
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
index c067d93..2e04137 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/MultipleCodecsTest.java
@@ -77,9 +77,9 @@ public class MultipleCodecsTest extends BaseNettyTest {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 // START SNIPPET: routes
-                from("direct:multiple-codec").to("netty:tcp://localhost:{{port}}?encoders=#encoders&sync=false");
+                from("direct:multiple-codec").to("netty4:tcp://localhost:{{port}}?encoders=#encoders&sync=false");
                 
-                from("netty:tcp://localhost:{{port}}?decoders=#length-decoder,#string-decoder&sync=false").to("mock:multiple-codec");
+                from("netty4:tcp://localhost:{{port}}?decoders=#length-decoder,#string-decoder&sync=false").to("mock:multiple-codec");
                 // START SNIPPET: routes
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
index bb5298d..7f9e689 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java
@@ -91,7 +91,7 @@ public class Netty2978IssueTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?sync=true")
+                from("netty4:tcp://localhost:{{port}}?sync=true")
                         .process(new Processor() {
                             public void process(final Exchange exchange) {
                                 String body = exchange.getIn().getBody(String.class);
@@ -107,7 +107,7 @@ public class Netty2978IssueTest extends BaseNettyTest {
         private final ProducerTemplate producerTemplate;
 
         public CamelClient(CamelContext camelContext) {
-            this.endpoint = camelContext.getEndpoint("netty:tcp://localhost:{{port}}?sync=true");
+            this.endpoint = camelContext.getEndpoint("netty4:tcp://localhost:{{port}}?sync=true");
             this.producerTemplate = camelContext.createProducerTemplate();
         }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
index 9c9ed89..c0c25c0 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyBacklogTest.java
@@ -27,7 +27,7 @@ public class NettyBacklogTest extends NettyTCPSyncTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?sync=true&backlog=500")
+                from("netty4:tcp://localhost:{{port}}?sync=true&backlog=500")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             if (exchange.getIn().getBody() instanceof Poetry) {

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
index cd6b0ee..f670a31 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
@@ -32,8 +32,8 @@ public class NettyComponentConfigurationAndDocumentationTest extends CamelTestSu
 
     @Test
     public void testComponentConfiguration() throws Exception {
-        NettyComponent comp = context.getComponent("netty", NettyComponent.class);
-        EndpointConfiguration conf = comp.createConfiguration("netty:tcp://localhost:5150?sync=true"
+        NettyComponent comp = context.getComponent("netty4", NettyComponent.class);
+        EndpointConfiguration conf = comp.createConfiguration("netty4:tcp://localhost:5150?sync=true"
                 + "&maximumPoolSize=32&ssl=true&passphrase=#password");
 
         assertEquals("true", conf.getParameter("sync"));
@@ -50,7 +50,7 @@ public class NettyComponentConfigurationAndDocumentationTest extends CamelTestSu
     @Test
     public void testComponentDocumentation() throws Exception {
         CamelContext context = new DefaultCamelContext();
-        String html = context.getComponentDocumentation("netty");
+        String html = context.getComponentDocumentation("netty4");
         assertNotNull("Should have found some auto-generated HTML if on Java 7", html);
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
index c81152d..9076675 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentWithConfigurationTest.java
@@ -26,15 +26,15 @@ public class NettyComponentWithConfigurationTest extends CamelTestSupport {
 
     @Test
     public void testNettyComponentWithConfiguration() throws Exception {
-        NettyComponent comp = context.getComponent("netty", NettyComponent.class);
+        NettyComponent comp = context.getComponent("netty4", NettyComponent.class);
 
         NettyConfiguration cfg = new NettyConfiguration();
 
         comp.setConfiguration(cfg);
         assertSame(cfg, comp.getConfiguration());
 
-        NettyEndpoint e1 = (NettyEndpoint) comp.createEndpoint("netty://tcp://localhost:4455");
-        NettyEndpoint e2 = (NettyEndpoint) comp.createEndpoint("netty://tcp://localhost:5566?sync=false&needClientAuth=true");
+        NettyEndpoint e1 = (NettyEndpoint) comp.createEndpoint("netty4://tcp://localhost:4455");
+        NettyEndpoint e2 = (NettyEndpoint) comp.createEndpoint("netty4://tcp://localhost:5566?sync=false&needClientAuth=true");
 
         // should not be same
         assertNotSame(e1, e2);

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
index 1da8861..123f557 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConcurrentTest.java
@@ -64,7 +64,7 @@ public class NettyConcurrentTest extends BaseNettyTest {
             final int index = i;
             Future<String> out = executor.submit(new Callable<String>() {
                 public String call() throws Exception {
-                    String reply = template.requestBody("netty:tcp://localhost:{{port}}", index, String.class);
+                    String reply = template.requestBody("netty4:tcp://localhost:{{port}}", index, String.class);
                     log.debug("Sent {} received {}", index, reply);
                     assertEquals("Bye " + index, reply);
                     return reply;
@@ -92,7 +92,7 @@ public class NettyConcurrentTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?sync=true").process(new Processor() {
+                from("netty4:tcp://localhost:{{port}}?sync=true").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String body = exchange.getIn().getBody(String.class);
                         exchange.getOut().setBody("Bye " + body);

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
index 6d9f8ec..8d856ed 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyConverterTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.netty4;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.PooledByteBufAllocator;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Before;
@@ -38,7 +39,7 @@ public class NettyConverterTest extends CamelTestSupport {
     @Before
     public void startUp() {
         byte[] bytes = PAYLOAD.getBytes();
-        buf = ByteBufAllocator.DEFAULT.buffer(bytes.length);
+        buf = PooledByteBufAllocator.DEFAULT.buffer(bytes.length);
         buf.writeBytes(bytes);
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
index 353c60a..57722fb 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomCodecTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 public class NettyCustomCodecTest extends BaseNettyTest {
 
-    private String uri = "netty:tcp://localhost:{{port}}?disconnect=true&sync=false"
+    private String uri = "netty4:tcp://localhost:{{port}}?disconnect=true&sync=false"
         + "&allowDefaultCodec=false&decoders=#myCustomDecoder,#myCustomDecoder2&encoder=#myCustomEncoder";
 
     // use reaadble bytes

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
index ba73be7..df7f49d 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactoryAsynchTest.java
@@ -49,7 +49,7 @@ public class NettyCustomPipelineFactoryAsynchTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?serverPipelineFactory=#spf&textline=true")
+                from("netty4:tcp://localhost:{{port}}?serverPipelineFactory=#spf&textline=true")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 exchange.getOut().setBody("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'");
@@ -62,7 +62,7 @@ public class NettyCustomPipelineFactoryAsynchTest extends BaseNettyTest {
     @Test
     public void testCustomClientPipelineFactory() throws Exception {
         String response = (String) template.requestBody(
-                "netty:tcp://localhost:{{port}}?clientPipelineFactory=#cpf&textline=true",
+                "netty4:tcp://localhost:{{port}}?clientPipelineFactory=#cpf&textline=true",
                 "Forest Gump describing Vietnam...");
 
         assertEquals("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'", response);

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
index dd85166..ebfa262 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyCustomPipelineFactorySynchTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.component.netty4;
 
-import java.nio.channels.Channels;
-
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelPipeline;
 import io.netty.handler.codec.DelimiterBasedFrameDecoder;
@@ -51,7 +49,7 @@ public class NettyCustomPipelineFactorySynchTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?serverPipelineFactory=#spf&sync=true&textline=true")
+                from("netty4:tcp://localhost:{{port}}?serverPipelineFactory=#spf&sync=true&textline=true")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 exchange.getOut().setBody("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'");
@@ -64,7 +62,7 @@ public class NettyCustomPipelineFactorySynchTest extends BaseNettyTest {
     @Test
     public void testCustomClientPipelineFactory() throws Exception {
         String response = (String) template.requestBody(
-                "netty:tcp://localhost:{{port}}?clientPipelineFactory=#cpf&sync=true&textline=true",
+                "netty4:tcp://localhost:{{port}}?clientPipelineFactory=#cpf&sync=true&textline=true",
                 "Forest Gump describing Vietnam...");
 
         assertEquals("Forrest Gump: We was always taking long walks, and we was always looking for a guy named 'Charlie'", response);

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
index 1bbf636..07db331 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyDisconnectTest.java
@@ -28,7 +28,7 @@ public class NettyDisconnectTest extends BaseNettyTest {
 
     @Test
     public void testCloseSessionWhenComplete() throws Exception {
-        Object out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "Claus");
+        Object out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "Claus");
         assertEquals("Bye Claus", out);
     }
 
@@ -36,7 +36,7 @@ public class NettyDisconnectTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?sync=true&disconnect=true").process(new Processor() {
+                from("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String body = exchange.getIn().getBody(String.class);
                         exchange.getOut().setBody("Bye " + body);

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
index 8376a72..61340cb 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyFileTcpTest.java
@@ -38,7 +38,7 @@ public class NettyFileTcpTest extends BaseNettyTest {
         return new RouteBuilder() {
             public void configure() {
                 // lets setup a server
-                from("netty:tcp://localhost:{{port}}?sync=false&textline=true")
+                from("netty4:tcp://localhost:{{port}}?sync=false&textline=true")
                         .to("mock:results");
 
                 from("file:src/test/data?noop=true&fileName=message1.txt").

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
index 0f650f1..d774a28 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutCloseChannelWhenCompleteTest.java
@@ -28,7 +28,7 @@ public class NettyInOutCloseChannelWhenCompleteTest extends BaseNettyTest {
 
     @Test
     public void testCloseSessionWhenComplete() throws Exception {
-        Object out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true", "Claus");
+        Object out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true", "Claus");
         assertEquals("Bye Claus", out);
     }
 
@@ -36,7 +36,7 @@ public class NettyInOutCloseChannelWhenCompleteTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?sync=true").process(new Processor() {
+                from("netty4:tcp://localhost:{{port}}?sync=true").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String body = exchange.getIn().getBody(String.class);
                         exchange.getOut().setBody("Bye " + body);

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
index a8a04fa..9a794f0 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutFromSedaTest.java
@@ -44,11 +44,11 @@ public class NettyInOutFromSedaTest extends BaseNettyTest {
             public void configure() throws Exception {
                 from("seda:start")
                     .log("before ${body}")
-                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true")
+                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
                     .log("after ${body}")
                     .to("mock:result");
 
-                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
                     .transform(body().prepend("Bye "));
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
index 5d875a3..e679d0f 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyInOutWithForcedNoResponseTest.java
@@ -27,14 +27,14 @@ public class NettyInOutWithForcedNoResponseTest extends BaseNettyTest {
 
     @Test
     public void testResponse() throws Exception {
-        Object out = template.requestBody("netty:tcp://localhost:{{port}}", "Copenhagen");
+        Object out = template.requestBody("netty4:tcp://localhost:{{port}}", "Copenhagen");
         assertEquals("Hello Claus", out);
     }
 
     @Test
     public void testNoResponse() throws Exception {
         try {
-            template.requestBody("netty:tcp://localhost:{{port}}", "London");
+            template.requestBody("netty4:tcp://localhost:{{port}}", "London");
             fail("Should throw an exception");
         } catch (RuntimeCamelException e) {
             assertTrue(e.getCause().getMessage().startsWith("No response"));
@@ -45,7 +45,7 @@ public class NettyInOutWithForcedNoResponseTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}")
+                from("netty4:tcp://localhost:{{port}}")
                     .choice()
                         .when(body().isEqualTo("Copenhagen")).transform(constant("Hello Claus"))
                         .otherwise().transform(constant(null));

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
index 58a279e..4707a61 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyManualEndpointTest.java
@@ -40,7 +40,7 @@ public class NettyManualEndpointTest extends BaseNettyTest {
 
         assertMockEndpointsSatisfied();
 
-        assertEquals("netty:tcp://localhost:" + getPort(), endpoint.getEndpointUri());
+        assertEquals("netty4:tcp://localhost:" + getPort(), endpoint.getEndpointUri());
     }
 
     @Override
@@ -64,7 +64,7 @@ public class NettyManualEndpointTest extends BaseNettyTest {
                 // create and start component
                 NettyComponent component = new NettyComponent(getContext());
                 component.setConfiguration(nettyConfig);
-                getContext().addComponent("netty", component);
+                getContext().addComponent("netty4", component);
                 component.start();
 
                 // create and start endpoint, pass in null as endpoint uri

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
index 9634c84..16691cf 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyMultipleSimultaneousClientsTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
  */
 public class NettyMultipleSimultaneousClientsTest extends BaseNettyTest {
 
-    private String uri = "netty:tcp://localhost:{{port}}?sync=true&reuseAddress=true&synchronous=false";
+    private String uri = "netty4:tcp://localhost:{{port}}?sync=true&reuseAddress=true&synchronous=false";
     private int clientCount = 20;
     private CountDownLatch startLatch = new CountDownLatch(1);
     private CountDownLatch finishLatch = new CountDownLatch(clientCount);

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
index ab49d3b..7308d20 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyOptionTest.java
@@ -27,7 +27,7 @@ public class NettyOptionTest extends NettyTCPSyncTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?sync=true&option.child.keepAlive=false")
+                from("netty4:tcp://localhost:{{port}}?sync=true&option.child.keepAlive=false")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             if (exchange.getIn().getBody() instanceof Poetry) {

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
index 6c2e8ac..8e6c921 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerAsyncEndpointTest.java
@@ -56,7 +56,7 @@ public class NettyProducerAsyncEndpointTest extends BaseNettyTest {
                                 beforeThreadName = Thread.currentThread().getName();
                             }
                         })
-                        .to("netty:tcp://localhost:{{port}}?textline=true&sync=true")
+                        .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 afterThreadName = Thread.currentThread().getName();
@@ -66,7 +66,7 @@ public class NettyProducerAsyncEndpointTest extends BaseNettyTest {
                         .to("mock:after")
                         .to("mock:result");
 
-                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
                     .delay(1000)
                     .validate(body().isInstanceOf(String.class))
                     .transform(body().regexReplaceAll("Hello", "Bye"));

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
index 138f88f..8008beb 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerPoolDisabledTest.java
@@ -38,9 +38,9 @@ public class NettyProducerPoolDisabledTest extends BaseNettyTest {
             @Override
             public void configure() throws Exception {
                 from("direct:start")
-                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&producerPoolEnabled=false");
+                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&producerPoolEnabled=false");
 
-                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .transform(body().regexReplaceAll("Hello", "Bye"));

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
index e8e42a5..f6f68ae 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProxyTest.java
@@ -33,7 +33,7 @@ public class NettyProxyTest extends BaseNettyTest {
         getMockEndpoint("mock:proxy").expectedBodiesReceived("Camel");
         getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel");
 
-        Object body = template.requestBody("netty:tcp://localhost:" + port1 + "?sync=true&textline=true", "Camel\n");
+        Object body = template.requestBody("netty4:tcp://localhost:" + port1 + "?sync=true&textline=true", "Camel\n");
         assertEquals("Bye Camel", body);
 
         assertMockEndpointsSatisfied();
@@ -47,12 +47,12 @@ public class NettyProxyTest extends BaseNettyTest {
                 port1 = getPort();
                 port2 = getNextPort();
 
-                fromF("netty:tcp://localhost:%s?sync=true&textline=true", port1)
+                fromF("netty4:tcp://localhost:%s?sync=true&textline=true", port1)
                     .to("mock:before")
                     .toF("netty:tcp://localhost:%s?sync=true&textline=true", port2)
                     .to("mock:after");
 
-                fromF("netty:tcp://localhost:%s?sync=true&textline=true", port2)
+                fromF("netty4:tcp://localhost:%s?sync=true&textline=true", port2)
                     .to("mock:proxy")
                     .transform().simple("Bye ${body}\n");
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
index 31c0ac4..d9a800b 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutIssueTest.java
@@ -31,9 +31,9 @@ public class NettyRequestTimeoutIssueTest extends CamelTestSupport {
             @Override
             public void configure() throws Exception {
                 from("direct:out")
-                        .to("netty:tcp://localhost:8080?requestTimeout=5000");
+                        .to("netty4:tcp://localhost:8080?requestTimeout=5000");
 
-                from("netty:tcp://localhost:8080")
+                from("netty4:tcp://localhost:8080")
                         .to("log:nettyCase?showAll=true&multiline=true");
             }
         };

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
index a3de7b7..fe98395 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyRequestTimeoutTest.java
@@ -30,14 +30,14 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
 
     @Test
     public void testRequestTimeoutOK() throws Exception {
-        String out = template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=5000", "Hello Camel", String.class);
+        String out = template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=5000", "Hello Camel", String.class);
         assertEquals("Bye World", out);
     }
 
     @Test
     public void testRequestTimeout() throws Exception {
         try {
-            template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=1000", "Hello Camel", String.class);
+            template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=1000", "Hello Camel", String.class);
             fail("Should have thrown exception");
         } catch (CamelExecutionException e) {
             ReadTimeoutException cause = assertIsInstanceOf(ReadTimeoutException.class, e.getCause());
@@ -48,7 +48,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
     @Test
     public void testRequestTimeoutAndOk() throws Exception {
         try {
-            template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=1000", "Hello Camel", String.class);
+            template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=1000", "Hello Camel", String.class);
             fail("Should have thrown exception");
         } catch (CamelExecutionException e) {
             ReadTimeoutException cause = assertIsInstanceOf(ReadTimeoutException.class, e.getCause());
@@ -56,7 +56,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
         }
 
         // now we try again but this time the is no delay on server and thus faster
-        String out = template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=1000", "Hello World", String.class);
+        String out = template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true&requestTimeout=1000", "Hello World", String.class);
         assertEquals("Bye World", out);
     }
 
@@ -65,7 +65,7 @@ public class NettyRequestTimeoutTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
                     .process(new Processor() {
                         @Override
                         public void process(Exchange exchange) throws Exception {

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
index e1252ab..424fdf1 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyReuseConnectionTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
  */
 public class NettyReuseConnectionTest extends BaseNettyTest {
 
-    private String uri = "netty:tcp://localhost:{{port}}?sync=true&disconnect=false";
+    private String uri = "netty4:tcp://localhost:{{port}}?sync=true&disconnect=false";
 
     @Test
     public void testReuseConnection() throws Exception {

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
index 6816074..b588c62 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClasspathTest.java
@@ -38,7 +38,7 @@ public class NettySSLClasspathTest extends BaseNettyTest {
 
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
+                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");                           
@@ -49,7 +49,7 @@ public class NettySSLClasspathTest extends BaseNettyTest {
         context.start();
 
         String response = template.requestBody(
-                "netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
+                "netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
                 "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
index 56345c9..5d4eb34 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLClientCertHeadersTest.java
@@ -55,7 +55,7 @@ public class NettySSLClientCertHeadersTest extends BaseNettyTest {
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 // needClientAuth=true so we can get the client certificate details
-                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreFile=#ksf&trustStoreFile=#tsf"
+                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreFile=#ksf&trustStoreFile=#tsf"
                         + "&needClientAuth=true&sslClientCertHeaders=true")
                     .to("mock:input")
                     .transform().constant("Bye World");
@@ -64,7 +64,7 @@ public class NettySSLClientCertHeadersTest extends BaseNettyTest {
         context.start();
 
         String response = template.requestBody(
-                "netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreFile=#ksf&trustStoreFile=#tsf",
+                "netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreFile=#ksf&trustStoreFile=#tsf",
                 "Hello World", String.class);
         assertEquals("Bye World", response);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
index 0ef1406..29b9630 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLContextParametersTest.java
@@ -73,7 +73,7 @@ public class NettySSLContextParametersTest extends BaseNettyTest {
 
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters")
+                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");                           
@@ -84,7 +84,7 @@ public class NettySSLContextParametersTest extends BaseNettyTest {
         context.start();
 
         String response = template.requestBody(
-                "netty:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters",
+                "netty4:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters",
                 "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
index b5843ff..07868ed 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLPassphaseBeanTest.java
@@ -46,7 +46,7 @@ public class NettySSLPassphaseBeanTest extends BaseNettyTest {
 
         context.addRoutes(new RouteBuilder() {
             public void configure() {
-                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
+                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             exchange.getOut().setBody("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.");                           
@@ -57,7 +57,7 @@ public class NettySSLPassphaseBeanTest extends BaseNettyTest {
         context.start();
 
         String response = template.requestBody(
-                "netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
+                "netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks",
                 "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
index dcc4fce..349ca01 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySSLTest.java
@@ -52,7 +52,7 @@ public class NettySSLTest extends BaseNettyTest {
         context.addRoutes(new RouteBuilder() {
             public void configure() {
                 // needClientAuth=true so we can get the client certificate details
-                from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreFile=#ksf&trustStoreFile=#tsf&needClientAuth=true")
+                from("netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreFile=#ksf&trustStoreFile=#tsf&needClientAuth=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             SSLSession session = exchange.getIn().getHeader(NettyConstants.NETTY_SSL_SESSION, SSLSession.class);
@@ -71,7 +71,7 @@ public class NettySSLTest extends BaseNettyTest {
         context.start();
 
         String response = template.requestBody(
-                "netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreFile=#ksf&trustStoreFile=#tsf",
+                "netty4:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreFile=#ksf&trustStoreFile=#tsf",
                 "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
index 19b0dea..354c2e2 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySingleCodecTest.java
@@ -54,9 +54,9 @@ public class NettySingleCodecTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("direct:single-codec").to("netty:tcp://localhost:{{port}}?encoder=#encoder&sync=false");
+                from("direct:single-codec").to("netty4:tcp://localhost:{{port}}?encoder=#encoder&sync=false");
 
-                from("netty:tcp://localhost:{{port}}?decoder=#decoder&sync=false").to("mock:single-codec");
+                from("netty4:tcp://localhost:{{port}}?decoder=#decoder&sync=false").to("mock:single-codec");
             }
         };
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
index 514f9a1..0c8c71d 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettySuspendResumeTest.java
@@ -25,13 +25,13 @@ public class NettySuspendResumeTest extends BaseNettyTest {
     public void testSuspendResume() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Camel", "Again");
 
-        String out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "Camel", String.class);
+        String out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "Camel", String.class);
         assertEquals("Bye Camel", out);
 
         context.suspendRoute("foo");
 
         try {
-            template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "World", String.class);
+            template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "World", String.class);
             fail("Should not allow connecting as its suspended");
         } catch (Exception e) {
             // expected
@@ -39,7 +39,7 @@ public class NettySuspendResumeTest extends BaseNettyTest {
 
         context.resumeRoute("foo");
 
-        out = template.requestBody("netty:tcp://localhost:{{port}}?sync=true&disconnect=true", "Again", String.class);
+        out = template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&disconnect=true", "Again", String.class);
         assertEquals("Bye Again", out);
 
         assertMockEndpointsSatisfied();
@@ -50,7 +50,7 @@ public class NettySuspendResumeTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?sync=true").routeId("foo")
+                from("netty4:tcp://localhost:{{port}}?sync=true").routeId("foo")
                     .to("log:result")
                     .to("mock:result")
                     .transform(body().prepend("Bye "));

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
index 92ba8d5..cd97937 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPAsyncTest.java
@@ -55,7 +55,7 @@ public class NettyTCPAsyncTest extends BaseNettyTest {
     public void testTCPInOnlyWithNettyConsumer() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMessageCount(1);
-        sendFile("netty:tcp://localhost:{{port}}?sync=false");
+        sendFile("netty4:tcp://localhost:{{port}}?sync=false");
         
         mock.assertIsSatisfied();
     }
@@ -65,7 +65,7 @@ public class NettyTCPAsyncTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?sync=false")
+                from("netty4:tcp://localhost:{{port}}?sync=false")
                     .to("log:result")
                     .to("mock:result");                
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
index c2a31d8..8d522d7 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncNotLazyChannelTest.java
@@ -26,7 +26,7 @@ public class NettyTCPSyncNotLazyChannelTest extends BaseNettyTest {
     @Test
     public void testTCPStringInOutWithNettyConsumer() throws Exception {
         String response = template.requestBody(
-            "netty:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false",
+            "netty4:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false",
             "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }
@@ -34,7 +34,7 @@ public class NettyTCPSyncNotLazyChannelTest extends BaseNettyTest {
     @Test
     public void testTCPObjectInOutWithNettyConsumer() throws Exception {
         Poetry poetry = new Poetry();
-        Poetry response = (Poetry) template.requestBody("netty:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false", poetry);
+        Poetry response = (Poetry) template.requestBody("netty4:tcp://localhost:{{port}}?sync=true&lazyChannelCreation=false", poetry);
         assertEquals("Dr. Sarojini Naidu", response.getPoet());
     }
 
@@ -43,7 +43,7 @@ public class NettyTCPSyncNotLazyChannelTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?sync=true")
+                from("netty4:tcp://localhost:{{port}}?sync=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             if (exchange.getIn().getBody() instanceof Poetry) {

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
index 937a10f..8671eb6 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTCPSyncTest.java
@@ -26,7 +26,7 @@ public class NettyTCPSyncTest extends BaseNettyTest {
     @Test
     public void testTCPStringInOutWithNettyConsumer() throws Exception {
         String response = template.requestBody(
-            "netty:tcp://localhost:{{port}}?sync=true",
+            "netty4:tcp://localhost:{{port}}?sync=true",
             "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);        
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }
@@ -34,12 +34,12 @@ public class NettyTCPSyncTest extends BaseNettyTest {
     @Test
     public void testTCPStringInOutWithNettyConsumer2Times() throws Exception {
         String response = template.requestBody(
-            "netty:tcp://localhost:{{port}}?sync=true",
+            "netty4:tcp://localhost:{{port}}?sync=true",
             "Epitaph in Kohima, India marking the WWII Battle of Kohima and Imphal, Burma Campaign - Attributed to John Maxwell Edmonds", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
 
         response = template.requestBody(
-            "netty:tcp://localhost:{{port}}?sync=true",
+            "netty4:tcp://localhost:{{port}}?sync=true",
             "Hello World", String.class);
         assertEquals("When You Go Home, Tell Them Of Us And Say, For Your Tomorrow, We Gave Our Today.", response);
     }
@@ -47,7 +47,7 @@ public class NettyTCPSyncTest extends BaseNettyTest {
     @Test
     public void testTCPObjectInOutWithNettyConsumer() throws Exception {
         Poetry poetry = new Poetry();
-        Poetry response = (Poetry) template.requestBody("netty:tcp://localhost:{{port}}?sync=true", poetry);
+        Poetry response = (Poetry) template.requestBody("netty4:tcp://localhost:{{port}}?sync=true", poetry);
         assertEquals("Dr. Sarojini Naidu", response.getPoet());
     }
     
@@ -56,7 +56,7 @@ public class NettyTCPSyncTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?sync=true")
+                from("netty4:tcp://localhost:{{port}}?sync=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             if (exchange.getIn().getBody() instanceof Poetry) {

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
index c2be3b3..17e22c1 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTcpWithInOutUsingPlainSocketTest.java
@@ -121,7 +121,7 @@ public class NettyTcpWithInOutUsingPlainSocketTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("netty:tcp://localhost:{{port}}?textline=true&sync=true").process(new Processor() {
+                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true").process(new Processor() {
                     public void process(Exchange e) {
                         String in = e.getIn().getBody(String.class);
                         if ("force-null-out-body".equals(in)) {

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
index 67e274c..16c45d1 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyNullDelimiterTest.java
@@ -28,7 +28,7 @@ public class NettyTextlineInOnlyNullDelimiterTest extends BaseNettyTest {
     public void testTextlineInOnlyNull() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
 
-        template.sendBody("netty:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false", "Hello World\u0000");
+        template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false", "Hello World\u0000");
 
         assertMockEndpointsSatisfied();
     }
@@ -38,7 +38,7 @@ public class NettyTextlineInOnlyNullDelimiterTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false")
+                from("netty4:tcp://localhost:{{port}}?textline=true&delimiter=NULL&sync=false")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .to("mock:result");

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
index 87accfe..29e37ca 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOnlyTest.java
@@ -28,7 +28,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
     public void testTextlineInOnlyDual() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World", "how are you?");
 
-        template.sendBody("netty:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\nhow are you?\n");
+        template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\nhow are you?\n");
 
         assertMockEndpointsSatisfied();
     }
@@ -37,7 +37,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
     public void testTextlineInOnlyAutoAppend() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
 
-        template.sendBody("netty:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World");
+        template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World");
 
         assertMockEndpointsSatisfied();
     }
@@ -46,7 +46,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
     public void testTextlineInOnly() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
 
-        template.sendBody("netty:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\n");
+        template.sendBody("netty4:tcp://localhost:{{port}}?textline=true&sync=false", "Hello World\n");
 
         assertMockEndpointsSatisfied();
     }
@@ -56,7 +56,7 @@ public class NettyTextlineInOnlyTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?textline=true&sync=false")
+                from("netty4:tcp://localhost:{{port}}?textline=true&sync=false")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .to("mock:result");

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
index a6819c4..54696e7 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutNonBlockingTest.java
@@ -56,7 +56,7 @@ public class NettyTextlineInOutNonBlockingTest extends BaseNettyTest {
                             beforeThreadName = Thread.currentThread().getName();
                         }
                     })
-                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true")
+                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             afterThreadName = Thread.currentThread().getName();
@@ -65,7 +65,7 @@ public class NettyTextlineInOutNonBlockingTest extends BaseNettyTest {
                     .to("log:after")
                     .to("mock:result");
 
-                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             beforeThreadName2 = Thread.currentThread().getName();

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
index 0198547..ab31fe9 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousFalseTest.java
@@ -53,7 +53,7 @@ public class NettyTextlineInOutSynchronousFalseTest extends BaseNettyTest {
                             beforeThreadName = Thread.currentThread().getName();
                         }
                     })
-                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
+                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             afterThreadName = Thread.currentThread().getName();
@@ -62,7 +62,7 @@ public class NettyTextlineInOutSynchronousFalseTest extends BaseNettyTest {
                     .to("log:after")
                     .to("mock:result");
 
-                from("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
+                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=false")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .transform(body().regexReplaceAll("Hello", "Bye"));

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
index cc7ddf8..8f97db5 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutSynchronousTest.java
@@ -53,7 +53,7 @@ public class NettyTextlineInOutSynchronousTest extends BaseNettyTest {
                             beforeThreadName = Thread.currentThread().getName();
                         }
                     })
-                    .to("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
+                    .to("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             afterThreadName = Thread.currentThread().getName();
@@ -62,7 +62,7 @@ public class NettyTextlineInOutSynchronousTest extends BaseNettyTest {
                     .to("log:after")
                     .to("mock:result");
 
-                from("netty:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
+                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true&synchronous=true")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .transform(body().regexReplaceAll("Hello", "Bye"));

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
index 0c5ef6d..0020a99 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTextlineInOutTest.java
@@ -28,7 +28,7 @@ public class NettyTextlineInOutTest extends BaseNettyTest {
     public void testTextlineInOut() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
 
-        String reply = template.requestBody("netty:tcp://localhost:{{port}}?textline=true&sync=true", "Hello World", String.class);
+        String reply = template.requestBody("netty4:tcp://localhost:{{port}}?textline=true&sync=true", "Hello World", String.class);
         assertEquals("Bye World", reply);
 
         assertMockEndpointsSatisfied();
@@ -39,7 +39,7 @@ public class NettyTextlineInOutTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:tcp://localhost:{{port}}?textline=true&sync=true")
+                from("netty4:tcp://localhost:{{port}}?textline=true&sync=true")
                     // body should be a String when using textline codec
                     .validate(body().isInstanceOf(String.class))
                     .to("mock:result")

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
index 9af4873..3127b98 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyTransferExchangeOptionTest.java
@@ -45,7 +45,7 @@ public class NettyTransferExchangeOptionTest extends BaseNettyTest {
     }
 
     private Exchange sendExchange(boolean setException) throws Exception {
-        Endpoint endpoint = context.getEndpoint("netty:tcp://localhost:{{port}}?transferExchange=true");
+        Endpoint endpoint = context.getEndpoint("netty4:tcp://localhost:{{port}}?transferExchange=true");
         Exchange exchange = endpoint.createExchange();
 
         Message message = exchange.getIn();
@@ -97,7 +97,7 @@ public class NettyTransferExchangeOptionTest extends BaseNettyTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("netty:tcp://localhost:{{port}}?transferExchange=true").process(new Processor() {
+                from("netty4:tcp://localhost:{{port}}?transferExchange=true").process(new Processor() {
                     public void process(Exchange e) throws InterruptedException {
                         assertNotNull(e.getIn().getBody());
                         assertNotNull(e.getIn().getHeaders());

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
index cba6c37..d395583 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPAsyncTest.java
@@ -43,7 +43,7 @@ public class NettyUDPAsyncTest extends BaseNettyTest {
         mock.expectedMessageCount(1);
         mock.message(0).body().startsWith("Song Of A Dream".getBytes());
 
-        sendFile("netty:udp://localhost:{{port}}?sync=false");
+        sendFile("netty4:udp://localhost:{{port}}?sync=false");
 
         mock.assertIsSatisfied();
     }
@@ -53,7 +53,7 @@ public class NettyUDPAsyncTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:udp://localhost:{{port}}?sync=false")
+                from("netty4:udp://localhost:{{port}}?sync=false")
                     .to("mock:result")
                     .to("log:Message"); 
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/e166efcd/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
index 1829c00..a213469 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyUDPLargeMessageInOnlyTest.java
@@ -36,7 +36,7 @@ public class NettyUDPLargeMessageInOnlyTest extends BaseNettyTest {
         String message = new String(msgBytes);
 
         getMockEndpoint("mock:result").expectedBodiesReceived(message);
-        template.sendBody("netty:udp://localhost:{{port}}?sync=false", message);
+        template.sendBody("netty4:udp://localhost:{{port}}?sync=false", message);
         assertMockEndpointsSatisfied();
     }
 
@@ -60,7 +60,7 @@ public class NettyUDPLargeMessageInOnlyTest extends BaseNettyTest {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("netty:udp://localhost:{{port}}?receiveBufferSizePredictor=2048&sync=false")
+                from("netty4:udp://localhost:{{port}}?receiveBufferSizePredictor=2048&sync=false")
                     .to("mock:result");
             }
         };