You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/08/07 07:59:43 UTC
[camel] branch master updated (cc91ccd -> 6153504)
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 cc91ccd Fixed CS
new b2d3b54 CAMEL-13738: parent/pom.xml - use dash in version properties
new 7f1b0b6 CAMEL-13740: Update xstream json docs
new 6153504 Regen
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:
components/camel-ahc/pom.xml | 2 +-
components/camel-atmosphere-websocket/pom.xml | 2 +-
components/camel-bean-validator/pom.xml | 4 +-
components/camel-cm-sms/pom.xml | 4 +-
components/camel-cxf/pom.xml | 2 +-
components/camel-dozer/pom.xml | 4 +-
components/camel-google-sheets/pom.xml | 6 +-
components/camel-http-common/pom.xml | 2 +-
components/camel-http/pom.xml | 2 +-
components/camel-jetty-common/pom.xml | 2 +-
.../camel-mail/src/main/docs/mail-component.adoc | 2 +-
components/camel-netty4-http/pom.xml | 2 +-
components/camel-restlet/pom.xml | 2 +-
components/camel-servlet/pom.xml | 2 +-
components/camel-spring-ws/pom.xml | 2 +-
components/camel-undertow/pom.xml | 2 +-
.../src/main/docs/json-xstream-dataformat.adoc | 70 ++--------------------
.../modules/ROOT/pages/file-component.adoc | 3 +-
.../ROOT/pages/json-xstream-dataformat.adoc | 70 ++--------------------
.../modules/ROOT/pages/mail-component.adoc | 4 +-
.../modules/ROOT/pages/multicast-eip.adoc | 5 ++
.../modules/ROOT/pages/recipientList-eip.adoc | 25 ++------
docs/user-manual/modules/ROOT/pages/split-eip.adoc | 17 +++---
parent/pom.xml | 12 ++--
.../karaf/features/src/main/resources/features.xml | 44 +++++++-------
25 files changed, 78 insertions(+), 214 deletions(-)
[camel] 01/03: CAMEL-13738: parent/pom.xml - use dash in version
properties
Posted by da...@apache.org.
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 b2d3b543d0eb4f8601130ba309480d724cdd0d4d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 7 09:33:10 2019 +0200
CAMEL-13738: parent/pom.xml - use dash in version properties
---
components/camel-ahc/pom.xml | 2 +-
components/camel-atmosphere-websocket/pom.xml | 2 +-
components/camel-bean-validator/pom.xml | 4 +-
components/camel-cm-sms/pom.xml | 4 +-
components/camel-cxf/pom.xml | 2 +-
components/camel-dozer/pom.xml | 4 +-
components/camel-google-sheets/pom.xml | 6 +--
components/camel-http-common/pom.xml | 2 +-
components/camel-http/pom.xml | 2 +-
components/camel-jetty-common/pom.xml | 2 +-
components/camel-netty4-http/pom.xml | 2 +-
components/camel-restlet/pom.xml | 2 +-
components/camel-servlet/pom.xml | 2 +-
components/camel-spring-ws/pom.xml | 2 +-
components/camel-undertow/pom.xml | 2 +-
parent/pom.xml | 12 +++---
.../karaf/features/src/main/resources/features.xml | 44 +++++++++++-----------
17 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index e070f4c..8395944 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
<groupId>org.asynchttpclient</groupId>
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 3fa4468..49cd796 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<!-- atmosphere -->
diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml
index 231d2f7..cb3688a 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -60,12 +60,12 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
- <version>${javax.el-api-hibernate-validator-version}</version>
+ <version>${javax-el-api-hibernate-validator-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
- <version>${javax.el-hibernate-validator-version}</version>
+ <version>${javax-el-hibernate-validator-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml
index 304f319..08be559 100644
--- a/components/camel-cm-sms/pom.xml
+++ b/components/camel-cm-sms/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
- <version>${javax.el-api-hibernate-validator-version}</version>
+ <version>${javax-el-api-hibernate-validator-version}</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
- <version>${javax.el-hibernate-validator-version}</version>
+ <version>${javax-el-hibernate-validator-version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 68cef82..260d173 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index 4a33dcf..c08a8cc 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -51,12 +51,12 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
- <version>${javax.el3-version}</version>
+ <version>${javax-el3-version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
- <version>${javax.el3-version}</version>
+ <version>${javax-el3-version}</version>
</dependency>
<!-- Testing -->
diff --git a/components/camel-google-sheets/pom.xml b/components/camel-google-sheets/pom.xml
index 7c3ac61..6067380 100644
--- a/components/camel-google-sheets/pom.xml
+++ b/components/camel-google-sheets/pom.xml
@@ -63,19 +63,19 @@
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-core</artifactId>
- <version>${citrus.version}</version>
+ <version>${citrus-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-java-dsl</artifactId>
- <version>${citrus.version}</version>
+ <version>${citrus-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-http</artifactId>
- <version>${citrus.version}</version>
+ <version>${citrus-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index 430f1e8..242b1be 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index f484e28..cd77acc 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index 8b4b9f1..806362d 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml
index 0576f25..c1ef35f 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<!-- testing -->
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index b3e90b9..2bcadeb 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index b82d1a5..d875abd 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 2fc2800..91c7093 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
<scope>provided</scope>
</dependency>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 7b6c959..8f9cbac 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 143c0ed..beb710f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -115,7 +115,7 @@
<cglib-version>3.2.12</cglib-version>
<chunk-templates-version>3.5.0</chunk-templates-version>
<chunk-templates-bundle-version>3.5.0_1</chunk-templates-bundle-version>
- <citrus.version>2.8.0</citrus.version>
+ <citrus-version>2.8.0</citrus-version>
<cmis-version>1.1.0</cmis-version>
<cometd-java-client-version>4.0.4</cometd-java-client-version>
<cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
@@ -310,15 +310,15 @@
<javacrumbs-version>0.22</javacrumbs-version>
<javapoet-version>1.11.1</javapoet-version>
<javassist-version>3.20.0-GA</javassist-version>
- <javax.el3-version>3.0.0</javax.el3-version>
- <javax.el-api-hibernate-validator-version>3.0.1-b04</javax.el-api-hibernate-validator-version>
- <javax.el-hibernate-validator-version>3.0.1-b10</javax.el-hibernate-validator-version>
+ <javax-el3-version>3.0.0</javax-el3-version>
+ <javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
+ <javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
<javax-activation-version-range>[0,2)</javax-activation-version-range>
<javax-activation-version>1.2.0</javax-activation-version>
<javax-annotation-api-version>1.3.2</javax-annotation-api-version>
<javax-inject-bundle-version>1_2</javax-inject-bundle-version>
<javax-mail-version>1.6.1</javax-mail-version>
- <javax.servlet-api-version>3.1.0</javax.servlet-api-version>
+ <javax-servlet-api-version>3.1.0</javax-servlet-api-version>
<jaxb-bundle-version>2.3.1_1</jaxb-bundle-version>
<jakarta-api-version>2.1.5</jakarta-api-version>
<jakarta-jaxb-version>2.3.2</jakarta-jaxb-version>
@@ -4454,7 +4454,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet-api-version}</version>
+ <version>${javax-servlet-api-version}</version>
</dependency>
<!-- Optional Spring Support -->
<dependency>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b39fbdd..58ac0fe 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -145,7 +145,7 @@
<bundle dependency='true'>mvn:io.netty/netty-handler-proxy/${netty-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.typesafe.netty/netty-reactive-streams/${netty-reactive-streams-version}</bundle>
<bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-ahc/${project.version}</bundle>
@@ -240,7 +240,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle>mvn:org.apache.camel/camel-avro/${project.version}</bundle>
@@ -668,7 +668,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libphonenumber/${libphonenumber-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-cm-sms/${project.version}</bundle>
</feature>
<feature name='camel-cmis' version='${project.version}' start-level='50'>
@@ -695,7 +695,7 @@
<details>camel-cometd currently requires jetty 9</details>
<feature version="[9,10)">jetty</feature>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-server/${cometd-java-server}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-server}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-server}</bundle>
@@ -735,7 +735,7 @@
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-couchdb/${project.version}</bundle>
</feature>
<feature name='camel-couchbase' version='${project.version}' start-level='50'>
@@ -849,8 +849,8 @@
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-beanutils/commons-beanutils/${commons-beanutils-version}</bundle>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
- <bundle dependency='true'>mvn:javax.el/javax.el-api/${javax.el3-version}</bundle>
- <bundle dependency='true'>mvn:org.glassfish/javax.el/${javax.el3-version}</bundle>
+ <bundle dependency='true'>mvn:javax.el/javax.el-api/${javax-el3-version}</bundle>
+ <bundle dependency='true'>mvn:org.glassfish/javax.el/${javax-el3-version}</bundle>
<bundle dependency='true'>mvn:org.objenesis/objenesis/${objenesis-version}</bundle>
<bundle>mvn:org.apache.camel/camel-dozer/${project.version}</bundle>
</feature>
@@ -858,7 +858,7 @@
<feature version="${project.version}">camel-core</feature>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:com.dropbox.core/dropbox-core-sdk/${dropbox-version}</bundle>
<!-- sadly dropbox-core-sdk include test scoped dependencies in its MANIFEST.MF OSGi import
so we need a bunch of other bundles here -->
@@ -1024,7 +1024,7 @@
<bundle dependency='true'>mvn:org.eclipse.jgit/org.eclipse.jgit/${jgit-version}</bundle>
<bundle dependency='true'>mvn:com.googlecode.javaewah/JavaEWAH/${java-ewah-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle>
<bundle dependency='true'>mvn:org.bouncycastle/bcpg-jdk15on/${bouncycastle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
@@ -1052,7 +1052,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle>mvn:org.apache.camel/camel-google-bigquery/${project.version}</bundle>
</feature>
@@ -1127,7 +1127,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
<bundle>mvn:org.apache.camel/camel-google-pubsub/${project.version}</bundle>
</feature>
@@ -1260,7 +1260,7 @@
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http/${project.version}</bundle>
@@ -1270,7 +1270,7 @@
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hystrix/${hystrix-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hystrix-event-stream/${hystrix-bundle-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:io.reactivex/rxjava/${rxjava-version}</bundle>
@@ -1536,7 +1536,7 @@
<feature version='${spring-version-range}'>spring-tx</feature>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation-1.0-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.1_spec/${geronimo-jpa-spec-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-spec-version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
@@ -1579,7 +1579,7 @@
<feature name='camel-jt400' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jt400/${jt400-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jt400/${project.version}</bundle>
</feature>
@@ -1849,7 +1849,7 @@
<bundle dependency='true'>mvn:io.netty/netty-transport-native-unix-common/${netty-version}</bundle>
<bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
<bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-netty4/${project.version}</bundle>
@@ -2092,7 +2092,7 @@
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:https://maven.restlet.com@id=restlet!org.restlet.osgi/org.restlet/${restlet-version}</bundle>
<bundle dependency='true'>mvn:https://maven.restlet.com@id=restlet!org.restlet.osgi/org.restlet.ext.httpclient/${restlet-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-restlet/${project.version}</bundle>
@@ -2168,7 +2168,7 @@
<bundle dependency='true'>mvn:javax.validation/validation-api/${validation-1-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-client/${cometd-java-client-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-client-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-client-version}</bundle>
@@ -2251,7 +2251,7 @@
<bundle dependency='true'>mvn:org.apache.camel/camel-util-json/${project.version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-slack/${project.version}</bundle>
</feature>
<feature name='camel-smpp' version='${project.version}' start-level='50'>
@@ -2573,7 +2573,7 @@
<bundle dependency='true'>mvn:io.undertow/undertow-core/${undertow-version}</bundle>
<bundle dependency='true'>mvn:org.jboss.xnio/xnio-api/${jboss-xnio-version}</bundle>
<bundle dependency='true'>mvn:org.jboss.xnio/xnio-nio/${jboss-xnio-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-attachments/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-undertow/${project.version}</bundle>
@@ -2619,7 +2619,7 @@
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
@@ -2628,7 +2628,7 @@
<feature name='camel-websocket' version='${project.version}' start-level='50'>
<feature>jetty</feature>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
<bundle>mvn:org.apache.camel/camel-websocket/${project.version}</bundle>
</feature>
<feature name='camel-websocket-jsr356' version='${project.version}' start-level='50'>
[camel] 03/03: Regen
Posted by da...@apache.org.
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 6153504f45f3960188ae0680052cb1b867014de7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 7 09:51:15 2019 +0200
Regen
---
.../camel-mail/src/main/docs/mail-component.adoc | 2 +-
.../modules/ROOT/pages/file-component.adoc | 3 +-
.../ROOT/pages/json-xstream-dataformat.adoc | 70 ++--------------------
.../modules/ROOT/pages/mail-component.adoc | 4 +-
.../modules/ROOT/pages/multicast-eip.adoc | 5 ++
.../modules/ROOT/pages/recipientList-eip.adoc | 25 ++------
docs/user-manual/modules/ROOT/pages/split-eip.adoc | 17 +++---
7 files changed, 26 insertions(+), 100 deletions(-)
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc b/components/camel-mail/src/main/docs/mail-component.adoc
index 946d9ff..9bbeac0 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -253,7 +253,7 @@ The component supports 49 options, which are listed below.
| *camel.component.mail.configuration.port* | The port number of the mail server | | Integer
| *camel.component.mail.configuration.protocol* | The protocol for communicating with the mail server | | String
| *camel.component.mail.configuration.reply-to* | The Reply-To recipients (the receivers of the response mail). Separate multiple email addresses with a comma. | | String
-| *camel.component.mail.configuration.session* | Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some other resource, such as a JavaEE container. If this is not specified, Camel automatically creates the mail session for you. | | Session
+| *camel.component.mail.configuration.session* | Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some other resource, such as a JavaEE container. When using a custom mail session, then the hostname and port from the mail session will be used (if configured on the session). | | Session
| *camel.component.mail.configuration.skip-failed-message* | If the mail consumer cannot retrieve a given mail message, then this option allows to skip the message and move on to retrieve the next mail message. <p/> The default behavior would be the consumer throws an exception and no mails from the batch would be able to be routed by Camel. | false | Boolean
| *camel.component.mail.configuration.ssl-context-parameters* | To configure security using SSLContextParameters. | | SSLContextParameters
| *camel.component.mail.configuration.subject* | The Subject of the message being sent. Note: Setting the subject in the header takes precedence over this option. | | String
diff --git a/docs/components/modules/ROOT/pages/file-component.adoc b/docs/components/modules/ROOT/pages/file-component.adoc
index d6536e6..56962cc 100644
--- a/docs/components/modules/ROOT/pages/file-component.adoc
+++ b/docs/components/modules/ROOT/pages/file-component.adoc
@@ -114,8 +114,7 @@ with the following path and query parameters:
| *processStrategy* (consumer) | A pluggable org.apache.camel.component.file.GenericFileProcessStrategy allowing you to implement your own readLock option or similar. Can also be used when special conditions must be met before a file can be consumed, such as a special ready file exists. If this option is set then the readLock option does not apply. | | GenericFileProcess Strategy
| *startingDirectoryMustExist* (consumer) | Whether the starting directory must exist. Mind that the autoCreate option is default enabled, which means the starting directory is normally auto created if it doesn't exist. You can disable autoCreate and enable this to ensure the starting directory must exist. Will thrown an exception if the directory doesn't exist. | false | boolean
| *startingDirectoryMustHave Access* (consumer) | Whether the starting directory has access permissions. Mind that the startingDirectoryMustExist parameter must be set to true in order to verify that the directory exists. Will thrown an exception if the directory doesn't have read and write permissions. | false | boolean
-| *appendChars* (producer) | Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (
- or
) or tab ( ) characters then escape with an extra slash, eg \n | | String
+| *appendChars* (producer) | Used to append characters (text) after writing files. This can for example be used to add new lines or other separators when writing and appending to existing files. To specify new-line (slash-n or slash-r) or tab (slash-t) characters then escape with an extra slash, eg slash-slash-n | | String
| *fileExist* (producer) | What to do if a file already exists with the same name. Override, which is the default, replaces the existing file. Append - adds content to the existing file. Fail - throws a GenericFileOperationException, indicating that there is already an existing file. Ignore - silently ignores the problem and does not override the existing file, but assumes everything is okay. Move - option requires to use the moveExisting option to be configured as well. The option eager [...]
| *flatten* (producer) | Flatten is used to flatten the file name path to strip any leading paths, so it's just the file name. This allows you to consume recursively into sub-directories, but when you eg write the files to another directory they will be written in a single directory. Setting this to true on the producer enforces that any file name in CamelFileName header will be stripped for any leading paths. | false | boolean
| *jailStartingDirectory* (producer) | Used for jailing (restricting) writing files to the starting directory (and sub) only. This is enabled by default to not allow Camel to write files to outside directories (to be more secured out of the box). You can turn this off to allow writing files to directories outside the starting directory, such as parent or root folders. | true | boolean
diff --git a/docs/components/modules/ROOT/pages/json-xstream-dataformat.adoc b/docs/components/modules/ROOT/pages/json-xstream-dataformat.adoc
index ccc9a20..287be2e 100644
--- a/docs/components/modules/ROOT/pages/json-xstream-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/json-xstream-dataformat.adoc
@@ -5,7 +5,9 @@
XStream is a Data Format which uses the
http://xstream.codehaus.org/[XStream library] to marshal and unmarshal
-Java objects to and from XML.
+Java objects to and from JSon. However XStream was created primary for working
+with XML and therefore using JSon with XStream is not as popular as for example
+Jackson is for JSon.
To use XStream in your camel routes you need to add the a dependency
on *camel-xstream* which implements this data format.
@@ -62,7 +64,7 @@ The JSon XStream dataformat supports 19 options, which are listed below.
-----------------------------------------------------------
// lets turn Object messages into XML then send to MQSeries
from("activemq:My.Queue").
- marshal().xstream().
+ marshal().json(JsonLibrary.XStream).
to("mqseries:Another.Queue");
-----------------------------------------------------------
@@ -83,67 +85,3 @@ from("direct:marshal").
to("mock:marshaled");
---------------------------------------------------------
-== XMLInputFactory and XMLOutputFactory
-
-http://xstream.codehaus.org/[The XStream library] uses the
-`javax.xml.stream.XMLInputFactory` and
-`javax.xml.stream.XMLOutputFactory`, you can control which
-implementation of this factory should be used.
-
-The Factory is discovered using this algorithm:
- 1. Use the `javax.xml.stream.XMLInputFactory` ,
-`javax.xml.stream.XMLOutputFactory` system property.
- 2. Use the `lib/xml.stream.properties` file in the `JRE_HOME`
-directory.
- 3. Use the Services API, if available, to determine the classname by
-looking in the `META-INF/services/javax.xml.stream.XMLInputFactory`,
-`META-INF/services/javax.xml.stream.XMLOutputFactory` files in jars
-available to the JRE.
- 4. Use the platform default XMLInputFactory,XMLOutputFactory instance.
-
-== How to set the XML encoding in Xstream DataFormat?
-
-You can set the encoding of XML in Xstream DataFormat
-by setting the Exchange's property with the key `Exchange.CHARSET_NAME`,
-or setting the encoding property on Xstream from DSL or Spring config.
-
-[source,java]
--------------------------------
-from("activemq:My.Queue").
- marshal().xstream("UTF-8").
- to("mqseries:Another.Queue");
--------------------------------
-
-== Setting the type permissions of Xstream DataFormat
-
-In Camel, one can always use its own processing step in the route to
-filter and block certain XML documents to be routed to the XStream's
-unmarhall step. You can set http://x-stream.github.io/security.html[XStream's type
-permissions] to automatically allow or deny the instantiation of certain
-types.
-
-The default type permissions setting used by Camel denies all types
-except for those from java.lang and java.util packages. This setting can
-be changed by setting System property
-org.apache.camel.xstream.permissions. Its value is a string of
-comma-separated permission terms, each representing a type being allowed
-or denied, depending on whether the term is prefixed with '+' (note '+'
-may be omitted) or with '-', respectively.
-
-Each term may contain a wildcard character '*'. For example, value
-"-*,java.lang.*,java.util.*" indicates denying all types except for
-java.lang.* and java.util.* classes. Setting this value to an empty
-string "" reverts to the default XStream's type permissions handling
-which denies certain blacklisted classes and allow others.
-
-The type permissions setting can be extended at an individual XStream
-DataFormat instance by setting its type permissions property.
-
-[source,java]
--------------------------------------------------------------------
- <dataFormats>
- <xstream id="xstream-default"
- permissions="org.apache.camel.samples.xstream.*"/>
- ...
-
--------------------------------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/mail-component.adoc b/docs/components/modules/ROOT/pages/mail-component.adoc
index 1fe6255..9bbeac0 100644
--- a/docs/components/modules/ROOT/pages/mail-component.adoc
+++ b/docs/components/modules/ROOT/pages/mail-component.adoc
@@ -176,7 +176,7 @@ with the following path and query parameters:
| *headerFilterStrategy* (advanced) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter headers. | | HeaderFilterStrategy
| *ignoreUnsupportedCharset* (advanced) | Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset is unsupported then charset=XXX (where XXX represents the unsupported charset) is removed from the content-type and it relies on the platform default instead. | false | boolean
| *ignoreUriScheme* (advanced) | Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charset is unsupported then charset=XXX (where XXX represents the unsupported charset) is removed from the content-type and it relies on the platform default instead. | false | boolean
-| *session* (advanced) | Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some other resource, such as a JavaEE container. If this is not specified, Camel automatically creates the mail session for you. | | Session
+| *session* (advanced) | Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some other resource, such as a JavaEE container. When using a custom mail session, then the hostname and port from the mail session will be used (if configured on the session). | | Session
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
| *useInlineAttachments* (advanced) | Whether to use disposition inline or attachment. | false | boolean
| *idempotentRepository* (filter) | A pluggable repository org.apache.camel.spi.IdempotentRepository which allows to cluster consuming from the same mailbox, and let the repository coordinate whether a mail message is valid for the consumer to process. By default no repository is in use. | | IdempotentRepository
@@ -253,7 +253,7 @@ The component supports 49 options, which are listed below.
| *camel.component.mail.configuration.port* | The port number of the mail server | | Integer
| *camel.component.mail.configuration.protocol* | The protocol for communicating with the mail server | | String
| *camel.component.mail.configuration.reply-to* | The Reply-To recipients (the receivers of the response mail). Separate multiple email addresses with a comma. | | String
-| *camel.component.mail.configuration.session* | Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some other resource, such as a JavaEE container. If this is not specified, Camel automatically creates the mail session for you. | | Session
+| *camel.component.mail.configuration.session* | Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created and managed by some other resource, such as a JavaEE container. When using a custom mail session, then the hostname and port from the mail session will be used (if configured on the session). | | Session
| *camel.component.mail.configuration.skip-failed-message* | If the mail consumer cannot retrieve a given mail message, then this option allows to skip the message and move on to retrieve the next mail message. <p/> The default behavior would be the consumer throws an exception and no mails from the batch would be able to be routed by Camel. | false | Boolean
| *camel.component.mail.configuration.ssl-context-parameters* | To configure security using SSLContextParameters. | | SSLContextParameters
| *camel.component.mail.configuration.subject* | The Subject of the message being sent. Note: Setting the subject in the header takes precedence over this option. | | String
diff --git a/docs/user-manual/modules/ROOT/pages/multicast-eip.adoc b/docs/user-manual/modules/ROOT/pages/multicast-eip.adoc
index d08b278..2d699e7 100644
--- a/docs/user-manual/modules/ROOT/pages/multicast-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/multicast-eip.adoc
@@ -59,6 +59,11 @@ from("direct:start")
.to("mock:result");
----
+NOTE: The Multicast, Recipient List, and Splitter EIPs have special support for using `AggregationStrategy` with
+access to the original input exchange. You may want to use this when you aggregate messages and
+there has been a failure in one of the messages, which you then want to enrich on the original
+input message and return as response; its the aggregate method with 3 exchange parameters.
+
== Stop processing in case of exception
The mutlicast EIP will by default continue to process
diff --git a/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc b/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc
index 19203fe..da32e34 100644
--- a/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/recipientList-eip.adoc
@@ -211,8 +211,12 @@ And in XML it is again an attribute on the recipient list tag.
<bean id="myStrategy" class="com.mycompany.MyOwnAggregationStrategy"/>
----
+NOTE: The Multicast, Recipient List, and Splitter EIPs have special support for using `AggregationStrategy` with
+access to the original input exchange. You may want to use this when you aggregate messages and
+there has been a failure in one of the messages, which you then want to enrich on the original
+input message and return as response; its the aggregate method with 3 exchange parameters.
+
== Knowing which endpoint when using custom AggregationStrategy
-*Available as of Camel 2.12*
When using a custom `AggregationStrategy` then the `aggregate` method is always invoked in sequential order
(also if parallel processing is enabled) of the endpoints the Recipient List is using.
@@ -315,23 +319,7 @@ from("direct:c").to("mock:C").setBody(constant("C"));
This timeout feature is also supported by Splitter and both multicast and recipientList.
===
-By default if a timeout occurs the `AggregationStrategy` is not invoked. However you can implement a special version `TimeoutAwareAggregationStrategy`
-
-[source,java]
-----
-public interface TimeoutAwareAggregationStrategy extends AggregationStrategy {
-
- /**
- * A timeout occurred
- *
- * @param oldExchange the oldest exchange (is <tt>null</tt> on first aggregation as we only have the new exchange)
- * @param index the index
- * @param total the total
- * @param timeout the timeout value in millis
- */
- void timeout(Exchange oldExchange, int index, int total, long timeout);
-----
-
+By default if a timeout occurs the `AggregationStrategy` is not invoked. However you can implement the `timeout` method:
This allows you to deal with the timeout in the `AggregationStrategy` if you really need to.
[NOTE]
@@ -345,7 +333,6 @@ The remainders will be cancelled. Camel will also only invoke the `timeout` meth
See details at the Multicast EIP
== Using ExchangePattern in recipients
-*Available as of Camel 2.15*
The recipient list will by default use the current Exchange Pattern. Though one can imagine use-cases where one wants to send
a message to a recipient using a different exchange pattern. For example you may have a route that initiates as an `InOnly` route,
diff --git a/docs/user-manual/modules/ROOT/pages/split-eip.adoc b/docs/user-manual/modules/ROOT/pages/split-eip.adoc
index 6109aef..f2ea37b 100644
--- a/docs/user-manual/modules/ROOT/pages/split-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/split-eip.adoc
@@ -136,6 +136,12 @@ There is a sample on this page (Split aggregate request/reply sample).
Notice its the same strategy as the Aggregate EIP supports.
This Splitter can be viewed as having a build in light weight Aggregate EIP.
+NOTE: The Multicast, Recipient List, and Splitter EIPs have special support for using `AggregationStrategy` with
+access to the original input exchange. You may want to use this when you aggregate messages and
+there has been a failure in one of the messages, which you then want to enrich on the original
+input message and return as response; its the aggregate method with 3 exchange parameters.
+
+
== Parallel execution of distinct parts
If you want to execute all parts in parallel you can use the `parallelProcessing` option as show:
@@ -183,8 +189,6 @@ from("direct:streaming")
There are two tokenizers that can be used to tokenize an XML payload. The first tokenizer uses the same principle as in the text tokenizer to scan the XML payload and extract a sequence of tokens.
-*Available as of Camel 2.9*
-
If you have a big XML payload, from a file source, and want to split it in streaming mode, then you can use the Tokenizer language with start/end tokens to do this with low memory footprint.
[NOTE]
@@ -258,14 +262,10 @@ from("file:inbox")
.to("activemq:queue:order");
----
-Available as of Camel 2.13.1, you can set the above `inheritNamsepaceTagName` property to `*` to include the preceding context in each token (i.e., generating each token enclosed in its ancestor elements). It is noted that each token must share the same ancestor elements in this case.
-
+You can set the above `inheritNamsepaceTagName` property to `*` to include the preceding context in each token (i.e., generating each token enclosed in its ancestor elements). It is noted that each token must share the same ancestor elements in this case.
The above tokenizer works well on simple structures but has some inherent limitations in handling more complex XML structures.
-*Available as of Camel 2.14*
-
The second tokenizer uses a StAX parser to overcome these limitations. This tokenizer recognizes XML namespaces and also handles simple and complex XML structures more naturally and efficiently.
-
To split using this tokenizer at {urn:shop}order, we can write
[source,java]
@@ -344,7 +344,6 @@ it results in invalid xml snippets after the split. For example the snippet coul
----
== Splitting files by grouping N lines together
-*Available as of Camel 2.10*
The Tokenizer language has a new option group that allows you to group N parts together, for example to split big files into chunks of 1000 lines.
@@ -610,12 +609,10 @@ And using XML DSL you specify it as follows:
----
== Using onPrepare to execute custom logic when preparing messages
-*Available as of Camel 2.8*
See details at Multicast EIP
== Sharing unit of work
-*Available as of Camel 2.8*
The Splitter will by default not share unit of work between the parent exchange and each split exchange.
This means each sub exchange has its own individual unit of work.
[camel] 02/03: CAMEL-13740: Update xstream json docs
Posted by da...@apache.org.
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 7f1b0b61c14074605138b322e09224dc10fda1c8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 7 09:33:26 2019 +0200
CAMEL-13740: Update xstream json docs
---
.../src/main/docs/json-xstream-dataformat.adoc | 70 ++--------------------
1 file changed, 4 insertions(+), 66 deletions(-)
diff --git a/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
index ccc9a20..287be2e 100644
--- a/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
@@ -5,7 +5,9 @@
XStream is a Data Format which uses the
http://xstream.codehaus.org/[XStream library] to marshal and unmarshal
-Java objects to and from XML.
+Java objects to and from JSon. However XStream was created primary for working
+with XML and therefore using JSon with XStream is not as popular as for example
+Jackson is for JSon.
To use XStream in your camel routes you need to add the a dependency
on *camel-xstream* which implements this data format.
@@ -62,7 +64,7 @@ The JSon XStream dataformat supports 19 options, which are listed below.
-----------------------------------------------------------
// lets turn Object messages into XML then send to MQSeries
from("activemq:My.Queue").
- marshal().xstream().
+ marshal().json(JsonLibrary.XStream).
to("mqseries:Another.Queue");
-----------------------------------------------------------
@@ -83,67 +85,3 @@ from("direct:marshal").
to("mock:marshaled");
---------------------------------------------------------
-== XMLInputFactory and XMLOutputFactory
-
-http://xstream.codehaus.org/[The XStream library] uses the
-`javax.xml.stream.XMLInputFactory` and
-`javax.xml.stream.XMLOutputFactory`, you can control which
-implementation of this factory should be used.
-
-The Factory is discovered using this algorithm:
- 1. Use the `javax.xml.stream.XMLInputFactory` ,
-`javax.xml.stream.XMLOutputFactory` system property.
- 2. Use the `lib/xml.stream.properties` file in the `JRE_HOME`
-directory.
- 3. Use the Services API, if available, to determine the classname by
-looking in the `META-INF/services/javax.xml.stream.XMLInputFactory`,
-`META-INF/services/javax.xml.stream.XMLOutputFactory` files in jars
-available to the JRE.
- 4. Use the platform default XMLInputFactory,XMLOutputFactory instance.
-
-== How to set the XML encoding in Xstream DataFormat?
-
-You can set the encoding of XML in Xstream DataFormat
-by setting the Exchange's property with the key `Exchange.CHARSET_NAME`,
-or setting the encoding property on Xstream from DSL or Spring config.
-
-[source,java]
--------------------------------
-from("activemq:My.Queue").
- marshal().xstream("UTF-8").
- to("mqseries:Another.Queue");
--------------------------------
-
-== Setting the type permissions of Xstream DataFormat
-
-In Camel, one can always use its own processing step in the route to
-filter and block certain XML documents to be routed to the XStream's
-unmarhall step. You can set http://x-stream.github.io/security.html[XStream's type
-permissions] to automatically allow or deny the instantiation of certain
-types.
-
-The default type permissions setting used by Camel denies all types
-except for those from java.lang and java.util packages. This setting can
-be changed by setting System property
-org.apache.camel.xstream.permissions. Its value is a string of
-comma-separated permission terms, each representing a type being allowed
-or denied, depending on whether the term is prefixed with '+' (note '+'
-may be omitted) or with '-', respectively.
-
-Each term may contain a wildcard character '*'. For example, value
-"-*,java.lang.*,java.util.*" indicates denying all types except for
-java.lang.* and java.util.* classes. Setting this value to an empty
-string "" reverts to the default XStream's type permissions handling
-which denies certain blacklisted classes and allow others.
-
-The type permissions setting can be extended at an individual XStream
-DataFormat instance by setting its type permissions property.
-
-[source,java]
--------------------------------------------------------------------
- <dataFormats>
- <xstream id="xstream-default"
- permissions="org.apache.camel.samples.xstream.*"/>
- ...
-
--------------------------------------------------------------------