svn commit: r1029044 - in /websites/production/camel/content: cache/main.pageCache camel-2220-release.html
Author: buildbot Date: Fri Apr 27 02:33:46 2018 New Revision: 1029044 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2220-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2220-release.html == --- websites/production/camel/content/camel-2220-release.html (original) +++ websites/production/camel/content/camel-2220-release.html Fri Apr 27 02:33:46 2018 @@ -94,7 +94,7 @@ -New and NoteworthyWelcome to the 2.22.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)This release supports only Spring Boot 2. Spring Boot v1 is no longer supported. Camel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Upgraded to Spring Framework 5. Camel should work with Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring version in future releases. Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this release.Optimised using toD DSL to reuse endpoints and prod ucers for components where its possible. For example HTTP based components will now reuse producer (http clients) with dynamic uris sending to the same host. See more details in the https://github.com/apache/camel/blob/master/camel-core/src/main/docs/eips/toD-eip.adoc"; rel="nofollow">toD documentation.The File2 consumer with read-lock idempotent/idempotent-changed can now be configured to delay the release tasks to expand the window when a file is regarded as in-process, which is usable in active/active cluster settings with a shared idempotent repository to ensure other nodes dont too quickly see a processed file as a file they can process (only needed if you have readLockRemoveOnCommit=true).Allow to plugin a custom request/reply correlation id manager implementation on Netty4 producer in request/reply mode.The Twitter component now uses extended mode by default to support tweets > 140 charactersAnd these important fixes:Fixed a CXF continuation timeout issue with camel-cxf consumer could cause the consumer to return a response with data instead of triggering a timeout to the calling SOAP client.Fixed using AdviceWith and using weave methods on onException etc. not working. Fixed Splitter in parallel processing and streaming mode may block, while iterating message body when the iterator throws exception in first invoked next() method call.Fixed Kafka consumer to not auto commit if autoCommitEnable=false.Fixed file consumer was using markerFile as read-lock by default, which should have been none. Fixed using man ual commit with Kafka to provide the current record offset and not the previous (and -1 for first)New Enterprise Integration PatternsNew Componentscamel-mybatis - Now has a mybatis-bean component that supports using MyBatis annotations on POJO beans to specify the SQL queries and mappings.camel-web3j - The web3j component uses the Web3j client API and allows you to add/read nodes to/from a web3j compliant content repositories.New DSLNew AnnotationsNew Data FormatsNew Langu agesNew ExamplesNew TutorialsAPI breakingThe RestProducerFactory has an API change where the RestConfiguration is provided as parameter as well.Known IssuesImportant changes to consider when upgradingCamel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Migrating from SB1 to SB2 may require changes, see the Spring Boot v1 to v2 migration documentation for details.Upgraded to Spring Framework v5 as default. Support for Spring Framework v4.3 is deprecated and not recommended to be used.Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this release. The camel-jms Maven pom.xml file now exclude spring-messaging dependency as this JAR is not used.Unit testing Camel with Spring Boot and extending the base classes CamelTestSupport or CamelSpringTestSupport is now throwing an exception as this has never been intended/support. Instead use the CamelSpringBootRunner JUnit runner, and do not extend a base class.The file consumer has changed to use readLock=none as default instead of readLock=markerFile. Documentation already indicated that readLock=none was the default. Getting the DistributionsBinary DistributionsDescriptionDownload Link PGP Signature file of downloadWindows Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip";>apache-camel-x.y.x.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip.asc";>apache-camel-x.y.x.zip.ascUnix/Linux/Cygwin Distributionhttp://
[camel] branch master updated: CAMEL-12455 - add DELIVERY_MODE to headers
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 fab7a58 CAMEL-12455 - add DELIVERY_MODE to headers
fab7a58 is described below
commit fab7a58e56e128286f327aba16c09553b26cb846
Author: Sezgin
AuthorDate: Thu Apr 26 20:23:03 2018 +0300
CAMEL-12455 - add DELIVERY_MODE to headers
add unit test for setting DELIVERY_MODE header
---
.../component/rabbitmq/RabbitMQMessageConverter.java | 3 +++
.../camel/component/rabbitmq/RabbitMQConsumerIntTest.java | 15 +++
2 files changed, 18 insertions(+)
diff --git
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
index f595848..6cb535e 100644
---
a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
+++
b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQMessageConverter.java
@@ -78,6 +78,9 @@ public class RabbitMQMessageConverter {
if (properties.getUserId() != null) {
exchange.getIn().setHeader(RabbitMQConstants.USERID,
properties.getUserId());
}
+if (properties.getDeliveryMode() != null) {
+exchange.getIn().setHeader(RabbitMQConstants.DELIVERY_MODE,
properties.getDeliveryMode());
+}
}
public AMQP.BasicProperties.Builder buildProperties(Exchange exchange) {
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
index 8ea7ac0..1b3826b 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
@@ -91,6 +91,21 @@ public class RabbitMQConsumerIntTest extends
AbstractRabbitMQIntTest {
}
@Test
+public void sentMessageIsDeliveryModeSet() throws InterruptedException,
IOException, TimeoutException {
+
+to.expectedMessageCount(1);
+to.expectedHeaderReceived(RabbitMQConstants.DELIVERY_MODE, 1);
+
+AMQP.BasicProperties.Builder properties = new
AMQP.BasicProperties.Builder();
+properties.deliveryMode(1);
+
+Channel channel = connection().createChannel();
+channel.basicPublish(EXCHANGE, "", properties.build(), MSG.getBytes());
+
+to.assertIsSatisfied();
+}
+
+@Test
public void sentMessageWithTimestampIsReceived() throws
InterruptedException, IOException, TimeoutException {
Date timestamp = currentTimestampWithoutMillis();
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
[camel] branch camel-2.21.x updated: [CAMEL-12428] Make sure response code and content type are propagated to cxfrs
This is an automated email from the ASF dual-hosted git repository.
dkulp 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 4280d66 [CAMEL-12428] Make sure response code and content type are
propagated to cxfrs
4280d66 is described below
commit 4280d660ed7bdce2c79d7d5d3da8b63567391f5d
Author: Daniel Kulp
AuthorDate: Mon Apr 9 16:18:54 2018 -0400
[CAMEL-12428] Make sure response code and content type are propagated to
cxfrs
(cherry picked from commit e4ad40f2eebb68cfde175b171538e26b278f63f6)
---
.../component/cxf/jaxrs/DefaultCxfRsBinding.java | 45 +-
.../component/cxf/jaxrs/CxfRsConsumerTest.java | 23 +--
2 files changed, 64 insertions(+), 4 deletions(-)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index 1658a94..0ecfd7b 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.cxf.jaxrs;
import java.lang.reflect.Method;
import java.nio.charset.Charset;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.TreeMap;
import javax.security.auth.Subject;
import javax.ws.rs.client.Entity;
@@ -38,6 +40,7 @@ import
org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.util.ExchangeHelper;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.jaxrs.model.OperationResourceInfoStack;
@@ -82,7 +85,47 @@ public class DefaultCxfRsBinding implements CxfRsBinding,
HeaderFilterStrategyAw
LOG.trace("Get the response from the in message");
}
-return response.getBody();
+Object o = response.getBody();
+if (!(o instanceof Response)) {
+//not a JAX-RS Response object, we need to set the headers from
the Camel values
+
+
+if
(response.getHeader(org.apache.cxf.message.Message.PROTOCOL_HEADERS) != null) {
+Map headers = CastUtils.cast((Map)response.getHeader(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
cxfExchange.getOutMessage().putIfAbsent(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
+new
TreeMap<>(String.CASE_INSENSITIVE_ORDER));
+final Map> cxfHeaders =
+CastUtils.cast((Map)
cxfExchange.getOutMessage().get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
+for (Map.Entry ent : headers.entrySet()) {
+List v;
+if (ent.getValue() instanceof List) {
+v = CastUtils.cast((List)ent.getValue());
+} else {
+v = Arrays.asList(ent.getValue().toString());
+}
+cxfHeaders.put(ent.getKey(), v);
+}
+}
+
+
+if (response.getHeader(Exchange.HTTP_RESPONSE_CODE) != null &&
!cxfExchange.containsKey(org.apache.cxf.message.Message.RESPONSE_CODE)) {
+cxfExchange.put(org.apache.cxf.message.Message.RESPONSE_CODE,
response.getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class));
+}
+if (response.getHeader(Exchange.CONTENT_TYPE) != null) {
+
cxfExchange.getOutMessage().putIfAbsent(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
+new
TreeMap<>(String.CASE_INSENSITIVE_ORDER));
+final Map> cxfHeaders =
+CastUtils.cast((Map)
cxfExchange.getOutMessage().get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
+if (!cxfHeaders.containsKey(Exchange.CONTENT_TYPE)) {
+List a =
Arrays.asList((String)response.getHeader(Exchange.CONTENT_TYPE));
+cxfHeaders.put(Exchange.CONTENT_TYPE, a);
+cxfExchange.getOutMessage().put(Exchange.CONTENT_TYPE,
response.getHeader(Exchange.CONTENT_TYPE));
+}
+}
+}
+return o;
}
public void
populateExchangeFromCxfRsRequest(org.apache.cxf.message.Exchange cxfExchange,
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
b/c
[camel] branch master updated: [CAMEL-12428] Make sure response code and content type are propagated to cxfrs
This is an automated email from the ASF dual-hosted git repository.
dkulp 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 e4ad40f [CAMEL-12428] Make sure response code and content type are
propagated to cxfrs
e4ad40f is described below
commit e4ad40f2eebb68cfde175b171538e26b278f63f6
Author: Daniel Kulp
AuthorDate: Mon Apr 9 16:18:54 2018 -0400
[CAMEL-12428] Make sure response code and content type are propagated to
cxfrs
---
.../component/cxf/jaxrs/DefaultCxfRsBinding.java | 45 +-
.../component/cxf/jaxrs/CxfRsConsumerTest.java | 23 +--
2 files changed, 64 insertions(+), 4 deletions(-)
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index 1658a94..0ecfd7b 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.cxf.jaxrs;
import java.lang.reflect.Method;
import java.nio.charset.Charset;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.TreeMap;
import javax.security.auth.Subject;
import javax.ws.rs.client.Entity;
@@ -38,6 +40,7 @@ import
org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.util.ExchangeHelper;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.cxf.jaxrs.model.OperationResourceInfoStack;
@@ -82,7 +85,47 @@ public class DefaultCxfRsBinding implements CxfRsBinding,
HeaderFilterStrategyAw
LOG.trace("Get the response from the in message");
}
-return response.getBody();
+Object o = response.getBody();
+if (!(o instanceof Response)) {
+//not a JAX-RS Response object, we need to set the headers from
the Camel values
+
+
+if
(response.getHeader(org.apache.cxf.message.Message.PROTOCOL_HEADERS) != null) {
+Map headers = CastUtils.cast((Map)response.getHeader(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
cxfExchange.getOutMessage().putIfAbsent(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
+new
TreeMap<>(String.CASE_INSENSITIVE_ORDER));
+final Map> cxfHeaders =
+CastUtils.cast((Map)
cxfExchange.getOutMessage().get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
+for (Map.Entry ent : headers.entrySet()) {
+List v;
+if (ent.getValue() instanceof List) {
+v = CastUtils.cast((List)ent.getValue());
+} else {
+v = Arrays.asList(ent.getValue().toString());
+}
+cxfHeaders.put(ent.getKey(), v);
+}
+}
+
+
+if (response.getHeader(Exchange.HTTP_RESPONSE_CODE) != null &&
!cxfExchange.containsKey(org.apache.cxf.message.Message.RESPONSE_CODE)) {
+cxfExchange.put(org.apache.cxf.message.Message.RESPONSE_CODE,
response.getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class));
+}
+if (response.getHeader(Exchange.CONTENT_TYPE) != null) {
+
cxfExchange.getOutMessage().putIfAbsent(org.apache.cxf.message.Message.PROTOCOL_HEADERS,
+new
TreeMap<>(String.CASE_INSENSITIVE_ORDER));
+final Map> cxfHeaders =
+CastUtils.cast((Map)
cxfExchange.getOutMessage().get(org.apache.cxf.message.Message.PROTOCOL_HEADERS));
+
+if (!cxfHeaders.containsKey(Exchange.CONTENT_TYPE)) {
+List a =
Arrays.asList((String)response.getHeader(Exchange.CONTENT_TYPE));
+cxfHeaders.put(Exchange.CONTENT_TYPE, a);
+cxfExchange.getOutMessage().put(Exchange.CONTENT_TYPE,
response.getHeader(Exchange.CONTENT_TYPE));
+}
+}
+}
+return o;
}
public void
populateExchangeFromCxfRsRequest(org.apache.cxf.message.Exchange cxfExchange,
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.j
[camel] branch camel-2.21.x updated: Upgrading Tika
This is an automated email from the ASF dual-hosted git repository. coheigea 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 f048a75 Upgrading Tika f048a75 is described below commit f048a757562f74192a975c44c3351961fdd9d7bf Author: Colm O hEigeartaigh AuthorDate: Thu Apr 26 15:46:55 2018 +0100 Upgrading Tika --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index ab053c5..5299b58 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -692,7 +692,7 @@ 1.2.1 6.8.21 2.1.1 -1.17 +1.18 7.9.1 4.0.6_1 4.0.6 -- To stop receiving notification emails like this one, please contact cohei...@apache.org.
[camel] branch master updated: Upgrading Tika
This is an automated email from the ASF dual-hosted git repository. coheigea 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 0513764 Upgrading Tika 0513764 is described below commit 051376444f5d7708fdbb043a319c91772e1462ea Author: Colm O hEigeartaigh AuthorDate: Thu Apr 26 15:46:55 2018 +0100 Upgrading Tika --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7a9a2f4..a158957 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -684,7 +684,7 @@ 1.2.1 6.14.2 2.1.1 -1.17 +1.18 7.9.1 4.0.6_1 4.0.6 -- To stop receiving notification emails like this one, please contact cohei...@apache.org.
svn commit: r1029000 - in /websites/production/camel/content: cache/main.pageCache camel-2220-release.html
Author: buildbot Date: Thu Apr 26 13:20:02 2018 New Revision: 1029000 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2220-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2220-release.html == --- websites/production/camel/content/camel-2220-release.html (original) +++ websites/production/camel/content/camel-2220-release.html Thu Apr 26 13:20:02 2018 @@ -94,7 +94,7 @@ -New and NoteworthyWelcome to the 2.22.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)This release supports only Spring Boot 2. Spring Boot v1 is no longer supported. Camel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Upgraded to Spring Framework 5. Camel should work with Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring version in future releases. Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this release.Optimised using toD DSL to reuse endpoints and prod ucers for components where its possible. For example HTTP based components will now reuse producer (http clients) with dynamic uris sending to the same host. See more details in the https://github.com/apache/camel/blob/master/camel-core/src/main/docs/eips/toD-eip.adoc"; rel="nofollow">toD documentation.The File2 consumer with read-lock idempotent/idempotent-changed can now be configured to delay the release tasks to expand the window when a file is regarded as in-process, which is usable in active/active cluster settings with a shared idempotent repository to ensure other nodes dont too quickly see a processed file as a file they can process (only needed if you have readLockRemoveOnCommit=true).Allow to plugin a custom request/reply correlation id manager implementation on Netty4 producer in request/reply mode.The Twitter component now uses extended mode by default to support tweets > 140 charactersAnd these important fixes:Fixed a CXF continuation timeout issue with camel-cxf consumer could cause the consumer to return a response with data instead of triggering a timeout to the calling SOAP client.Fixed using AdviceWith and using weave methods on onException etc. not working. Fixed Splitter in parallel processing and streaming mode may block, while iterating message body when the iterator throws exception in first invoked next() method call.Fixed Kafka consumer to not auto commit if autoCommitEnable=false.Fixed file consumer was using markerFile as read-lock by default, which should have been none. New Enterprise Integration PatternsNew Componentscamel-mybatis - Now has a mybatis-bean component that supports using MyBatis annotations on POJO beans to specify the SQL queries and mappings.camel-web3j - The web3j component uses the Web3j client API and allows you to add/read nodes to/from a web3j compliant content repositories.New DSLNew AnnotationsNew Data FormatsNew LanguagesNew ExamplesNew TutorialsAPI breakingKnown IssuesImportant changes to consider when upgradingCamel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Migrating from SB1 to SB2 may require changes, see the Spring Boot v1 to v2 migration documentation for details.Upgraded to Spring Framework v5 as default. Support for Spring Framework v4.3 is deprecated and not recommended to be used.Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this release. The camel-jms Maven pom.xml file now exclude spring-messaging dependency as this JAR is not used.Unit testing Camel with Spring Boot and extending the base classes CamelTestSupport or CamelSpringTestSupport is now throwing an exception as this has never been intended/support. Instead use the CamelSpringBootRunner JUnit runner, and do not extend a base class.The file consumer has changed to use readLock=none as default instead of readLock=markerFile. Documentation already indicated that readLock=none was the default. Getting the DistributionsBinary DistributionsDescriptionDownload LinkPGP Signature file of downloadWindows Distributionhttp://www.apa che.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip">apache-camel-x.y.x.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip.asc";>apache-camel-x.y.x.zip.ascUnix/Linux/Cygwin Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz";>apache-camel-x.y.x.tar.gzhttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz.asc";>apache-camel-x.y.x.tar.gz.ascT
[camel] branch master updated: CAMEL-12460 Fix camel actuator endpoints to get it working with SB2 (#2307)
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 dc6caa6 CAMEL-12460 Fix camel actuator endpoints to get it working
with SB2 (#2307)
dc6caa6 is described below
commit dc6caa696255240a2a27c3bf229fc3aac9014401
Author: Tomohisa Igarashi
AuthorDate: Thu Apr 26 09:12:19 2018 -0400
CAMEL-12460 Fix camel actuator endpoints to get it working with SB2 (#2307)
* CAMEL-12460 Fix camel actuator endpoints to get it working with SB2
Also extracted CamelRoutesEndpointProperties as a separated class from
CamelRoutesEndpoint
* CAMEL-12460 Update camel-archetype-spring-boot to align with SB2
Reflected review comments:
* Updated actuator properties in archetype template to get working with SB2
* Added a comment on the -parameter javac option that it's required for
SB2 actuator endpoint
---
.../main/resources/archetype-resources/readme.adoc | 4 +--
.../src/main/resources/application.properties | 9 --
.../boot/actuate/endpoint/CamelRoutesEndpoint.java | 21 +
.../CamelRoutesEndpointAutoConfiguration.java | 12 +++-
.../endpoint/CamelRoutesEndpointProperties.java| 34 ++
.../additional-spring-configuration-metadata.json | 8 +
.../pom.xml| 2 +-
.../readme.adoc| 10 +++
.../src/main/resources/application.properties | 4 ++-
examples/camel-example-spring-boot/readme.adoc | 4 +--
.../src/main/resources/application.properties | 4 +++
parent/pom.xml | 6
12 files changed, 82 insertions(+), 36 deletions(-)
diff --git
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/readme.adoc
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/readme.adoc
index 310c8fb..1fc8d6d 100644
---
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/readme.adoc
+++
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/readme.adoc
@@ -26,13 +26,13 @@ You can run this example using
To show a summary of all the routes
-curl -XGET -s http://localhost:8080/camel/routes
+curl -XGET -s http://localhost:8080/camelroutes
To show detailed information for a specific route
-curl -XGET -s http://localhost:8080/camel/routes/{id}/info
+curl -XGET -s http://localhost:8080/camelroutes/{id}/detail
diff --git
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
index 34397fc..24b20c1 100644
---
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
+++
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -31,14 +31,17 @@ timer.period = 2000
# add for example: &repeatCount=5 to the timer endpoint to make Camel idle
#camel.springboot.duration-max-idle-seconds=15
+# expose actuator endpoint via HTTP
+management.endpoints.web.exposure.include=info,health,camelroutes
+
# all access to actuator endpoints without security
management.security.enabled = false
# turn on actuator health check
-endpoints.health.enabled = true
+management.endpoint.health.enabled = true
# allow to obtain basic information about camel routes (read only mode)
-endpoints.camelroutes.enabled = true
-endpoints.camelroutes.read-only = true
+management.endpoint.camelroutes.enabled = true
+management.endpoint.camelroutes.read-only = true
# to configure logging levels
#logging.level.org.springframework = INFO
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
index e9f8a53..f7978e4 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java
@@ -39,19 +39,20 @@ import
org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.actuate.endpoint.annotation.Selector;
import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.lang.Nullable;
/**
* {@link Endpoint} to expose {@link org.apache.camel.Route} information.
*/
@E
[camel] branch master updated: Rename parameter for latest camel-kafka fix in PR #2306.
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 ec184a6 Rename parameter for latest camel-kafka fix in PR #2306.
ec184a6 is described below
commit ec184a60c32233a76ffc81231ae76328c545cc98
Author: Claus Ibsen
AuthorDate: Thu Apr 26 14:44:17 2018 +0200
Rename parameter for latest camel-kafka fix in PR #2306.
---
.../component/kafka/DefaultKafkaManualCommit.java | 24 ++
.../kafka/DefaultKafkaManualCommitFactory.java | 4 ++--
.../component/kafka/KafkaManualCommitFactory.java | 2 +-
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommit.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommit.java
index 3dc991f..ba1cc15 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommit.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommit.java
@@ -34,32 +34,30 @@ public class DefaultKafkaManualCommit implements
KafkaManualCommit {
private final String threadId;
private final StateRepository offsetRepository;
private final TopicPartition partition;
-private final long partitionLastOffset;
+private final long recordOffset;
public DefaultKafkaManualCommit(KafkaConsumer consumer, String topicName,
String threadId,
-StateRepository
offsetRepository, TopicPartition partition, long partitionLastOffset) {
+StateRepository
offsetRepository, TopicPartition partition, long recordOffset) {
this.consumer = consumer;
this.topicName = topicName;
this.threadId = threadId;
this.offsetRepository = offsetRepository;
this.partition = partition;
-this.partitionLastOffset = partitionLastOffset;
+this.recordOffset = recordOffset;
}
@Override
public void commitSync() {
-commitOffset(offsetRepository, partition, partitionLastOffset);
+commitOffset(offsetRepository, partition, recordOffset);
}
-
-
-protected void commitOffset(StateRepository
offsetRepository, TopicPartition partition, long partitionLastOffset) {
-if (partitionLastOffset != -1) {
+protected void commitOffset(StateRepository
offsetRepository, TopicPartition partition, long recordOffset) {
+if (recordOffset != -1) {
if (offsetRepository != null) {
-offsetRepository.setState(serializeOffsetKey(partition),
serializeOffsetValue(partitionLastOffset));
+offsetRepository.setState(serializeOffsetKey(partition),
serializeOffsetValue(recordOffset));
} else {
-LOG.debug("CommitSync {} from topic {} with offset: {}",
threadId, topicName, partitionLastOffset);
-consumer.commitSync(Collections.singletonMap(partition, new
OffsetAndMetadata(partitionLastOffset + 1)));
+LOG.debug("CommitSync {} from topic {} with offset: {}",
threadId, topicName, recordOffset);
+consumer.commitSync(Collections.singletonMap(partition, new
OffsetAndMetadata(recordOffset + 1)));
}
}
}
@@ -92,8 +90,8 @@ public class DefaultKafkaManualCommit implements
KafkaManualCommit {
return partition;
}
-public long getPartitionLastOffset() {
-return partitionLastOffset;
+public long getRecordOffset() {
+return recordOffset;
}
}
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommitFactory.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommitFactory.java
index 3760f90..ba60cc9 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommitFactory.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommitFactory.java
@@ -25,7 +25,7 @@ public class DefaultKafkaManualCommitFactory implements
KafkaManualCommitFactory
@Override
public KafkaManualCommit newInstance(Exchange exchange, KafkaConsumer
consumer, String topicName,
- String threadId,
StateRepository offsetRepository, TopicPartition partition,
long partitionLastOffset) {
-return new DefaultKafkaManualCommit(consumer, topicName, threadId,
offsetRepository, partition, partitionLastOffset);
+ String threadId,
StateRepository offsetRepository, TopicPartition partition,
long recordOffset) {
+return new DefaultKafkaManualCommit(consumer, topicName, th
[camel] branch master updated: Fixed the Defect manual commit not working (#2306)
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 803f0d6 Fixed the Defect manual commit not working (#2306)
803f0d6 is described below
commit 803f0d630bf82a6918224bb4b8cfe3bb47b94da1
Author: mchandwani
AuthorDate: Thu Apr 26 08:34:00 2018 -0400
Fixed the Defect manual commit not working (#2306)
* Defect Fix for manual commit. partitionLastOffset is always -1. Manual
commit is not successful because consumer.comitSync is never called
* Removing changes
---
.../org/apache/camel/component/kafka/DefaultKafkaManualCommit.java | 2 ++
.../src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommit.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommit.java
index 1965999..3dc991f 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommit.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/DefaultKafkaManualCommit.java
@@ -50,6 +50,8 @@ public class DefaultKafkaManualCommit implements
KafkaManualCommit {
public void commitSync() {
commitOffset(offsetRepository, partition, partitionLastOffset);
}
+
+
protected void commitOffset(StateRepository
offsetRepository, TopicPartition partition, long partitionLastOffset) {
if (partitionLastOffset != -1) {
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index a166c11..05111f2 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -287,8 +287,9 @@ public class KafkaConsumer extends DefaultConsumer {
if
(endpoint.getConfiguration().isAllowManualCommit()) {
// allow Camel users to access the Kafka
consumer API to be able to do for example manual commits
KafkaManualCommit manual =
endpoint.getComponent().getKafkaManualCommitFactory().newInstance(exchange,
consumer, topicName, threadId,
-offsetRepository, partition,
partitionLastOffset);
+offsetRepository, partition,
record.offset());
exchange.getIn().setHeader(KafkaConstants.MANUAL_COMMIT, manual);
+
}
try {
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
[camel] branch master updated (c14763c -> ea8b47d)
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 c14763c Added TODO add ea8b47d CAMEL-12442:rest-dsl - Rest producer should use RestConfiguration (#2308) No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/component/rest/RestEndpoint.java | 8 +--- .../src/main/java/org/apache/camel/spi/RestProducerFactory.java | 3 ++- .../camel/component/rest/RestComponentVerifierExtensionTest.java | 1 + .../apache/camel/component/rest/RestComponentVerifierTest.java| 1 + .../java/org/apache/camel/component/rest/RestEndpointTest.java| 3 ++- .../main/java/org/apache/camel/component/http/HttpComponent.java | 3 ++- .../main/java/org/apache/camel/component/http4/HttpComponent.java | 3 ++- .../java/org/apache/camel/component/jetty/JettyHttpComponent.java | 2 +- .../apache/camel/component/netty4/http/NettyHttpComponent.java| 2 +- .../java/org/apache/camel/component/restlet/RestletComponent.java | 2 +- .../java/org/apache/camel/swagger/SwaggerRestProducerFactory.java | 7 --- .../apache/camel/swagger/producer/DummyRestProducerFactory.java | 3 ++- .../org/apache/camel/component/undertow/UndertowComponent.java| 2 +- 13 files changed, 25 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact davscl...@apache.org.
svn commit: r1028992 - in /websites/production/camel/content: cache/main.pageCache camel-2220-release.html
Author: buildbot Date: Thu Apr 26 09:18:56 2018 New Revision: 1028992 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2220-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2220-release.html == --- websites/production/camel/content/camel-2220-release.html (original) +++ websites/production/camel/content/camel-2220-release.html Thu Apr 26 09:18:56 2018 @@ -94,7 +94,7 @@ -New and NoteworthyWelcome to the 2.22.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)This release supports only Spring Boot 2. Spring Boot v1 is no longer supported. Camel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Upgraded to Spring Framework 5. Camel should work with Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring version in future releases. Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this release.The File2 consumer with read-lock idempotent/idempotent-changed can now be configured > to delay the release tasks to expand the window when a file is regarded as > in-process, which is usable in active/active cluster settings with a shared > idempotent repository to ensure other nodes dont too quickly see a processed > file as a file they can process (only needed if you have > readLockRemoveOnCommit=true).Allow to plugin a custom request/reply > correlation id manager implementation on href="netty4.html">Netty4 producer in request/reply > mode.The Twitter > component now uses extended mode by default to support tweets > 140 > charactersAnd these important fixes:Fixed a CXF > continuation timeout issue with camel-cxf consumer could cause the > consumer to return a response with data instead of triggering a timeout to > the calling SOAP client.Fixed using AdviceWith and using weave methods on onException etc. not working. Fixed Splitter in parallel processing and streaming mode may block, while iterating message body when the iterator throws exception in first invoked next() method call.Fixed Kafka consumer to not auto commit if autoCommitEnable=false.Fixed file consumer was using markerFile as read-lock by default, which should have been none. New Enterprise Integration PatternsNew Componentscamel-mybatis - Now has a mybatis-bean component that supports using MyBatis annotations on POJO beans to specify the SQL queries and mappings.New DSLNew AnnotationsNew Data FormatsNew LanguagesNew ExamplesNew TutorialsAPI breakingKnown IssuesImportant changes to consider when upgradingCamel has upgraded from Spring Boot v1 to v2 and therefore v1 is no longer supported. Migrating from SB1 to SB2 may require changes, see the Spring Boot v1 to v2 migration documentation for details.Upgraded to Spring Framework v5 as default. Support for Spring Framework v4.3 is depr ecated and not recommended to be used.Upgraded to Karaf 4.2. You may run Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this release. The camel-jms Maven pom.xml file now exclude spring-messaging dependency as this JAR is not used.Unit testing Camel with Spring Boot and extending the base classes CamelTestSupport or CamelSpringTestSupport is now throwing an exception as this has never been intended/support. Instead use the CamelSpringBootRunner JUnit runner, and do not extend a base class.The file consumer has changed to use readLock=none as default instead of readLock=markerFile. Documentation already indicated that readLock=none was the default. Getting the DistributionsBinary DistributionsDescriptionDownload LinkPGP Signature file of downloadWindows Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip";>apache-camel-x.y.x.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip.asc";>apache-camel-x.y.x.zip.ascUnix/Linux/Cygwin Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apac he-camel/x.y.x/apache-camel-x.y.x.tar.gz">apache-camel-x.y.x.tar.gzhttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz.asc";>apache-camel-x.y.x.tar.gz.ascThe above URLs use redirectionThe above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using http://www.mozilla.com/en-US/firefox/"; rel="nofollow">FireFox< /div>Source DistributionsDescriptionDownload LinkPGP Signature file of
[camel] branch master updated: Added TODO
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 c14763c Added TODO c14763c is described below commit c14763cea7f46d7fa3046057bfd7c2b64b3e90ab Author: Claus Ibsen AuthorDate: Thu Apr 26 10:51:06 2018 +0200 Added TODO --- .../src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java| 1 + 1 file changed, 1 insertion(+) diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java index ef6810e..59e26ba 100644 --- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java +++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java @@ -41,6 +41,7 @@ import org.web3j.protocol.ipc.UnixIpcService; import org.web3j.protocol.ipc.WindowsIpcService; // TODO: should it say web3j compliant content repository. Should it not say something about blockchain,bitcoin +// TODO: label should be bitcoin,blockchain (web3j is already in the JAR name) /** * The web3j component uses the Web3j client API and allows you to add/read nodes to/from a web3j compliant content repositories. -- To stop receiving notification emails like this one, please contact davscl...@apache.org.
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d7ef9d1 Polished
d7ef9d1 is described below
commit d7ef9d10897fc87dea24b658c6d53bdb2ab90222
Author: Claus Ibsen
AuthorDate: Thu Apr 26 10:50:02 2018 +0200
Polished
---
.../camel-web3j/src/main/docs/web3j-component.adoc | 44 --
.../camel/component/web3j/Web3jConfiguration.java | 8 +++-
.../camel/component/web3j/Web3jEndpoint.java | 7 +++-
components/readme.adoc | 2 +-
.../springboot/Web3jComponentConfiguration.java| 5 ++-
5 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/components/camel-web3j/src/main/docs/web3j-component.adoc
b/components/camel-web3j/src/main/docs/web3j-component.adoc
index 617932f..be802c6 100644
--- a/components/camel-web3j/src/main/docs/web3j-component.adoc
+++ b/components/camel-web3j/src/main/docs/web3j-component.adoc
@@ -1,26 +1,24 @@
[[web3j-component]]
== web3j Component
-*Available as of Camel version 2.20*
-
-*Available as of Camel version 2.20*
+*Available as of Camel version 2.22*
The web3j component uses the
https://github.com/web3j/web3j[web3j] client
API and allows you to read/write from geth/parity compatible Ethereum nodes.
-### URI Format
+=== URI Format
-[source,java]
---
+[source,text]
+
web3j://ethereumServerUrl[?options]
---
+
You can append query options to the URI in the following format,
?options=value&option2=value&...
-### Web3j Options
+=== Web3j Options
// component options: START
The web3j component supports 2 options which are listed below.
@@ -54,7 +52,7 @@ with the following path and query parameters:
|===
- Query Parameters (4 parameters):
+ Query Parameters (5 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -63,35 +61,9 @@ with the following path and query parameters:
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by the routing Error Handler. By default the
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with
exceptions, that will be logged at WARN or ERROR level and ignored. | false |
boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
options is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer
creates an exchange. | | ExchangePattern
+| *operation* (producer) | Operation to use. | transaction | String
| *synchronous* (advanced) | Sets whether synchronous processing should be
strictly used, or Camel is allowed to use asynchronous processing (if
supported). | false | boolean
|===
// endpoint options: END
-### Usage
-
-
-### Dependencies
-
-Maven users will need to add the following dependency to their pom.xml.
-
-*pom.xml*
-
-[source,xml]
-
-org.apache.camel
-camel-web3j
-${camel-version}
-
-
-where `${camel-version`} must be replaced by the actual version of Camel
-(2.22 or higher).
-
-### See Also
-
-* Configuring Camel
-* Component
-* Endpoint
-* Getting Started
\ No newline at end of file
diff --git
a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
index f408dad..b8a7ed0 100644
---
a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
+++
b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jConfiguration.java
@@ -28,8 +28,11 @@ import org.web3j.protocol.core.DefaultBlockParameterName;
@UriParams
public class Web3jConfiguration implements Cloneable {
+
+// TODO: Add javadoc for setter for documentation and add @UriParam to
each option
+
@UriParam(label = "producer", defaultValue = "transaction")
-private String operation = Web3jConstants.TRANSACTION.toLowerCase();
+private String operation = Web3jConstants.TRANSACTION.toLowerCase(); //
TODO: Make this an enum
private DefaultBlockParameter fromBlock;
private DefaultBlockParameter toBlock;
private DefaultBlockParameter atBlock;
@@ -331,6 +334,9 @@ public class Web3jConfiguration implements Cloneable {
return operation;
}
+/**
+ * Operation to use.
+ */
pu
[camel] branch CAMEL-12462 deleted (was 094572e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-12462 in repository https://gitbox.apache.org/repos/asf/camel.git. was 094572e CAMEL-12462: Better name thanks to Alex for suggestion. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact davscl...@apache.org.
[camel] branch master updated: CAMEL-12462 (#2302)
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 0c0f70c CAMEL-12462 (#2302) 0c0f70c is described below commit 0c0f70cdda4cccd27c5bb00f0dca4e103bf5ac5e Author: Claus Ibsen AuthorDate: Thu Apr 26 10:38:35 2018 +0200 CAMEL-12462 (#2302) * CAMEL-12462: Optimise toD to allow components to be SendDynamicAware in their producers to use static endpoint and dynamic parts provided via headers (pre processor) * CAMEL-12462: Optimise toD to allow components to be SendDynamicAware in their producers to use static endpoint and dynamic parts provided via headers (pre processor) * CAMEL-12462: Optimise toD to allow components to be SendDynamicAware in their producers to use static endpoint and dynamic parts provided via headers (pre processor) * CAMEL-12462: Optimise toD to allow components to be SendDynamicAware in their producers to use static endpoint and dynamic parts provided via headers (pre processor) * CAMEL-12462: camel-http now supports optimised toD for all its lenient query parameters. * CAMEL-12462: camel-http now supports optimised toD for all its lenient query parameters. * CAMEL-12462: camel-http now supports optimised toD for all its lenient query parameters. * CAMEL-12462: camel-http4 now supports optimised toD for all its lenient query parameters. * CAMEL-12462: camel-undertow now supports optimised toD for all its lenient query parameters. * CAMEL-12462: camel-netty4-http now supports optimised toD for all its lenient query parameters. * CAMEL-12462: Optimise toD to allow components to be SendDynamicAware in their producers to use static endpoint and dynamic parts provided via headers (pre processor) * CAMEL-12462: Optimise toD to allow components to be SendDynamicAware in their producers to use static endpoint and dynamic parts provided via headers (pre processor) * Polished doc * CAMEL-12462: Optimise toD to allow components to be SendDynamicAware in their producers to use static endpoint and dynamic parts provided via headers (pre processor) * CAMEL-12462: Fixed typo. Thanks to Dmitry Volodin for spotting this. * CAMEL-12462: Better name thanks to Alex for suggestion. --- camel-core/src/main/docs/eips/toD-eip.adoc | 106 - camel-core/src/main/docs/eips/wireTap-eip.adoc | 3 +- .../mbean/ManagedSendDynamicProcessorMBean.java| 6 + .../api/management/mbean/ManagedWireTapMBean.java | 3 + .../mbean/ManagedSendDynamicProcessor.java | 8 + .../management/mbean/ManagedWireTapProcessor.java | 4 + .../apache/camel/model/ProcessorDefinition.java| 18 +++ .../apache/camel/model/ToDynamicDefinition.java| 20 +++ .../org/apache/camel/model/WireTapDefinition.java | 2 +- .../camel/processor/SendDynamicAwareResolver.java | 69 + .../camel/processor/SendDynamicProcessor.java | 125 +++- .../apache/camel/processor/WireTapProcessor.java | 8 +- .../org/apache/camel/spi/SendDynamicAware.java | 117 +++ .../java/org/apache/camel/util/ExchangeHelper.java | 18 +++ .../apache/camel/component/bar/BarComponent.java | 33 + .../apache/camel/component/bar/BarConstants.java | 25 .../apache/camel/component/bar/BarEndpoint.java| 65 .../apache/camel/component/bar/BarProducer.java| 44 ++ .../camel/component/bar/BarSendDynamicAware.java | 79 ++ .../ManagedSendDynamicProcessorTest.java | 5 +- .../camel/management/ManagedWireTapTest.java | 5 +- .../processor/ToDynamicSendDynamicAwareTest.java | 54 +++ .../services/org/apache/camel/send-dynamic/bar | 18 +++ .../camel-headersmap/src/main/docs/headersmap.adoc | 6 +- .../camel/http/common/HttpSendDynamicAware.java| 165 + .../http/common/HttpSendDynamicPostProcessor.java | 34 + .../http/common/HttpSendDynamicPreProcessor.java | 49 ++ .../services/org/apache/camel/send-dynamic/http| 18 +++ .../services/org/apache/camel/send-dynamic/https | 18 +++ .../component/http/HttpSendDynamicAwareTest.java | 96 .../http/handler/BasicValidationHandler.java | 9 +- .../http/handler/DrinkValidationHandler.java | 40 + .../services/org/apache/camel/send-dynamic/http4 | 18 +++ .../services/org/apache/camel/send-dynamic/https4 | 18 +++ .../component/http4/HttpSendDynamicAwareTest.java | 89 +++ .../http4/handler/BasicValidationHandler.java | 10 +- .../http4/handler/DrinkValidationHandler.java | 34 + .../services/org/apache/camel/send-dynamic/jetty | 17 +++ .../JettyHttpProducerSendDynamicAwareTest.java | 59 +
[camel] branch master updated: Remove Metric 3.0.1 related classloader leak warning, now that we use Metrics 3.2.6. (#2305)
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 61fa5f3 Remove Metric 3.0.1 related classloader leak warning, now
that we use Metrics 3.2.6. (#2305)
61fa5f3 is described below
commit 61fa5f3ab0eae789daa88a07c83e7af355093533
Author: Pascal Schumacher
AuthorDate: Thu Apr 26 10:24:00 2018 +0200
Remove Metric 3.0.1 related classloader leak warning, now that we use
Metrics 3.2.6. (#2305)
---
components/camel-metrics/src/main/docs/metrics-component.adoc | 5 -
1 file changed, 5 deletions(-)
diff --git a/components/camel-metrics/src/main/docs/metrics-component.adoc
b/components/camel-metrics/src/main/docs/metrics-component.adoc
index 0a8818c..c74a57c 100644
--- a/components/camel-metrics/src/main/docs/metrics-component.adoc
+++ b/components/camel-metrics/src/main/docs/metrics-component.adoc
@@ -153,11 +153,6 @@ class MyBean extends RouteBuilder {
}
-CAUTION: `MetricRegistry` uses internal thread(s) for reporting. There is no
-public API in version DropWizard `3.0.1` for users to clean up on exit. Thus
using
-Camel Metrics Component leads to Java classloader leak and my cause
-`OutOfMemoryErrors` in some cases.
-
### Usage
Each metric has type and name. Supported types are
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
[camel] branch CAMEL-12462 updated (896a8c2 -> 094572e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-12462 in repository https://gitbox.apache.org/repos/asf/camel.git. from 896a8c2 CAMEL-12462: Fixed typo. Thanks to Dmitry Volodin for spotting this. add 094572e CAMEL-12462: Better name thanks to Alex for suggestion. No new revisions were added by this update. Summary of changes: .../component/netty4/http/NettyHttpSendDynamicAware.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact davscl...@apache.org.
[camel] branch master updated: Lets sort components in pom.xml like ls would do
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 c569d3b Lets sort components in pom.xml like ls would do
c569d3b is described below
commit c569d3b8a21d7b6299978cfd9a9b160ddb89e0a2
Author: Claus Ibsen
AuthorDate: Thu Apr 26 09:39:10 2018 +0200
Lets sort components in pom.xml like ls would do
---
apache-camel/pom.xml | 4 ++--
apache-camel/src/main/descriptors/common-bin.xml | 4 ++--
components/pom.xml | 2 +-
parent/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 9ce60cf..8a4b80a 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1127,11 +1127,11 @@
org.apache.camel
- camel-websocket
+ camel-web3j
org.apache.camel
- camel-web3j
+ camel-websocket
org.apache.camel
diff --git a/apache-camel/src/main/descriptors/common-bin.xml
b/apache-camel/src/main/descriptors/common-bin.xml
index 105ed91..3ab0c73 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -289,8 +289,8 @@
org.apache.camel:camel-velocity
org.apache.camel:camel-vertx
org.apache.camel:camel-weather
-org.apache.camel:camel-websocket
org.apache.camel:camel-web3j
+org.apache.camel:camel-websocket
org.apache.camel:camel-wordpress
org.apache.camel:camel-xmlbeans
org.apache.camel:camel-xchange
@@ -589,8 +589,8 @@
org.apache.camel:camel-velocity-starter
org.apache.camel:camel-vertx-starter
org.apache.camel:camel-weather-starter
-org.apache.camel:camel-websocket-starter
org.apache.camel:camel-web3j-starter
+org.apache.camel:camel-websocket-starter
org.apache.camel:camel-wordpress-starter
org.apache.camel:camel-xmlbeans-starter
org.apache.camel:camel-xchange-starter
diff --git a/components/pom.xml b/components/pom.xml
index eeccf68..74b4e4c 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -305,8 +305,8 @@
camel-velocity
camel-vertx
camel-weather
-camel-websocket
camel-web3j
+camel-websocket
camel-wordpress
camel-xchange
camel-xmlbeans
diff --git a/parent/pom.xml b/parent/pom.xml
index f26fede..36341a8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2174,12 +2174,12 @@
org.apache.camel
-camel-websocket
+camel-web3j
${project.version}
org.apache.camel
-camel-web3j
+camel-websocket
${project.version}
--
To stop receiving notification emails like this one, please contact
davscl...@apache.org.
[camel] branch master updated: Regen
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 6894e45 Regen 6894e45 is described below commit 6894e45e8205f7e28bc40d4c61cee9d787b6a207 Author: Claus Ibsen AuthorDate: Thu Apr 26 09:36:46 2018 +0200 Regen --- components/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/readme.adoc b/components/readme.adoc index 985985d..ae52dae 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^ // components: START -Number of Components: 294 in 201 JAR artifacts (20 deprecated) +Number of Components: 293 in 200 JAR artifacts (20 deprecated) [width="100%",cols="4,1,5",options="header"] |=== -- To stop receiving notification emails like this one, please contact davscl...@apache.org.
