camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [5/6] camel git commit: Camel component docs
Date Tue, 05 Jan 2016 18:10:22 GMT
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 <davsclaus@apache.org>
Authored: Tue Jan 5 19:02:48 2016 +0100
Committer: Claus Ibsen <davsclaus@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")


Mime
View raw message