[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1a7fc21 Polished
1a7fc21 is described below
commit 1a7fc21a389ee03642858caff506af8d5a58b3dc
Author: Claus Ibsen
AuthorDate: Mon Apr 19 17:05:07 2021 +0200
Polished
---
.../org/apache/camel/component/vertx/kafka/VertxKafkaEndpoint.java | 3 ---
1 file changed, 3 deletions(-)
diff --git
a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/VertxKafkaEndpoint.java
b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/VertxKafkaEndpoint.java
index 36a6715..8b909a8 100644
---
a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/VertxKafkaEndpoint.java
+++
b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/main/java/org/apache/camel/component/vertx/kafka/VertxKafkaEndpoint.java
@@ -23,7 +23,6 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import
org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration;
-import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultEndpoint;
@@ -37,8 +36,6 @@ public class VertxKafkaEndpoint extends DefaultEndpoint {
@UriParam
private VertxKafkaConfiguration configuration = new
VertxKafkaConfiguration();
-@UriParam
-private HeaderFilterStrategy headerFilterStrategy;
public VertxKafkaEndpoint() {
}
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 9d1cf83 Polished 9d1cf83 is described below commit 9d1cf8339de956b3abe67a4812f92f71432dceaf Author: Claus Ibsen AuthorDate: Mon Apr 19 07:29:38 2021 +0200 Polished --- components/camel-microprofile/camel-microprofile-config/pom.xml | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-microprofile/camel-microprofile-health/pom.xml | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-microprofile/camel-microprofile-metrics/pom.xml| 2 +- .../resources/META-INF/services/org/apache/camel/component.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/camel-microprofile/camel-microprofile-config/pom.xml b/components/camel-microprofile/camel-microprofile-config/pom.xml index 9f3f7a3..b2d729d 100644 --- a/components/camel-microprofile/camel-microprofile-config/pom.xml +++ b/components/camel-microprofile/camel-microprofile-config/pom.xml @@ -29,7 +29,7 @@ camel-microprofile-config jar -Camel :: MicroProfile Config +Camel :: MicroProfile :: Config Bridging Eclipse MicroProfile Config with Camel properties diff --git a/components/camel-microprofile/camel-microprofile-config/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-microprofile/camel-microprofile-config/src/generated/resources/META-INF/services/org/apache/camel/other.properties index 2c7fc23..94e93c0 100644 --- a/components/camel-microprofile/camel-microprofile-config/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ b/components/camel-microprofile/camel-microprofile-config/src/generated/resources/META-INF/services/org/apache/camel/other.properties @@ -3,5 +3,5 @@ name=microprofile-config groupId=org.apache.camel artifactId=camel-microprofile-config version=3.10.0-SNAPSHOT -projectName=Camel :: MicroProfile Config +projectName=Camel :: MicroProfile :: Config projectDescription=Bridging Eclipse MicroProfile Config with Camel properties diff --git a/components/camel-microprofile/camel-microprofile-health/pom.xml b/components/camel-microprofile/camel-microprofile-health/pom.xml index 6c6f1a4..d13edda 100644 --- a/components/camel-microprofile/camel-microprofile-health/pom.xml +++ b/components/camel-microprofile/camel-microprofile-health/pom.xml @@ -29,7 +29,7 @@ camel-microprofile-health jar -Camel :: MicroProfile Health +Camel :: MicroProfile :: Health Bridging Eclipse MicroProfile Health with Camel health checks diff --git a/components/camel-microprofile/camel-microprofile-health/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-microprofile/camel-microprofile-health/src/generated/resources/META-INF/services/org/apache/camel/other.properties index 9820a3b..6b9c289 100644 --- a/components/camel-microprofile/camel-microprofile-health/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ b/components/camel-microprofile/camel-microprofile-health/src/generated/resources/META-INF/services/org/apache/camel/other.properties @@ -3,5 +3,5 @@ name=microprofile-health groupId=org.apache.camel artifactId=camel-microprofile-health version=3.10.0-SNAPSHOT -projectName=Camel :: MicroProfile Health +projectName=Camel :: MicroProfile :: Health projectDescription=Bridging Eclipse MicroProfile Health with Camel health checks diff --git a/components/camel-microprofile/camel-microprofile-metrics/pom.xml b/components/camel-microprofile/camel-microprofile-metrics/pom.xml index bbecb35..ffcb754 100644 --- a/components/camel-microprofile/camel-microprofile-metrics/pom.xml +++ b/components/camel-microprofile/camel-microprofile-metrics/pom.xml @@ -29,7 +29,7 @@ camel-microprofile-metrics jar -Camel :: MicroProfile Metrics +Camel :: MicroProfile :: Metrics Camel metrics exposed with Eclipse MicroProfile Metrics diff --git a/components/camel-microprofile/camel-microprofile-metrics/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-microprofile/camel-microprofile-metrics/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 9a4a752..8d66f85 100644 --- a/components/camel-microprofile/camel-microprofile-metrics/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-microprofile/camel-microprofile-metrics/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -3,5 +3,5 @@ components=microprofile-metrics groupId=org.apache.camel artifactId=camel-
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5c4b7e8 Polished
5c4b7e8 is described below
commit 5c4b7e8bf2e5676c3bda5e1aca3b8a7d07371fae
Author: Claus Ibsen
AuthorDate: Wed Mar 31 07:46:02 2021 +0200
Polished
---
.../apache/camel/catalog/docs/sql-component.adoc | 19 ++
.../JdbcOrphanLockAwareIdempotentRepository.java | 23 +++---
.../modules/ROOT/pages/sql-component.adoc | 19 ++
3 files changed, 49 insertions(+), 12 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
index a42a90e..af5a795 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sql-component.adoc
@@ -574,6 +574,25 @@ the second one is the message id (`String`).
The option `tableName` can be used to use the default SQL queries but with a
different table name.
However if you want to customize the SQL queries then you can configure each
of them individually.
+=== Orphan Lock aware Jdbc IdempotentRepository
+
+One of the limitations of
`org.apache.camel.processor.idempotent.jdbc.JdbcMessageIdRepository` is that it
does not handle orphan locks resulting from JVM crash or non graceful shutdown.
This can result in unprocessed files/messages if this is implementation is used
with camel-file, camel-ftp etc. if you need to address orphan locks processing
then use
+`org.apache.camel.processor.idempotent.jdbc.JdbcOrphanLockAwareIdempotentRepository`.
This repository keeps track of the locks held by an instance of the
application. For each lock held, the application will send keep alive signals
to the lock repository resulting in updating the createdAt column with the
current Timestamp. When an application instance tries to acquire a lock if the,
then there are three possibilities exist :
+
+* lock entry does not exist then the lock is provided using the base
implementation of `JdbcMessageIdRepository`.
+
+* lock already exists and the createdAt < System.currentTimeMillis() -
lockMaxAgeMillis. In this case it is assumed that an active instance has the
lock and the lock is not provided to the new instance requesting the lock
+
+* lock already exists and the createdAt > = System.currentTimeMillis() -
lockMaxAgeMillis. In this case it is assumed that there is no active instance
which has the lock and the lock is provided to the requesting instance. The
reason behind is that if the original instance which had the lock, if it was
still running, it would have updated the Timestamp on createdAt using its
keepAlive mechanism
+
+This repository has two additional configuration parameters
+
+[cols="1,1"]
+|===
+|Parameter | Description
+|lockMaxAgeMillis | This refers to the duration after which the lock is
considered orphaned i.e. if the currentTimestamp - createdAt >=
lockMaxAgeMillis then lock is orphaned.
+|lockKeepAliveIntervalMillis | The frequency at which keep alive updates are
done to createdAt Timestamp column.
+|===
== Using the JDBC based aggregation repository
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/JdbcOrphanLockAwareIdempotentRepository.java
b/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/JdbcOrphanLockAwareIdempotentRepository.java
index a787e5a..a84cbff 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/JdbcOrphanLockAwareIdempotentRepository.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/processor/idempotent/jdbc/JdbcOrphanLockAwareIdempotentRepository.java
@@ -45,8 +45,6 @@ import
org.springframework.transaction.support.TransactionTemplate;
* A lock is granted to an instance if either the entry for the lock
attributes do not exists in the
* CAMEL_MESSAGEPROCESSED table or if in case the instance holding the lock
has crashed. This is determined if the
* timestamp on the createdAt column is more than the lockMaxAge.
- *
- * *
*/
public class JdbcOrphanLockAwareIdempotentRepository extends
JdbcMessageIdRepository implements ShutdownableService {
@@ -144,16 +142,22 @@ public class JdbcOrphanLockAwareIdempotentRepository
extends JdbcMessageIdReposi
updateTimestampQuery =
updateTimestampQuery.replaceFirst(DEFAULT_TABLENAME, getTableName());
}
executorServiceManager = context.getExecutorServiceManager();
-executorService =
executorServiceManager.newSingleThreadScheduledExecutor(this,
this.getClass().getName());
-/**
- * Sched
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new ef774b4 Polished
ef774b4 is described below
commit ef774b4352c1951027207593285fdeee72c743d9
Author: Claus Ibsen
AuthorDate: Sat Mar 6 17:06:08 2021 +0100
Polished
---
.../camel/impl/engine/AbstractCamelContext.java | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 3d2d334..0835060 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2963,7 +2963,7 @@ public abstract class AbstractCamelContext extends
BaseService
// use basic endpoint uri to not log verbose details or
potential sensitive data
String uri =
order.getRoute().getEndpoint().getEndpointBaseUri();
uri = URISupport.sanitizeUri(uri);
-lines.add(String.format("\t%s %s (%s)", status, id, uri));
+lines.add(String.format(" %s %s (%s)", status, id, uri));
}
for (Route route : routes) {
if (!route.isAutoStartup()) {
@@ -2977,7 +2977,7 @@ public abstract class AbstractCamelContext extends
BaseService
// use basic endpoint uri to not log verbose details or
potential sensitive data
String uri = route.getEndpoint().getEndpointBaseUri();
uri = URISupport.sanitizeUri(uri);
-lines.add(String.format("\t%s %s (%s)", status, id, uri));
+lines.add(String.format(" %s %s (%s)", status, id, uri));
}
}
if (disabled > 0) {
@@ -3367,7 +3367,7 @@ public abstract class AbstractCamelContext extends
BaseService
// use basic endpoint uri to not log verbose details or
potential sensitive data
String uri =
order.getRoute().getEndpoint().getEndpointBaseUri();
uri = URISupport.sanitizeUri(uri);
-lines.add(String.format("\t%s %s (%s)", status, id, uri));
+lines.add(String.format(" %s %s (%s)", status, id, uri));
}
if (forced > 0) {
LOG.info("Routes shutdown summary (total:{} stopped:{}
forced:{})", total, stopped, forced);
@@ -3542,30 +3542,33 @@ public abstract class AbstractCamelContext extends
BaseService
protected void logRouteState(Route route, String state) {
if (LOG.isInfoEnabled()) {
if (route.getConsumer() != null) {
-// use basic endpoint uri to not log verbose details or
potential sensitive data
+String id = route.getId();
String uri = route.getEndpoint().getEndpointBaseUri();
uri = URISupport.sanitizeUri(uri);
-LOG.info("Route: {} is {}, was consuming from: {}",
route.getId(), state, uri);
+String line = String.format("%s %s (%s)", state, id, uri);
+LOG.info(line);
} else {
-LOG.info("Route: {} is {}.", route.getId(), state);
+String id = route.getId();
+String line = String.format("%s %s", state, id);
+LOG.info(line);
}
}
}
protected synchronized void stopRouteService(RouteService routeService)
throws Exception {
routeService.stop();
-logRouteState(routeService.getRoute(), "stopped");
+logRouteState(routeService.getRoute(), "Stopped");
}
protected synchronized void shutdownRouteService(RouteService
routeService) throws Exception {
routeService.shutdown();
-logRouteState(routeService.getRoute(), "shutdown and removed");
+logRouteState(routeService.getRoute(), "Shutdown");
}
protected synchronized void suspendRouteService(RouteService routeService)
throws Exception {
routeService.setRemovingRoutes(false);
routeService.suspend();
-logRouteState(routeService.getRoute(), "suspended");
+logRouteState(routeService.getRoute(), "Suspended");
}
/**
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new f93ed92 Polished f93ed92 is described below commit f93ed928856ed494c2cc13313fba254fc6c04dc0 Author: Claus Ibsen AuthorDate: Tue Feb 9 07:07:28 2021 +0100 Polished --- core/camel-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml index 02aa398..2afbd7d 100644 --- a/core/camel-core/pom.xml +++ b/core/camel-core/pom.xml @@ -254,7 +254,7 @@ -log4j.properties +log4j2.properties
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c564264 Polished
c564264 is described below
commit c564264bbca93b625bf654be170e3c890152352c
Author: Claus Ibsen
AuthorDate: Thu Feb 4 07:24:57 2021 +0100
Polished
---
.../META-INF/camel-main-configuration-metadata.json | 8
core/camel-main/src/main/docs/main.adoc | 8
.../camel/main/DefaultConfigurationProperties.java | 17 +
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index 5a85bd6..9e75fce 100644
---
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -34,8 +34,8 @@
{ "name": "camel.main.endpointRuntimeStatisticsEnabled", "description":
"Sets whether endpoint runtime statistics is enabled (gathers runtime usage of
each incoming and outgoing endpoints). The default value is false.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"boolean", "javaType": "boolean" },
{ "name": "camel.main.fileConfigurations", "description": "Directory to
load additional configuration files that contains configuration values that
takes precedence over any other configuration. This can be used to refer to
files that may have secret configuration that has been mounted on the file
system for containers. You can specify a pattern to load from sub directories
and a name pattern such as \/var\/app\/secret\/.properties, multiple
directories can be separated by comma.", " [...]
{ "name": "camel.main.inflightRepositoryBrowseEnabled", "description":
"Sets whether the inflight repository should allow browsing each inflight
exchange. This is by default disabled as there is a very slight performance
overhead when enabled.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean" },
-{ "name": "camel.main.javaRoutesExcludePattern", "description": "Used for
exclusive filtering component scanning of RouteBuilder classes with Component
annotation. The exclusive filtering takes precedence over inclusive filtering.
The pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma. For example to exclude all classes starting with Bar use:
**\/Bar* To exclude all routes form a specific package use:
com\/mycompany\/bar\/* [...]
-{ "name": "camel.main.javaRoutesIncludePattern", "description": "Used for
inclusive filtering component scanning of RouteBuilder classes with Component
annotation. The exclusive filtering takes precedence over inclusive filtering.
The pattern is using Ant-path style pattern. Multiple patterns can be specified
separated by comma. For example to include all classes starting with Foo use:
**\/Foo To include all routes form a specific package use:
com\/mycompany\/foo\/* To in [...]
+{ "name": "camel.main.javaRoutesExcludePattern", "description": "Used for
exclusive filtering RouteBuilder classes which are collected from the registry
or via classpath scanning. The exclusive filtering takes precedence over
inclusive filtering. The pattern is using Ant-path style pattern. Multiple
patterns can be specified separated by comma. For example to exclude all
classes starting with Bar use: **\/Bar* To exclude all routes form
a specific package use: com\/mycomp [...]
+{ "name": "camel.main.javaRoutesIncludePattern", "description": "Used for
inclusive filtering RouteBuilder classes which are collected from the registry
or via classpath scanning. The exclusive filtering takes precedence over
inclusive filtering. The pattern is using Ant-path style pattern. Multiple
patterns can be specified separated by comma. Multiple patterns can be
specified separated by comma. For example to include all classes starting with
Foo use: **\/Foo To include a [...]
{ "name": "camel.main.jmxEnabled", "description": "Enable JMX in your
Camel application.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.main.jmxManagementNamePattern", "description": "The
naming pattern for creating the CamelContext JMX management name. The default
pattern is #name#", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": "java.lang.String", "defaultValue": "#name#" },
{ "name": "camel.main.jmxManagementStatisticsLevel", "description": "Sets
the JMX statistics level, the
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new dfdcafa Polished
dfdcafa is described below
commit dfdcafa8cb998aa077248d9f3b339333917c6332
Author: Claus Ibsen
AuthorDate: Sat Jan 30 15:47:43 2021 +0100
Polished
---
core/camel-api/src/main/java/org/apache/camel/Component.java| 2 --
.../main/java/org/apache/camel/spi/HeaderFilterStrategyAware.java | 2 --
.../main/java/org/apache/camel/builder/AggregationStrategies.java | 5 -
.../camel/processor/aggregate/AbstractListAggregationStrategy.java | 2 --
.../apache/camel/processor/aggregate/StringAggregationStrategy.java | 6 --
.../camel/util/toolbox/FlexibleAggregationStrategiesTest.java | 2 --
6 files changed, 19 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/Component.java
b/core/camel-api/src/main/java/org/apache/camel/Component.java
index 3d0d548..84a2148 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Component.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Component.java
@@ -62,8 +62,6 @@ public interface Component extends CamelContextAware, Service
{
* Notice: When using raw uris, then the parameter values is raw as
well.
*
* @return true to use raw uris, false to use encoded
uris (default).
- *
- * @since Camel 2.11.0
*/
boolean useRawUri();
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategyAware.java
b/core/camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategyAware.java
index bf0f553..3e84e84 100644
---
a/core/camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategyAware.java
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategyAware.java
@@ -18,8 +18,6 @@ package org.apache.camel.spi;
/**
* An interface to represent an object which can make use of injected {@link
HeaderFilterStrategy}.
- *
- * @since 1.5
*/
public interface HeaderFilterStrategyAware {
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/AggregationStrategies.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/AggregationStrategies.java
index d6dc3fa..34489f1 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/AggregationStrategies.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/AggregationStrategies.java
@@ -27,8 +27,6 @@ import
org.apache.camel.processor.aggregate.UseOriginalAggregationStrategy;
/**
* Toolbox class to create commonly used Aggregation Strategies in a fluent
manner. For more information about the
* supported {@link AggregationStrategy}, see links to the Javadocs of the
relevant class below.
- *
- * @since 2.12
*/
public final class AggregationStrategies {
@@ -145,8 +143,6 @@ public final class AggregationStrategies {
/**
* Creates a {@link StringAggregationStrategy}.
- *
- * @since 3.0.0
*/
public static StringAggregationStrategy string() {
return new StringAggregationStrategy();
@@ -156,7 +152,6 @@ public final class AggregationStrategies {
* Creates a {@link StringAggregationStrategy} with delimiter.
*
* @param delimiter The delimiter to join with.
- * @since 3.0.0
*/
public static StringAggregationStrategy string(String delimiter) {
return string().delimiter(delimiter);
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
index 1dbe56e..8d0209d 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
@@ -31,8 +31,6 @@ import org.apache.camel.Exchange;
* {@link org.apache.camel.Message#setBody(Object)} or be kept as a property
on the exchange.
* The default behavior to store as message body, allows to more easily group
together a list of values and have its
* result stored as a {@link List} on the completed {@link Exchange}.
- *
- * @since 2.11
*/
public abstract class AbstractListAggregationStrategy implements
AggregationStrategy {
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/StringAggregationStrategy.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/StringAggregationStrategy.java
index 20173b0..43422a6 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/StringAggregationStrategy.java
+++
b/core/camel-core-processor/src/main/java/org/apach
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c1e47ec Polished
c1e47ec is described below
commit c1e47ec47ca2ec4d5bd3e60cd1e51c91e8cef2eb
Author: Claus Ibsen
AuthorDate: Thu Jan 21 15:19:33 2021 +0100
Polished
---
.../org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
index e56628a..a8fbe5b 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
@@ -138,7 +138,7 @@ public abstract class LoadBalancerSupport extends
AsyncProcessorSupport
@Override
public String toString() {
-return getClass().getSimpleName() + Arrays.toString(doGetProcessors());
+return getClass().getSimpleName();
}
}
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 256a7ee Polished 256a7ee is described below commit 256a7ee80fb75873b9a02d2833ad3dab9c99ca7d Author: Claus Ibsen AuthorDate: Sat Dec 12 11:20:02 2020 +0100 Polished --- core/camel-allcomponents/pom.xml | 1 - core/camel-api/pom.xml| 1 - core/camel-base-engine/pom.xml| 1 - core/camel-base/pom.xml | 1 - core/camel-cluster/pom.xml| 1 - core/camel-componentdsl/pom.xml | 1 - core/camel-core-catalog/pom.xml | 1 - core/camel-core-engine/pom.xml| 1 - core/camel-core-languages/pom.xml | 1 - core/camel-core-model/pom.xml | 1 - core/camel-core-processor/pom.xml | 1 - core/camel-core-reifier/pom.xml | 1 - core/camel-core/pom.xml | 1 - core/camel-endpointdsl/pom.xml| 1 - core/camel-health/pom.xml | 1 - core/camel-management-api/pom.xml | 1 - core/camel-management/pom.xml | 1 - core/camel-support/pom.xml| 1 - core/camel-util/pom.xml | 1 - core/camel-xml-jaxp/pom.xml | 1 - core/pom.xml | 2 +- 21 files changed, 1 insertion(+), 21 deletions(-) diff --git a/core/camel-allcomponents/pom.xml b/core/camel-allcomponents/pom.xml index a27da0d..285c8f7 100644 --- a/core/camel-allcomponents/pom.xml +++ b/core/camel-allcomponents/pom.xml @@ -24,7 +24,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-allcomponents diff --git a/core/camel-api/pom.xml b/core/camel-api/pom.xml index 587837a..ebb41f5 100644 --- a/core/camel-api/pom.xml +++ b/core/camel-api/pom.xml @@ -25,7 +25,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-api diff --git a/core/camel-base-engine/pom.xml b/core/camel-base-engine/pom.xml index f727826..b7ecf35 100644 --- a/core/camel-base-engine/pom.xml +++ b/core/camel-base-engine/pom.xml @@ -24,7 +24,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-base-engine diff --git a/core/camel-base/pom.xml b/core/camel-base/pom.xml index 345a9f5..8b9d640 100644 --- a/core/camel-base/pom.xml +++ b/core/camel-base/pom.xml @@ -24,7 +24,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-base diff --git a/core/camel-cluster/pom.xml b/core/camel-cluster/pom.xml index d46784b..bde0770 100644 --- a/core/camel-cluster/pom.xml +++ b/core/camel-cluster/pom.xml @@ -24,7 +24,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-cluster diff --git a/core/camel-componentdsl/pom.xml b/core/camel-componentdsl/pom.xml index b200fe3..8b4dc2b 100644 --- a/core/camel-componentdsl/pom.xml +++ b/core/camel-componentdsl/pom.xml @@ -24,7 +24,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-componentdsl diff --git a/core/camel-core-catalog/pom.xml b/core/camel-core-catalog/pom.xml index 2f4f3fd..2f3df99 100644 --- a/core/camel-core-catalog/pom.xml +++ b/core/camel-core-catalog/pom.xml @@ -24,7 +24,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-core-catalog diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml index 0414933..2cf5c5c 100644 --- a/core/camel-core-engine/pom.xml +++ b/core/camel-core-engine/pom.xml @@ -24,7 +24,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-core-engine diff --git a/core/camel-core-languages/pom.xml b/core/camel-core-languages/pom.xml index cc98374..c1ec8df 100644 --- a/core/camel-core-languages/pom.xml +++ b/core/camel-core-languages/pom.xml @@ -24,7 +24,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-core-languages diff --git a/core/camel-core-model/pom.xml b/core/camel-core-model/pom.xml index 3248251..a1435eb 100644 --- a/core/camel-core-model/pom.xml +++ b/core/camel-core-model/pom.xml @@ -24,7 +24,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-core-model diff --git a/core/camel-core-processor/pom.xml b/core/camel-core-processor/pom.xml index e54e776..cb4e83c 100644 --- a/core/camel-core-processor/pom.xml +++ b/core/camel-core-processor/pom.xml @@ -25,7 +25,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-core-processor diff --git a/core/camel-core-reifier/pom.xml b/core/camel-core-reifier/pom.xml index 3cdaad0..a2b6252 100644 --- a/core/camel-core-reifier/pom.xml +++ b/core/camel-core-reifier/pom.xml @@ -25,7 +25,6 @@ org.apache.camel core 3.7.0-SNAPSHOT -.. camel-core-reifier diff --git a/core/camel-cor
[camel] branch master updated: Polished website nav panel
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new eb82780 Polished website nav panel
eb82780 is described below
commit eb82780514ec9f30e0b391c13302b18a62769c5a
Author: Claus Ibsen
AuthorDate: Wed Dec 9 13:12:50 2020 +0100
Polished website nav panel
---
docs/user-manual-nav.adoc.template| 2 +-
docs/user-manual/modules/ROOT/references.adoc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/user-manual-nav.adoc.template
b/docs/user-manual-nav.adoc.template
index 639b2ac..13efd99 100644
--- a/docs/user-manual-nav.adoc.template
+++ b/docs/user-manual-nav.adoc.template
@@ -50,7 +50,7 @@
** xref:java-dsl.adoc[Java DSL]
** xref:spring.adoc[Spring support]
* xref:using-osgi-blueprint-with-camel.adoc[Using OSGi blueprint with Camel]
-* Supported expression languages -- see Components documentation
+* Languages -- see Components documentation
* xref:(eips-vc}:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns]
* Frequently asked questions
** xref:faq:can-i-get-commercial-support.adoc[Can I get commercial support?]
diff --git a/docs/user-manual/modules/ROOT/references.adoc
b/docs/user-manual/modules/ROOT/references.adoc
index 0e6048d..80f7a38 100644
--- a/docs/user-manual/modules/ROOT/references.adoc
+++ b/docs/user-manual/modules/ROOT/references.adoc
@@ -1,5 +1,5 @@
* *Reference*
* xref:latest@components::index.adoc[Components]
* xref:latest@components:dataformats:index.adoc[Data Formats]
-* xref:latest@components:languages:index.adoc[Supported expression languages]
-* xref:{eip-vc}:eips:enterprise-integration-patterns.adoc[Enterprise
Integration Patterns]
+* xref:latest@components:languages:index.adoc[Languages]
+* xref:{eip-vc}:eips:enterprise-integration-patterns.adoc[EIPs]
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 4fbf4a6 Polished
4fbf4a6 is described below
commit 4fbf4a61f6290de48d966c052d9647a8f8e10084
Author: Claus Ibsen
AuthorDate: Wed Dec 9 06:58:17 2020 +0100
Polished
---
.../apache/camel/language/csimple/joor/JoorCSimpleCompiler.java| 3 ++-
.../java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java | 7 +++
.../java/org/apache/camel/main/DefaultMainShutdownStrategy.java| 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
b/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
index fe0e96a..d05b7ce 100644
---
a/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
+++
b/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
@@ -31,6 +31,7 @@ import org.apache.camel.spi.annotations.JdkService;
import org.apache.camel.support.ScriptHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.StopWatch;
+import org.apache.camel.util.TimeUtils;
import org.joor.Reflect;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -156,7 +157,7 @@ public class JoorCSimpleCompiler extends ServiceSupport
implements CSimpleCompil
protected void doStop() throws Exception {
super.doStop();
if (counter > 0) {
-LOG.info("csimple-joor compiled {} scripts in {} millis", counter,
taken);
+LOG.info("csimple-joor compiled {} scripts in {}", counter,
TimeUtils.printDuration(taken));
}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
index d780914..b03e7b8 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
@@ -54,6 +54,7 @@ import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StopWatch;
+import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -264,10 +265,8 @@ public class DefaultShutdownStrategy extends
ServiceSupport implements ShutdownS
currentShutdownTaskFuture = null;
}
-// convert to seconds as its easier to read than a big milli seconds
number
-long seconds = TimeUnit.SECONDS.convert(watch.taken(),
TimeUnit.MILLISECONDS);
-
-LOG.info("Graceful shutdown of {} routes completed in {} seconds",
routesOrdered.size(), seconds);
+LOG.info("Graceful shutdown of {} routes completed in {}",
routesOrdered.size(),
+TimeUtils.printDuration(watch.taken()));
return true;
}
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultMainShutdownStrategy.java
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultMainShutdownStrategy.java
index e027a7f..a72243f 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultMainShutdownStrategy.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultMainShutdownStrategy.java
@@ -29,8 +29,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Implementation of {@link MainShutdownStrategy} that add a virtual machine
shutdown hook to properly stop the main
- * instance.
+ * Implementation of {@link MainShutdownStrategy} that add a virtual machine
shutdown hook
+ * to properly stop the main instance.
*/
public class DefaultMainShutdownStrategy extends SimpleMainShutdownStrategy {
protected static final Logger LOG =
LoggerFactory.getLogger(DefaultMainShutdownStrategy.class);
@@ -72,7 +72,7 @@ public class DefaultMainShutdownStrategy extends
SimpleMainShutdownStrategy {
}
private void handleHangup() {
-LOG.info("Received hang up - stopping the main instance.");
+LOG.info("Received hangup signal, stopping the main instance.");
// and shutdown listener to allow camel context to graceful shutdown
if JVM shutdown hook is triggered
// as otherwise the JVM terminates before Camel is graceful shutdown
addShutdownListener(() -> {
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 00a84f5 Polished 00a84f5 is described below commit 00a84f57cc4c37dd692690086cf9c06234105e09 Author: Claus Ibsen AuthorDate: Sun Dec 6 12:39:19 2020 +0100 Polished --- parent/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index e636492..a7314ff 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2650,10 +2650,6 @@ - - - - org.apache.camel
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7217f90 Polished
7217f90 is described below
commit 7217f904f2878455b24faa39c48a62999428c952
Author: Claus Ibsen
AuthorDate: Thu Nov 12 18:44:56 2020 +0100
Polished
---
.../main/java/org/apache/camel/component/direct/DirectComponent.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectComponent.java
b/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectComponent.java
index a083596..403e3f6 100644
---
a/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectComponent.java
+++
b/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectComponent.java
@@ -62,7 +62,7 @@ public class DirectComponent extends DefaultComponent {
protected void doShutdown() throws Exception {
ServiceHelper.stopAndShutdownService(consumers);
consumers.clear();
-super.doStop();
+super.doShutdown();
}
public boolean isBlock() {
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new e9696b5 Polished e9696b5 is described below commit e9696b5c521992bfacb35aba970bb84bf834ee72 Author: Claus Ibsen AuthorDate: Wed Oct 21 15:07:24 2020 +0200 Polished --- .../resources/org/apache/camel/catalog/docs/joor-language.adoc | 2 +- components/camel-joor/src/main/docs/joor-language.adoc | 2 +- docs/components/modules/languages/pages/joor-language.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/joor-language.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/joor-language.adoc index 3d0653c..0506830 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/joor-language.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/joor-language.adoc @@ -52,7 +52,7 @@ The jOOR language allows the following variables to be used in the script: The jOOR language allows the following functions to be used in the script: -[width="100%",cols="2,1m,7",options="header"] +[width="100%",cols="2,8",options="header"] |=== | Function | Description | bodyAs(type) | To convert the body to the given type. diff --git a/components/camel-joor/src/main/docs/joor-language.adoc b/components/camel-joor/src/main/docs/joor-language.adoc index 3d0653c..0506830 100644 --- a/components/camel-joor/src/main/docs/joor-language.adoc +++ b/components/camel-joor/src/main/docs/joor-language.adoc @@ -52,7 +52,7 @@ The jOOR language allows the following variables to be used in the script: The jOOR language allows the following functions to be used in the script: -[width="100%",cols="2,1m,7",options="header"] +[width="100%",cols="2,8",options="header"] |=== | Function | Description | bodyAs(type) | To convert the body to the given type. diff --git a/docs/components/modules/languages/pages/joor-language.adoc b/docs/components/modules/languages/pages/joor-language.adoc index fda65dd..f423cef 100644 --- a/docs/components/modules/languages/pages/joor-language.adoc +++ b/docs/components/modules/languages/pages/joor-language.adoc @@ -54,7 +54,7 @@ The jOOR language allows the following variables to be used in the script: The jOOR language allows the following functions to be used in the script: -[width="100%",cols="2,1m,7",options="header"] +[width="100%",cols="2,8",options="header"] |=== | Function | Description | bodyAs(type) | To convert the body to the given type.
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new a201f04 Polished a201f04 is described below commit a201f04e5aedafe2a2b40738fd2d64bdeaa42912 Author: Claus Ibsen AuthorDate: Mon Oct 19 20:02:26 2020 +0200 Polished --- components/camel-arangodb/pom.xml | 4 ++-- .../resources/META-INF/services/org/apache/camel/component.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/camel-arangodb/pom.xml b/components/camel-arangodb/pom.xml index b1999c3..380 100644 --- a/components/camel-arangodb/pom.xml +++ b/components/camel-arangodb/pom.xml @@ -32,8 +32,8 @@ camel-arangodb jar -Camel ArangoDb Component -Camel ArangoDb (Java Driver) component +Camel :: ArangoDB +Camel ArangoDB (Java Driver) component UTF-8 diff --git a/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 66fd7d2..282dd28 100644 --- a/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -3,5 +3,5 @@ components=arangodb groupId=org.apache.camel artifactId=camel-arangodb version=3.7.0-SNAPSHOT -projectName=Camel ArangoDb Component -projectDescription=Camel ArangoDb (Java Driver) component +projectName=Camel :: ArangoDB +projectDescription=Camel ArangoDB (Java Driver) component
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5b97772 Polished
5b97772 is described below
commit 5b977726a4da1651241ad0c510c6240b7dda1ed9
Author: Claus Ibsen
AuthorDate: Mon Sep 21 13:35:24 2020 +0200
Polished
---
.../java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
index b34ca0e..c765f49 100644
---
a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
+++
b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
@@ -176,7 +176,6 @@ public abstract class AbstractCamelCatalog {
model.getEndpointPathOptions().forEach(o -> rows.put(o.getName(), o));
if (model.isApi()) {
-// TODO: combo of apiName/methodName
String[] apiSyntax = StringHelper.splitWords(model.getApiSyntax());
String key = properties.get(apiSyntax[0]);
String key2 = apiSyntax.length > 1 ? properties.get(apiSyntax[1])
: null;
@@ -822,9 +821,9 @@ public abstract class AbstractCamelCatalog {
sb.append(syntax);
if (!copy.isEmpty()) {
-boolean hasQuestionmark = sb.toString().contains("?");
+boolean hasQuestionMark = sb.toString().contains("?");
// the last option may already contain a ? char, if so we
should use & instead of ?
-sb.append(hasQuestionmark ? ampersand : '?');
+sb.append(hasQuestionMark ? ampersand : '?');
String query = URISupport.createQueryString(copy, ampersand,
encode);
sb.append(query);
}
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 0a44f5c Polished
0a44f5c is described below
commit 0a44f5cc66c641434e0e0c301e377193dea86829
Author: Claus Ibsen
AuthorDate: Sun Sep 20 11:22:47 2020 +0200
Polished
---
.../component/google/sheets/GoogleSheetsEndpoint.java | 1 -
.../sheets/stream/GoogleSheetsStreamConfiguration.java | 18 --
.../camel/support/component/AbstractApiEndpoint.java | 4
3 files changed, 23 deletions(-)
diff --git
a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
index e8b4115..09f4359 100644
---
a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
+++
b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
@@ -66,7 +66,6 @@ public class GoogleSheetsEndpoint extends
AbstractApiEndpoint
@Override
public void configureProperties(Map options) {
super.configureProperties(options);
-// TODO: this is not very clean as it does not leverage the endpoint
-// TODO: configurer, but the generated configurer currently does not
-// TODO: support configuration inheritance, so only basic options
-// TODO: are supported. This should be fixed.
setProperties(getConfiguration(), options);
// validate and initialize state
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1eded5a Polished
1eded5a is described below
commit 1eded5a74399c908a93dccebd48fc6c9d2f6924c
Author: Claus Ibsen
AuthorDate: Sun Sep 20 08:41:08 2020 +0200
Polished
---
components/camel-braintree/pom.xml | 31 +++
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/components/camel-braintree/pom.xml
b/components/camel-braintree/pom.xml
index 13526c4..b59196d 100644
--- a/components/camel-braintree/pom.xml
+++ b/components/camel-braintree/pom.xml
@@ -61,22 +61,6 @@
-
-
-com.braintreepayments.gateway
-braintree-java
-${braintree-gateway-version}
-sources
-provided
-true
-
-
-org.json
-json
-
-
-
-
org.slf4j
@@ -268,6 +252,21 @@
+
+
+
+com.braintreepayments.gateway
+braintree-java
+${braintree-gateway-version}
+sources
+
+
+org.json
+json
+
+
+
+
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 95af9bb Polished
95af9bb is described below
commit 95af9bbe1dc0172d722563710470e78eaa80f209
Author: Claus Ibsen
AuthorDate: Fri Sep 11 06:40:06 2020 +0200
Polished
---
.../org/apache/camel/catalog/docs/rabbitmq-component.adoc | 13 +++--
.../camel-rabbitmq/src/main/docs/rabbitmq-component.adoc| 13 +++--
docs/components/modules/ROOT/pages/rabbitmq-component.adoc | 13 +++--
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rabbitmq-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rabbitmq-component.adoc
index e61707f..86085dd 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rabbitmq-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/rabbitmq-component.adoc
@@ -341,16 +341,17 @@
from("rabbitmq:A?queue=IN&declare=false&autoDelete=false&arg.queue.x-message-ttl
You would think that it would be a straight forward operation. However, if the
source queue has a routing key set in the headers, it will pass down to the
destination and not be overriden with the URI query parameters. Because the
exchange is the same and the routing key is the same, an infinitely growing
loop is created.
-Either make a second exchange for the producer to avoid the headers to pass
through or manually access the exchange headers in a processor and get rid of
the misbehaving key. (Example is written in Kotlin)
+Either make a second exchange for the producer to avoid the headers to pass
through or manually access the exchange headers in a processor and get rid of
the misbehaving key.
-[source,kotlin]
+[source,java]
from("rabbitmq:A?queue=IN&declare=false&autoDelete=false&arg.queue.x-message-ttl=2")
// ...
- .process(Processor { exchange: Exchange ->
-val input = exchange.`in`.body as InputModel
-exchange.`in`.removeHeader("rabbitmq.ROUTING_KEY")
-exchange.`in`.body = OutputModel(...)
+ .process(e -> {
+InputModel input = e.getMessage().getBody(InputModel.class);
+e.getMessage().removeHeader("rabbitmq.ROUTING_KEY");
+OutputModel output = ...
+e.getMessage().setBody(output);
})
// ...
.to("rabbitmq:A?queue=OUT&routingKey=OUT&declare=false&autoDelete=false&arg.queue.x-message-ttl=2");
diff --git a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
index e61707f..86085dd 100644
--- a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
+++ b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
@@ -341,16 +341,17 @@
from("rabbitmq:A?queue=IN&declare=false&autoDelete=false&arg.queue.x-message-ttl
You would think that it would be a straight forward operation. However, if the
source queue has a routing key set in the headers, it will pass down to the
destination and not be overriden with the URI query parameters. Because the
exchange is the same and the routing key is the same, an infinitely growing
loop is created.
-Either make a second exchange for the producer to avoid the headers to pass
through or manually access the exchange headers in a processor and get rid of
the misbehaving key. (Example is written in Kotlin)
+Either make a second exchange for the producer to avoid the headers to pass
through or manually access the exchange headers in a processor and get rid of
the misbehaving key.
-[source,kotlin]
+[source,java]
from("rabbitmq:A?queue=IN&declare=false&autoDelete=false&arg.queue.x-message-ttl=2")
// ...
- .process(Processor { exchange: Exchange ->
-val input = exchange.`in`.body as InputModel
-exchange.`in`.removeHeader("rabbitmq.ROUTING_KEY")
-exchange.`in`.body = OutputModel(...)
+ .process(e -> {
+InputModel input = e.getMessage().getBody(InputModel.class);
+e.getMessage().removeHeader("rabbitmq.ROUTING_KEY");
+OutputModel output = ...
+e.getMessage().setBody(output);
})
// ...
.to("rabbitmq:A?queue=OUT&routingKey=OUT&declare=false&autoDelete=false&arg.queue.x-message-ttl=2");
diff --git a/docs/components/modules/ROOT/pages/rabbitmq-component.adoc
b/docs/components/modules/ROOT/pages/rabbitmq-component.adoc
index f34e15a..27fe3dd 100644
--- a/docs/components/modules/ROOT/pages/rabbitmq-component.adoc
+++ b/docs/components/modules/ROOT/pages/rabbitmq-component.adoc
@@ -343,16 +343,17 @@
from("rabbitmq:A?queue=IN&declare=false&autoDelete=false&arg.queue.x-message-ttl
You would think that it would be a straight forward operation. However, if the
source queue has a routing key
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new bea9825 Polished
bea9825 is described below
commit bea98255d1c652fde97143557a92262b2ef1a598
Author: Claus Ibsen
AuthorDate: Tue Sep 8 14:26:39 2020 +0200
Polished
---
.../camel/component/google/sheets/stream/google-sheets-stream.json | 2 +-
.../src/main/docs/google-sheets-stream-component.adoc| 2 +-
.../component/google/sheets/stream/GoogleSheetsStreamEndpoint.java | 5 +++--
core/camel-componentdsl/src/generated/resources/metadata.json| 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git
a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
index 39aae66..5267057 100644
---
a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
+++
b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
@@ -17,7 +17,7 @@
"syntax": "google-sheets-stream:apiName",
"async": false,
"api": false,
-"apiPropertyQualifier": "",
+"apiPropertyQualifier": "apiName",
"consumerOnly": true,
"producerOnly": false,
"lenientProperties": false,
diff --git
a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index 2ab2839..993c1c0 100644
---
a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++
b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -151,7 +151,7 @@ with the following path and query parameters:
=== Query API Parameters (2 APIs):
The Google Sheets Stream endpoint is an API based component and has additional
parameters based on which API name and method in use.
-The API name and method is located in the endpoint URI as the path parameters:
+The API name and method is located in the endpoint URI as the apiName path
parameters:
google-sheets-stream:apiName
diff --git
a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
index afeb487..7885f7c 100644
---
a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
+++
b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
@@ -21,6 +21,7 @@ import java.util.List;
import com.google.api.services.sheets.v4.Sheets;
import com.google.api.services.sheets.v4.model.Spreadsheet;
import com.google.api.services.sheets.v4.model.ValueRange;
+import org.apache.camel.Category;
import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
@@ -37,9 +38,9 @@ import org.apache.camel.support.ScheduledPollEndpoint;
@UriEndpoint(firstVersion = "2.23.0",
scheme = "google-sheets-stream",
title = "Google Sheets Stream",
- syntax = "google-sheets-stream:apiName",
+ syntax = "google-sheets-stream:apiName", apiPropertyQualifier =
"apiName",
consumerOnly = true,
- label = "api,cloud,sheets")
+ category = { Category.API, Category.CLOUD, Category.SHEETS })
public class GoogleSheetsStreamEndpoint extends ScheduledPollEndpoint {
@UriParam
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json
b/core/camel-componentdsl/src/generated/resources/metadata.json
index ae96f41b..15fbdbb 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -3322,7 +3322,7 @@
"syntax": "google-sheets-stream:apiName",
"async": false,
"api": false,
-"apiPropertyQualifier": "",
+"apiPropertyQualifier": "apiName",
"consumerOnly": true,
"producerOnly": false,
"lenientProperties": false
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 68f7c1a Polished 68f7c1a is described below commit 68f7c1a3ff398ef3d69c9138249ded9a978142de Author: Claus Ibsen AuthorDate: Thu Sep 3 16:29:44 2020 +0200 Polished --- components/camel-zendesk/src/main/docs/zendesk-component.adoc | 7 --- 1 file changed, 7 deletions(-) diff --git a/components/camel-zendesk/src/main/docs/zendesk-component.adoc b/components/camel-zendesk/src/main/docs/zendesk-component.adoc index ce6036e..33afe71 100644 --- a/components/camel-zendesk/src/main/docs/zendesk-component.adoc +++ b/components/camel-zendesk/src/main/docs/zendesk-component.adoc @@ -244,13 +244,6 @@ The following lists each API method and its additional parameters. // endpoint options: END -== URI format - -[source,java] - -zendesk://endpoint?[options] - - == Producer Endpoints:
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 742319d Polished
742319d is described below
commit 742319d57565fc585b971870fce851d2b45542b9
Author: Claus Ibsen
AuthorDate: Sun Jul 19 10:08:57 2020 +0200
Polished
---
.../src/main/java/org/apache/camel/component/bean/BeanInfo.java | 4
1 file changed, 4 deletions(-)
diff --git
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 0491065..0fc1799 100644
---
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -417,10 +417,6 @@ public class BeanInfo {
boolean hasCustomAnnotation = false;
boolean hasHandlerAnnotation =
org.apache.camel.util.ObjectHelper.hasAnnotation(method.getAnnotations(),
Handler.class);
-if (!hasHandlerAnnotation) {
-
-}
-
int size = parameterTypes.length;
if (LOG.isTraceEnabled()) {
LOG.trace("Creating MethodInfo for class: {} method: {} having {}
parameters", clazz, method, size);
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 8ff64ca Polished
8ff64ca is described below
commit 8ff64ca33ccc6b091731747443d88f2ad8dceb73
Author: Claus Ibsen
AuthorDate: Wed Jun 3 14:38:12 2020 +0200
Polished
---
docs/components/modules/others/pages/microprofile-health.adoc | 1 -
1 file changed, 1 deletion(-)
diff --git a/docs/components/modules/others/pages/microprofile-health.adoc
b/docs/components/modules/others/pages/microprofile-health.adoc
index 1a3d105..43b14ac 100644
--- a/docs/components/modules/others/pages/microprofile-health.adoc
+++ b/docs/components/modules/others/pages/microprofile-health.adoc
@@ -40,7 +40,6 @@ public class MyHealthCheck extends
AbstractCamelMicroProfileLivenessCheck {
public MyHealthCheck() {
super("my-liveness-check-id");
-getConfiguration().setEnabled(true);
}
@Override
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e9927da Polished
e9927da is described below
commit e9927daac1e85981d8ff7bebf0a146b9fd11cde3
Author: Claus Ibsen
AuthorDate: Tue Jun 2 10:40:40 2020 +0200
Polished
---
.../camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
b/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
index e4ba6ca..1762dc5 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
@@ -284,7 +284,7 @@ public class ThreadPoolProfile implements Serializable,
Cloneable {
@Override
public String toString() {
return "ThreadPoolProfile[" + id + " (" + defaultProfile + ") size:" +
poolSize + "-" + maxPoolSize
-+ ", keepAlive: " + keepAliveTime + " " + timeUnit + ",
maxQueue: " + maxQueueSize
++ ", keepAlive:" + keepAliveTime + " " + timeUnit + ",
maxQueue:" + maxQueueSize
+ ", allowCoreThreadTimeOut:" + allowCoreThreadTimeOut + ",
rejectedPolicy:" + rejectedPolicy + "]";
}
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e4dddf5 Polished
e4dddf5 is described below
commit e4dddf5b4ec608d1fda276d64a664c8eb2d031de
Author: Claus Ibsen
AuthorDate: Mon May 25 18:23:26 2020 +0200
Polished
---
.../apache/camel/openapi/RestOpenApiReader.java| 41 --
1 file changed, 7 insertions(+), 34 deletions(-)
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index 4463b23..faf9e67 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -122,8 +122,8 @@ public class RestOpenApiReader {
}
private void parse(OasDocument openApi, RestDefinition rest, String
camelContextId,
- ClassResolver classResolver)
-throws ClassNotFoundException {
+ ClassResolver classResolver) throws
ClassNotFoundException {
+
List verbs = new ArrayList<>(rest.getVerbs());
// must sort the verbs by uri so we group them together when an uri
has multiple operations
Collections.sort(verbs, new VerbOrdering());
@@ -132,19 +132,11 @@ public class RestOpenApiReader {
String pathAsTag = rest.getTag() != null
? rest.getTag() : FileUtil.stripLeadingSeparator(rest.getPath());
if (openApi instanceof Oas20Document) {
-
-
parseOas20((Oas20Document)openApi, rest, pathAsTag);
-
-
} else if (openApi instanceof Oas30Document) {
-
-
-
parseOas30((Oas30Document)openApi, rest, pathAsTag);
-
-
}
+
// gather all types in use
Set types = new LinkedHashSet<>();
for (VerbDefinition verb : verbs) {
@@ -161,7 +153,6 @@ public class RestOpenApiReader {
continue;
}
-
String type = verb.getType();
if (org.apache.camel.util.ObjectHelper.isNotEmpty(type)) {
if (type.endsWith("[]")) {
@@ -346,8 +337,8 @@ public class RestOpenApiReader {
private void doParseVerbs(OasDocument openApi, RestDefinition rest, String
camelContextId,
List verbs, String pathAsTag) {
-// used during gathering of apis
+// used during gathering of apis
String basePath = rest.getPath();
for (VerbDefinition verb : verbs) {
@@ -420,7 +411,6 @@ public class RestOpenApiReader {
// add path
openApi.paths.addPathItem(opPath, path);
-
}
}
@@ -472,7 +462,6 @@ public class RestOpenApiReader {
// set type on parameter
if (!parameter.in.equals("body")) {
-
Oas30Parameter parameter30 = (Oas30Parameter)parameter;
Oas30Schema oas30Schema = null;
final boolean isArray =
param.getDataType().equalsIgnoreCase("array");
@@ -542,9 +531,7 @@ public class RestOpenApiReader {
// set schema on body parameter
if (parameter.in.equals("body")) {
-
Oas30Parameter bp = (Oas30Parameter)parameter;
-
String type = param.getDataType() != null ?
param.getDataType() : verb.getType();
if (type != null) {
if (type.endsWith("[]")) {
@@ -563,9 +550,7 @@ public class RestOpenApiReader {
} else {
OasSchema model =
(Oas30Schema)bp.createSchema();
model = modelTypeAsProperty(type, openApi,
model);
-
bp.schema = model;
-
}
}
}
@@ -582,9 +567,9 @@ public class RestOpenApiReader {
mediaType.schema = mediaType.createSchema();
mediaType.schema.$ref = bp.schema.$ref;
op.requestBody.addMediaType(part, mediaType);
-
}
}
+
// add examples
if (param.getExamples() != null) {
Extension exampleExtension =
op.requestBody.createExtension();
@@ -607,7 +592,6 @@ public class RestOpenApiReader {
op.addParameter(parameter);
}
-
}
// clear parameters if its empty
@@ -617,7 +601,6 @@ public class RestOpenApiReader {
// if we have an out type then set that as response message
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 4805139 Polished
4805139 is described below
commit 480513900fe0e39308fe2562a76ab435f0ed25fc
Author: Claus Ibsen
AuthorDate: Wed May 20 07:57:40 2020 +0200
Polished
---
.../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 4e12fd9..b37e79f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -452,7 +452,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
boolean multiValued = option.isMultiValue();
if (multiValued) {
// multi value option that takes one value
-String desc = baseDesc.replace("@@REPLACE_ME@@", "\nThe
option is a: " + ogtype.toString().replace("<", "<").replace(">",
">") + " type.");
+String desc = baseDesc.replaceFirst("@@REPLACE_ME@@",
"\nThe option is a: " + ogtype.toString().replace("<",
"<").replace(">", ">") + " type.");
Method fluent =
target.addMethod().setDefault().setName(option.getName()).setReturnType(new
GenericType(loadClass(target.getCanonicalName(
.addParameter(new GenericType(String.class), "key")
.addParameter(new GenericType(Object.class),
"value")
@@ -471,7 +471,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
fluent.getJavaDoc().setFullText(desc);
} else {
// regular option
-String desc = baseDesc.replace("@@REPLACE_ME@@", "\nThe
option is a: " + ogtype.toString().replace("<", "<").replace(">",
">") + " type.");
+String desc = baseDesc.replaceFirst("@@REPLACE_ME@@",
"\nThe option is a: " + ogtype.toString().replace("<",
"<").replace(">", ">") + " type.");
Method fluent =
target.addMethod().setDefault().setName(option.getName()).setReturnType(new
GenericType(loadClass(target.getCanonicalName(
.addParameter(isPrimitive(ogtype.toString()) ?
ogtype : gtype, option.getName())
.setBody("doSetProperty(\"" + option.getName() +
"\", " + option.getName() + ");", "return this;\n");
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new bc7d67c Polished bc7d67c is described below commit bc7d67c6fe672812d9a3b67706372e965bf4af18 Author: Claus Ibsen AuthorDate: Sat May 16 17:33:19 2020 +0200 Polished --- .../modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc index 245d45c..4048233 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_4.adoc @@ -9,9 +9,18 @@ from both 3.0 to 3.1 and 3.1 to 3.2. === camel-test and JMX The `camel-test` module no longer has dependency on `camel-management` out of the box. -In Camel JMX is optional and to use JMX then `camel-management` must be added as depencency. +In Camel JMX is optional and to use JMX then `camel-management` must be added as dependency. -So for users that do not use JMX then `camel-test` will not include JMX out of the box anymore. +For example to use JMX during testing you the following dependency as test scope: + +[source,xml] + + +org.apache.camel +camel-management +test + + === Template components
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5a8abd62 Polished
5a8abd62 is described below
commit 5a8abd62344c018a7dfd28e4ccf6a533c205b116
Author: Claus Ibsen
AuthorDate: Sat May 9 09:17:45 2020 +0200
Polished
---
.../main/java/org/apache/camel/ExtendedCamelContext.java| 13 +
1 file changed, 13 insertions(+)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index b75c91e..0546459 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -565,12 +565,25 @@ public interface ExtendedCamelContext extends
CamelContext {
*/
void setSupervisingRouteController(SupervisingRouteController
supervisingRouteController);
+/**
+ * Internal {@link RouteController} that are only used internally by Camel
to
+ * perform basic route operations. Do not use this as end user.
+ */
RouteController getInternalRouteController();
+/**
+ * Internal API for adding routes. Do not use this as end user.
+ */
void addRoute(Route route);
+/**
+ * Internal API for removing routes. Do not use this as end user.
+ */
void removeRoute(Route route);
+/**
+ * Internal API for creating error handler. Do not use this as end user.
+ */
Processor createErrorHandler(Route route, Processor processor) throws
Exception;
}
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new fbe2ae8 Polished
fbe2ae8 is described below
commit fbe2ae801e4dffd08645b53ea09a3a08b46f7d64
Author: Claus Ibsen
AuthorDate: Tue Apr 14 08:06:23 2020 +0200
Polished
---
components/camel-djl/pom.xml | 5
.../org/apache/camel/component/djl/djl.json| 12 +-
.../camel-djl/src/main/docs/djl-component.adoc | 28 +++---
.../apache/camel/component/djl/DJLComponent.java | 5
.../apache/camel/component/djl/DJLEndpoint.java| 17 -
.../apache/camel/component/djl/DJLProducer.java| 7 --
.../component/djl/model/AbstractPredictor.java | 1 -
.../model/CustomImageClassificationPredictor.java | 1 -
.../djl/model/CustomObjectDetectionPredictor.java | 1 -
.../djl/model/ModelPredictorProducer.java | 1 -
.../djl/model/ZooImageClassificationPredictor.java | 1 -
.../djl/model/ZooObjectDetectionPredictor.java | 1 -
.../component/ComponentsBuilderFactory.java| 6 ++---
.../component/dsl/DjlComponentBuilderFactory.java | 10
.../src/generated/resources/metadata.json | 10
.../endpoint/dsl/DJLEndpointBuilderFactory.java| 19 ---
docs/components/modules/ROOT/nav.adoc | 2 +-
.../modules/ROOT/pages/djl-component.adoc | 28 +++---
18 files changed, 63 insertions(+), 92 deletions(-)
diff --git a/components/camel-djl/pom.xml b/components/camel-djl/pom.xml
index 7a1c1a0..9c5e9cf 100644
--- a/components/camel-djl/pom.xml
+++ b/components/camel-djl/pom.xml
@@ -15,11 +15,6 @@
Camel :: Deep Java Library
Camel Deep Java Library support
-
-UTF-8
-
UTF-8
-
-
diff --git
a/components/camel-djl/src/generated/resources/org/apache/camel/component/djl/djl.json
b/components/camel-djl/src/generated/resources/org/apache/camel/component/djl/djl.json
index 6021878..2a397d9 100644
---
a/components/camel-djl/src/generated/resources/org/apache/camel/component/djl/djl.json
+++
b/components/camel-djl/src/generated/resources/org/apache/camel/component/djl/djl.json
@@ -5,9 +5,9 @@
"scheme": "djl",
"extendsScheme": "",
"syntax": "djl:application",
-"title": "DJL",
-"description": "Represents a DJL endpoint.",
-"label": "deeplearning",
+"title": "Deep Java Library",
+"description": "The Deep Java Library component is used to infer deep
learning models.",
+"label": "ai,deeplearning",
"deprecated": false,
"async": false,
"consumerOnly": false,
@@ -26,10 +26,10 @@
},
"properties": {
"application": { "kind": "path", "displayName": "Application", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "Application name" },
-"artifactId": { "kind": "parameter", "displayName": "Artifact Id",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"secret": false, "description": "Model Artifact" },
+"artifactId": { "kind": "parameter", "displayName": "Artifact Id",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "Model Artifact" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the [...]
-"model": { "kind": "parameter", "displayName": "Model", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"secret": false, "description": "Model" },
-"translator": { "kind": "parameter", "displayName": "Translator", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"secret": false, "description": "Translator" },
+"model": { "kind": "parameter", "displayName": "Model", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description":
"Model" },
+"translator": { "kind": "parameter", "displa
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 42a9aea Polished
42a9aea is described below
commit 42a9aea7914cef1595ed9d4d27b2c3b49e37fcb8
Author: Claus Ibsen
AuthorDate: Fri Apr 10 22:04:20 2020 +0200
Polished
---
.../java/org/apache/camel/maven/packaging/GenerateConfigurerMojo.java| 1 +
1 file changed, 1 insertion(+)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateConfigurerMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateConfigurerMojo.java
index fa38aa1..3cc118b 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateConfigurerMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateConfigurerMojo.java
@@ -66,6 +66,7 @@ public class GenerateConfigurerMojo extends
AbstractGeneratorMojo {
/**
* Whether to discover configurer classes from classpath by scanning for
@Configurer annotations.
+ * This requires using jandex-maven-plugin.
*/
@Parameter(defaultValue = "true")
protected boolean discoverClasses = true;
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new e2df871 Polished e2df871 is described below commit e2df871229a0c209cfa026bbac2bea835c17ca7a Author: Claus Ibsen AuthorDate: Wed Apr 8 15:38:49 2020 +0200 Polished --- .../faulttolerance/SpringFaultToleranceRouteFallbackTest.xml| 2 +- .../microprofile/faulttolerance/SpringFaultToleranceRouteOkTest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-microprofile-fault-tolerance/src/test/resources/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteFallbackTest.xml b/components/camel-microprofile-fault-tolerance/src/test/resources/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteFallbackTest.xml index 39dbe97..e99c5f7 100644 --- a/components/camel-microprofile-fault-tolerance/src/test/resources/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteFallbackTest.xml +++ b/components/camel-microprofile-fault-tolerance/src/test/resources/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteFallbackTest.xml @@ -21,7 +21,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd "> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> http://camel.apache.org/schema/spring";> diff --git a/components/camel-microprofile-fault-tolerance/src/test/resources/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteOkTest.xml b/components/camel-microprofile-fault-tolerance/src/test/resources/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteOkTest.xml index 1e2b139..92826d9 100644 --- a/components/camel-microprofile-fault-tolerance/src/test/resources/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteOkTest.xml +++ b/components/camel-microprofile-fault-tolerance/src/test/resources/org/apache/camel/component/microprofile/faulttolerance/SpringFaultToleranceRouteOkTest.xml @@ -21,7 +21,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=" http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd "> + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> http://camel.apache.org/schema/spring";>
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6447968 Polished
6447968 is described below
commit 6447968b03230a4baae0103db71d4e6122417dc3
Author: Claus Ibsen
AuthorDate: Thu Apr 2 10:59:46 2020 +0200
Polished
---
.../src/main/java/org/apache/camel/component/rest/RestProducer.java | 2 +-
.../src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducer.java
b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducer.java
index 0957a43..a4fa067 100644
---
a/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducer.java
+++
b/components/camel-rest/src/main/java/org/apache/camel/component/rest/RestProducer.java
@@ -345,7 +345,7 @@ public class RestProducer extends DefaultAsyncProducer {
}
if (jaxb != null) {
-// to setup JAXB we need to use camel-xml-jaxb
+// to setup JAXB we need to use camel-jaxb
camelContext.adapt(ExtendedCamelContext.class).getRestBindingJaxbDataFormatFactory()
.setupJaxb(camelContext, configuration, type, outType,
jaxb, outJaxb);
}
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
index 95b9fd6..233cc50 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
@@ -120,7 +120,7 @@ public class RestBindingReifier extends AbstractReifier {
}
if (jaxb != null) {
-// to setup JAXB we need to use camel-xml-jaxb
+// to setup JAXB we need to use camel-jaxb
camelContext.adapt(ExtendedCamelContext.class).getRestBindingJaxbDataFormatFactory()
.setupJaxb(camelContext, config,
parseString(definition.getType()), parseString(definition.getOutType()), jaxb,
outJaxb);
}
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c583be3 Polished
c583be3 is described below
commit c583be3d50798a8f6669b31d4061225c15a89a3d
Author: Claus Ibsen
AuthorDate: Tue Mar 17 06:47:33 2020 +0100
Polished
---
.../modules/ROOT/pages/Endpoint-dsl.adoc | 54 --
1 file changed, 20 insertions(+), 34 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/Endpoint-dsl.adoc
b/docs/user-manual/modules/ROOT/pages/Endpoint-dsl.adoc
index 5e3ddbc..8989d07 100644
--- a/docs/user-manual/modules/ROOT/pages/Endpoint-dsl.adoc
+++ b/docs/user-manual/modules/ROOT/pages/Endpoint-dsl.adoc
@@ -1,50 +1,36 @@
-[[ENDPOINT-DSL]]
-= ENDPOINT DSL
+[[Endpoint-DSL]]
+= Endpoint DSL
-Endpoint-dsl is a new API that is created to replace already being used URLs
to designate the consumer or producer endpoints.
-
-== How Endpoint-dsl is better than URLs?
-
-=== Simple and easy to read/understand
+Endpoint-dsl is a new API that allows to use type-safe endpoint URL
configurations.
The following is an example of an FTP consumer endpoint definition:
-from("ftp://foo@myserver?password=secret&;
-
- recursive=true&
-
+[source,java]
+
+from("ftp://foo@myserver?password=secret&recursive=true&;
ftpClient.dataTimeout=3&
-
ftpClientConfig.serverLanguageCode=fr")
-
.to("bean:doSomething");
+
-The same java statement can be rewritten in the following more readable way:
-
-from(ftp("myserver").account("foo")
-
-.password("secret")
-
-.recursive(true)
+The same Java statement can be rewritten in the following more readable way:
+[source,java]
+
+from(ftp("myserver").account("foo").password("secret").recursive(true)
.advanced()
-
-.ftpClientParameters(
-
-Collections.singletonMap("dataTimeout", 3))
-
-.ftpClientConfig(
-
-Collections.singletonMap("serverLanguageCode", "fr")))
-
+.ftpClientParameters(Collections.singletonMap("dataTimeout", 3))
+.ftpClientConfig(Collections.singletonMap("serverLanguageCode", "fr")))
.to(bean("something"));
+
+
+== The fluent DSL now provides type safety for parameters:
-=== The fluent DSL now provides type safety for parameters :
The above example of endpoint-dsl uses the meta model, which is extracted
from the source using an annotation processor and
written in various JSON files, to generate a fluent DSL for each endpoint.This
fluent DSL provides type safety for parameters.
-It further allows leveraging the java editor code completion to access the
list of available parameters for the each endpoint.
+It further allows leveraging the Java editor code completion to access the
list of available parameters for the each endpoint.
-== How to access?
+== How to use
-The DSL can be accessed in several ways, but the main one is to switch to
using an EndpointRouteBuilder instead of the usual
-RouteBuilder. It provides access to all endpoint builders which are defined
through inheritance on the EndpointRouteBuilder.
+The DSL can be accessed in several ways, but the main one is to switch to
using an `EndpointRouteBuilder` instead of the usual
+`RouteBuilder`. It provides access to all endpoint builders which are defined
through inheritance on the `EndpointRouteBuilder`.
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 0e0ae23 Polished
0e0ae23 is described below
commit 0e0ae23dc52d5206f9d907514970108c89452b4e
Author: Claus Ibsen
AuthorDate: Wed Mar 4 13:56:45 2020 +0100
Polished
---
.../src/main/java/org/apache/camel/spi/LifecycleStrategy.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
b/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
index 5a6e247..20ddeaa 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
@@ -112,16 +112,16 @@ public interface LifecycleStrategy {
void onRoutesRemove(Collection routes);
/**
- * Notification on adding {@link Route}(s).
+ * Notification on creating {@link Route}(s).
*
- * @param route the added route context
+ * @param route the created route context
*/
void onRouteContextCreate(Route route);
/**
* Notification on adding error handler.
*
- * @param routethe added route context
+ * @param route the added route context
* @param errorHandlerthe error handler
* @param errorHandlerBuilder the error handler builder
*/
@@ -130,7 +130,7 @@ public interface LifecycleStrategy {
/**
* Notification on removing error handler.
*
- * @param routethe removed route context
+ * @param route the removed route context
* @param errorHandlerthe error handler
* @param errorHandlerBuilder the error handler builder
*/
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6335fcb Polished
6335fcb is described below
commit 6335fcb686a5fb839865de903c430f8468e0a542
Author: Claus Ibsen
AuthorDate: Mon Mar 2 11:01:26 2020 +0100
Polished
---
components/camel-weka/pom.xml | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/components/camel-weka/pom.xml b/components/camel-weka/pom.xml
index dea87fc..525aec8 100644
--- a/components/camel-weka/pom.xml
+++ b/components/camel-weka/pom.xml
@@ -17,7 +17,8 @@
limitations under the License.
-->
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0
@@ -25,13 +26,14 @@
org.apache.camel
3.2.0-SNAPSHOT
-
+
camel-weka
Camel :: Weka
Camel Weka support
+
org.apache.camel
camel-support
@@ -40,12 +42,13 @@
org.apache.camel
camel-file
+
- io.nessus.weka
- nessus-weka-api
- ${nessus-weka-version}
+io.nessus.weka
+nessus-weka-api
+${nessus-weka-version}
-
+
org.apache.camel
@@ -73,7 +76,7 @@
test
-
+
jboss.thirdparty
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 5d7c7b2 Polished 5d7c7b2 is described below commit 5d7c7b21f174e6f9fbd20012cfa847d52bb96b18 Author: Claus Ibsen AuthorDate: Mon Mar 2 10:50:57 2020 +0100 Polished --- core/camel-componentdsl/pom.xml | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/camel-componentdsl/pom.xml b/core/camel-componentdsl/pom.xml index 9aa78ab..a70cb96 100644 --- a/core/camel-componentdsl/pom.xml +++ b/core/camel-componentdsl/pom.xml @@ -35,10 +35,10 @@ - - org.apache.camel - camel-api - + +org.apache.camel +camel-api + org.apache.camel camel-core-engine @@ -51,13 +51,13 @@ org.slf4j slf4j-api - - org.apache.camel - camel-allcomponents + +org.apache.camel +camel-allcomponents pom - provided - - +provided + + junit junit
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 1100714 Polished 1100714 is described below commit 110071428505571d8956f8a49c2e2d81b00e81c6 Author: Claus Ibsen AuthorDate: Mon Feb 24 14:59:44 2020 +0100 Polished --- tests/camel-jmh/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/camel-jmh/pom.xml b/tests/camel-jmh/pom.xml index 5226d40..09980ef 100644 --- a/tests/camel-jmh/pom.xml +++ b/tests/camel-jmh/pom.xml @@ -48,7 +48,7 @@ org.apache.camel -camel-core +camel-core-engine test
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 94fabb9 Polished
94fabb9 is described below
commit 94fabb91f6e0e57c71bb86f3a9f090f593cc83c3
Author: Claus Ibsen
AuthorDate: Mon Feb 24 07:24:41 2020 +0100
Polished
---
core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java | 3 ---
core/camel-util/src/main/java/org/apache/camel/util/URISupport.java | 1 -
2 files changed, 4 deletions(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
index 014065b..8294512 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
@@ -34,9 +34,6 @@ import static
org.apache.camel.util.URISupport.RAW_TOKEN_START;
*/
class URIScanner {
-private static final String RAW_START_ONE = RAW_TOKEN_PREFIX +
RAW_TOKEN_START[0];
-private static final String RAW_START_TWO = RAW_TOKEN_PREFIX +
RAW_TOKEN_START[1];
-
// TODO: when upgrading to JDK11 as minimum then use java.nio.Charset
private static final String CHARSET = "UTF-8";
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 6b0eb19..4a33268 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -26,7 +26,6 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.regex.Pattern;
/**
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1b336a9 Polished
1b336a9 is described below
commit 1b336a9b622d5a5f1af77b109b2f48ffb98e812a
Author: Claus Ibsen
AuthorDate: Sat Feb 15 09:32:40 2020 +0100
Polished
---
.../src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java
b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java
index 2c20e87..48197bb 100644
---
a/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java
+++
b/components/camel-nsq/src/test/java/org/apache/camel/component/nsq/NsqConsumerTest.java
@@ -92,7 +92,7 @@ public class NsqConsumerTest extends NsqTestSupport {
String messageText =
exchange.getIn().getBody(String.class);
int attempts =
exchange.getIn().getHeader(NsqConstants.NSQ_MESSAGE_ATTEMPTS, Integer.class);
if (messageText.contains("Requeue") && attempts < 3) {
-throw new Exception();
+throw new Exception("Forced error");
}
}
}).to(mockResultEndpoint);
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new e851cd9 Polished e851cd9 is described below commit e851cd98d1b4d33fd9fbaa6e46502783f8bd41e1 Author: Claus Ibsen AuthorDate: Mon Jan 27 14:33:45 2020 +0100 Polished --- .../main/java/org/apache/camel/processor/CamelInternalProcessor.java| 2 -- 1 file changed, 2 deletions(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java index c1e4d3b..e0f4fa1 100644 --- a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java +++ b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java @@ -24,7 +24,6 @@ import java.util.concurrent.RejectedExecutionException; import org.apache.camel.AsyncCallback; import org.apache.camel.CamelContext; -import org.apache.camel.CamelContextAware; import org.apache.camel.Exchange; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.ExtendedExchange; @@ -60,7 +59,6 @@ import org.apache.camel.support.OrderedComparator; import org.apache.camel.support.SynchronizationAdapter; import org.apache.camel.support.UnitOfWorkHelper; import org.apache.camel.support.processor.DelegateAsyncProcessor; -import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.util.StopWatch; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 644cad9 Polished
644cad9 is described below
commit 644cad97a1e2419c15bf4ca66d6c435ca3729137
Author: Claus Ibsen
AuthorDate: Fri Jan 17 10:08:03 2020 +0100
Polished
---
.../src/main/java/org/apache/camel/component/as2/AS2Endpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
index 40b39d3..1f7e832 100644
---
a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
+++
b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Endpoint.java
@@ -49,7 +49,7 @@ import org.apache.http.entity.ContentType;
/**
* Component used for transferring data secure and reliable over the internet
using the AS2 protocol.
*/
-@UriEndpoint(scheme = "as2", firstVersion = "2.22.0", title = "AS2", syntax =
"as2:apiName/methodName", label = "AS2")
+@UriEndpoint(scheme = "as2", firstVersion = "2.22.0", title = "AS2", syntax =
"as2:apiName/methodName", label = "file")
public class AS2Endpoint extends AbstractApiEndpoint {
@UriParam
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d86740c Polished
d86740c is described below
commit d86740ceddd054d6304b55cb809d8bc5747d677a
Author: Claus Ibsen
AuthorDate: Wed Jan 15 14:37:34 2020 +0100
Polished
---
.../org/apache/camel/impl/engine/DefaultBeanIntrospection.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java
index 08ff965..6d8d94f 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultBeanIntrospection.java
@@ -88,19 +88,20 @@ public class DefaultBeanIntrospection extends
ServiceSupport implements BeanIntr
@Override
public ClassInfo cacheClass(Class clazz) {
+invoked.incrementAndGet();
if (logger.shouldLog()) {
log("cacheClass", clazz);
}
-invoked.incrementAndGet();
return IntrospectionSupport.cacheClass(clazz);
}
@Override
public void clearCache() {
-if (logger.shouldLog()) {
-log("clearCache", null);
-}
if (invoked.get() > 0) {
+invoked.incrementAndGet();
+if (logger.shouldLog()) {
+log("clearCache", null);
+}
IntrospectionSupport.clearCache();
}
}
[camel] branch master updated: Polished a bit
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 0789fb0 Polished a bit
0789fb0 is described below
commit 0789fb00d8256bbb6cb86f6c80708930cdefe737
Author: Claus Ibsen
AuthorDate: Tue Jan 14 07:18:47 2020 +0100
Polished a bit
---
.../src/main/java/org/apache/camel/support/PropertyBindingSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index 4a7aca2..66e1b06 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -353,7 +353,7 @@ public final class PropertyBindingSupport {
Object value = entry.getValue();
// skip based on some known names
-if ("basicPropertyBinding".equals(key)) {
+if ("basicPropertyBinding".equals(key) ||
"bridgeErrorHandler".equals(key) || "lazyStartProducer".equals(key)) {
continue;
}
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 534b227 Polished 534b227 is described below commit 534b2279e83477edad22879416d107facf0f2748 Author: Claus Ibsen AuthorDate: Fri Jan 3 17:08:59 2020 +0100 Polished --- .../src/main/java/org/apache/camel/processor/TryProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java index 2d70216..71408e6 100644 --- a/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java +++ b/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java @@ -64,7 +64,6 @@ public class TryProcessor extends AsyncProcessorSupport implements Navigate
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1c7f823 Polished
1c7f823 is described below
commit 1c7f8239a002d5a51d93897fced234d83de96ade
Author: Claus Ibsen
AuthorDate: Fri Jan 3 13:15:40 2020 +0100
Polished
---
.../java/org/apache/camel/impl/converter/DefaultTypeConverter.java | 7 +++
.../java/org/apache/camel/impl/engine/AbstractCamelContext.java| 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
index bc4d5c6..20cde48 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
@@ -20,6 +20,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.PackageScanClassResolver;
+import org.apache.camel.util.StopWatch;
+import org.apache.camel.util.TimeUtils;
/**
* Default implementation of a type converter registry used for
@@ -60,6 +62,8 @@ public class DefaultTypeConverter extends
BaseTypeConverterRegistry {
@Override
protected void doStart() throws Exception {
+StopWatch watch = new StopWatch();
+
super.doStart();
// core type converters is always loaded which does not use any
classpath scanning and therefore is fast
@@ -78,6 +82,9 @@ public class DefaultTypeConverter extends
BaseTypeConverterRegistry {
log.warn("Annotation scanning mode loaded {} type converters.
Its recommended to migrate to @Converter(loader = true) for fast type converter
mode.", additional);
}
}
+
+String time = TimeUtils.printDuration(watch.taken());
+log.debug("Loaded {} type converters in {}", typeMappings.size(),
time);
}
@Override
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index d2bb7d7..401f3ab 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2286,10 +2286,10 @@ public abstract class AbstractCamelContext extends
ServiceSupport implements Ext
@Override
public void start() {
+startDate = new Date();
try (MDCHelper mdcHelper = new MDCHelper()) {
init();
vetoStarted.set(false);
-startDate = new Date();
stopWatch.restart();
log.info("Apache Camel {} (CamelContext: {}) is starting",
getVersion(), getName());
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6243894 Polished
6243894 is described below
commit 6243894c338980bb08709fe31284fd4da4d69fd9
Author: Claus Ibsen
AuthorDate: Thu Dec 12 13:58:38 2019 +0100
Polished
---
.../camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
index cc389dd..e6bd89b 100644
---
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
+++
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPComponent.java
@@ -187,12 +187,12 @@ public class CoAPComponent extends DefaultComponent
implements RestConsumerFacto
}
CoAPEndpoint endpoint = camelContext.getEndpoint(url,
CoAPEndpoint.class);
-setProperties(endpoint, parameters);
+setProperties(camelContext, endpoint, parameters);
// configure consumer properties
Consumer consumer = endpoint.createConsumer(processor);
if (config.getConsumerProperties() != null &&
!config.getConsumerProperties().isEmpty()) {
-setProperties(consumer, config.getConsumerProperties());
+setProperties(camelContext, consumer,
config.getConsumerProperties());
}
return consumer;
}
[camel] branch master updated: Polished migration guides
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new b4551d9 Polished migration guides b4551d9 is described below commit b4551d9a48d042bcc0e8ee5e4549bc2a91b1b2b6 Author: Claus Ibsen AuthorDate: Tue Dec 10 12:56:49 2019 +0100 Polished migration guides --- docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 5 - docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc index 0f39172..e93bf6d 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc @@ -1,8 +1,11 @@ -= Apache Camel 3 Migration Guide += Apache Camel 2.x to 3.0 Migration Guide This document is intended for helping you migrate your Apache Camel applications from version 2.x to 3.0. +IMPORTANT: If you are migrating from Camel 3.x to 3.y then use the +xref:camel-3x-migration-guide.adoc[Camel 3.x to 3.y Migration Guide]. + == Java versions Camel 3 supports Java 11. Support for Java 8 is best effort for the earlier versions of Camel 3. However at some time in the 3.x lifeline we will drop support for Java 8. diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc index 45e8639..f075c1f 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc @@ -3,7 +3,7 @@ This document is intended for helping you migrate your Apache Camel application from Camel 3.x to Camel 3.y. -IMPORTANT: If you are migrating from Camel 2.x then read first the +IMPORTANT: If you are migrating from Camel 2.x then use the xref:camel-3-migration-guide.adoc[Camel 2.x to 3.0 Migration Guide]. For example if you are migrating from Camel 3.0 to 3.2, then you should follow the guides
[camel] branch master updated: Polished docs
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 710873a Polished docs 710873a is described below commit 710873a9b0d81cc91869064d9255033cf778e16a Author: Claus Ibsen AuthorDate: Tue Nov 19 15:04:59 2019 +0100 Polished docs --- .../modules/ROOT/pages/content-enricher.adoc | 2 +- .../pages/enterprise-integration-patterns.adoc | 2 +- .../modules/ROOT/pages/event-message.adoc | 2 +- .../using-getin-or-getout-methods-on-exchange.adoc | 2 +- docs/user-manual/modules/ROOT/pages/message.adoc | 4 +- .../modules/ROOT/pages/request-reply.adoc | 44 ++ .../modules/ROOT/pages/spring-remoting.adoc| 2 +- .../pages/using-exchange-pattern-annotations.adoc | 2 +- 8 files changed, 52 insertions(+), 8 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/content-enricher.adoc b/docs/user-manual/modules/ROOT/pages/content-enricher.adoc index ac602a0..386d700 100644 --- a/docs/user-manual/modules/ROOT/pages/content-enricher.adoc +++ b/docs/user-manual/modules/ROOT/pages/content-enricher.adoc @@ -92,7 +92,7 @@ Camel comes with two flavors of content enricher in the DSL * `pollEnrich` `enrich` uses a `Producer` to obtain the additional data. It is usually -used for xref:requestReply-eip.adoc[Request Reply] messaging, for instance +used for xref:request-reply.adoc[Request Reply] messaging, for instance to invoke an external web service. + `pollEnrich` on the other hand uses a xref:polling-consumer.adoc[Polling Consumer] to obtain the additional data. It is usually used for diff --git a/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc b/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc index 71dafcf..9a41130 100644 --- a/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc +++ b/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc @@ -82,7 +82,7 @@ a|image::eip/EventMessageIcon.gif[image] transmit events from one application to another? a|image::eip/RequestReplyIcon.gif[image] -|xref:requestReply-eip.adoc[Request Reply] |When an application sends a +|xref:request-reply.adoc[Request Reply] |When an application sends a message, how can it get a response from the receiver? a|image::eip/CorrelationIdentifierIcon.gif[image] diff --git a/docs/user-manual/modules/ROOT/pages/event-message.adoc b/docs/user-manual/modules/ROOT/pages/event-message.adoc index 8242c05..5f6ad25 100644 --- a/docs/user-manual/modules/ROOT/pages/event-message.adoc +++ b/docs/user-manual/modules/ROOT/pages/event-message.adoc @@ -15,7 +15,7 @@ The default behaviour of many xref:components::index.adoc[Components] is InOnly such as for xref:components::jms-component.adoc[JMS], xref:components::jms-component.adoc[File] or xref:components::seda-component.adoc[SEDA] -TIP: See the related xref:requestReply-eip.adoc[Request Reply] message. +TIP: See the related xref:request-reply.adoc[Request Reply] message. [[eventMessage-ExplicitlyspecifyingInOnly]] == Explicitly specifying InOnly diff --git a/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc b/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc index 43905ae..e8031fd 100644 --- a/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc +++ b/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc @@ -8,7 +8,7 @@ called Message Exchange Patterns (MEP for short). The MEP defines the messaging style used such as one-way (xref:event-message.adoc[InOnly]) or request-reply -(xref:requestReply-eip.adoc[InOut]), +(xref:request-reply.adoc[InOut]), which means you have IN and optionally OUT messages. This closely maps to other APIs such as WS, WSDL, REST, JBI and the likes. diff --git a/docs/user-manual/modules/ROOT/pages/message.adoc b/docs/user-manual/modules/ROOT/pages/message.adoc index 8b0d05c..2826805 100644 --- a/docs/user-manual/modules/ROOT/pages/message.adoc +++ b/docs/user-manual/modules/ROOT/pages/message.adoc @@ -11,11 +11,11 @@ image::eip/MessageSolution.gif[image] To support various message xref:exchange-pattern.adoc[exchange patterns] like one way xref:event-message.adoc[Event Message] and -xref:requestReply-eip.adoc[Request Reply] messages Camel uses an +xref:request-reply.adoc[Request Reply] messages Camel uses an xref:exchange.adoc[Exchange] interface which has a *pattern* property which can be set to *InOnly* for an xref:event-message.adoc[Event Message] which has a single inbound Message, or *InOut* for a -xref:requestReply-eip.adoc[Request Reply] where there is an inbound and +xref:request-reply.adoc[Request Reply] where there is an inbound and outbound
[camel] branch master updated: Polished EIP docs to have more links
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 89f343b Polished EIP docs to have more links 89f343b is described below commit 89f343bc99105e9cda56bf8f10ea863f6afafcf7 Author: Claus Ibsen AuthorDate: Tue Nov 19 09:53:15 2019 +0100 Polished EIP docs to have more links --- .../modules/ROOT/pages/enterprise-integration-patterns.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc b/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc index 44d2604..71dafcf 100644 --- a/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc +++ b/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc @@ -24,7 +24,7 @@ a|image::eip/MessageIcon.gif[image] message channel exchange a piece of information? a|image::eip/PipesAndFiltersIcon.gif[image] -|xref:pipeline-eip.adoc[Pipes and Filters |How can we perform +|xref:pipeline-eip.adoc[Pipes and Filters] |How can we perform complex processing on a message while maintaining independence and flexibility? @@ -189,7 +189,7 @@ of endpoints at the same time? [width="100%",cols="10%,10%,80%",] |=== a|image::eip/DataEnricherIcon.gif[image] -|[xref:content-enricher.adoc[Content Enricher] |How do we communicate +|xref:content-enricher.adoc[Content Enricher] |How do we communicate with another system if the message originator does not have all the required data items available?
[camel] branch master updated: Polished EIP docs to have more links
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 85ef457 Polished EIP docs to have more links 85ef457 is described below commit 85ef45714b2dd42d3880dbad696d02404b1d5493 Author: Claus Ibsen AuthorDate: Tue Nov 19 09:52:02 2019 +0100 Polished EIP docs to have more links --- .../pages/enterprise-integration-patterns.adoc | 34 +++--- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc b/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc index b92cc41..44d2604 100644 --- a/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc +++ b/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc @@ -16,29 +16,29 @@ patterns. [width="100%",cols="10%,10%,80%",] |=== a|image::eip/ChannelIcon.gif[image] -|Message Channel |How does one application +|xref:message-channel.adoc[Message Channel] |How does one application communicate with another using messaging? a|image::eip/MessageIcon.gif[image] -|Message |How can two applications connected by a +|xref:message.adoc[Message] |How can two applications connected by a message channel exchange a piece of information? a|image::eip/PipesAndFiltersIcon.gif[image] -|Pipes and Filters |How can we perform +|xref:pipeline-eip.adoc[Pipes and Filters |How can we perform complex processing on a message while maintaining independence and flexibility? a|image::eip/ContentBasedRouterIcon.gif[image] -|Message Router |How can you decouple +|xref:message-router.adoc[Message Router] |How can you decouple individual processing steps so that messages can be passed to different filters depending on a set of conditions? a|image::eip/MessageTranslatorIcon.gif[image] -|Message Translator |How can systems using +|xref:message-translator.adoc[Message Translator] |How can systems using different data formats communicate with each other using messaging? a|image::eip/MessageEndpointIcon.gif[image] -|Message Endpoint |How does an application +|xref:message-endpoint.adoc[Message Endpoint] |How does an application connect to a messaging channel to send and receive messages? |=== @@ -48,25 +48,25 @@ connect to a messaging channel to send and receive messages? [width="100%",cols="10%,10%,80%",] |=== a|image::eip/PointToPointIcon.gif[image] -|Point to Point Channel |How can the +|xref:point-to-point-channel.adoc[Point to Point Channel] |How can the caller be sure that exactly one receiver will receive the document or perform the call? a|image::eip/PublishSubscribeIcon.gif[image] -|Publish Subscribe Channel |How can +|xref:publish-subscribe-channel.adoc[Publish Subscribe Channel] |How can the sender broadcast an event to all interested receivers? a|image::eip/DeadLetterChannelIcon.gif[image] -|Dead Letter Channel |What will the +|xref:dead-letter-channel.adoc[Dead Letter Channel] |What will the messaging system do with a message it cannot deliver? a|image::eip/GuaranteedMessagingIcon.gif[image] -|Guaranteed Delivery |How can the sender +|xref:guaranteed-delivery.adoc[Guaranteed Delivery] |How can the sender make sure that a message will be delivered, even if the messaging system fails? a|image::eip/MessageBusIcon.gif[image] -|Message Bus |What is an architecture that +|xref:message-bus.adoc[Message Bus] |What is an architecture that enables separate applications to work together, but in a de-coupled fashion such that applications can be easily added or removed without affecting the others? @@ -78,20 +78,20 @@ affecting the others? [width="100%",cols="10%,10%,80%",] |=== a|image::eip/EventMessageIcon.gif[image] -|Event Message |How can messaging be used to +|xref:event-message.adoc[Event Message] |How can messaging be used to transmit events from one application to another? a|image::eip/RequestReplyIcon.gif[image] -|Request Reply |When an application sends a +|xref:requestReply-eip.adoc[Request Reply] |When an application sends a message, how can it get a response from the receiver? a|image::eip/CorrelationIdentifierIcon.gif[image] -|Correlation Identifier |How does a +|xref:correlation-identifier.adoc[Correlation Identifier] |How does a requestor that has received a reply know which request this is the reply for? a|image::eip/ReturnAddressIcon.gif[image] -|Return Address |How does a replier know where +|xref:return-address.adoc[Return Address] |How does a replier know where to send the reply? |==
[camel] branch master updated: Polished eip table a bit
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 416e4b0 Polished eip table a bit
416e4b0 is described below
commit 416e4b081f1841b1284a40146378da9d18caf837
Author: Claus Ibsen
AuthorDate: Mon Nov 18 17:19:14 2019 +0100
Polished eip table a bit
---
.../pages/enterprise-integration-patterns.adoc | 38 --
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git
a/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc
b/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc
index 03aee8d..b92cc41 100644
--- a/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc
+++ b/docs/user-manual/modules/ROOT/pages/enterprise-integration-patterns.adoc
@@ -3,27 +3,13 @@
Camel supports most of the
http://www.eaipatterns.com/toc.html[Enterprise Integration Patterns]
-from the excellent book by
-http://www.amazon.com/exec/obidos/search-handle-url/105-9796798-8100401?%5Fencoding=UTF8&search-type=ss&index=books&field-author=Gregor%20Hohpe[Gregor
-Hohpe] and
-http://www.amazon.com/exec/obidos/search-handle-url/105-9796798-8100401?%5Fencoding=UTF8&search-type=ss&index=books&field-author=Bobby%20Woolf[Bobby
-Woolf].
+from the excellent book by Gregor Hohpe and Bobby Woolf.
If you are new to Camel you might want to try the
Getting Started in the
User Guide before attempting to implement these
patterns.
-The EIP icons library is available as a Visio stencil file adapted to
-render the icons with the Camel color : sand. Download it
-link:{attachmentsdir}/Hohpe_EIP_camel_20150622.zip[here]
-for your presentation, functional and technical analysis documents. The
-original EIP stencil is also available in
-link:{attachmentsdir}/Hohpe_EIP_camel_OpenOffice.zip[OpenOffice
-3.x Draw] (thanks to Marco Garbelini) ,
-http://www.eaipatterns.com/download/EIP_Visio_stencil.zip[Microsoft
-Visio], or http://www.graffletopia.com/stencils/137[Omnigraffle].
-
[[EnterpriseIntegrationPatterns-MessagingSystems]]
== Messaging Systems
@@ -269,7 +255,7 @@ avoid missing messages while it's not listening for them?
receiver deal with duplicate messages?
a|image::eip/TransactionalClientIcon.gif[image]
-|[xref:transactional-client.adoc[Transactional Client] |How can a client
+|xref:transactional-client.adoc[Transactional Client] |How can a client
control its transactions with the messaging system?
a|image::eip/MessagingGatewayIcon.gif[image]
@@ -293,7 +279,7 @@ messaging system that is distributed across multiple
platforms and a
wide geographic area?
a|image::eip/DetourIcon.gif[image]
-|Detour |How can you route a message through
+|xref:intercept.adoc[Detour] |How can you route a message through
intermediate steps to perform validation, testing or debugging
functions?
@@ -306,5 +292,21 @@ on a point-to-point channel?
analyze and debug the flow of messages in a loosely coupled system?
|
-|Log |How can I log processing a message?
+|xref:log-eip.adoc[Log] |How can I log processing a message?
+
+|
+|xref:step-eip.adoc[Step] | Steps groups together a set of EIPs into a
composite logical unit for metrics and monitoring. |
+
|===
+
+=== EIP Icons
+
+The EIP icons library is available as a Visio stencil file adapted to
+render the icons with the Camel color : sand. Download it
+link:{attachmentsdir}/Hohpe_EIP_camel_20150622.zip[here]
+for your presentation, functional and technical analysis documents. The
+original EIP stencil is also available in
+link:{attachmentsdir}/Hohpe_EIP_camel_OpenOffice.zip[OpenOffice
+3.x Draw] (thanks to Marco Garbelini) ,
+http://www.eaipatterns.com/download/EIP_Visio_stencil.zip[Microsoft
+Visio], or http://www.graffletopia.com/stencils/137[Omnigraffle].
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 78ef07a Polished 78ef07a is described below commit 78ef07a85298132c7bf6db4fab51a0a34244ea85 Author: Claus Ibsen AuthorDate: Tue Oct 1 09:34:26 2019 +0200 Polished --- .../java/org/apache/camel/model/OptionalIdentifiedDefinition.java| 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java index 1058391..a2a56b3 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java @@ -120,7 +120,10 @@ public abstract class OptionalIdentifiedDefinition + * Important: If you want to set the id of the route, then you + * must use routeId(String) instead. * * @param id the id * @return the builder
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 79374e0 Polished 79374e0 is described below commit 79374e09a4d4fe07a78e56e30c2c8938e342b011 Author: Claus Ibsen AuthorDate: Sat Aug 24 12:05:14 2019 +0200 Polished --- .../org/apache/camel/component/caffeine/lrucache/CaffeineLRUCache.java | 2 +- .../src/main/resources/application.properties | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/camel-caffeine-lrucache/src/main/java/org/apache/camel/component/caffeine/lrucache/CaffeineLRUCache.java b/core/camel-caffeine-lrucache/src/main/java/org/apache/camel/component/caffeine/lrucache/CaffeineLRUCache.java index 0834131..10f9861 100644 --- a/core/camel-caffeine-lrucache/src/main/java/org/apache/camel/component/caffeine/lrucache/CaffeineLRUCache.java +++ b/core/camel-caffeine-lrucache/src/main/java/org/apache/camel/component/caffeine/lrucache/CaffeineLRUCache.java @@ -57,7 +57,7 @@ public class CaffeineLRUCache implements LRUCache, RemovalListener cache; private final Map map; private final Consumer evict; diff --git a/examples/camel-example-spring-boot/src/main/resources/application.properties b/examples/camel-example-spring-boot/src/main/resources/application.properties index a970973..956cb50 100644 --- a/examples/camel-example-spring-boot/src/main/resources/application.properties +++ b/examples/camel-example-spring-boot/src/main/resources/application.properties @@ -24,6 +24,9 @@ greeting = Hello World # how often to trigger the timer timer.period = 2000 +# to watch bean introspection using java reflection usage +# camel.springboot.bean-introspection-logging-level=INFO + # to automatic shutdown the JVM after a period of time #camel.springboot.duration-max-seconds=60 #camel.springboot.duration-max-messages=100
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new a6c9fcb Polished a6c9fcb is described below commit a6c9fcbd79b7c6e5489c6e1a4bce5d492730b2a6 Author: Claus Ibsen AuthorDate: Thu Aug 15 09:36:57 2019 +0200 Polished --- .../java/org/apache/camel/spring/CamelContextFactoryBean.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java index cc155fb..ff28d3f 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java @@ -100,7 +100,7 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new ea03c80 Polished
ea03c80 is described below
commit ea03c8044159280cd9359a498ef6689bf896e2c0
Author: Claus Ibsen
AuthorDate: Thu Aug 8 08:23:38 2019 +0200
Polished
---
.../src/main/java/org/apache/camel/component/seda/SedaComponent.java | 1 -
.../src/main/java/org/apache/camel/component/seda/SedaEndpoint.java| 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaComponent.java
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaComponent.java
index 5c78ddc..6cd8407 100644
---
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaComponent.java
+++
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaComponent.java
@@ -98,7 +98,6 @@ public class SedaComponent extends DefaultComponent {
this.defaultBlockWhenFull = defaultBlockWhenFull;
}
-
public long getDefaultOfferTimeout() {
return defaultOfferTimeout;
}
diff --git
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index 68ef095..6d69ea7 100644
---
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -195,6 +195,7 @@ public class SedaEndpoint extends DefaultEndpoint
implements AsyncEndpoint, Brow
/**
* Get's the {@link QueueReference} for the this endpoint.
+ *
* @return the reference, or null if no queue reference exists.
*/
public synchronized QueueReference getQueueReference() {
@@ -417,7 +418,7 @@ public class SedaEndpoint extends DefaultEndpoint
implements AsyncEndpoint, Brow
this.purgeWhenStopping = purgeWhenStopping;
}
-/**
+/**
* Returns the current pending exchanges
*/
@Override
[camel] branch master updated: Polished and fixed typo
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 0931438 Polished and fixed typo 0931438 is described below commit 0931438bd4e5168cc736bf1720d1594e3d103b64 Author: Claus Ibsen AuthorDate: Tue Aug 6 16:44:30 2019 +0200 Polished and fixed typo --- .../src/main/docs/rest-swagger-component.adoc | 8 +++--- .../rest/swagger/RestSwaggerComponent.java | 33 ++ .../rest/swagger/RestSwaggerEndpoint.java | 6 ++-- .../RestSwaggerComponentConfiguration.java | 12 4 files changed, 27 insertions(+), 32 deletions(-) diff --git a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc index b2a8486..7636eec 100644 --- a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc +++ b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc @@ -93,9 +93,9 @@ The REST Swagger component supports 10 options, which are listed below. | *basePath* (producer) | API basePath, for example /v2. Default is unset, if set overrides the value present in Swagger specification. | | String | *componentName* (producer) | Name of the Camel component that will perform the requests. The component must be present in Camel registry and it must implement RestProducerFactory service provider interface. If not set CLASSPATH is searched for single component that implements RestProducerFactory SPI. Can be overridden in endpoint configuration. | | String | *consumes* (producer) | What payload type this component capable of consuming. Could be one type, like application/json or multiple types as application/json, application/xml; q=0.5 according to the RFC7231. This equates to the value of Accept HTTP header. If set overrides any value found in the Swagger specification. Can be overridden in endpoint configuration | | String -| *host* (producer) | Scheme hostname and port to direct the HTTP requests to in the form of \https://hostname:port. Can be configured at the endpoint, component or in the correspoding REST configuration in the Camel Context. If you give this component a name (e.g. petstore) that REST configuration is consulted first, rest-swagger next, and global configuration last. If set overrides any value found in the Swagger specification, RestConfiguration. Can be overridden in endpoint configurat [...] +| *host* (producer) | Scheme hostname and port to direct the HTTP requests to in the form of \https://hostname:port. Can be configured at the endpoint, component or in the corresponding REST configuration in the Camel Context. If you give this component a name (e.g. petstore) that REST configuration is consulted first, rest-swagger next, and global configuration last. If set overrides any value found in the Swagger specification, RestConfiguration. Can be overridden in endpoint configura [...] | *produces* (producer) | What payload type this component is producing. For example application/json according to the RFC7231. This equates to the value of Content-Type HTTP header. If set overrides any value present in the Swagger specification. Can be overridden in endpoint configuration. | | String -| *specificationUri* (producer) | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \https://api.example.com:8080). Can be overridden in e [...] +| *specificationUri* (producer) | Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme, hostname and optionally the port in the URI syntax (i.e. \https://api.example.com:8080). Can be overridden in [...] | *sslContextParameters* (security) | Customize TLS parameters used by the component. If not set defaults to the TLS parameters set in the Camel context | | SSLContextParameters | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean @@ -130,9 +130,9 @@ with th
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 2931c66 Polished
2931c66 is described below
commit 2931c66abe2405556a4ed54c560d035cf4192855
Author: Claus Ibsen
AuthorDate: Mon Jul 29 07:50:36 2019 +0200
Polished
---
.../src/main/java/org/apache/camel/spi/InterceptStrategy.java| 4
.../src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java | 5 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
b/core/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
index 72e814b..581f9c9 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
@@ -25,8 +25,6 @@ import org.apache.camel.Processor;
* processors in a route with interceptors. For example, a possible
* usecase is to gather performance statistics at the processor's level.
*
- * Important: This SPI is not intended to be used by Camel end users -
do NOT use this.
- *
* Its strongly adviced to use an {@link
org.apache.camel.AsyncProcessor} as the returned wrapped
* {@link Processor} which ensures the interceptor works well with the
asynchronous routing engine.
* You can use the {@link org.apache.camel.processor.DelegateAsyncProcessor}
to easily return an
@@ -36,8 +34,6 @@ import org.apache.camel.Processor;
*/
public interface InterceptStrategy {
-// TODO: Camel 3.0 make this an internal API
-
/**
* This method is invoked by
* {@link
org.apache.camel.model.ProcessorDefinition#wrapProcessor(RouteContext,
Processor)}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
b/core/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
index 7ddc20d..c62c77c 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
@@ -24,6 +24,7 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.InterceptStrategy;
+import org.junit.Test;
/**
* Trying to reproduce CAMEL-927.
@@ -38,6 +39,7 @@ public class TwoTimerWithJMXIssue extends ContextTestSupport {
return true;
}
+@Test
public void testFromWithNoOutputs() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(2);
@@ -53,7 +55,8 @@ public class TwoTimerWithJMXIssue extends ContextTestSupport {
public void configure() throws Exception {
context.adapt(ExtendedCamelContext.class).addInterceptStrategy(new MyTracer());
-
from("timer://kickoff_1?period=250").from("timer://kickoff_2?period=250&delay=10").to("mock:result");
+from("timer://kickoff_1?period=250").to("mock:result");
+
from("timer://kickoff_2?period=250&delay=10").to("mock:result");
}
};
}
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a2e2acf Polished
a2e2acf is described below
commit a2e2acfb390db0500f19b261a88a296a44bc4401
Author: Claus Ibsen
AuthorDate: Fri Jul 19 09:23:06 2019 +0200
Polished
---
.../java/org/apache/camel/component/language/LanguageEndpoint.java| 4
1 file changed, 4 deletions(-)
diff --git
a/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
b/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
index f82f0bd..7bb219a 100644
---
a/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
+++
b/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageEndpoint.java
@@ -43,10 +43,6 @@ import org.apache.camel.util.ObjectHelper;
* By having a component to execute language scripts, it allows more dynamic
routing capabilities.
* For example by using the Routing Slip or Dynamic Router EIPs you can send
messages to language endpoints
* where the script is dynamic defined as well.
- *
- * This component is provided out of the box in camel-core and hence no
additional JARs is needed.
- * You only have to include additional Camel components if the language of
choice mandates it,
- * such as using Groovy or JavaScript languages.
*/
@UriEndpoint(firstVersion = "2.5.0", scheme = "language", title = "Language",
syntax = "language:languageName:resourceUri", producerOnly = true, label =
"core,script")
public class LanguageEndpoint extends ResourceEndpoint {
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 272ea94 Polished
272ea94 is described below
commit 272ea94f9e765355dd308b6ba8037e70e3fc92b7
Author: Claus Ibsen
AuthorDate: Thu Jul 18 10:53:39 2019 +0200
Polished
---
.../org/apache/camel/processor/CamelInternalProcessor.java | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 9f48f00..78753e1 100644
---
a/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -248,7 +248,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
/**
* Strategy to determine if we should continue processing the {@link
Exchange}.
*/
-protected boolean continueProcessing(Exchange exchange) {
+private boolean continueProcessing(Exchange exchange) {
Object stop = exchange.getProperty(Exchange.ROUTE_STOP);
if (stop != null) {
boolean doStop =
exchange.getContext().getTypeConverter().convertTo(Boolean.class, stop);
@@ -350,7 +350,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
* @param policy the policy
* @return true to run
*/
-protected boolean isRoutePolicyRunAllowed(RoutePolicy policy) {
+boolean isRoutePolicyRunAllowed(RoutePolicy policy) {
if (policy instanceof StatefulService) {
StatefulService ss = (StatefulService) policy;
return ss.isRunAllowed();
@@ -395,9 +395,8 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
}
private static boolean isCamelStopping(CamelContext context) {
-if (context instanceof StatefulService) {
-StatefulService ss = (StatefulService) context;
-return ss.isStopping() || ss.isStopped();
+if (context != null) {
+return context.isStopping() || context.isStopped();
}
return false;
}
@@ -516,9 +515,8 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor {
@Override
public StopWatch before(Exchange exchange) throws Exception {
-StopWatch watch = new StopWatch();
debugger.beforeProcess(exchange, target, definition);
-return watch;
+return new StopWatch();
}
@Override
[camel] branch master updated: Polished pom
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new dd76862 Polished pom dd76862 is described below commit dd7686231586dbbf49a83e83a24a8dc135f2b89a Author: Claus Ibsen AuthorDate: Tue Jul 9 18:00:10 2019 +0200 Polished pom --- components/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/pom.xml b/components/pom.xml index d122205..2a031df 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -36,7 +36,6 @@ -camel-attachments camel-bean camel-browse camel-controlbus @@ -70,6 +69,7 @@ camel-blueprint camel-spring camel-groovy +camel-attachments camel-http-common camel-http4 camel-hystrix
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e38709e Polished
e38709e is described below
commit e38709e3d9d5149be7bafeeb49815dabfd2a250b
Author: Claus Ibsen
AuthorDate: Fri Jun 28 13:37:43 2019 +0200
Polished
---
examples/camel-example-main-tiny/pom.xml | 4 ++--
examples/camel-example-main/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/examples/camel-example-main-tiny/pom.xml
b/examples/camel-example-main-tiny/pom.xml
index 744f005..96d1d08 100644
--- a/examples/camel-example-main-tiny/pom.xml
+++ b/examples/camel-example-main-tiny/pom.xml
@@ -95,12 +95,12 @@
ch.qos.logback
logback-core
-1.2.3
+${logback-version}
ch.qos.logback
logback-classic
-1.2.3
+${logback-version}
diff --git a/examples/camel-example-main/pom.xml
b/examples/camel-example-main/pom.xml
index e2eee64..73f6388 100644
--- a/examples/camel-example-main/pom.xml
+++ b/examples/camel-example-main/pom.xml
@@ -61,12 +61,12 @@
ch.qos.logback
logback-core
-1.2.3
+${logback-version}
ch.qos.logback
logback-classic
-1.2.3
+${logback-version}
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 2ae94b6 Polished 2ae94b6 is described below commit 2ae94b683a67c5b99af7fdde9e552fa1d43c80a9 Author: Claus Ibsen AuthorDate: Tue Jun 25 14:21:49 2019 +0200 Polished --- .../test/java/org/apache/camel/support/PropertyBindingSupportTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportTest.java b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportTest.java index ba1b5f4..fdc9c7a 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportTest.java @@ -22,7 +22,6 @@ import java.util.Properties; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; -import org.apache.camel.ExtendedCamelContext; import org.apache.camel.PropertyBindingException; import org.apache.camel.spi.Injector; import org.junit.Test;
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 3b75c01 Polished 3b75c01 is described below commit 3b75c01110efb3bf2ffbe43bbe701c13c2a58f63 Author: Claus Ibsen AuthorDate: Tue Jun 25 06:43:00 2019 +0200 Polished --- examples/camel-example-main-tiny/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/camel-example-main-tiny/pom.xml b/examples/camel-example-main-tiny/pom.xml index 83d..744f005 100644 --- a/examples/camel-example-main-tiny/pom.xml +++ b/examples/camel-example-main-tiny/pom.xml @@ -44,7 +44,7 @@ org.apache.camel camel-core-engine - + org.apache.camel camel-jaxp
[camel] branch master updated: Polished example
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 762b5fc Polished example
762b5fc is described below
commit 762b5fc5072e4c7a0d7511e67855d5916e2b53bb
Author: Claus Ibsen
AuthorDate: Tue Jun 18 05:55:41 2019 +0200
Polished example
---
examples/camel-example-cafe-endpointdsl/README.md | 11 +++
examples/camel-example-cafe-endpointdsl/pom.xml | 3 ++-
.../java/org/apache/camel/example/cafe/CafeRouteBuilder.java | 10 --
.../src/main/resources/features.xml | 4 ++--
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/examples/camel-example-cafe-endpointdsl/README.md
b/examples/camel-example-cafe-endpointdsl/README.md
index 543fac7..59f1f06 100644
--- a/examples/camel-example-cafe-endpointdsl/README.md
+++ b/examples/camel-example-cafe-endpointdsl/README.md
@@ -1,12 +1,16 @@
-# Cafe Example
+# Cafe Example with Endpoint DSL
### Introduction
+This example uses the Camel Endpoint DSL to configure Camel endpoints using a
type-safe Java endpoint DSL
+(eg fluent builder style).
+
This example shows how to work with splitter and aggregator to implement a
Cafe demo.
-First It uses the splitter to dispatch the order, then sends the orders to
barista by checking
+First it uses the splitter to dispatch the order, then sends the orders to
barista by checking
if the coffee is hot or cold. When the coffee is ready, we use a aggregate to
gather the drinks for waiter to deliver.
+
### Build
You will need to compile this example first:
@@ -20,8 +24,7 @@ To run the example type
mvn camel:run
You can see the routing rules by looking at the java code in the
-`src/main/java directory` and the Spring XML configuration lives in
-`src/main/resources/META-INF/spring`
+`src/main/java` directory.
To stop the example hit ctrl+c
diff --git a/examples/camel-example-cafe-endpointdsl/pom.xml
b/examples/camel-example-cafe-endpointdsl/pom.xml
index 76cdbc9..3bbb60b 100644
--- a/examples/camel-example-cafe-endpointdsl/pom.xml
+++ b/examples/camel-example-cafe-endpointdsl/pom.xml
@@ -30,7 +30,7 @@
camel-example-cafe-endpointdsl
jar
-Camel :: Example :: Cafe using the Endpoint DSL
+Camel :: Example :: Cafe :: Endpoint DSL
A cafe example showing how to work with Camel and the
Endpoint DSL
@@ -40,6 +40,7 @@
+
org.apache.camel
camel-endpointdsl
diff --git
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
b/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
index af9a1fa..a7a1442 100644
---
a/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
+++
b/examples/camel-example-cafe-endpointdsl/src/main/java/org/apache/camel/example/cafe/CafeRouteBuilder.java
@@ -18,6 +18,7 @@ package org.apache.camel.example.cafe;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.endpoint.EndpointRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
@@ -30,7 +31,10 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.Registry;
/**
- * A simple example router from Cafe Demo
+ * A simple example router from Cafe Demo.
+ *
+ * Notice how this RouteBuilder extends {@link EndpointRouteBuilder} which
provides the support
+ * for Camel Endpoint DSL.
*/
public class CafeRouteBuilder extends EndpointRouteBuilder {
@@ -49,7 +53,7 @@ public class CafeRouteBuilder extends EndpointRouteBuilder {
public void runCafeRouteDemo() throws Exception {
// create CamelContext
-DefaultCamelContext camelContext = new DefaultCamelContext();
+CamelContext camelContext = new DefaultCamelContext();
// bind beans to the Camel
bindBeans(camelContext.getRegistry());
@@ -57,6 +61,8 @@ public class CafeRouteBuilder extends EndpointRouteBuilder {
// add the routes
camelContext.addRoutes(this);
+// add additional routes using inlined RouteBuilder
+// where we can access the Camel Endpoint DSL from this class
RouteBuilder.addRoutes(camelContext, rb ->
rb.from(timer("myTimer").fixedRate(true).period(500).advanced().synchronous(false))
.delay(simple("${random(250,1000)}"))
diff --git
a/examples/camel-example-cafe-endpointdsl/src/main/resources/features.xml
b/examples/camel-example-cafe-endpointdsl/src/main/resources/features.xml
index 960c101..0a9dae7 100644
--- a/examples/camel-example-cafe-endpointdsl/src/main/resources/fe
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a629519 Polished
a629519 is described below
commit a629519f7319af6967c4e31bb9afbb7ce79ed6bd
Author: Claus Ibsen
AuthorDate: Wed Jun 12 09:49:34 2019 +0200
Polished
---
.../spring/boot/actuate/health/CamelHealthAutoConfiguration.java | 5 +++--
.../camel/spring/boot/actuate/health/CamelHealthIndicator.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
index e2cfb4b..839dc5b 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthAutoConfiguration.java
@@ -35,14 +35,15 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(HealthCheckVerboseConfiguration.class)
public class CamelHealthAutoConfiguration {
-private HealthCheckVerboseConfiguration properties;
+private HealthCheckVerboseConfiguration properties;
+
public CamelHealthAutoConfiguration(HealthCheckVerboseConfiguration
configuration) {
this.properties = configuration;
}
@ConditionalOnClass({CamelContext.class})
@ConditionalOnMissingBean(CamelHealthIndicator.class)
-protected class CamelHealthIndicatorInitializer {
+protected class CamelHealthIndicatorInitializer {
@Bean
public HealthIndicator camelHealthIndicator(CamelContext camelContext)
{
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthIndicator.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthIndicator.java
index 47554a9..ff60ea4 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthIndicator.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthIndicator.java
@@ -28,7 +28,7 @@ import
org.springframework.boot.actuate.health.HealthIndicator;
public class CamelHealthIndicator extends AbstractHealthIndicator {
private final CamelContext camelContext;
-private final HealthCheckVerboseConfiguration properties;
+private final HealthCheckVerboseConfiguration properties;
public CamelHealthIndicator(CamelContext camelContext,
HealthCheckVerboseConfiguration properties) {
this.camelContext = camelContext;
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new b3621a4 Polished b3621a4 is described below commit b3621a439cbff4a391fd2e49d5d33d79f60ec546 Author: Claus Ibsen AuthorDate: Mon May 20 06:52:16 2019 +0200 Polished --- core/camel-base/pom.xml | 25 +--- core/camel-caffeine-lrucache/pom.xml | 4 +++ core/camel-cloud/pom.xml | 30 ++- core/camel-core-xml/pom.xml | 11 +++ core/camel-core/pom.xml | 14 - core/camel-headersmap/pom.xml| 1 - core/camel-jaxp/pom.xml | 4 ++- core/camel-management-api/pom.xml| 3 +- core/camel-management-impl/pom.xml | 9 ++ core/camel-support/pom.xml | 12 +++- core/camel-util/pom.xml | 58 +--- 11 files changed, 52 insertions(+), 119 deletions(-) diff --git a/core/camel-base/pom.xml b/core/camel-base/pom.xml index 98640b6..fd77903 100644 --- a/core/camel-base/pom.xml +++ b/core/camel-base/pom.xml @@ -36,57 +36,46 @@ + org.apache.camel spi-annotations true - org.apache.camel meta-annotations true - -org.apache.camel -camel-util - - + org.apache.camel camel-api - org.apache.camel camel-management-api - org.apache.camel camel-support - + +org.apache.camel +camel-util + org.apache.camel camel-util-json - + org.slf4j slf4j-api - - -org.osgi -osgi.core -provided -true - - diff --git a/core/camel-caffeine-lrucache/pom.xml b/core/camel-caffeine-lrucache/pom.xml index 450f61b..1d2beff 100644 --- a/core/camel-caffeine-lrucache/pom.xml +++ b/core/camel-caffeine-lrucache/pom.xml @@ -34,13 +34,17 @@ Camel Caffeine LRUCache support +3.0 +tooling + org.apache.camel camel-support + com.github.ben-manes.caffeine caffeine diff --git a/core/camel-cloud/pom.xml b/core/camel-cloud/pom.xml index 54c7721..fc3fd8c 100644 --- a/core/camel-cloud/pom.xml +++ b/core/camel-cloud/pom.xml @@ -39,24 +39,19 @@ - -org.apache.camel -apt -provided - - + org.apache.camel spi-annotations true - org.apache.camel meta-annotations true + org.apache.camel camel-core @@ -110,4 +105,25 @@ + + + +apt + +true + + + + + + +org.apache.camel +apt +provided + + + + + + diff --git a/core/camel-core-xml/pom.xml b/core/camel-core-xml/pom.xml index e99e9c4..4dc18c3 100644 --- a/core/camel-core-xml/pom.xml +++ b/core/camel-core-xml/pom.xml @@ -32,18 +32,18 @@ Camel :: Core XML Camel Core XML support - - - + org.apache.camel -camel-core +spi-annotations org.apache.camel -spi-annotations +camel-core + + junit junit @@ -61,4 +61,5 @@ test + diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml index 8d630cd..958631f 100644 --- a/core/camel-core/pom.xml +++ b/core/camel-core/pom.xml @@ -192,20 +192,6 @@ slf4j-api - - -org.osgi -osgi.core -provided -true - - -org.osgi -osgi.cmpn -provided -true - - org.codehaus.woodstox diff --git a/core/camel-headersmap/pom.xml b/core/camel-headersmap/pom.xml index 00419de..33b6181 100644 --- a/core/camel-headersmap/pom.xml +++ b/core/camel-headersmap/pom.xml @@ -35,7 +35,6 @@ 2.20.0 tooling - diff --git a/core/camel-jaxp/pom.xml b/core/camel-jaxp/pom.xml index 3e4c36f..6d8e8db 100644 --- a/core/camel-jaxp/pom.xml +++ b/core/camel-jaxp/pom.x
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e8e8191 Polished
e8e8191 is described below
commit e8e819135b7b023f1db3128f342d7cf462e23544
Author: Claus Ibsen
AuthorDate: Tue May 14 06:35:35 2019 +0200
Polished
---
.../src/main/java/org/apache/camel/impl/DefaultModel.java| 1 -
core/camel-core/src/main/java/org/apache/camel/model/Model.java | 2 --
.../src/main/java/org/apache/camel/model/ModelCamelContext.java | 9 -
.../src/main/java/org/apache/camel/reifier/RouteReifier.java | 2 +-
4 files changed, 1 insertion(+), 13 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
index fba6394..ceee483 100644
--- a/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
+++ b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModel.java
@@ -32,7 +32,6 @@ import org.apache.camel.Route;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.HystrixConfigurationDefinition;
import org.apache.camel.model.Model;
-import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ModelHelper;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ProcessorDefinitionHelper;
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/Model.java
b/core/camel-core/src/main/java/org/apache/camel/model/Model.java
index 47d6638..f3b77be 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/Model.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/Model.java
@@ -258,8 +258,6 @@ public interface Model {
/**
* Start all routes from this model.
- *
- * @throws Exception
*/
void startRouteDefinitions() throws Exception;
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
b/core/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
index 42245ba..7d9fb3f 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
@@ -16,16 +16,7 @@
*/
package org.apache.camel.model;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
import org.apache.camel.CamelContext;
-import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition;
-import org.apache.camel.model.rest.RestDefinition;
-import org.apache.camel.model.transformer.TransformerDefinition;
-import org.apache.camel.model.validator.ValidatorDefinition;
/**
* Model level interface for the {@link CamelContext}
diff --git
a/core/camel-core/src/main/java/org/apache/camel/reifier/RouteReifier.java
b/core/camel-core/src/main/java/org/apache/camel/reifier/RouteReifier.java
index 264cc20..52f689b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/reifier/RouteReifier.java
+++ b/core/camel-core/src/main/java/org/apache/camel/reifier/RouteReifier.java
@@ -75,7 +75,7 @@ public class RouteReifier extends
ProcessorReifier {
*
* Will stop and remove the old route from camel context and add and start
this new advised route.
*
- * @param definition
+ * @param definition the model definition
* @param camelContext the camel context
* @param builder the route builder
* @return a new route which is this route merged with the route builder
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 4131e1f Polished
4131e1f is described below
commit 4131e1f7b5b52747882e96a0ace6ae97d62ca0ec
Author: Claus Ibsen
AuthorDate: Sun May 12 10:19:21 2019 +0200
Polished
---
core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
b/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
index c7f8b0c..c024fe4 100644
--- a/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
@@ -979,7 +979,6 @@ public abstract class MainSupport extends ServiceSupport {
}
}
-
String stringValue = value != null ? value.toString() : null;
boolean hit = false;
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new e0b42a7f Polished e0b42a7f is described below commit e0b42a7fdd87da4312abfacb59e6b232801c79a3 Author: Claus Ibsen AuthorDate: Sun May 12 08:55:33 2019 +0200 Polished --- examples/camel-example-main/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/camel-example-main/readme.adoc b/examples/camel-example-main/readme.adoc index 03d224f..ad5da44 100644 --- a/examples/camel-example-main/readme.adoc +++ b/examples/camel-example-main/readme.adoc @@ -7,7 +7,7 @@ via Camel built-in dependency-injection that supports binding via the Also notice how you can configure Camel in the `application.properties` file. - Alternative example +=== Alternative example The class `StandaloneCamel` is an alternative example that uses a _public static void main_ class and where you manually setup Camel without
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new f43950a Polished f43950a is described below commit f43950ae0f9812c4bdd5b09c2146c80bce71ee29 Author: Claus Ibsen AuthorDate: Fri May 3 14:14:49 2019 +0200 Polished --- core/camel-headersmap/src/main/docs/headersmap.adoc | 21 - 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/core/camel-headersmap/src/main/docs/headersmap.adoc b/core/camel-headersmap/src/main/docs/headersmap.adoc index 8b9283f..6947bc1 100644 --- a/core/camel-headersmap/src/main/docs/headersmap.adoc +++ b/core/camel-headersmap/src/main/docs/headersmap.adoc @@ -1,35 +1,38 @@ -## HeadersMap +== HeadersMap *Available as of Camel 2.20* The camel-headersmap is a faster implementation of a case-insenstive map which can be plugged in and used by Camel at runtime to have slight faster performance in the Camel Message headers. -### Auto detection from classpath +=== Auto detection from classpath To use this implementation all you need to do is to add the `camel-headersmap` dependency to the classpath, and Camel should auto-detect this on startup and log as follows: -``` +[source,text] + Detected and using custom HeadersMapFactory: org.apache.camel.component.headersmap.FastHeadersMapFactory@71e9ebae -``` + For spring-boot there is a `camel-headersmap-starter` dependency you should use. -### Manual enabling +=== Manual enabling If you use OSGi or the implementation is not added to the classpath, you need to enable this explict such: -``` +[source,java] + CamelContext camel = ... camel.setHeadersMapFactory(new FastHeadersMapFactory()); -``` + Or in XML DSL (spring or blueprint XML file) you can declare the factory as a ``: -``` +[source,xml] + -``` + and then Camel should detect the bean and use the factory. \ No newline at end of file
[camel] branch master updated: Polished examples
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 4f70c8b Polished examples
4f70c8b is described below
commit 4f70c8b318b7c1a70321c1ac6972eae6f136f249
Author: Claus Ibsen
AuthorDate: Tue Apr 30 12:36:46 2019 +0200
Polished examples
---
examples/camel-example-spring-pulsar/pom.xml | 113 -
.../camel/example/pulsar/client/CamelClient.java | 6 +-
.../example/pulsar/client/CamelClientEndpoint.java | 9 +-
.../camel/example/pulsar/server/ServerRoutes.java | 2 -
.../apache/camel/example/pulsar/server/Treble.java | 1 -
.../example/pulsar/server/TypeConverters.java | 1 -
.../resources/META-INF/spring/camel-server.xml | 89
.../src/main/resources/camel-client.xml| 72 ++---
.../src/main/resources/features.xml| 29 --
9 files changed, 131 insertions(+), 191 deletions(-)
diff --git a/examples/camel-example-spring-pulsar/pom.xml
b/examples/camel-example-spring-pulsar/pom.xml
index a58d53b..09ff5f0 100644
--- a/examples/camel-example-spring-pulsar/pom.xml
+++ b/examples/camel-example-spring-pulsar/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
@@ -30,13 +31,13 @@
An example using Spring XML to talk to the Pulsar server from
different kind of client techniques
-
org.apache.camel.example.server.*
-
org.apache.activemq.xbean
true
Messaging
+
+
org.apache.camel
camel-core
@@ -50,43 +51,37 @@
camel-pulsar
-
+
+
+org.apache.logging.log4j
+log4j-api
+${log4j2-version}
+
+
+org.apache.logging.log4j
+log4j-core
+${log4j2-version}
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+${log4j2-version}
+
-org.apache.xbean
-xbean-spring
+org.apache.logging.log4j
+log4j-1.2-api
+${log4j2-version}
-
-
-
-org.apache.logging.log4j
-log4j-api
-${log4j2-version}
-
-
-org.apache.logging.log4j
-log4j-core
-${log4j2-version}
-
-
-org.apache.logging.log4j
-log4j-slf4j-impl
-${log4j2-version}
-
-
-org.apache.logging.log4j
-log4j-1.2-api
-${log4j2-version}
-
-
+
- org.apache.camel
- camel-test-spring
- test
+org.apache.camel
+camel-test-spring
+test
-
+
CamelServer
@@ -118,44 +113,20 @@
-
-
-
- org.codehaus.mojo
-
build-helper-maven-plugin
-
-
- attach-artifacts
- package
-
-
attach-artifact
-
-
-
-
-
target/classes/features.xml
-
xml
-
features
-
-
-
-
[camel] branch master updated: Polished examples
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new d67bdc0 Polished examples d67bdc0 is described below commit d67bdc08b924bef4370570a9067160d8712095d7 Author: Claus Ibsen AuthorDate: Tue Apr 30 12:30:16 2019 +0200 Polished examples --- examples/README.adoc | 14 +- examples/camel-example-billboard-aggr/pom.xml | 5 + examples/camel-example-spring-pulsar/pom.xml | 11 +++ 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/examples/README.adoc b/examples/README.adoc index b55d328..ca65382 100644 --- a/examples/README.adoc +++ b/examples/README.adoc @@ -11,7 +11,7 @@ View the individual example READMEs for details. ### Examples // examples: START -Number of Examples: 107 (0 deprecated) +Number of Examples: 109 (0 deprecated) [width="100%",cols="4,2,4",options="header"] |=== @@ -21,8 +21,6 @@ Number of Examples: 107 (0 deprecated) | link:camel-example-bigxml-split/README.md[Bigxml Split] (camel-example-bigxml-split) | | How to deal with big XML files in Camel -| link:camel-example-billboard-aggr/README.md[Billboard Aggr] (camel-example-billboard-aggr) | | Billboard aggregation example - | link:camel-example-telegram/README.adoc[Telegram] (camel-example-telegram) | | An example that uses Telegram API | link:camel-example-webhook/readme.adoc[Webhook] (camel-example-webhook) | | Example on how to use the Camel Webhook component @@ -94,6 +92,8 @@ Number of Examples: 107 (0 deprecated) | link:camel-example-jdbc/README.md[JDBC] (camel-example-jdbc) | Database | An example for showing Camel using JDBC component +| link:camel-example-jooq/README.adoc[JOOQ] (camel-example-jooq) | Database | An example for showing Camel using JOOQ component + | link:camel-example-mybatis/README.md[MyBatis] (camel-example-mybatis) | Database | An example for showing Camel using MyBatis SQL mapper component | link:camel-example-spring-boot-rest-jpa/README.md[Spring Boot REST JPA] (camel-example-spring-boot-rest-jpa) | Database | An example demonstrating how to use Camel REST DSL with JPA to expose a RESTful API that performs CRUD @@ -102,6 +102,10 @@ Number of Examples: 107 (0 deprecated) | link:camel-example-aggregate/README.md[Aggregate] (camel-example-aggregate) | EIP | Demonstrates the persistent support for the Camel aggregator +| link:camel-example-artemis/README.md[Widget Gadget using Apache Artemis] (camel-example-artemis) | EIP | The widget and gadget example from the EIP book using Apache Artemis + +| link:camel-example-billboard-aggr/README.md[Billboard Aggr] (camel-example-billboard-aggr) | EIP | Billboard aggregation example + | link:camel-example-cafe/README.md[Cafe] (camel-example-cafe) | EIP | A cafe example showing how to work with Camel | link:camel-example-hystrix/README.md[Hystrix] (camel-example-hystrix) | EIP | An example showing how to use Hystrix EIP as circuit breaker in Camel routes @@ -186,6 +190,8 @@ Number of Examples: 107 (0 deprecated) | link:camel-example-spring-jms/README.md[Spring JMS] (camel-example-spring-jms) | Messaging | An example using Spring XML to talk to the JMS server from different kind of client techniques +| link:camel-example-spring-pulsar/README.md[Spring Pulsar] (camel-example-spring-pulsar) | Messaging | An example using Spring XML to talk to the Pulsar server from different kind of client techniques + | link:camel-example-cxf-blueprint/README.md[CXF Blueprint] (camel-example-cxf-blueprint) | OSGi | An example which use a CXF consumer and the OSGI HTTP Service | link:camel-example-ehcache-blueprint/README.md[EHCache OSGi] (camel-example-ehcache-blueprint) | OSGi | An example using EHCache with OSGi Blueprint @@ -230,8 +236,6 @@ Number of Examples: 107 (0 deprecated) | link:camel-example-spring-security/README.md[Spring Security] (camel-example-spring-security) | Security | An example showing how to work with Camel and Spring Security -| link:camel-example-simplejirabot/README.md[JIRA Bot] (camel-example-simplejirabot) | Social | An example showing how to work with RSS and IRC endpoints - | link:camel-example-twitter-salesforce/README.md[Twitter Salesforce] (camel-example-twitter-salesforce) | Social | Twitter mentions is created as contacts in Salesforce | link:camel-example-twitter-websocket/README.md[Twitter Websocket] (camel-example-twitter-websocket) | Social | An example that pushes new tweets to a web page using web-socket diff --git a/examples/camel-example-billboard-aggr/pom.xml b/examples/camel-example-billboard-aggr/pom.xml index f5b4e69..cf98b44 100644 --- a/examples/camel-example-billboard-aggr/pom.xml +++ b/examples/camel-example-billboard-aggr/pom.xml @@ -34,10 +34,7 @@ Billboard aggregation example
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f1017e0 Polished
f1017e0 is described below
commit f1017e096f54574d299e9f78b259f13842114ffe
Author: Claus Ibsen
AuthorDate: Thu Apr 18 10:55:18 2019 +0200
Polished
---
.../main/java/org/apache/camel/language/bean/BeanExpression.java | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
b/core/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
index 594aa24..38d4a52 100644
---
a/core/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
+++
b/core/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
@@ -30,8 +30,9 @@ import org.apache.camel.component.bean.BeanHolder;
import org.apache.camel.component.bean.ConstantBeanHolder;
import org.apache.camel.component.bean.ConstantTypeBeanHolder;
import org.apache.camel.component.bean.RegistryBean;
-import org.apache.camel.language.simple.SimpleLanguage;
+import org.apache.camel.spi.Language;
import org.apache.camel.support.ExchangeHelper;
+import org.apache.camel.support.LanguageSupport;
import org.apache.camel.util.KeyValueHolder;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.OgnlHelper;
@@ -308,8 +309,9 @@ public class BeanExpression implements Expression,
Predicate {
// if there was a key then we need to lookup using the key
if (key != null) {
// if key is a nested simple expression then re-evaluate that
again
-if (SimpleLanguage.hasSimpleFunction(key)) {
-key = SimpleLanguage.expression(key).evaluate(exchange,
String.class);
+if (LanguageSupport.hasSimpleFunction(key)) {
+Language lan =
exchange.getContext().resolveLanguage("simple");
+key = lan.createExpression(key).evaluate(exchange,
String.class);
}
if (key != null) {
result = lookupResult(resultExchange, key, result,
nullSafe, ognlPath, holder.getBean());
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 50dff5a Polished 50dff5a is described below commit 50dff5aca7ba0743bdd036fc61c4a596e244f572 Author: Claus Ibsen AuthorDate: Thu Apr 18 10:15:58 2019 +0200 Polished --- .../src/main/java/org/apache/camel/component/bean/BeanInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java index 4e043b2..00d0c6e 100644 --- a/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java +++ b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java @@ -45,10 +45,10 @@ import org.apache.camel.Headers; import org.apache.camel.Message; import org.apache.camel.OutHeaders; import org.apache.camel.PropertyInject; -import org.apache.camel.builder.ExpressionBuilder; import org.apache.camel.spi.Registry; import org.apache.camel.support.IntrospectionSupport; import org.apache.camel.support.ObjectHelper; +import org.apache.camel.support.builder.ExpressionBuilder; import org.apache.camel.support.language.AnnotationExpressionFactory; import org.apache.camel.support.language.DefaultAnnotationExpressionFactory; import org.apache.camel.support.language.LanguageAnnotation;
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 47794a5 Polished 47794a5 is described below commit 47794a5184571f83a831f0769c3a107b474d807f Author: Claus Ibsen AuthorDate: Tue Mar 26 12:28:37 2019 +0100 Polished --- .../java/org/apache/camel/model/ThrowExceptionDefinition.java | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java index d3236af..d7a0222 100644 --- a/core/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java +++ b/core/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java @@ -51,7 +51,13 @@ public class ThrowExceptionDefinition extends NoOutputDefinition
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 0621a79 Polished 0621a79 is described below commit 0621a792f7c9a3ee5d26ad60493f34c06dad9f73 Author: Claus Ibsen AuthorDate: Sun Mar 24 10:18:14 2019 +0100 Polished --- .../component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java | 2 +- .../org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java index 756a917..385e658 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalancePartitionRevokeTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java index b36b7c2..7deef47 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaConsumerRebalanceTest.java @@ -1,4 +1,4 @@ -/** +/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership.
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 373ffbc Polished
373ffbc is described below
commit 373ffbc8fa64204e0ea80090002c92dc1580f068
Author: Claus Ibsen
AuthorDate: Mon Feb 18 06:17:07 2019 +0100
Polished
---
.../org/apache/camel/catalog/CamelCatalogTest.java | 42 +++---
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 0a3145c..c867e42 100644
---
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -68,14 +68,15 @@ public class CamelCatalogTest {
}
@Test
-public void testFindLanguageNames() throws Exception {
-List names = catalog.findLanguageNames();
-
-assertTrue(names.contains("simple"));
-assertTrue(names.contains("spel"));
-assertTrue(names.contains("xpath"));
-assertTrue(names.contains("bean"));
-assertFalse(names.contains("method"));
+public void testFindComponentNames() throws Exception {
+List names = catalog.findComponentNames();
+assertNotNull(names);
+assertTrue(names.contains("file"));
+assertTrue(names.contains("log"));
+assertTrue(names.contains("docker"));
+assertTrue(names.contains("jms"));
+assertTrue(names.contains("activemq"));
+assertTrue(names.contains("zookeeper-master"));
}
@Test
@@ -96,17 +97,8 @@ public class CamelCatalogTest {
}
@Test
-public void testFindNames() throws Exception {
-List names = catalog.findComponentNames();
-assertNotNull(names);
-assertTrue(names.contains("file"));
-assertTrue(names.contains("log"));
-assertTrue(names.contains("docker"));
-assertTrue(names.contains("jms"));
-assertTrue(names.contains("activemq"));
-assertTrue(names.contains("zookeeper-master"));
-
-names = catalog.findDataFormatNames();
+public void testFindDataFormatNames() throws Exception {
+List names = catalog.findDataFormatNames();
assertNotNull(names);
assertTrue(names.contains("bindy-csv"));
assertTrue(names.contains("hl7"));
@@ -114,9 +106,12 @@ public class CamelCatalogTest {
assertTrue(names.contains("syslog"));
assertTrue(names.contains("asn1"));
assertTrue(names.contains("zipfile"));
+}
+
+@Test
+public void testFindLanguageNames() throws Exception {
+List names = catalog.findLanguageNames();
-names = catalog.findLanguageNames();
-assertNotNull(names);
assertTrue(names.contains("simple"));
assertTrue(names.contains("groovy"));
assertTrue(names.contains("mvel"));
@@ -124,8 +119,11 @@ public class CamelCatalogTest {
assertTrue(names.contains("file"));
assertTrue(names.contains("xtokenize"));
assertTrue(names.contains("hl7terser"));
+}
-names = catalog.findModelNames();
+@Test
+public void testFindModelNames() throws Exception {
+List names = catalog.findModelNames();
assertNotNull(names);
assertTrue(names.contains("from"));
assertTrue(names.contains("to"));
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new f174c42 Polished f174c42 is described below commit f174c42c3238f097ffc7765e7e85a09ff7501249 Author: Claus Ibsen AuthorDate: Wed Feb 13 06:24:00 2019 +0100 Polished --- platforms/spring-boot/components-starter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml index 4724219..9793b84 100644 --- a/platforms/spring-boot/components-starter/pom.xml +++ b/platforms/spring-boot/components-starter/pom.xml @@ -27,7 +27,7 @@ components-starter pom - Camel :: Components :: Starter + Camel :: Platforms :: Spring-Boot :: Components Starter Camel Components Starter
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 4ed31ff Polished
4ed31ff is described below
commit 4ed31ffb8c18c9a2ebdbe05da462f6fdf62f341b
Author: Claus Ibsen
AuthorDate: Wed Feb 6 07:43:20 2019 +0100
Polished
---
.../java/org/apache/camel/component/consul/ConsulEventWatchTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
index 52c9862..548cac1 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java
@@ -38,7 +38,6 @@ public class ConsulEventWatchTest extends ConsulTestSupport {
List values = generateRandomListOfStrings(3);
MockEndpoint mock = getMockEndpoint("mock:event-watch");
-mock.expectedMessageCount(values.size());
mock.expectedBodiesReceived(values);
mock.expectedHeaderReceived(ConsulConstants.CONSUL_RESULT, true);
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new d873ce8 Polished d873ce8 is described below commit d873ce81dc853c3e4c46eee07f29556c66cbc691 Author: Claus Ibsen AuthorDate: Tue Feb 5 06:46:44 2019 +0100 Polished --- components/camel-file/src/main/docs/file-component.adoc | 2 +- .../java/org/apache/camel/component/file/GenericFileEndpoint.java | 4 ++-- components/camel-ftp/src/main/docs/ftp-component.adoc | 2 +- components/camel-ftp/src/main/docs/ftps-component.adoc| 2 +- components/camel-ftp/src/main/docs/sftp-component.adoc| 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/camel-file/src/main/docs/file-component.adoc b/components/camel-file/src/main/docs/file-component.adoc index db0ee94..6f0865b 100644 --- a/components/camel-file/src/main/docs/file-component.adoc +++ b/components/camel-file/src/main/docs/file-component.adoc @@ -104,7 +104,7 @@ with the following path and query parameters: | *flatten* (producer) | Flatten is used to flatten the file name path to strip any leading paths, so it's just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths. | false | boolean | *jailStartingDirectory* (producer) | Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders. | true | boolean | *moveExisting* (producer) | Expression (such as File Language) used to compute file name to use when fileExist=Move is configured. To move files into a backup subdirectory just enter backup. This option only supports the following File Language tokens: file:name, file:name.ext, file:name.noext, file:onlyname, file:onlyname.noext, file:ext, and file:parent. Notice the file:parent is not supported by the FTP component, as the FTP component can only move any existing files to a relative d [...] -| *tempFileName* (producer) | The same as tempPrefix option but offering a more fine grained control on the naming of the temporary filename as it uses the File Language. | | String +| *tempFileName* (producer) | The same as tempPrefix option but offering a more fine grained control on the naming of the temporary filename as it uses the File Language. The location for tempFilename is relative to the final file location in the option 'fileName', not the target directory in the base uri. For example if option fileName includes a directory prefix: dir/finalFilename then tempFileName is relative to that subdirectory dir. | | String | *tempPrefix* (producer) | This option is used to write the file using a temporary name and then, after the write is complete, rename it to the real name. Can be used to identify files being written and also avoid consumers (not using exclusive read locks) reading in progress files. Is often used by FTP when uploading big files. | | String | *allowNullBody* (producer) | Used to specify if a null body is allowed during file writing. If set to true then an empty file will be created, when set to false, and attempting to send a null body to the file component, a GenericFileWriteException of 'Cannot write null body to file.' will be thrown. If the fileExist option is set to 'Override', then the file will be truncated, and if set to append the file will remain unchanged. | false | boolean | *chmod* (producer) | Specify the file permissions which is sent by the producer, the chmod value must be between 000 and 777; If there is a leading digit like in 0755 we will ignore it. | | String diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java index 024e761..46ce718 100644 --- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java +++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java @@ -779,8 +779,8 @@ public abstract class GenericFileEndpoint extends ScheduledPollEndpoint imple /** * The same as tempPrefix option but offering a more fine grained control on the naming of the temporary filename as it uses the File Language. - * The location for tempFilename is relative to the final file location in the option
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 036198c Polished 036198c is described below commit 036198cf2b3199149160670c2fb421b9a1259fb6 Author: Claus Ibsen AuthorDate: Wed Jan 30 14:54:57 2019 +0100 Polished --- MIGRATION.md | 4 +++- .../java/org/apache/camel/component/bean/MyCurrency.java | 0 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MIGRATION.md b/MIGRATION.md index 9ea8d8a..34b058f 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -23,7 +23,7 @@ TODO: as table of all the modules Maven users of Apache Camel can keep using the dependency *camel-core* which will have transitive dependency on all of its modules, and therefore no migration is needed. However users whom wants to trim the size of the classes on the classpath, can use fine grained Maven dependency on only the modules needed. -TODO: we need camel-core-minimal dependecy for just basic Camel +TODO: we need camel-core-minimal dependency for just basic Camel Migrating custom components @@ -54,6 +54,8 @@ The classes from `org.apache.camel.impl` that was intended to support Camel deve All the classes in `org.apache.camel.util.component` has been moved from the camel-core JAR to the package `org.apache.camel.support.component` in the `camel-support` JAR. +The class `ServiceHelper` has been moved from `org.apache.camek.util.ServiceHelper` in the camel-core JAR to `org.apache.camel.support.service.ServiceHelper` and moved to the `camel-api` JAR. + The class `FileIdempotentRepository` has been moved from `org.apache.camel.processor.idempotent.FileIdempotentRepository` in the camel-core JAR to `org.apache.camel.support.processor.idempotent.FileIdempotentRepository` and moved to the `camel-suppor` JAR. The class `MemoryIdempotentRepository` has been moved from `org.apache.camel.processor.idempotent.MemoryIdempotentRepository` in the camel-core JAR to `org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository` and moved to the `camel-suppor` JAR. diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MyCurrency.java b/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrency.java similarity index 100% rename from camel-core/src/main/java/org/apache/camel/component/bean/MyCurrency.java rename to camel-core/src/test/java/org/apache/camel/component/bean/MyCurrency.java
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 26fc1b0 Polished
26fc1b0 is described below
commit 26fc1b06600c2a28e959241f0dadf7f0d7c8dad4
Author: Claus Ibsen
AuthorDate: Tue Jan 29 08:15:41 2019 +0100
Polished
---
.../karaf/features/src/main/resources/features.xml | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index e31c712..05d7dab 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -42,33 +42,34 @@
xml-specs-api
mvn:com.github.ben-manes.caffeine/caffeine/${caffeine-version}
mvn:org.apache.camel/camel-util-json/${project.version}
+mvn:org.apache.camel/spi-annotations/${project.version}
mvn:org.apache.camel/camel-api/${project.version}
+
mvn:org.apache.camel/camel-management-api/${project.version}
mvn:org.apache.camel/camel-util/${project.version}
+mvn:org.apache.camel/camel-support/${project.version}
+mvn:org.apache.camel/camel-base/${project.version}
+
mvn:org.apache.camel/camel-management-impl/${project.version}
+mvn:org.apache.camel/camel-core/${project.version}
+
mvn:org.apache.camel/camel-browse/${project.version}
mvn:org.apache.camel/camel-controlbus/${project.version}
-
mvn:org.apache.camel/camel-management-api/${project.version}
-mvn:org.apache.camel/camel-support/${project.version}
mvn:org.apache.camel/camel-dataformat/${project.version}
mvn:org.apache.camel/camel-direct/${project.version}
mvn:org.apache.camel/camel-directvm/${project.version}
-mvn:org.apache.camel/camel-saga/${project.version}
+mvn:org.apache.camel/camel-file/${project.version}
mvn:org.apache.camel/camel-language/${project.version}
mvn:org.apache.camel/camel-log/${project.version}
-mvn:org.apache.camel/camel-file/${project.version}
mvn:org.apache.camel/camel-properties/${project.version}
mvn:org.apache.camel/camel-ref/${project.version}
+mvn:org.apache.camel/camel-rest/${project.version}
+mvn:org.apache.camel/camel-saga/${project.version}
mvn:org.apache.camel/camel-scheduler/${project.version}
+mvn:org.apache.camel/camel-seda/${project.version}
mvn:org.apache.camel/camel-stub/${project.version}
mvn:org.apache.camel/camel-timer/${project.version}
-mvn:org.apache.camel/camel-rest/${project.version}
-mvn:org.apache.camel/camel-seda/${project.version}
mvn:org.apache.camel/camel-validator/${project.version}
mvn:org.apache.camel/camel-vm/${project.version}
mvn:org.apache.camel/camel-xslt/${project.version}
-
mvn:org.apache.camel/camel-management-impl/${project.version}
-mvn:org.apache.camel/camel-base/${project.version}
-mvn:org.apache.camel/camel-core/${project.version}
-mvn:org.apache.camel/spi-annotations/${project.version}
shell
mvn:org.apache.camel/camel-commands-core/${project.version}
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 9c948d5 Polished 9c948d5 is described below commit 9c948d5f9d0fc017786574fd12b41a92f2ccc5ed Author: Claus Ibsen AuthorDate: Tue Jan 15 10:00:31 2019 +0100 Polished --- examples/README.adoc | 25 +++--- .../camel-example-artemis-amqp-blueprint/pom.xml | 5 ++--- .../camel-example-artemis-large-messages/pom.xml | 2 +- examples/camel-example-cdi-rest-servlet/pom.xml| 4 ++-- examples/camel-example-ehcache-blueprint/pom.xml | 6 +++--- .../camel-example-fhir-auth-tx-spring-boot/pom.xml | 2 +- examples/camel-example-fhir-osgi/pom.xml | 2 +- examples/camel-example-fhir-spring-boot/pom.xml| 4 ++-- examples/camel-example-fhir/pom.xml| 2 +- .../hello-camel-grpc-client-kubernetes/pom.xml | 2 +- .../hello-camel-grpc-server-kubernetes/pom.xml | 2 +- examples/camel-example-olingo4-blueprint/pom.xml | 6 +++--- examples/camel-example-rest-producer/pom.xml | 2 +- examples/camel-example-rest-swagger/pom.xml| 4 ++-- .../camel-example-servlet-rest-blueprint/pom.xml | 4 ++-- examples/camel-example-servlet-tomcat/pom.xml | 2 +- examples/camel-example-spark-rest/pom.xml | 6 +++--- .../camel-example-spring-boot-activemq/pom.xml | 2 +- .../camel-example-spring-boot-geocoder/pom.xml | 2 +- .../hello-camel-grpc-client/pom.xml| 2 +- .../hello-camel-grpc-server/pom.xml| 2 +- examples/camel-example-spring-boot-grpc/pom.xml| 2 +- .../camel-example-spring-boot-infinispan/pom.xml | 2 +- examples/camel-example-spring-boot-metrics/pom.xml | 2 +- .../camel-example-spring-boot-rest-jpa/pom.xml | 2 +- .../camel-example-spring-boot-rest-swagger/pom.xml | 2 +- examples/camel-example-spring-boot-xml/pom.xml | 2 +- examples/camel-example-sql-blueprint/pom.xml | 4 ++-- .../camel-example-transformer-blueprint/pom.xml| 4 ++-- .../pom.xml| 2 +- 30 files changed, 54 insertions(+), 56 deletions(-) diff --git a/examples/README.adoc b/examples/README.adoc index ea7c650..8e847a9 100644 --- a/examples/README.adoc +++ b/examples/README.adoc @@ -40,7 +40,7 @@ Number of Examples: 104 (2 deprecated) | link:camel-example-reload/Readme.md[Reload] (camel-example-reload) | Beginner | An example that live reloads routes when the XML file is updated -| link:camel-example-rest-swagger/README.md[REST Swagger] (camel-example-rest-swagger) | Beginner | This example shows how to call a REST service defined using Swagger specification +| link:camel-example-rest-swagger/README.md[REST Swagger] (camel-example-rest-swagger) | Beginner | This example shows how to call a Rest service defined using Swagger specification | link:camel-example-servlet-tomcat/README.md[Servlet Tomcat] (camel-example-servlet-tomcat) | Beginner | An example using Camel Servlet with Apache Tomcat @@ -112,15 +112,15 @@ Number of Examples: 104 (2 deprecated) | link:camel-example-widget-gadget-xml/README.md[Widget Gadget XML] (camel-example-widget-gadget-xml) | EIP | The widget and gadget example from the EIP book -| link:camel-example-fhir/README.md[FHIR] (camel-example-fhir) | Health Care | An example running Camel FHIR using Camel CDI +| link:camel-example-fhir/README.md[FHIR] (camel-example-fhir) | Health Care | An example running Camel FHIR using Camel CDI | link:camel-example-fhir-auth-tx-spring-boot/readme.adoc[Fhir Auth Tx Spring Boot] (camel-example-fhir-auth-tx-spring-boot) | Health Care | An example showing how to work with Camel, FHIR Authorization, FHIR Transaction and Spring Boot -| link:camel-example-fhir-osgi/README.md[Fhir Osgi] (camel-example-fhir-osgi) | Health Care | An example running Camel FHIR in Apache Karaf +| link:camel-example-fhir-osgi/README.md[Fhir Osgi] (camel-example-fhir-osgi) | Health Care | An example running Camel FHIR using OSGi Blueprint -| link:camel-example-fhir-spring-boot/readme.adoc[Fhir Spring Boot] (camel-example-fhir-spring-boot) | Health Care | An example showing how to work with Camel, Fhir and Spring Boot +| link:camel-example-fhir-spring-boot/readme.adoc[Fhir Spring Boot] (camel-example-fhir-spring-boot) | Health Care | An example showing how to work with Camel, FHIR and Spring Boot -| link:camel-example-transformer-blueprint/README.md[Transformer OSGi Blueprint] (camel-example-transformer-blueprint) | Input/Output Type Contract | An example demonstrating declarative transformation along data type declaration using OSGi Blueprint XML +| link:camel-example-transformer-blueprint/README.md[Transformer OSGi Blueprint] (camel-example-transformer-blueprint) | Input/Output Typ
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c8357b9 Polished
c8357b9 is described below
commit c8357b95e4a1896eaecbec0cfed81e76178d
Author: Claus Ibsen
AuthorDate: Mon Dec 3 08:26:41 2018 +0100
Polished
---
.../src/main/docs/google-bigquery-component.adoc | 25 ++
.../main/docs/google-bigquery-sql-component.adoc | 20 -
2 files changed, 20 insertions(+), 25 deletions(-)
diff --git
a/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
b/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
index 5af187d..765591e 100644
---
a/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
+++
b/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
@@ -3,8 +3,6 @@
*Available as of Camel version 2.20*
-### Component Description
-
The Google Bigquery component provides access
to https://cloud.google.com/bigquery/[Cloud BigQuery Infrastructure] via
the
https://developers.google.com/api-client-library/java/apis/bigquery/v2[Google
Client Services API].
@@ -29,7 +27,7 @@ for this component:
[[GoogleBigQuery-AuthenticationConfiguration]]
-### Authentication Configuration
+=== Authentication Configuration
Google BigQuery component authentication is targeted for use with the GCP
Service Accounts.
For more information please refer to
https://cloud.google.com/docs/authentication[Google Cloud Platform Auth Guide]
@@ -48,15 +46,15 @@
https://developers.google.com/identity/protocols/application-default-credentials
Service Account Email and Service Account Key can be found in the GCP JSON
credentials file as client_email and private_key respectively.
-### URI Format
+=== URI Format
-[source,java]
+[source,text]
google-bigquery://project-id:datasetId[:tableId]?[options]
-### Options
+=== Options
// component options: START
The Google BigQuery component supports 4 options, which are listed below.
@@ -124,7 +122,7 @@ The component supports 4 options, which are listed below.
// spring-boot-auto-configure options: END
-### Message Headers
+=== Message Headers
[width="100%",cols="10%,10%,80%",options="header",]
|===
@@ -136,7 +134,7 @@ The component supports 4 options, which are listed below.
|===
-### Producer Endpoints
+=== Producer Endpoints
Producer endpoints can accept and deliver to BigQuery individual and grouped
exchanges alike. Grouped exchanges have `Exchange.GROUPED_EXCHANGE` property
set.
@@ -148,7 +146,7 @@ correct suffix or partition decorator.
Google BigQuery endpoint expects the payload to be either a map or list of
maps. A payload containing a map
will insert a single row and a payload containing a list of map's will insert
a row for each entry in the list.
-### Template tables
+=== Template tables
Reference:
https://cloud.google.com/bigquery/streaming-data-into-bigquery#template-tables
@@ -159,13 +157,12 @@ I.e. the following route will create tables and insert
records sharded on a per
[source,java]
--
from("direct:start")
-.header(GoogleBigQueryConstants.TABLE_SUFFIX, "_${date:now:MMdd}")
-.to("google-bigquery:sampleDataset:sampleTable")
-
+ .header(GoogleBigQueryConstants.TABLE_SUFFIX, "_${date:now:MMdd}")
+ .to("google-bigquery:sampleDataset:sampleTable")
--
Note it is recommended to use partitioning for this use case.
-### Partitioning
+=== Partitioning
Reference: https://cloud.google.com/bigquery/docs/creating-partitioned-tables
@@ -173,7 +170,7 @@ Partitioning is specified when creating a table and if set
data will be automati
separate tables. When inserting data a specific partition can be specified by
setting the
`GoogleBigQueryConstants.PARTITION_DECORATOR` header on the exchange.
-### Ensuring data consistency
+=== Ensuring data consistency
Reference:
https://cloud.google.com/bigquery/streaming-data-into-bigquery#dataconsistency
diff --git
a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
index 36d7cb8..a0e06bb 100644
---
a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
+++
b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
@@ -1,9 +1,7 @@
[[google-bigquery-sql-component]]
== Google BigQuery Standard SQL
[camel] branch master updated: Polished examples a bit with a new health care category.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new ff138c9 Polished examples a bit with a new health care category. ff138c9 is described below commit ff138c9f1e07aa98eb1312cac389b292fcbc4417 Author: Claus Ibsen AuthorDate: Mon Aug 20 19:43:31 2018 +0200 Polished examples a bit with a new health care category. --- components/readme.adoc | 2 +- examples/README.adoc | 28 +++--- .../camel-example-fhir-auth-tx-spring-boot/pom.xml | 2 +- examples/camel-example-fhir-osgi/pom.xml | 2 +- examples/camel-example-fhir-spring-boot/pom.xml| 2 +- examples/camel-example-fhir/pom.xml| 1 + examples/camel-example-widget-gadget-cdi/pom.xml | 2 +- examples/camel-example-widget-gadget-java/pom.xml | 2 +- examples/camel-example-widget-gadget-xml/pom.xml | 2 +- 9 files changed, 22 insertions(+), 21 deletions(-) diff --git a/components/readme.adoc b/components/readme.adoc index 0e95827..4ad0a64 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -27,7 +27,7 @@ Number of Components: 301 in 204 JAR artifacts (21 deprecated) `apns:name` | 2.8 | For sending notifications to Apple iOS devices. | link:camel-as2/camel-as2-component/src/main/docs/as2-component.adoc[AS2] (camel-as2) + -`as2:name` | 2.22 | Component used for transferring data secure and reliable over the internet using the AS2 protocol. +`as2:apiName` | 2.22 | Component used for transferring data secure and reliable over the internet using the AS2 protocol. | link:camel-asterisk/src/main/docs/asterisk-component.adoc[Asterisk] (camel-asterisk) + `asterisk:name` | 2.18 | The asterisk component is used to interact with Asterisk PBX Server. diff --git a/examples/README.adoc b/examples/README.adoc index f242495..b7f8079 100644 --- a/examples/README.adoc +++ b/examples/README.adoc @@ -17,8 +17,6 @@ Number of Examples: 109 (8 deprecated) |=== | Example | Category | Description -| link:camel-example-fhir/README.md[FHIR] (camel-example-fhir) | | An example running Camel FHIR using Camel CDI - | link:camel-example-micrometer/README.md[Micrometer] (camel-example-micrometer) | Advanced | An example showing how to work with Camel, Spring Java Config and Micrometer monitoring | link:camel-example-cdi/README.md[CDI] (camel-example-cdi) | Beginner | An example showing how to work with Camel and CDI for dependency injection @@ -29,10 +27,6 @@ Number of Examples: 109 (8 deprecated) | link:camel-example-console/README.md[Console] (camel-example-console) | Beginner | An example that reads input from the console -| link:camel-example-fhir-auth-tx-spring-boot/readme.adoc[Fhir Auth Tx Spring Boot] (camel-example-fhir-auth-tx-spring-boot) | Beginner | An example showing how to work with Camel, FHIR Authorization, FHIR Transaction and Spring Boot - -| link:camel-example-fhir-spring-boot/readme.adoc[Fhir Spring Boot] (camel-example-fhir-spring-boot) | Beginner | An example showing how to work with Camel, Fhir and Spring Boot - | link:camel-example-ftp/README.md[FTP] (camel-example-ftp) | Beginner | An example for showing Camel FTP integration | link:camel-example-java8/readme.adoc[Java8] (camel-example-java8) | Beginner | An example for showing Camel DSL for Java 8 @@ -62,12 +56,6 @@ Number of Examples: 109 (8 deprecated) | link:camel-example-spring-xquery/README.md[Spring XQuery] (camel-example-spring-xquery) | Beginner | An example using Spring XML to transform a message using XQuery -| link:camel-example-widget-gadget-cdi/README.md[Widget Gadget CDI] (camel-example-widget-gadget-cdi) | Beginner | The widget and gadget example from the EIP book - -| link:camel-example-widget-gadget-java/README.md[Widget Gadget Java] (camel-example-widget-gadget-java) | Beginner | The widget and gadget example from the EIP book - -| link:camel-example-widget-gadget-xml/README.md[Widget Gadget XML] (camel-example-widget-gadget-xml) | Beginner | The widget and gadget example from the EIP book - | link:camel-example-cassandra-kubernetes/ReadMe.md[Cassandra Kubernetes] (camel-example-cassandra-kubernetes) | Cloud | An example with Camel and Cassandra running on Kubernetes | link:camel-example-cdi-aws-s3/README.md[CDI AWS S3] (camel-example-cdi-aws-s3) | Cloud | AWS S3 CDI example @@ -116,6 +104,20 @@ Number of Examples: 109 (8 deprecated) route dynamically based on the flow of messages +| link:camel-example-widget-gadget-cdi/README.md[Widget Gadget CDI] (camel-example-widget-gadget-cdi) | EIP | The widget and gadget example from the EIP book + +| link:camel-example-widget-gadget-java/README.md[Widget Gadget Java] (camel-example-widget-gadget-java) | EIP | The widget and gadget example from the E
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 08eb993 Polished
08eb993 is described below
commit 08eb993e1b8fa05beec5a7e3f0a26ce2c1c01dba
Author: Claus Ibsen
AuthorDate: Thu Aug 16 15:30:58 2018 +0200
Polished
---
.../src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java| 1 -
1 file changed, 1 deletion(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index df3b4b5..b1c 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -316,7 +316,6 @@ public class KafkaConsumer extends DefaultConsumer {
KafkaManualCommit manual =
endpoint.getComponent().getKafkaManualCommitFactory().newInstance(exchange,
consumer, topicName, threadId,
offsetRepository, partition,
record.offset());
exchange.getIn().setHeader(KafkaConstants.MANUAL_COMMIT, manual);
-
}
try {
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d7ef9d1 Polished
d7ef9d1 is described below
commit d7ef9d10897fc87dea24b658c6d53bdb2ab90222
Author: Claus Ibsen
AuthorDate: Thu Apr 26 10:50:02 2018 +0200
Polished
---
.../camel-web3j/src/main/docs/web3j-component.adoc | 44 --
.../camel/component/web3j/Web3jConfiguration.java | 8 +++-
.../camel/component/web3j/Web3jEndpoint.java | 7 +++-
components/readme.adoc | 2 +-
.../springboot/Web3jComponentConfiguration.java| 5 ++-
5 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/components/camel-web3j/src/main/docs/web3j-component.adoc
b/components/camel-web3j/src/main/docs/web3j-component.adoc
index 617932f..be802c6 100644
--- a/components/camel-web3j/src/main/docs/web3j-component.adoc
+++ b/components/camel-web3j/src/main/docs/web3j-component.adoc
@@ -1,26 +1,24 @@
[[web3j-component]]
== web3j Component
-*Available as of Camel version 2.20*
-
-*Available as of Camel version 2.20*
+*Available as of Camel version 2.22*
The web3j component uses the
https://github.com/web3j/web3j[web3j] client
API and allows you to read/write from geth/parity compatible Ethereum nodes.
-### URI Format
+=== URI Format
-[source,java]
---
+[source,text]
+
web3j://ethereumServerUrl[?options]
---
+
You can append query options to the URI in the following format,
?options=value&option2=value&...
-### Web3j Options
+=== Web3j Options
// component options: START
The web3j component supports 2 options which are listed below.
@@ -54,7 +52,7 @@ with the following path and query parameters:
|===
- Query Parameters (4 parameters):
+ Query Parameters (5 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -63,35 +61,9 @@ with the following path and query parameters:
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by the routing Error Handler. By default the
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with
exceptions, that will be logged at WARN or ERROR level and ignored. | false |
boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
options is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer
creates an exchange. | | ExchangePattern
+| *operation* (producer) | Operation to use. | transaction | String
| *synchronous* (advanced) | Sets whether synchronous processing should be
strictly used, or Camel is allowed to use asynchronous processing (if
supported). | false | boolean
|===
// endpoint options: END
-### Usage
-
-
-### Dependencies
-
-Maven users will need to add the following dependency to their pom.xml.
-
-*pom.xml*
-
-[source,xml]
-
-org.apache.camel
-camel-web3j
-${camel-version}
-
-
-where `${camel-version`} must be replaced by the actual version of Camel
-(2.22 or higher).
-
-### See Also
-
-* Configuring Camel
-* Component
-* Endpoint
-* Getting Started
\ No newline at end of file
diff --git
a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
index f408dad..b8a7ed0 100644
---
a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
+++
b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
@@ -28,8 +28,11 @@ import org.web3j.protocol.core.DefaultBlockParameterName;
@UriParams
public class Web3jConfiguration implements Cloneable {
+
+// TODO: Add javadoc for setter for documentation and add @UriParam to
each option
+
@UriParam(label = "producer", defaultValue = "transaction")
-private String operation = Web3jConstants.TRANSACTION.toLowerCase();
+private String operation = Web3jConstants.TRANSACTION.toLowerCase(); //
TODO: Make this an enum
private DefaultBlockParameter fromBlock;
private DefaultBlockParameter toBlock;
private DefaultBlockParameter atBlock;
@@ -331,6 +334,9 @@ public class Web3jConfiguration implements Cloneable {
return operation;
}
+/**
+ * Operation to use.
+ */
pu
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7a9167e Polished
7a9167e is described below
commit 7a9167ef85da9a95c52b2ab97086a15d29dff059
Author: Claus Ibsen
AuthorDate: Mon Apr 9 10:29:13 2018 +0200
Polished
---
components/camel-spring-boot/src/main/docs/spring-boot.adoc | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
index cd77c13..478f045 100644
--- a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -163,10 +163,10 @@ route.from = jms:invoices
Or set via system property:
-[source,xml]
+[source,text]
+
java -Droute.to=jms:processed.invoices -jar mySpringApp.jar
+
...can be used as placeholders in Camel route:
@@ -288,7 +288,7 @@ public class InvoiceProcessor {
[[SpringBoot-SpringtypeconversionAPIbridge]]
-Spring type conversion API bridge
+ Spring type conversion API bridge
Spring comes with
the powerful
http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert[type
@@ -365,7 +365,7 @@ directory camel, which camel-spring-boot will auto detect
and include.
From *Camel 2.17* onwards you can configure the directory name or turn
this off using the configuration option
-[source,java]
+[source,text]
// turn off
camel.springboot.xml-routes = false
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new fa95f55 Polished fa95f55 is described below commit fa95f55841a90951421fb3a5e60b155edad223cc Author: Claus Ibsen AuthorDate: Thu Mar 22 08:05:13 2018 +0100 Polished --- components/camel-jira/src/main/docs/jira-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-jira/src/main/docs/jira-component.adoc b/components/camel-jira/src/main/docs/jira-component.adoc index 0e90463..7567fe5 100644 --- a/components/camel-jira/src/main/docs/jira-component.adoc +++ b/components/camel-jira/src/main/docs/jira-component.adoc @@ -1,7 +1,7 @@ +[[jira-component]] == JIRA Component (deprecated) *Available as of Camel version 2.15* -*Available as of Camel version 2.15* The JIRA component interacts with the JIRA API by encapsulating -- To stop receiving notification emails like this one, please contact davscl...@apache.org.
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 2821cb7 Polished 2821cb7 is described below commit 2821cb7eb27ba627351173446e6f5917176858ac Author: Andrea Cosentino AuthorDate: Wed Mar 21 10:51:40 2018 +0100 Polished --- .../org/apache/camel/component/elasticsearch/ElasticsearchProducer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java index 349a63a..52c7afa 100644 --- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java +++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchProducer.java @@ -21,7 +21,6 @@ import java.net.UnknownHostException; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import org.apache.camel.Exchange; -- To stop receiving notification emails like this one, please contact acosent...@apache.org.
[camel] branch master updated: Polished docs
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7484815 Polished docs
7484815 is described below
commit 74848159a51176ad64e77d8ce9e03f5cfc1e962b
Author: Claus Ibsen
AuthorDate: Sat Mar 10 14:11:05 2018 +0100
Polished docs
---
.../src/main/docs/spring-boot.adoc | 241 +
1 file changed, 107 insertions(+), 134 deletions(-)
diff --git a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
index 4e2dcc6..cd77c13 100644
--- a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -1,9 +1,11 @@
[[SpringBoot-SpringBoot]]
-Spring Boot
-~~~
+== Spring Boot
*Available as of Camel 2.15*
+NOTE: Camel only supports Spring Boot 1.5.x. Support for Spring Boot 2 is
planned
+for Camel 2.22 which is scheduled for summer 2018.
+
Spring Boot component provides auto-configuration for Apache Camel. Our
opinionated auto-configuration of the Camel context auto-detects Camel
routes available in the Spring context and registers the key Camel
@@ -14,21 +16,20 @@ Maven users will need to add the following dependency to
their `pom.xml`
in order to use this component:
[source,xml]
-
+
org.apache.camel
camel-spring-boot
${camel.version}
-
+
`camel-spring-boot` jar comes with the `spring.factories` file, so as
soon as you add that dependency into your classpath, Spring Boot will
automatically auto-configure Camel for you.
[[SpringBoot-CamelSpringBootStarter]]
-Camel Spring Boot Starter
-^
+=== Camel Spring Boot Starter
*Available as of Camel 2.17*
@@ -42,18 +43,18 @@ application] in the source code also.
To use the starter, add the following to your spring boot pom.xml file:
[source,xml]
---
+
org.apache.camel
camel-spring-boot-starter
-2.17.0
+${camel.version}
---
+
Then you can just add classes with your Camel routes such as:
[source,java]
-
+
package com.example;
import org.apache.camel.builder.RouteBuilder;
@@ -67,7 +68,7 @@ public class MyRoute extends RouteBuilder {
from("timer:foo").to("log:bar");
}
}
-
+
Then these routes will be started automatically.
@@ -75,8 +76,7 @@ You can customize the Camel application in the
`application.properties`
or `application.yml` file.
[[SpringBoot-Auto-configuredCamelcontext]]
-Auto-configured Camel context
-^
+=== Auto-configured Camel context
The most important piece of functionality provided by the Camel
auto-configuration is `CamelContext` instance.
@@ -87,7 +87,7 @@ context (under `camelContext` bean name), so you can access
it just as
any other Spring bean.
[source,java]
---
+
@Configuration
public class MyAppConfig {
@@ -100,11 +100,10 @@ public class MyAppConfig {
}
}
---
+
[[SpringBoot-Auto-detectingCamelroutes]]
-Auto-detecting Camel routes
-^^^
+=== Auto-detecting Camel routes
Camel auto-configuration collects all the `RouteBuilder` instances from
the Spring context and automatically injects them into the provided
@@ -113,7 +112,7 @@ Boot starter is as simple as adding the `@Component`
annotated class to
your classpath:
[source,java]
---
+
@Component
public class MyRouter extends RouteBuilder {
@@ -123,14 +122,12 @@ public class MyRouter extends RouteBuilder {
}
}
---
+
- +
-...or creating a new route `RouteBuilder` bean in your `@Configuration`
-class:
+Or creating a new route `RouteBuilder` bean in your `@Configuration` class:
[source,java]
---
+
@Configuration
public class MyRouterConfiguration {
@@ -145,27 +142,26 @@ public class MyRouterConfiguration {
};
}
-
+
}
---
+
[[SpringBoot-Camelproperties]]
-Camel properties
-
+=== Camel properties
Spring Boot auto-configuration automatically connects
to
http://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f45dde8 Polished
f45dde8 is described below
commit f45dde8ebedd267865ade86c9cf914f72a2acc13
Author: Claus Ibsen
AuthorDate: Sat Mar 10 09:16:52 2018 +0100
Polished
---
.../src/main/resources/archetype-resources/pom.xml| 19 +++
.../src/main/java/MySpringBootRouter.java | 2 +-
.../test/java/sample/camel/FooApplicationTest.java| 11 +++
3 files changed, 23 insertions(+), 9 deletions(-)
diff --git
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
index 40760e9..d8a3fca 100644
---
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml
@@ -56,13 +56,6 @@
-
-
- org.apache.camel
- camel-spring-boot-starter
- ${camel-version}
-
-
org.springframework.boot
@@ -77,7 +70,17 @@
spring-boot-starter-actuator
-
+
+
+ org.apache.camel
+ camel-spring-boot-starter
+
+
+ org.apache.camel
+ camel-stream-starter
+
+
+
org.springframework.boot
spring-boot-starter-test
diff --git
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/java/MySpringBootRouter.java
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/java/MySpringBootRouter.java
index dc5c216..236fbfd 100644
---
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/java/MySpringBootRouter.java
+++
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/java/MySpringBootRouter.java
@@ -35,7 +35,7 @@ public class MySpringBootRouter extends RouteBuilder {
.filter(simple("${body} contains 'foo'"))
.to("log:foo")
.end()
-.log("${body}");
+.to("stream:out");
}
}
diff --git
a/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationTest.java
b/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationTest.java
index 721e8cb..b05058b 100644
---
a/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationTest.java
+++
b/examples/camel-example-spring-boot/src/test/java/sample/camel/FooApplicationTest.java
@@ -19,9 +19,12 @@ package sample.camel;
import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
+import org.apache.camel.EndpointInject;
import org.apache.camel.builder.NotifyBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringBootRunner;
import org.apache.camel.test.spring.EnableRouteCoverage;
+import org.apache.camel.test.spring.MockEndpoints;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,19 +36,27 @@ import static org.junit.Assert.assertTrue;
@SpringBootTest(classes = MyCamelApplication.class,
properties = "greeting = Hello foo")
@EnableRouteCoverage
+@MockEndpoints("log:foo") // mock the log:foo endpoint => mock:log:foo which
we then use in the testing
//@Ignore // enable me to run this test as well so we can cover testing the
route completely
public class FooApplicationTest {
@Autowired
private CamelContext camelContext;
+@EndpointInject(uri = "mock:log:foo")
+private MockEndpoint mock;
+
@Test
public void shouldSayFoo() throws Exception {
+mock.expectedBodiesReceived("Hello foo");
+
// we expect that one or more messages is automatic done by the Camel
// route as it uses a timer to trigger
NotifyBuilder notify = new
NotifyBuilder(camelContext).whenDone(1).create();
assertTrue(notify.matches(10, TimeUnit.SECONDS));
+
+mock.assertIsSatisfied();
}
}
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 422e094 Polished
422e094 is described below
commit 422e094b04bb6395192b2f4cdcc7be9786fe7770
Author: Claus Ibsen
AuthorDate: Sat Mar 10 09:08:02 2018 +0100
Polished
---
.../main/resources/archetype-resources/readme.adoc | 16
.../src/main/resources/application.properties | 9 -
examples/camel-example-spring-boot/readme.adoc | 19 +++
.../sample/camel/{SampleBean.java => MyBean.java} | 2 +-
...amelApplication.java => MyCamelApplication.java} | 4 ++--
.../{SampleCamelRouter.java => MyCamelRouter.java} | 2 +-
.../src/main/resources/application.properties | 21 +++--
.../test/java/sample/camel/FooApplicationTest.java | 3 +--
...icationTest.java => MyCamelApplicationTest.java} | 4 ++--
9 files changed, 45 insertions(+), 35 deletions(-)
diff --git
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/readme.adoc
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/readme.adoc
index 04347d3..310c8fb 100644
---
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/readme.adoc
+++
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/readme.adoc
@@ -1,27 +1,27 @@
-# Camel Example Spring Boot
+== Camel Example Spring Boot
This example shows how to work with a simple Apache Camel application using
Spring Boot.
The example generates messages using timer trigger, writes them to standard
output.
-## Camel routes
+=== Camel routes
-The Camel route is located in the `SampleCamelRouter` class. In this class the
route
-starts from a timer, that triggers every 2nd second and calls a Spring Bean
`SampleBean`
+The Camel route is located in the `MyCamelRouter` class. In this class the
route
+starts from a timer, that triggers every 2nd second and calls a Spring Bean
`MyBean`
which returns a message, that is routed to a stream endpoint which writes to
standard output.
-## Using Camel components
+=== Using Camel components
Apache Camel provides 200+ components which you can use to integrate and route
messages between many systems
and data formats. To use any of these Camel components, add the component as a
dependency to your project.
-## How to run
+=== How to run
You can run this example using
mvn spring-boot:run
-## To get info about the routes
+=== To get info about the routes
To show a summary of all the routes
@@ -36,7 +36,7 @@ curl -XGET -s http://localhost:8080/camel/routes/{id}/info
-## More information
+=== More information
You can find more information about Apache Camel at the website:
http://camel.apache.org/
diff --git
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
index e476d26..34397fc 100644
---
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
+++
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -24,6 +24,13 @@ greeting = Hello World
# how often to trigger the timer
timer.period = 2000
+# to automatic shutdown the JVM after a period of time
+#camel.springboot.duration-max-seconds=60
+#camel.springboot.duration-max-messages=100
+
+# add for example: &repeatCount=5 to the timer endpoint to make Camel idle
+#camel.springboot.duration-max-idle-seconds=15
+
# all access to actuator endpoints without security
management.security.enabled = false
# turn on actuator health check
@@ -37,4 +44,4 @@ endpoints.camelroutes.read-only = true
#logging.level.org.springframework = INFO
#logging.level.org.apache.camel.spring.boot = INFO
#logging.level.org.apache.camel.impl = DEBUG
-#logging.level.sample.camel = DEBUG
\ No newline at end of file
+#logging.level.sample.camel = DEBUG
diff --git a/examples/camel-example-spring-boot/readme.adoc
b/examples/camel-example-spring-boot/readme.adoc
index 72475b2..310c8fb 100644
--- a/examples/camel-example-spring-boot/readme.adoc
+++ b/examples/camel-example-spring-boot/readme.adoc
@@ -1,27 +1,27 @@
-# Camel Example Spring Boot
+== Camel Example Spring Boot
This example shows how to work with a simple Apache Camel application using
Spring Boot.
The example generates messages using timer trigger, writes them to standard
output.
-## Camel routes
+=== Camel routes
-The Camel route is located in the `SampleCamelRouter` class. In this class the
route
-starts from a timer, that triggers every 2nd second and calls a Spr
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 9110a7e Polished
9110a7e is described below
commit 9110a7ea7ab04a0e23c391d3d4c9db123c1011ff
Author: Claus Ibsen
AuthorDate: Fri Mar 9 17:40:31 2018 +0100
Polished
---
.../src/main/resources/archetype-resources/ReadMe.txt | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/ReadMe.txt
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/ReadMe.txt
index 54e61f3..db2f325 100644
---
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/ReadMe.txt
+++
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/ReadMe.txt
@@ -6,12 +6,12 @@ This example shows how to work with the simple Camel
application based on the Sp
The example generates messages using timer trigger, writes them to the
standard output
and the mock endpoint (for testing purposes).
-This example exposes Jolokia API and Spring Boot actuators endpoints (like
metrics) via the webmvc endpoint.
-We consider this as the best practice - Spring Boot applications with these
API exposed can be easily
-monitored and managed by 3rd parties tools.
+This example exposes Jolokia API and Spring Boot actuators endpoints (like
metrics) via
+the webmvc endpoint. We consider this as the best practice - Spring Boot
applications
+with these API exposed can be easily monitored and managed by 3rd parties
tools.
-This example packages your application as a JAR, but you can also package as a
WAR and deploy to
-servlet containers like Tomcat.
+This example packages your application as a JAR, but you can also package as a
WAR and
+deploy to servlet containers like Tomcat.
You will need to compile this example first:
@@ -26,7 +26,6 @@ You can also execute the JAR directly:
java -jar target/${artifactId}-${version}.jar
You will see the message printed to the console every second.
-
To stop the example hit ctrl + c
For more help see the Apache Camel documentation
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a905067 Polished
a905067 is described below
commit a90506749420d3e72c6c6ce09d0775897dfdfa05
Author: Claus Ibsen
AuthorDate: Fri Mar 9 17:39:24 2018 +0100
Polished
---
.../src/main/resources/archetype-resources/ReadMe.txt | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/ReadMe.txt
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/ReadMe.txt
index 8e16528..54e61f3 100644
---
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/ReadMe.txt
+++
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/ReadMe.txt
@@ -3,25 +3,27 @@ Spring Boot Example
This example shows how to work with the simple Camel application based on the
Spring Boot.
-The example generates messages using timer trigger, writes them to the
standard output and the mock
-endpoint (for testing purposes).
+The example generates messages using timer trigger, writes them to the
standard output
+and the mock endpoint (for testing purposes).
-This example exposes Jolokia API and Spring Boot actuators endpoints (like
metrics) via the webmvc endpoint. We consider
-this as the best practice - Spring Boot applications with these API exposed
can be easily monitored and managed by the
-3rd parties tools.
+This example exposes Jolokia API and Spring Boot actuators endpoints (like
metrics) via the webmvc endpoint.
+We consider this as the best practice - Spring Boot applications with these
API exposed can be easily
+monitored and managed by 3rd parties tools.
This example packages your application as a JAR, but you can also package as a
WAR and deploy to
servlet containers like Tomcat.
You will need to compile this example first:
- mvn install
+
+mvn install
To run the example type
- mvn spring-boot:run
+
+mvn spring-boot:run
You can also execute the JAR directly:
- java -jar target/${artifactId}-${version}.jar
+java -jar target/${artifactId}-${version}.jar
You will see the message printed to the console every second.
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new bb62929 Polished
bb62929 is described below
commit bb629296bdc8fb86441ed7848df8b445c7a9d1b6
Author: Claus Ibsen
AuthorDate: Tue Mar 6 14:24:52 2018 +0100
Polished
---
camel-core/src/main/docs/constant-language.adoc | 11 ---
.../main/java/org/apache/camel/builder/ExpressionClause.java | 5 -
.../org/apache/camel/builder/ExpressionClauseSupport.java | 5 -
.../org/apache/camel/model/language/ConstantExpression.java | 3 +++
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/camel-core/src/main/docs/constant-language.adoc
b/camel-core/src/main/docs/constant-language.adoc
index 6bb2f44..cbb7e82 100644
--- a/camel-core/src/main/docs/constant-language.adoc
+++ b/camel-core/src/main/docs/constant-language.adoc
@@ -6,6 +6,9 @@
The Constant Expression Language is really just a way to specify
constant strings as a type of expression.
+NOTE: This is a fixed constant value that is only set once during starting up
the route,
+ do not use this if you want dynamic values during routing.
+
=== Constant Options
@@ -32,9 +35,9 @@ expression like:
-the value
+the value
-
+
@@ -46,7 +49,9 @@ And the same example using Java DSL:
[source,java]
-from("seda:a").setHeader("theHeader", constant("the value")).to("mock:b");
+from("seda:a")
+ .setHeader("theHeader", constant("the value"))
+ .to("mock:b");
=== Dependencies
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 16714d4..52af129 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -59,7 +59,10 @@ public class ExpressionClause extends
ExpressionDefinition {
}
/**
- * Specify the constant expression value
+ * Specify the constant expression value.
+ *
+ * Important: this is a fixed constant value that is only set once
during starting up the route,
+ * do not use this if you want dynamic values during routing.
*/
public T constant(Object value) {
return delegate.constant(value);
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index 91b2d3f..e732c3c 100644
---
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -79,7 +79,10 @@ public class ExpressionClauseSupport {
}
/**
- * Specify the constant expression value
+ * Specify the constant expression value.
+ *
+ * Important: this is a fixed constant value that is only set once
during starting up the route,
+ * do not use this if you want dynamic values during routing.
*/
public T constant(Object value) {
if (value instanceof String) {
diff --git
a/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
b/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
index 76749db..4390a0c 100644
---
a/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
+++
b/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
@@ -24,6 +24,9 @@ import org.apache.camel.spi.Metadata;
/**
* To use a constant value in Camel expressions or predicates.
+ *
+ * Important: this is a fixed constant value that is only set once
during starting up the route,
+ * do not use this if you want dynamic values during routing.
*/
@Metadata(firstVersion = "1.5.0", label = "language,core", title = "Constant")
@XmlRootElement(name = "constant")
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
[camel] branch master updated: Polished docs
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new fad1a94 Polished docs fad1a94 is described below commit fad1a9423312ae4024b4c43f64510df3ffb626be Author: Claus Ibsen AuthorDate: Tue Mar 6 13:43:36 2018 +0100 Polished docs --- components/camel-websocket/pom.xml| 2 +- .../java/org/apache/camel/component/websocket/WebsocketEndpoint.java | 2 +- components/readme.adoc| 2 +- .../websocket/springboot/WebsocketComponentConfiguration.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml index 76b30cc..6138621 100644 --- a/components/camel-websocket/pom.xml +++ b/components/camel-websocket/pom.xml @@ -31,7 +31,7 @@ camel-websocket jar Camel :: WebSocket - Camel WebSocket + Camel WebSocket using Jetty diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java index cdd4cbf..374512b 100644 --- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java +++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java @@ -34,7 +34,7 @@ import org.apache.camel.util.jsse.SSLContextParameters; import org.eclipse.jetty.server.Handler; /** - * The websocket component provides websocket endpoints for communicating with clients using websocket. + * The websocket component provides websocket endpoints with Jetty for communicating with clients using websocket. * * This component uses Jetty as the websocket implementation. */ diff --git a/components/readme.adoc b/components/readme.adoc index af4e1dc..8f2a5c2 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -426,7 +426,7 @@ Number of Components: 291 in 199 JAR artifacts (19 deprecated) `jetty:httpUri` | 1.2 | The jetty component provides HTTP-based endpoints for consuming and producing HTTP requests. | link:camel-websocket/src/main/docs/websocket-component.adoc[Jetty Websocket] (camel-websocket) + -`websocket:host:port/resourceUri` | 2.10 | The websocket component provides websocket endpoints for communicating with clients using websocket. +`websocket:host:port/resourceUri` | 2.10 | The websocket component provides websocket endpoints with Jetty for communicating with clients using websocket. | link:camel-jgroups/src/main/docs/jgroups-component.adoc[JGroups] (camel-jgroups) + `jgroups:clusterName` | 2.13 | The jgroups component provides exchange of messages between Camel and JGroups clusters. diff --git a/platforms/spring-boot/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java index 165e9aa..a8cc7cf 100644 --- a/platforms/spring-boot/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-websocket-starter/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentConfiguration.java @@ -26,8 +26,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; /** - * The websocket component provides websocket endpoints for communicating with - * clients using websocket. + * The websocket component provides websocket endpoints with Jetty for + * communicating with clients using websocket. * * Generated by camel-package-maven-plugin - do not edit this file! */ -- To stop receiving notification emails like this one, please contact davscl...@apache.org.
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 91c738d Polished
91c738d is described below
commit 91c738db9d1c39b3495069f3d78a6cabf36a887c
Author: Claus Ibsen
AuthorDate: Tue Mar 6 09:47:26 2018 +0100
Polished
---
.../src/main/docs/spark-rest-component.adoc| 73 ++
1 file changed, 32 insertions(+), 41 deletions(-)
diff --git
a/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
b/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
index 65bc660..e113157 100644
--- a/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
+++ b/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
@@ -21,14 +21,14 @@ for this component:
-
-### URI format
+=== URI format
-[source,java]
+[source,text]
--
- spark-rest://verb:path?[options]
+spark-rest://verb:path?[options]
--
-### URI Options
+=== URI Options
@@ -99,7 +99,7 @@ with the following path and query parameters:
// endpoint options: END
-### Path using Spark syntax
+=== Path using Spark syntax
The path option is defined using a Spark REST syntax where you define
the REST context path using support for parameters and splat. See more
@@ -110,8 +110,8 @@ The following is a Camel route using a fixed path
[source,java]
---
- from("spark-rest:get:hello")
-.transform().constant("Bye World");
+from("spark-rest:get:hello")
+ .transform().constant("Bye World");
---
And the following route uses a parameter which is mapped to a Camel
@@ -119,11 +119,11 @@ header with the key "me".
[source,java]
- from("spark-rest:get:hello/:me")
-.transform().simple("Bye ${header.me}");
+from("spark-rest:get:hello/:me")
+ .transform().simple("Bye ${header.me}");
-### Mapping to Camel Message
+=== Mapping to Camel Message
The Spark Request object is mapped to a Camel Message as
a `org.apache.camel.component.sparkrest.SparkMessage` which has access
@@ -139,11 +139,11 @@ Simple language to construct a response message.
[source,java]
--
- from("spark-rest:get:/hello/*/to/*")
-.transform().simple("Bye big ${header.splat[1]} from ${header.splat[0]}");
+from("spark-rest:get:/hello/*/to/*")
+ .transform().simple("Bye big ${header.splat[1]} from ${header.splat[0]}");
--
-### Rest DSL
+=== Rest DSL
Apache Camel provides a new Rest DSL that allow to define the REST
services in a nice REST style. For example we can define a REST hello
@@ -151,44 +151,35 @@ service as shown below:
[source,java]
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
-rest("/hello/{me}").get()
-.route().transform().simple("Bye ${header.me}");
-}
-};
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+ rest("/hello/{me}").get()
+ .route().transform().simple("Bye ${header.me}");
+ }
+ };
[source,xml]
--
- http://camel.apache.org/schema/spring";>
-
-
-
-
-Bye ${header.me}
-
-
-
-
-
+http://camel.apache.org/schema/spring";>
+
+
+
+
+ Bye ${header.me}
+
+
+
+
+
--
See more details at the Rest DSL.
-### More examples
+=== More examples
There is a *camel-example-spark-rest-tomcat* example in the Apache Camel
distribution, that demonstrates how to use camel-spark-rest in a web
application that can be deployed on Apache Tomcat, or similar web
containers.
-
-### See Also
-
-* Configuring Camel
-* Component
-* Endpoint
-* Getting Started
-
-* <>
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
[camel] branch master updated: Polished docs for camel-wordpress
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6dde5ba Polished docs for camel-wordpress
6dde5ba is described below
commit 6dde5ba464cb6cc7138bc7b456f7ebebf0d8a789
Author: Claus Ibsen
AuthorDate: Tue Jan 30 10:18:14 2018 +0100
Polished docs for camel-wordpress
---
.../src/main/docs/wordpress-component.adoc | 45 +++---
.../component/wordpress/WordpressEndpoint.java | 4 +-
components/readme.adoc | 2 +-
.../WordpressComponentConfiguration.java | 2 +-
4 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/components/camel-wordpress/src/main/docs/wordpress-component.adoc
b/components/camel-wordpress/src/main/docs/wordpress-component.adoc
index a8d98f8..73b6ffb 100644
--- a/components/camel-wordpress/src/main/docs/wordpress-component.adoc
+++ b/components/camel-wordpress/src/main/docs/wordpress-component.adoc
@@ -1,31 +1,12 @@
== Wordpress Component
-*Available as of Camel version 2.20.1*
+*Available as of Camel version 2.21*
Camel component for
https://developer.wordpress.org/rest-api/reference/[Wordpress API].
-=== Usage
-
Currently only the **Posts** and **Users** operations are supported.
- Configure your route
-
-The `WordpressConfiguration` class can be used to set initial properties
configuration to the component instead of passing it as query parameter. The
following listing shows how to set the component to be used in your routes.
-
-[source,java]
---
-public void configure() {
-final WordpressConfiguration configuration = new WordpressConfiguration();
-final WordpressComponent component = new WordpressComponent();
-configuration.setApiVersion("2");
-configuration.setUrl("http://yoursite.com/wp-json/";);
-component.setConfiguration(configuration);
-getContext().addComponent("wordpress", component);
-
-from("wordpress:post?id=1")
- .to("mock:result");
-}
---
+=== Options
// component options: START
The Wordpress component supports 2 options which are listed below.
@@ -80,10 +61,28 @@ with the following path and query parameters:
Most of parameters needed when performing a read operation mirrors from the
official https://developer.wordpress.org/rest-api/reference/[API]. When
performing searches operations, the `criteria.` suffix is needed. Take the
following `Consumer` as example:
--
+
wordpress:post?criteria.perPage=10&criteria.orderBy=author&criteria.categories=camel,dozer,json
--
+
+ Configuring Wordpress component
+
+The `WordpressConfiguration` class can be used to set initial properties
configuration to the component instead of passing it as query parameter. The
following listing shows how to set the component to be used in your routes.
+
+[source,java]
+
+public void configure() {
+final WordpressConfiguration configuration = new WordpressConfiguration();
+final WordpressComponent component = new WordpressComponent();
+configuration.setApiVersion("2");
+configuration.setUrl("http://yoursite.com/wp-json/";);
+component.setConfiguration(configuration);
+getContext().addComponent("wordpress", component);
+
+from("wordpress:post?id=1")
+ .to("mock:result");
+}
+
Consumer Example
diff --git
a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java
b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java
index 77af980..a6fe780 100644
---
a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java
+++
b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/WordpressEndpoint.java
@@ -41,9 +41,9 @@ import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
/**
- * Represents a Wordpress endpoint.
+ * Integrates Camel with Wordpress.
*/
-@UriEndpoint(firstVersion = "2.20.1", scheme = "wordpress", title =
"Wordpress", syntax = "wordpress:operation", label = "Wordpress")
+@UriEndpoint(firstVersion = "2.21.0", scheme = "wordpress", title =
"Wordpress", syntax = "wordpress:operation", label = "cms")
public class WordpressEndpoint extends DefaultEndpoint {
public static final String ENDPOINT_SERVICE_POST = "post, user";
diff --git a/components/readme.adoc b/components/readme.adoc
index d3b6e6a..4d1b980 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -843,7 +843,7 @@ Number of Components: 290 in 199 JAR artifacts (19
deprecated)
`weather:name` | 2.12 |
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 3ad257c Polished
3ad257c is described below
commit 3ad257cb36631d08b807833f006b23dd739f
Author: Claus Ibsen
AuthorDate: Mon Jan 15 14:00:32 2018 +0100
Polished
---
examples/camel-example-kafka/README.adoc | 19 +++
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/examples/camel-example-kafka/README.adoc
b/examples/camel-example-kafka/README.adoc
index 25e32e3..d1f35cb 100644
--- a/examples/camel-example-kafka/README.adoc
+++ b/examples/camel-example-kafka/README.adoc
@@ -1,6 +1,6 @@
-# Camel Kafka example
+= Camel Kafka example
-### Introduction
+=== Introduction
An example which shows how to integrate Camel with Kakfa.
@@ -11,7 +11,7 @@ This project consists of the following examples:
3. Topic is sent in the header as well as in the URL.
-### Preparing Kafka
+=== Preparing Kafka
This example requires that Kafka Server is up and running.
@@ -34,31 +34,27 @@ On linux run
$ ${KAFKA}/bin/kafka-topics.sh --create --zookeeper : --replication-factor 1 --partitions 1 --topic AccessLog
-### Build
+=== Build
You will need to compile this example first:
$ mvn compile
-### Run
+=== Run
Run the consumer first in separate shell
-
$ mvn compile exec:java -Pkafka-consumer
-
Run the message producer in the seperate shell
-
$ mvn compile exec:java -Pkafka-producer
Initially, some messages are sent programmatically.
On the command prompt, type the messages. Each line is sent as one message to
kafka
Press `Ctrl-C` to exit.
-
-### Configuration
+=== Configuration
You can configure the details in the file:
`src/main/resources/application.properties`
@@ -66,8 +62,7 @@ You can configure the details in the file:
You can enable verbose logging by adjusting the
`src/main/resources/log4j2.properties`
file as documented in the file.
-
-### Forum, Help, etc
+=== Forum, Help, etc
If you hit an problems please let us know on the Camel Forums
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" '].
