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/35206 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
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/35205 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[camel] branch master updated: Polished pom
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new dd76862 Polished pom dd76862 is described below commit dd7686231586dbbf49a83e83a24a8dc135f2b89a Author: Claus Ibsen AuthorDate: Tue Jul 9 18:00:10 2019 +0200 Polished pom --- components/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/pom.xml b/components/pom.xml index d122205..2a031df 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -36,7 +36,6 @@ -camel-attachments camel-bean camel-browse camel-controlbus @@ -70,6 +69,7 @@ camel-blueprint camel-spring camel-groovy +camel-attachments camel-http-common camel-http4 camel-hystrix
[camel] branch master updated: Camel-CMIS: Use PropertyBindingSupport wherever possible
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d7c3a06 Camel-CMIS: Use PropertyBindingSupport wherever possible
d7c3a06 is described below
commit d7c3a06c2ff03f98f109fd32f75fbe2b1d7a96b2
Author: Andrea Cosentino
AuthorDate: Tue Jul 9 16:20:18 2019 +0200
Camel-CMIS: Use PropertyBindingSupport wherever possible
---
.../camel/component/cmis/DefaultCMISSessionFacadeFactory.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/DefaultCMISSessionFacadeFactory.java
b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/DefaultCMISSessionFacadeFactory.java
index a41cfc3..fe5249d 100644
---
a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/DefaultCMISSessionFacadeFactory.java
+++
b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/DefaultCMISSessionFacadeFactory.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cmis;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.support.EndpointHelper;
+import org.apache.camel.support.PropertyBindingSupport;
public class DefaultCMISSessionFacadeFactory implements
CMISSessionFacadeFactory {
@@ -30,8 +30,8 @@ public class DefaultCMISSessionFacadeFactory implements
CMISSessionFacadeFactory
// must use a copy of the properties
Map copy = new HashMap<>(endpoint.getProperties());
// which we then set on the newly created facade
-EndpointHelper.setReferenceProperties(endpoint.getCamelContext(),
facade, copy);
-EndpointHelper.setProperties(endpoint.getCamelContext(), facade, copy);
+
+PropertyBindingSupport.bindProperties(endpoint.getCamelContext(),
facade, copy);
return facade;
}
[camel-quarkus] branch master updated: Use RestAssured in JDBC test #42
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 692b3e6 Use RestAssured in JDBC test #42
692b3e6 is described below
commit 692b3e66aef9bf791d9d93351fae1eb0b1962352
Author: lburgazzoli
AuthorDate: Mon Jul 8 20:21:20 2019 +0200
Use RestAssured in JDBC test #42
---
integration-tests/jdbc/pom.xml | 4 ++
.../{CamelLifecycle.java => CamelResource.java}| 53 +-
.../java/io/quarkus/it/camel/jdbc/CamelRoute.java | 15 ++
.../jdbc/src/main/resources/application.properties | 10 ++--
.../io/quarkus/it/camel/jdbc/CamelJdbcTest.java| 49 ++--
5 files changed, 62 insertions(+), 69 deletions(-)
diff --git a/integration-tests/jdbc/pom.xml b/integration-tests/jdbc/pom.xml
index 32a6435..9043bd6 100644
--- a/integration-tests/jdbc/pom.xml
+++ b/integration-tests/jdbc/pom.xml
@@ -39,6 +39,10 @@
io.quarkus
+quarkus-resteasy
+
+
+io.quarkus
quarkus-jdbc-h2
diff --git
a/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelLifecycle.java
b/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelResource.java
similarity index 61%
rename from
integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelLifecycle.java
rename to
integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelResource.java
index e5e3b18..b84b919 100644
---
a/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelLifecycle.java
+++
b/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelResource.java
@@ -19,35 +19,33 @@ package io.quarkus.it.camel.jdbc;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-
+import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
import javax.inject.Inject;
-import javax.sql.DataSource;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
-import org.apache.camel.quarkus.core.runtime.CamelRuntime;
-import org.apache.camel.quarkus.core.runtime.InitializingEvent;
-import org.apache.camel.quarkus.core.runtime.StartingEvent;
-import org.jboss.logging.Logger;
+import io.agroal.api.AgroalDataSource;
+import io.quarkus.agroal.DataSource;
+import org.apache.camel.ProducerTemplate;
+@Path("/test")
@ApplicationScoped
-public class CamelLifecycle {
-
-private static final Logger log = Logger.getLogger(CamelLifecycle.class);
-
+public class CamelResource {
@Inject
-CamelRuntime runtime;
+@DataSource("camel-ds")
+AgroalDataSource dataSource;
@Inject
-DataSource dataSource;
-
-public void initializing(@Observes InitializingEvent event) {
-log.debug("Binding camelsDs");
-runtime.getRegistry().bind("camelsDs", dataSource);
-}
+ProducerTemplate template;
-public void starting(@Observes StartingEvent event) throws SQLException {
-log.debug("Initializing camels table");
+@PostConstruct
+void postConstruct() throws SQLException {
try (Connection con = dataSource.getConnection()) {
try (Statement statement = con.createStatement()) {
try {
@@ -59,8 +57,21 @@ public class CamelLifecycle {
statement.execute("insert into camels (id, species) values (2,
'Camelus bactrianus')");
statement.execute("insert into camels (id, species) values (3,
'Camelus ferus')");
}
-log.info("Initialized camels table");
}
}
+@Path("/species/{id}")
+@GET
+@Produces(MediaType.TEXT_PLAIN)
+public String getSpeciesById(@PathParam("id") String id ) throws Exception
{
+return template.requestBody("direct:execute", "select species from
camels where id = " + id, String.class);
+}
+
+@Path("/execute")
+@POST
+@Consumes(MediaType.TEXT_PLAIN)
+@Produces(MediaType.TEXT_PLAIN)
+public String executeStatement(String statement) throws Exception {
+return template.requestBody("direct:execute", statement, String.class);
+}
}
diff --git
a/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelRoute.java
b/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelRoute.java
index a2255d4..da66741 100644
---
a/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelRoute.java
+++
b/integration-tests/jdbc/src/main/java/io/quarkus/it/camel/jdbc/CamelRoute.java
@@ -16,20 +16,15 @@
*/
package io.quarkus.it.camel.jdbc;
-import javax.enterprise.context.ApplicationScoped;
-
[camel] 04/04: The regen game 2
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit e99d121418c62567ba83995b1873feae974313a2 Author: Andrea Cosentino AuthorDate: Tue Jul 9 15:02:51 2019 +0200 The regen game 2 --- components/readme.adoc | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/components/readme.adoc b/components/readme.adoc index f189f2b..cde2350 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1,7 +1,7 @@ Components // components: START -Number of Components: 295 in 232 JAR artifacts (0 deprecated) +Number of Components: 297 in 234 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -67,6 +67,9 @@ Number of Components: 295 in 232 JAR artifacts (0 deprecated) | link:camel-avro/src/main/docs/avro-component.adoc[Avro] (camel-avro) + `avro:transport:host:port/messageName` | 2.10 | Working with Apache Avro for data serialization. +| link:camel-aws-cw/src/main/docs/aws-cw-component.adoc[AWS CloudWatch] (camel-aws-cw) + +`aws-cw:namespace` | 2.11 | The aws-cw component is used for sending metrics to an Amazon CloudWatch. + | link:camel-aws-ddb/src/main/docs/aws-ddb-component.adoc[AWS DynamoDB] (camel-aws-ddb) + `aws-ddb:tableName` | 2.10 | The aws-ddb component is used for storing and retrieving data from Amazon's DynamoDB service. @@ -169,6 +172,9 @@ Number of Components: 295 in 232 JAR artifacts (0 deprecated) | link:camel-cm-sms/src/main/docs/cm-sms-component.adoc[CM SMS Gateway] (camel-cm-sms) + `cm-sms:host` | 2.18 | The cm-sms component allows to integrate with CM SMS Gateway. +| link:camel-cmis/src/main/docs/cmis-component.adoc[CMIS] (camel-cmis) + +`cmis:cmsUrl` | 2.11 | The cmis component uses the Apache Chemistry client API and allows you to add/read nodes to/from a CMIS compliant content repositories. + | link:camel-coap/src/main/docs/coap-component.adoc[CoAP] (camel-coap) + `coap:uri` | 2.16 | The coap component is used for sending and receiving messages from COAP capable devices.
[camel] 01/04: Added camel-attachments to components POM
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit be86080b9d8ee10db5918f1a4f5ebb8baaabd852 Author: Andrea Cosentino AuthorDate: Tue Jul 9 13:04:54 2019 +0200 Added camel-attachments to components POM --- components/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/pom.xml b/components/pom.xml index 8c1858c..d122205 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -36,6 +36,7 @@ +camel-attachments camel-bean camel-browse camel-controlbus
[camel] 02/04: Camel-Mail: Fixed compilation
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 01a3552c287a68a91d0fc04dd10ef9c53c093721 Author: Andrea Cosentino AuthorDate: Tue Jul 9 14:19:10 2019 +0200 Camel-Mail: Fixed compilation --- .../src/main/java/org/apache/camel/component/mail/MailMessage.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java index 79b7c2f..836c9ee 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailMessage.java @@ -17,15 +17,12 @@ package org.apache.camel.component.mail; import java.io.IOException; -import java.util.HashMap; import java.util.Map; import javax.mail.Message; import javax.mail.MessagingException; import org.apache.camel.Exchange; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.attachment.Attachment; -import org.apache.camel.attachment.AttachmentMap; import org.apache.camel.support.DefaultMessage; import org.apache.camel.support.ExchangeHelper; import org.apache.camel.util.ObjectHelper;
[camel] 03/04: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit bb97becabeb1e9deace77225ba9b43c5266d2145 Author: Andrea Cosentino AuthorDate: Tue Jul 9 14:48:12 2019 +0200 Regen --- components/readme.adoc | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/components/readme.adoc b/components/readme.adoc index cde2350..f189f2b 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1,7 +1,7 @@ Components // components: START -Number of Components: 297 in 234 JAR artifacts (0 deprecated) +Number of Components: 295 in 232 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -67,9 +67,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-avro/src/main/docs/avro-component.adoc[Avro] (camel-avro) + `avro:transport:host:port/messageName` | 2.10 | Working with Apache Avro for data serialization. -| link:camel-aws-cw/src/main/docs/aws-cw-component.adoc[AWS CloudWatch] (camel-aws-cw) + -`aws-cw:namespace` | 2.11 | The aws-cw component is used for sending metrics to an Amazon CloudWatch. - | link:camel-aws-ddb/src/main/docs/aws-ddb-component.adoc[AWS DynamoDB] (camel-aws-ddb) + `aws-ddb:tableName` | 2.10 | The aws-ddb component is used for storing and retrieving data from Amazon's DynamoDB service. @@ -172,9 +169,6 @@ Number of Components: 297 in 234 JAR artifacts (0 deprecated) | link:camel-cm-sms/src/main/docs/cm-sms-component.adoc[CM SMS Gateway] (camel-cm-sms) + `cm-sms:host` | 2.18 | The cm-sms component allows to integrate with CM SMS Gateway. -| link:camel-cmis/src/main/docs/cmis-component.adoc[CMIS] (camel-cmis) + -`cmis:cmsUrl` | 2.11 | The cmis component uses the Apache Chemistry client API and allows you to add/read nodes to/from a CMIS compliant content repositories. - | link:camel-coap/src/main/docs/coap-component.adoc[CoAP] (camel-coap) + `coap:uri` | 2.16 | The coap component is used for sending and receiving messages from COAP capable devices.
[camel] branch master updated (65297ef -> e99d121)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 65297ef CAMEL-13678: Move attachments out of camel-core into camel-attachments. Upgrade cxf codegen plugin. new be86080 Added camel-attachments to components POM new 01a3552 Camel-Mail: Fixed compilation new bb97bec Regen new e99d121 The regen game 2 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/camel/component/mail/MailMessage.java | 3 --- components/pom.xml | 1 + 2 files changed, 1 insertion(+), 3 deletions(-)
[camel-quarkus] branch master updated: chore(build): remove travis build
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/master by this push: new 4e7a3a6 chore(build): remove travis build 4e7a3a6 is described below commit 4e7a3a63b479f8f8a104deda83d1b558fd4f65db Author: lburgazzoli AuthorDate: Tue Jul 9 14:24:27 2019 +0200 chore(build): remove travis build --- .travis.yml | 14 -- 1 file changed, 14 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 46b782a..000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -services: - - docker -language: java -jdk: - - openjdk8 -cache: - directories: -- $HOME/.m2/repository -- $HOME/.m2/wrapper -- $GRAALVM_HOME -# skip the built-in install step -install: true -script: - - ./mvnw clean verify -Dnative -Dnative-image.docker-build=true -Dnative-image.xmx=5g -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
[camel-quarkus] branch master updated (f1aa1b5 -> 7e05bb7)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from f1aa1b5 Merge pull request #50 from ppalaga/190709-migrate-constants add 7e05bb7 Removed Jenkinsfile not used No new revisions were added by this update. Summary of changes: Jenkinsfile | 65 - 1 file changed, 65 deletions(-) delete mode 100644 Jenkinsfile
[camel-quarkus] 01/01: Removed Jenkinsfile not used
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch jenkinsfile
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a4ffa0fe421dbc54d76ee9bd3d6e022ebf05b848
Author: Andrea Cosentino
AuthorDate: Tue Jul 9 14:21:36 2019 +0200
Removed Jenkinsfile not used
---
Jenkinsfile | 65 -
1 file changed, 65 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 89d8f24..000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,65 +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.
- */
-
-def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?:
'/home/jenkins/jenkins-slave/maven-repositories/0'
-def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-def JDK_NAME = env.JDK_NAME ?: 'JDK 1.8 (latest)'
-def MAVEN_PARAMS = "-U -B -e -fae -V -Dmaven.repo.local=${LOCAL_REPOSITORY}
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-
-pipeline {
-
-agent {
-label AGENT_LABEL
-}
-
-tools {
-jdk JDK_NAME
-}
-
-options {
-buildDiscarder(
-logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
-)
-disableConcurrentBuilds()
-}
-
-stages {
-stage('Test & Verify') {
-steps {
-sh "./mvnw $MAVEN_PARAMS clean verify -Dnative
-Dnative-image.docker-build=true -f pom.xml"
-}
-}
-
-//stage('Deploy') {
-//steps {
-//sh "./mvnw $MAVEN_PARAMS deploy -f pom.xml"
-//}
-//}
-}
-
-post {
-always {
-emailext(
-subject: '${DEFAULT_SUBJECT}',
-body: '${DEFAULT_CONTENT}',
-recipientProviders: [[$class: 'CulpritsRecipientProvider']]
-)
-}
-}
-}
[camel-quarkus] branch jenkinsfile created (now a4ffa0f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch jenkinsfile in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. at a4ffa0f Removed Jenkinsfile not used This branch includes the following new commits: new a4ffa0f Removed Jenkinsfile not used The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-quarkus] 01/01: Test PR on Jenkins do not merge
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch oscerd-patch-1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 9658a5daac47768d8e3e893e808ace665ddc60c4 Author: Andrea Cosentino AuthorDate: Tue Jul 9 12:47:12 2019 +0200 Test PR on Jenkins do not merge --- README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.adoc b/README.adoc index 92bce43..5b7d5ef 100644 --- a/README.adoc +++ b/README.adoc @@ -54,3 +54,4 @@ Build with tests in JVM mode and native mode: == Licensing This software is licensed under the terms you may find in the file named `LICENSE.txt` in this directory. +
[camel-quarkus] branch oscerd-patch-1 created (now 9658a5d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch oscerd-patch-1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. at 9658a5d Test PR on Jenkins do not merge This branch includes the following new commits: new 9658a5d Test PR on Jenkins do not merge The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-quarkus] branch master updated: Do not use io.quarkus...FeatureBuildItem feature constants
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 418d93d Do not use io.quarkus...FeatureBuildItem feature constants
new f1aa1b5 Merge pull request #50 from ppalaga/190709-migrate-constants
418d93d is described below
commit 418d93d8a98d6e83472cb7fe4be363ec786232b0
Author: Peter Palaga
AuthorDate: Tue Jul 9 12:12:23 2019 +0200
Do not use io.quarkus...FeatureBuildItem feature constants
Those constants will be removed from Quarkus together with Camel
extensions
---
.../quarkus/component/aws/s3/deployment/CamelAwsS3Processor.java | 4 +++-
.../quarkus/component/aws/sns/deployment/CamelAwsSNSProcessor.java| 4 +++-
.../quarkus/component/aws/sqs/deployment/CamelAwsSQSProcessor.java| 4 +++-
.../java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java | 4 +++-
.../component/infinispan/deployment/CamelInfinispanProcessor.java | 4 +++-
.../camel/quarkus/component/jdbc/deployment/CamelJdbcProcessor.java | 4 +++-
.../component/netty4http/deployment/CamelNetty4HTTPProcessor.java | 4 +++-
.../component/salesforce/deployment/CamelSalesforceProcessor.java | 4 +++-
.../quarkus/component/servlet/deployment/CamelServletProcessor.java | 3 ++-
9 files changed, 26 insertions(+), 9 deletions(-)
diff --git
a/extensions/aws-s3/deployment/src/main/java/org/apache/camel/quarkus/component/aws/s3/deployment/CamelAwsS3Processor.java
b/extensions/aws-s3/deployment/src/main/java/org/apache/camel/quarkus/component/aws/s3/deployment/CamelAwsS3Processor.java
index da17505..3f16539 100644
---
a/extensions/aws-s3/deployment/src/main/java/org/apache/camel/quarkus/component/aws/s3/deployment/CamelAwsS3Processor.java
+++
b/extensions/aws-s3/deployment/src/main/java/org/apache/camel/quarkus/component/aws/s3/deployment/CamelAwsS3Processor.java
@@ -53,9 +53,11 @@ class CamelAwsS3Processor {
public static final String AWS_S3_APPLICATION_ARCHIVE_MARKERS =
"com/amazonaws";
+private static final String FEATURE = "camel-aws-s3";
+
@BuildStep
FeatureBuildItem feature() {
-return new FeatureBuildItem(FeatureBuildItem.CAMEL_AWS_S3);
+return new FeatureBuildItem(FEATURE);
}
@BuildStep
diff --git
a/extensions/aws-sns/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sns/deployment/CamelAwsSNSProcessor.java
b/extensions/aws-sns/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sns/deployment/CamelAwsSNSProcessor.java
index 1234cbc..77063eb 100644
---
a/extensions/aws-sns/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sns/deployment/CamelAwsSNSProcessor.java
+++
b/extensions/aws-sns/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sns/deployment/CamelAwsSNSProcessor.java
@@ -51,9 +51,11 @@ class CamelAwsSNSProcessor {
public static final String AWS_SNS_APPLICATION_ARCHIVE_MARKERS =
"com/amazonaws";
+private static final String FEATURE = "camel-aws-sns";
+
@BuildStep
FeatureBuildItem feature() {
-return new FeatureBuildItem(FeatureBuildItem.CAMEL_AWS_SNS);
+return new FeatureBuildItem(FEATURE);
}
@BuildStep
diff --git
a/extensions/aws-sqs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sqs/deployment/CamelAwsSQSProcessor.java
b/extensions/aws-sqs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sqs/deployment/CamelAwsSQSProcessor.java
index dc6fa75..5323fce 100644
---
a/extensions/aws-sqs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sqs/deployment/CamelAwsSQSProcessor.java
+++
b/extensions/aws-sqs/deployment/src/main/java/org/apache/camel/quarkus/component/aws/sqs/deployment/CamelAwsSQSProcessor.java
@@ -51,9 +51,11 @@ class CamelAwsSQSProcessor {
public static final String AWS_SQS_APPLICATION_ARCHIVE_MARKERS =
"com/amazonaws";
+private static final String FEATURE = "camel-aws-sqs";
+
@BuildStep
FeatureBuildItem feature() {
-return new FeatureBuildItem(FeatureBuildItem.CAMEL_AWS_SQS);
+return new FeatureBuildItem(FEATURE);
}
@BuildStep
diff --git
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
index 7f45d9a..8fce03b 100644
---
a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
+++
b/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -72,6 +72,8 @@ class CamelProcessor {
private static final List>
CAMEL_REFLECTIVE_ANNOTATIONS = Arrays.asList();
+private static final String FEATURE = "camel-core";
+
@Inject
[camel] branch CAMEL-13678 deleted (was bd2ea04)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-13678 in repository https://gitbox.apache.org/repos/asf/camel.git. was bd2ea04 CAMEL-13678: Move attachments out of camel-core into camel-attachments. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-quarkus] branch master updated: chore(arc): add ConsumerTemplate and ProducerTemplate producers
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 0304e02 chore(arc): add ConsumerTemplate and ProducerTemplate
producers
new 7899370 Merge pull request #48 from lburgazzoli/producers
0304e02 is described below
commit 0304e02803a1bb347126911772cca3f99873a483
Author: lburgazzoli
AuthorDate: Tue Jul 9 11:26:53 2019 +0200
chore(arc): add ConsumerTemplate and ProducerTemplate producers
---
.../apache/camel/quarkus/core/runtime/CamelProducers.java| 12
1 file changed, 12 insertions(+)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelProducers.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelProducers.java
index 7ed990c..8a90350 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelProducers.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/CamelProducers.java
@@ -20,6 +20,8 @@ import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.spi.Registry;
@ApplicationScoped
@@ -38,6 +40,16 @@ public class CamelProducers {
}
@Produces
+public ProducerTemplate getCamelProducerTemplate() {
+return camelRuntime.getContext().createProducerTemplate();
+}
+
+@Produces
+public ConsumerTemplate getCamelConsumerTemplate() {
+return camelRuntime.getContext().createConsumerTemplate();
+}
+
+@Produces
public CamelConfig.BuildTime getCamelBuildTimeConfig() {
return camelRuntime.getBuildTimeConfig();
}
[camel-quarkus] branch master updated: chore(build): add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 59632ad chore(build): add Jenkinsfile
new b5fc2ce Merge pull request #49 from lburgazzoli/jenkins
59632ad is described below
commit 59632ad6f63939d675003add925ff2f5cfe1c447
Author: lburgazzoli
AuthorDate: Tue Jul 9 11:36:17 2019 +0200
chore(build): add Jenkinsfile
---
Jenkinsfile | 65 +
1 file changed, 65 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 000..89d8f24
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?:
'/home/jenkins/jenkins-slave/maven-repositories/0'
+def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
+def JDK_NAME = env.JDK_NAME ?: 'JDK 1.8 (latest)'
+def MAVEN_PARAMS = "-U -B -e -fae -V -Dmaven.repo.local=${LOCAL_REPOSITORY}
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+
+pipeline {
+
+agent {
+label AGENT_LABEL
+}
+
+tools {
+jdk JDK_NAME
+}
+
+options {
+buildDiscarder(
+logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
+)
+disableConcurrentBuilds()
+}
+
+stages {
+stage('Test & Verify') {
+steps {
+sh "./mvnw $MAVEN_PARAMS clean verify -Dnative
-Dnative-image.docker-build=true -f pom.xml"
+}
+}
+
+//stage('Deploy') {
+//steps {
+//sh "./mvnw $MAVEN_PARAMS deploy -f pom.xml"
+//}
+//}
+}
+
+post {
+always {
+emailext(
+subject: '${DEFAULT_SUBJECT}',
+body: '${DEFAULT_CONTENT}',
+recipientProviders: [[$class: 'CulpritsRecipientProvider']]
+)
+}
+}
+}
[camel] branch master updated: Fixed CS for AWS-SWF
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 66d980d Fixed CS for AWS-SWF
66d980d is described below
commit 66d980d978fccb25b5791d4c06ca4cfc8e69227e
Author: Andrea Cosentino
AuthorDate: Tue Jul 9 11:33:59 2019 +0200
Fixed CS for AWS-SWF
---
.../src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
index 3778bcc..1f6b42b 100644
---
a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
+++
b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
@@ -116,7 +116,7 @@ public class SWFEndpoint extends DefaultEndpoint {
public StartWorkflowOptions getStartWorkflowOptions() {
StartWorkflowOptions startWorkflowOptions = new StartWorkflowOptions();
try {
- PropertyBindingSupport.bindProperties(getCamelContext(),
startWorkflowOptions, configuration.getStartWorkflowOptionsParameters());
+PropertyBindingSupport.bindProperties(getCamelContext(),
startWorkflowOptions, configuration.getStartWorkflowOptionsParameters());
PropertyBindingSupport.bindProperties(getCamelContext(),
startWorkflowOptions, configuration.getStartWorkflowOptionsParameters());
} catch (Exception e) {
throw new RuntimeException(e);
[camel] branch master updated (0003716 -> fa07474)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 0003716 Upgrade GRPC to version 1.22.0 new f01f10c Camel-AWS-SWF - Use PropertyBindingSupport where possible new fa07474 Removed unused import The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[camel] 02/02: Removed unused import
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit fa07474d3edd0e49d390f82b0ecd961e64d56a18 Author: Andrea Cosentino AuthorDate: Tue Jul 9 11:26:46 2019 +0200 Removed unused import --- .../src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java| 1 - 1 file changed, 1 deletion(-) diff --git a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java index 58b1917..3778bcc 100644 --- a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java +++ b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java @@ -34,7 +34,6 @@ import org.apache.camel.Producer; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.support.DefaultEndpoint; -import org.apache.camel.support.EndpointHelper; import org.apache.camel.support.ExchangeHelper; import org.apache.camel.support.PropertyBindingSupport; import org.apache.camel.util.ObjectHelper;
[camel] 01/02: Camel-AWS-SWF - Use PropertyBindingSupport where possible
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f01f10c9784b7eb47db453f3dcde1ef9f2e50d5a
Author: Andrea Cosentino
AuthorDate: Tue Jul 9 11:26:13 2019 +0200
Camel-AWS-SWF - Use PropertyBindingSupport where possible
---
.../main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
index bba4450..58b1917 100644
---
a/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
+++
b/components/camel-aws-swf/src/main/java/org/apache/camel/component/aws/swf/SWFEndpoint.java
@@ -36,6 +36,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.ExchangeHelper;
+import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.util.ObjectHelper;
/**
@@ -116,8 +117,8 @@ public class SWFEndpoint extends DefaultEndpoint {
public StartWorkflowOptions getStartWorkflowOptions() {
StartWorkflowOptions startWorkflowOptions = new StartWorkflowOptions();
try {
-EndpointHelper.setReferenceProperties(getCamelContext(),
startWorkflowOptions, configuration.getStartWorkflowOptionsParameters());
-EndpointHelper.setProperties(getCamelContext(),
startWorkflowOptions, configuration.getStartWorkflowOptionsParameters());
+ PropertyBindingSupport.bindProperties(getCamelContext(),
startWorkflowOptions, configuration.getStartWorkflowOptionsParameters());
+PropertyBindingSupport.bindProperties(getCamelContext(),
startWorkflowOptions, configuration.getStartWorkflowOptionsParameters());
} catch (Exception e) {
throw new RuntimeException(e);
}
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/35194 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[camel] branch master updated: Upgrade GRPC to version 1.22.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 0003716 Upgrade GRPC to version 1.22.0 0003716 is described below commit 0003716959bb120d343aa4fc0b537e4d5c73e561 Author: Andrea Cosentino AuthorDate: Tue Jul 9 10:52:01 2019 +0200 Upgrade GRPC to version 1.22.0 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 33a4a679..6387202 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -258,11 +258,11 @@ 17.0 0.30 2.3.25 -1.21.0 +1.22.0 0.13.0 26.0-android 3.7.0 - 2.0.22.Final + 2.0.25.Final 1.21.0_1 2.3.2 2.8.5
[camel] branch master updated: Upgrade Micrometer to version 1.2.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new a9e7fb9 Upgrade Micrometer to version 1.2.0 a9e7fb9 is described below commit a9e7fb903dc4adf092e3ccd7f159a5bae027da7e Author: Andrea Cosentino AuthorDate: Tue Jul 9 09:26:56 2019 +0200 Upgrade Micrometer to version 1.2.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8d6f22c..33a4a679 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -493,7 +493,7 @@ 2.22.1 3.2.3 3.2.6 -1.1.5 +1.2.0 0.2.5 1.9.11 2.0.21
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/35192 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] 02/02: CAMEL-13707: checkstyle
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 60946487b6ecb16d7fc1a31af4a060c3acd97f79
Author: Jan Bednář
AuthorDate: Fri Jul 5 15:45:52 2019 +0200
CAMEL-13707: checkstyle
---
.../camel/component/netty4/http/NettyHttpProducerHeadersTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
index 013c420..a1fc167 100644
---
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
+++
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
@@ -77,7 +77,7 @@ public class NettyHttpProducerHeadersTest extends
CamelTestSupport {
port = AvailablePortFinder.getNextAvailable(8000);
from("netty-http:http://localhost:; + port +
"?matchOnUriPrefix=true")
-.setBody(simple("${header."+Exchange.HTTP_URI+"}"));
+.setBody(simple("${header." + Exchange.HTTP_URI + "}"));
}
};
}
[camel] 01/02: CAMEL-13707: The path should not be empty in combination with http query
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit edb2d90e88fd1cff5473629bb3cf06ec771c1ee0
Author: Jan Bednář
AuthorDate: Fri Jul 5 15:29:28 2019 +0200
CAMEL-13707: The path should not be empty in combination with http query
---
.../component/netty4/http/NettyHttpHelper.java | 36 +-
.../netty4/http/NettyHttpGetWithParamTest.java | 1 -
.../netty4/http/NettyHttpProducerHeadersTest.java | 84 ++
3 files changed, 104 insertions(+), 17 deletions(-)
diff --git
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java
index 4170ad7..75acf2e 100644
---
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java
+++
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java
@@ -31,6 +31,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
@@ -204,23 +205,21 @@ public final class NettyHttpHelper {
if (path.startsWith("/")) {
path = path.substring(1);
}
-
-if (path.length() > 0) {
-// inject the dynamic path before the query params, if there
are any
-int idx = uri.indexOf("?");
-// if there are no query params
-if (idx == -1) {
-// make sure that there is exactly one "/" between
HTTP_URI and HTTP_PATH
-uri = uri.endsWith("/") ? uri : uri + "/";
-uri = uri.concat(path);
-} else {
-// there are query params, so inject the relative path in
the right place
-String base = uri.substring(0, idx);
-base = base.endsWith("/") ? base : base + "/";
-base = base.concat(path);
-uri = base.concat(uri.substring(idx));
-}
+// inject the dynamic path before the query params, if there are
any
+int idx = uri.indexOf("?");
+
+// if there are no query params
+if (idx == -1) {
+// make sure that there is exactly one "/" between HTTP_URI
and HTTP_PATH
+uri = uri.endsWith("/") ? uri : uri + "/";
+uri = uri.concat(path);
+} else {
+// there are query params, so inject the relative path in the
right place
+String base = uri.substring(0, idx);
+base = base.endsWith("/") ? base : base + "/";
+base = base.concat(path);
+uri = base.concat(uri.substring(idx));
}
}
@@ -258,6 +257,11 @@ public final class NettyHttpHelper {
if (queryString != null) {
// need to encode query string
queryString =
UnsafeUriCharactersEncoder.encodeHttpURI(queryString);
+if (ObjectHelper.isEmpty(uri.getPath())) {
+// If queryString is present, the path cannot be empty -
CAMEL-13707
+uri = new URI(url + "/");
+}
+
uri = URISupport.createURIWithQuery(uri, queryString);
}
return uri;
diff --git
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java
index 71d63ac..aa4b24f 100644
---
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java
+++
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithParamTest.java
@@ -41,7 +41,6 @@ public class NettyHttpGetWithParamTest extends BaseNettyTest {
}
@Test
-@Ignore("HTTP_QUERY not supported")
public void testHttpGetWithParamsViaHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye World");
diff --git
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
new file mode 100644
index 000..013c420
--- /dev/null
+++
[camel] branch master updated (ffe353a -> 6094648)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from ffe353a CAMEL-13734 - Fixed CS new edb2d90 CAMEL-13707: The path should not be empty in combination with http query new 6094648 CAMEL-13707: checkstyle The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../component/netty4/http/NettyHttpHelper.java | 36 +- .../netty4/http/NettyHttpGetWithParamTest.java | 1 - .../netty4/http/NettyHttpProducerHeadersTest.java | 84 ++ 3 files changed, 104 insertions(+), 17 deletions(-) create mode 100644 components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpProducerHeadersTest.java
[camel] 02/03: CAMEL-13734: camel-undertow - Support streaming for producer endpoints
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0747f77e50b08e2248b5db7e63cc4f4cd8b91dbe
Author: Tadayoshi Sato
AuthorDate: Mon Jul 8 15:42:24 2019 +0900
CAMEL-13734: camel-undertow - Support streaming for producer endpoints
---
.../src/main/docs/undertow-component.adoc | 2 +-
.../undertow/DefaultUndertowHttpBinding.java | 17 ++-
.../component/undertow/UndertowClientCallback.java | 18 +--
.../camel/component/undertow/UndertowConsumer.java | 4 +-
.../camel/component/undertow/UndertowEndpoint.java | 4 +-
.../camel/component/undertow/UndertowProducer.java | 117 ---
.../undertow/UndertowStreamingClientCallback.java | 61
.../dsl/UndertowEndpointBuilderFactory.java| 166 +
.../main/java/org/apache/camel/util/IOHelper.java | 13 ++
.../modules/ROOT/pages/undertow-component.adoc | 2 +-
10 files changed, 271 insertions(+), 133 deletions(-)
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc
b/components/camel-undertow/src/main/docs/undertow-component.adoc
index 612dfb6..1e08541 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -85,12 +85,12 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
+| *useStreaming* (common) | For HTTP endpoint: if true, text and binary
messages will be wrapped as java.io.InputStream before they are passed to an
Exchange; otherwise they will be passed as byte. For WebSocket endpoint: if
true, text and binary messages will be wrapped as java.io.Reader and
java.io.InputStream respectively before they are passed to an Exchange;
otherwise they will be passed as String and byte respectively. | false | boolean
| *accessLog* (consumer) | Whether or not the consumer should write access log
| false | Boolean
| *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
| *httpMethodRestrict* (consumer) | Used to only allow consuming if the
HttpMethod matches, such as GET/POST/PUT etc. Multiple methods can be specified
separated by comma. | | String
| *matchOnUriPrefix* (consumer) | Whether or not the consumer should try to
find a target consumer by matching the URI prefix if no exact match is found. |
false | Boolean
| *optionsEnabled* (consumer) | Specifies whether to enable HTTP OPTIONS for
this Servlet consumer. By default OPTIONS is turned off. | false | boolean
-| *useStreaming* (consumer) | For HTTP endpoint: if true, text and binary
messages will be wrapped as java.io.InputStream before they are passed to an
Exchange; otherwise they will be passed as byte. For WebSocket endpoint: if
true, text and binary messages will be wrapped as java.io.Reader and
java.io.InputStream respectively before they are passed to an Exchange;
otherwise they will be passed as String and byte respectively. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option 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
| *cookieHandler* (producer) | Configure a cookie handler to maintain a HTTP
session | | CookieHandler
diff --git
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
index 00eff07..28211de 100644
---
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
+++
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
@@ -150,7 +150,22 @@ public class DefaultUndertowHttpBinding implements
UndertowHttpBinding {
//retrieve response headers
populateCamelHeaders(clientExchange.getResponse(),
result.getHeaders(), exchange);
-result.setBody(readFromChannel(clientExchange.getResponseChannel()));
+StreamSourceChannel source = clientExchange.getResponseChannel();
+if (useStreaming) {
+// client
[camel] 03/03: CAMEL-13734 - Fixed CS
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ffe353a0ed86b226d2a15ae17ff4b050b800633c
Author: Andrea Cosentino
AuthorDate: Tue Jul 9 08:35:44 2019 +0200
CAMEL-13734 - Fixed CS
---
.../camel/component/undertow/UndertowClientCallback.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowClientCallback.java
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowClientCallback.java
index f6c3c77..fb2604a 100644
---
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowClientCallback.java
+++
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowClientCallback.java
@@ -94,6 +94,12 @@ class UndertowClientCallback implements
ClientCallback {
private static final Logger LOG =
LoggerFactory.getLogger(UndertowClientCallback.class);
+protected final UndertowEndpoint endpoint;
+
+protected final Exchange exchange;
+
+protected final ClientRequest request;
+
private final ByteBuffer body;
private final AsyncCallback callback;
@@ -104,12 +110,6 @@ class UndertowClientCallback implements
ClientCallback {
*/
private final BlockingDeque closables = new
LinkedBlockingDeque<>();
-protected final UndertowEndpoint endpoint;
-
-protected final Exchange exchange;
-
-protected final ClientRequest request;
-
private final Boolean throwExceptionOnFailure;
UndertowClientCallback(final Exchange exchange, final AsyncCallback
callback, final UndertowEndpoint endpoint,
[camel] 01/03: CAMEL-13734: camel-undertow - Support streaming for consumer endpoints
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 72e18efd15af749bde12fe71f923d94889c01fca
Author: Tadayoshi Sato
AuthorDate: Mon Jul 8 14:43:45 2019 +0900
CAMEL-13734: camel-undertow - Support streaming for consumer endpoints
---
.../src/main/docs/undertow-component.adoc | 2 +-
.../undertow/DefaultUndertowHttpBinding.java | 14 -
.../undertow/RestUndertowHttpBinding.java | 8 ++
.../component/undertow/UndertowComponent.java | 2 +-
.../camel/component/undertow/UndertowConsumer.java | 18
.../camel/component/undertow/UndertowEndpoint.java | 21 ++
.../dsl/UndertowEndpointBuilderFactory.java| 33 +-
7 files changed, 88 insertions(+), 10 deletions(-)
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc
b/components/camel-undertow/src/main/docs/undertow-component.adoc
index 480d953..612dfb6 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -90,6 +90,7 @@ with the following path and query parameters:
| *httpMethodRestrict* (consumer) | Used to only allow consuming if the
HttpMethod matches, such as GET/POST/PUT etc. Multiple methods can be specified
separated by comma. | | String
| *matchOnUriPrefix* (consumer) | Whether or not the consumer should try to
find a target consumer by matching the URI prefix if no exact match is found. |
false | Boolean
| *optionsEnabled* (consumer) | Specifies whether to enable HTTP OPTIONS for
this Servlet consumer. By default OPTIONS is turned off. | false | boolean
+| *useStreaming* (consumer) | For HTTP endpoint: if true, text and binary
messages will be wrapped as java.io.InputStream before they are passed to an
Exchange; otherwise they will be passed as byte. For WebSocket endpoint: if
true, text and binary messages will be wrapped as java.io.Reader and
java.io.InputStream respectively before they are passed to an Exchange;
otherwise they will be passed as String and byte respectively. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option 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
| *cookieHandler* (producer) | Configure a cookie handler to maintain a HTTP
session | | CookieHandler
@@ -108,7 +109,6 @@ with the following path and query parameters:
| *fireWebSocketChannelEvents* (websocket) | if true, the consumer will post
notifications to the route when a new WebSocket peer connects, disconnects,
etc. See UndertowConstants.EVENT_TYPE and EventType. | false | boolean
| *sendTimeout* (websocket) | Timeout in milliseconds when sending to a
websocket channel. The default timeout is 3 (30 seconds). | 3 | Integer
| *sendToAll* (websocket) | To send to all websocket subscribers. Can be used
to configure on endpoint level, instead of having to use the
UndertowConstants.SEND_TO_ALL header on the message. | | Boolean
-| *useStreaming* (websocket) | if true, text and binary messages coming
through a WebSocket will be wrapped as java.io.Reader and java.io.InputStream
respectively before they are passed to an Exchange; otherwise they will be
passed as String and byte respectively. | false | boolean
| *sslContextParameters* (security) | To configure security using
SSLContextParameters | | SSLContextParameters
|===
// endpoint options: END
diff --git
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
index 603a414..00eff07 100644
---
a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
+++
b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/DefaultUndertowHttpBinding.java
@@ -56,6 +56,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xnio.channels.BlockingReadableByteChannel;
import org.xnio.channels.StreamSourceChannel;
+import org.xnio.streams.ChannelInputStream;
/**
* DefaultUndertowHttpBinding represent binding used by default, if user
doesn't provide any.
@@ -68,10 +69,16 @@ public class DefaultUndertowHttpBinding implements
UndertowHttpBinding {
//use default filter strategy from Camel HTTP
private HeaderFilterStrategy headerFilterStrategy;
private Boolean transferException;
+private boolean useStreaming;
public DefaultUndertowHttpBinding()
[camel] branch master updated (363a7a3 -> ffe353a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 363a7a3 Fixed CS for Camel-package-maven-plugin new 72e18ef CAMEL-13734: camel-undertow - Support streaming for consumer endpoints new 0747f77 CAMEL-13734: camel-undertow - Support streaming for producer endpoints new ffe353a CAMEL-13734 - Fixed CS The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/docs/undertow-component.adoc | 2 +- .../undertow/DefaultUndertowHttpBinding.java | 31 - .../undertow/RestUndertowHttpBinding.java | 8 ++ .../component/undertow/UndertowClientCallback.java | 24 ++-- .../component/undertow/UndertowComponent.java | 2 +- .../camel/component/undertow/UndertowConsumer.java | 20 +++- .../camel/component/undertow/UndertowEndpoint.java | 21 +++- .../camel/component/undertow/UndertowProducer.java | 117 +- .../undertow/UndertowStreamingClientCallback.java | 61 ++ .../dsl/UndertowEndpointBuilderFactory.java| 133 - .../main/java/org/apache/camel/util/IOHelper.java | 13 ++ .../modules/ROOT/pages/undertow-component.adoc | 2 +- 12 files changed, 325 insertions(+), 109 deletions(-) create mode 100644 components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowStreamingClientCallback.java
[camel-quarkus] branch master updated (86e02a7 -> 206aebb)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 86e02a7 chore: ignore ObjectStore folder new d82e084 Use caffein as LRUCache in native mode #45 new 1a808a0 Infinispan substrate test are disbaled #44 new 206aebb Merge pull request #46 from lburgazzoli/caffeine The 115 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../quarkus/core/deployment/CamelProcessor.java| 34 -- .../it/camel/core/CamelInfinispanITCase.java | 3 -- 2 files changed, 12 insertions(+), 25 deletions(-)
[camel] branch master updated: Fixed CS for Camel-package-maven-plugin
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 363a7a3 Fixed CS for Camel-package-maven-plugin
363a7a3 is described below
commit 363a7a3335e60f3bde5c0badf2a96877e1cef37b
Author: Andrea Cosentino
AuthorDate: Tue Jul 9 08:23:49 2019 +0200
Fixed CS for Camel-package-maven-plugin
---
.../src/main/java/org/apache/camel/maven/packaging/MvelHelper.java | 2 +-
.../test/java/org/apache/camel/maven/packaging/MvelHelperTest.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java
index 13ea42d..fa02f40 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
diff --git
a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/MvelHelperTest.java
b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/MvelHelperTest.java
index ac9e031..4626260 100644
---
a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/MvelHelperTest.java
+++
b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/MvelHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -61,6 +61,7 @@ public class MvelHelperTest {
arguments("some http://example.com here", "some
\\http://example.com here"),
arguments("https://example.com;, "\\https://example.com;),
arguments("ftp://example.com;, "\\ftp://example.com;),
-arguments("Sets the POST URL for zipkin's http://zipkin.io/zipkin-api/#/\;>v2 api, usually
\"http://zipkinhost:9411/api/v2/spans\";, "Sets the POST URL for zipkin's http://zipkin.io/zipkin-api/#/\;>v2 api, usually
\"\\http://zipkinhost:9411/api/v2/spans\";));
+arguments("Sets the POST URL for zipkin's http://zipkin.io/zipkin-api/#/\;>v2 api, usually
\"http://zipkinhost:9411/api/v2/spans\";,
+"Sets the POST URL for zipkin's http://zipkin.io/zipkin-api/#/\;>v2 api, usually
\"\\http://zipkinhost:9411/api/v2/spans\";));
}
}
[camel] branch camel-2.x updated: [CAMEL-13711] Files.createTempFile not equivalent to File.createTempFile
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new 7686dc9 [CAMEL-13711] Files.createTempFile not equivalent to
File.createTempFile
7686dc9 is described below
commit 7686dc90540966ec81c5e46f4fb599a2cf9f4502
Author: Thomas Diesler
AuthorDate: Mon Jul 8 16:15:17 2019 +0200
[CAMEL-13711] Files.createTempFile not equivalent to File.createTempFile
---
.../org/apache/camel/component/hdfs2/HdfsFileType.java| 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
index c5648ed..3c29507 100644
---
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
+++
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
@@ -141,12 +141,19 @@ public enum HdfsFileType {
String fname = hdfsPath.substring(hdfsPath.lastIndexOf('/'));
// [CAMEL-13711] Files.createTempFile not equivalent to
File.createTempFile
-int dotIndex = fname.indexOf('.');
-if (dotIndex > 0) {
-fname = fname.substring(0, dotIndex);
+
+File outputDest;
+try {
+
+// First trying: Files.createTempFile
+outputDest = Files.createTempFile(fname, ".hdfs").toFile();
+
+} catch (Exception ex) {
+
+// Now trying: File.createTempFile
+outputDest = File.createTempFile(fname, ".hdfs");
}
-File outputDest = Files.createTempFile(fname,
".hdfs").toFile();
if (outputDest.exists()) {
outputDest.delete();
}
[camel] branch master updated: [CAMEL-13711] Files.createTempFile not equivalent to File.createTempFile
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e0be4d7 [CAMEL-13711] Files.createTempFile not equivalent to
File.createTempFile
e0be4d7 is described below
commit e0be4d70bd7c2cf268f2d95080ff2ffcb9c46034
Author: Thomas Diesler
AuthorDate: Mon Jul 8 16:15:17 2019 +0200
[CAMEL-13711] Files.createTempFile not equivalent to File.createTempFile
---
.../org/apache/camel/component/hdfs2/HdfsFileType.java| 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
index a6ea21f..9857902 100644
---
a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
+++
b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsFileType.java
@@ -141,12 +141,19 @@ public enum HdfsFileType {
String fname = hdfsPath.substring(hdfsPath.lastIndexOf('/'));
// [CAMEL-13711] Files.createTempFile not equivalent to
File.createTempFile
-int dotIndex = fname.indexOf('.');
-if (dotIndex > 0) {
-fname = fname.substring(0, dotIndex);
+
+File outputDest;
+try {
+
+// First trying: Files.createTempFile
+outputDest = Files.createTempFile(fname, ".hdfs").toFile();
+
+} catch (Exception ex) {
+
+// Now trying: File.createTempFile
+outputDest = File.createTempFile(fname, ".hdfs");
}
-File outputDest = Files.createTempFile(fname,
".hdfs").toFile();
if (outputDest.exists()) {
outputDest.delete();
}
