You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/01/05 19:10:18 UTC

[1/6] camel git commit: Polished

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 0e2bf50e5 -> 13c0c3bd1
  refs/heads/master 61d6d0f6a -> 57c79a900


Polished


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

Branch: refs/heads/master
Commit: 9a3cd3ec052241bade0e5f0ede9ecd0a1f87f800
Parents: 61d6d0f
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 18:47:39 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 5 18:49:19 2016 +0100

----------------------------------------------------------------------
 .../component/netty/http/NettyHttpBridgeEncodedPathTest.java   | 6 +++---
 .../component/netty4/http/NettyHttpBridgeEncodedPathTest.java  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9a3cd3ec/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBridgeEncodedPathTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBridgeEncodedPathTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBridgeEncodedPathTest.java
index 71c0580..25a3bff 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBridgeEncodedPathTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBridgeEncodedPathTest.java
@@ -52,11 +52,11 @@ public class NettyHttpBridgeEncodedPathTest extends BaseNettyTest {
                         exchange.getOut().setBody(exchange.getIn().getHeader(Exchange.HTTP_QUERY));
                     }
                 };
-                from("netty-http://http://localhost:" + port2 + "/nettyTestRouteA?matchOnUriPrefix=true")
+                from("netty-http:http://localhost:" + port2 + "/nettyTestRouteA?matchOnUriPrefix=true")
                         .log("Using NettyTestRouteA route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
-                        .to("netty-http://http://localhost:" + port1 + "/nettyTestRouteB?throwExceptionOnFailure=false&bridgeEndpoint=true");
+                        .to("netty-http:http://localhost:" + port1 + "/nettyTestRouteB?throwExceptionOnFailure=false&bridgeEndpoint=true");
 
-                from("netty-http://http://localhost:" + port1 + "/nettyTestRouteB?matchOnUriPrefix=true")
+                from("netty-http:http://localhost:" + port1 + "/nettyTestRouteB?matchOnUriPrefix=true")
                         .log("Using NettyTestRouteB route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
                         .process(serviceProc);
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/9a3cd3ec/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
index 59c82f6..a2c9b3c 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
@@ -52,11 +52,11 @@ public class NettyHttpBridgeEncodedPathTest extends BaseNettyTest {
                         exchange.getOut().setBody(exchange.getIn().getHeader(Exchange.HTTP_QUERY));
                     }
                 };
-                from("netty4-http://http://localhost:" + port2 + "/nettyTestRouteA?matchOnUriPrefix=true")
+                from("netty4-http:http://localhost:" + port2 + "/nettyTestRouteA?matchOnUriPrefix=true")
                         .log("Using NettyTestRouteA route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
-                        .to("netty4-http://http://localhost:" + port1 + "/nettyTestRouteB?throwExceptionOnFailure=false&bridgeEndpoint=true");
+                        .to("netty4-http:http://localhost:" + port1 + "/nettyTestRouteB?throwExceptionOnFailure=false&bridgeEndpoint=true");
 
-                from("netty4-http://http://localhost:" + port1 + "/nettyTestRouteB?matchOnUriPrefix=true")
+                from("netty4-http:http://localhost:" + port1 + "/nettyTestRouteB?matchOnUriPrefix=true")
                         .log("Using NettyTestRouteB route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
                         .process(serviceProc);
             }


[3/6] camel git commit: Camel component docs

Posted by da...@apache.org.
Camel component docs


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

Branch: refs/heads/master
Commit: 57c79a900a689014780748f8b3e5dc69d3293881
Parents: d1a9209
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 19:09:27 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 5 19:09:27 2016 +0100

----------------------------------------------------------------------
 .../apache/camel/component/netty4/NettyConfiguration.java    | 8 ++++++++
 .../component/netty4/NettyServerBootstrapConfiguration.java  | 1 +
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/57c79a90/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
index 7a447f5..7f33e39 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
@@ -56,7 +56,15 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem
     private int decoderMaxLineLength = 1024;
     @UriParam
     private String encoding;
+    @UriParam(description = "To use a single encoder. This options is deprecated use encoders instead.")
+    @Deprecated
+    private ChannelHandler encoder;
+    @UriParam(javaType = "java.lang.String")
     private List<ChannelHandler> encoders = new ArrayList<ChannelHandler>();
+    @UriParam(description = "To use a single decoder. This options is deprecated use encoders instead.")
+    @Deprecated
+    private ChannelHandler decoder;
+    @UriParam(javaType = "java.lang.String")
     private List<ChannelHandler> decoders = new ArrayList<ChannelHandler>();
     @UriParam
     private boolean disconnect;

http://git-wip-us.apache.org/repos/asf/camel/blob/57c79a90/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
index f790fe6..5221040 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
@@ -63,6 +63,7 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
     protected ServerInitializerFactory serverInitializerFactory;
     @UriParam(label = "consumer,advanced")
     protected NettyServerBootstrapFactory nettyServerBootstrapFactory;
+    @UriParam(label = "advanced", prefix = "option.", multiValue = true)
     protected Map<String, Object> options;
     // SSL options is also part of the server bootstrap as the server listener on port X is either plain or SSL
     @UriParam(label = "security")


[5/6] camel git commit: Camel component docs

Posted by da...@apache.org.
Camel component docs


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

Branch: refs/heads/camel-2.16.x
Commit: 8a80d086dabed6c2d240ec5f5d010f0740c0bd41
Parents: b95b348
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 19:02:48 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 5 19:10:02 2016 +0100

----------------------------------------------------------------------
 .../org/apache/camel/component/netty/NettyConfiguration.java | 8 ++++++++
 .../component/netty/NettyServerBootstrapConfiguration.java   | 1 +
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8a80d086/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
index afb22b6..ddbc2b7 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
@@ -56,7 +56,15 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem
     private int decoderMaxLineLength = 1024;
     @UriParam
     private String encoding;
+    @UriParam(description = "To use a single encoder. This options is deprecated use encoders instead.")
+    @Deprecated
+    private ChannelHandler encoder;
+    @UriParam(javaType = "java.lang.String")
     private List<ChannelHandler> encoders = new ArrayList<ChannelHandler>();
+    @UriParam(description = "To use a single decoder. This options is deprecated use encoders instead.")
+    @Deprecated
+    private ChannelHandler decoder;
+    @UriParam(javaType = "java.lang.String")
     private List<ChannelHandler> decoders = new ArrayList<ChannelHandler>();
     @UriParam
     private boolean disconnect;

http://git-wip-us.apache.org/repos/asf/camel/blob/8a80d086/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
index 5e080ff..29aa309 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
@@ -65,6 +65,7 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
     protected ServerPipelineFactory serverPipelineFactory;
     @UriParam(label = "consumer,advanced")
     protected NettyServerBootstrapFactory nettyServerBootstrapFactory;
+    @UriParam(label = "advanced", prefix = "option.", multiValue = true)
     protected Map<String, Object> options;
     // SSL options is also part of the server bootstrap as the server listener on port X is either plain or SSL
     @UriParam(label = "security")


[4/6] camel git commit: Polished

Posted by da...@apache.org.
Polished


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

Branch: refs/heads/camel-2.16.x
Commit: b95b34893a274bb36bcca4c012b69e0704d16d87
Parents: 0e2bf50
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 18:47:39 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 5 19:09:54 2016 +0100

----------------------------------------------------------------------
 .../component/netty/http/NettyHttpBridgeEncodedPathTest.java   | 6 +++---
 .../component/netty4/http/NettyHttpBridgeEncodedPathTest.java  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b95b3489/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBridgeEncodedPathTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBridgeEncodedPathTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBridgeEncodedPathTest.java
index 71c0580..25a3bff 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBridgeEncodedPathTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBridgeEncodedPathTest.java
@@ -52,11 +52,11 @@ public class NettyHttpBridgeEncodedPathTest extends BaseNettyTest {
                         exchange.getOut().setBody(exchange.getIn().getHeader(Exchange.HTTP_QUERY));
                     }
                 };
-                from("netty-http://http://localhost:" + port2 + "/nettyTestRouteA?matchOnUriPrefix=true")
+                from("netty-http:http://localhost:" + port2 + "/nettyTestRouteA?matchOnUriPrefix=true")
                         .log("Using NettyTestRouteA route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
-                        .to("netty-http://http://localhost:" + port1 + "/nettyTestRouteB?throwExceptionOnFailure=false&bridgeEndpoint=true");
+                        .to("netty-http:http://localhost:" + port1 + "/nettyTestRouteB?throwExceptionOnFailure=false&bridgeEndpoint=true");
 
-                from("netty-http://http://localhost:" + port1 + "/nettyTestRouteB?matchOnUriPrefix=true")
+                from("netty-http:http://localhost:" + port1 + "/nettyTestRouteB?matchOnUriPrefix=true")
                         .log("Using NettyTestRouteB route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
                         .process(serviceProc);
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/b95b3489/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
index 59c82f6..a2c9b3c 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpBridgeEncodedPathTest.java
@@ -52,11 +52,11 @@ public class NettyHttpBridgeEncodedPathTest extends BaseNettyTest {
                         exchange.getOut().setBody(exchange.getIn().getHeader(Exchange.HTTP_QUERY));
                     }
                 };
-                from("netty4-http://http://localhost:" + port2 + "/nettyTestRouteA?matchOnUriPrefix=true")
+                from("netty4-http:http://localhost:" + port2 + "/nettyTestRouteA?matchOnUriPrefix=true")
                         .log("Using NettyTestRouteA route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
-                        .to("netty4-http://http://localhost:" + port1 + "/nettyTestRouteB?throwExceptionOnFailure=false&bridgeEndpoint=true");
+                        .to("netty4-http:http://localhost:" + port1 + "/nettyTestRouteB?throwExceptionOnFailure=false&bridgeEndpoint=true");
 
-                from("netty4-http://http://localhost:" + port1 + "/nettyTestRouteB?matchOnUriPrefix=true")
+                from("netty4-http:http://localhost:" + port1 + "/nettyTestRouteB?matchOnUriPrefix=true")
                         .log("Using NettyTestRouteB route: CamelHttpPath=[${header.CamelHttpPath}], CamelHttpUri=[${header.CamelHttpUri}]")
                         .process(serviceProc);
             }


[2/6] camel git commit: Camel component docs

Posted by da...@apache.org.
Camel component docs


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

Branch: refs/heads/master
Commit: d1a9209d5fcde605008731a6fc80308e8c198303
Parents: 9a3cd3e
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 19:02:48 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 5 19:02:48 2016 +0100

----------------------------------------------------------------------
 .../org/apache/camel/component/netty/NettyConfiguration.java | 8 ++++++++
 .../component/netty/NettyServerBootstrapConfiguration.java   | 1 +
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d1a9209d/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
index afb22b6..ddbc2b7 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
@@ -56,7 +56,15 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem
     private int decoderMaxLineLength = 1024;
     @UriParam
     private String encoding;
+    @UriParam(description = "To use a single encoder. This options is deprecated use encoders instead.")
+    @Deprecated
+    private ChannelHandler encoder;
+    @UriParam(javaType = "java.lang.String")
     private List<ChannelHandler> encoders = new ArrayList<ChannelHandler>();
+    @UriParam(description = "To use a single decoder. This options is deprecated use encoders instead.")
+    @Deprecated
+    private ChannelHandler decoder;
+    @UriParam(javaType = "java.lang.String")
     private List<ChannelHandler> decoders = new ArrayList<ChannelHandler>();
     @UriParam
     private boolean disconnect;

http://git-wip-us.apache.org/repos/asf/camel/blob/d1a9209d/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
index 5e080ff..29aa309 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBootstrapConfiguration.java
@@ -65,6 +65,7 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
     protected ServerPipelineFactory serverPipelineFactory;
     @UriParam(label = "consumer,advanced")
     protected NettyServerBootstrapFactory nettyServerBootstrapFactory;
+    @UriParam(label = "advanced", prefix = "option.", multiValue = true)
     protected Map<String, Object> options;
     // SSL options is also part of the server bootstrap as the server listener on port X is either plain or SSL
     @UriParam(label = "security")


[6/6] camel git commit: Camel component docs

Posted by da...@apache.org.
Camel component docs


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

Branch: refs/heads/camel-2.16.x
Commit: 13c0c3bd1e3b050db06d63ccb2d337b4048d4038
Parents: 8a80d08
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jan 5 19:09:27 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jan 5 19:10:08 2016 +0100

----------------------------------------------------------------------
 .../apache/camel/component/netty4/NettyConfiguration.java    | 8 ++++++++
 .../component/netty4/NettyServerBootstrapConfiguration.java  | 1 +
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/13c0c3bd/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
index 7a447f5..7f33e39 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java
@@ -56,7 +56,15 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem
     private int decoderMaxLineLength = 1024;
     @UriParam
     private String encoding;
+    @UriParam(description = "To use a single encoder. This options is deprecated use encoders instead.")
+    @Deprecated
+    private ChannelHandler encoder;
+    @UriParam(javaType = "java.lang.String")
     private List<ChannelHandler> encoders = new ArrayList<ChannelHandler>();
+    @UriParam(description = "To use a single decoder. This options is deprecated use encoders instead.")
+    @Deprecated
+    private ChannelHandler decoder;
+    @UriParam(javaType = "java.lang.String")
     private List<ChannelHandler> decoders = new ArrayList<ChannelHandler>();
     @UriParam
     private boolean disconnect;

http://git-wip-us.apache.org/repos/asf/camel/blob/13c0c3bd/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
index f790fe6..5221040 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
@@ -63,6 +63,7 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
     protected ServerInitializerFactory serverInitializerFactory;
     @UriParam(label = "consumer,advanced")
     protected NettyServerBootstrapFactory nettyServerBootstrapFactory;
+    @UriParam(label = "advanced", prefix = "option.", multiValue = true)
     protected Map<String, Object> options;
     // SSL options is also part of the server bootstrap as the server listener on port X is either plain or SSL
     @UriParam(label = "security")