You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2018/11/06 10:43:32 UTC
[camel] branch master updated (4d04d2a -> 79628fe)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4d04d2a Upgrade EhCache to version 2.10.6
new c823585 Added Endpoint completer to adoc
new 26c8c23 Added Endpoint Completer to Summary
new 09a33b9 Added Uris to Summary
new db8a577 Merge branch 'master' of github.com:apache/camel
new ee7a689 [CAMEL-12914]camel-rest-swagger - Unit test fails after jetty upgrade
new 79628fe Merge branch 'master' of github.com:apache/camel
The 6 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:
.../test/java/org/apache/camel/component/rest/swagger/HttpsTest.java | 2 +-
.../org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 02/06: Added Endpoint Completer to Summary
Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 26c8c23a86334f093db0de936ec878db6db8c13c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 5 13:34:19 2018 +0100
Added Endpoint Completer to Summary
---
docs/user-manual/en/SUMMARY.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 7f0b599..00bd04f 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -93,7 +93,7 @@
* [DSL](dsl.adoc)
* [Endpoint](endpoint.adoc)
* Endpoint Annotations
-* EndpointCompleter
+* [EndpointCompleter](endpoint-completer.adoc)
* [Error Handler](error-handler.adoc)
* [Exchange](exchange.adoc)
* [Exchange Pattern](exchange-pattern.adoc)
Re: [camel] 04/06: Merge branch 'master' of github.com:apache/camel
Posted by Andrea Cosentino <an...@yahoo.com.INVALID>.
Can you please rebase and avoid merge commit? Just to keep the codebase and commit history clean.
Thanks.
--
Andrea Cosentino
----------------------------------
Apache Camel PMC Chair
Apache Karaf Committer
Apache Servicemix PMC Member
Email: ancosen1985@yahoo.com
Twitter: @oscerd2
Github: oscerd
On Tuesday, November 6, 2018, 11:43:34 AM GMT+1, <ff...@apache.org> wrote:
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit db8a577bb6443c463ebb8c965c02e08e1ac084b6
Merge: e0aba10 09a33b9
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Mon Nov 5 20:43:24 2018 +0800
Merge branch 'master' of github.com:apache/camel
docs/user-manual/en/SUMMARY.md | 4 ++--
docs/user-manual/en/endpoint-completer.adoc | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
[camel] 04/06: Merge branch 'master' of github.com:apache/camel
Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit db8a577bb6443c463ebb8c965c02e08e1ac084b6
Merge: e0aba10 09a33b9
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Mon Nov 5 20:43:24 2018 +0800
Merge branch 'master' of github.com:apache/camel
docs/user-manual/en/SUMMARY.md | 4 ++--
docs/user-manual/en/endpoint-completer.adoc | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
[camel] 03/06: Added Uris to Summary
Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 09a33b99836f88aa2627cccb930c4656fb34f475
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 5 13:36:55 2018 +0100
Added Uris to Summary
---
docs/user-manual/en/SUMMARY.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 00bd04f..e5d0ebc 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -119,7 +119,7 @@
* Tracer
* [Transport](transport.adoc)
* [Type Converter](type-converter.adoc)
-* URIs
+* [URIs](uris.adoc)
* [UuidGenerator](uuidgenerator.adoc)
* XML Configuration
[camel] 01/06: Added Endpoint completer to adoc
Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c823585bbe592d5f6b76da8096fb410fb9da7ee6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Nov 5 13:33:50 2018 +0100
Added Endpoint completer to adoc
---
docs/user-manual/en/endpoint-completer.adoc | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/docs/user-manual/en/endpoint-completer.adoc b/docs/user-manual/en/endpoint-completer.adoc
new file mode 100644
index 0000000..45b59bc
--- /dev/null
+++ b/docs/user-manual/en/endpoint-completer.adoc
@@ -0,0 +1,27 @@
+[[EndpointCompleter-EndpointCompleter]]
+=== EndpointCompleter
+
+As of *Camel 2.12*.
+This API is an optional SPI interface for link:component.adoc[Component]
+implementors. It provides a completion hook; rather like bash tab
+completion, or the completion in the
+http://karaf.apache.org/manual/latest/#_using_the_console[Karaf
+shell] when typing commands.
+
+Nice behaving components should implement EndpointCompleter and its
+completion method. The method is given a
+ComponentConfiguration object which wraps up all the various configuration values (and can be
+used to create a new Endpoint instance if required - or inject values
+into an exemplar internal instance).
+
+The *completeEndpointPath()* method then returns a list of Strings of
+the matching values available.
+
+For example here's the
+https://github.com/apache/camel/blob/master/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java#L78[implementation
+code in the FileComponent to implement completeEndpointPath()].
+
+Some example implementations include:
+
+* link:file2.adoc[File]
+
[camel] 05/06: [CAMEL-12914]camel-rest-swagger - Unit test fails
after jetty upgrade
Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ee7a68917d24c028acfc38297d2e031ed2cfc369
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Nov 6 18:42:55 2018 +0800
[CAMEL-12914]camel-rest-swagger - Unit test fails after jetty upgrade
---
.../test/java/org/apache/camel/component/rest/swagger/HttpsTest.java | 2 +-
.../org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
index 6bf472d..1c33dae 100644
--- a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
+++ b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
@@ -167,7 +167,7 @@ public abstract class HttpsTest extends CamelTestSupport {
sslContextParameters.setCamelContext(camelContext);
sslContextParameters.setTrustManagers(trustManagerParameters);
final CipherSuitesParameters cipherSuites = new CipherSuitesParameters();
- cipherSuites.setCipherSuite(Collections.singletonList("TLS_RSA_WITH_AES_128_CBC_SHA256"));
+ cipherSuites.setCipherSuite(Collections.singletonList("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"));
sslContextParameters.setCipherSuites(cipherSuites);
sslContextParameters.setSecureSocketProtocol("TLSv1.2");
return sslContextParameters;
diff --git a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java
index 3791706..8592328 100644
--- a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java
+++ b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/Jetty94ServerFactory.java
@@ -59,7 +59,7 @@ public final class Jetty94ServerFactory extends JettyHttpServerFactory {
sslContextFactory.setTrustStoreType(httpsSettings.trustStoreType());
}
sslContextFactory.setNeedClientAuth(httpsSettings.needClientAuth());
- sslContextFactory.setIncludeCipherSuites("TLS_RSA_WITH_AES_128_CBC_SHA256");
+ sslContextFactory.setIncludeCipherSuites("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256");
sslContextFactory.setProtocol("TLSv1.2");
final HttpConfiguration httpConfig = createHttpConfig(jettySettings);
[camel] 06/06: Merge branch 'master' of github.com:apache/camel
Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 79628fe26416e37381d2b5ef28086a9c2d9fc813
Merge: ee7a689 4d04d2a
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Tue Nov 6 18:43:06 2018 +0800
Merge branch 'master' of github.com:apache/camel
.../camel-cache/src/main/docs/cache-component.adoc | 2 +-
.../src/main/docs/consul-component.adoc | 6 +--
.../src/main/docs/disruptor-component.adoc | 4 +-
.../src/main/docs/ehcache-component.adoc | 2 +-
.../org/apache/camel/http/common/CamelServlet.java | 1 -
.../src/main/docs/infinispan-component.adoc | 2 +-
.../src/main/docs/jetty-component.adoc | 2 +-
.../camel-jms/src/main/docs/jms-component.adoc | 2 +-
.../camel-mllp/src/main/docs/mllp-component.adoc | 4 +-
.../src/main/docs/nagios-component.adoc | 2 +-
.../camel-netty/src/main/docs/netty-component.adoc | 10 ++--
.../src/main/docs/netty4-component.adoc | 12 ++---
.../src/main/docs/spring-boot.adoc | 4 +-
.../cloud/CamelCloudConfigurationProperties.java | 2 -
.../boot/CamelAutoConfigurationPropertiesTest.java | 2 +-
...amelAutoConfigurationWithContextRunnerTest.java | 54 ----------------------
.../boot/CamelConfigurationLocationsTest.java | 2 +-
.../camel/spring/boot/CamelEventNotifierTest.java | 2 +-
.../boot/CustomCamelCamelConfigurationTest.java | 2 +-
.../spring/boot/CustomShutdownStrategyTest.java | 2 +-
.../spring/boot/SpringConverterDelegationTest.java | 2 +-
.../camel/spring/boot/issues/RestDslPostTest.java | 2 +-
.../camel/spring/boot/issues/SimpleOgnlTest.java | 2 +-
.../boot/parent/SpringBootRefreshContextTest.java | 5 +-
.../camel-ssh/src/main/docs/ssh-component.adoc | 4 +-
.../src/main/docs/zookeeper-component.adoc | 2 +-
parent/pom.xml | 10 ++--
platforms/spring-boot/spring-boot-dm/pom.xml | 8 ++--
.../maven/bom/generator/BomGeneratorMojo.java | 4 ++
29 files changed, 53 insertions(+), 105 deletions(-)