You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/08/29 09:52:45 UTC
camel git commit: CAMEL-11721: Camel Kafka component JSON metadata is
invalid
Repository: camel
Updated Branches:
refs/heads/master 04ba8ec03 -> 215cd87fa
CAMEL-11721: Camel Kafka component JSON metadata is invalid
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/215cd87f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/215cd87f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/215cd87f
Branch: refs/heads/master
Commit: 215cd87fa746e98b87442208497a921907ab05c1
Parents: 04ba8ec
Author: James Netherton <ja...@gmail.com>
Authored: Tue Aug 29 10:47:00 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Aug 29 11:50:13 2017 +0200
----------------------------------------------------------------------
components/camel-kafka/src/main/docs/kafka-component.adoc | 2 +-
.../java/org/apache/camel/component/kafka/KafkaConfiguration.java | 2 +-
.../component/kafka/springboot/KafkaComponentConfiguration.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/215cd87f/components/camel-kafka/src/main/docs/kafka-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc b/components/camel-kafka/src/main/docs/kafka-component.adoc
index ea6c22e..f474877 100644
--- a/components/camel-kafka/src/main/docs/kafka-component.adoc
+++ b/components/camel-kafka/src/main/docs/kafka-component.adoc
@@ -139,7 +139,7 @@ with the following path and query parameters:
| **kerberosPrincipalToLocal Rules** (security) | A list of rules for mapping from principal names to short names (typically operating system usernames). The rules are evaluated in order and the first rule that matches a principal name is used to map it to a short name. Any later rules in the list are ignored. By default principal names of the form username/hostnameREALM are mapped to username. For more details on the format please see security authorization and acls. Multiple values can be separated by comma | DEFAULT | String
| **kerberosRenewJitter** (security) | Percentage of random jitter added to the renewal time. | 0.05 | Double
| **kerberosRenewWindowFactor** (security) | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached at which time it will try to renew the ticket. | 0.8 | Double
-| **saslJaasConfig** (security) | Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username=\USERNAME\ password=\PASSWORD\; | | String
+| **saslJaasConfig** (security) | Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username=USERNAME password=PASSWORD; | | String
| **saslKerberosServiceName** (security) | The Kerberos principal name that Kafka runs as. This can be defined either in Kafka's JAAS config or in Kafka's config. | | String
| **saslMechanism** (security) | The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI | String
| **securityProtocol** (security) | Protocol used to communicate with brokers. Currently only PLAINTEXT and SSL are supported. | PLAINTEXT | String
http://git-wip-us.apache.org/repos/asf/camel/blob/215cd87f/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
index 52436c6..e724ef6 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
@@ -999,7 +999,7 @@ public class KafkaConfiguration implements Cloneable {
* Expose the kafka sasl.jaas.config parameter
*
* Example:
- * org.apache.kafka.common.security.plain.PlainLoginModule required username=\"USERNAME\" password=\"PASSWORD\";
+ * org.apache.kafka.common.security.plain.PlainLoginModule required username="USERNAME" password="PASSWORD";
*/
public void setSaslJaasConfig(String saslMechanism) {
this.saslJaasConfig = saslMechanism;
http://git-wip-us.apache.org/repos/asf/camel/blob/215cd87f/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
index 6c8127f..03c1f48 100644
--- a/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
@@ -381,7 +381,7 @@ public class KafkaComponentConfiguration
/**
* Expose the kafka sasl.jaas.config parameter Example:
* org.apache.kafka.common.security.plain.PlainLoginModule required
- * username=\"USERNAME\" password=\"PASSWORD\";
+ * username="USERNAME" password="PASSWORD";
*/
private String saslJaasConfig;
/**