This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 0347f8a Regen 0347f8a is described below commit 0347f8a9aed674a076771f02af444313cba07a4f Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Feb 5 08:00:20 2020 +0100 Regen --- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../org/apache/camel/dataformat.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../services/org/apache/camel/component.properties | 2 +- .../org/apache/camel/dataformat.properties | 2 +- .../services/org/apache/camel/language.properties | 2 +- .../modules/ROOT/pages/jdbc-component.adoc | 74 ++++++++++++++++++++++ 26 files changed, 99 insertions(+), 25 deletions(-) diff --git a/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/component.properties index ccce457..a191bd7 100644 --- a/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=ahc-ws ahc-wss +components=ahc-wss ahc-ws groupId=org.apache.camel artifactId=camel-ahc-ws version=3.1.0-SNAPSHOT diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 0b26220..951d964 100644 --- a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=atomix-map atomix-messaging atomix-multimap atomix-queue atomix-set atomix-value +components=atomix-multimap atomix-queue atomix-map atomix-value atomix-set atomix-messaging groupId=org.apache.camel artifactId=camel-atomix version=3.1.0-SNAPSHOT diff --git a/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 0011330..7d4a106 100644 --- a/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=azure-blob azure-queue +components=azure-queue azure-blob groupId=org.apache.camel artifactId=camel-azure version=3.1.0-SNAPSHOT diff --git a/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties index f2fa996..edf7add 100644 --- a/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties +++ b/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -dataFormats=bindy-csv bindy-fixed bindy-kvp +dataFormats=bindy-fixed bindy-csv bindy-kvp groupId=org.apache.camel artifactId=camel-bindy version=3.1.0-SNAPSHOT diff --git a/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 85da2f6..e524dc8 100644 --- a/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=caffeine-cache caffeine-loadcache +components=caffeine-loadcache caffeine-cache groupId=org.apache.camel artifactId=camel-caffeine version=3.1.0-SNAPSHOT diff --git a/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 9aa7436..ee2df76 100644 --- a/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=coap coap+tcp coaps coaps+tcp +components=coaps coap+tcp coaps+tcp coap groupId=org.apache.camel artifactId=camel-coap version=3.1.0-SNAPSHOT diff --git a/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 8a267e7..436654a 100644 --- a/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=cxf cxfrs +components=cxfrs cxf groupId=org.apache.camel artifactId=camel-cxf version=3.1.0-SNAPSHOT diff --git a/components/camel-disruptor/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-disruptor/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 772bc93..028e5f0 100644 --- a/components/camel-disruptor/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-disruptor/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=disruptor disruptor-vm +components=disruptor-vm disruptor groupId=org.apache.camel artifactId=camel-disruptor version=3.1.0-SNAPSHOT diff --git a/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/component.properties index a48199e..0f8c3ec 100644 --- a/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-ftp/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=ftp ftps sftp +components=ftps ftp sftp groupId=org.apache.camel artifactId=camel-ftp version=3.1.0-SNAPSHOT diff --git a/components/camel-google-bigquery/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-google-bigquery/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 5fbe018..2f720f4 100644 --- a/components/camel-google-bigquery/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-google-bigquery/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=google-bigquery google-bigquery-sql +components=google-bigquery-sql google-bigquery groupId=org.apache.camel artifactId=camel-google-bigquery version=3.1.0-SNAPSHOT diff --git a/components/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 3acdc1c..a9fbee3 100644 --- a/components/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-google-sheets/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=google-sheets google-sheets-stream +components=google-sheets-stream google-sheets groupId=org.apache.camel artifactId=camel-google-sheets version=3.1.0-SNAPSHOT diff --git a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 783d129..ebe9f96 100644 --- a/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-hazelcast/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=hazelcast-atomicvalue hazelcast-instance hazelcast-list hazelcast-map hazelcast-multimap hazelcast-queue hazelcast-replicatedmap hazelcast-ringbuffer hazelcast-seda hazelcast-set hazelcast-topic +components=hazelcast-ringbuffer hazelcast-set hazelcast-topic hazelcast-map hazelcast-seda hazelcast-atomicvalue hazelcast-queue hazelcast-list hazelcast-multimap hazelcast-instance hazelcast-replicatedmap groupId=org.apache.camel artifactId=camel-hazelcast version=3.1.0-SNAPSHOT diff --git a/components/camel-http/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-http/src/generated/resources/META-INF/services/org/apache/camel/component.properties index f21cd32..efe7727 100644 --- a/components/camel-http/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-http/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=http https +components=https http groupId=org.apache.camel artifactId=camel-http version=3.1.0-SNAPSHOT diff --git a/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/component.properties index b7b28d4..2a2b7dc 100644 --- a/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-ignite/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=ignite-cache ignite-compute ignite-events ignite-idgen ignite-messaging ignite-queue ignite-set +components=ignite-set ignite-queue ignite-messaging ignite-compute ignite-idgen ignite-cache ignite-events groupId=org.apache.camel artifactId=camel-ignite version=3.1.0-SNAPSHOT diff --git a/components/camel-irc/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-irc/src/generated/resources/META-INF/services/org/apache/camel/component.properties index ffd9af2..7a00b74 100644 --- a/components/camel-irc/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-irc/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=irc ircs +components=ircs irc groupId=org.apache.camel artifactId=camel-irc version=3.1.0-SNAPSHOT diff --git a/components/camel-kubernetes/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-kubernetes/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 1920fca..e89c5a7 100644 --- a/components/camel-kubernetes/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-kubernetes/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=kubernetes-config-maps kubernetes-deployments kubernetes-hpa kubernetes-job kubernetes-namespaces kubernetes-nodes kubernetes-persistent-volumes kubernetes-persistent-volumes-claims kubernetes-pods kubernetes-replication-controllers kubernetes-resources-quota kubernetes-secrets kubernetes-service-accounts kubernetes-services openshift-build-configs openshift-builds +components=kubernetes-job kubernetes-nodes kubernetes-hpa kubernetes-persistent-volumes-claims kubernetes-service-accounts kubernetes-services kubernetes-pods openshift-build-configs kubernetes-resources-quota kubernetes-persistent-volumes openshift-builds kubernetes-secrets kubernetes-config-maps kubernetes-replication-controllers kubernetes-namespaces kubernetes-deployments groupId=org.apache.camel artifactId=camel-kubernetes version=3.1.0-SNAPSHOT diff --git a/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 4d97a48..71d3c5c 100644 --- a/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=imap imaps pop3 pop3s smtp smtps +components=pop3s imap imaps smtp pop3 smtps groupId=org.apache.camel artifactId=camel-mail version=3.1.0-SNAPSHOT diff --git a/components/camel-milo/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-milo/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 6a70e75..8a3f3ef 100644 --- a/components/camel-milo/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-milo/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=milo-client milo-server +components=milo-server milo-client groupId=org.apache.camel artifactId=camel-milo version=3.1.0-SNAPSHOT diff --git a/components/camel-openstack/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-openstack/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 9971b6d..1bf8213 100644 --- a/components/camel-openstack/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-openstack/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=openstack-cinder openstack-glance openstack-keystone openstack-neutron openstack-nova openstack-swift +components=openstack-glance openstack-keystone openstack-swift openstack-neutron openstack-nova openstack-cinder groupId=org.apache.camel artifactId=camel-openstack version=3.1.0-SNAPSHOT diff --git a/components/camel-sip/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-sip/src/generated/resources/META-INF/services/org/apache/camel/component.properties index f6f3324..09954ef 100644 --- a/components/camel-sip/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-sip/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=sip sips +components=sips sip groupId=org.apache.camel artifactId=camel-sip version=3.1.0-SNAPSHOT diff --git a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component.properties index fb66624..ea64538 100644 --- a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=sjms sjms-batch +components=sjms-batch sjms groupId=org.apache.camel artifactId=camel-sjms version=3.1.0-SNAPSHOT diff --git a/components/camel-sql/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-sql/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 5468356..67bf3fb 100644 --- a/components/camel-sql/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-sql/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=sql sql-stored +components=sql-stored sql groupId=org.apache.camel artifactId=camel-sql version=3.1.0-SNAPSHOT diff --git a/components/camel-twitter/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-twitter/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 4aa8c90..6477810 100644 --- a/components/camel-twitter/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-twitter/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -components=twitter-directmessage twitter-search twitter-timeline +components=twitter-search twitter-directmessage twitter-timeline groupId=org.apache.camel artifactId=camel-twitter version=3.1.0-SNAPSHOT diff --git a/components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties index f199810..fc7b825 100644 --- a/components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties +++ b/components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -dataFormats=univocity-csv univocity-fixed univocity-tsv +dataFormats=univocity-fixed univocity-tsv univocity-csv groupId=org.apache.camel artifactId=camel-univocity-parsers version=3.1.0-SNAPSHOT diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties index ea48bb8..1bba5e4 100644 --- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties +++ b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties @@ -1,5 +1,5 @@ # Generated by camel build tools - do NOT edit this file! -languages=constant exchangeProperty file header ref simple tokenize +languages=ref exchangeProperty file simple constant tokenize header groupId=org.apache.camel artifactId=camel-base version=3.1.0-SNAPSHOT diff --git a/docs/components/modules/ROOT/pages/jdbc-component.adoc b/docs/components/modules/ROOT/pages/jdbc-component.adoc index 8357b45..a3cdf63 100644 --- a/docs/components/modules/ROOT/pages/jdbc-component.adoc +++ b/docs/components/modules/ROOT/pages/jdbc-component.adoc @@ -220,6 +220,80 @@ bound in the previous step: Or you can create a `DataSource` in Spring like this: +With spring xml: + +[source,xml] +---- +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:jdbc="http://www.springframework.org/schema/jdbc" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://camel.apache.org/schema/spring + http://camel.apache.org/schema/spring/camel-spring.xsd + http://www.springframework.org/schema/jdbc + http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd + http://activemq.apache.org/schema/core + http://activemq.apache.org/schema/core/activemq-core.xsd"> + + <!-- PROPERTY PLACEHOLDERS --> + <!-- + You may use property placeholders data store configuration + for to do that, you can resolve this properties with srping + --> + <bean id="db" class="org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer"> + <property name="location" value="classpath:db.properties"/> + </bean> + + <!-- DATA STORE CONFIGURATION --> + + <!-- + In this example the DataStore is a postgres database, you can change the jdbc connector. + Also, the property testWhileIdle and validationQuery keep connection open. + --> + + <bean id="DataStore" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> + <property name="driverClassName" value="org.postgresql.Driver" /> + <property name="url" value="jdbc:postgresql://${DB_HOST}/${DB_NAME}"/> + <property name="username" value="${DB_USER}" /> + <property name="password" value="${DB_PASS}" /> + <property name="initialSize" value="4"/> + <property name="maxActive" value="15"/> + <property name="maxIdle" value="16"/> + <property name="minIdle" value="8"/> + <property name="timeBetweenEvictionRunsMillis" value="1800"/> + <property name="minEvictableIdleTimeMillis" value="1800"/> + <property name="testOnBorrow" value="true"/> + <property name="testWhileIdle" value="true"/> + <property name="testOnReturn" value="true"/> + <property name="validationQuery" value="SELECT 1"/> + <property name="maxWait" value="1000"/> + <property name="removeAbandoned" value="true"/> + <property name="logAbandoned" value="true"/> + <property name="removeAbandonedTimeout" value="30000"/> + </bean> + + <!-- You shuould write a file with an script to initialize your database. + If you have nothing to do with your database, then you can write just a + validation query like 'SELECT *; '--> + <jdbc:initialize-database data-source="DataStore" enabled="true"> + <jdbc:script location="classpath:datastore-schema.sql" /> + </jdbc:initialize-database> + + <camelContext xmlns="http://camel.apache.org/schema/spring"> + + <!-- CAMEL ROUTE --> + <route id="Reporter"> + <from uri="direct:to-datastore"/> + <!-- this example is done with camel-jdbc but you can make it work with camel-sql --> + <setBody> + <simple>insert into test '${body[value]}'</simple> + </setBody> + <to uri="jdbc:DataStore"/> + </route> +---- + We create an endpoint, add the SQL query to the body of the IN message, and then send the exchange. The result of the query is returned in the OUT body: