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 11:03:45 UTC
[1/2] camel git commit: CAMEL-9131: Add more labels to Camel
components for options.
Repository: camel
Updated Branches:
refs/heads/master 969f29034 -> bfb5b9e37
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/98a2ed9b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/98a2ed9b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/98a2ed9b
Branch: refs/heads/master
Commit: 98a2ed9bee52ad95a2d6ffa9818c1271b59d0e36
Parents: 969f290
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 22 10:44:38 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 22 10:44:38 2015 +0200
----------------------------------------------------------------------
.../component/netty/NettyConfiguration.java | 2 +-
.../NettyServerBootstrapConfiguration.java | 2 +
.../component/netty4/NettyConfiguration.java | 34 +++++++-------
.../NettyServerBootstrapConfiguration.java | 48 ++++++++++----------
4 files changed, 44 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/98a2ed9b/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 3c0a82f..afb22b6 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
@@ -64,7 +64,7 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem
private boolean lazyChannelCreation = true;
@UriParam(label = "advanced")
private boolean transferExchange;
- @UriParam(label = "consumer", defaultValue = "true")
+ @UriParam(label = "consumer,advanced", defaultValue = "true")
private boolean disconnectOnNoReply = true;
@UriParam(label = "consumer,advanced", defaultValue = "WARN")
private LoggingLevel noReplyLogLevel = LoggingLevel.WARN;
http://git-wip-us.apache.org/repos/asf/camel/blob/98a2ed9b/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 b33d1d5..5e080ff 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
@@ -93,7 +93,9 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
protected String enabledProtocols = DEFAULT_ENABLED_PROTOCOLS;
@UriParam(label = "security")
protected String passphrase;
+ @UriParam(label = "consumer,advanced")
protected BossPool bossPool;
+ @UriParam(label = "consumer,advanced")
protected WorkerPool workerPool;
@UriParam(label = "consumer,advanced")
protected String networkInterface;
http://git-wip-us.apache.org/repos/asf/camel/blob/98a2ed9b/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 de8dff2..7a447f5 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
@@ -60,43 +60,43 @@ 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")
+ @UriParam(label = "consumer,advanced", 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 ClientInitializerFactory clientInitializerFactory;
- @UriParam(defaultValue = "16")
+ @UriParam(label = "consumer,advanced", defaultValue = "16")
private int maximumPoolSize = 16;
- @UriParam(label = "consumer", defaultValue = "true")
+ @UriParam(label = "consumer,advanced", defaultValue = "true")
private boolean usingExecutorService = 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 useByteBuf;
- @UriParam
+ @UriParam(label = "advanced")
private boolean udpByteArrayCodec;
http://git-wip-us.apache.org/repos/asf/camel/blob/98a2ed9b/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 0e9af39..f790fe6 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
@@ -39,15 +39,15 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
protected int port;
@UriParam(label = "consumer")
protected boolean broadcast;
- @UriParam(defaultValue = "65536")
+ @UriParam(label = "advanced", defaultValue = "65536")
protected int sendBufferSize = 65536;
- @UriParam(defaultValue = "65536")
+ @UriParam(label = "advanced", defaultValue = "65536")
protected int 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;
@@ -57,45 +57,45 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
protected boolean reuseAddress = true;
@UriParam(label = "producer", defaultValue = "10000")
protected int connectTimeout = 10000;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer,advanced")
protected int backlog;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer,advanced")
protected ServerInitializerFactory serverInitializerFactory;
- @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
+ @UriParam(label = "security")
protected String keyStoreFormat;
- @UriParam
+ @UriParam(label = "security")
protected String securityProvider;
- @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;
- @UriParam
+ @UriParam(label = "consumer,advanced")
protected EventLoopGroup bossGroup;
- @UriParam
+ @UriParam(label = "consumer,advanced")
protected EventLoopGroup workerGroup;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer,advanced")
protected String networkInterface;
@UriParam(label = "consumer", defaultValue = "true")
private boolean reconnect = true;
[2/2] camel git commit: CAMEL-9131: Add more labels to Camel
components for options.
Posted by da...@apache.org.
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/bfb5b9e3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bfb5b9e3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bfb5b9e3
Branch: refs/heads/master
Commit: bfb5b9e37372938ea1f3eb172a2b3f211155241d
Parents: 98a2ed9
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 22 11:04:02 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 22 11:04:02 2015 +0200
----------------------------------------------------------------------
.../netty/http/NettyHttpConfiguration.java | 25 +++++++++++---------
.../component/netty/http/NettyHttpEndpoint.java | 14 +++++------
.../netty4/http/NettyHttpConfiguration.java | 22 ++++++++---------
.../netty4/http/NettyHttpEndpoint.java | 14 +++++------
4 files changed, 39 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bfb5b9e3/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
index 3ed99a5..7f63eba 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
@@ -36,31 +36,31 @@ public class NettyHttpConfiguration extends NettyConfiguration {
@UriPath @Metadata(required = "true")
private String path;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private boolean urlDecodeHeaders;
- @UriParam(defaultValue = "true")
+ @UriParam(label = "consumer,advanced", defaultValue = "true")
private boolean mapHeaders = true;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private boolean compression;
- @UriParam(defaultValue = "true")
+ @UriParam(label = "producer", defaultValue = "true")
private boolean throwExceptionOnFailure = true;
- @UriParam
+ @UriParam(label = "advanced")
private boolean transferException;
- @UriParam
+ @UriParam(label = "consumer")
private boolean matchOnUriPrefix;
@UriParam
private boolean bridgeEndpoint;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private boolean disableStreamCache;
@UriParam(label = "consumer", defaultValue = "true")
private boolean send503whenSuspended = true;
- @UriParam(defaultValue = "" + 1024 * 1024)
+ @UriParam(label = "consumer,advanced", defaultValue = "" + 1024 * 1024)
private int chunkedMaxContentLength = 1024 * 1024;
- @UriParam(label = "consumer", defaultValue = "8192")
+ @UriParam(label = "consumer,advanced", defaultValue = "8192")
private int maxHeaderSize = 8192;
- @UriParam(label = "producer", defaultValue = "200-299")
+ @UriParam(label = "producer,advanced", defaultValue = "200-299")
private String okStatusCodeRange = "200-299";
- @UriParam(label = "producer", defaultValue = "false")
+ @UriParam(label = "producer,advanced")
private boolean useRelativePath;
public NettyHttpConfiguration() {
@@ -264,6 +264,9 @@ public class NettyHttpConfiguration extends NettyConfiguration {
/**
* Sets whether to use a relative path in HTTP requests.
+ * <p/>
+ * Some third party backend systems such as IBM Datapower do not support absolute URIs in HTTP POSTs, and setting
+ * this option to <tt>true</tt> can work around this problem.
*/
public void setUseRelativePath(boolean useRelativePath) {
this.useRelativePath = useRelativePath;
http://git-wip-us.apache.org/repos/asf/camel/blob/bfb5b9e3/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
index 9cc5ac6..bd5332c 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
@@ -45,18 +45,18 @@ public class NettyHttpEndpoint extends NettyEndpoint implements HeaderFilterStra
private static final Logger LOG = LoggerFactory.getLogger(NettyHttpEndpoint.class);
@UriParam
+ private NettyHttpConfiguration configuration;
+ @UriParam(label = "advanced")
private NettyHttpBinding nettyHttpBinding;
- @UriParam
+ @UriParam(label = "advanced")
private HeaderFilterStrategy headerFilterStrategy;
- @UriParam
- private NettyHttpConfiguration configuration;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private boolean traceEnabled;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private String httpMethodRestrict;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private NettySharedHttpServer nettySharedHttpServer;
- @UriParam(label = "consumer")
+ @UriParam(label = "consumer,security")
private NettyHttpSecurityConfiguration securityConfiguration;
public NettyHttpEndpoint(String endpointUri, NettyHttpComponent component, NettyConfiguration configuration) {
http://git-wip-us.apache.org/repos/asf/camel/blob/bfb5b9e3/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
index 894e47c..31627aa 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
@@ -35,31 +35,31 @@ public class NettyHttpConfiguration extends NettyConfiguration {
@UriPath @Metadata(required = "true")
private String path;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private boolean urlDecodeHeaders;
- @UriParam(defaultValue = "true")
+ @UriParam(label = "consumer,advanced", defaultValue = "true")
private boolean mapHeaders = true;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private boolean compression;
- @UriParam(defaultValue = "true")
+ @UriParam(label = "producer", defaultValue = "true")
private boolean throwExceptionOnFailure = true;
- @UriParam
+ @UriParam(label = "advanced")
private boolean transferException;
- @UriParam
+ @UriParam(label = "consumer")
private boolean matchOnUriPrefix;
@UriParam
private boolean bridgeEndpoint;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private boolean disableStreamCache;
@UriParam(label = "consumer", defaultValue = "true")
private boolean send503whenSuspended = true;
- @UriParam(defaultValue = "" + 1024 * 1024)
+ @UriParam(label = "consumer,advanced", defaultValue = "" + 1024 * 1024)
private int chunkedMaxContentLength = 1024 * 1024;
- @UriParam(label = "consumer", defaultValue = "8192")
+ @UriParam(label = "consumer,advanced", defaultValue = "8192")
private int maxHeaderSize = 8192;
- @UriParam(label = "producer", defaultValue = "200-299")
+ @UriParam(label = "producer,advanced", defaultValue = "200-299")
private String okStatusCodeRange = "200-299";
- @UriParam(label = "producer", defaultValue = "false")
+ @UriParam(label = "producer,advanced")
private boolean useRelativePath;
public NettyHttpConfiguration() {
http://git-wip-us.apache.org/repos/asf/camel/blob/bfb5b9e3/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
index 736ced4..5d96197 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
@@ -44,18 +44,18 @@ public class NettyHttpEndpoint extends NettyEndpoint implements HeaderFilterStra
private static final Logger LOG = LoggerFactory.getLogger(NettyHttpEndpoint.class);
@UriParam
+ private NettyHttpConfiguration configuration;
+ @UriParam(label = "advanced")
private NettyHttpBinding nettyHttpBinding;
- @UriParam
+ @UriParam(label = "advanced")
private HeaderFilterStrategy headerFilterStrategy;
- @UriParam
- private NettyHttpConfiguration configuration;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private boolean traceEnabled;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private String httpMethodRestrict;
- @UriParam
+ @UriParam(label = "consumer,advanced")
private NettySharedHttpServer nettySharedHttpServer;
- @UriParam
+ @UriParam(label = "consumer,security")
private NettyHttpSecurityConfiguration securityConfiguration;
public NettyHttpEndpoint(String endpointUri, NettyHttpComponent component, NettyConfiguration configuration) {