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 2015/09/22 10:27:53 UTC
[2/8] camel git commit: CAMEL-9131: Add more labels to Camel
components for options.
CAMEL-9131: Add more labels to Camel components for options.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd022bc5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd022bc5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd022bc5
Branch: refs/heads/master
Commit: bd022bc560686dbeafbbc12155fb77cc9f257d8c
Parents: de2aab1
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 22 09:26:28 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 22 09:26:28 2015 +0200
----------------------------------------------------------------------
.../component/netty/NettyConfiguration.java | 32 +++++++-------
.../NettyServerBootstrapConfiguration.java | 44 ++++++++++----------
2 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bd022bc5/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 5a148c0..3c0a82f 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
@@ -60,45 +60,45 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem
private List<ChannelHandler> decoders = new ArrayList<ChannelHandler>();
@UriParam
private boolean disconnect;
- @UriParam(label = "producer", defaultValue = "true")
+ @UriParam(label = "producer,advanced", defaultValue = "true")
private boolean lazyChannelCreation = true;
- @UriParam
+ @UriParam(label = "advanced")
private boolean transferExchange;
@UriParam(label = "consumer", defaultValue = "true")
private boolean disconnectOnNoReply = true;
- @UriParam(label = "consumer", defaultValue = "WARN")
+ @UriParam(label = "consumer,advanced", defaultValue = "WARN")
private LoggingLevel noReplyLogLevel = LoggingLevel.WARN;
- @UriParam(label = "consumer", defaultValue = "WARN")
+ @UriParam(label = "consumer,advanced", defaultValue = "WARN")
private LoggingLevel serverExceptionCaughtLogLevel = LoggingLevel.WARN;
- @UriParam(label = "consumer", defaultValue = "DEBUG")
+ @UriParam(label = "consumer,advanced", defaultValue = "DEBUG")
private LoggingLevel serverClosedChannelExceptionCaughtLogLevel = LoggingLevel.DEBUG;
@UriParam(defaultValue = "true")
private boolean allowDefaultCodec = true;
- @UriParam(label = "producer")
+ @UriParam(label = "producer,advanced")
private ClientPipelineFactory clientPipelineFactory;
//CAMEL-8031 Moved this option to NettyComponent
private int maximumPoolSize = 16;
- @UriParam(label = "consumer", defaultValue = "true")
+ @UriParam(label = "consumer,advanced", defaultValue = "true")
private boolean orderedThreadPoolExecutor = true;
- @UriParam(label = "producer", defaultValue = "-1")
+ @UriParam(label = "producer,advanced", defaultValue = "-1")
private int producerPoolMaxActive = -1;
- @UriParam(label = "producer")
+ @UriParam(label = "producer,advanced")
private int producerPoolMinIdle;
- @UriParam(label = "producer", defaultValue = "100")
+ @UriParam(label = "producer,advanced", defaultValue = "100")
private int producerPoolMaxIdle = 100;
- @UriParam(label = "producer", defaultValue = "" + 5 * 60 * 1000L)
+ @UriParam(label = "producer,advanced", defaultValue = "" + 5 * 60 * 1000L)
private long producerPoolMinEvictableIdle = 5 * 60 * 1000L;
- @UriParam(label = "producer", defaultValue = "true")
+ @UriParam(label = "producer,advanced", defaultValue = "true")
private boolean producerPoolEnabled = true;
- @UriParam(label = "producer")
+ @UriParam(label = "producer,advanced")
private boolean udpConnectionlessSending;
@UriParam(label = "consumer")
private boolean clientMode;
- @UriParam(label = "producer")
+ @UriParam(label = "producer,advanced")
private boolean useChannelBuffer;
- @UriParam(label = "consumer", defaultValue = "" + 10 * 1024 * 1024L)
+ @UriParam(label = "consumer,advanced", defaultValue = "" + 10 * 1024 * 1024L)
private long maxChannelMemorySize = 10 * 1024 * 1024L;
- @UriParam(label = "consumer", defaultValue = "" + 200 * 1024 * 1024L)
+ @UriParam(label = "consumer,advanced", defaultValue = "" + 200 * 1024 * 1024L)
private long maxTotalMemorySize = 200 * 1024 * 1024L;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/bd022bc5/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 9832192..b33d1d5 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
@@ -41,15 +41,15 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
protected int port;
@UriParam(label = "consumer")
protected boolean broadcast;
- @UriParam(defaultValue = "65536")
+ @UriParam(label = "advanced", defaultValue = "65536")
protected long sendBufferSize = 65536;
- @UriParam(defaultValue = "65536")
+ @UriParam(label = "advanced", defaultValue = "65536")
protected long receiveBufferSize = 65536;
- @UriParam
+ @UriParam(label = "advanced")
protected int receiveBufferSizePredictor;
- @UriParam(label = "consumer", defaultValue = "1")
+ @UriParam(label = "consumer,advanced", defaultValue = "1")
protected int bossCount = 1;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer,advanced")
protected int workerCount;
@UriParam(defaultValue = "true")
protected boolean keepAlive = true;
@@ -59,43 +59,43 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
protected boolean reuseAddress = true;
@UriParam(label = "producer", defaultValue = "10000")
protected long connectTimeout = 10000;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer,advanced")
protected int backlog;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer,advanced")
protected ServerPipelineFactory serverPipelineFactory;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer,advanced")
protected NettyServerBootstrapFactory nettyServerBootstrapFactory;
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
+ @UriParam(label = "security")
protected boolean ssl;
- @UriParam
+ @UriParam(label = "security")
protected boolean sslClientCertHeaders;
- @UriParam
+ @UriParam(label = "security")
protected SslHandler sslHandler;
- @UriParam
+ @UriParam(label = "security")
protected SSLContextParameters sslContextParameters;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer,security")
protected boolean needClientAuth;
- @UriParam
+ @UriParam(label = "security")
protected File keyStoreFile;
- @UriParam
+ @UriParam(label = "security")
protected File trustStoreFile;
- @UriParam
+ @UriParam(label = "security")
protected String keyStoreResource;
- @UriParam
+ @UriParam(label = "security")
protected String trustStoreResource;
- @UriParam(defaultValue = "JKS")
+ @UriParam(defaultValue = "JKS", label = "security")
protected String keyStoreFormat = "JKS";
- @UriParam(defaultValue = "SunX509")
+ @UriParam(defaultValue = "SunX509", label = "security")
protected String securityProvider = "SunX509";
- @UriParam(defaultValue = DEFAULT_ENABLED_PROTOCOLS)
+ @UriParam(defaultValue = DEFAULT_ENABLED_PROTOCOLS, label = "security")
protected String enabledProtocols = DEFAULT_ENABLED_PROTOCOLS;
- @UriParam
+ @UriParam(label = "security")
protected String passphrase;
protected BossPool bossPool;
protected WorkerPool workerPool;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer,advanced")
protected String networkInterface;
public String getAddress() {