[camel] branch master updated: Fixed CS for Camel-Nats
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 7d61923 Fixed CS for Camel-Nats
7d61923 is described below
commit 7d61923e65a32cb5d9091364ad1b68a5c5180bca
Author: Andrea Cosentino
AuthorDate: Wed Jan 23 08:56:36 2019 +0100
Fixed CS for Camel-Nats
---
.../src/main/java/org/apache/camel/component/nats/NatsComponent.java| 2 +-
.../src/main/java/org/apache/camel/component/nats/NatsEndpoint.java | 2 +-
.../test/java/org/apache/camel/component/nats/NatsProducerTLSTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
index a5e45c2..bd76619 100644
---
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
+++
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
@@ -20,9 +20,9 @@ import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.SSLContextParametersAware;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.spi.Metadata;
@Component("nats")
public class NatsComponent extends DefaultComponent implements
SSLContextParametersAware {
diff --git
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsEndpoint.java
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsEndpoint.java
index 13dbaa6..44a6868 100644
---
a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsEndpoint.java
+++
b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsEndpoint.java
@@ -30,9 +30,9 @@ import io.nats.client.Options.Builder;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
+import org.apache.camel.support.DefaultEndpoint;
/**
* The nats component allows you produce and consume messages from http://nats.io/";>NATS.
diff --git
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTLSTest.java
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTLSTest.java
index a63bd19..8ab348c 100644
---
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTLSTest.java
+++
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsProducerTLSTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.nats;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.support.jsse.KeyManagersParameters;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
import org.junit.Test;
[camel] branch master updated: CAMEL-13002 - OSGi Metadata for camel-directvm
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 04113f8 CAMEL-13002 - OSGi Metadata for camel-directvm
04113f8 is described below
commit 04113f8d0a4043fe9e679ea7dd2863821c057aa5
Author: Andrea Cosentino
AuthorDate: Wed Jan 23 08:52:15 2019 +0100
CAMEL-13002 - OSGi Metadata for camel-directvm
---
components/camel-directvm/pom.xml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/components/camel-directvm/pom.xml
b/components/camel-directvm/pom.xml
index ad76302..9503690 100644
--- a/components/camel-directvm/pom.xml
+++ b/components/camel-directvm/pom.xml
@@ -34,6 +34,12 @@
Camel Direct VM component
+
+ ${camel.osgi.import.defaults},
+ *
+
+
org.apache.camel.component.directvm.*
+
org.apache.camel.spi.ComponentResolver;component=direct-vm
[camel] branch master updated: Fixed CS for Camel-Nagios
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 54a90b0 Fixed CS for Camel-Nagios
54a90b0 is described below
commit 54a90b03664712d7b2895cecaf983e9baf748f3b
Author: Andrea Cosentino
AuthorDate: Wed Jan 23 08:36:00 2019 +0100
Fixed CS for Camel-Nagios
---
.../main/java/org/apache/camel/component/nagios/NagiosComponent.java| 2 +-
.../src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java | 2 +-
.../java/org/apache/camel/component/nagios/NagiosEventNotifier.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java
index 6fa562b..70f7193 100644
---
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java
+++
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java
@@ -20,9 +20,9 @@ import java.net.URI;
import java.util.Map;
import org.apache.camel.Endpoint;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.spi.Metadata;
import org.apache.camel.util.ObjectHelper;
@Component("nagios")
diff --git
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
index 9dbfd82..2204ba7 100644
---
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
+++
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
@@ -23,9 +23,9 @@ import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
+import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.util.ObjectHelper;
/**
diff --git
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
index 801c5f0..3200342 100644
---
a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
+++
b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
@@ -21,6 +21,7 @@ import com.googlecode.jsendnsca.MessagePayload;
import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
import com.googlecode.jsendnsca.NagiosSettings;
import com.googlecode.jsendnsca.PassiveCheckSender;
+import org.apache.camel.spi.CamelEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartupFailureEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStopFailureEvent;
import org.apache.camel.spi.CamelEvent.ExchangeFailedEvent;
@@ -28,7 +29,6 @@ import
org.apache.camel.spi.CamelEvent.ExchangeFailureHandledEvent;
import org.apache.camel.spi.CamelEvent.ExchangeRedeliveryEvent;
import org.apache.camel.spi.CamelEvent.ServiceStartupFailureEvent;
import org.apache.camel.spi.CamelEvent.ServiceStopFailureEvent;
-import org.apache.camel.spi.CamelEvent;
import org.apache.camel.support.EventNotifierSupport;
/**
[camel] branch master updated: Regen
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 0271572 Regen
0271572 is described below
commit 02715729662e471b22f58c8346039d2ca8169a31
Author: Andrea Cosentino
AuthorDate: Wed Jan 23 08:29:48 2019 +0100
Regen
---
bom/camel-bom/pom.xml | 10 ++
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ++
2 files changed, 20 insertions(+)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 25840ae..9279698 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -569,6 +569,16 @@
org.apache.camel
+camel-dataformat
+${project.version}
+
+
+org.apache.camel
+camel-dataformat-starter
+${project.version}
+
+
+org.apache.camel
camel-digitalocean
${project.version}
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index f560cd5..6332084 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -779,6 +779,16 @@
org.apache.camel
+camel-dataformat
+${project.version}
+
+
+org.apache.camel
+camel-dataformat-starter
+${project.version}
+
+
+org.apache.camel
camel-digitalocean
${project.version}
[camel] branch master updated: CAMEL-13103 - camel-consul-starter - Some weird compile error now
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 2596b18 CAMEL-13103 - camel-consul-starter - Some weird compile error
now
2596b18 is described below
commit 2596b188a6351cecf39bcf09ebb8626cab473055
Author: Andrea Cosentino
AuthorDate: Wed Jan 23 08:00:59 2019 +0100
CAMEL-13103 - camel-consul-starter - Some weird compile error now
---
.../spring-boot/components-starter/camel-consul-starter/pom.xml | 6 ++
1 file changed, 6 insertions(+)
diff --git
a/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml
index 21382bf..16bc835 100644
--- a/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml
@@ -39,6 +39,12 @@
camel-consul
${project.version}
+
+ org.apache.camel
+ spi-annotations
+ ${project.version}
+ provided
+
org.apache.camel
[camel] branch master updated: Add checkstyle separated property (#2727)
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 58635b2 Add checkstyle separated property (#2727) 58635b2 is described below commit 58635b21f296f179ec60f7fec7924dc85d267cd9 Author: Denis Istomin AuthorDate: Wed Jan 23 11:34:29 2019 +0500 Add checkstyle separated property (#2727) --- buildingtools/camel-checkstyle.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/buildingtools/camel-checkstyle.xml b/buildingtools/camel-checkstyle.xml index 9f1bf38..dcb47fe 100644 --- a/buildingtools/camel-checkstyle.xml +++ b/buildingtools/camel-checkstyle.xml @@ -112,6 +112,7 @@ lengths, if/try depths, etc... +
[camel] branch master updated (d2cd8a7 -> 7070b00)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from d2cd8a7 CAMEL-13100 - Regen
new d1fcea1 CAMEL-13102: Move camel-dataformat out of camel-core
new 10f773c CAMEL-13102: Move camel-dataformat out of camel-core
new e1c9da8 CAMEL-13102: Move camel-dataformat out of camel-core
new 18af3bb Regen
new 96c4a6c Regen
new ea58ff9 CAMEL-13102: Move camel-dataformat out of camel-core
new af0daf9 Polished
new e5a3264 CAMEL-13102: Move camel-dataformat out of camel-core
new 7070b00 CAMEL-13102: Move camel-dataformat out of camel-core
The 34879 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-camel/pom.xml | 10
apache-camel/src/main/descriptors/common-bin.xml | 6 ++-
camel-base/pom.xml | 2 +-
camel-core/pom.xml | 5 ++
camel-core/readme.adoc | 5 +-
.../rest/RestProducerBindingProcessor.java | 4 +-
.../apache/camel/processor/RestBindingAdvice.java | 2 +
.../org/apache/camel/reifier/MarshalReifier.java | 2 +-
.../org/apache/camel/reifier/UnmarshalReifier.java | 2 +-
.../camel/processor/UnmarshalProcessorTest.java| 1 +
.../DefaultManagementObjectStrategy.java | 5 +-
.../camel/management/mbean/ManagedMarshal.java | 2 +-
.../camel/management/mbean/ManagedUnmarshal.java | 2 +-
.../stream/ByteArrayInputStreamCache.java | 0
.../stream/CachedByteArrayOutputStream.java| 0
.../camel/converter/stream/CachedOutputStream.java | 0
.../apache/camel/converter/stream/CipherPair.java | 0
.../converter/stream/FileInputStreamCache.java | 0
.../camel/converter/stream/InputStreamCache.java | 0
.../converter/stream/OutputStreamBuilder.java | 2 +
.../apache/camel/converter/stream/ReaderCache.java | 0
.../apache/camel/converter/stream/SourceCache.java | 0
.../converter/stream/StreamCacheConverter.java | 0
.../camel/converter/stream/StreamSourceCache.java | 0
.../org/apache/camel/converter/stream/package.html | 0
.../camel/support}/processor/MarshalProcessor.java | 2 +-
.../support}/processor/UnmarshalProcessor.java | 2 +-
.../camel-csv/src/main/docs/csv-dataformat.adoc| 4 +-
.../camel-dataformat}/pom.xml | 62 --
.../src/main/docs/dataformat-component.adoc| 0
.../component/dataformat/DataFormatComponent.java | 0
.../component/dataformat/DataFormatEndpoint.java | 4 +-
.../apache/camel/component/dataformat/package.html | 0
.../camel/component/dozer/DozerProducer.java | 4 +-
components/pom.xml | 1 +
components/readme.adoc | 4 +-
docs/components/modules/ROOT/nav.adoc | 1 +
.../modules/ROOT/pages/csv-dataformat.adoc | 4 +-
.../modules/ROOT/pages}/dataformat-component.adoc | 0
parent/pom.xml | 10
.../karaf/features/src/main/resources/features.xml | 1 +
.../csv/springboot/CsvDataFormatConfiguration.java | 4 +-
.../camel-dataformat-starter/pom.xml | 53 ++
.../DataFormatComponentAutoConfiguration.java | 0
.../DataFormatComponentConfiguration.java | 0
.../src/main/resources/META-INF/LICENSE.txt| 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 19 +++
.../src/main/resources/META-INF/spring.provides| 17 ++
platforms/spring-boot/components-starter/pom.xml | 1 +
50 files changed, 187 insertions(+), 56 deletions(-)
rename {camel-base =>
camel-support}/src/main/java/org/apache/camel/converter/stream/ByteArrayInputStreamCache.java
(100%)
rename {camel-base =>
camel-support}/src/main/java/org/apache/camel/converter/stream/CachedByteArrayOutputStream.java
(100%)
rename {camel-base =>
camel-support}/src/main/java/org/apache/camel/converter/stream/CachedOutputStream.java
(100%)
rename {camel-base =>
camel-support}/src/main/java/org/apache/camel/converter/stream/CipherPair.java
(100%)
rename {camel-base =>
camel-support}/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
(100%)
rename {camel-base =>
camel-support}/src/main/java/org/apache/camel/converter/stream/InputStreamCache.java
(100%)
rename {camel-base =>
camel-support}/src/main/java/org/apache/camel/converter/stream/OutputStreamBuilder.java
(96%)
rename {camel-base =>
camel-support}/src/main/java/org/apache/camel/converter/stream/ReaderCache.java
(100%)
rename {camel-base =>
camel-suppo
[camel-k] branch nicolaferraro-patch-1 created (now 210d239)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch nicolaferraro-patch-1 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 210d239 chore(release): add publisher to makefile This branch includes the following new commits: new 55fca8e This is Apache Camel K new 62b4354 Scaffolding project structure new bfca1f2 Add license headers new 8661409 Initial draft of local build system new c3d39e6 First e2e working version new f42dedf Detect changes with digest and redeploy new ce21143 Added kamel binary new ae2a059 Renaming binaries and adding code generation new 6275a0c kamel run Sample.java works new d7cefab Adding JVM runtime new 1832a12 Fix JVM runtime references new f71e202 Add support for .js, .java and classes new 5845d92 Merge pull request #1 from lburgazzoli/scripting new 76f8bd9 Add bash completion new b045295 Refactor maven builder into its own module new fef7130 Fix integration with new runtime classes new 9c3d3c1 Merge pull request #2 from lburgazzoli/completion new 2ce3c24 swith to full in-memory java compiler and some minro cleanup new 09b2624 Merge pull request #3 from lburgazzoli/compile-java new a4b7717 Added Property placeholder for commons-lang3 version new 446e3d1 Merge pull request #5 from apache/cl3-version new 1ca5606 refactor client cmd to be more cobra compliant new c96e433 use os/user to determine user home new 17c6684 Add get and detection of current namespace new f19195f Remove unused code new d827ed2 Add kamel install (docker image still incomplete) new 5b3bf76 Fix rebase errors new 4f65095 Fix operator role to have lower privileges than the standard user new 07b5758 Standardize command options new 587e235 Use https instead of git for github.com/nicolaferraro/operator-sdk.git source new 15a0210 Added build documentation. new b97bf5f Update readme fix typos new 97eee36 Merge pull request #12 from apache/onderson-patch-1 new d3041ce Dep version Readme new c7f6990 Merge pull request #15 from apache/dep-version-readme new eeaf11d README update new 2c743bb Merge pull request #16 from apache/pr-test new 7c57c49 add clean and dep target to Makefile new dd3eafa apply go fmt new b62b092 remove import alias and fix naming new 4b59b14 Installation and run works new 8c40967 Merge pull request #18 from nicolaferraro/master new 9851138 runtime: add support for groovy new ac3008c Add getting started guide new c83fffa Add labels to all resources new 66d282c CAMEL-12789: complete install command new 3a8be01 Changed log message in Sample.java in order to really rocks! new 45c7e9f Add label to operator service new 2c0b6bf Add uninstall command new ab51a14 initial code for integration context new ff672fb Fix typo in print integration context new b00ac4e generate pom using go's xml encoder new bff423d Bump Camel to version 2.22.1 new 0fc767a Adding contributing guide new 15cd1e5 Fix typos in contributing guide new 8ce6226 add support for non java integrations new d8bfcac Route loaders should derive language from 'kamel run --language' #46 new 19dc6d0 Support set integration name for kamel run new e42b5d8 Support set integration name for kamel run, sanitize the name new db677d6 Added dep new 0db195a Unable to reinstall the operator fixes #43 new 6d61e5c kamel run should support adding dependencies #49 new c194b5a Store integration code in a configmap #54 new c2840db Add a flag to wait until the integration is running new 51294e5 Set this unuseful file to something that will not change new aa45c71 Allow buildless direct deploy #31 new 784e581 Add CRD aliases new b97541a kamel run runtime/examples/Sample.java fails with java.lang.NoClassDefFoundError #57 new 5c03a35 Fix tests and add release scripts up to cross-compilation new 3ba8d5b Fix integration tests new 3676bb5 Support for properties #62 new 1b89b01 Support for environment variables #65 new 99f8129 Support for configmap and secrets #67 new ea382b1 Add support for XML routes #70 new eeef530 Fix release scripts new 80d1cf3 Update release with git tag step new 5efc8a9 Add command to increment version new 0e429c0 Push snapshot to docker hub when making a new version new a4d9ab4 Bump version to 0.0.2-SNAPSHOT new e417081 fix bug preventint integration to run new 8517c33 jvm: improve language detection new f2717d0 Context handling improvement new dc17a2d chore(kamel): fix completion generation new 864ffae fix findings new 497afdf chore(cobra): supoport zsh completion new
[camel] branch master updated (637814b -> d2cd8a7)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 637814b [CAMEL-13002] OSGi metadata
new 0ec5a7a CAMEL-13100 - Move camel-browse out of camel-core
new 2ed7599 CAMEL-13100 - Move camel-browse out of camel-core
new d2cd8a7 CAMEL-13100 - Regen
The 34870 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-camel/pom.xml | 10 ++
apache-camel/src/main/descriptors/common-bin.xml | 2 ++
bom/camel-bom/pom.xml | 10 ++
camel-core/pom.xml | 5 +
camel-core/readme.adoc | 5 +
components/{camel-ref => camel-browse}/pom.xml | 6 +++---
.../camel-browse}/src/main/docs/browse-component.adoc | 0
.../org/apache/camel/component/browse/BrowseComponent.java | 0
.../java/org/apache/camel/component/browse/BrowseEndpoint.java | 0
.../main/java/org/apache/camel/component/browse/package.html | 0
components/pom.xml | 1 +
components/readme.adoc | 4 ++--
docs/components/modules/ROOT/nav.adoc | 1 +
.../components/modules/ROOT/pages}/browse-component.adoc | 0
parent/pom.xml | 10 ++
.../{camel-avro-starter => camel-browse-starter}/pom.xml | 8
.../browse/springboot/BrowseComponentAutoConfiguration.java| 0
.../browse/springboot/BrowseComponentConfiguration.java| 0
.../src/main/resources/META-INF/LICENSE.txt| 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/META-INF/spring.provides| 2 +-
platforms/spring-boot/components-starter/pom.xml | 1 +
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ++
24 files changed, 62 insertions(+), 15 deletions(-)
copy components/{camel-ref => camel-browse}/pom.xml (98%)
copy {camel-core =>
components/camel-browse}/src/main/docs/browse-component.adoc (100%)
rename {camel-core =>
components/camel-browse}/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
(100%)
rename {camel-core =>
components/camel-browse}/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
(100%)
rename {camel-core =>
components/camel-browse}/src/main/java/org/apache/camel/component/browse/package.html
(100%)
rename {camel-core/src/main/docs =>
docs/components/modules/ROOT/pages}/browse-component.adoc (100%)
copy platforms/spring-boot/components-starter/{camel-avro-starter =>
camel-browse-starter}/pom.xml (90%)
copy platforms/spring-boot/components-starter/{camel-core-starter =>
camel-browse-starter}/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java
(100%)
copy platforms/spring-boot/components-starter/{camel-core-starter =>
camel-browse-starter}/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentConfiguration.java
(100%)
copy {tooling/maven/camel-package-maven-plugin =>
platforms/spring-boot/components-starter/camel-browse-starter}/src/main/resources/META-INF/LICENSE.txt
(100%)
copy {tooling/maven/camel-package-maven-plugin =>
platforms/spring-boot/components-starter/camel-browse-starter}/src/main/resources/META-INF/NOTICE.txt
(100%)
copy platforms/spring-boot/components-starter/{camel-direct-starter =>
camel-browse-starter}/src/main/resources/META-INF/spring.factories (94%)
copy platforms/spring-boot/components-starter/{camel-ahc-starter =>
camel-browse-starter}/src/main/resources/META-INF/spring.provides (97%)
[camel] branch master updated (b870eeb -> 637814b)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b870eeb CAMEL-13026: Polished Closes #2705
new 526d4aa Move service helper classes into a separate package to avoid
split packages for OSGi
new a56c550 Move some classes around
new 637814b [CAMEL-13002] OSGi metadata
The 34867 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-api/pom.xml | 17 +
.../main/java/org/apache/camel/Suspendable.java| 4 +-
.../java/org/apache/camel/spi/Transformer.java | 2 +-
.../main/java/org/apache/camel/spi/Validator.java | 2 +-
.../camel/support/{ => service}/ServiceHelper.java | 2 +-
.../support/{ => service}/ServiceSupport.java | 2 +-
camel-base/pom.xml | 21 +
.../apache/camel}/cloud/ServiceCallConstants.java | 2 +-
.../camel/cloud}/ServiceCallExpressionSupport.java | 6 +-
.../impl/converter/BaseTypeConverterRegistry.java | 2 +-
.../impl/health/DefaultHealthCheckService.java | 2 +-
.../camel/impl/saga/InMemorySagaService.java | 2 +-
.../camel/impl/validator/ProcessorValidator.java | 2 +-
.../throttling/ThrottlingInflightRoutePolicy.java | 2 +-
camel-core/pom.xml | 42 +-
.../builder/DefaultFluentProducerTemplate.java | 4 +-
.../apache/camel/builder/ExpressionBuilder.java| 4 -
.../org/apache/camel/builder/NotifyBuilder.java| 2 +-
.../RecordableInputStream.java | 2 +-
.../{support => builder}/RecordableReader.java | 2 +-
.../camel/{support => builder}/ScriptHelper.java | 3 +-
.../org/apache/camel/builder/SimpleBuilder.java| 1 -
.../TokenPairExpressionIterator.java | 6 +-
.../TokenXMLExpressionIterator.java| 4 +-
.../XMLTokenExpressionIterator.java| 4 +-
.../camel/builder/XsltAggregationStrategy.java | 2 +-
.../org/apache/camel/builder/xml/XPathBuilder.java | 2 +-
.../component/bean/AbstractBeanProcessor.java | 2 +-
.../apache/camel/component/bean/BeanProcessor.java | 2 +-
.../apache/camel/component/bean/BeanProducer.java | 2 +-
.../apache/camel/component/bean/MethodInfo.java| 2 +-
.../camel/component/bean/PojoProxyHelper.java | 2 +-
.../component/dataformat/DataFormatEndpoint.java | 2 +-
.../camel/component/file/GenericFileConsumer.java | 2 +-
.../camel/component/file/GenericFileEndpoint.java | 2 +-
.../component/file/GenericFilePollingConsumer.java | 2 +-
.../camel/component/file/GenericFileProducer.java | 2 +-
...dempotentChangedRepositoryReadLockStrategy.java | 2 +-
...IdempotentRenameRepositoryReadLockStrategy.java | 2 +-
.../FileIdempotentRepositoryReadLockStrategy.java | 2 +-
.../GenericFileProcessStrategySupport.java | 4 +-
.../camel/component/rest/RestApiProducer.java | 2 +-
.../apache/camel/component/rest/RestProducer.java | 2 +-
.../rest/RestProducerBindingProcessor.java | 2 +-
.../component/validator/ValidatorProducer.java | 2 +-
.../apache/camel/component/xslt/XsltEndpoint.java | 2 +-
.../apache/camel/impl/AbstractCamelContext.java| 4 +-
.../apache/camel/impl/AbstractDynamicRegistry.java | 2 +-
.../camel/impl/CamelPostProcessorHelper.java | 2 +-
.../impl/DefaultAsyncProcessorAwaitManager.java| 4 +-
.../apache/camel/impl/DefaultConsumerCache.java| 4 +-
.../apache/camel/impl/DefaultConsumerTemplate.java | 4 +-
.../org/apache/camel/impl/DefaultDebugger.java | 6 +-
.../camel/impl/DefaultExecutorServiceManager.java | 2 +-
.../camel/impl/DefaultInflightRepository.java | 4 +-
.../camel/impl/DefaultManagementStrategy.java | 4 +-
.../impl/DefaultPackageScanClassResolver.java | 2 +-
.../apache/camel/impl/DefaultProducerCache.java| 4 +-
.../apache/camel/impl/DefaultProducerTemplate.java | 4 +-
.../org/apache/camel/impl/DefaultRestRegistry.java | 2 +-
.../java/org/apache/camel/impl/DefaultRoute.java | 2 +-
.../apache/camel/impl/DefaultRouteController.java | 2 +-
.../camel/impl/DefaultRuntimeEndpointRegistry.java | 2 +-
.../apache/camel/impl/DefaultShutdownStrategy.java | 4 +-
.../camel/impl/DefaultStreamCachingStrategy.java | 4 +-
.../java/org/apache/camel/impl/DeferProducer.java | 5 +-
.../camel/impl/DeferServiceStartupListener.java| 2 +-
.../org/apache/camel/impl/FileStateRepository.java | 2 +-
.../camel/impl/FileWatcherReloadStrategy.java | 3 +-
.../java/org/apache/camel/impl/GzipDataFormat.java | 3 +-
.../apache/camel/impl/InterceptSendToEndpoint.java | 2
[camel] 02/04: [CAMEL-13026] Using 'ObjectHelper.notNull' as suggested
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f0a0d1b79524c998818cde9179b4caa506d2bf77
Author: Christian Ribeaud
AuthorDate: Thu Jan 10 10:17:56 2019 +0100
[CAMEL-13026] Using 'ObjectHelper.notNull' as suggested
---
.../src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java | 4
.../java/org/apache/camel/dataformat/csv/CsvMarshallerFactory.java| 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
index 648cb4a..d2fee61 100644
---
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
+++
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
@@ -51,6 +51,8 @@ public abstract class CsvMarshaller {
* @return New instance
*/
public static CsvMarshaller create(CSVFormat format, CsvDataFormat
dataFormat) {
+org.apache.camel.util.ObjectHelper.notNull(format, "CSV format");
+org.apache.camel.util.ObjectHelper.notNull(dataFormat, "CSV data
format");
// If we don't want the header record, clear it
if (format.getSkipHeaderRecord()) {
format = format.withHeader((String[]) null);
@@ -93,6 +95,8 @@ public abstract class CsvMarshaller {
* @return a new {@link CSVPrinter}. Never null.
*/
protected CSVPrinter createPrinter(Exchange exchange, OutputStream
outputStream) throws IOException {
+org.apache.camel.util.ObjectHelper.notNull(exchange, "Exchange");
+org.apache.camel.util.ObjectHelper.notNull(outputStream, "Output
stream");
return new CSVPrinter(new OutputStreamWriter(outputStream,
ExchangeHelper.getCharsetName(exchange)), format);
}
diff --git
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshallerFactory.java
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshallerFactory.java
index e88db04..c206164 100644
---
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshallerFactory.java
+++
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshallerFactory.java
@@ -35,7 +35,7 @@ public interface CsvMarshallerFactory {
*
* @param format the CSV format. Can NOT be null.
* @param dataFormat the CSV data format. Can NOT be
null.
- * @return a new {@link CsvMarshaller}.
+ * @return a new {@link CsvMarshaller}. Never null.
*/
CsvMarshaller create(CSVFormat format, CsvDataFormat dataFormat);
}
[camel] 01/04: [CAMEL-13026] Add 'CsvMarshallerFactory' and corresponding tests
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ba75f65a66c10f05a860620c00531c7f1080f132
Author: Christian Ribeaud
AuthorDate: Wed Jan 9 22:08:07 2019 +0100
[CAMEL-13026] Add 'CsvMarshallerFactory' and corresponding tests
---
.../apache/camel/dataformat/csv/CsvDataFormat.java | 25 +++-
.../apache/camel/dataformat/csv/CsvMarshaller.java | 19 ++-
.../camel/dataformat/csv/CsvMarshallerFactory.java | 41 ++
.../camel/dataformat/csv/CsvMarshalHeaderTest.java | 109 +++
...MarshalHeaderWithCustomMarshallFactoryTest.java | 153 +
5 files changed, 342 insertions(+), 5 deletions(-)
diff --git
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
index e9bee40..db19351 100644
---
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
+++
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
@@ -69,6 +69,8 @@ public class CsvDataFormat extends ServiceSupport implements
DataFormat, DataFor
private boolean useOrderedMaps;
private CsvRecordConverter recordConverter;
+private CsvMarshallerFactory marshallerFactory =
CsvMarshallerFactory.DEFAULT;
+
private volatile CsvMarshaller marshaller;
private volatile CsvUnmarshaller unmarshaller;
@@ -94,7 +96,7 @@ public class CsvDataFormat extends ServiceSupport implements
DataFormat, DataFor
@Override
protected void doStart() throws Exception {
-marshaller = CsvMarshaller.create(getActiveFormat(), this);
+marshaller = marshallerFactory.create(getActiveFormat(), this);
unmarshaller = CsvUnmarshaller.create(getActiveFormat(), this);
}
@@ -208,6 +210,27 @@ public class CsvDataFormat extends ServiceSupport
implements DataFormat, DataFor
}
/**
+ * Sets the {@link CsvMarshaller} factory.
+ * If {@code null}, then {@link CsvMarshallerFactory#DEFAULT} is used
instead.
+ *
+ * @param marshallerFactory
+ * @return Current {@code CsvDataFormat}, fluent API
+ */
+public CsvDataFormat setMarshallerFactory(CsvMarshallerFactory
marshallerFactory) {
+this.marshallerFactory = (marshallerFactory == null) ?
CsvMarshallerFactory.DEFAULT : marshallerFactory;
+return this;
+}
+
+/**
+ * Returns the used {@link CsvMarshallerFactory}.
+ *
+ * @return never {@code null}.
+ */
+public CsvMarshallerFactory getMarshallerFactory() {
+return marshallerFactory;
+}
+
+/**
* Sets the CSV format by name before applying any changes.
*
* @param name CSV format name
diff --git
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
index 5c5ad70..648cb4a 100644
---
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
+++
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
@@ -28,18 +28,18 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.support.ExchangeHelper;
-import org.apache.camel.util.IOHelper;
import org.apache.camel.support.ObjectHelper;
+import org.apache.camel.util.IOHelper;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
/**
* This class marshal data into a CSV format.
*/
-abstract class CsvMarshaller {
+public abstract class CsvMarshaller {
private final CSVFormat format;
-private CsvMarshaller(CSVFormat format) {
+protected CsvMarshaller(CSVFormat format) {
this.format = format;
}
@@ -73,7 +73,7 @@ abstract class CsvMarshaller {
* @throws IOExceptionif we cannot write into the
given stream
*/
public void marshal(Exchange exchange, Object object, OutputStream
outputStream) throws NoTypeConversionAvailableException, IOException {
-CSVPrinter printer = new CSVPrinter(new
OutputStreamWriter(outputStream, ExchangeHelper.getCharsetName(exchange)),
format);
+CSVPrinter printer = createPrinter(exchange, outputStream);
try {
Iterator it = ObjectHelper.createIterator(object);
while (it.hasNext()) {
@@ -85,6 +85,17 @@ abstract class CsvMarshaller {
}
}
+/**
+ * Creates and returns a {@link CSVPrinter}.
+ *
+ * @param exchange Exchange (used for access to type conversion).
Could NOT be null.
+ * @param outputStream Output stream of the CSV. Could NOT be
null.
+ * @return a new {@link CSVPrinter}. Never null.
+ */
+protected CSVPrinter createPrinter
[camel] branch master updated (723870b -> b870eeb)
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 723870b camel3 - controlbus component should use public camel-api
new ba75f65 [CAMEL-13026] Add 'CsvMarshallerFactory' and corresponding
tests
new f0a0d1b [CAMEL-13026] Using 'ObjectHelper.notNull' as suggested
new a32d44e Adapt documentation and add possibility to set the marshaller
factory in 'camel-core'
new b870eeb CAMEL-13026: Polished Closes #2705
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/model/dataformat/CsvDataFormat.java | 25
.../camel-csv/src/main/docs/csv-dataformat.adoc| 4 +-
.../apache/camel/dataformat/csv/CsvDataFormat.java | 25 +++-
.../apache/camel/dataformat/csv/CsvMarshaller.java | 24 +++-
...ordConverter.java => CsvMarshallerFactory.java} | 29 ++--
.../camel/dataformat/csv/CsvMarshalHeaderTest.java | 109 +++
...MarshalHeaderWithCustomMarshallFactoryTest.java | 154 +
.../modules/ROOT/pages/csv-dataformat.adoc | 4 +-
.../csv/springboot/CsvDataFormatConfiguration.java | 12 ++
9 files changed, 366 insertions(+), 20 deletions(-)
copy
components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/{CsvRecordConverter.java
=> CsvMarshallerFactory.java} (55%)
create mode 100644
components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderTest.java
create mode 100644
components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java
[camel] 03/04: Adapt documentation and add possibility to set the marshaller factory in 'camel-core'
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a32d44eaae3a908306dc6a4d2cdf64744b5b440a
Author: Christian Ribeaud
AuthorDate: Mon Jan 21 10:13:30 2019 +0100
Adapt documentation and add possibility to set the marshaller factory in
'camel-core'
---
.../camel/model/dataformat/CsvDataFormat.java | 24 ++
.../camel-csv/src/main/docs/csv-dataformat.adoc| 4 +++-
.../modules/ROOT/pages/csv-dataformat.adoc | 2 ++
.../csv/springboot/CsvDataFormatConfiguration.java | 12 +++
4 files changed, 41 insertions(+), 1 deletion(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index ccc10ea..36e7406 100644
---
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -85,6 +85,8 @@ public class CsvDataFormat extends DataFormatDefinition {
private Boolean trim;
@XmlAttribute
private Boolean trailingDelimiter;
+@XmlAttribute
+private String marshallerFactoryRef;
// Unmarshall options
@XmlAttribute
@@ -197,6 +199,10 @@ public class CsvDataFormat extends DataFormatDefinition {
Object recordConverter =
CamelContextHelper.mandatoryLookup(camelContext, recordConverterRef);
setProperty(camelContext, dataFormat, "recordConverter",
recordConverter);
}
+if (ObjectHelper.isNotEmpty(marshallerFactoryRef)) {
+Object marshallerFactory =
CamelContextHelper.mandatoryLookup(camelContext, marshallerFactoryRef.trim());
+setProperty(camelContext, dataFormat, "marshallerFactory",
marshallerFactory);
+}
}
private static Character singleChar(String value, String attributeName) {
@@ -206,6 +212,24 @@ public class CsvDataFormat extends DataFormatDefinition {
return value.charAt(0);
}
+/**
+ * Sets the CsvMarshallerFactory reference.
+ *
+ * @param marshallerFactoryRef the CsvMarshallerFactory
reference. Could be null.
+ */
+public void setMarshallerFactoryRef(String marshallerFactoryRef) {
+this.marshallerFactoryRef = marshallerFactoryRef;
+}
+
+/**
+ * Returns the CsvMarshallerFactory reference.
+ *
+ * @return the CsvMarshallerFactory or null if
none has been specified.
+ */
+public String getMarshallerFactoryRef() {
+return marshallerFactoryRef;
+}
+
public String getFormatRef() {
return formatRef;
}
diff --git a/components/camel-csv/src/main/docs/csv-dataformat.adoc
b/components/camel-csv/src/main/docs/csv-dataformat.adoc
index 797..3a1253d 100644
--- a/components/camel-csv/src/main/docs/csv-dataformat.adoc
+++ b/components/camel-csv/src/main/docs/csv-dataformat.adoc
@@ -12,7 +12,7 @@ exported/imported by Excel.
### Options
// dataformat options: START
-The CSV dataformat supports 28 options, which are listed below.
+The CSV dataformat supports 29 options, which are listed below.
@@ -42,6 +42,7 @@ The CSV dataformat supports 28 options, which are listed
below.
| ignoreHeaderCase | false | Boolean | Sets whether or not to ignore case when
accessing header names.
| trim | false | Boolean | Sets whether or not to trim leading and trailing
blanks.
| trailingDelimiter | false | Boolean | Sets whether or not to add a trailing
delimiter.
+| marshallerFactoryRef | | String | Sets the `CsvMarshallerFactory` reference.
| lazyLoad | false | Boolean | Whether the unmarshalling should produce an
iterator that reads the lines on the fly or if all the lines must be read at
one.
| useMaps | false | Boolean | Whether the unmarshalling should produce maps
(HashMap)for the lines values instead of lists. It requires to have header
(either defined or collected).
| useOrderedMaps | false | Boolean | Whether the unmarshalling should produce
ordered maps (LinkedHashMap) for the lines values instead of lists. It requires
to have header (either defined or collected).
@@ -89,6 +90,7 @@ The component supports 29 options, which are listed below.
| *camel.dataformat.csv.trim* | Sets whether or not to trim leading and
trailing blanks. | false | Boolean
| *camel.dataformat.csv.use-maps* | Whether the unmarshalling should produce
maps (HashMap)for the lines values instead of lists. It requires to have header
(either defined or collected). | false | Boolean
| *camel.dataformat.csv.use-ordered-maps* | Whether the unmarshalling should
produce ordered maps (LinkedHashMap) for the lines values instead of lists. It
requires to have header (either defined or collected). | false | Boolean
+| *camel.dataformat.csv.marshaller-factory-ref* | Refers to a custom
`CsvMarshallerFactory` to lookup from the
[camel] 04/04: CAMEL-13026: Polished Closes #2705
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b870eeb55036d220d460db5cf21c123787973da6
Author: Dmitry Volodin
AuthorDate: Tue Jan 22 19:32:30 2019 +0300
CAMEL-13026: Polished
Closes #2705
---
.../main/java/org/apache/camel/model/dataformat/CsvDataFormat.java | 7 ---
components/camel-csv/src/main/docs/csv-dataformat.adoc | 2 +-
.../main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java | 1 +
.../csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java | 1 +
docs/components/modules/ROOT/pages/csv-dataformat.adoc | 4 ++--
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
index 36e7406..81c2c82 100644
---
a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
+++
b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
@@ -85,7 +85,7 @@ public class CsvDataFormat extends DataFormatDefinition {
private Boolean trim;
@XmlAttribute
private Boolean trailingDelimiter;
-@XmlAttribute
+@XmlAttribute @Metadata(label = "advanced")
private String marshallerFactoryRef;
// Unmarshall options
@@ -213,9 +213,10 @@ public class CsvDataFormat extends DataFormatDefinition {
}
/**
- * Sets the CsvMarshallerFactory reference.
+ * Sets the implementation of the CsvMarshallerFactory interface which is
able to customize marshalling/unmarshalling
+ * behavior by extending CsvMarshaller or creating it from scratch.
*
- * @param marshallerFactoryRef the CsvMarshallerFactory
reference. Could be null.
+ * @param marshallerFactoryRef the CsvMarshallerFactory
reference.
*/
public void setMarshallerFactoryRef(String marshallerFactoryRef) {
this.marshallerFactoryRef = marshallerFactoryRef;
diff --git a/components/camel-csv/src/main/docs/csv-dataformat.adoc
b/components/camel-csv/src/main/docs/csv-dataformat.adoc
index 3a1253d..8b4255f 100644
--- a/components/camel-csv/src/main/docs/csv-dataformat.adoc
+++ b/components/camel-csv/src/main/docs/csv-dataformat.adoc
@@ -42,7 +42,7 @@ The CSV dataformat supports 29 options, which are listed
below.
| ignoreHeaderCase | false | Boolean | Sets whether or not to ignore case when
accessing header names.
| trim | false | Boolean | Sets whether or not to trim leading and trailing
blanks.
| trailingDelimiter | false | Boolean | Sets whether or not to add a trailing
delimiter.
-| marshallerFactoryRef | | String | Sets the `CsvMarshallerFactory` reference.
+| marshallerFactoryRef | | String | Sets the implementation of the
CsvMarshallerFactory interface which is able to customize
marshalling/unmarshalling behavior by extending CsvMarshaller or creating it
from scratch.
| lazyLoad | false | Boolean | Whether the unmarshalling should produce an
iterator that reads the lines on the fly or if all the lines must be read at
one.
| useMaps | false | Boolean | Whether the unmarshalling should produce maps
(HashMap)for the lines values instead of lists. It requires to have header
(either defined or collected).
| useOrderedMaps | false | Boolean | Whether the unmarshalling should produce
ordered maps (LinkedHashMap) for the lines values instead of lists. It requires
to have header (either defined or collected).
diff --git
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
index d2fee61..1ad903f 100644
---
a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
+++
b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
@@ -74,6 +74,7 @@ public abstract class CsvMarshaller {
* @throws NoTypeConversionAvailableException if the body cannot be
converted
* @throws IOExceptionif we cannot write into the
given stream
*/
+@SuppressWarnings("rawtypes")
public void marshal(Exchange exchange, Object object, OutputStream
outputStream) throws NoTypeConversionAvailableException, IOException {
CSVPrinter printer = createPrinter(exchange, outputStream);
try {
diff --git
a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java
b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java
index 0916bc4..f46921f 100644
---
a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeaderWithCustomMarshallFactoryTest.java
+++
b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalHeader
[camel-k] branch master updated: Enable status subresource for integration
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new f7714fe Enable status subresource for integration
f7714fe is described below
commit f7714fe1de55454f2f7a26f9c29b87f9e4d97e0e
Author: Antonin Stefanutti
AuthorDate: Tue Jan 22 13:05:59 2019 +0100
Enable status subresource for integration
---
deploy/crd-integration.yaml| 2 ++
deploy/resources.go| 2 ++
pkg/controller/integration/build_context.go| 10 +-
pkg/controller/integration/build_image.go | 4 ++--
pkg/controller/integration/build_image_failure_recovery.go | 4 ++--
pkg/controller/integration/deploy.go | 2 +-
pkg/controller/integration/initialize.go | 8
pkg/controller/integration/monitor.go | 2 +-
8 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/deploy/crd-integration.yaml b/deploy/crd-integration.yaml
index 11db52b..e6e2657 100644
--- a/deploy/crd-integration.yaml
+++ b/deploy/crd-integration.yaml
@@ -8,6 +8,8 @@ spec:
group: camel.apache.org
scope: Namespaced
version: v1alpha1
+ subresources:
+status: {}
names:
kind: Integration
listKind: IntegrationList
diff --git a/deploy/resources.go b/deploy/resources.go
index 211bda6..68cfc91 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -2870,6 +2870,8 @@ spec:
group: camel.apache.org
scope: Namespaced
version: v1alpha1
+ subresources:
+status: {}
names:
kind: Integration
listKind: IntegrationList
diff --git a/pkg/controller/integration/build_context.go
b/pkg/controller/integration/build_context.go
index 26315c1..c78c588 100644
--- a/pkg/controller/integration/build_context.go
+++ b/pkg/controller/integration/build_context.go
@@ -66,7 +66,7 @@ func (action *buildContextAction) Handle(ctx context.Context,
integration *v1alp
// with a context
target := integration.DeepCopy()
target.Status.Context = ""
- return action.client.Update(ctx, target)
+ return action.client.Status().Update(ctx,
target)
}
}
@@ -83,7 +83,7 @@ func (action *buildContextAction) Handle(ctx context.Context,
integration *v1alp
logrus.Info("Integration ", target.Name, "
transitioning to state ", target.Status.Phase)
- return action.client.Update(ctx, target)
+ return action.client.Status().Update(ctx, target)
}
if ictx.Status.Phase == v1alpha1.IntegrationContextPhaseReady {
@@ -104,14 +104,14 @@ func (action *buildContextAction) Handle(ctx
context.Context, integration *v1alp
logrus.Info("Integration ", target.Name, "
transitioning to state ", target.Status.Phase)
- return action.client.Update(ctx, target)
+ return action.client.Status().Update(ctx, target)
}
if integration.Status.Context == "" {
// We need to set the context
target := integration.DeepCopy()
target.Status.Context = ictx.Name
- return action.client.Update(ctx, target)
+ return action.client.Status().Update(ctx, target)
}
return nil
@@ -145,5 +145,5 @@ func (action *buildContextAction) Handle(ctx
context.Context, integration *v1alp
target := integration.DeepCopy()
target.Status.Context = platformCtxName
- return action.client.Update(ctx, target)
+ return action.client.Status().Update(ctx, target)
}
diff --git a/pkg/controller/integration/build_image.go
b/pkg/controller/integration/build_image.go
index f381ad5..5a0778e 100644
--- a/pkg/controller/integration/build_image.go
+++ b/pkg/controller/integration/build_image.go
@@ -146,7 +146,7 @@ func (action *buildImageAction) handleBuildStateChange(ctx
context.Context, res
logrus.Infof("Integration %s transitioning to state %s, reason:
%s", target.Name, target.Status.Phase, res.Error.Error())
- return action.client.Update(ctx, target)
+ return action.client.Status().Update(ctx, target)
case builder.StatusCompleted:
target.Status.Phase = v1alpha1.IntegrationPhaseDeploying
if res.PublicImage != "" {
@@ -164,7 +164,7 @@ func (action *buildImageAction) handleBuildStateChange(ctx
context.Context, res
logrus.Info("Integration ", target.Name, " transitioning to
stat
[camel] branch master updated: camel3 - controlbus component should use public camel-api
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 723870b camel3 - controlbus component should use public camel-api
723870b is described below
commit 723870bb17b239a1c2fb3c4f2056d69f3ade5f93
Author: Claus Ibsen
AuthorDate: Tue Jan 22 16:24:23 2019 +0100
camel3 - controlbus component should use public camel-api
---
.../component/controlbus/ControlBusProducer.java| 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java
b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java
index 042cdc3..4723534 100644
---
a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java
+++
b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java
@@ -26,9 +26,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Route;
import org.apache.camel.ServiceStatus;
-import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.spi.CamelLogger;
import org.apache.camel.spi.Language;
+import org.apache.camel.spi.RouteContext;
+import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
@@ -37,7 +38,6 @@ import org.apache.camel.util.ObjectHelper;
* The control bus producer.
*/
public class ControlBusProducer extends DefaultAsyncProducer {
-private static final Expression ROUTE_ID_EXPRESSION =
ExpressionBuilder.routeIdExpression();
private final CamelLogger logger;
@@ -89,6 +89,20 @@ public class ControlBusProducer extends DefaultAsyncProducer
{
}
}
+private static String getRouteId(Exchange exchange) {
+String answer = null;
+UnitOfWork uow = exchange.getUnitOfWork();
+RouteContext rc = uow != null ? uow.getRouteContext() : null;
+if (rc != null) {
+answer = rc.getRoute().getId();
+}
+if (answer == null) {
+// fallback and get from route id on the exchange
+answer = exchange.getFromRouteId();
+}
+return answer;
+}
+
/**
* Tasks to run when processing by language.
*/
@@ -148,7 +162,7 @@ public class ControlBusProducer extends
DefaultAsyncProducer {
String id = getEndpoint().getRouteId();
if (ObjectHelper.equal("current", id)) {
-id = ROUTE_ID_EXPRESSION.evaluate(exchange, String.class);
+id = getRouteId(exchange);
}
Object result = null;
@@ -224,6 +238,7 @@ public class ControlBusProducer extends
DefaultAsyncProducer {
logger.log("Error executing ControlBus task [" + task + "].
This exception will be ignored.", e);
}
}
+
}
}
[camel] branch master updated (6c32421 -> 4871aca)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 6c32421 camel3 - browse component should use public camel-api new 87244c1 Fixed CS for camel-mqtt new 1099a40 Fixed CS for Camel-Mustache new 4871aca Fixed CS for camel-mybatis The 34859 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/camel/component/mqtt/MQTTComponent.java | 2 +- .../java/org/apache/camel/component/mustache/MustacheComponent.java | 2 +- .../java/org/apache/camel/component/mybatis/BaseMyBatisEndpoint.java | 2 +- .../java/org/apache/camel/component/mybatis/MyBatisComponent.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
[camel] branch master updated: camel3 - browse component should use public camel-api
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 6c32421 camel3 - browse component should use public camel-api
6c32421 is described below
commit 6c32421f1f6ec9063fe51a63fe0635763445be4a
Author: Claus Ibsen
AuthorDate: Tue Jan 22 16:19:52 2019 +0100
camel3 - browse component should use public camel-api
---
.../camel/component/browse/BrowseEndpoint.java | 16 ---
.../component/browse/BrowseRouteConsumeTest.java | 53 ++
2 files changed, 62 insertions(+), 7 deletions(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
index d2b7430..6738654 100644
---
a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
+++
b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseEndpoint.java
@@ -24,13 +24,11 @@ import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.processor.loadbalancer.LoadBalancer;
-import org.apache.camel.processor.loadbalancer.LoadBalancerConsumer;
-import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
import org.apache.camel.spi.BrowsableEndpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriPath;
+import org.apache.camel.support.DefaultConsumer;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.support.DefaultProducer;
@@ -46,7 +44,7 @@ public class BrowseEndpoint extends DefaultEndpoint
implements BrowsableEndpoint
private String name;
private List exchanges;
-private final LoadBalancer loadBalancer = new TopicLoadBalancer();
+private volatile Processor onExchangeProcessor;
public BrowseEndpoint() {
}
@@ -75,7 +73,9 @@ public class BrowseEndpoint extends DefaultEndpoint
implements BrowsableEndpoint
}
public Consumer createConsumer(Processor processor) throws Exception {
-Consumer answer = new LoadBalancerConsumer(this, processor,
loadBalancer);
+this.onExchangeProcessor = processor;
+
+Consumer answer = new DefaultConsumer(this, processor);
configureConsumer(answer);
return answer;
}
@@ -101,8 +101,10 @@ public class BrowseEndpoint extends DefaultEndpoint
implements BrowsableEndpoint
protected void onExchange(Exchange exchange) throws Exception {
getExchanges().add(exchange);
-// now fire any consumers
-loadBalancer.process(exchange);
+// now fire the consumer
+if (onExchangeProcessor != null) {
+onExchangeProcessor.process(exchange);
+}
}
@Override
diff --git
a/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteConsumeTest.java
b/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteConsumeTest.java
new file mode 100644
index 000..23ac082
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/component/browse/BrowseRouteConsumeTest.java
@@ -0,0 +1,53 @@
+/**
+ * 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.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.browse;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spi.BrowsableEndpoint;
+import org.junit.Test;
+
+public class BrowseRouteConsumeTest extends ContextTestSupport {
+
+@Test
+public void testBrowseRoute() throws Exception {
+MockEndpoint mock = getMockEndpoint("mock:foo");
+mock.expectedBodiesReceived("Hello World", "Bye World");
+
+template.sendBody("direct:start", "Hello World");
+template.sendBody("direct:start", "Bye World");
+
+assertMockEndpointsSatisfied();
+
+BrowsableEndpoint list = context.getEndpoint("browse:foo",
BrowsableEndpoint.class);
+
+mock.getExchanges().get(0).
buildbot success in on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/31180 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel] branch camel-2.23.x updated: CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.23.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.23.x by this push: new c3750dc CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719) c3750dc is described below commit c3750dc94317d8bcd9175da4a554e681b9acf2c6 Author: phantomjinx AuthorDate: Tue Jan 22 14:56:26 2019 + CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719) * ApiConsumerHelper does not recognise ClientEntitySets and thus defaults to return a constant 1. This means that the scheduling polling is never concluded to be idle and the backoffXXX consumer properties do not work. * If the ClientEntitySet is empty then return 0 to allow for backoffXXX properties to correctly handle the scheduling of the polling. --- .../org/apache/camel/component/olingo4/Olingo4Consumer.java | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java index 1fcd546..16256bc 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java @@ -27,6 +27,7 @@ import org.apache.camel.component.olingo4.internal.Olingo4ApiName; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.component.AbstractApiConsumer; import org.apache.camel.util.component.ApiConsumerHelper; +import org.apache.olingo.client.api.domain.ClientEntitySet; /** * The Olingo4 consumer. @@ -83,7 +84,15 @@ public class Olingo4Consumer extends AbstractApiConsumer
[camel] branch camel-2.x updated: CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new d39eafb CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719) d39eafb is described below commit d39eafb17efd7a62a26320d10d77c2d0be8ccc89 Author: phantomjinx AuthorDate: Tue Jan 22 14:56:26 2019 + CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719) * ApiConsumerHelper does not recognise ClientEntitySets and thus defaults to return a constant 1. This means that the scheduling polling is never concluded to be idle and the backoffXXX consumer properties do not work. * If the ClientEntitySet is empty then return 0 to allow for backoffXXX properties to correctly handle the scheduling of the polling. --- .../org/apache/camel/component/olingo4/Olingo4Consumer.java | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java index 1fcd546..16256bc 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java @@ -27,6 +27,7 @@ import org.apache.camel.component.olingo4.internal.Olingo4ApiName; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.component.AbstractApiConsumer; import org.apache.camel.util.component.ApiConsumerHelper; +import org.apache.olingo.client.api.domain.ClientEntitySet; /** * The Olingo4 consumer. @@ -83,7 +84,15 @@ public class Olingo4Consumer extends AbstractApiConsumer
[camel] branch camel-2.22.x updated: CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.22.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.22.x by this push: new 6c56dc5 CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719) 6c56dc5 is described below commit 6c56dc572dff298b2e82054c55e10d9acdcf2abc Author: phantomjinx AuthorDate: Tue Jan 22 14:56:26 2019 + CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719) * ApiConsumerHelper does not recognise ClientEntitySets and thus defaults to return a constant 1. This means that the scheduling polling is never concluded to be idle and the backoffXXX consumer properties do not work. * If the ClientEntitySet is empty then return 0 to allow for backoffXXX properties to correctly handle the scheduling of the polling. --- .../org/apache/camel/component/olingo4/Olingo4Consumer.java | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java index 1fcd546..16256bc 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java @@ -27,6 +27,7 @@ import org.apache.camel.component.olingo4.internal.Olingo4ApiName; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.component.AbstractApiConsumer; import org.apache.camel.util.component.ApiConsumerHelper; +import org.apache.olingo.client.api.domain.ClientEntitySet; /** * The Olingo4 consumer. @@ -83,7 +84,15 @@ public class Olingo4Consumer extends AbstractApiConsumer
[camel] branch camel-2.21.x updated: CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.21.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.21.x by this push: new 9bc5fcd CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719) 9bc5fcd is described below commit 9bc5fcda12d5475576a92386c754a4280443d11f Author: phantomjinx AuthorDate: Tue Jan 22 14:56:26 2019 + CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719) * ApiConsumerHelper does not recognise ClientEntitySets and thus defaults to return a constant 1. This means that the scheduling polling is never concluded to be idle and the backoffXXX consumer properties do not work. * If the ClientEntitySet is empty then return 0 to allow for backoffXXX properties to correctly handle the scheduling of the polling. --- .../org/apache/camel/component/olingo4/Olingo4Consumer.java | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java index b50bd31..ecff6e6 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java @@ -27,6 +27,7 @@ import org.apache.camel.component.olingo4.internal.Olingo4ApiName; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.component.AbstractApiConsumer; import org.apache.camel.util.component.ApiConsumerHelper; +import org.apache.olingo.client.api.domain.ClientEntitySet; /** * The Olingo4 consumer. @@ -83,7 +84,15 @@ public class Olingo4Consumer extends AbstractApiConsumer
[camel] branch master updated: CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719)
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 7ee9007 CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719) 7ee9007 is described below commit 7ee9007ac72054dde06340f5dc45bba2464c98ee Author: phantomjinx AuthorDate: Tue Jan 22 14:56:26 2019 + CAMEL-13077: Fix polling return for empty OData ClientEntitySets (#2719) * ApiConsumerHelper does not recognise ClientEntitySets and thus defaults to return a constant 1. This means that the scheduling polling is never concluded to be idle and the backoffXXX consumer properties do not work. * If the ClientEntitySet is empty then return 0 to allow for backoffXXX properties to correctly handle the scheduling of the polling. --- .../org/apache/camel/component/olingo4/Olingo4Consumer.java | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java index afcb20d..8763fd8 100644 --- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java +++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java @@ -26,6 +26,7 @@ import org.apache.camel.component.olingo4.api.Olingo4ResponseHandler; import org.apache.camel.component.olingo4.internal.Olingo4ApiName; import org.apache.camel.support.component.AbstractApiConsumer; import org.apache.camel.support.component.ApiConsumerHelper; +import org.apache.olingo.client.api.domain.ClientEntitySet; /** * The Olingo4 consumer. @@ -82,7 +83,15 @@ public class Olingo4Consumer extends AbstractApiConsumer
[camel] branch master updated (f6a8108 -> b384e1e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from f6a8108 Fixed CS for Camel-mongodb-gridfs new 3307885 CAMEL-13088: build system - Automate list of components in parent and apache-camel poms new e7ecb4e CAMEL-13088: Polished parent/pom.xml new 9c5f2a5 CAMEL-13088: build system - Automate list of components in parent and apache-camel poms new c1b4f65 CAMEL-13088: build system - Automate list of components in parent and apache-camel poms new d6a2f15 CAMEL-13088: build system - Automate list of components in parent and apache-camel poms new a901d93 CAMEL-13088: build system - Automate list of components in parent and apache-camel poms new 818a744 CAMEL-13088: build system - Automate list of components in parent and apache-camel poms new 1d81913 Fixed CS new 0c94527 Fixed examples to use Camel Sprint Boot BOM new b95fb8d CAMEL-13088: build system - Automate list of components in parent and apache-camel poms new b384e1e Regen The 34854 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: apache-camel/pom.xml | 685 apache-camel/src/main/descriptors/common-bin.xml | 129 ++- bom/camel-bom/pom.xml | 176 ++-- .../modules/ROOT/pages/cxf-component.adoc | 97 ++- .../hello-camel-grpc-client-kubernetes/pom.xml | 4 +- .../camel-example-spring-boot-rest-jpa/pom.xml | 4 +- parent/pom.xml | 906 +++-- platforms/camel-catalog/pom.xml| 4 +- .../camel-spring-boot-dependencies/pom.xml | 186 +++-- .../maven/packaging/PackageComponentMojo.java | 2 +- .../camel/maven/packaging/PackageJaxbMojo.java | 4 - .../camel/maven/packaging/PackageOtherMojo.java| 1 - .../maven/packaging/PrepareCatalogKarafMojo.java | 2 +- .../maven/packaging/PrepareComponentMojo.java | 2 +- .../maven/packaging/PrepareParentPomMojo.java | 182 + .../camel/maven/packaging/PrepareReadmeMojo.java | 3 +- .../maven/packaging/PrepareReleasePomMojo.java | 207 + .../maven/packaging/PrepareUserGuideMojo.java | 2 +- .../packaging/SpringBootAutoConfigurationMojo.java | 51 +- .../maven/packaging/SpringBootStarterMojo.java | 2 - .../camel/maven/packaging/UpdateReadmeMojo.java| 1 - 21 files changed, 1750 insertions(+), 900 deletions(-) create mode 100644 tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java create mode 100644 tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReleasePomMojo.java
[camel] branch master updated: Fixed CS for Camel-mongodb-gridfs
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 f6a8108 Fixed CS for Camel-mongodb-gridfs f6a8108 is described below commit f6a8108c2f03d22e721def264eabce1335e60740 Author: Andrea Cosentino AuthorDate: Tue Jan 22 15:33:41 2019 +0100 Fixed CS for Camel-mongodb-gridfs --- .../java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java index efbfb74..67b8dee 100644 --- a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java +++ b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpoint.java @@ -26,12 +26,12 @@ import com.mongodb.gridfs.GridFS; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; import org.apache.camel.support.CamelContextHelper; +import org.apache.camel.support.DefaultEndpoint; /** * Component for working with MongoDB GridFS.
[camel] branch master updated: Fixed CS for Camel-mongodb3
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 788f683 Fixed CS for Camel-mongodb3 788f683 is described below commit 788f6838f76897f50c7e94f2eb63e67dc5876a4b Author: Andrea Cosentino AuthorDate: Tue Jan 22 15:30:42 2019 +0100 Fixed CS for Camel-mongodb3 --- .../main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java index 40d0032..00c64e1 100644 --- a/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java +++ b/components/camel-mongodb3/src/main/java/org/apache/camel/component/mongodb3/MongoDbEndpoint.java @@ -35,12 +35,12 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; import org.apache.camel.support.CamelContextHelper; +import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.util.ObjectHelper; import org.bson.Document; import org.bson.conversions.Bson;
buildbot failure in on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building . Full details are available at: https://ci.apache.org/builders/camel-site-production/builds/31179 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch master updated: Fixed CS for Camel-mllp
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 9d72c52 Fixed CS for Camel-mllp 9d72c52 is described below commit 9d72c52de5eaaac05a4d8d4fb800387c0dd555aa Author: Andrea Cosentino AuthorDate: Tue Jan 22 14:57:25 2019 +0100 Fixed CS for Camel-mllp --- .../src/main/java/org/apache/camel/component/mllp/MllpComponent.java| 2 +- .../src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java | 2 +- .../java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpComponent.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpComponent.java index 6342be3..eb8f246 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpComponent.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpComponent.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -import org.apache.camel.spi.Metadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java index 8ffc609..740fa53 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java @@ -30,11 +30,11 @@ import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedResource; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; import org.slf4j.Logger; /** diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java index 81ec5d4..f9971e7 100644 --- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java +++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java @@ -49,8 +49,8 @@ import org.apache.camel.component.mllp.internal.TcpServerBindThread; import org.apache.camel.component.mllp.internal.TcpServerConsumerValidationRunnable; import org.apache.camel.component.mllp.internal.TcpSocketConsumerRunnable; import org.apache.camel.converter.IOConverter; -import org.apache.camel.support.DefaultConsumer; import org.apache.camel.processor.mllp.Hl7AcknowledgementGenerationException; +import org.apache.camel.support.DefaultConsumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
[camel] branch master updated: Fixed CS for Camel-Mina2
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 22f739d Fixed CS for Camel-Mina2
22f739d is described below
commit 22f739d46a15ebf698e9a66b74372df5a2b4ccfe
Author: Andrea Cosentino
AuthorDate: Tue Jan 22 14:46:18 2019 +0100
Fixed CS for Camel-Mina2
---
.../main/java/org/apache/camel/component/mina2/Mina2Component.java| 2 +-
.../src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java | 2 +-
.../src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
index 413985f..3095659 100644
---
a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
+++
b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
@@ -23,9 +23,9 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
import org.apache.camel.SSLContextParametersAware;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.spi.Metadata;
import org.apache.camel.util.ObjectHelper;
import org.apache.mina.core.filterchain.IoFilter;
diff --git
a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
index 63dc2fa..4cf9eda 100644
---
a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
+++
b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Endpoint.java
@@ -22,9 +22,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.MultipleConsumersSupport;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
+import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.util.ObjectHelper;
import org.apache.mina.core.session.IoSession;
diff --git
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
index 145e175..083a239 100644
---
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
+++
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.mina2;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.support.jsse.ClientAuthentication;
import org.apache.camel.support.jsse.KeyManagersParameters;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.BeforeClass;
public class BaseMina2Test extends CamelTestSupport {
[camel] branch master updated: Fixed CS for Camel-Milo
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 0b2912d Fixed CS for Camel-Milo 0b2912d is described below commit 0b2912d8b76aa2ba764800de4db3eab7c733ecc2 Author: Andrea Cosentino AuthorDate: Tue Jan 22 14:25:38 2019 +0100 Fixed CS for Camel-Milo --- .../java/org/apache/camel/component/milo/client/MiloClientEndpoint.java | 2 +- .../java/org/apache/camel/component/milo/server/MiloServerEndpoint.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java index 715f86c..402f803 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java @@ -21,11 +21,11 @@ import java.util.Objects; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId; /** diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerEndpoint.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerEndpoint.java index 618fdc9..d63488b 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerEndpoint.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerEndpoint.java @@ -22,10 +22,10 @@ import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.component.milo.server.internal.CamelNamespace; import org.apache.camel.component.milo.server.internal.CamelServerItem; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; /** * Make telemetry data available as an OPC UA server
[camel] branch master updated: Fixed CS for Camel-micrometer
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 280c533 Fixed CS for Camel-micrometer 280c533 is described below commit 280c5333978453c37257eb5cd4464b12bd335b99 Author: Andrea Cosentino AuthorDate: Tue Jan 22 13:58:47 2019 +0100 Fixed CS for Camel-micrometer --- .../apache/camel/component/micrometer/AbstractMicrometerProducer.java | 2 +- .../org/apache/camel/component/micrometer/MicrometerComponent.java| 4 ++-- .../org/apache/camel/component/micrometer/MicrometerEndpoint.java | 2 +- .../camel/component/micrometer/routepolicy/MicrometerRoutePolicy.java | 2 +- .../component/micrometer/spi/InstrumentedThreadPoolFactoryTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/AbstractMicrometerProducer.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/AbstractMicrometerProducer.java index 162fb33..c29985c 100644 --- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/AbstractMicrometerProducer.java +++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/AbstractMicrometerProducer.java @@ -24,8 +24,8 @@ import io.micrometer.core.instrument.Tags; import org.apache.camel.Exchange; import org.apache.camel.Expression; import org.apache.camel.Message; -import org.apache.camel.support.DefaultProducer; import org.apache.camel.language.simple.SimpleLanguage; +import org.apache.camel.support.DefaultProducer; import org.apache.camel.util.ObjectHelper; import static org.apache.camel.component.micrometer.MicrometerConstants.CAMEL_CONTEXT_TAG; import static org.apache.camel.component.micrometer.MicrometerConstants.HEADER_METRIC_NAME; diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerComponent.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerComponent.java index 5d59441..b05ea5f 100644 --- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerComponent.java +++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerComponent.java @@ -23,10 +23,10 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Tag; import io.micrometer.core.instrument.Tags; import org.apache.camel.Endpoint; -import org.apache.camel.spi.annotations.Component; -import org.apache.camel.support.DefaultComponent; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.Registry; +import org.apache.camel.spi.annotations.Component; +import org.apache.camel.support.DefaultComponent; import org.apache.camel.util.StringHelper; /** diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java index 91f6a6d..33da764 100644 --- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java +++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java @@ -24,11 +24,11 @@ import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; /** * To collect various metrics directly from Camel routes using the Micrometer library. diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicy.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicy.java index bf1..eda6ab7 100644 --- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicy.java +++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicy.java @@ -26,8 +26,8 @@ import org.apache.camel.Route; import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.micrometer.MicrometerUtils; import org.apache.camel.support.RoutePolicySupport; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.support.ServiceHelper; +import org.apache.camel.util.ObjectHelper; import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_METER_NAME
[camel] branch master updated: Fixed CS for Camel-metrics
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 a339f8b Fixed CS for Camel-metrics a339f8b is described below commit a339f8b4d08324505631d3556f85f50e6bb0cdcd Author: Andrea Cosentino AuthorDate: Tue Jan 22 13:54:59 2019 +0100 Fixed CS for Camel-metrics --- .../java/org/apache/camel/component/metrics/MetricsComponent.java | 4 ++-- .../main/java/org/apache/camel/component/metrics/MetricsEndpoint.java | 2 +- .../component/metrics/spi/InstrumentedThreadPoolFactoryTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java index 3fe0507..de5448b 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java @@ -24,10 +24,10 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Slf4jReporter; import org.apache.camel.Endpoint; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.spi.annotations.Component; -import org.apache.camel.support.DefaultComponent; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.Registry; +import org.apache.camel.spi.annotations.Component; +import org.apache.camel.support.DefaultComponent; import org.apache.camel.util.StringHelper; /** diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsEndpoint.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsEndpoint.java index 6f816ce..21dd2f8 100644 --- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsEndpoint.java +++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsEndpoint.java @@ -22,11 +22,11 @@ import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; /** * To collect various metrics directly from Camel routes using the DropWizard metrics library. diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/spi/InstrumentedThreadPoolFactoryTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/spi/InstrumentedThreadPoolFactoryTest.java index f5871bd..319210f 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/spi/InstrumentedThreadPoolFactoryTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/spi/InstrumentedThreadPoolFactoryTest.java @@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit; import com.codahale.metrics.InstrumentedExecutorService; import com.codahale.metrics.InstrumentedScheduledExecutorService; import com.codahale.metrics.MetricRegistry; -import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; import org.apache.camel.spi.ThreadPoolFactory; import org.apache.camel.spi.ThreadPoolProfile; +import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith;
[camel] branch master updated: Fixed CS for Camel-master
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 97bde9a Fixed CS for Camel-master
97bde9a is described below
commit 97bde9a732ee17dac02d5410372f069288685bd2
Author: Andrea Cosentino
AuthorDate: Tue Jan 22 13:37:31 2019 +0100
Fixed CS for Camel-master
---
.../main/java/org/apache/camel/component/master/MasterComponent.java| 2 +-
.../src/main/java/org/apache/camel/component/master/MasterEndpoint.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java
b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java
index 42832d6..25f505a 100644
---
a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java
+++
b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterComponent.java
@@ -21,11 +21,11 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.cluster.CamelClusterService;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.cluster.ClusterServiceHelper;
import org.apache.camel.support.cluster.ClusterServiceSelectors;
-import org.apache.camel.spi.Metadata;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
diff --git
a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterEndpoint.java
b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterEndpoint.java
index a903fe7..d601f55 100644
---
a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterEndpoint.java
+++
b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterEndpoint.java
@@ -25,10 +25,10 @@ import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.cluster.CamelClusterView;
-import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriPath;
+import org.apache.camel.support.DefaultEndpoint;
/**
* Represents an endpoint which only becomes active when the {@link
CamelClusterView}
[camel] branch master updated: Fixed CS for Camel-Lumberjack
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 888ad2d Fixed CS for Camel-Lumberjack 888ad2d is described below commit 888ad2da271d66d44e864004f6124231162839a1 Author: Andrea Cosentino AuthorDate: Tue Jan 22 13:34:44 2019 +0100 Fixed CS for Camel-Lumberjack --- .../org/apache/camel/component/lumberjack/LumberjackComponent.java| 2 +- .../org/apache/camel/component/lumberjack/LumberjackEndpoint.java | 2 +- .../camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java | 4 ++-- .../apache/camel/component/lumberjack/LumberjackComponentSSLTest.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java index 1009fc7..2f2313f 100644 --- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java +++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java @@ -20,9 +20,9 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.SSLContextParametersAware; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.DefaultComponent; -import org.apache.camel.spi.Metadata; import org.apache.camel.support.jsse.SSLContextParameters; /** diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java index 9459f29..779f15c 100644 --- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java +++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackEndpoint.java @@ -23,11 +23,11 @@ import javax.net.ssl.SSLContext; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.support.jsse.SSLContextParameters; /** diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java index df1e089..4fb329c 100644 --- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java +++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java @@ -22,12 +22,12 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.camel.support.jsse.KeyManagersParameters; import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.TrustManagersParameters; +import org.apache.camel.test.AvailablePortFinder; +import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.BeforeClass; import org.junit.Test; diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java index 985e46d..a04a756 100644 --- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java +++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java @@ -22,12 +22,12 @@ import java.util.Map; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.JndiRegistry; -import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.camel.support.jsse.KeyManagersParameters; import org.apache.camel.support.jsse.KeyStoreParameters; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.camel.support.jsse.TrustManagersParameters; +import org.apache.camel.test.AvailablePortFinder; +import org.apache.camel.test.junit4.CamelTe
[camel] branch master updated: Fixed CS for Camel-Lucene
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 390bf28 Fixed CS for Camel-Lucene
390bf28 is described below
commit 390bf28c97977001d976934a58dddfa3fffced26
Author: Andrea Cosentino
AuthorDate: Tue Jan 22 13:32:07 2019 +0100
Fixed CS for Camel-Lucene
---
.../main/java/org/apache/camel/component/lucene/LuceneComponent.java| 2 +-
.../src/main/java/org/apache/camel/component/lucene/LuceneEndpoint.java | 2 +-
.../java/org/apache/camel/component/lucene/LuceneQueryProducer.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneComponent.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneComponent.java
index 885d40a..7d3a565 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneComponent.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneComponent.java
@@ -21,9 +21,9 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.spi.Metadata;
@Component("lucene")
public class LuceneComponent extends DefaultComponent {
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneEndpoint.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneEndpoint.java
index b8c1234..06832f7 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneEndpoint.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneEndpoint.java
@@ -20,9 +20,9 @@ import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
+import org.apache.camel.support.DefaultEndpoint;
/**
* To insert or query from Apache Lucene databases.
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneQueryProducer.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneQueryProducer.java
index 5d5d4cc..d794bd1 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneQueryProducer.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneQueryProducer.java
@@ -20,8 +20,8 @@ import java.io.File;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.support.DefaultProducer;
import org.apache.camel.processor.lucene.support.Hits;
+import org.apache.camel.support.DefaultProducer;
import org.apache.lucene.analysis.Analyzer;
public class LuceneQueryProducer extends DefaultProducer {
[camel] branch master updated: Fixed CS for Camel-Linkedin
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 0b49729 Fixed CS for Camel-Linkedin 0b49729 is described below commit 0b497292d22ac6d73274fee3496486a3b509b3f4 Author: Andrea Cosentino AuthorDate: Tue Jan 22 12:37:18 2019 +0100 Fixed CS for Camel-Linkedin --- .../apache/camel/component/linkedin/AbstractLinkedInTestSupport.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java index 6b26cd1..52d5980 100644 --- a/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java +++ b/components/camel-linkedin/camel-linkedin-component/src/test/java/org/apache/camel/component/linkedin/AbstractLinkedInTestSupport.java @@ -24,8 +24,8 @@ import java.util.Properties; import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.component.linkedin.api.OAuthScope; -import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.camel.support.IntrospectionSupport; +import org.apache.camel.test.junit4.CamelTestSupport; /** * Abstract base class for LinkedIn Integration tests generated by Camel API component maven plugin.
[camel] branch camel-2.22.x updated: CAMEL-13098 - Camel-google-mail: Stream component doesn't work in OSGi
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.22.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.22.x by this push: new ee3dbfe CAMEL-13098 - Camel-google-mail: Stream component doesn't work in OSGi ee3dbfe is described below commit ee3dbfeef2f7ab1413f6e81b86fb6e8023403f8a Author: Andrea Cosentino AuthorDate: Tue Jan 22 12:06:19 2019 +0100 CAMEL-13098 - Camel-google-mail: Stream component doesn't work in OSGi --- components/camel-google-mail/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml index 6a6c181..c9f8022 100644 --- a/components/camel-google-mail/pom.xml +++ b/components/camel-google-mail/pom.xml @@ -38,7 +38,7 @@ org.apache.camel.component.google.mail org.apache.camel.component.google.mail.internal org.apache.camel.component.google.mail.internal - org.apache.camel.component.google.mail + org.apache.camel.component.google.mail,org.apache.camel.component.google.mail.stream org.apache.camel.spi.ComponentResolver;component=google-mail
[camel] branch camel-2.x updated: CAMEL-13098 - Camel-google-mail: Stream component doesn't work in OSGi
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new 1344ae3 CAMEL-13098 - Camel-google-mail: Stream component doesn't work in OSGi 1344ae3 is described below commit 1344ae3078188bcc2a145f8b8030603bee322b68 Author: Andrea Cosentino AuthorDate: Tue Jan 22 12:06:19 2019 +0100 CAMEL-13098 - Camel-google-mail: Stream component doesn't work in OSGi --- components/camel-google-mail/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml index e513a2d..555aeb7 100644 --- a/components/camel-google-mail/pom.xml +++ b/components/camel-google-mail/pom.xml @@ -38,7 +38,7 @@ org.apache.camel.component.google.mail org.apache.camel.component.google.mail.internal org.apache.camel.component.google.mail.internal - org.apache.camel.component.google.mail + org.apache.camel.component.google.mail,org.apache.camel.component.google.mail.stream org.apache.camel.spi.ComponentResolver;component=google-mail
[camel] branch master updated: CAMEL-13098 - Camel-google-mail: Stream component doesn't work in OSGi
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 73ab1e9 CAMEL-13098 - Camel-google-mail: Stream component doesn't work in OSGi 73ab1e9 is described below commit 73ab1e9c540ade86692de7c8106e799c1c0fd3e8 Author: Andrea Cosentino AuthorDate: Tue Jan 22 12:06:19 2019 +0100 CAMEL-13098 - Camel-google-mail: Stream component doesn't work in OSGi --- components/camel-google-mail/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml index f942ff8..d90fe62 100644 --- a/components/camel-google-mail/pom.xml +++ b/components/camel-google-mail/pom.xml @@ -38,7 +38,7 @@ org.apache.camel.component.google.mail org.apache.camel.component.google.mail.internal org.apache.camel.component.google.mail.internal - org.apache.camel.component.google.mail + org.apache.camel.component.google.mail,org.apache.camel.component.google.mail.stream org.apache.camel.spi.ComponentResolver;component=google-mail
[camel] branch master updated: Camel-Jgroups-raft: Tests must log on file
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 c81ad66 Camel-Jgroups-raft: Tests must log on file
c81ad66 is described below
commit c81ad66b5558fb768d5ce314d3beae6ef326e089
Author: Andrea Cosentino
AuthorDate: Tue Jan 22 11:51:18 2019 +0100
Camel-Jgroups-raft: Tests must log on file
---
components/camel-jgroups-raft/src/test/resources/log4j2.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-jgroups-raft/src/test/resources/log4j2.properties
b/components/camel-jgroups-raft/src/test/resources/log4j2.properties
index 8f85ee1..bf1ad45 100644
--- a/components/camel-jgroups-raft/src/test/resources/log4j2.properties
+++ b/components/camel-jgroups-raft/src/test/resources/log4j2.properties
@@ -25,12 +25,12 @@ appender.stdout.name = stdout
appender.stdout.layout.type = PatternLayout
appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
rootLogger.level = INFO
-rootLogger.appenderRef.file.ref = stdout
+rootLogger.appenderRef.file.ref = file
loggers = mine,yours
logger.mine.name = org.apache.camel.component.jgroups.raft
-logger.mine.level = TRACE
+logger.mine.level = INFO
logger.yours.name = org.apache.camel.component.master
-logger.yours.level = TRACE
\ No newline at end of file
+logger.yours.level = INFO
[camel] branch master updated: Fixed CS for Camel-JGroups
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 f3c43be Fixed CS for Camel-JGroups
f3c43be is described below
commit f3c43beab87c1874b92c263df684e60a3048ed9c
Author: Andrea Cosentino
AuthorDate: Tue Jan 22 11:47:03 2019 +0100
Fixed CS for Camel-JGroups
---
.../java/org/apache/camel/component/jgroups/JGroupsComponent.java | 2 +-
.../main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
index e8c1e3f..f45c46b 100644
---
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
+++
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.jgroups;
import java.util.Map;
import org.apache.camel.Endpoint;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.annotations.Component;
import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.spi.Metadata;
import org.jgroups.JChannel;
/**
diff --git
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
index 1f3f538..fe2b3a0 100644
---
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
+++
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
@@ -23,11 +23,11 @@ import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
+import org.apache.camel.support.DefaultEndpoint;
import org.jgroups.JChannel;
import org.jgroups.Message;
import org.jgroups.View;
@@ -192,4 +192,4 @@ public class JGroupsEndpoint extends DefaultEndpoint {
this.enableViewMessages = enableViewMessages;
}
-}
\ No newline at end of file
+}
[camel] branch camel-2.23.x updated: CAMEL-13097 - Camel-google-calendar: Stream component doesn't work in OSGi
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.23.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.23.x by this push: new ec54110 CAMEL-13097 - Camel-google-calendar: Stream component doesn't work in OSGi ec54110 is described below commit ec541104b3bf156e097f70f0b4c5737df0d9dd61 Author: Andrea Cosentino AuthorDate: Tue Jan 22 11:23:53 2019 +0100 CAMEL-13097 - Camel-google-calendar: Stream component doesn't work in OSGi --- components/camel-google-calendar/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml index 715095f..65de1f1 100644 --- a/components/camel-google-calendar/pom.xml +++ b/components/camel-google-calendar/pom.xml @@ -38,7 +38,7 @@ org.apache.camel.component.google.calendar org.apache.camel.component.google.calendar.internal org.apache.camel.component.google.calendar.internal - org.apache.camel.component.google.calendar + org.apache.camel.component.google.calendar,org.apache.camel.component.google.calendar.stream org.apache.camel.spi.ComponentResolver;component=google-calendar
[camel] branch camel-2.x updated: CAMEL-13097 - Camel-google-calendar: Stream component doesn't work in OSGi
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-2.x by this push: new 4b34504 CAMEL-13097 - Camel-google-calendar: Stream component doesn't work in OSGi 4b34504 is described below commit 4b3450478aeab1e19657ab44c42325f2f67f649d Author: Andrea Cosentino AuthorDate: Tue Jan 22 11:23:53 2019 +0100 CAMEL-13097 - Camel-google-calendar: Stream component doesn't work in OSGi --- components/camel-google-calendar/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml index fb7b006..ec651fa 100644 --- a/components/camel-google-calendar/pom.xml +++ b/components/camel-google-calendar/pom.xml @@ -38,7 +38,7 @@ org.apache.camel.component.google.calendar org.apache.camel.component.google.calendar.internal org.apache.camel.component.google.calendar.internal - org.apache.camel.component.google.calendar + org.apache.camel.component.google.calendar,org.apache.camel.component.google.calendar.stream org.apache.camel.spi.ComponentResolver;component=google-calendar
[camel] branch master updated: CAMEL-13097 - Camel-google-calendar: Stream component doesn't work in OSGi
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 f8a0018 CAMEL-13097 - Camel-google-calendar: Stream component doesn't work in OSGi f8a0018 is described below commit f8a00181f6577be11ef23be4bdcb1f41a7e3756e Author: Andrea Cosentino AuthorDate: Tue Jan 22 11:23:53 2019 +0100 CAMEL-13097 - Camel-google-calendar: Stream component doesn't work in OSGi --- components/camel-google-calendar/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml index 101f7f9..2499d5a 100644 --- a/components/camel-google-calendar/pom.xml +++ b/components/camel-google-calendar/pom.xml @@ -38,7 +38,7 @@ org.apache.camel.component.google.calendar org.apache.camel.component.google.calendar.internal org.apache.camel.component.google.calendar.internal - org.apache.camel.component.google.calendar + org.apache.camel.component.google.calendar,org.apache.camel.component.google.calendar.stream org.apache.camel.spi.ComponentResolver;component=google-calendar
[camel] branch master updated: Updated the cxf-component document links
This is an automated email from the ASF dual-hosted git repository. ningjiang 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 39b1708 Updated the cxf-component document links 39b1708 is described below commit 39b17083f56bc2e3bb74c62af6fe383fa4879fb7 Author: Willem Jiang AuthorDate: Tue Jan 22 18:16:20 2019 +0800 Updated the cxf-component document links --- .../camel-cxf/src/main/docs/cxf-component.adoc | 97 +++--- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc index 0410e6b..f9f1c34 100644 --- a/components/camel-cxf/src/main/docs/cxf-component.adoc +++ b/components/camel-cxf/src/main/docs/cxf-component.adoc @@ -17,50 +17,50 @@ The *cxf:* component provides integration with http://cxf.apache.org[Apache CXF] for connecting to http://cxf.apache.org/docs/jax-ws.html[JAX-WS] services hosted in CXF. -* link:#CXF-CXFComponent[CXF Component] -** link:#CXF-URIformat[URI format] -** link:#CXF-Options[Options] -*** link:#CXF-Descriptionsofthedataformats[Descriptions of the +* link:#cxf-component[CXF Component] +** link:#uri-format[URI format] +** link:#options[Options] +*** link:#descriptions-of-the-dataformats[Descriptions of the dataformats] - link:#CXF-HowtoenableCXFLoggingOutInterceptorinMESSAGEmode[How to + link:#how-to-enable-cxfs-loggingoutinterceptor-in-message-mode[How to enable CXF's LoggingOutInterceptor in MESSAGE mode] -*** link:#CXF-DescriptionofrelayHeadersoption[Description of +*** link:#description-of-relayheaders-option[Description of relayHeaders option] - link:#CXF-AvailableonlyinPOJOmode[Available only in POJO mode] - link:#CXF-ChangessinceRelease2.0[Changes since Release 2.0] -** link:#CXF-ConfiguretheCXFendpointswithSpring[Configure the CXF + link:#available-only-in-pojo-mode[Available only in POJO mode] + link:#changes-since-release20[Changes since Release 2.0] +** link:#configure-the-cxf-endpoints-with-spring[Configure the CXF endpoints with Spring] -** link:#CXF-ConfiguringtheCXFEndpointswithApacheAriesBlueprint.[Configuring +** link:#configuring-the-cxf-endpoints-with-apache-aries-blueprint[Configuring the CXF Endpoints with Apache Aries Blueprint.] -** link:#CXF-Howtomakethecamel-cxfcomponentuselog4jinsteadofjava.util.logging[How +** link:#how-to-make-the-camel-cxf-component-use-log4j-instead-of-javautillogging[How to make the camel-cxf component use log4j instead of java.util.logging] -** link:#CXF-Howtoletcamel-cxfresponsemessagewithxmlstartdocument[How to +** link:#how-to-let-camel-cxf-response-message-with-xml-start-document[How to let camel-cxf response message with xml start document] -** link:#CXF-HowtooverridetheCXFproduceraddressfrommessageheader[How to +** link:#how-to-override-the-cxf-producer-address-from-message-header[How to override the CXF producer address from message header] -** link:#CXF-Howtoconsumeamessagefromacamel-cxfendpointinPOJOdataformat[How +** link:#how-to-consume-a-message-from-a-camel-cxf-endpoint-in-pojo-data-format[How to consume a message from a camel-cxf endpoint in POJO data format] -** link:#CXF-Howtopreparethemessageforthecamel-cxfendpointinPOJOdataformat[How +** link:#how-to-prepare-the-message-for-the-camel-cxf-endpoint-in-pojo-data-format[How to prepare the message for the camel-cxf endpoint in POJO data format] -** link:#CXF-Howtodealwiththemessageforacamel-cxfendpointinPAYLOADdataformat[How +** link:#how-to-deal-with-the-message-for-a-camel-cxf-endpoint-in-payload-dataformat[How to deal with the message for a camel-cxf endpoint in PAYLOAD data format] -** link:#CXF-HowtogetandsetSOAPheadersinPOJOmode[How to get and set SOAP +** link:#how-to-get-and-set-soap-headers-in-pojo-mode[How to get and set SOAP headers in POJO mode] -** link:#CXF-HowtogetandsetSOAPheadersinPAYLOADmode[How to get and set +** link:#how-to-get-and-set-soap-headers-in-payload-mode[How to get and set SOAP headers in PAYLOAD mode] -** link:#CXF-SOAPheadersarenotavailableinMESSAGEmode[SOAP headers are +** link:#soap-headers-are-not-available-in-message-mode[SOAP headers are not available in MESSAGE mode] -** link:#CXF-HowtothrowaSOAPFaultfromCamel[How to throw a SOAP Fault +** link:#how-to-throw-a-soap-fault-from-camel[How to throw a SOAP Fault from Camel] -** link:#CXF-Howtopropagateacamel-cxfendpointrequestandresponsecontext[How +** link:#how-to-propagate-a-camel-cxf-endpoints-request-and-response-context[How to propagate a camel-cxf endpoint's request and response context] -** link:#CXF-AttachmentSupport[Attachment Support] -** link:#CXF-StreamingSupportinPAYLOADmode[Streaming Support in PAYLOAD +** link:#attachment-support[Attachment Support] +** link:#streaming-support-in-payload-mode[Streaming Support in PAYLOAD mode] -** link:#CXF-Usingthege
[camel] branch master updated: [CAMEL-13096] MockEndpoint may not respect expected minimum message count (#2725)
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 1ea6b35 [CAMEL-13096] MockEndpoint may not respect expected minimum
message count (#2725)
1ea6b35 is described below
commit 1ea6b35ed6674bc84f40f5bc92d426443b25b23d
Author: Thomas Diesler
AuthorDate: Tue Jan 22 11:03:55 2019 +0100
[CAMEL-13096] MockEndpoint may not respect expected minimum message count
(#2725)
---
.../main/java/org/apache/camel/component/mock/MockEndpoint.java| 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index 7962a0e..64db1b7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -43,7 +43,6 @@ import org.apache.camel.Message;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.ProcessorBuilder;
import org.apache.camel.impl.InterceptSendToEndpoint;
import org.apache.camel.spi.BrowsableEndpoint;
@@ -508,8 +507,8 @@ public class MockEndpoint extends DefaultEndpoint
implements BrowsableEndpoint {
* Important: This overrides any previous set value using {@link
#expectedMessageCount(int)}
*/
public void expectedHeaderReceived(final String name, final Object value) {
-if (expectedCount == -1) {
-expectedMessageCount(1);
+if (expectedMinimumCount == -1) {
+expectedMinimumMessageCount(1);
}
if (expectedHeaderValues == null) {
expectedHeaderValues =
getCamelContext().getHeadersMapFactory().newMap();
@@ -717,7 +716,7 @@ public class MockEndpoint extends DefaultEndpoint
implements BrowsableEndpoint {
}
if (actualValue instanceof Expression) {
-Class clazz = Object.class;
+Class clazz = Object.class;
if (expectedValue != null) {
clazz = expectedValue.getClass();
}
[camel] branch master updated: Upgrade Brave to version 5.6.1
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 bec96aa Upgrade Brave to version 5.6.1 bec96aa is described below commit bec96aafa60b797f5779ca2449841a23a21592ab Author: Andrea Cosentino AuthorDate: Tue Jan 22 10:51:06 2019 +0100 Upgrade Brave to version 5.6.1 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index dd7e155..efe1146 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -98,7 +98,7 @@ 3.2.1 2.10.0 2.91.0 -5.6.0 +5.6.1 1.12 0.9.5.2 0.9.5.2_2
[camel-k] branch master updated: Bump version to 0.2.1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/master by this push: new 51f2f4c Bump version to 0.2.1-SNAPSHOT 51f2f4c is described below commit 51f2f4ce0def3dbd4315443a62a6ce36746c59da Author: nferraro AuthorDate: Tue Jan 22 09:16:36 2019 +0100 Bump version to 0.2.1-SNAPSHOT --- deploy/camel-catalog.yaml | 2 +- deploy/operator-deployment-kubernetes.yaml | 2 +- deploy/operator-deployment-openshift.yaml | 2 +- deploy/resources.go | 6 +++--- runtime/camel-k-maven-plugin/pom.xml| 2 +- runtime/camel-k-runtime-core/pom.xml| 2 +- runtime/camel-k-runtime-groovy/pom.xml | 2 +- runtime/camel-k-runtime-jvm/pom.xml | 2 +- runtime/camel-k-runtime-kotlin/pom.xml | 2 +- runtime/camel-k-runtime-spring-boot/pom.xml | 2 +- runtime/camel-k-runtime-yaml/pom.xml| 2 +- runtime/camel-knative-http/pom.xml | 2 +- runtime/camel-knative/pom.xml | 2 +- runtime/pom.xml | 2 +- version/version.go | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/deploy/camel-catalog.yaml b/deploy/camel-catalog.yaml index 1a118db..4b3de72 100644 --- a/deploy/camel-catalog.yaml +++ b/deploy/camel-catalog.yaml @@ -1501,7 +1501,7 @@ artifacts: - http: true id: knative passive: false -version: 0.2.0-SNAPSHOT +version: 0.2.1-SNAPSHOT camel-krati: artifactId: camel-krati dataformats: [] diff --git a/deploy/operator-deployment-kubernetes.yaml b/deploy/operator-deployment-kubernetes.yaml index 82ce18d..4e17f11 100644 --- a/deploy/operator-deployment-kubernetes.yaml +++ b/deploy/operator-deployment-kubernetes.yaml @@ -21,7 +21,7 @@ spec: serviceAccountName: camel-k-operator containers: - name: camel-k-operator - image: docker.io/apache/camel-k:0.2.0-SNAPSHOT + image: docker.io/apache/camel-k:0.2.1-SNAPSHOT ports: - containerPort: 6 name: metrics diff --git a/deploy/operator-deployment-openshift.yaml b/deploy/operator-deployment-openshift.yaml index 965db72..4920d03 100644 --- a/deploy/operator-deployment-openshift.yaml +++ b/deploy/operator-deployment-openshift.yaml @@ -21,7 +21,7 @@ spec: serviceAccountName: camel-k-operator containers: - name: camel-k-operator - image: docker.io/apache/camel-k:0.2.0-SNAPSHOT + image: docker.io/apache/camel-k:0.2.1-SNAPSHOT ports: - containerPort: 6 name: metrics diff --git a/deploy/resources.go b/deploy/resources.go index fc54a5b..211bda6 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -1545,7 +1545,7 @@ artifacts: - http: true id: knative passive: false -version: 0.2.0-SNAPSHOT +version: 0.2.1-SNAPSHOT camel-krati: artifactId: camel-krati dataformats: [] @@ -2936,7 +2936,7 @@ spec: serviceAccountName: camel-k-operator containers: - name: camel-k-operator - image: docker.io/apache/camel-k:0.2.0-SNAPSHOT + image: docker.io/apache/camel-k:0.2.1-SNAPSHOT ports: - containerPort: 6 name: metrics @@ -2995,7 +2995,7 @@ spec: serviceAccountName: camel-k-operator containers: - name: camel-k-operator - image: docker.io/apache/camel-k:0.2.0-SNAPSHOT + image: docker.io/apache/camel-k:0.2.1-SNAPSHOT ports: - containerPort: 6 name: metrics diff --git a/runtime/camel-k-maven-plugin/pom.xml b/runtime/camel-k-maven-plugin/pom.xml index 7f702a6..f564e25 100644 --- a/runtime/camel-k-maven-plugin/pom.xml +++ b/runtime/camel-k-maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.k camel-k-runtime-parent -0.2.0-SNAPSHOT +0.2.1-SNAPSHOT 4.0.0 diff --git a/runtime/camel-k-runtime-core/pom.xml b/runtime/camel-k-runtime-core/pom.xml index 10694f0..07a8ab3 100644 --- a/runtime/camel-k-runtime-core/pom.xml +++ b/runtime/camel-k-runtime-core/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.k camel-k-runtime-parent -0.2.0-SNAPSHOT +0.2.1-SNAPSHOT 4.0.0 diff --git a/runtime/camel-k-runtime-groovy/pom.xml b/runtime/camel-k-runtime-groovy/pom.xml index f98f85b..58c8c6c 100644 --- a/runtime/camel-k-runtime-groovy/pom.xml +++ b/runtime/camel-k-runtime-groovy/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.k camel-k-runtime-parent -0.2.0-SNAPSHOT +0.2.1-SNAPSHOT 4.0.0 diff --git a/runtime/camel-k-runtime-jvm/pom.xml b/runtime/camel-k-runtime-jvm/pom.xml index 5a870b3..e20998f 100644 --- a/runtime/camel-k-runtime-jvm/pom.xml +++ b/runtime/c
[camel-k] branch master updated (35d0369 -> 1eadb53)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 35d0369 fix npe on rest trait new c2053bf Sort on linux is different from OSX new 554cfbe Bump version to 0.2.X new 1eadb53 Add standard deployment annotations for knative The 422 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: deploy/camel-catalog.yaml | 2 +- deploy/operator-deployment-kubernetes.yaml | 2 +- deploy/operator-deployment-openshift.yaml | 2 +- deploy/resources.go | 52 ++--- pkg/trait/deployment.go | 10 +- runtime/camel-k-maven-plugin/pom.xml| 2 +- runtime/camel-k-runtime-core/pom.xml| 2 +- runtime/camel-k-runtime-groovy/pom.xml | 2 +- runtime/camel-k-runtime-jvm/pom.xml | 2 +- runtime/camel-k-runtime-kotlin/pom.xml | 2 +- runtime/camel-k-runtime-spring-boot/pom.xml | 2 +- runtime/camel-k-runtime-yaml/pom.xml| 2 +- runtime/camel-knative-http/pom.xml | 2 +- runtime/camel-knative/pom.xml | 2 +- runtime/pom.xml | 2 +- version/version.go | 2 +- 16 files changed, 49 insertions(+), 41 deletions(-)
