camel git commit: CAMEL-11835: cluster service : make a JGroups based cluster service
Repository: camel Updated Branches: refs/heads/master da6aa1ecb -> b584b3d30 CAMEL-11835: cluster service : make a JGroups based cluster service Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b584b3d3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b584b3d3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b584b3d3 Branch: refs/heads/master Commit: b584b3d304127dcaacb6ee12972fded1ae5bdd2d Parents: da6aa1e Author: Andrea TarocchiAuthored: Fri Oct 6 19:39:59 2017 +0200 Committer: Andrea Tarocchi Committed: Fri Oct 6 19:40:11 2017 +0200 -- components/camel-jgroups/pom.xml| 5 + .../jgroups/ha/JGroupsLockClusterService.java | 58 +++ .../jgroups/ha/JGroupsLockClusterView.java | 159 +++ .../src/main/resources/locking.xml | 69 .../jgroups/ha/JGroupsLockMasterTest.java | 104 ...oupsLockClusterServiceAutoConfiguration.java | 51 ++ .../JGroupsLockClusterServiceConfiguration.java | 38 + .../main/resources/META-INF/spring.factories| 3 +- 8 files changed, 486 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b584b3d3/components/camel-jgroups/pom.xml -- diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml index 1b0ab00..9d4bcad 100644 --- a/components/camel-jgroups/pom.xml +++ b/components/camel-jgroups/pom.xml @@ -78,6 +78,11 @@ log4j-slf4j-impl test + +org.apache.camel +camel-master +test + http://git-wip-us.apache.org/repos/asf/camel/blob/b584b3d3/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterService.java -- diff --git a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterService.java b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterService.java new file mode 100644 index 000..d560105 --- /dev/null +++ b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterService.java @@ -0,0 +1,58 @@ +/** + * 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.jgroups.ha; + +import org.apache.camel.impl.ha.AbstractCamelClusterService; + +public class JGroupsLockClusterService extends AbstractCamelClusterService { + +private static final String DEFAULT_JGROUPS_CONFIG = "locking.xml"; +private static final String DEFAULT_JGROUPS_CLUSTERNAME = "jgroups-master"; + +private String jgroupsConfig; +private String jgroupsClusterName; + +public JGroupsLockClusterService() { +this.jgroupsConfig = DEFAULT_JGROUPS_CONFIG; +this.jgroupsClusterName = DEFAULT_JGROUPS_CLUSTERNAME; +} +public JGroupsLockClusterService(String jgroupsConfig, String jgroupsClusterName) { +this.jgroupsConfig = jgroupsConfig; +this.jgroupsClusterName = jgroupsClusterName; +} + +@Override +protected JGroupsLockClusterView createView(String namespace) throws Exception { +return new JGroupsLockClusterView(this, namespace, jgroupsConfig, jgroupsClusterName); +} + +public String getJgroupsConfig() { +return jgroupsConfig; +} + +public void setJgroupsConfig(String jgroupsConfig) { +this.jgroupsConfig = jgroupsConfig; +} + +public String getJgroupsClusterName() { +return jgroupsClusterName; +} + +public void setJgroupsClusterName(String jgroupsClusterName) { +this.jgroupsClusterName = jgroupsClusterName; +} +} http://git-wip-us.apache.org/repos/asf/camel/blob/b584b3d3/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/ha/JGroupsLockClusterView.java
[1/2] camel git commit: CAMEL-11308: Add workaround for jackson to map POJO BigDecimal as Dobule so it works with MongoDB again.
Repository: camel Updated Branches: refs/heads/camel-2.19.x ebb467848 -> 798ed7296 refs/heads/master d983c0353 -> da6aa1ecb CAMEL-11308: Add workaround for jackson to map POJO BigDecimal as Dobule so it works with MongoDB again. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da6aa1ec Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da6aa1ec Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da6aa1ec Branch: refs/heads/master Commit: da6aa1ecb9559c973b6f4b0cee526846335821e8 Parents: d983c03 Author: Claus IbsenAuthored: Fri Oct 6 15:25:36 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 15:25:36 2017 +0200 -- components/camel-mongodb/pom.xml| 52 - .../converters/MongoDbFallbackConverter.java| 9 +++ .../mongodb/MongoDbBigDecimalConverterTest.java | 60 +++ .../src/test/resources/log4j2.properties| 2 +- .../converters/MongoDbFallbackConverter.java| 17 ++ .../MongoDbBigDecimalConverterTest.java | 61 6 files changed, 174 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/da6aa1ec/components/camel-mongodb/pom.xml -- diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index ac4a728..58d5945 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -43,7 +43,7 @@ camel-core - + org.apache.camel camel-jackson @@ -95,30 +95,30 @@ - - - -aix - - -AIX - - - -true - - - -hpux - - -HP-UX - - - -true - - - + + + + aix + + + AIX + + + +true + + + + hpux + + + HP-UX + + + +true + + + http://git-wip-us.apache.org/repos/asf/camel/blob/da6aa1ec/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbFallbackConverter.java -- diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbFallbackConverter.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbFallbackConverter.java index 134c2f9..a055f67 100644 --- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbFallbackConverter.java +++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbFallbackConverter.java @@ -16,6 +16,7 @@ */ package org.apache.camel.component.mongodb.converters; +import java.math.BigDecimal; import java.util.Map; import com.fasterxml.jackson.databind.ObjectMapper; @@ -72,6 +73,14 @@ public final class MongoDbFallbackConverter { // okay then fallback and use jackson if (type == DBObject.class) { Map m = OBJECT_MAPPER.convertValue(value, Map.class); +// workaround problem with mongodb for BigDecimal should be Double +for (Map.Entry entry : m.entrySet()) { +Object v = entry.getValue(); +if (v instanceof BigDecimal) { +v = Double.valueOf(v.toString()); +entry.setValue(v); +} +} return new BasicDBObject(m); } http://git-wip-us.apache.org/repos/asf/camel/blob/da6aa1ec/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbBigDecimalConverterTest.java -- diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbBigDecimalConverterTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbBigDecimalConverterTest.java new file mode 100644 index 000..e07ecf6 --- /dev/null +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbBigDecimalConverterTest.java @@ -0,0 +1,60 @@ +/** + * 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,
[2/2] camel git commit: CAMEL-11308: Add workaround for jackson to map POJO BigDecimal as Dobule so it works with MongoDB again.
CAMEL-11308: Add workaround for jackson to map POJO BigDecimal as Dobule so it works with MongoDB again. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/798ed729 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/798ed729 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/798ed729 Branch: refs/heads/camel-2.19.x Commit: 798ed7296948175cf6e35882102939e63527ee48 Parents: ebb4678 Author: Claus IbsenAuthored: Fri Oct 6 15:25:36 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 15:25:57 2017 +0200 -- components/camel-mongodb/pom.xml| 52 - .../converters/MongoDbFallbackConverter.java| 9 +++ .../mongodb/MongoDbBigDecimalConverterTest.java | 60 +++ .../src/test/resources/log4j2.properties| 2 +- .../converters/MongoDbFallbackConverter.java| 17 ++ .../MongoDbBigDecimalConverterTest.java | 61 6 files changed, 174 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/798ed729/components/camel-mongodb/pom.xml -- diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index 4355ea0..b6018ba 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -43,7 +43,7 @@ camel-core - + org.apache.camel camel-jackson @@ -95,30 +95,30 @@ - - - -aix - - -AIX - - - -true - - - -hpux - - -HP-UX - - - -true - - - + + + + aix + + + AIX + + + +true + + + + hpux + + + HP-UX + + + +true + + + http://git-wip-us.apache.org/repos/asf/camel/blob/798ed729/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbFallbackConverter.java -- diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbFallbackConverter.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbFallbackConverter.java index 134c2f9..a055f67 100644 --- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbFallbackConverter.java +++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/converters/MongoDbFallbackConverter.java @@ -16,6 +16,7 @@ */ package org.apache.camel.component.mongodb.converters; +import java.math.BigDecimal; import java.util.Map; import com.fasterxml.jackson.databind.ObjectMapper; @@ -72,6 +73,14 @@ public final class MongoDbFallbackConverter { // okay then fallback and use jackson if (type == DBObject.class) { Map m = OBJECT_MAPPER.convertValue(value, Map.class); +// workaround problem with mongodb for BigDecimal should be Double +for (Map.Entry entry : m.entrySet()) { +Object v = entry.getValue(); +if (v instanceof BigDecimal) { +v = Double.valueOf(v.toString()); +entry.setValue(v); +} +} return new BasicDBObject(m); } http://git-wip-us.apache.org/repos/asf/camel/blob/798ed729/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbBigDecimalConverterTest.java -- diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbBigDecimalConverterTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbBigDecimalConverterTest.java new file mode 100644 index 000..e07ecf6 --- /dev/null +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbBigDecimalConverterTest.java @@ -0,0 +1,60 @@ +/** + * 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
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master b7e8974f2 -> d983c0353 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d983c035 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d983c035 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d983c035 Branch: refs/heads/master Commit: d983c0353ce5754de21b36d6ff953cf654693a0b Parents: b7e8974 Author: Claus IbsenAuthored: Fri Oct 6 14:38:29 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 14:38:29 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d983c035/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml -- 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 90f9778..32a4d37 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 @@ -58,7 +58,7 @@ com.dropbox.core dropbox-core-sdk -1.8.2 +3.0.4 com.github.dozermapper
svn commit: r1019180 - in /websites/production/camel/content: cache/main.pageCache camel-2200-release.html
Author: buildbot Date: Fri Oct 6 12:19:38 2017 New Revision: 1019180 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2200-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2200-release.html == --- websites/production/camel/content/camel-2200-release.html (original) +++ websites/production/camel/content/camel-2200-release.html Fri Oct 6 12:19:38 2017 @@ -88,7 +88,7 @@ Camel 2.20.0 Release (currently in progress)http://camel.apache.org/images/camel-box-small.png; data-image-src="http://camel.apache.org/images/camel-box-small.png;> -New and NoteworthyWelcome to the x.y.z release which approx XXX issues resolved (new features, improvements and bug fixes such as...)Support for Java 9 as a technical preview. Official support for Java 9 will be forthcoming in the following releases. (source code builds and tests on a Java 9 JVM).Many internal optimisations in the Camel routing engine, such as reducing thread contention when updating JMX statistics, reducing internal state objects to claim less memory, and reducing the number of allocated objects to reduce overhead on GC etc, and much more.CamelSpring Boot now supports referring to bean's (lookup in Spring Boot) by their id names in the configuration files (application.properties|yaml file) when you configure any of the Camel starter components.CamelSpring Boot now also supports using Spring (auto) configuration to configure CamelContext when using Spring XML files with camelContext.Worked to make Apache Camel more ready and compatible with the upcoming Spring Boot 2 and Spring Framework 5. Officially support for these is expected in Camel 2.21 release.TheJMS component now includes JMS 2.0 functionality to use shared (durable and non-durable) topic.The https://github.com/apache/camel/blob/master/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc; rel="nofollow">Camel Maven Plugin can now validate for duplicate route ids in your source code.SplittedTwittercomponent into 4, now directmessage, seach, streaming and timeline has its own endpoint and scheme. Seehttps://github.com /apache/camel/blob/master/components/camel-twitter/src/main/docs/twitter.adoc" rel="nofollow">documentationfor more detailsIntroducedHeadersMapFactory SPI which allows to plugin different implementations, or to use case sensitive maps that are faster than the default.AllowKafka consumer to break on first unhandled exception, sync the offset from last known good, and then re-connect after one timeout cycle, to restart consuming again. This avoids loosing the failed message, but retry it again on either this consumer, or another consume which was re-balanced by Kafka. This requires to be turned on with the new option breakOnFirstError which can be set on both component or endpoint level.Starting and stoping the CamelContext when used with Spring framework (SpringCamelContext) was revised to ensure that the Camel context is started last - when all resources should be available, and stopp ed first - while all resources are still availableTheSQL Stored Procedure now supports specifying custom types as FQN classnames and scale in numeric values.Using Camel withSpring now supports calling Bean by their FQN name and let Spring instantiate the bean using auto-wired constructor's as opposed to only supporting a no-arg constructor.Using Camel with Spring Boot can now easily filter Java RouteBuilder routes via ANT-path pattern style to either include or exclude class names, which can be configured using Spring configuration properties.TheWire Tap EIP can now be configured to use static endpoint uri instead of being dynamic evaluated via the Simple language. TheWire Tap EIP will now complete any inflight wire tapped exchanges while shutting down to give them time to complete graceful.TheJSonPath can now split and write each row as a string value (JSon format) instead of using a Map/POJO type with the new writeAsString option.ThePOJO Consuming Consume annotation on POJO classes now support a predicate (using simple language) to filter the message. See the camel-example-spring-boot-pojo for more.The internal JSon parser that is used by camel-catalog and runtime camel-catalog (from camel-core) now embeds a simple-json v2 parser which means it can parse any kind of json formatted document (before it was confined to its own dense format)Infinispan, Ehcache and Hazelcast caches can automatically discover cache managers in spring-bootIntroduceda n experimentalHealth Checks SPI that can be leveraged in in cloud environments to detect non healthy
[2/3] camel git commit: CAMEL-11751: Upgrade dropbox. This closes #1990
CAMEL-11751: Upgrade dropbox. This closes #1990 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1aab5180 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1aab5180 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1aab5180 Branch: refs/heads/master Commit: 1aab5180e48f83257756f6f5be65acfa992f496d Parents: f549e03 Author: Claus IbsenAuthored: Fri Oct 6 13:18:30 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 13:18:30 2017 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1aab5180/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 1741d46..92cf7f1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -189,7 +189,7 @@ 1.6.1_5 6.1.0 7.3.0.Final -1.8.2 +3.0.4 3.4 3.3.0-v20070426 2.1.5
[1/3] camel git commit: CAMEL-11751: Upgraded dropbox-core SDK to 3.0.4
Repository: camel Updated Branches: refs/heads/master ac17984f8 -> b7e8974f2 CAMEL-11751: Upgraded dropbox-core SDK to 3.0.4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f549e039 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f549e039 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f549e039 Branch: refs/heads/master Commit: f549e039d257493e62e35a08938e0a1f863f13c8 Parents: ac17984 Author: Viral GohelAuthored: Mon Oct 2 19:23:25 2017 +0530 Committer: Claus Ibsen Committed: Fri Oct 6 13:17:51 2017 +0200 -- .../src/main/docs/dropbox-component.adoc| 2 +- .../component/dropbox/DropboxConfiguration.java | 10 +- .../dropbox/core/DropboxAPIFacade.java | 184 ++- .../dropbox/dto/DropboxSearchResult.java| 8 +- .../DropboxScheduledPollSearchConsumer.java | 6 +- .../producer/DropboxSearchProducer.java | 6 +- 6 files changed, 110 insertions(+), 106 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f549e039/components/camel-dropbox/src/main/docs/dropbox-component.adoc -- diff --git a/components/camel-dropbox/src/main/docs/dropbox-component.adoc b/components/camel-dropbox/src/main/docs/dropbox-component.adoc index 92f32de..a40e727 100644 --- a/components/camel-dropbox/src/main/docs/dropbox-component.adoc +++ b/components/camel-dropbox/src/main/docs/dropbox-component.adoc @@ -91,7 +91,7 @@ with the following path and query parameters: |=== | Name | Description | Default | Type | *accessToken* (common) | *Required* The access token to make API requests for a specific Dropbox user | | String -| *client* (common) | To use an existing DbxClient instance as DropBox client. | | DbxClient +| *client* (common) | To use an existing DbxClient instance as DropBox client. | | DbxClientV2 | *clientIdentifier* (common) | *Required* Name of the app registered to make API requests | | String | *localPath* (common) | Optional folder or file to upload on Dropbox from the local filesystem. If this option has not been configured then the message body is used as the content to upload. | | String | *newRemotePath* (common) | Destination file or folder | | String http://git-wip-us.apache.org/repos/asf/camel/blob/f549e039/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java -- diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java index e02c82d..3263fdc 100755 --- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java +++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java @@ -18,8 +18,8 @@ package org.apache.camel.component.dropbox; import java.util.Locale; -import com.dropbox.core.DbxClient; import com.dropbox.core.DbxRequestConfig; +import com.dropbox.core.v2.DbxClientV2; import org.apache.camel.component.dropbox.util.DropboxOperation; import org.apache.camel.component.dropbox.util.DropboxUploadMode; import org.apache.camel.spi.Metadata; @@ -56,16 +56,16 @@ public class DropboxConfiguration { private String clientIdentifier; //reference to dropbox client @UriParam -private DbxClient client; +private DbxClientV2 client; /** * To use an existing DbxClient instance as DropBox client. */ -public void setClient(DbxClient client) { +public void setClient(DbxClientV2 client) { this.client = client; } -public DbxClient getClient() { +public DbxClientV2 getClient() { return client; } @@ -74,7 +74,7 @@ public class DropboxConfiguration { */ public void createClient() { DbxRequestConfig config = new DbxRequestConfig(clientIdentifier, Locale.getDefault().toString()); -this.client = new DbxClient(config, accessToken); +this.client = new DbxClientV2(config, accessToken); } public String getAccessToken() { http://git-wip-us.apache.org/repos/asf/camel/blob/f549e039/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java -- diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java index c6a1739..7992aa1 100755 ---
[3/3] camel git commit: CAMEL-11751: Make camel-dropbox install in karaf
CAMEL-11751: Make camel-dropbox install in karaf Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7e8974f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7e8974f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7e8974f Branch: refs/heads/master Commit: b7e8974f276beebfc1c9d5aaecacfec7ce6b55be Parents: 1aab518 Author: Claus IbsenAuthored: Fri Oct 6 13:32:41 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 13:32:41 2017 +0200 -- platforms/karaf/features/src/main/resources/features.xml | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b7e8974f/platforms/karaf/features/src/main/resources/features.xml -- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 1257bbd..ecb736e 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -539,9 +539,14 @@ mvn:commons-io/commons-io/${commons-io-version} mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version} mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version} -wrap:mvn:com.dropbox.core/dropbox-core-sdk/${dropbox-version} +mvn:com.dropbox.core/dropbox-core-sdk/${dropbox-version} + +wrap:mvn:com.google.android/android/4.1.1.4 +wrap:mvn:com.google.appengine/appengine-api-1.0-sdk/1.9.38 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${squareup-okhttp-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version} +wrap:mvn:com.squareup.okhttp3/okhttp/3.5.0 mvn:org.apache.camel/camel-dropbox/${project.version}
[1/2] camel git commit: Polished
Repository: camel Updated Branches: refs/heads/master fb8d3acd0 -> ac17984f8 Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cda4cb6a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cda4cb6a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cda4cb6a Branch: refs/heads/master Commit: cda4cb6a8ba4055160037f0bcef28bc5be9f32df Parents: fb8d3ac Author: Claus IbsenAuthored: Fri Oct 6 12:08:22 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 12:08:22 2017 +0200 -- .../main/java/org/apache/camel/model/InterceptDefinition.java | 5 + .../main/java/org/apache/camel/model/ProcessorDefinition.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/cda4cb6a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java -- diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java index 1196133..5acd5b6 100644 --- a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java @@ -88,10 +88,7 @@ public class InterceptDefinition extends OutputDefinition { if (interceptedTarget != null) { // wrap in a pipeline so we continue routing to the next -List list = new ArrayList(2); -list.add(output); -list.add(interceptedTarget); -return new Pipeline(context, list); +return Pipeline.newInstance(context, output, interceptedTarget); } else { return output; } http://git-wip-us.apache.org/repos/asf/camel/blob/cda4cb6a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java -- diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java index 500b043..0ac2474 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java @@ -411,7 +411,7 @@ public abstract class ProcessorDefinition * to using a {@link Pipeline} but derived classes could change the behaviour */ protected Processor createCompositeProcessor(RouteContext routeContext, List list) throws Exception { -return new Pipeline(routeContext.getCamelContext(), list); +return Pipeline.newInstance(routeContext.getCamelContext(), list); } /**
[2/2] camel git commit: Upgrade ActiveMQ
Upgrade ActiveMQ Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ac17984f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ac17984f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ac17984f Branch: refs/heads/master Commit: ac17984f89c0e27d504b621e1f8d851bc9077076 Parents: cda4cb6 Author: Claus IbsenAuthored: Fri Oct 6 12:20:33 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 12:20:33 2017 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ac17984f/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 781f8f0..1741d46 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -40,7 +40,7 @@ 1.1.3 -5.15.0 +5.15.1 2.3.0 1.0.2.v20150114 2.0.36
camel git commit: Polished should be in A..Z order
Repository: camel Updated Branches: refs/heads/master e37cf3fde -> fb8d3acd0 Polished should be in A..Z order Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fb8d3acd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fb8d3acd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fb8d3acd Branch: refs/heads/master Commit: fb8d3acd025d1fadfd506b4c5dbe53c4d675e197 Parents: e37cf3f Author: Claus IbsenAuthored: Fri Oct 6 11:38:12 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 12:04:11 2017 +0200 -- apache-camel/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/fb8d3acd/apache-camel/pom.xml -- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index 506906b..03111c6 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -1845,12 +1845,12 @@ org.apache.camel - camel-master-starter + camel-mail-starter ${project.version} org.apache.camel - camel-mail-starter + camel-master-starter ${project.version}
[camel] Git Push Summary
Repository: camel Updated Branches: refs/heads/connector-async [deleted] 5b1b92669
camel git commit: camel-connector before/after should support asy...
Repository: camel Updated Branches: refs/heads/master e007a6c2c -> e37cf3fde camel-connector before/after should support asy... ...nc routing engine via pipeline which also is simpler code Modifies the `DefaultConnectorEndpoint` to create `Pipeline` based `Consumer`s and `Producer`s. Additional helper method was added to `Pipeline` to create it for such use cases. Cleans up `Pipeline` by adding `@Override` and removes interfaces that are already inherited from `MulticastProcessor`. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e37cf3fd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e37cf3fd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e37cf3fd Branch: refs/heads/master Commit: e37cf3fde55946973dd121cfb48ce7ae4806adc2 Parents: e007a6c Author: Claus IbsenAuthored: Fri Oct 6 10:14:28 2017 +0200 Committer: Zoran Regvart Committed: Fri Oct 6 11:58:21 2017 +0200 -- .../org/apache/camel/processor/Pipeline.java| 33 +-- .../connector/ConnectorConsumerProcessor.java | 94 .../component/connector/ConnectorProducer.java | 50 +++ .../connector/DefaultConnectorEndpoint.java | 25 -- 4 files changed, 59 insertions(+), 143 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e37cf3fd/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java -- diff --git a/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java b/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java index b35252d..e75c20c 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java +++ b/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java @@ -16,6 +16,7 @@ */ package org.apache.camel.processor; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -25,8 +26,6 @@ import org.apache.camel.AsyncProcessor; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.Traceable; -import org.apache.camel.spi.IdAware; import org.apache.camel.util.AsyncProcessorConverterHelper; import org.apache.camel.util.AsyncProcessorHelper; import org.apache.camel.util.ExchangeHelper; @@ -41,7 +40,7 @@ import static org.apache.camel.processor.PipelineHelper.continueProcessing; * * @version */ -public class Pipeline extends MulticastProcessor implements AsyncProcessor, Traceable, IdAware { +public class Pipeline extends MulticastProcessor { private static final Logger LOG = LoggerFactory.getLogger(Pipeline.class); private String id; @@ -59,10 +58,29 @@ public class Pipeline extends MulticastProcessor implements AsyncProcessor, Trac return new Pipeline(camelContext, processors); } +public static Processor newInstance(final CamelContext camelContext, final Processor... processors) { +if (processors == null || processors.length == 0) { +return null; +} else if (processors.length == 1) { +return processors[0]; +} + +final List toBeProcessed = new ArrayList<>(processors.length); +for (Processor processor : processors) { +if (processor != null) { +toBeProcessed.add(processor); +} +} + +return new Pipeline(camelContext, toBeProcessed); +} + +@Override public void process(Exchange exchange) throws Exception { AsyncProcessorHelper.process(this, exchange); } +@Override public boolean process(Exchange exchange, AsyncCallback callback) { Iterator processors = getProcessors().iterator(); Exchange nextExchange = exchange; @@ -118,7 +136,8 @@ public class Pipeline extends MulticastProcessor implements AsyncProcessor, Trac // implement asynchronous routing logic in callback so we can have the callback being // triggered and then continue routing where we left boolean sync = asyncProcessor.process(exchange, new AsyncCallback() { -public void done(boolean doneSync) { +@Override +public void done(final boolean doneSync) { // we only have to handle async completion of the pipeline if (doneSync) { return; @@ -135,8 +154,8 @@ public class Pipeline extends MulticastProcessor implements AsyncProcessor, Trac } nextExchange = createNextExchange(nextExchange); -doneSync = process(original, nextExchange, callback, processors, processor); -if (!doneSync) { +
camel git commit: Fix bom parent
Repository: camel Updated Branches: refs/heads/master aa56fd10c -> e007a6c2c Fix bom parent Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e007a6c2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e007a6c2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e007a6c2 Branch: refs/heads/master Commit: e007a6c2c34b63335869feccef17a104e9eebce1 Parents: aa56fd1 Author: Nicola FerraroAuthored: Fri Oct 6 11:50:26 2017 +0200 Committer: Nicola Ferraro Committed: Fri Oct 6 11:50:26 2017 +0200 -- bom/camel-bom/pom.xml | 1 + bom/target-template-pom.xml | 1 + pom.xml | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e007a6c2/bom/camel-bom/pom.xml -- diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml index 7eb3bb0..7b968de 100644 --- a/bom/camel-bom/pom.xml +++ b/bom/camel-bom/pom.xml @@ -23,6 +23,7 @@ org.apache.camel camel 2.20.0-SNAPSHOT +../../ camel-bom pom http://git-wip-us.apache.org/repos/asf/camel/blob/e007a6c2/bom/target-template-pom.xml -- diff --git a/bom/target-template-pom.xml b/bom/target-template-pom.xml index 14cde64..81982c4 100644 --- a/bom/target-template-pom.xml +++ b/bom/target-template-pom.xml @@ -27,6 +27,7 @@ org.apache.camel camel ${project.version} +../../ camel-bom http://git-wip-us.apache.org/repos/asf/camel/blob/e007a6c2/pom.xml -- diff --git a/pom.xml b/pom.xml index 9d6e4d6..f1ddf31 100755 --- a/pom.xml +++ b/pom.xml @@ -140,9 +140,7 @@ parent etc - buildingtools camel-core components
[2/3] camel git commit: Fixed camel-master should have been camel-master-starter in that pom file
Fixed camel-master should have been camel-master-starter in that pom file Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff197c22 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff197c22 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff197c22 Branch: refs/heads/master Commit: ff197c224d4d535511f7f2973b1929032f49c755 Parents: 7c14aa1 Author: Claus IbsenAuthored: Fri Oct 6 11:31:18 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 11:31:18 2017 +0200 -- apache-camel/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ff197c22/apache-camel/pom.xml -- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index dd15392..506906b 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -1845,7 +1845,7 @@ org.apache.camel - camel-master + camel-master-starter ${project.version}
[3/3] camel git commit: Disable non-working bom module. Need to fix this.
Disable non-working bom module. Need to fix this. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aa56fd10 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aa56fd10 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aa56fd10 Branch: refs/heads/master Commit: aa56fd10c71d4ae65c636710249a49f1e72a55e8 Parents: ff197c2 Author: Claus IbsenAuthored: Fri Oct 6 11:34:05 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 11:34:05 2017 +0200 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/aa56fd10/pom.xml -- diff --git a/pom.xml b/pom.xml index f1ddf31..9d6e4d6 100755 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,9 @@ parent etc + buildingtools camel-core components
[1/3] camel git commit: Revert "camel-bom: fix relative path to parent pom"
Repository: camel Updated Branches: refs/heads/master 5dbd6ffcc -> aa56fd10c Revert "camel-bom: fix relative path to parent pom" This reverts commit 497f51e3a400f3e415ddf015a766726e2845ade3. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c14aa1c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c14aa1c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c14aa1c Branch: refs/heads/master Commit: 7c14aa1cdce06a5f888508da26fd40fe11bfc490 Parents: 5dbd6ff Author: Claus IbsenAuthored: Fri Oct 6 11:27:49 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 11:27:49 2017 +0200 -- bom/camel-bom/pom.xml | 1 - bom/target-template-pom.xml | 1 - 2 files changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7c14aa1c/bom/camel-bom/pom.xml -- diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml index 611a3e5..7eb3bb0 100644 --- a/bom/camel-bom/pom.xml +++ b/bom/camel-bom/pom.xml @@ -23,7 +23,6 @@ org.apache.camel camel 2.20.0-SNAPSHOT -../../apache-camel camel-bom pom http://git-wip-us.apache.org/repos/asf/camel/blob/7c14aa1c/bom/target-template-pom.xml -- diff --git a/bom/target-template-pom.xml b/bom/target-template-pom.xml index 74ab3ab..14cde64 100644 --- a/bom/target-template-pom.xml +++ b/bom/target-template-pom.xml @@ -27,7 +27,6 @@ org.apache.camel camel ${project.version} -../../apache-camel camel-bom
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/19907 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 git commit: Deprecate scala archetype
Repository: camel Updated Branches: refs/heads/master 8ab9bc408 -> 5dbd6ffcc Deprecate scala archetype Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5dbd6ffc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5dbd6ffc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5dbd6ffc Branch: refs/heads/master Commit: 5dbd6ffcc14baa25ee496943182733ee49df Parents: 8ab9bc4 Author: Claus IbsenAuthored: Fri Oct 6 10:53:09 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 10:53:09 2017 +0200 -- archetypes/camel-archetype-scala/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5dbd6ffc/archetypes/camel-archetype-scala/pom.xml -- diff --git a/archetypes/camel-archetype-scala/pom.xml b/archetypes/camel-archetype-scala/pom.xml index 04aab74..3dfffb7 100644 --- a/archetypes/camel-archetype-scala/pom.xml +++ b/archetypes/camel-archetype-scala/pom.xml @@ -29,7 +29,7 @@ org.apache.camel.archetypes camel-archetype-scala - Camel :: Archetypes :: Scala Router + Camel :: Archetypes :: Scala Router (deprecated) Creates a new Camel project using Scala DSL. maven-archetype
[3/4] camel git commit: CAMEL-11881: Handling special arguments when declaring queues
CAMEL-11881: Handling special arguments when declaring queues Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a57a06e6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a57a06e6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a57a06e6 Branch: refs/heads/camel-2.19.x Commit: a57a06e609970427bb58e0e7a2215fe7352824e6 Parents: 2b8e5ad Author: Veiga Ortiz, HeÌctorAuthored: Thu Oct 5 19:16:32 2017 -0500 Committer: Claus Ibsen Committed: Fri Oct 6 10:29:50 2017 +0200 -- .../component/rabbitmq/RabbitMQConstants.java | 3 +++ .../rabbitmq/RabbitMQDeclareSupport.java | 18 ++ 2 files changed, 21 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a57a06e6/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java -- diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java index 0ae82b2..fc6a326 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java @@ -42,6 +42,9 @@ public final class RabbitMQConstants { public static final String RABBITMQ_DEAD_LETTER_ROUTING_KEY = "x-dead-letter-routing-key"; public static final String RABBITMQ_DIRECT_REPLY_EXCHANGE = ""; public static final String RABBITMQ_DIRECT_REPLY_ROUTING_KEY = "amq.rabbitmq.reply-to"; +public static final String RABBITMQ_QUEUE_LENGHT_LIMIT_KEY = "x-max-length"; +public static final String RABBITMQ_QUEUE_MESSAGE_TTL_KEY = "x-message-ttl"; +public static final String RABBITMQ_QUEUE_TTL_KEY = "x-expires"; private RabbitMQConstants() { //Constants class http://git-wip-us.apache.org/repos/asf/camel/blob/a57a06e6/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java -- diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java index b38eae9..03fc325 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java @@ -60,9 +60,27 @@ public class RabbitMQDeclareSupport { populateQueueArgumentsFromDeadLetterExchange(queueArgs); populateQueueArgumentsFromConfigurer(queueArgs); queueArgs.putAll(endpoint.getQueueArgs()); +formatSpecialQueueArguments(queueArgs); return queueArgs; } +private void formatSpecialQueueArguments(Map queueArgs) { +Object queueLengthLimit = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_LENGHT_LIMIT_KEY); +if (queueLengthLimit != null && queueLengthLimit instanceof String) { +queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_LENGHT_LIMIT_KEY, Long.parseLong((String) queueLengthLimit)); +} + +Object queueMessageTtl = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_MESSAGE_TTL_KEY); +if (queueMessageTtl != null && queueMessageTtl instanceof String) { +queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_MESSAGE_TTL_KEY, Long.parseLong((String) queueMessageTtl)); +} + +Object queueExpiration = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_TTL_KEY); +if (queueExpiration != null && queueExpiration instanceof String) { +queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_TTL_KEY, Long.parseLong((String) queueExpiration)); +} +} + private Map populateQueueArgumentsFromDeadLetterExchange(final Map queueArgs) { if (endpoint.getDeadLetterExchange() != null) { queueArgs.put(RabbitMQConstants.RABBITMQ_DEAD_LETTER_EXCHANGE, endpoint.getDeadLetterExchange());
[2/4] camel git commit: Polished and fixed typo. This closes #2010
Polished and fixed typo. This closes #2010 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8ab9bc40 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8ab9bc40 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8ab9bc40 Branch: refs/heads/master Commit: 8ab9bc4085d4316e381acf0beca333f0ad774402 Parents: 7dfd373 Author: Claus IbsenAuthored: Fri Oct 6 10:29:21 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 10:29:21 2017 +0200 -- .../apache/camel/component/rabbitmq/RabbitMQConstants.java | 2 +- .../camel/component/rabbitmq/RabbitMQDeclareSupport.java| 9 - 2 files changed, 5 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8ab9bc40/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java -- diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java index fc6a326..cc7bf32 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java @@ -42,7 +42,7 @@ public final class RabbitMQConstants { public static final String RABBITMQ_DEAD_LETTER_ROUTING_KEY = "x-dead-letter-routing-key"; public static final String RABBITMQ_DIRECT_REPLY_EXCHANGE = ""; public static final String RABBITMQ_DIRECT_REPLY_ROUTING_KEY = "amq.rabbitmq.reply-to"; -public static final String RABBITMQ_QUEUE_LENGHT_LIMIT_KEY = "x-max-length"; +public static final String RABBITMQ_QUEUE_LENGTH_LIMIT_KEY = "x-max-length"; public static final String RABBITMQ_QUEUE_MESSAGE_TTL_KEY = "x-message-ttl"; public static final String RABBITMQ_QUEUE_TTL_KEY = "x-expires"; http://git-wip-us.apache.org/repos/asf/camel/blob/8ab9bc40/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java -- diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java index 982dd27..99c425a 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java @@ -66,9 +66,10 @@ public class RabbitMQDeclareSupport { } private void formatSpecialQueueArguments(Map queueArgs) { -Object queueLengthLimit = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_LENGHT_LIMIT_KEY); +// some arguments must be in numeric values so we need to fix this +Object queueLengthLimit = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_LENGTH_LIMIT_KEY); if (queueLengthLimit != null && queueLengthLimit instanceof String) { -queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_LENGHT_LIMIT_KEY, Long.parseLong((String) queueLengthLimit)); +queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_LENGTH_LIMIT_KEY, Long.parseLong((String) queueLengthLimit)); } Object queueMessageTtl = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_MESSAGE_TTL_KEY); @@ -82,13 +83,11 @@ public class RabbitMQDeclareSupport { } } -private Map populateQueueArgumentsFromDeadLetterExchange(final Map queueArgs) { +private void populateQueueArgumentsFromDeadLetterExchange(final Map queueArgs) { if (endpoint.getDeadLetterExchange() != null) { queueArgs.put(RabbitMQConstants.RABBITMQ_DEAD_LETTER_EXCHANGE, endpoint.getDeadLetterExchange()); queueArgs.put(RabbitMQConstants.RABBITMQ_DEAD_LETTER_ROUTING_KEY, endpoint.getDeadLetterRoutingKey()); } - -return queueArgs; } private Map resolvedExchangeArguments() {
[1/4] camel git commit: CAMEL-11881: Handling special arguments when declaring queues
Repository: camel Updated Branches: refs/heads/camel-2.19.x 2b8e5adca -> ebb467848 refs/heads/master 497f51e3a -> 8ab9bc408 CAMEL-11881: Handling special arguments when declaring queues Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7dfd373e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7dfd373e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7dfd373e Branch: refs/heads/master Commit: 7dfd373eda68c17dd5efec952eaeab048ca99b9f Parents: 497f51e Author: Veiga Ortiz, HeÌctorAuthored: Thu Oct 5 19:16:32 2017 -0500 Committer: Claus Ibsen Committed: Fri Oct 6 10:27:12 2017 +0200 -- .../component/rabbitmq/RabbitMQConstants.java | 3 +++ .../rabbitmq/RabbitMQDeclareSupport.java | 18 ++ 2 files changed, 21 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7dfd373e/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java -- diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java index 0ae82b2..fc6a326 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java @@ -42,6 +42,9 @@ public final class RabbitMQConstants { public static final String RABBITMQ_DEAD_LETTER_ROUTING_KEY = "x-dead-letter-routing-key"; public static final String RABBITMQ_DIRECT_REPLY_EXCHANGE = ""; public static final String RABBITMQ_DIRECT_REPLY_ROUTING_KEY = "amq.rabbitmq.reply-to"; +public static final String RABBITMQ_QUEUE_LENGHT_LIMIT_KEY = "x-max-length"; +public static final String RABBITMQ_QUEUE_MESSAGE_TTL_KEY = "x-message-ttl"; +public static final String RABBITMQ_QUEUE_TTL_KEY = "x-expires"; private RabbitMQConstants() { //Constants class http://git-wip-us.apache.org/repos/asf/camel/blob/7dfd373e/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java -- diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java index 90e993e..982dd27 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java @@ -61,9 +61,27 @@ public class RabbitMQDeclareSupport { populateQueueArgumentsFromDeadLetterExchange(queueArgs); populateQueueArgumentsFromConfigurer(queueArgs); queueArgs.putAll(endpoint.getQueueArgs()); +formatSpecialQueueArguments(queueArgs); return queueArgs; } +private void formatSpecialQueueArguments(Map queueArgs) { +Object queueLengthLimit = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_LENGHT_LIMIT_KEY); +if (queueLengthLimit != null && queueLengthLimit instanceof String) { +queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_LENGHT_LIMIT_KEY, Long.parseLong((String) queueLengthLimit)); +} + +Object queueMessageTtl = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_MESSAGE_TTL_KEY); +if (queueMessageTtl != null && queueMessageTtl instanceof String) { +queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_MESSAGE_TTL_KEY, Long.parseLong((String) queueMessageTtl)); +} + +Object queueExpiration = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_TTL_KEY); +if (queueExpiration != null && queueExpiration instanceof String) { +queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_TTL_KEY, Long.parseLong((String) queueExpiration)); +} +} + private Map populateQueueArgumentsFromDeadLetterExchange(final Map queueArgs) { if (endpoint.getDeadLetterExchange() != null) { queueArgs.put(RabbitMQConstants.RABBITMQ_DEAD_LETTER_EXCHANGE, endpoint.getDeadLetterExchange());
camel git commit: camel-bom: fix relative path to parent pom
Repository: camel Updated Branches: refs/heads/master a12916c22 -> 497f51e3a camel-bom: fix relative path to parent pom Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/497f51e3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/497f51e3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/497f51e3 Branch: refs/heads/master Commit: 497f51e3a400f3e415ddf015a766726e2845ade3 Parents: a12916c Author: Pascal SchumacherAuthored: Thu Oct 5 19:46:08 2017 +0200 Committer: Nicola Ferraro Committed: Fri Oct 6 10:21:07 2017 +0200 -- bom/camel-bom/pom.xml | 1 + bom/target-template-pom.xml | 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/497f51e3/bom/camel-bom/pom.xml -- diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml index 7eb3bb0..611a3e5 100644 --- a/bom/camel-bom/pom.xml +++ b/bom/camel-bom/pom.xml @@ -23,6 +23,7 @@ org.apache.camel camel 2.20.0-SNAPSHOT +../../apache-camel camel-bom pom http://git-wip-us.apache.org/repos/asf/camel/blob/497f51e3/bom/target-template-pom.xml -- diff --git a/bom/target-template-pom.xml b/bom/target-template-pom.xml index 14cde64..74ab3ab 100644 --- a/bom/target-template-pom.xml +++ b/bom/target-template-pom.xml @@ -27,6 +27,7 @@ org.apache.camel camel ${project.version} +../../apache-camel camel-bom
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/19906 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 git commit: camel-connector before/after should support async routing engine via pipeline which also is simpler code.
Repository: camel Updated Branches: refs/heads/connector-async [created] 5b1b92669 camel-connector before/after should support async routing engine via pipeline which also is simpler code. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b1b9266 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b1b9266 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b1b9266 Branch: refs/heads/connector-async Commit: 5b1b92669ee238b3a1e2c80545ed88e9464f1298 Parents: a12916c Author: Claus IbsenAuthored: Fri Oct 6 10:14:28 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 10:14:28 2017 +0200 -- .../connector/ConnectorConsumerProcessor.java | 94 .../component/connector/ConnectorProducer.java | 50 +++ .../connector/DefaultConnectorEndpoint.java | 34 ++- 3 files changed, 42 insertions(+), 136 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5b1b9266/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java -- diff --git a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java deleted file mode 100644 index 53c3860..000 --- a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorConsumerProcessor.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * 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.connector; - -import org.apache.camel.AsyncCallback; -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.apache.camel.processor.DelegateAsyncProcessor; -import org.apache.camel.util.ServiceHelper; - -/** - * Connector {@link Processor} which is capable of performing before and after custom processing - * while consuming a message (ie from the consumer). - */ -public class ConnectorConsumerProcessor extends DelegateAsyncProcessor { - -private final Processor beforeConsumer; -private final Processor afterConsumer; - -public ConnectorConsumerProcessor(Processor processor, Processor beforeConsumer, Processor afterConsumer) { -super(processor); -this.beforeConsumer = beforeConsumer; -this.afterConsumer = afterConsumer; -} - -@Override -public boolean process(Exchange exchange, final AsyncCallback callback) { -// setup callback for after consumer -AsyncCallback delegate = doneSync -> { -if (afterConsumer != null) { -try { -afterConsumer.process(exchange); -} catch (Throwable e) { -exchange.setException(e); -} -} -callback.done(doneSync); -}; - -// perform any before consumer -if (beforeConsumer != null) { -try { -beforeConsumer.process(exchange); -} catch (Throwable e) { -exchange.setException(e); -callback.done(true); -return true; -} -} - -// process the consumer -return super.process(exchange, delegate); -} - -@Override -protected void doStart() throws Exception { -ServiceHelper.startServices(beforeConsumer, processor, afterConsumer); -} - -@Override -protected void doStop() throws Exception { -ServiceHelper.stopServices(beforeConsumer, processor, afterConsumer); -} - -@Override -protected void doSuspend() throws Exception { -ServiceHelper.suspendService(processor); -} - -@Override -protected void doResume() throws Exception { -ServiceHelper.resumeService(processor); -} - -@Override -protected void doShutdown() throws Exception { -
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 3d630602d -> a12916c22 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a12916c2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a12916c2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a12916c2 Branch: refs/heads/master Commit: a12916c227c71cd60c8f5ec39a4897fd32cf2966 Parents: 3d63060 Author: Claus IbsenAuthored: Fri Oct 6 09:28:43 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 09:28:43 2017 +0200 -- .../camel-spring-boot-dependencies/pom.xml | 199 +++ 1 file changed, 159 insertions(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a12916c2/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml -- 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 7171372..90f9778 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 @@ -3269,223 +3269,342 @@ org.optaplanner optaplanner-benchmark -6.5.0.Final +7.3.0.Final org.optaplanner optaplanner-benchmark -6.5.0.Final +7.3.0.Final sources org.optaplanner optaplanner-benchmark -6.5.0.Final +7.3.0.Final test-jar org.optaplanner optaplanner-benchmark -6.5.0.Final +7.3.0.Final javadoc org.optaplanner optaplanner-core -6.5.0.Final +7.3.0.Final org.optaplanner optaplanner-core -6.5.0.Final +7.3.0.Final sources org.optaplanner optaplanner-core -6.5.0.Final +7.3.0.Final test-jar org.optaplanner optaplanner-core -6.5.0.Final +7.3.0.Final javadoc org.optaplanner +optaplanner-core-gwt +7.3.0.Final +gwt-lib + + +org.optaplanner optaplanner-distribution -6.5.0.Final +7.3.0.Final zip org.optaplanner optaplanner-docs -6.5.0.Final -jdocbook +7.3.0.Final +zip org.optaplanner optaplanner-examples -6.5.0.Final +7.3.0.Final org.optaplanner optaplanner-examples -6.5.0.Final +7.3.0.Final sources org.optaplanner optaplanner-examples -6.5.0.Final +7.3.0.Final test-jar org.optaplanner optaplanner-persistence-common -6.5.0.Final +7.3.0.Final org.optaplanner optaplanner-persistence-common -6.5.0.Final +7.3.0.Final sources org.optaplanner optaplanner-persistence-common -6.5.0.Final +7.3.0.Final test-jar org.optaplanner optaplanner-persistence-common -6.5.0.Final +7.3.0.Final +javadoc + + +org.optaplanner +optaplanner-persistence-jackson +7.3.0.Final + + +org.optaplanner +optaplanner-persistence-jackson +7.3.0.Final +sources + + +org.optaplanner +optaplanner-persistence-jackson +7.3.0.Final +test-jar + + +org.optaplanner +optaplanner-persistence-jackson +7.3.0.Final +javadoc + + +org.optaplanner +optaplanner-persistence-jaxb +7.3.0.Final + + +org.optaplanner +optaplanner-persistence-jaxb +7.3.0.Final +sources + + +org.optaplanner +optaplanner-persistence-jaxb +7.3.0.Final +test-jar + + +org.optaplanner +optaplanner-persistence-jaxb +7.3.0.Final javadoc org.optaplanner optaplanner-persistence-jpa -6.5.0.Final +7.3.0.Final org.optaplanner optaplanner-persistence-jpa -6.5.0.Final +7.3.0.Final sources org.optaplanner