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 2017/04/21 19:11:23 UTC
[1/4] camel git commit: Polished
Repository: camel
Updated Branches:
refs/heads/master f0eeaf233 -> 7b65a45b6
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/245c528d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/245c528d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/245c528d
Branch: refs/heads/master
Commit: 245c528dce6fdf9afc192cdf78f0004ce3d62bc2
Parents: f0eeaf2
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 21 20:40:50 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 21 20:40:50 2017 +0200
----------------------------------------------------------------------
components/camel-openstack/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/245c528d/components/camel-openstack/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml
index 93f4b3e..1fd665c 100644
--- a/components/camel-openstack/pom.xml
+++ b/components/camel-openstack/pom.xml
@@ -28,7 +28,8 @@
<artifactId>camel-openstack</artifactId>
<packaging>jar</packaging>
- <name>Camel :: OpenStack component</name>
+ <name>Camel :: OpenStack</name>
+ <description>Camel OpenStack support</description>
<dependencies>
[4/4] camel git commit: Add to release kit
Posted by da...@apache.org.
Add to release kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b65a45b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b65a45b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b65a45b
Branch: refs/heads/master
Commit: 7b65a45b6d9fbe6aa0b0ebebf086cee53b2e9903
Parents: 5bc22d1
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 21 21:09:02 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 21 21:09:02 2017 +0200
----------------------------------------------------------------------
apache-camel/pom.xml | 5 +++++
apache-camel/src/main/descriptors/common-bin.xml | 5 ++++-
parent/pom.xml | 5 +++++
3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7b65a45b/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index f16aefc..e626aa0 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1344,6 +1344,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-elasticsearch5-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-elsql-starter</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/7b65a45b/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index ef0567a..e81d27a 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -73,7 +73,7 @@
<include>org.apache.camel:camel-docker</include>
<include>org.apache.camel:camel-dozer</include>
<include>org.apache.camel:camel-drill</include>
- <include>org.apache.camel:camel-dropbox</include>
+ <include>org.apache.camel:camel-dropbox</include>
<include>org.apache.camel:camel-eclipse</include>
<include>org.apache.camel:camel-ehcache</include>
<include>org.apache.camel:camel-ejb</include>
@@ -100,6 +100,7 @@
<include>org.apache.camel:camel-gora</include>
<include>org.apache.camel:camel-groovy</include>
<include>org.apache.camel:camel-groovy-dsl</include>
+ <include>org.apache.camel:camel-grpc</include>
<include>org.apache.camel:camel-guava-eventbus</include>
<include>org.apache.camel:camel-guice</include>
<include>org.apache.camel:camel-gson</include>
@@ -358,6 +359,7 @@
<include>org.apache.camel:camel-eclipse-starter</include>
<include>org.apache.camel:camel-ehcache-starter</include>
<include>org.apache.camel:camel-elasticsearch-starter</include>
+ <include>org.apache.camel:camel-elasticsearch5-starter</include>
<include>org.apache.camel:camel-elsql-starter</include>
<include>org.apache.camel:camel-etcd-starter</include>
<include>org.apache.camel:camel-exec-starter</include>
@@ -378,6 +380,7 @@
<include>org.apache.camel:camel-gora-starter</include>
<include>org.apache.camel:camel-grape-starter</include>
<include>org.apache.camel:camel-groovy-starter</include>
+ <include>org.apache.camel:camel-grpc-starter</include>
<include>org.apache.camel:camel-gson-starter</include>
<include>org.apache.camel:camel-guava-eventbus-starter</include>
<include>org.apache.camel:camel-guice-starter</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/7b65a45b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 254e6b2..2141220 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2430,6 +2430,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-elasticsearch5-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-elsql-starter</artifactId>
<version>${project.version}</version>
</dependency>
[2/4] camel git commit: Regen
Posted by da...@apache.org.
Regen
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c60d204
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c60d204
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c60d204
Branch: refs/heads/master
Commit: 7c60d204e3ecc80885aecd1f1b13aa3a9c6ab2f8
Parents: 245c528
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 21 20:42:56 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 21 20:42:56 2017 +0200
----------------------------------------------------------------------
components/readme.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7c60d204/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index a81ce4f..b13f816 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -405,7 +405,7 @@ Number of Components: 238 in 185 JAR artifacts (14 deprecated)
`lumberjack:host:port` | 2.18 | The lumberjack retrieves logs sent over the network using the Lumberjack protocol.
| link:camel-mail/src/main/docs/mail-component.adoc[Mail] (camel-mail) +
-`imap:host:port` | 1.0 | To send or receive emails using imap/pop3 or stmp protocols.
+`imap:host:port` | 1.0 | To send or receive emails using imap/pop3 or smtp protocols.
| link:camel-metrics/src/main/docs/metrics-component.adoc[Metrics] (camel-metrics) +
`metrics:metricsType:metricsName` | 2.14 | To collect various metrics directly from Camel routes using the DropWizard metrics library.
[3/4] camel git commit: Fixed CS
Posted by da...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5bc22d1f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5bc22d1f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5bc22d1f
Branch: refs/heads/master
Commit: 5bc22d1f1c94f633ac9499ddbf7f20f546c73883
Parents: 7c60d20
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 21 21:01:52 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 21 21:04:47 2017 +0200
----------------------------------------------------------------------
.../example/kubernetes/fmp/CqlPopulateBean.java | 20 +++---
.../example/kubernetes/fmp/HazelcastRoute.java | 68 ++++++++++----------
.../camel/example/kafka/StringPartitioner.java | 6 +-
.../apache/camel/example/mention/Contact.java | 7 +-
...ponentConfigurationAndDocumentationTest.java | 6 +-
...nguageConfigurationAndDocumentationTest.java | 3 +-
6 files changed, 57 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5bc22d1f/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/CqlPopulateBean.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/CqlPopulateBean.java b/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/CqlPopulateBean.java
index d2b589a..8df7777 100644
--- a/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/CqlPopulateBean.java
+++ b/examples/camel-example-cassandra-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/CqlPopulateBean.java
@@ -20,15 +20,15 @@ import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Session;
public class CqlPopulateBean {
-
- public void populate() {
- Cluster cluster = Cluster.builder().addContactPoint("cassandra").build();
- Session session = cluster.connect();
- session.execute("create keyspace if not exists test with replication = {'class':'SimpleStrategy', 'replication_factor':1};");
- session.execute("create table if not exists test.users ( id int primary key, name text );");
- session.execute("insert into test.users (id,name) values (1, 'oscerd') if not exists;");
- session.close();
- cluster.close();
- }
+
+ public void populate() {
+ Cluster cluster = Cluster.builder().addContactPoint("cassandra").build();
+ Session session = cluster.connect();
+ session.execute("create keyspace if not exists test with replication = {'class':'SimpleStrategy', 'replication_factor':1};");
+ session.execute("create table if not exists test.users ( id int primary key, name text );");
+ session.execute("insert into test.users (id,name) values (1, 'oscerd') if not exists;");
+ session.close();
+ cluster.close();
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5bc22d1f/examples/camel-example-hazelcast-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/HazelcastRoute.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-hazelcast-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/HazelcastRoute.java b/examples/camel-example-hazelcast-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/HazelcastRoute.java
index d11cae6..b851680 100644
--- a/examples/camel-example-hazelcast-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/HazelcastRoute.java
+++ b/examples/camel-example-hazelcast-kubernetes/src/main/java/org/apache/camel/example/kubernetes/fmp/HazelcastRoute.java
@@ -18,47 +18,47 @@ package org.apache.camel.example.kubernetes.fmp;
import java.util.UUID;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.hazelcast.HazelcastComponent;
-import org.apache.camel.component.hazelcast.HazelcastConstants;
-
import com.hazelcast.client.HazelcastClient;
import com.hazelcast.client.config.ClientConfig;
import com.hazelcast.config.GroupConfig;
import com.hazelcast.config.SSLConfig;
import com.hazelcast.core.HazelcastInstance;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.hazelcast.HazelcastComponent;
+import org.apache.camel.component.hazelcast.HazelcastConstants;
public class HazelcastRoute extends RouteBuilder {
- @Override
- public void configure() throws Exception {
-
- HazelcastComponent component = new HazelcastComponent();
- ClientConfig config = new ClientConfig();
- config.getNetworkConfig().addAddress("hazelcast");
- config.getNetworkConfig().setSSLConfig(new SSLConfig().setEnabled(false));
- config.setGroupConfig(new GroupConfig("someGroup"));
- HazelcastInstance instance = HazelcastClient.newHazelcastClient(config);
- component.setHazelcastInstance(instance);
- getContext().addComponent("hazelcast", component);
-
- from("timer:foo?period=5000")
- .log("Producer side: Sending data to Hazelcast topic..")
- .process(new Processor() {
-
- @Override
- public void process(Exchange exchange) throws Exception {
- exchange.getIn().setHeader(HazelcastConstants.OPERATION, HazelcastConstants.PUBLISH_OPERATION);
- String payload = "Test " + UUID.randomUUID();
- exchange.getIn().setBody(payload);
- }
- })
- .to("hazelcast:topic:foo");
-
- from("hazelcast:topic:foo")
- .log("Consumer side: Detected following action: $simple{in.header.CamelHazelcastListenerAction}");
- }
+ @Override
+ public void configure() throws Exception {
+ // setup hazelcast
+ ClientConfig config = new ClientConfig();
+ config.getNetworkConfig().addAddress("hazelcast");
+ config.getNetworkConfig().setSSLConfig(new SSLConfig().setEnabled(false));
+ config.setGroupConfig(new GroupConfig("someGroup"));
+ HazelcastInstance instance = HazelcastClient.newHazelcastClient(config);
+
+ // setup camel hazelcast
+ HazelcastComponent hazelcast = new HazelcastComponent();
+ hazelcast.setHazelcastInstance(instance);
+ getContext().addComponent("hazelcast", hazelcast);
+
+ from("timer:foo?period=5000")
+ .log("Producer side: Sending data to Hazelcast topic..")
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(HazelcastConstants.OPERATION, HazelcastConstants.PUBLISH_OPERATION);
+ String payload = "Test " + UUID.randomUUID();
+ exchange.getIn().setBody(payload);
+ }
+ })
+ .to("hazelcast:topic:foo");
+
+ from("hazelcast:topic:foo")
+ .log("Consumer side: Detected following action: $simple{in.header.CamelHazelcastListenerAction}");
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5bc22d1f/examples/camel-example-kafka/src/main/java/org/apache/camel/example/kafka/StringPartitioner.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-kafka/src/main/java/org/apache/camel/example/kafka/StringPartitioner.java b/examples/camel-example-kafka/src/main/java/org/apache/camel/example/kafka/StringPartitioner.java
index 0566bd1..77f5bfd 100644
--- a/examples/camel-example-kafka/src/main/java/org/apache/camel/example/kafka/StringPartitioner.java
+++ b/examples/camel-example-kafka/src/main/java/org/apache/camel/example/kafka/StringPartitioner.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/camel/blob/5bc22d1f/examples/camel-example-twitter-salesforce/src/main/java/org/apache/camel/example/mention/Contact.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-twitter-salesforce/src/main/java/org/apache/camel/example/mention/Contact.java b/examples/camel-example-twitter-salesforce/src/main/java/org/apache/camel/example/mention/Contact.java
index 220c912..abf7088 100644
--- a/examples/camel-example-twitter-salesforce/src/main/java/org/apache/camel/example/mention/Contact.java
+++ b/examples/camel-example-twitter-salesforce/src/main/java/org/apache/camel/example/mention/Contact.java
@@ -21,11 +21,10 @@
*/
package org.apache.camel.example.mention;
-import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
-import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
-
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
+import org.apache.camel.component.salesforce.api.dto.AbstractSObjectBase;
/**
* Contact Data Transfer Object (DTO) needed for Salesforce component.
@@ -36,6 +35,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* and generates {@link AbstractDescribedSObjectBase} based classes,
* which are needed for some of the operations (like composite API).
*/
+// CHECKSTYLE:OFF
public class Contact extends AbstractSObjectBase {
@JsonProperty("LastName")
@@ -59,3 +59,4 @@ public class Contact extends AbstractSObjectBase {
this.screenName = screenName;
}
}
+// CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/camel/blob/5bc22d1f/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/FtpComponentConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/FtpComponentConfigurationAndDocumentationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/FtpComponentConfigurationAndDocumentationTest.java
index a316e3b..95c62af 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/FtpComponentConfigurationAndDocumentationTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/FtpComponentConfigurationAndDocumentationTest.java
@@ -42,8 +42,10 @@ public class FtpComponentConfigurationAndDocumentationTest extends CamelTestSupp
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
- assertTrue(json.contains("\"minDepth\": { \"kind\": \"parameter\", \"displayName\": \"Min Depth\", \"group\": \"filter\", \"label\": \"consumer,filter\", \"type\": \"integer\", \"javaType\": \"int\""));
- assertTrue(json.contains("\"username\": { \"kind\": \"parameter\", \"displayName\": \"Username\", \"group\": \"security\", \"label\": \"security\", \"type\": \"string\""));
+ assertTrue(json.contains("\"minDepth\": { \"kind\": \"parameter\", \"displayName\": \"Min Depth\", \"group\": \"filter\""
+ + ", \"label\": \"consumer,filter\", \"type\": \"integer\", \"javaType\": \"int\""));
+ assertTrue(json.contains("\"username\": { \"kind\": \"parameter\", \"displayName\": \"Username\", \"group\": \"security\""
+ + ", \"label\": \"security\", \"type\": \"string\""));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5bc22d1f/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/SimpleLanguageConfigurationAndDocumentationTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/SimpleLanguageConfigurationAndDocumentationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/SimpleLanguageConfigurationAndDocumentationTest.java
index bd8e839..7064ed2 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/SimpleLanguageConfigurationAndDocumentationTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/SimpleLanguageConfigurationAndDocumentationTest.java
@@ -37,7 +37,8 @@ public class SimpleLanguageConfigurationAndDocumentationTest extends CamelTestSu
assertTrue(json.contains("\"name\": \"simple\""));
assertTrue(json.contains("\"modelName\": \"simple\""));
- assertTrue(json.contains("\"resultType\": { \"kind\": \"attribute\", \"displayName\": \"Result Type\", \"required\": false, \"type\": \"string\", \"javaType\": \"java.lang.String\", \"deprecated\": false"));
+ assertTrue(json.contains("\"resultType\": { \"kind\": \"attribute\", \"displayName\": \"Result Type\", \"required\": false, \"type\": \"string\""
+ + ", \"javaType\": \"java.lang.String\", \"deprecated\": false"));
}
}