You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2016/06/14 12:42:15 UTC
[1/2] camel git commit: CAMEL-10056: ServiceCall EIP : add missing
configuration options to ConsulConfigurationDefinition
Repository: camel
Updated Branches:
refs/heads/master 150240d9d -> d15029c4b
CAMEL-10056: ServiceCall EIP : add missing configuration options to ConsulConfigurationDefinition
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d15029c4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d15029c4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d15029c4
Branch: refs/heads/master
Commit: d15029c4b4a91e952c5bb7671b189d0370b38f71
Parents: f5a6388
Author: lburgazzoli <lb...@gmail.com>
Authored: Tue Jun 14 14:41:23 2016 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Tue Jun 14 14:41:47 2016 +0200
----------------------------------------------------------------------
.../remote/ConsulConfigurationDefinition.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d15029c4/camel-core/src/main/java/org/apache/camel/model/remote/ConsulConfigurationDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/remote/ConsulConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/remote/ConsulConfigurationDefinition.java
index 7128d3f..9cb8a16 100644
--- a/camel-core/src/main/java/org/apache/camel/model/remote/ConsulConfigurationDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/remote/ConsulConfigurationDefinition.java
@@ -21,8 +21,10 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.spi.Metadata;
+import org.apache.camel.util.jsse.SSLContextParameters;
/**
* Consul remote service call configuration
@@ -50,6 +52,8 @@ public class ConsulConfigurationDefinition extends ServiceCallConfigurationDefin
private Long writeTimeoutMillis;
@XmlAttribute @Metadata(defaultValue = "10")
private Integer blockSeconds = 10;
+ @XmlTransient
+ private SSLContextParameters sslContextParameters;
public ConsulConfigurationDefinition() {
}
@@ -134,6 +138,14 @@ public class ConsulConfigurationDefinition extends ServiceCallConfigurationDefin
this.blockSeconds = blockSeconds;
}
+ public SSLContextParameters getSslContextParameters() {
+ return sslContextParameters;
+ }
+
+ public void setSslContextParameters(SSLContextParameters sslContextParameters) {
+ this.sslContextParameters = sslContextParameters;
+ }
+
// -------------------------------------------------------------------------
// Fluent API
// -------------------------------------------------------------------------
@@ -209,4 +221,12 @@ public class ConsulConfigurationDefinition extends ServiceCallConfigurationDefin
setBlockSeconds(blockSeconds);
return this;
}
+
+ /**
+ * To configure security using SSLContextParameters.
+ */
+ public ConsulConfigurationDefinition sslContextParameters(SSLContextParameters sslContextParameters) {
+ setSslContextParameters(sslContextParameters);
+ return this;
+ }
}
[2/2] camel git commit: CAMEL-10055: ServiceCall EIP : add missing
configuration options to EtcdConfigurationDefinition
Posted by lb...@apache.org.
CAMEL-10055: ServiceCall EIP : add missing configuration options to EtcdConfigurationDefinition
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f5a63887
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f5a63887
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f5a63887
Branch: refs/heads/master
Commit: f5a63887d07f0b307b1747b2a949d2727bcb5009
Parents: 150240d
Author: lburgazzoli <lb...@gmail.com>
Authored: Tue Jun 14 14:37:09 2016 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Tue Jun 14 14:41:47 2016 +0200
----------------------------------------------------------------------
.../remote/EtcdConfigurationDefinition.java | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f5a63887/camel-core/src/main/java/org/apache/camel/model/remote/EtcdConfigurationDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/remote/EtcdConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/remote/EtcdConfigurationDefinition.java
index 21599b3..c1fdc9d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/remote/EtcdConfigurationDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/remote/EtcdConfigurationDefinition.java
@@ -21,8 +21,10 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.spi.Metadata;
+import org.apache.camel.util.jsse.SSLContextParameters;
/**
* Etcd remote service call configuration
@@ -41,6 +43,8 @@ public class EtcdConfigurationDefinition extends ServiceCallConfigurationDefinit
private Long timeout;
@XmlAttribute @Metadata(defaultValue = "/services/")
private String servicePath = "/services/";
+ @XmlTransient
+ private SSLContextParameters sslContextParameters;
public EtcdConfigurationDefinition() {
}
@@ -93,6 +97,13 @@ public class EtcdConfigurationDefinition extends ServiceCallConfigurationDefinit
this.servicePath = servicePath;
}
+ public SSLContextParameters getSslContextParameters() {
+ return sslContextParameters;
+ }
+
+ public void setSslContextParameters(SSLContextParameters sslContextParameters) {
+ this.sslContextParameters = sslContextParameters;
+ }
// -------------------------------------------------------------------------
// Fluent API
@@ -137,4 +148,12 @@ public class EtcdConfigurationDefinition extends ServiceCallConfigurationDefinit
setServicePath(servicePath);
return this;
}
+
+ /**
+ * To configure security using SSLContextParameters.
+ */
+ public EtcdConfigurationDefinition sslContextParameters(SSLContextParameters sslContextParameters) {
+ setSslContextParameters(sslContextParameters);
+ return this;
+ }
}