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 2017/03/08 08:36:28 UTC
[1/2] camel git commit: Regen docs
Repository: camel
Updated Branches:
refs/heads/master 1a9a26a92 -> f32328c19
Regen docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f32328c1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f32328c1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f32328c1
Branch: refs/heads/master
Commit: f32328c1957acd85ee5768b5545bc0c0461ea215
Parents: e099511
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 8 09:36:09 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 8 09:36:22 2017 +0100
----------------------------------------------------------------------
.../src/main/docs/salesforce-component.adoc | 14 +++++---------
components/readme.adoc | 5 ++++-
docs/user-manual/en/SUMMARY.md | 1 +
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f32328c1/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index bc396ab..33445c4 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -431,7 +431,6 @@ The Salesforce component supports 24 options which are listed below.
-{% raw %}
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
@@ -460,7 +459,6 @@ The Salesforce component supports 24 options which are listed below.
| packages | common | | String[] | Package names to scan for DTO classes (multiple packages can be separated by comma).
| resolvePropertyPlaceholders | advanced | true | boolean | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders.
|=======================================================================
-{% endraw %}
// component options: END
@@ -473,24 +471,23 @@ The Salesforce component supports 24 options which are listed below.
// endpoint options: START
-The Salesforce component is configured using the URI syntax with the following path and query parameters:
+The Salesforce endpoint is configured using URI syntax:
salesforce:operationName:topicName
-#### 2 path parameters:
+ with the following path and query parameters:
+
+#### Path Parameters (2 parameters):
-{% raw %}
[width="100%",cols="2,1,1m,6",options="header"]
|=======================================================================
| Name | Default | Java Type | Description
| operationName | | OperationName | The operation to use
| topicName | | String | The name of the topic to use
|=======================================================================
-{% endraw %}
-#### 41 query parameters:
+#### Query Parameters (41 parameters):
-{% raw %}
[width="100%",cols="2,1,1m,1m,5",options="header"]
|=======================================================================
| Name | Group | Default | Java Type | Description
@@ -536,7 +533,6 @@ The Salesforce component is configured using the URI syntax with the following p
| exchangePattern | consumer (advanced) | | ExchangePattern | Sets the exchange pattern when the consumer creates an exchange.
| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
|=======================================================================
-{% endraw %}
// endpoint options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/f32328c1/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 0a91f0e..0f45199 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
^^^^^^^^^^
// components: START
-Number of Components: 219 in 174 JAR artifacts (13 deprecated)
+Number of Components: 220 in 174 JAR artifacts (13 deprecated)
[width="100%",cols="4,1,5",options="header"]
|=======================================================================
@@ -56,6 +56,9 @@ Number of Components: 219 in 174 JAR artifacts (13 deprecated)
| link:camel-aws/src/main/docs/aws-kinesis-component.adoc[AWS Kinesis] (camel-aws) +
`aws-kinesis:streamName` | 2.17 | The aws-kinesis component is for consuming records from Amazon Kinesis Streams.
+| link:camel-aws/src/main/docs/aws-kinesis-firehose-component.adoc[AWS Kinesis Firehose] (camel-aws) +
+`aws-kinesis-firehose:streamName` | 2.19 | A Camel Amazon Web Services Components
+
| link:camel-aws/src/main/docs/aws-s3-component.adoc[AWS S3 Storage Service] (camel-aws) +
`aws-s3:bucketNameOrArn` | 2.8 | The aws-s3 component is used for storing and retrieving objecct from Amazon S3 Storage Service.
http://git-wip-us.apache.org/repos/asf/camel/blob/f32328c1/docs/user-manual/en/SUMMARY.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index c575605..935cf23 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -140,6 +140,7 @@
* [AWS DynamoDB Streams](aws-ddbstream-component.adoc)
* [AWS EC2](aws-ec2-component.adoc)
* [AWS Kinesis](aws-kinesis-component.adoc)
+ * [AWS Kinesis Firehose](aws-kinesis-firehose-component.adoc)
* [AWS S3 Storage Service](aws-s3-component.adoc)
* [AWS Simple Email Service](aws-ses-component.adoc)
* [AWS Simple Notification System](aws-sns-component.adoc)
[2/2] camel git commit: CAMEL-10958 camel-scala-starter starter
module removed but references to it still exist
Posted by da...@apache.org.
CAMEL-10958 camel-scala-starter starter module removed but references to it still exist
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e0995119
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e0995119
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e0995119
Branch: refs/heads/master
Commit: e0995119c7dc592c9830f319dfe5f88c3f27ddc6
Parents: 1a9a26a
Author: Tom Cunningham <tc...@redhat.com>
Authored: Tue Mar 7 22:30:15 2017 -0500
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 8 09:36:22 2017 +0100
----------------------------------------------------------------------
apache-camel/pom.xml | 5 -----
apache-camel/src/main/descriptors/common-bin.xml | 1 -
parent/pom.xml | 5 -----
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 -----
4 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e0995119/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index aa98a14..e05f958 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1922,11 +1922,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-scala-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-schematron-starter</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/e0995119/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index eb0a99a..672ed0e 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -478,7 +478,6 @@
<include>org.apache.camel:camel-salesforce-starter</include>
<include>org.apache.camel:camel-sap-netweaver-starter</include>
<include>org.apache.camel:camel-saxon-starter</include>
- <include>org.apache.camel:camel-scala-starter</include>
<include>org.apache.camel:camel-schematron-starter</include>
<include>org.apache.camel:camel-script-starter</include>
<include>org.apache.camel:camel-scr-starter</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/e0995119/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a36d6ce..1f7d41c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2977,11 +2977,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-scala-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-schematron-starter</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/e0995119/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index cb17ae8..cb9e151 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2084,11 +2084,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-scala-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-schematron</artifactId>
<version>${project.version}</version>
</dependency>