This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f7d57badd9b57375c13ecd391318d705239542ed
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Sep 16 09:07:02 2019 +0200
Regen docs
---
.../modules/ROOT/pages/kubernetes-component.adoc | 10 ++---
.../pages/kubernetes-config-maps-component.adoc | 13 +++---
.../pages/kubernetes-deployments-component.adoc | 12 +++---
.../ROOT/pages/kubernetes-hpa-component.adoc | 12 +++---
.../ROOT/pages/kubernetes-job-component.adoc | 12 +++---
.../pages/kubernetes-namespaces-component.adoc | 12 +++---
.../ROOT/pages/kubernetes-nodes-component.adoc | 12 +++---
...rnetes-persistent-volumes-claims-component.adoc | 12 +++---
.../kubernetes-persistent-volumes-component.adoc | 12 +++---
.../ROOT/pages/kubernetes-pods-component.adoc | 12 +++---
...bernetes-replication-controllers-component.adoc | 12 +++---
.../kubernetes-resources-quota-component.adoc | 12 +++---
.../ROOT/pages/kubernetes-secrets-component.adoc | 12 +++---
.../kubernetes-service-accounts-component.adoc | 12 +++---
.../ROOT/pages/kubernetes-services-component.adoc | 12 +++---
.../pages/openshift-build-configs-component.adoc | 10 ++---
.../ROOT/pages/openshift-builds-component.adoc | 12 +++---
.../modules/ROOT/pages/sql-component.adoc | 48 +++++++++++++++++++++-
18 files changed, 146 insertions(+), 103 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/kubernetes-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-component.adoc
index f57c21d..7f3db07 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-component]]
-= Kubernetes Component (deprecated)
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-component.adoc
+== Kubernetes Component (deprecated)
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
[IMPORTANT]
@@ -75,7 +75,7 @@ kubernetes:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -85,7 +85,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (29 parameters):
+==== Query Parameters (29 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
diff --git
a/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc
index 303b9fb..3274ac5 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-config-maps-component.adoc
@@ -1,12 +1,11 @@
-[[kubernetes-config-maps-component]]
-= Kubernetes ConfigMap Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
+== Kubernetes ConfigMap Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
The *Kubernetes ConfigMap* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
-provides a producer to execute kubernetes ConfigMap operations.
+provides a producer to execute kubernetes ConfigMap operations and a consumer
to consume events related to Config maps.
== Component Options
@@ -27,7 +26,7 @@ kubernetes-config-maps:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +36,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -91,4 +90,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-config-maps.enabled* | Whether to enable auto
configuration of the kubernetes-config-maps component. This is enabled by
default. | | Boolean
| *camel.component.kubernetes-config-maps.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git
a/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc
index 9dc2f7c..b1b97b4 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-deployments-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-deployments-component]]
-= Kubernetes Deployments Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
+== Kubernetes Deployments Component
*Available as of Camel version 2.20*
+*Available as of Camel version 2.20*
+
The *Kubernetes Deployments* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-deployments:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +100,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-deployments.enabled* | Whether to enable auto
configuration of the kubernetes-deployments component. This is enabled by
default. | | Boolean
| *camel.component.kubernetes-deployments.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc
index 81980f6..03b0636 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-hpa-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-hpa-component]]
-= Kubernetes HPA Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
+== Kubernetes HPA Component
*Available as of Camel version 2.23*
+*Available as of Camel version 2.23*
+
The *Kubernetes HPA* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -29,7 +29,7 @@ kubernetes-hpa:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -39,7 +39,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -101,4 +101,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-hpa.enabled* | Whether to enable auto
configuration of the kubernetes-hpa component. This is enabled by default. | |
Boolean
| *camel.component.kubernetes-hpa.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc
index 9fbaec6..beca5ca 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-job-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-job-component]]
-= Kubernetes Job Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
+== Kubernetes Job Component
*Available as of Camel version 2.23*
+*Available as of Camel version 2.23*
+
The *Kubernetes Job* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-job:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +100,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-job.enabled* | Whether to enable auto
configuration of the kubernetes-job component. This is enabled by default. | |
Boolean
| *camel.component.kubernetes-job.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git
a/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc
index 37203ca..b419929 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-namespaces-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-namespaces-component]]
-= Kubernetes Namespaces Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
+== Kubernetes Namespaces Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Namespaces* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -29,7 +29,7 @@ kubernetes-namespaces:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -39,7 +39,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -101,4 +101,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-namespaces.enabled* | Whether to enable auto
configuration of the kubernetes-namespaces component. This is enabled by
default. | | Boolean
| *camel.component.kubernetes-namespaces.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc
index 1abb15b..e427260 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-nodes-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-nodes-component]]
-= Kubernetes Nodes Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
+== Kubernetes Nodes Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Nodes* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -29,7 +29,7 @@ kubernetes-nodes:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -39,7 +39,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -101,4 +101,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-nodes.enabled* | Whether to enable auto
configuration of the kubernetes-nodes component. This is enabled by default. |
| Boolean
| *camel.component.kubernetes-nodes.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git
a/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc
index 3a3cbb8..fa815cd 100644
---
a/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc
+++
b/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-claims-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-persistent-volumes-claims-component]]
-= Kubernetes Persistent Volume Claim Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
+== Kubernetes Persistent Volume Claim Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Persistent Volume Claim* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-persistent-volumes-claims:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -92,4 +92,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-persistent-volumes-claims.enabled* | Whether to
enable auto configuration of the kubernetes-persistent-volumes-claims
component. This is enabled by default. | | Boolean
|
*camel.component.kubernetes-persistent-volumes-claims.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git
a/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-component.adoc
index a932904..9b8796b 100644
---
a/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-component.adoc
+++
b/docs/components/modules/ROOT/pages/kubernetes-persistent-volumes-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-persistent-volumes-component]]
-= Kubernetes Persistent Volume Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
+== Kubernetes Persistent Volume Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Persistent Volume* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-persistent-volumes:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -92,4 +92,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-persistent-volumes.enabled* | Whether to enable
auto configuration of the kubernetes-persistent-volumes component. This is
enabled by default. | | Boolean
|
*camel.component.kubernetes-persistent-volumes.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/kubernetes-pods-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-pods-component.adoc
index 53656f7..eaa61f3 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-pods-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-pods-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-pods-component]]
-= Kubernetes Pods Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
+== Kubernetes Pods Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Pods* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-pods:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -100,4 +100,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-pods.enabled* | Whether to enable auto
configuration of the kubernetes-pods component. This is enabled by default. |
| Boolean
| *camel.component.kubernetes-pods.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git
a/docs/components/modules/ROOT/pages/kubernetes-replication-controllers-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-replication-controllers-component.adoc
index c9d22a2..0509ed2 100644
---
a/docs/components/modules/ROOT/pages/kubernetes-replication-controllers-component.adoc
+++
b/docs/components/modules/ROOT/pages/kubernetes-replication-controllers-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-replication-controllers-component]]
-= Kubernetes Replication Controller Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
+== Kubernetes Replication Controller Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Replication Controller* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -29,7 +29,7 @@ kubernetes-replication-controllers:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -39,7 +39,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -101,4 +101,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-replication-controllers.enabled* | Whether to
enable auto configuration of the kubernetes-replication-controllers component.
This is enabled by default. | | Boolean
|
*camel.component.kubernetes-replication-controllers.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git
a/docs/components/modules/ROOT/pages/kubernetes-resources-quota-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-resources-quota-component.adoc
index 59b4e39..185ec20 100644
---
a/docs/components/modules/ROOT/pages/kubernetes-resources-quota-component.adoc
+++
b/docs/components/modules/ROOT/pages/kubernetes-resources-quota-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-resources-quota-component]]
-= Kubernetes Resources Quota Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
+== Kubernetes Resources Quota Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Resources Quota* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-resources-quota:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -92,4 +92,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-resources-quota.enabled* | Whether to enable
auto configuration of the kubernetes-resources-quota component. This is enabled
by default. | | Boolean
| *camel.component.kubernetes-resources-quota.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git
a/docs/components/modules/ROOT/pages/kubernetes-secrets-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-secrets-component.adoc
index 87a7a92..f94b206 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-secrets-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-secrets-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-secrets-component]]
-= Kubernetes Secrets Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
+== Kubernetes Secrets Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Secrets* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -28,7 +28,7 @@ kubernetes-secrets:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -38,7 +38,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -92,4 +92,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-secrets.enabled* | Whether to enable auto
configuration of the kubernetes-secrets component. This is enabled by default.
| | Boolean
| *camel.component.kubernetes-secrets.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git
a/docs/components/modules/ROOT/pages/kubernetes-service-accounts-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-service-accounts-component.adoc
index 399957f..f672c2a 100644
---
a/docs/components/modules/ROOT/pages/kubernetes-service-accounts-component.adoc
+++
b/docs/components/modules/ROOT/pages/kubernetes-service-accounts-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-service-accounts-component]]
-= Kubernetes Service Account Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
+== Kubernetes Service Account Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Service Account* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -26,7 +26,7 @@ kubernetes-service-accounts:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -36,7 +36,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -90,4 +90,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-service-accounts.enabled* | Whether to enable
auto configuration of the kubernetes-service-accounts component. This is
enabled by default. | | Boolean
| *camel.component.kubernetes-service-accounts.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git
a/docs/components/modules/ROOT/pages/kubernetes-services-component.adoc
b/docs/components/modules/ROOT/pages/kubernetes-services-component.adoc
index e09abcf..3a4bab5 100644
--- a/docs/components/modules/ROOT/pages/kubernetes-services-component.adoc
+++ b/docs/components/modules/ROOT/pages/kubernetes-services-component.adoc
@@ -1,8 +1,8 @@
-[[kubernetes-services-component]]
-= Kubernetes Services Component
-:page-source:
components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
+== Kubernetes Services Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Services* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -29,7 +29,7 @@ kubernetes-services:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -39,7 +39,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (28 parameters):
+==== Query Parameters (28 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -101,4 +101,4 @@ The component supports 2 options, which are listed below.
| *camel.component.kubernetes-services.enabled* | Whether to enable auto
configuration of the kubernetes-services component. This is enabled by default.
| | Boolean
| *camel.component.kubernetes-services.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
\ No newline at end of file
+// spring-boot-auto-configure options: END
diff --git
a/docs/components/modules/ROOT/pages/openshift-build-configs-component.adoc
b/docs/components/modules/ROOT/pages/openshift-build-configs-component.adoc
index 82b41a4..385d2ff 100644
--- a/docs/components/modules/ROOT/pages/openshift-build-configs-component.adoc
+++ b/docs/components/modules/ROOT/pages/openshift-build-configs-component.adoc
@@ -1,8 +1,8 @@
-[[openshift-build-configs-component]]
-= Openshift Build Config Component
-:page-source:
components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
+== Openshift Build Config Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *OpenShift Build Config* component is one of
xref:kubernetes.adoc[Kubernetes Components] which
@@ -27,7 +27,7 @@ openshift-build-configs:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +37,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
diff --git a/docs/components/modules/ROOT/pages/openshift-builds-component.adoc
b/docs/components/modules/ROOT/pages/openshift-builds-component.adoc
index cd77e1b..13782aa 100644
--- a/docs/components/modules/ROOT/pages/openshift-builds-component.adoc
+++ b/docs/components/modules/ROOT/pages/openshift-builds-component.adoc
@@ -1,8 +1,8 @@
-[[openshift-builds-component]]
-= Openshift Builds Component
-:page-source:
components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
+== Openshift Builds Component
*Available as of Camel version 2.17*
+*Available as of Camel version 2.17*
+
The *Kubernetes Builds* component is one of
xref:kubernetes-component.adoc[Kubernetes Components] which
@@ -27,7 +27,7 @@ openshift-builds:masterUrl
with the following path and query parameters:
-=== Path Parameters (1 parameters):
+==== Path Parameters (1 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -37,7 +37,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (20 parameters):
+==== Query Parameters (20 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -64,4 +64,4 @@ with the following path and query parameters:
| *trustCerts* (security) | Define if the certs we used are trusted anyway or
not | | Boolean
| *username* (security) | Username to connect to Kubernetes | | String
|===
-// endpoint options: END
\ No newline at end of file
+// endpoint options: END
diff --git a/docs/components/modules/ROOT/pages/sql-component.adoc
b/docs/components/modules/ROOT/pages/sql-component.adoc
index 40552ce..6ac77c7 100644
--- a/docs/components/modules/ROOT/pages/sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/sql-component.adoc
@@ -786,9 +786,9 @@ JDBC vendor.
<bean id="repo"
class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
<property name="transactionManager" ref="transactionManager"/>
- <propertyname="repositoryName" value="aggregation"/>
+ <property name="repositoryName" value="aggregation"/>
<property name="dataSource" ref="dataSource"/>
- <property name"jdbcOptimisticLockingExceptionMapper"
ref="myExceptionMapper"/>
+ <property name="jdbcOptimisticLockingExceptionMapper"
ref="myExceptionMapper"/>
</bean>
<!-- use the default mapper with extraFQN class names from our JDBC driver -->
<bean id="myExceptionMapper"
class="org.apache.camel.processor.aggregate.jdbc.DefaultJdbcOptimisticLockingExceptionMapper">
@@ -801,6 +801,50 @@
class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
</bean>
-----
+=== Propagation behavior
+
+`JdbcAggregationRepository` uses two distinct _transaction templates_ from
Spring-TX. One is read-only
+and one is used for read-write operations.
+
+However, when using `JdbcAggregationRepository` within a route that itself
uses `<transacted />` and there's
+common `PlatformTransactionManager` used, there may be a need to configure
_propagation behavior_ used by
+transaction templates inside `JdbcAggregationRepository`.
+
+Here's a way to do it:
+[source,xml]
+----
+<bean id="repo"
+class="org.apache.camel.processor.aggregate.jdbc.JdbcAggregationRepository">
+ <property name="propagationBehaviorName" value="PROPAGATION_NESTED" />
+</bean>
+----
+
+Propagation is specified by constants of
`org.springframework.transaction.TransactionDefinition` interface,
+so `propagationBehaviorName` is convenient setter that allows to use names of
the constants.
+
+=== PostgreSQL case
+
+There's special database that may cause problems with optimistic locking used
by `JdbcAggregationRepository`.
+PostgreSQL marks connection as invalid in case of data integrity violation
exception (the one with SQLState 23505).
+This makes the connection effectively unusable within nested transaction.
+Details can be found
+https://www.postgresql.org/message-id/200609241203.59292.ralf.wiebicke%40exedio.com[in
this document].
+
+`org.apache.camel.processor.aggregate.jdbc.PostgresAggregationRepository`
extends `JdbcAggregationRepository` and
+uses special `INSERT .. ON CONFLICT ..` statement to provide optimistic
locking behavior.
+
+This statement is (with default aggregation table definition):
+[source,sql]
+----
+INSERT INTO aggregation (id, exchange) values (?, ?) ON CONFLICT DO NOTHING
+----
+
+Details can be found https://www.postgresql.org/docs/9.5/sql-insert.html[in
PostgreSQL documentation].
+
+When this clause is used, `java.sql.PreparedStatement.executeUpdate()` call
returns `0` instead of throwing
+SQLException with SQLState=23505. Further handling is exactly the same as with
generic `JdbcAggregationRepository`,
+but without marking PostgreSQL connection as invalid.
+
== Camel Sql Starter
A starter module is available to spring-boot users. When using the starter,
