camel-commits mailing list archives

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


Mime
View raw message