date:20180226

[camel] branch master updated: Upgrade Spring Cloud Commons to version 1.3.2.RELEASE

2018-02-26 Thread acosentino

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 16fdf71  Upgrade Spring Cloud Commons to version 1.3.2.RELEASE
16fdf71 is described below

commit 16fdf717cd2e212272248f71fd1816138c3013c2
Author: Andrea Cosentino 
AuthorDate: Tue Feb 27 08:13:16 2018 +0100

Upgrade Spring Cloud Commons to version 1.3.2.RELEASE
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index fa48f71..e8cac3f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -634,7 +634,7 @@
 3.0.8.RELEASE_1
 1.5.10.RELEASE
 
-1.3.1.RELEASE
+1.3.2.RELEASE
 1.4.3.RELEASE
 1.2.0
 1.13.6.RELEASE

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

svn commit: r1026002 - in /websites/production/camel/content: cache/main.pageCache camel-2210-release.html

2018-02-26 Thread buildbot

Author: buildbot
Date: Mon Feb 26 15:18:47 2018
New Revision: 1026002

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2210-release.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2210-release.html
==
--- websites/production/camel/content/camel-2210-release.html (original)
+++ websites/production/camel/content/camel-2210-release.html Mon Feb 26 
15:18:47 2018
@@ -94,7 +94,7 @@
 
 
 
-New and NoteworthyWelcome 
to the x.y.z release which approx XXX issues resolved (new features, 
improvements and bug fixes such as...)Upgraded to JAXB 2.3.0 which 
is more JDK9 compliant.Added better support 
forjavax.jms.StreamMessage types inJMS component.OptimisedJMS to support ActiveMQ Artemis http://activemq.apache.org/artemis/docs/latest/large-messages.html;>large 
messages so you can send and receive big messages such as GB's in size. 
There is an example demonstrating this in 
camel-example-artemis-large-messages.Added support for route coverage 
reports which allows 3rd party tooling via SPI to visualise route coverage to 
Camel developers.Added route-coverage goal to the https://github.com/
 
apache/camel/blob/master/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc"
 rel="nofollow">Camel Maven Plugin so you can report route coverage from 
Maven command line.Added support for doing manual commits via Java 
code when using Kafka 
consumer.Vendor extensions in the swagger generated API docs is now 
disabled turned off, when usingRest 
DSL(not all 3rd partyAPI gateways/tooling support vendor 
extensions). You can turn this back-on via the apiVendorExtension 
option.The SFTP consumer now also supports 
theuseList option which can be used to download a single 
known file without use LIST operation on the FTP server (which can be slow if 
the FTP server has many files in the LIST results)CamelJSON with camel-jackson will now automatic 
use shared ObjectMapper instance if t
 here is only one instance in theRegistry. For example users with Spring Boot then 
allows Camel to easily use the default mapper from Spring 
Boot.AddedExtendedStartupListener that allows a 
callback just after the CamelContext has been fully started.You can 
now specify examples in theRest 
DSL that are included in the generated Swagger api-doc via 
camel-swagger-java.Improved file/ftp consumer to use current thread to 
poll, instead of a scheduled background task, when using pollEnrich (Content Enricher).Direct component now blocks by default if 
sending to a consumer which is not yet ready, which may happen during startup 
(little window of opportunity). This 
avoidsDirectConsumerNotAvailableException being thrown 
during startup etc.
 TheFTP component can now log 
progress (turn ontransferLoggingLevel) when perfomring download/upload 
and other operations. You can also find this information for the consumer in 
JMX.Added support for resuming downloads toFTP component. For example if you download big files and 
has connection problems with the FTP server. Then later when the connectivity 
works again, Camel can resume download the in-progress 
file.TheJettyandSERVLET consumers will now return HTTP Status 405 
(method not allowed) for requests that would have been processed by another 
HTTP request method, for example calling REST services with the wrong method. 
Beforehand a 404 error code was always regardless.Reworked 
theFileIdempotentRepository so the internal in-memory cache 
is onl
 y used for quick lookup of the most frequent file names, and lookup from disk 
as well. See more details in the class javadoc of the file.TheSQL Stored Procedure 
component now supports INOUT parameters.Added restart action 
toControlBus 
Component so you can easier restart a route.The following 
issues has been fixedFixedafterApplicationStart callback on 
camel-spring-boot to be called later and after CamelContext has been fully 
started.Fixed an issue testing with@UseAdviceWith and Camel on 
Spring Boot.FixedOnCompletion would not be triggered from a route 
usingSplitter and an exception 
was thrown during splitting.FixedKafka consumerstops consumin
 g messages when exception occurs during offset commit.FixedNetty4 consumer to stop taking in new 
requests while being shutdown, as otherwise it cannot graceful shutdown if new 
requests come in faster than it can process existing in-flight 
messages.Fixed an issue withRouting Slip andDynamic Router when using context scoped error 
handler, could cause the error handler to become stopped.FixedRest DSL withJetty security via custom define security handler and 
turned on api-doc as well would not startup Jetty server due missing

[camel] branch master updated: CAMEL-11598: camel-spring-boot - actuator endpoints - Make it read-only by default

2018-02-26 Thread davsclaus

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 ed47a51  CAMEL-11598: camel-spring-boot - actuator endpoints - Make it 
read-only by default
ed47a51 is described below

commit ed47a5160c2136ff09eb591e387bbebdb8c41afe
Author: Claus Ibsen 
AuthorDate: Mon Feb 26 15:21:48 2018 +0100

CAMEL-11598: camel-spring-boot - actuator endpoints - Make it read-only by 
default
---
 .../actuate/endpoint/AbstractCamelMvcEndpoint.java | 39 ++
 .../actuate/endpoint/CamelRoutesMvcEndpoint.java   | 10 +++---
 .../additional-spring-configuration-metadata.json  |  6 
 .../endpoint/CamelRoutesMvcEndpointTest.java   | 15 -
 .../src/main/resources/application.properties  |  3 ++
 5 files changed, 67 insertions(+), 6 deletions(-)

diff --git 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/AbstractCamelMvcEndpoint.java
 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/AbstractCamelMvcEndpoint.java
index 991c508..9f937a0 100644
--- 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/AbstractCamelMvcEndpoint.java
+++ 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/AbstractCamelMvcEndpoint.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.spring.boot.actuate.endpoint;
 
+import java.util.Collections;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -23,13 +25,22 @@ import org.springframework.boot.actuate.endpoint.Endpoint;
 import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
 import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 /**
  * Adapter to expose {@link T} as an {@link MvcEndpoint}.
  */
 abstract class AbstractCamelMvcEndpoint extends 
EndpointMvcAdapter {
+/**
+ * A {@link ResponseEntity} returned for forbidden operations (such as 
trying to stop a route).
+ */
+private static final ResponseEntity> 
FORBIDDEN_RESPONSE = new ResponseEntity>(
+Collections.singletonMap("message", "This operation is forbidden"),
+HttpStatus.FORBIDDEN);
+
 private final T delegate;
+private boolean readOnly = true;
 
 protected AbstractCamelMvcEndpoint(String path, T delegate) {
 super(delegate);
@@ -38,10 +49,27 @@ abstract class AbstractCamelMvcEndpoint 
extends EndpointMvcA
 setPath(path);
 }
 
+/**
+ * Returns the response that should be returned when the operation is 
forbidden.
+ * @return The response to be returned when the operation is disabled
+ */
+protected ResponseEntity getForbiddenResponse() {
+return FORBIDDEN_RESPONSE;
+}
+
+public boolean isReadOnly() {
+return readOnly;
+}
+
+public void setReadOnly(boolean readOnly) {
+this.readOnly = readOnly;
+}
+
 // 
 // Helpers
 // 
 
+
 protected T delegate() {
 return this.delegate;
 }
@@ -62,6 +90,17 @@ abstract class AbstractCamelMvcEndpoint 
extends EndpointMvcA
 return supplier.apply(delegate);
 }
 
+protected Object doIfEnabledAndNotReadOnly(Supplier supplier) {
+if (!delegate.isEnabled()) {
+return getDisabledResponse();
+}
+if (isReadOnly()) {
+return getForbiddenResponse();
+}
+
+return supplier.get();
+}
+
 @SuppressWarnings("serial")
 @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
 public static class GenericException extends RuntimeException {
diff --git 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesMvcEndpoint.java
 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesMvcEndpoint.java
index ae1a11b..5e852be 100644
--- 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesMvcEndpoint.java
+++ 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesMvcEndpoint.java
@@ -101,7 +101,7 @@ public class CamelRoutesMvcEndpoint extends 
AbstractCamelMvcEndpoint {
+return doIfEnabledAndNotReadOnly(() -> {
 try {
 delegate().stopRoute(
 id,
@@ -128,7 +128,7 @@ public class CamelRoutesMvcEndpoint extends 
AbstractCamelMvcEndpoint {
+return

[camel] branch master updated: Added remove headers EIP docs

2018-02-26 Thread acosentino

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 c88f2b4  Added remove headers EIP docs
c88f2b4 is described below

commit c88f2b41bf59775495c581f3d0f24b79f80741ba
Author: Andrea Cosentino 
AuthorDate: Mon Feb 26 14:56:28 2018 +0100

Added remove headers EIP docs
---
 .../src/main/docs/eips/removeHeaders-eip.adoc  | 25 ++
 1 file changed, 25 insertions(+)

diff --git a/camel-core/src/main/docs/eips/removeHeaders-eip.adoc 
b/camel-core/src/main/docs/eips/removeHeaders-eip.adoc
new file mode 100644
index 000..3f1147d
--- /dev/null
+++ b/camel-core/src/main/docs/eips/removeHeaders-eip.adoc
@@ -0,0 +1,25 @@
+[[removeHeaders-eip]]
+== Remove Headers EIP
+The Remove Headers EIP allows you to remove headers from your exchange.
+
+== Options
+
+// eip options: START
+The Remove Headers EIP supports 2 options which are listed below:
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *pattern* | *Required* Name or pattern of headers to remove |  | String
+| *excludePattern* | Name or patter of headers to not remove |  | String
+|===
+// eip options: END
+
+=== Samples
+
+[source,java]
+
+from("seda:b")
+  .removeHeaders(map)
+  .to("mock:result");
+

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] 02/02: Regen docs

2018-02-26 Thread davsclaus

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

commit 4f50ce7b247e653d7784b5f8275fcebb0eb598b6
Author: Claus Ibsen 
AuthorDate: Mon Feb 26 13:56:11 2018 +0100

Regen docs
---
 camel-core/src/main/docs/eips/enrich-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/onFallback-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/pipeline-eip.adoc | 2 +-
 camel-core/src/main/docs/eips/removeHeader-eip.adoc | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/camel-core/src/main/docs/eips/enrich-eip.adoc 
b/camel-core/src/main/docs/eips/enrich-eip.adoc
index c93ac4e..0509b0c 100644
--- a/camel-core/src/main/docs/eips/enrich-eip.adoc
+++ b/camel-core/src/main/docs/eips/enrich-eip.adoc
@@ -8,7 +8,6 @@ 
image:http://www.enterpriseintegrationpatterns.com/img/DataEnricher.gif[image]
 // eip options: START
 The Enrich EIP supports 7 options which are listed below:
 
-
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
diff --git a/camel-core/src/main/docs/eips/onFallback-eip.adoc 
b/camel-core/src/main/docs/eips/onFallback-eip.adoc
index 4117703..74f58e1 100644
--- a/camel-core/src/main/docs/eips/onFallback-eip.adoc
+++ b/camel-core/src/main/docs/eips/onFallback-eip.adoc
@@ -10,7 +10,6 @@ Hystrix has many options as listed in the table above. For 
example to set a high
 // eip options: START
 The On Fallback EIP supports 1 options which are listed below:
 
-
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
diff --git a/camel-core/src/main/docs/eips/pipeline-eip.adoc 
b/camel-core/src/main/docs/eips/pipeline-eip.adoc
index 706d4fa..4f9e01c 100644
--- a/camel-core/src/main/docs/eips/pipeline-eip.adoc
+++ b/camel-core/src/main/docs/eips/pipeline-eip.adoc
@@ -13,7 +13,7 @@ together.
 == Options
 
 // eip options: START
-The Pipeline EIP supports 0 options which are listed below:
+The Pipeline EIP has no options.
 // eip options: END
 
 [[PipesandFilters-Samples]]
diff --git a/camel-core/src/main/docs/eips/removeHeader-eip.adoc 
b/camel-core/src/main/docs/eips/removeHeader-eip.adoc
index a89d6d2..09e2a79 100644
--- a/camel-core/src/main/docs/eips/removeHeader-eip.adoc
+++ b/camel-core/src/main/docs/eips/removeHeader-eip.adoc
@@ -7,7 +7,6 @@ The Remove Header EIP allows you to remove an header from your 
exchange.
 // eip options: START
 The Remove Header EIP supports 1 options which are listed below:
 
-
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] branch master updated (0eba468 -> 4f50ce7)

2018-02-26 Thread davsclaus

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 0eba468  Upgrade EhCache to version 3.5.0
 new 0ff8be2  CAMEL-12047: Allow to resolve JSonSchemaResolver from registry
 new 4f50ce7  Regen docs

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:
 camel-core/src/main/docs/eips/enrich-eip.adoc  |  1 -
 camel-core/src/main/docs/eips/onFallback-eip.adoc  |  1 -
 camel-core/src/main/docs/eips/pipeline-eip.adoc|  2 +-
 camel-core/src/main/docs/eips/removeHeader-eip.adoc|  1 -
 .../apache/camel/runtimecatalog/RuntimeCamelCatalog.java   | 14 ++
 .../camel/core/xml/AbstractCamelContextFactoryBean.java|  6 ++
 6 files changed, 21 insertions(+), 4 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] 01/02: CAMEL-12047: Allow to resolve JSonSchemaResolver from registry

2018-02-26 Thread davsclaus

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

commit 0ff8be276e3d002d05e459e7f0909bea1400508b
Author: Claus Ibsen 
AuthorDate: Mon Feb 26 13:55:55 2018 +0100

CAMEL-12047: Allow to resolve JSonSchemaResolver from registry
---
 .../apache/camel/runtimecatalog/RuntimeCamelCatalog.java   | 14 ++
 .../camel/core/xml/AbstractCamelContextFactoryBean.java|  6 ++
 2 files changed, 20 insertions(+)

diff --git 
a/camel-core/src/main/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalog.java
 
b/camel-core/src/main/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalog.java
index 86c4b53..7f382f8 100644
--- 
a/camel-core/src/main/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalog.java
+++ 
b/camel-core/src/main/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalog.java
@@ -26,6 +26,20 @@ import org.apache.camel.StaticService;
  */
 public interface RuntimeCamelCatalog extends StaticService {
 
+// configuration
+
+/**
+ * Gets the {@link JSonSchemaResolver}.
+ */
+JSonSchemaResolver getJSonSchemaResolver();
+
+/**
+ * To use a custom {@link JSonSchemaResolver}
+ */
+void setJSonSchemaResolver(JSonSchemaResolver resolver);
+
+// functions
+
 /**
  * Returns the component information as JSon format.
  *
diff --git 
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
 
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 71386ae..87101bb 100644
--- 
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ 
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -84,6 +84,7 @@ import org.apache.camel.processor.interceptor.BacklogTracer;
 import org.apache.camel.processor.interceptor.HandleFault;
 import org.apache.camel.processor.interceptor.TraceFormatter;
 import org.apache.camel.processor.interceptor.Tracer;
+import org.apache.camel.runtimecatalog.JSonSchemaResolver;
 import org.apache.camel.spi.AsyncProcessorAwaitManager;
 import org.apache.camel.spi.ClassResolver;
 import org.apache.camel.spi.Debugger;
@@ -269,6 +270,11 @@ public abstract class AbstractCamelContextFactoryBeans
 Map typeConverters = 
getContext().getRegistry().findByTypeWithName(TypeConverters.class);
 if (typeConverters != null && !typeConverters.isEmpty()) {

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] branch master updated: Upgrade EhCache to version 3.5.0

2018-02-26 Thread acosentino

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 0eba468  Upgrade EhCache to version 3.5.0
0eba468 is described below

commit 0eba468ab74ca05a1894ff3bb0171647095926cf
Author: Andrea Cosentino 
AuthorDate: Mon Feb 26 11:29:21 2018 +0100

Upgrade EhCache to version 3.5.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index e6cf54a..fa48f71 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -196,7 +196,7 @@
 2.1.5
 2.1.5_1
 2.10.1
-3.4.0
+3.5.0
 5.2.0
 2.4.4_1
 18.0

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated: Added remove Header EIP docs

2018-02-26 Thread acosentino

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 a452a9e  Added remove Header EIP docs
a452a9e is described below

commit a452a9e12074ce83ba07da981b52901d0b42b80d
Author: Andrea Cosentino 
AuthorDate: Mon Feb 26 11:26:09 2018 +0100

Added remove Header EIP docs
---
 .../src/main/docs/eips/removeHeader-eip.adoc   | 40 ++
 1 file changed, 40 insertions(+)

diff --git a/camel-core/src/main/docs/eips/removeHeader-eip.adoc 
b/camel-core/src/main/docs/eips/removeHeader-eip.adoc
new file mode 100644
index 000..a89d6d2
--- /dev/null
+++ b/camel-core/src/main/docs/eips/removeHeader-eip.adoc
@@ -0,0 +1,40 @@
+[[removeHeader-eip]]
+== Remove Header EIP
+The Remove Header EIP allows you to remove an header from your exchange.
+
+== Options
+
+// eip options: START
+The Remove Header EIP supports 1 options which are listed below:
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *headerName* | *Required* Name of header to remove |  | String
+|===
+// eip options: END
+
+=== Samples
+
+[source,java]
+
+from("seda:b")
+  .removeHeader("myHeader")
+  .to("mock:result");
+
+
+ Spring DSL
+The sample below demonstrates the delay in Spring DSL:
+
+[source,xml]
+
+
+  
+  
+ myHeader
+  
+  
+
+
+

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated: Fixed component doc

2018-02-26 Thread davsclaus

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 b16fdf9  Fixed component doc
b16fdf9 is described below

commit b16fdf947af2c108e35fd56ad4f0ef00f8613955
Author: Claus Ibsen 
AuthorDate: Mon Feb 26 10:40:03 2018 +0100

Fixed component doc
---
 .../camel-tika/src/main/docs/tika-component.adoc   | 30 +-
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/components/camel-tika/src/main/docs/tika-component.adoc 
b/components/camel-tika/src/main/docs/tika-component.adoc
index b9dc720..ce5e0aa 100644
--- a/components/camel-tika/src/main/docs/tika-component.adoc
+++ b/components/camel-tika/src/main/docs/tika-component.adoc
@@ -14,23 +14,17 @@ following dependency to their `pom.xml`:
 *pom.xml*
 
 [source,xml]
-
+
 
 org.apache.camel
 camel-tika
 x.x.x
 
 
-
-
-### URI format
+
 
 The TIKA component only supports producer endpoints.
 
-[source,java]

-tika:operation[?options]

 
 ### Options
 
@@ -74,35 +68,23 @@ with the following path and query parameters:
 // endpoint options: END
 
 
-### Headers
-[width="100%",cols="10%,90%",options="header",]
-|===
-|Header |Description
-|===
 
 ### To Detect a file's MIME Type
 
 The file should be placed in the Body.
 
 [source,java]

+
 from("direct:start")
 .to("tika:detect");

+
 
 ### To Parse a File
 
 The file should be placed in the Body.
 
 [source,java]

+
 from("direct:start")
 .to("tika:parse");

-
-### See Also
-
-* Configuring Camel
-* Component
-* Endpoint
-* Getting Started
+

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] 02/03: Added automatic generation marker to onFallback docs

2018-02-26 Thread acosentino

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 9a6f33f9fb28a02ccef3523d73d0cd0458d56f1a
Author: Andrea Cosentino 
AuthorDate: Mon Feb 26 10:35:48 2018 +0100

Added automatic generation marker to onFallback docs
---
 camel-core/src/main/docs/eips/onFallback-eip.adoc | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/camel-core/src/main/docs/eips/onFallback-eip.adoc 
b/camel-core/src/main/docs/eips/onFallback-eip.adoc
index 13c9309..4117703 100644
--- a/camel-core/src/main/docs/eips/onFallback-eip.adoc
+++ b/camel-core/src/main/docs/eips/onFallback-eip.adoc
@@ -5,6 +5,19 @@ If you are using *onFallback* then that is intended to be 
local processing only
 Configuring Hystrix Example
 Hystrix has many options as listed in the table above. For example to set a 
higher timeout to *5* seconds, and also let the circuit breaker wait *10* 
seconds before attempting a request again when the state was tripped to be open.
 
+== Options
+
+// eip options: START
+The On Fallback EIP supports 1 options which are listed below:
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *fallbackViaNetwork* | Whether the fallback goes over the network. If the 
fallback will go over the network it is another possible point of failure and 
so it also needs to be wrapped by a HystrixCommand. It is important to execute 
the fallback command on a separate thread-pool, otherwise if the main command 
were to become latent and fill the thread-pool this would prevent the fallback 
from running if the two commands share the same pool. | false | Boolean
+|===
+// eip options: END
+
 [source,java]
 
 from("direct:start")
@@ -65,4 +78,4 @@ You can also configure Hystrix globally and then refer to 
that configuration:
 
   
 
-
\ No newline at end of file
+

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated (1cb67e2 -> 539fafe)

2018-02-26 Thread acosentino

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 1cb67e2  CAMEL-12273: Regen docs
 new 5355a19  Added automatic generation marker to pipeline docs
 new 9a6f33f  Added automatic generation marker to onFallback docs
 new 539fafe  Added automatic generation makers for enricher docs

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:
 camel-core/src/main/docs/eips/enrich-eip.adoc | 33 ---
 camel-core/src/main/docs/eips/onFallback-eip.adoc | 15 ++-
 camel-core/src/main/docs/eips/pipeline-eip.adoc   |  8 +-
 3 files changed, 38 insertions(+), 18 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] 03/03: Added automatic generation makers for enricher docs

2018-02-26 Thread acosentino

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 539fafec271bf51316eff9d0fbb52841634a5e0e
Author: Andrea Cosentino 
AuthorDate: Mon Feb 26 10:38:18 2018 +0100

Added automatic generation makers for enricher docs
---
 camel-core/src/main/docs/eips/enrich-eip.adoc | 33 ++-
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/camel-core/src/main/docs/eips/enrich-eip.adoc 
b/camel-core/src/main/docs/eips/enrich-eip.adoc
index 68cf1b7..c93ac4e 100644
--- a/camel-core/src/main/docs/eips/enrich-eip.adoc
+++ b/camel-core/src/main/docs/eips/enrich-eip.adoc
@@ -5,6 +5,23 @@ Camel supports the Content Enricher from the EIP patterns 
using a Message Transl
 
 image:http://www.enterpriseintegrationpatterns.com/img/DataEnricher.gif[image]
 
+// eip options: START
+The Enrich EIP supports 7 options which are listed below:
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *strategyRef* | Refers to an AggregationStrategy to be used to merge the 
reply from the external service, into a single outgoing message. By default 
Camel will use the reply from the external service as outgoing message. |  | 
String
+| *strategyMethodName* | This option can be used to explicit declare the 
method name to use, when using POJOs as the AggregationStrategy. |  | String
+| *strategyMethodAllowNull* | If this option is false then the aggregate 
method is not used if there was no data to enrich. If this option is true then 
null values is used as the oldExchange (when no data to enrich), when using 
POJOs as the AggregationStrategy. | false | Boolean
+| *aggregateOnException* | If this option is false then the aggregate method 
is not used if there was an exception thrown while trying to retrieve the data 
to enrich from the resource. Setting this option to true allows end users to 
control what to do if there was an exception in the aggregate method. For 
example to suppress the exception or set a custom message body etc. | false | 
Boolean
+| *shareUnitOfWork* | Shares the org.apache.camel.spi.UnitOfWork with the 
parent and the resource exchange. Enrich will by default not share unit of work 
between the parent exchange and the resource exchange. This means the resource 
exchange has its own individual unit of work. | false | Boolean
+| *cacheSize* | Sets the maximum size used by the 
org.apache.camel.impl.ProducerCache which is used to cache and reuse producer 
when uris are reused. |  | Integer
+| *ignoreInvalidEndpoint* | Ignore the invalidate endpoint exception when try 
to create a producer with that endpoint | false | Boolean
+|===
+// eip options: END
+
 === Content enrichment using a Message Translator or a Processor
 
 You can use Templating to consume a message from one destination, transform it 
with something like Velocity or XQuery, and then send it on to another 
destination. For example using InOnly (one way messaging)
@@ -82,22 +99,6 @@ Instead of using enrich you can use Recipient List and have 
dynamic endpoints an
 From *Camel 2.16* onwards both `enrich` and `pollEnrich` supports dynamic 
endpoints that uses an Expression to compute the uri, which allows to use data 
from the current Exchange. In other words all what is told above no longer 
apply and it just works.
 
 
-=== Enrich Options
-[width="100%",cols="3,2,6",options="header"]
-|===
-| Option | Default Value | Description
-| `uri` |  | The endpoint uri for the external service to enrich from. You 
must use either uri or ref. *Important:* From Camel 2.16 onwards, this option 
is removed, and you use an Expression to configure the uri, such as Simple or 
Constant or any other dynamic language that can compute the uri dynamically 
using values from the current Exchange.
-| `ref` |  | Refers to the endpoint for the external service to enrich from. 
You must use either `uri` or `ref`.  *Important:* From *Camel 2.16* onwards, 
this option is removed, and you use an Expression to configure the uri, such as 
Simple or Constant or any other dynamic language that can compute the uri 
dynamically using values from the current  Exchange.
-| `expression` |  | *Camel 2.16*: Mandatory. The Expression to configure the 
uri, such as Simple or Constant or any other dynamic language that can compute 
the uri dynamically using values from the current  Exchange.
-| `strategyRef` |  | Refers to an `AggregationStrategy` to be used to merge 
the reply from the external service, into a single outgoing message. By default 
Camel will use the reply from the external service as outgoing message. From 
*Camel 2.12* onwards you can also use a POJO as the AggregationStrategy, see 
the Aggregate page for more details.
-| `strategyMethodName` |  | *Camel 2.12*: This option can be used to explicit 
declare the method name to use, when using POJOs as the

[camel] 01/03: Added automatic generation marker to pipeline docs

2018-02-26 Thread acosentino

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 5355a195873a2076b02fc1e1fb9ec907f801ec94
Author: Andrea Cosentino 
AuthorDate: Mon Feb 26 10:31:41 2018 +0100

Added automatic generation marker to pipeline docs
---
 camel-core/src/main/docs/eips/pipeline-eip.adoc | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/camel-core/src/main/docs/eips/pipeline-eip.adoc 
b/camel-core/src/main/docs/eips/pipeline-eip.adoc
index 192f176..706d4fa 100644
--- a/camel-core/src/main/docs/eips/pipeline-eip.adoc
+++ b/camel-core/src/main/docs/eips/pipeline-eip.adoc
@@ -10,6 +10,12 @@ With Camel you can split your processing across multiple 
independent
 
link:https://github.com/apache/camel/blob/master/docs/user-manual/en/endpoint.adoc[Endpoint]
 instances which can then be chained
 together.
 
+== Options
+
+// eip options: START
+The Pipeline EIP supports 0 options which are listed below:
+// eip options: END
+
 [[PipesandFilters-Samples]]
 === Samples
 
@@ -88,4 +94,4 @@ then the `` element comes into its own.
 
   
 
-
\ No newline at end of file
+

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] 01/03: CAMEL-12273: Component docs should not generate empty tables.

2018-02-26 Thread davsclaus

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

commit 7d8f0ea68a29acca1f182b132068b8445788fb24
Author: Claus Ibsen 
AuthorDate: Mon Feb 26 10:01:04 2018 +0100

CAMEL-12273: Component docs should not generate empty tables.
---
 .../src/main/resources/eip-options.mvel   | 4 +++-
 .../src/main/resources/endpoint-options.mvel  | 8 
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
index d57f18b..ee51c62 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/eip-options.mvel
@@ -1,6 +1,8 @@
+@if{eipOptions.isEmpty()}
+The @{title} EIP has no options.
+@else{}
 The @{title} EIP supports @{eipOptions.size()} options which are listed below:
 
-@if{!eipOptions.isEmpty()}
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
index ee86096..217313f 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel
@@ -8,16 +8,24 @@ with the following path and query parameters:
 
  Path Parameters (@{endpointPathOptions.size()} parameters):
 
+@if{endpointPathOptions.isEmpty()}
+The @{title} endpoint has no path parameters.
+@else{}
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 @foreach{row : endpointPathOptions}| *@{row.getShortName(30)}* | 
@{row.description} | @{row.getShortDefaultValue(20)} | 
@{row.getShortJavaType(25)}
 @end{}|===
+@end{}
 
  Query Parameters (@{endpointOptions.size()} parameters):
 
+@if{endpointOptions.isEmpty()}
+The @{title} endpoint has no query parameters.
+@else{}
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 @foreach{row : endpointOptions}| *@{row.getShortName(30)}* (@{row.shortGroup}) 
| @{row.description} | @{row.getShortDefaultValue(20)} | 
@{row.getShortJavaType(25)}
 @end{}|===
+@end{}

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] 03/03: CAMEL-12273: Regen docs

2018-02-26 Thread davsclaus

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

commit 1cb67e25a3b59e00864165cff5ea02c3ad356052
Author: Claus Ibsen 
AuthorDate: Mon Feb 26 10:31:24 2018 +0100

CAMEL-12273: Regen docs
---
 camel-core/src/main/docs/eips/aggregate-eip.adoc| 1 -
 camel-core/src/main/docs/eips/batch-config-eip.adoc | 3 +--
 camel-core/src/main/docs/eips/bean-eip.adoc | 1 -
 camel-core/src/main/docs/eips/choice-eip.adoc   | 3 +--
 camel-core/src/main/docs/eips/circuitBreaker-eip.adoc   | 3 +--
 camel-core/src/main/docs/eips/claimCheck-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/convertBodyTo-eip.adoc| 3 +--
 camel-core/src/main/docs/eips/customLoadBalancer-eip.adoc   | 3 +--
 camel-core/src/main/docs/eips/delay-eip.adoc| 3 +--
 camel-core/src/main/docs/eips/dynamicRouter-eip.adoc| 1 -
 camel-core/src/main/docs/eips/failover-eip.adoc | 1 -
 camel-core/src/main/docs/eips/filter-eip.adoc   | 4 ++--
 camel-core/src/main/docs/eips/from-eip.adoc | 1 -
 camel-core/src/main/docs/eips/hystrix-eip.adoc  | 1 -
 camel-core/src/main/docs/eips/hystrixConfiguration-eip.adoc | 1 -
 camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/inOnly-eip.adoc   | 3 +--
 camel-core/src/main/docs/eips/inOut-eip.adoc| 1 -
 camel-core/src/main/docs/eips/loadBalance-eip.adoc  | 3 +--
 camel-core/src/main/docs/eips/log-eip.adoc  | 3 +--
 camel-core/src/main/docs/eips/loop-eip.adoc | 1 -
 camel-core/src/main/docs/eips/multicast-eip.adoc| 1 -
 camel-core/src/main/docs/eips/pollEnrich-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/random-eip.adoc   | 4 ++--
 camel-core/src/main/docs/eips/recipientList-eip.adoc| 1 -
 camel-core/src/main/docs/eips/resequence-eip.adoc   | 3 +--
 camel-core/src/main/docs/eips/roundRobin-eip.adoc   | 2 +-
 camel-core/src/main/docs/eips/routingSlip-eip.adoc  | 1 -
 camel-core/src/main/docs/eips/saga-eip.adoc | 1 -
 camel-core/src/main/docs/eips/sample-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/script-eip.adoc   | 4 ++--
 camel-core/src/main/docs/eips/serviceCall-eip.adoc  | 3 +--
 camel-core/src/main/docs/eips/sort-eip.adoc | 3 +--
 camel-core/src/main/docs/eips/split-eip.adoc| 1 -
 camel-core/src/main/docs/eips/sticky-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/stop-eip.adoc | 2 +-
 camel-core/src/main/docs/eips/stream-config-eip.adoc| 1 -
 camel-core/src/main/docs/eips/threads-eip.adoc  | 1 -
 camel-core/src/main/docs/eips/throttle-eip.adoc | 3 +--
 camel-core/src/main/docs/eips/topic-eip.adoc| 2 +-
 camel-core/src/main/docs/eips/validate-eip.adoc | 4 ++--
 camel-core/src/main/docs/eips/weighted-eip.adoc | 1 -
 camel-core/src/main/docs/eips/wireTap-eip.adoc  | 1 -
 43 files changed, 24 insertions(+), 60 deletions(-)

diff --git a/camel-core/src/main/docs/eips/aggregate-eip.adoc 
b/camel-core/src/main/docs/eips/aggregate-eip.adoc
index 4df466c..c2795af 100644
--- a/camel-core/src/main/docs/eips/aggregate-eip.adoc
+++ b/camel-core/src/main/docs/eips/aggregate-eip.adoc
@@ -19,7 +19,6 @@ single correlation key into a single message exchange.
 // eip options: START
 The Aggregate EIP supports 24 options which are listed below:
 
-
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
diff --git a/camel-core/src/main/docs/eips/batch-config-eip.adoc 
b/camel-core/src/main/docs/eips/batch-config-eip.adoc
index 47dc2cd..9d01774 100644
--- a/camel-core/src/main/docs/eips/batch-config-eip.adoc
+++ b/camel-core/src/main/docs/eips/batch-config-eip.adoc
@@ -5,7 +5,6 @@
 // eip options: START
 The Batch-config EIP supports 5 options which are listed below:
 
-
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
@@ -15,4 +14,4 @@ The Batch-config EIP supports 5 options which are listed 
below:
 | *reverse* | Whether to reverse the ordering. | false | Boolean
 | *ignoreInvalidExchanges* | Whether to ignore invalid exchanges | false | 
Boolean
 |===
-// eip options: END
\ No newline at end of file
+// eip options: END
diff --git a/camel-core/src/main/docs/eips/bean-eip.adoc 
b/camel-core/src/main/docs/eips/bean-eip.adoc
index 0ed7c71..d3c3917 100644
--- a/camel-core/src/main/docs/eips/bean-eip.adoc
+++ b/camel-core/src/main/docs/eips/bean-eip.adoc
@@ -18,7 +18,6 @@ the link:registry.html[Registry]
 // eip options: START
 The Bean EIP supports 5 options which are listed below:
 
-

[camel] branch master updated (daadfe7 -> 1cb67e2)

2018-02-26 Thread davsclaus

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 daadfe7  CAMEL-12287: Allow overriding the endpoint host
 new 7d8f0ea  CAMEL-12273: Component docs should not generate empty tables.
 new 065b6b4  CAMEL-12273: Regen docs
 new 1cb67e2  CAMEL-12273: Regen docs

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:
 camel-core/src/main/docs/bean-component.adoc  | 3 +++
 camel-core/src/main/docs/binding-component.adoc   | 3 +++
 camel-core/src/main/docs/browse-component.adoc| 3 +++
 camel-core/src/main/docs/class-component.adoc | 3 +++
 camel-core/src/main/docs/controlbus-component.adoc| 3 +++
 camel-core/src/main/docs/dataformat-component.adoc| 3 +++
 camel-core/src/main/docs/dataset-component.adoc   | 3 +++
 camel-core/src/main/docs/direct-component.adoc| 3 +++
 camel-core/src/main/docs/direct-vm-component.adoc | 3 +++
 camel-core/src/main/docs/eips/aggregate-eip.adoc  | 1 -
 camel-core/src/main/docs/eips/batch-config-eip.adoc   | 3 +--
 camel-core/src/main/docs/eips/bean-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/choice-eip.adoc | 3 +--
 camel-core/src/main/docs/eips/circuitBreaker-eip.adoc | 3 +--
 camel-core/src/main/docs/eips/claimCheck-eip.adoc | 1 -
 camel-core/src/main/docs/eips/convertBodyTo-eip.adoc  | 3 +--
 camel-core/src/main/docs/eips/customLoadBalancer-eip.adoc | 3 +--
 camel-core/src/main/docs/eips/delay-eip.adoc  | 3 +--
 camel-core/src/main/docs/eips/dynamicRouter-eip.adoc  | 1 -
 camel-core/src/main/docs/eips/failover-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/filter-eip.adoc | 4 ++--
 camel-core/src/main/docs/eips/from-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/hystrix-eip.adoc| 1 -
 camel-core/src/main/docs/eips/hystrixConfiguration-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc | 1 -
 camel-core/src/main/docs/eips/inOnly-eip.adoc | 3 +--
 camel-core/src/main/docs/eips/inOut-eip.adoc  | 1 -
 camel-core/src/main/docs/eips/loadBalance-eip.adoc| 3 +--
 camel-core/src/main/docs/eips/log-eip.adoc| 3 +--
 camel-core/src/main/docs/eips/loop-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/multicast-eip.adoc  | 1 -
 camel-core/src/main/docs/eips/pollEnrich-eip.adoc | 1 -
 camel-core/src/main/docs/eips/random-eip.adoc | 4 ++--
 camel-core/src/main/docs/eips/recipientList-eip.adoc  | 1 -
 camel-core/src/main/docs/eips/resequence-eip.adoc | 3 +--
 camel-core/src/main/docs/eips/roundRobin-eip.adoc | 2 +-
 camel-core/src/main/docs/eips/routingSlip-eip.adoc| 1 -
 camel-core/src/main/docs/eips/saga-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/sample-eip.adoc | 1 -
 camel-core/src/main/docs/eips/script-eip.adoc | 4 ++--
 camel-core/src/main/docs/eips/serviceCall-eip.adoc| 3 +--
 camel-core/src/main/docs/eips/sort-eip.adoc   | 3 +--
 camel-core/src/main/docs/eips/split-eip.adoc  | 1 -
 camel-core/src/main/docs/eips/sticky-eip.adoc | 1 -
 camel-core/src/main/docs/eips/stop-eip.adoc   | 2 +-
 camel-core/src/main/docs/eips/stream-config-eip.adoc  | 1 -
 camel-core/src/main/docs/eips/threads-eip.adoc| 1 -
 camel-core/src/main/docs/eips/throttle-eip.adoc   | 3 +--
 camel-core/src/main/docs/eips/topic-eip.adoc  | 2 +-
 camel-core/src/main/docs/eips/validate-eip.adoc   | 4 ++--
 camel-core/src/main/docs/eips/weighted-eip.adoc   | 1 -
 camel-core/src/main/docs/eips/wireTap-eip.adoc| 1 -
 camel-core/src/main/docs/file-component.adoc  | 3 +++
 camel-core/src/main/docs/language-component.adoc  | 3 +++
 camel-core/src/main/docs/log-component.adoc   | 3 +++
 camel-core/src/main/docs/mock-component.adoc  | 3 +++
 camel-core/src/main/docs/properties-component.adoc| 3 +++
 camel-core/src/main/docs/ref-component.adoc   | 3 +++

[camel] branch master updated: CAMEL-12287: Allow overriding the endpoint host

2018-02-26 Thread acosentino

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 daadfe7  CAMEL-12287: Allow overriding the endpoint host
daadfe7 is described below

commit daadfe77bdd62822347193f49bd22b8fddaf8646
Author: Jens Reimann 
AuthorDate: Thu Feb 22 10:30:17 2018 +0100

CAMEL-12287: Allow overriding the endpoint host

This change adds the ability to override the server reported
hostname/IP with the originally provided IP when connecting
to the server.
---
 .../src/main/docs/milo-client-component.adoc   |  3 +-
 .../milo/client/MiloClientConfiguration.java   | 18 ++-
 .../milo/client/internal/SubscriptionManager.java  | 59 --
 .../MiloClientComponentConfiguration.java  | 13 +
 4 files changed, 88 insertions(+), 5 deletions(-)

diff --git a/components/camel-milo/src/main/docs/milo-client-component.adoc 
b/components/camel-milo/src/main/docs/milo-client-component.adoc
index eb3e2b5..ea1f48a 100644
--- a/components/camel-milo/src/main/docs/milo-client-component.adoc
+++ b/components/camel-milo/src/main/docs/milo-client-component.adoc
@@ -95,7 +95,7 @@ with the following path and query parameters:
 | *endpointUri* | *Required* The OPC UA server endpoint |  | String
 |===
 
- Query Parameters (23 parameters):
+ Query Parameters (24 parameters):
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
@@ -119,6 +119,7 @@ with the following path and query parameters:
 | *keyStoreUrl* (client) | The URL where the key should be loaded from |  | URL
 | *maxPendingPublishRequests* (client) | The maximum number of pending publish 
requests |  | Long
 | *maxResponseMessageSize* (client) | The maximum number of bytes a response 
message may have |  | Long
+| *overrideHost* (client) | Override the server reported endpoint host with 
the host from the endpoint URI. | false | boolean
 | *productUri* (client) | The product URI | 
http://camel.apache.org/EclipseMilo | String
 | *requestTimeout* (client) | Request timeout in milliseconds |  | Long
 | *sessionName* (client) | Session name |  | String
diff --git 
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
 
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
index 1a78648..75743ea 100644
--- 
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
+++ 
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConfiguration.java
@@ -85,6 +85,9 @@ public class MiloClientConfiguration implements Cloneable {
 @UriParam(label = "client", javaType = "java.lang.String")
 private Set allowedSecurityPolicies = new HashSet<>();
 
+@UriParam(label = "client")
+private boolean overrideHost;
+
 public MiloClientConfiguration() {
 }
 
@@ -95,6 +98,7 @@ public class MiloClientConfiguration implements Cloneable {
 this.productUri = other.productUri;
 this.requestTimeout = other.requestTimeout;
 this.allowedSecurityPolicies = allowedSecurityPolicies != null ? new 
HashSet<>(other.allowedSecurityPolicies) : null;
+this.overrideHost = other.overrideHost;
 }
 
 public void setEndpointUri(final String endpointUri) {
@@ -316,7 +320,19 @@ public class MiloClientConfiguration implements Cloneable {
 }
 
 public Set getAllowedSecurityPolicies() {
-return allowedSecurityPolicies;
+return this.allowedSecurityPolicies;
+}
+
+/**
+ * Override the server reported endpoint host with the host from the
+ * endpoint URI.
+ */
+public void setOverrideHost(boolean overrideHost) {
+this.overrideHost = overrideHost;
+}
+
+public boolean isOverrideHost() {
+return overrideHost;
 }
 
 @Override
diff --git 
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
 
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
index f2d3102..904217d 100644
--- 
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
+++ 
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.milo.client.internal;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -416,7 +417,11 @@ public class SubscriptionManager {
 }
 }
 
-return findEndpoint(endpoints);
+try {
+return findEndpoint(endpoints);
+

[camel] branch master updated: Added Stop EIP docs

2018-02-26 Thread acosentino

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 ccde993  Added Stop EIP docs
ccde993 is described below

commit ccde9936610949f3de3705416d927a68cd3334a3
Author: Andrea Cosentino 
AuthorDate: Mon Feb 26 09:51:54 2018 +0100

Added Stop EIP docs
---
 camel-core/src/main/docs/eips/stop-eip.adoc | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/camel-core/src/main/docs/eips/stop-eip.adoc 
b/camel-core/src/main/docs/eips/stop-eip.adoc
new file mode 100644
index 000..e17f164
--- /dev/null
+++ b/camel-core/src/main/docs/eips/stop-eip.adoc
@@ -0,0 +1,22 @@
+[[stop-eip]]
+== Stop EIP
+The Stop EIP stops the processing of the current message
+
+== Options
+
+// eip options: START
+The Stop EIP supports 0 options which are listed below:
+// eip options: END
+
+== Examples
+
+[source,java]
+
+from("direct:start")
+.choice()
+.when(body().contains("Hello")).to("mock:hello")
+.when(body().contains("Bye")).to("mock:bye").stop()
+.otherwise().to("mock:other")
+.end()
+.to("mock:result");
+

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated: CAMEL-12289: camel-opentracing: URISyntaxException in AbstractSpanDecorator

2018-02-26 Thread davsclaus

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 2ae0093  CAMEL-12289: camel-opentracing: URISyntaxException in 
AbstractSpanDecorator
2ae0093 is described below

commit 2ae0093a74032c25c89a918dcd9c0d50456f4ac1
Author: Claus Ibsen 
AuthorDate: Mon Feb 26 09:44:48 2018 +0100

CAMEL-12289: camel-opentracing: URISyntaxException in AbstractSpanDecorator
---
 .../opentracing/decorators/AbstractSpanDecorator.java| 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
index 74d42a0..702e43f 100644
--- 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
+++ 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.opentracing.decorators;
 
-import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -26,6 +25,7 @@ import io.opentracing.tag.Tags;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.opentracing.SpanDecorator;
+import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.URISupport;
 
 /**
@@ -43,7 +43,7 @@ public abstract class AbstractSpanDecorator implements 
SpanDecorator {
 // OpenTracing aims to use low cardinality operation names. Ideally a 
specific
 // span decorator should be defined for all relevant Camel components 
that
 // identify a meaningful operation name
-return URI.create(endpoint.getEndpointUri()).getScheme();
+return getComponentName(endpoint);
 }
 
 /**
@@ -69,7 +69,8 @@ public abstract class AbstractSpanDecorator implements 
SpanDecorator {
 
 @Override
 public void pre(Span span, Exchange exchange, Endpoint endpoint) {
-span.setTag(Tags.COMPONENT.getKey(), CAMEL_COMPONENT + 
URI.create(endpoint.getEndpointUri()).getScheme());
+String scheme = getComponentName(endpoint);
+span.setTag(Tags.COMPONENT.getKey(), CAMEL_COMPONENT + scheme);
 
 // Including the endpoint URI provides access to any options that may 
have been provided, for
 // subsequent analysis
@@ -116,4 +117,13 @@ public abstract class AbstractSpanDecorator implements 
SpanDecorator {
 return Collections.emptyMap();
 }
 
+private static String getComponentName(Endpoint endpoint) {
+String[] splitURI = 
StringHelper.splitOnCharacter(endpoint.getEndpointUri(), ":", 2);
+if (splitURI.length > 0) {
+return splitURI[0];
+} else {
+return null;
+}
+}
+
 }

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] branch camel-2.20.x updated: CAMEL-12289: camel-opentracing: URISyntaxException in AbstractSpanDecorator

2018-02-26 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/camel-2.20.x by this push:
 new 4909b61  CAMEL-12289: camel-opentracing: URISyntaxException in 
AbstractSpanDecorator
4909b61 is described below

commit 4909b6190ba73d3856512e8906811e4dc58c4acb
Author: Claus Ibsen 
AuthorDate: Mon Feb 26 09:44:48 2018 +0100

CAMEL-12289: camel-opentracing: URISyntaxException in AbstractSpanDecorator
---
 .../opentracing/decorators/AbstractSpanDecorator.java| 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
index 74d42a0..702e43f 100644
--- 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
+++ 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.opentracing.decorators;
 
-import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -26,6 +25,7 @@ import io.opentracing.tag.Tags;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.opentracing.SpanDecorator;
+import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.URISupport;
 
 /**
@@ -43,7 +43,7 @@ public abstract class AbstractSpanDecorator implements 
SpanDecorator {
 // OpenTracing aims to use low cardinality operation names. Ideally a 
specific
 // span decorator should be defined for all relevant Camel components 
that
 // identify a meaningful operation name
-return URI.create(endpoint.getEndpointUri()).getScheme();
+return getComponentName(endpoint);
 }
 
 /**
@@ -69,7 +69,8 @@ public abstract class AbstractSpanDecorator implements 
SpanDecorator {
 
 @Override
 public void pre(Span span, Exchange exchange, Endpoint endpoint) {
-span.setTag(Tags.COMPONENT.getKey(), CAMEL_COMPONENT + 
URI.create(endpoint.getEndpointUri()).getScheme());
+String scheme = getComponentName(endpoint);
+span.setTag(Tags.COMPONENT.getKey(), CAMEL_COMPONENT + scheme);
 
 // Including the endpoint URI provides access to any options that may 
have been provided, for
 // subsequent analysis
@@ -116,4 +117,13 @@ public abstract class AbstractSpanDecorator implements 
SpanDecorator {
 return Collections.emptyMap();
 }
 
+private static String getComponentName(Endpoint endpoint) {
+String[] splitURI = 
StringHelper.splitOnCharacter(endpoint.getEndpointUri(), ":", 2);
+if (splitURI.length > 0) {
+return splitURI[0];
+} else {
+return null;
+}
+}
+
 }

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] branch camel-2.19.x updated: CAMEL-12289: camel-opentracing: URISyntaxException in AbstractSpanDecorator

2018-02-26 Thread davsclaus

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/camel-2.19.x by this push:
 new 2103a14  CAMEL-12289: camel-opentracing: URISyntaxException in 
AbstractSpanDecorator
2103a14 is described below

commit 2103a142b28fe62dcfe18dd8a764c071471ed10c
Author: Claus Ibsen 
AuthorDate: Mon Feb 26 09:44:48 2018 +0100

CAMEL-12289: camel-opentracing: URISyntaxException in AbstractSpanDecorator
---
 .../opentracing/decorators/AbstractSpanDecorator.java| 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
index 74d42a0..702e43f 100644
--- 
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
+++ 
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/AbstractSpanDecorator.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.opentracing.decorators;
 
-import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -26,6 +25,7 @@ import io.opentracing.tag.Tags;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.opentracing.SpanDecorator;
+import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.URISupport;
 
 /**
@@ -43,7 +43,7 @@ public abstract class AbstractSpanDecorator implements 
SpanDecorator {
 // OpenTracing aims to use low cardinality operation names. Ideally a 
specific
 // span decorator should be defined for all relevant Camel components 
that
 // identify a meaningful operation name
-return URI.create(endpoint.getEndpointUri()).getScheme();
+return getComponentName(endpoint);
 }
 
 /**
@@ -69,7 +69,8 @@ public abstract class AbstractSpanDecorator implements 
SpanDecorator {
 
 @Override
 public void pre(Span span, Exchange exchange, Endpoint endpoint) {
-span.setTag(Tags.COMPONENT.getKey(), CAMEL_COMPONENT + 
URI.create(endpoint.getEndpointUri()).getScheme());
+String scheme = getComponentName(endpoint);
+span.setTag(Tags.COMPONENT.getKey(), CAMEL_COMPONENT + scheme);
 
 // Including the endpoint URI provides access to any options that may 
have been provided, for
 // subsequent analysis
@@ -116,4 +117,13 @@ public abstract class AbstractSpanDecorator implements 
SpanDecorator {
 return Collections.emptyMap();
 }
 
+private static String getComponentName(Endpoint endpoint) {
+String[] splitURI = 
StringHelper.splitOnCharacter(endpoint.getEndpointUri(), ":", 2);
+if (splitURI.length > 0) {
+return splitURI[0];
+} else {
+return null;
+}
+}
+
 }

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] branch master updated: Upgrade Spring Cloud Commons to version 1.3.2.RELEASE

svn commit: r1026002 - in /websites/production/camel/content: cache/main.pageCache camel-2210-release.html

[camel] branch master updated: CAMEL-11598: camel-spring-boot - actuator endpoints - Make it read-only by default

[camel] branch master updated: Added remove headers EIP docs

[camel] 02/02: Regen docs

[camel] branch master updated (0eba468 -> 4f50ce7)

[camel] 01/02: CAMEL-12047: Allow to resolve JSonSchemaResolver from registry

[camel] branch master updated: Upgrade EhCache to version 3.5.0

[camel] branch master updated: Added remove Header EIP docs

[camel] branch master updated: Fixed component doc

[camel] 02/03: Added automatic generation marker to onFallback docs

[camel] branch master updated (1cb67e2 -> 539fafe)

[camel] 03/03: Added automatic generation makers for enricher docs

[camel] 01/03: Added automatic generation marker to pipeline docs

[camel] 01/03: CAMEL-12273: Component docs should not generate empty tables.

[camel] 03/03: CAMEL-12273: Regen docs

[camel] branch master updated (daadfe7 -> 1cb67e2)

[camel] branch master updated: CAMEL-12287: Allow overriding the endpoint host

[camel] branch master updated: Added Stop EIP docs

[camel] branch master updated: CAMEL-12289: camel-opentracing: URISyntaxException in AbstractSpanDecorator

[camel] branch camel-2.20.x updated: CAMEL-12289: camel-opentracing: URISyntaxException in AbstractSpanDecorator

[camel] branch camel-2.19.x updated: CAMEL-12289: camel-opentracing: URISyntaxException in AbstractSpanDecorator

22 matches

Site Navigation

Mail list logo

Footer information