camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [camel] 01/03: Merge remote-tracking branch 'origin/master' into camel-3.x
Date Mon, 12 Nov 2018 12:34:19 GMT
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 590834380a57a8061d1bb512ee55e68b74025cb0
Merge: 7340cff 2037535
Author: Guillaume Nodet <gnodet@gmail.com>
AuthorDate: Mon Nov 12 09:06:41 2018 +0100

    Merge remote-tracking branch 'origin/master' into camel-3.x

 .../camel-aws/src/main/docs/aws-sqs-component.adoc | 30 +++++++++-
 .../camel/component/aws/sqs/SqsConfiguration.java  | 14 +++++
 .../camel/component/aws/sqs/SqsEndpoint.java       |  6 ++
 .../src/main/resources/META-INF/spring.schemas     |  1 +
 .../main/docs/elasticsearch-rest-component.adoc    |  2 +
 .../elasticsearch/ElasticsearchProducer.java       | 24 ++++----
 .../camel/component/http4/HttpComponent.java       |  4 +-
 .../apache/camel/component/http4/HttpEndpoint.java | 25 ++++----
 .../component/http4/HttpsAuthenticationTest.java   |  4 +-
 .../apache/camel/component/http4/HttpsGetTest.java |  4 +-
 ...psTwoComponentsSslContextParametersGetTest.java |  4 +-
 ...tpsTwoDifferentSslContextParametersGetTest.java |  4 +-
 .../src/main/docs/jgroups-component.adoc           | 12 ++--
 .../component/mybatis/MyBatisBeanProducer.java     |  2 +-
 .../camel/component/mybatis/MyBatisQueueTest.java  |  2 +-
 .../component/mybatis/MyBatisTestSupport.java      | 68 +++++++++++++---------
 .../camel-nsq/src/main/docs/nsq-component.adoc     |  2 +-
 .../camel/component/nsq/NsqConfiguration.java      |  2 +-
 components/camel-slack/pom.xml                     |  6 +-
 .../camel/component/slack/SlackConsumerTest.java   | 55 +++++++++++++++--
 .../camel/component/slack/SlackProducerTest.java   | 48 +++++++++++----
 .../resources/OSGI-INF/blueprint/blueprint.xml     | 44 --------------
 .../src/main/resources/META-INF/spring.schemas     |  1 +
 .../src/main/resources/META-INF/spring.schemas     |  1 +
 .../src/main/resources/META-INF/spring.schemas     |  1 +
 etc/scripts/release-distro.sh                      |  6 +-
 etc/scripts/release-website.sh                     |  4 +-
 parent/pom.xml                                     | 12 ++--
 .../sqs/springboot/SqsComponentConfiguration.java  | 13 +++++
 .../itest/springboot/CamelSalesforceTest.java      |  2 +-
 .../camel/itest/springboot/CamelSjms2Test.java     |  3 +-
 31 files changed, 257 insertions(+), 149 deletions(-)

diff --cc components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
index 845929b,6049ee3..9b2beb6
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
@@@ -57,6 -59,13 +57,11 @@@ import org.apache.http.protocol.HttpCon
  @ManagedResource(description = "Managed HttpEndpoint")
  public class HttpEndpoint extends HttpCommonEndpoint {
  
 -    private static final Logger LOG = LoggerFactory.getLogger(HttpEndpoint.class);
 -
+     @UriParam(label = "security", description = "To configure security using SSLContextParameters."
+         + " Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters
is supported per HttpComponent."
+         + " If you need to use 2 or more different instances, you need to define a new HttpComponent
per instance you need.")
+     protected SSLContextParameters sslContextParameters;
+ 
      @UriParam(label = "advanced", description = "To use a custom HttpContext instance")
      private HttpContext httpContext;
      @UriParam(label = "advanced", description = "Register a custom configuration strategy
for new HttpClient instances"
diff --cc components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
index 69f8427,572526c..a2da530
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
@@@ -19,8 -19,8 +19,8 @@@ package org.apache.camel.component.http
  import org.apache.camel.builder.RouteBuilder;
  import org.apache.camel.impl.JndiRegistry;
  import org.apache.camel.test.AvailablePortFinder;
 -import org.apache.camel.util.jsse.SSLContextParameters;
 +import org.apache.camel.support.jsse.SSLContextParameters;
- import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+ import org.apache.http.conn.ssl.NoopHostnameVerifier;
  import org.apache.http.impl.bootstrap.HttpServer;
  import org.apache.http.impl.bootstrap.ServerBootstrap;
  import org.junit.After;
diff --cc components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
index f1a79ff,7f259cf..75509b6
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
@@@ -19,8 -19,8 +19,8 @@@ package org.apache.camel.component.http
  import org.apache.camel.FailedToCreateRouteException;
  import org.apache.camel.builder.RouteBuilder;
  import org.apache.camel.impl.JndiRegistry;
 -import org.apache.camel.util.jsse.SSLContextParameters;
 +import org.apache.camel.support.jsse.SSLContextParameters;
- import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+ import org.apache.http.conn.ssl.NoopHostnameVerifier;
  import org.apache.http.impl.bootstrap.HttpServer;
  import org.apache.http.impl.bootstrap.ServerBootstrap;
  import org.junit.After;


Mime
View raw message