camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [camel] 04/05: CAMEL-13108: camel-core - Move dataset into camel-dataset component.
Date Sat, 06 Apr 2019 21:37:35 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 8ec73a35179487c5abb2b0d7874b77090153529a
Author: Claus Ibsen <claus.ibsen@gmail.com>
AuthorDate: Sat Apr 6 23:34:19 2019 +0200

    CAMEL-13108: camel-core - Move dataset into camel-dataset component.
---
 apache-camel/pom.xml                               | 10 ++++++++
 apache-camel/src/main/descriptors/common-bin.xml   |  2 ++
 .../src/main/docs/dataset-component.adoc           | 26 +++++++++++++++++++
 .../src/main/docs/dataset-test-component.adoc      | 30 ++++++++++++++++++++++
 components/pom.xml                                 |  1 +
 components/readme.adoc                             | 16 +++++-------
 core/camel-core/readme.adoc                        |  8 +-----
 parent/pom.xml                                     |  5 ++++
 8 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 2f8f64a..fd5bf91 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -423,6 +423,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-dataset</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-digitalocean</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -1887,6 +1892,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-dataset-starter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-digitalocean-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 8f3ba61..9efd07b 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -106,6 +106,7 @@
         <include>org.apache.camel:camel-cxf</include>
         <include>org.apache.camel:camel-cxf-transport</include>
         <include>org.apache.camel:camel-dataformat</include>
+        <include>org.apache.camel:camel-dataset</include>
         <include>org.apache.camel:camel-digitalocean</include>
         <include>org.apache.camel:camel-direct</include>
         <include>org.apache.camel:camel-directvm</include>
@@ -437,6 +438,7 @@
         <include>org.apache.camel:camel-cxf-starter</include>
         <include>org.apache.camel:camel-cxf-transport-starter</include>
         <include>org.apache.camel:camel-dataformat-starter</include>
+        <include>org.apache.camel:camel-dataset-starter</include>
         <include>org.apache.camel:camel-digitalocean-starter</include>
         <include>org.apache.camel:camel-direct-starter</include>
         <include>org.apache.camel:camel-directvm-starter</include>
diff --git a/components/camel-dataset/src/main/docs/dataset-component.adoc b/components/camel-dataset/src/main/docs/dataset-component.adoc
index f92ffc0..4d12d6f 100644
--- a/components/camel-dataset/src/main/docs/dataset-component.adoc
+++ b/components/camel-dataset/src/main/docs/dataset-component.adoc
@@ -93,7 +93,33 @@ with the following path and query parameters:
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used,
or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
+// spring-boot-auto-configure options: START
+=== Spring Boot Auto-Configuration
 
+When using Spring Boot make sure to use the following Maven dependency to have support for
auto configuration:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel</groupId>
+  <artifactId>camel-dataset-starter</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel core version -->
+</dependency>
+----
+
+
+The component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *camel.component.dataset.enabled* | Whether to enable auto configuration of the dataset
component. This is enabled by default. |  | Boolean
+| *camel.component.dataset.resolve-property-placeholders* | Whether the component should
resolve property placeholders on itself when starting. Only properties which are of String
type can use property placeholders. | true | Boolean
+|===
+// spring-boot-auto-configure options: END
 
 You can append query options to the URI in the following format,
 `?option=value&option=value&...`
diff --git a/components/camel-dataset/src/main/docs/dataset-test-component.adoc b/components/camel-dataset/src/main/docs/dataset-test-component.adoc
index 3eddfb9..8051920 100644
--- a/components/camel-dataset/src/main/docs/dataset-test-component.adoc
+++ b/components/camel-dataset/src/main/docs/dataset-test-component.adoc
@@ -1,5 +1,8 @@
+[[dataset-test-component]]
 == DataSet Test Component
 == Test Component
+*Available as of Camel version 1.3*
+
 
 *Available as of Camel version 1.3*
 
@@ -99,6 +102,33 @@ with the following path and query parameters:
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used,
or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
+// spring-boot-auto-configure options: START
+=== Spring Boot Auto-Configuration
+
+When using Spring Boot make sure to use the following Maven dependency to have support for
auto configuration:
+
+[source,xml]
+----
+<dependency>
+  <groupId>org.apache.camel</groupId>
+  <artifactId>camel-dataset-starter</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel core version -->
+</dependency>
+----
+
+
+The component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *camel.component.dataset-test.enabled* | Whether to enable auto configuration of the dataset-test
component. This is enabled by default. |  | Boolean
+| *camel.component.dataset-test.resolve-property-placeholders* | Whether the component should
resolve property placeholders on itself when starting. Only properties which are of String
type can use property placeholders. | true | Boolean
+|===
+// spring-boot-auto-configure options: END
 
 
 === Example
diff --git a/components/pom.xml b/components/pom.xml
index 2720c5c..9af6efa 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -39,6 +39,7 @@
         <module>camel-browse</module>
         <module>camel-controlbus</module>
         <module>camel-dataformat</module>
+        <module>camel-dataset</module>
         <module>camel-direct</module>
         <module>camel-directvm</module>
         <module>camel-language</module>
diff --git a/components/readme.adoc b/components/readme.adoc
index 8fbc15e..b28d4d9 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1,7 +1,7 @@
 ==== Components
 
 // components: START
-Number of Components: 293 in 228 JAR artifacts (0 deprecated)
+Number of Components: 293 in 229 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -208,9 +208,12 @@ Number of Components: 293 in 228 JAR artifacts (0 deprecated)
 | link:camel-dataformat/src/main/docs/dataformat-component.adoc[Data Format] (camel-dataformat)
+
 `dataformat:name:operation` | 2.12 | The dataformat component is used for working with Data
Formats as if it was a regular Component supporting Endpoints and URIs.
 
-| link:../core/camel-core/src/main/docs/dataset-component.adoc[Dataset] (camel-core) +
+| link:camel-dataset/src/main/docs/dataset-component.adoc[Dataset] (camel-dataset) +
 `dataset:name` | 1.3 | The dataset component provides a mechanism to easily perform load
& soak testing of your system.
 
+| link:camel-dataset/src/main/docs/dataset-test-component.adoc[DataSet Test] (camel-dataset)
+
+`dataset-test:name` | 1.3 | The test component extends the mock component by on startup to
pull messages from another endpoint to set the expected message bodies.
+
 | link:camel-digitalocean/src/main/docs/digitalocean-component.adoc[DigitalOcean] (camel-digitalocean)
+
 `digitalocean:operation` | 2.19 | The DigitalOcean component allows you to manage Droplets
and resources within the DigitalOcean cloud.
 
@@ -766,7 +769,7 @@ Number of Components: 293 in 228 JAR artifacts (0 deprecated)
 | link:camel-spring-batch/src/main/docs/spring-batch-component.adoc[Spring Batch] (camel-spring-batch)
+
 `spring-batch:jobName` | 2.10 | The spring-batch component allows to send messages to Spring
Batch for further processing.
 
-| link:camel-spring/src/main/docs/spring-event-component.adoc[Spring Event] (camel-spring)
+
+| link:@@@ARTIFACTID@@@/src/main/docs/spring-event-component.adoc[Spring Event] (@@@ARTIFACTID@@@)
+
 `spring-event:name` | 1.4 | The spring-event component allows to listen for Spring Application
Events.
 
 | link:camel-spring-integration/src/main/docs/spring-integration-component.adoc[Spring Integration]
(camel-spring-integration) +
@@ -808,9 +811,6 @@ Number of Components: 293 in 228 JAR artifacts (0 deprecated)
 | link:camel-telegram/src/main/docs/telegram-component.adoc[Telegram] (camel-telegram) +
 `telegram:type/authorizationToken` | 2.18 | The telegram component provides access to the
Telegram Bot API.
 
-| link:../core/camel-core/src/main/docs/test-component.adoc[Test] (camel-core) +
-`test:name` | 1.3 | The test component extends the mock component by on startup to pull messages
from another endpoint to set the expected message bodies.
-
 | link:camel-thrift/src/main/docs/thrift-component.adoc[Thrift] (camel-thrift) +
 `thrift:host:port/service` | 2.20 | The Thrift component allows to call and expose remote
procedures (RPC) with Apache Thrift data format and serialization mechanism
 
@@ -995,7 +995,7 @@ Number of Data Formats: 45 in 35 JAR artifacts (0 deprecated)
 ==== Expression Languages
 
 // languages: START
-Number of Languages: 18 in 9 JAR artifacts (1 deprecated)
+Number of Languages: 17 in 8 JAR artifacts (1 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -1027,8 +1027,6 @@ Number of Languages: 18 in 9 JAR artifacts (1 deprecated)
 
 | link:../core/camel-core/src/main/docs/simple-language.adoc[Simple] (camel-core) | 1.1 |
To use Camels built-in Simple language in Camel expressions or predicates.
 
-| link:camel-spring/src/main/docs/spel-language.adoc[SpEL] (camel-spring) | 2.7 | To use
Spring Expression Language (SpEL) in Camel expressions or predicates.
-
 | link:../core/camel-core/src/main/docs/tokenize-language.adoc[Tokenize] (camel-core) | 2.0
| To use Camel message body or header with a tokenizer in Camel expressions or predicates.
 
 | link:../core/camel-core/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-core)
| 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or
predicates.
diff --git a/core/camel-core/readme.adoc b/core/camel-core/readme.adoc
index 681438a..a91d99d 100644
--- a/core/camel-core/readme.adoc
+++ b/core/camel-core/readme.adoc
@@ -5,7 +5,7 @@
 
 
 // components: START
-Number of Components: 5 in 1 JAR artifacts (0 deprecated)
+Number of Components: 3 in 1 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -17,15 +17,9 @@ Number of Components: 5 in 1 JAR artifacts (0 deprecated)
 | link:src/main/docs/class-component.adoc[Class] (camel-core) +
 `class:beanName` | 2.4 | The Class Component is for invoking Java Classes (Java beans) from
Camel.
 
-| link:src/main/docs/dataset-component.adoc[Dataset] (camel-core) +
-`dataset:name` | 1.3 | The dataset component provides a mechanism to easily perform load
& soak testing of your system.
-
 | link:src/main/docs/mock-component.adoc[Mock] (camel-core) +
 `mock:name` | 1.0 | The mock component is used for testing routes and mediation rules using
mocks.
 
-| link:src/main/docs/test-component.adoc[Test] (camel-core) +
-`test:name` | 1.3 | The test component extends the mock component by on startup to pull messages
from another endpoint to set the expected message bodies.
-
 |===
 // components: END
 
diff --git a/parent/pom.xml b/parent/pom.xml
index c4cf314..61064d8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2689,6 +2689,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-dataset-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-digitalocean-starter</artifactId>
         <version>${project.version}</version>
       </dependency>


Mime
View raw message