[2/2] camel git commit: Regen. This closes #2019
Regen. This closes #2019 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a807d60 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a807d60 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a807d60 Branch: refs/heads/master Commit: 6a807d6057744135147294a0c8f32f812c294e08 Parents: 38ff665 Author: Claus IbsenAuthored: Mon Oct 16 11:10:45 2017 +0200 Committer: Claus Ibsen Committed: Mon Oct 16 11:10:45 2017 +0200 -- .../src/main/docs/tarfile-dataformat.adoc | 3 ++- .../src/main/docs/zipfile-dataformat.adoc | 3 ++- .../springboot/TarFileDataFormatConfiguration.java | 13 + .../springboot/ZipFileDataFormatConfiguration.java | 13 + 4 files changed, 30 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/6a807d60/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc -- diff --git a/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc b/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc index 9f0c972..83134c1 100644 --- a/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc +++ b/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc @@ -14,7 +14,7 @@ aggregate multiple messages into a single Tar File. // dataformat options: START -The Tar File dataformat supports 3 options which are listed below. +The Tar File dataformat supports 4 options which are listed below. @@ -23,6 +23,7 @@ The Tar File dataformat supports 3 options which are listed below. | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the tar file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. | allowEmptyDirectory | false | Boolean | If the tar file has more then one entry setting this option to true allows to get the iterator even if the directory is empty +| preservePathElements | false | Boolean | If the file name contains path elements setting this option to true allows the path to be maintained in the tar file. | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END http://git-wip-us.apache.org/repos/asf/camel/blob/6a807d60/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc -- diff --git a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc index 34282d1..fc37530 100644 --- a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc +++ b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc @@ -11,7 +11,7 @@ This data format supports ZIP64, as long as Java 7 or later is being used]. === ZipFile Options // dataformat options: START -The Zip File dataformat supports 3 options which are listed below. +The Zip File dataformat supports 4 options which are listed below. @@ -20,6 +20,7 @@ The Zip File dataformat supports 3 options which are listed below. | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the zip file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. | allowEmptyDirectory | false | Boolean | If the zip file has more then one entry setting this option to true allows to get the iterator even if the directory is empty +| preservePathElements | false | Boolean | If the file name contains path elements setting this option to true allows the path to be maintained in the zip file. | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END http://git-wip-us.apache.org/repos/asf/camel/blob/6a807d60/platforms/spring-boot/components-starter/camel-tarfile-starter/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatConfiguration.java -- diff --git
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master e8eeccbfe -> f1b05572e Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1b05572 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1b05572 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1b05572 Branch: refs/heads/master Commit: f1b05572ec6df9aa9bb8d16b0a7ad5f1f398efb1 Parents: e8eeccb Author: Claus IbsenAuthored: Mon Oct 16 11:02:13 2017 +0200 Committer: Claus Ibsen Committed: Mon Oct 16 11:02:13 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f1b05572/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 6af9949..d387262 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 @@ -83,7 +83,7 @@ com.lmax disruptor -3.3.6 +3.3.7 com.sna-projects.krati
[3/3] camel git commit: Regen. This closes #2036 #2037.
Regen. This closes #2036 #2037. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/97502f39 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/97502f39 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/97502f39 Branch: refs/heads/master Commit: 97502f3993a8b000ce353ecd1695fb67b9c00911 Parents: fb3fec7 Author: Claus IbsenAuthored: Sat Oct 14 19:22:49 2017 +0200 Committer: Claus Ibsen Committed: Sat Oct 14 19:22:49 2017 +0200 -- .../camel-amqp/src/main/docs/amqp-component.adoc | 2 +- .../camel-jms/src/main/docs/jms-component.adoc | 2 +- .../jms/springboot/JmsComponentConfiguration.java| 15 --- 3 files changed, 10 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/97502f39/components/camel-amqp/src/main/docs/amqp-component.adoc -- diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc index 2213072..be9bc8b 100644 --- a/components/camel-amqp/src/main/docs/amqp-component.adoc +++ b/components/camel-amqp/src/main/docs/amqp-component.adoc @@ -157,7 +157,7 @@ with the following path and query parameters: | Name | Description | Default | Type | *clientId* (common) | Sets the JMS client ID to use. Note that this value if specified must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. | | String | *connectionFactory* (common) | The connection factory to be use. A connection factory must be configured either on the component or endpoint. | | ConnectionFactory -| *disableReplyTo* (common) | If true a producer will behave like a InOnly exchange with the exception that JMSReplyTo header is sent out and not be suppressed like in the case of InOnly. Like InOnly the producer will not wait for a reply. A consumer with this flag will behave like InOnly. This feature can be used to bridge InOut requests to another queue so that a route on the other queue will send its response directly back to the original JMSReplyTo. | false | boolean +| *disableReplyTo* (common) | Specifies whether Camel ignores the JMSReplyTo header in messages. If true Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from a route and you do not want Camel to automatically send back a reply message because another component in your code handles the reply message. You can also use this option if you want to use Camel as a proxy between different message brokers and you want to route message from one system to another. | false | boolean | *durableSubscriptionName* (common) | The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configured as well. | | String | *jmsMessageType* (common) | Allows you to force the use of a specific javax.jms.Message implementation for sending JMS messages. Possible values are: Bytes Map Object Stream Text. By default Camel would determine which JMS message type to use from the In body type. This option allows you to specify it. | | JmsMessageType | *testConnectionOnStartup* (common) | Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel throws an exception on startup. This ensures that Camel is not started with failed connections. The JMS producers is tested as well. | false | boolean http://git-wip-us.apache.org/repos/asf/camel/blob/97502f39/components/camel-jms/src/main/docs/jms-component.adoc -- diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc index 8ef8a3c..cf43483 100644 --- a/components/camel-jms/src/main/docs/jms-component.adoc +++ b/components/camel-jms/src/main/docs/jms-component.adoc @@ -329,7 +329,7 @@ with the following path and query parameters: | Name | Description | Default | Type | *clientId* (common) | Sets the JMS client ID to use. Note that this value if specified must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. | | String | *connectionFactory* (common) | Sets the default connection factory to be used if a connection factory is not specified for either link
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/camel-2.20.x b8eabcd05 -> 768a70c43 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/768a70c4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/768a70c4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/768a70c4 Branch: refs/heads/camel-2.20.x Commit: 768a70c43fddb443a6d3f456f7dee6c98488aedb Parents: b8eabcd Author: Andrea CosentinoAuthored: Fri Oct 13 15:27:52 2017 +0200 Committer: Andrea Cosentino Committed: Fri Oct 13 15:27:52 2017 +0200 -- .../src/main/resources/camel-connector-schema.json | 2 +- .../myfoo-connector/src/main/resources/camel-connector.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/768a70c4/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json -- diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json index 122a02e..c13125f 100644 --- a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json +++ b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json @@ -14,7 +14,7 @@ "javaType":"org.myfoo.connector.MyFooComponent", "groupId":"org.apache.camel", "artifactId":"myfoo-connector", -"version":"2.20.0-SNAPSHOT" +"version":"2.20.1-SNAPSHOT" }, "componentProperties":{ http://git-wip-us.apache.org/repos/asf/camel/blob/768a70c4/platforms/myfoo-connector/src/main/resources/camel-connector.json -- diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector.json b/platforms/myfoo-connector/src/main/resources/camel-connector.json index e869857..bffb0fd 100644 --- a/platforms/myfoo-connector/src/main/resources/camel-connector.json +++ b/platforms/myfoo-connector/src/main/resources/camel-connector.json @@ -2,14 +2,14 @@ "baseScheme" : "timer", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0-SNAPSHOT", + "baseVersion" : "2.20.1-SNAPSHOT", "baseJavaType" : "org.apache.camel.component.timer.TimerComponent", "name" : "MyFoo", "scheme" : "my-foo", "javaType" : "org.myfoo.connector.MyFooComponent", "groupId" : "org.myfoo", "artifactId" : "myfoo-connector", - "version" : "2.20.0-SNAPSHOT", + "version" : "2.20.1-SNAPSHOT", "description" : "Something cool", "labels" : [ "foo", "timer" ], "pattern" : "From",
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 449d82656 -> 71996da18 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/71996da1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/71996da1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/71996da1 Branch: refs/heads/master Commit: 71996da18c817f4026d3baa6162526cb165557e7 Parents: 449d826 Author: Claus IbsenAuthored: Thu Oct 12 20:11:35 2017 +0200 Committer: Claus Ibsen Committed: Thu Oct 12 20:11:35 2017 +0200 -- examples/README.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/71996da1/examples/README.adoc -- diff --git a/examples/README.adoc b/examples/README.adoc index 92f0552..fa1c537 100644 --- a/examples/README.adoc +++ b/examples/README.adoc @@ -11,7 +11,7 @@ View the individual example READMEs for details. ### Examples // examples: START -Number of Examples: 97 (8 deprecated) +Number of Examples: 98 (8 deprecated) [width="100%",cols="4,2,4",options="header"] |=== @@ -50,6 +50,8 @@ Number of Examples: 97 (8 deprecated) | link:camel-example-spring-boot-pojo/README.adoc[Spring Boot Pojo] (camel-example-spring-boot-pojo) | Beginner | An example showing how to work with Camel POJO routing with Spring Boot +| link:camel-example-spring-boot-xml/readme.adoc[Spring Boot Xml] (camel-example-spring-boot-xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot + | link:camel-example-spring-javaconfig/README.md[Spring Java Config] (camel-example-spring-javaconfig) | Beginner | An example showing how to work with Camel and Spring Java Config | link:camel-example-spring-xquery/README.md[Spring XQuery] (camel-example-spring-xquery) | Beginner | An example using Spring XML to transform a message using XQuery
[2/2] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2439863b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2439863b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2439863b Branch: refs/heads/master Commit: 2439863b60dbf5ec182ab0f86266272f4220c6d5 Parents: ca24d08 Author: Andrea CosentinoAuthored: Thu Oct 12 08:37:36 2017 +0200 Committer: Andrea Cosentino Committed: Thu Oct 12 08:37:36 2017 +0200 -- .../src/main/resources/camel-connector-schema.json | 2 +- .../myfoo-connector/src/main/resources/camel-connector.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2439863b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json -- diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json index 122a02e..2e8f53d 100644 --- a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json +++ b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json @@ -14,7 +14,7 @@ "javaType":"org.myfoo.connector.MyFooComponent", "groupId":"org.apache.camel", "artifactId":"myfoo-connector", -"version":"2.20.0-SNAPSHOT" +"version":"2.21.0-SNAPSHOT" }, "componentProperties":{ http://git-wip-us.apache.org/repos/asf/camel/blob/2439863b/platforms/myfoo-connector/src/main/resources/camel-connector.json -- diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector.json b/platforms/myfoo-connector/src/main/resources/camel-connector.json index e869857..23b289d 100644 --- a/platforms/myfoo-connector/src/main/resources/camel-connector.json +++ b/platforms/myfoo-connector/src/main/resources/camel-connector.json @@ -2,14 +2,14 @@ "baseScheme" : "timer", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0-SNAPSHOT", + "baseVersion" : "2.21.0-SNAPSHOT", "baseJavaType" : "org.apache.camel.component.timer.TimerComponent", "name" : "MyFoo", "scheme" : "my-foo", "javaType" : "org.myfoo.connector.MyFooComponent", "groupId" : "org.myfoo", "artifactId" : "myfoo-connector", - "version" : "2.20.0-SNAPSHOT", + "version" : "2.21.0-SNAPSHOT", "description" : "Something cool", "labels" : [ "foo", "timer" ], "pattern" : "From",
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master b7e8974f2 -> d983c0353 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d983c035 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d983c035 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d983c035 Branch: refs/heads/master Commit: d983c0353ce5754de21b36d6ff953cf654693a0b Parents: b7e8974 Author: Claus IbsenAuthored: Fri Oct 6 14:38:29 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 14:38:29 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d983c035/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 90f9778..32a4d37 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 @@ -58,7 +58,7 @@ com.dropbox.core dropbox-core-sdk -1.8.2 +3.0.4 com.github.dozermapper
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 3d630602d -> a12916c22 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a12916c2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a12916c2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a12916c2 Branch: refs/heads/master Commit: a12916c227c71cd60c8f5ec39a4897fd32cf2966 Parents: 3d63060 Author: Claus IbsenAuthored: Fri Oct 6 09:28:43 2017 +0200 Committer: Claus Ibsen Committed: Fri Oct 6 09:28:43 2017 +0200 -- .../camel-spring-boot-dependencies/pom.xml | 199 +++ 1 file changed, 159 insertions(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a12916c2/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 7171372..90f9778 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 @@ -3269,223 +3269,342 @@ org.optaplanner optaplanner-benchmark -6.5.0.Final +7.3.0.Final org.optaplanner optaplanner-benchmark -6.5.0.Final +7.3.0.Final sources org.optaplanner optaplanner-benchmark -6.5.0.Final +7.3.0.Final test-jar org.optaplanner optaplanner-benchmark -6.5.0.Final +7.3.0.Final javadoc org.optaplanner optaplanner-core -6.5.0.Final +7.3.0.Final org.optaplanner optaplanner-core -6.5.0.Final +7.3.0.Final sources org.optaplanner optaplanner-core -6.5.0.Final +7.3.0.Final test-jar org.optaplanner optaplanner-core -6.5.0.Final +7.3.0.Final javadoc org.optaplanner +optaplanner-core-gwt +7.3.0.Final +gwt-lib + + +org.optaplanner optaplanner-distribution -6.5.0.Final +7.3.0.Final zip org.optaplanner optaplanner-docs -6.5.0.Final -jdocbook +7.3.0.Final +zip org.optaplanner optaplanner-examples -6.5.0.Final +7.3.0.Final org.optaplanner optaplanner-examples -6.5.0.Final +7.3.0.Final sources org.optaplanner optaplanner-examples -6.5.0.Final +7.3.0.Final test-jar org.optaplanner optaplanner-persistence-common -6.5.0.Final +7.3.0.Final org.optaplanner optaplanner-persistence-common -6.5.0.Final +7.3.0.Final sources org.optaplanner optaplanner-persistence-common -6.5.0.Final +7.3.0.Final test-jar org.optaplanner optaplanner-persistence-common -6.5.0.Final +7.3.0.Final +javadoc + + +org.optaplanner +optaplanner-persistence-jackson +7.3.0.Final + + +org.optaplanner +optaplanner-persistence-jackson +7.3.0.Final +sources + + +org.optaplanner +optaplanner-persistence-jackson +7.3.0.Final +test-jar + + +org.optaplanner +optaplanner-persistence-jackson +7.3.0.Final +javadoc + + +org.optaplanner +optaplanner-persistence-jaxb +7.3.0.Final + + +org.optaplanner +optaplanner-persistence-jaxb +7.3.0.Final +sources + + +org.optaplanner +optaplanner-persistence-jaxb +7.3.0.Final +test-jar + + +org.optaplanner +optaplanner-persistence-jaxb +7.3.0.Final javadoc org.optaplanner optaplanner-persistence-jpa -6.5.0.Final +7.3.0.Final org.optaplanner optaplanner-persistence-jpa -6.5.0.Final +7.3.0.Final sources org.optaplanner
[1/2] camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 08a1c369d -> 12e2c2c17 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/409015f9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/409015f9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/409015f9 Branch: refs/heads/master Commit: 409015f9ef618f1ba80d45546ef14894482970bb Parents: 08a1c36 Author: Claus IbsenAuthored: Tue Oct 3 16:59:26 2017 +0200 Committer: Claus Ibsen Committed: Tue Oct 3 16:59:35 2017 +0200 -- .../main/resources/camel-connector-schema.json | 120 +-- 1 file changed, 60 insertions(+), 60 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/409015f9/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json -- diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json index cffd10e..122a02e 100644 --- a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json +++ b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json @@ -1,62 +1,62 @@ { - "component":{ - "kind":"component", - "baseScheme":"timer", - "scheme":"my-foo", - "syntax":"my-foo:timerName", - "title":"MyFoo", - "description":"Something cool", - "label":"foo,timer", - "deprecated":false, - "async":false, - "consumerOnly":true, - "lenientProperties":false, - "javaType":"org.myfoo.connector.MyFooComponent", - "groupId":"org.apache.camel", - "artifactId":"myfoo-connector", - "version":"2.20.0-SNAPSHOT" - }, - "componentProperties":{ - - }, - "properties":{ - "timerName":{ - "kind":"path", - "displayName":"Timer Name", - "group":"consumer", - "required":true, - "type":"string", - "javaType":"java.lang.String", - "deprecated":false, - "secret":false, - "description":"The name of the timer" - }, - "period":{ - "kind":"parameter", - "displayName":"Period", - "group":"consumer", - "required":false, - "type":"integer", - "javaType":"long", - "deprecated":false, - "secret":false, - "defaultValue":5000, - "description":"If greater than 0 generate periodic events every period milliseconds. The default value is 1000. You can also specify time values using units such as 60s (60 seconds) 5m30s (5 minutes and 30 seconds) and 1h (1 hour)." - }, - "repeatCount":{ - "kind":"parameter", - "displayName":"Repeat Count", - "group":"consumer", - "required":false, - "type":"integer", - "javaType":"long", - "deprecated":false, - "secret":false, - "defaultValue":0, - "description":"Specifies a maximum limit of number of fires. So if you set it to 1 the timer will only fire once. If you set it to 5 it will only fire five times. A value of zero or negative means fire forever." - } - }, - "connectorProperties":{ - - } + "component":{ +"kind":"component", +"baseScheme":"timer", +"scheme":"my-foo", +"syntax":"my-foo:timerName", +"title":"MyFoo", +"description":"Something cool", +"label":"foo,timer", +"deprecated":false, +"async":false, +"consumerOnly":true, +"lenientProperties":false, +"javaType":"org.myfoo.connector.MyFooComponent", +"groupId":"org.apache.camel", +"artifactId":"myfoo-connector", +"version":"2.20.0-SNAPSHOT" + }, + "componentProperties":{ + + }, + "properties":{ +"timerName":{ + "kind":"path", + "displayName":"Timer Name", + "group":"consumer", + "required":true, + "type":"string", + "javaType":"java.lang.String", + "deprecated":false, + "secret":false, + "description":"The name of the timer" +}, +"period":{ + "kind":"parameter", +
[2/2] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/27c02551 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/27c02551 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/27c02551 Branch: refs/heads/master Commit: 27c02551b044af63353ea585599cbc62bd83a52c Parents: a7a867f Author: lburgazzoliAuthored: Thu Sep 28 10:53:35 2017 +0200 Committer: lburgazzoli Committed: Thu Sep 28 10:53:43 2017 +0200 -- components/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/27c02551/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 503052b..1d4d3ff 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -519,7 +519,7 @@ Number of Components: 282 in 194 JAR artifacts (17 deprecated) `imap:host:port` | 1.0 | To send or receive emails using imap/pop3 or smtp protocols. | link:camel-master/src/main/docs/master-component.adoc[Master] (camel-master) + -`master:namespace:delegateUri` | 2.20 | Camel Master Support +`master:namespace:delegateUri` | 2.20 | Represents an endpoint which only becomes active when the CamelClusterView has the leadership. | link:camel-metrics/src/main/docs/metrics-component.adoc[Metrics] (camel-metrics) + `metrics:metricsType:metricsName` | 2.14 | To collect various metrics directly from Camel routes using the DropWizard metrics library.
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 86a052d31 -> 1bf7b9f83 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1bf7b9f8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1bf7b9f8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1bf7b9f8 Branch: refs/heads/master Commit: 1bf7b9f83b54eab0fea1bf5a00880b074cd5dc47 Parents: 86a052d Author: Claus IbsenAuthored: Wed Sep 27 19:25:58 2017 +0200 Committer: Claus Ibsen Committed: Wed Sep 27 19:25:58 2017 +0200 -- examples/README.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1bf7b9f8/examples/README.adoc -- diff --git a/examples/README.adoc b/examples/README.adoc index 51ba791..92f0552 100644 --- a/examples/README.adoc +++ b/examples/README.adoc @@ -11,7 +11,7 @@ View the individual example READMEs for details. ### Examples // examples: START -Number of Examples: 96 (8 deprecated) +Number of Examples: 97 (8 deprecated) [width="100%",cols="4,2,4",options="header"] |=== @@ -80,6 +80,8 @@ Number of Examples: 96 (8 deprecated) | link:camel-example-spring-boot-clustered-route-controller/readme.adoc[Spring Boot Clustered Route Controller] (camel-example-spring-boot-clustered-route-controller) | Clustering | An example showing how to work with Camel's Clustered Route Controller and Spring Boot +| link:camel-example-spring-boot-master/readme.adoc[Spring Boot Master] (camel-example-spring-boot-master) | Clustering | An example showing how to work with Camel's Master component and Spring Boot + | link:camel-example-cdi-cassandraql/README.md[CDI Cassandra] (camel-example-cdi-cassandraql) | Database | Cassandraql CDI example | link:camel-example-jdbc/README.md[JDBC] (camel-example-jdbc) | Database | An example for showing Camel using JDBC component
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 71cc7be5f -> 26772c4a6 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/26772c4a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/26772c4a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/26772c4a Branch: refs/heads/master Commit: 26772c4a6d4ae5eab16759257dba01068192b12f Parents: 71cc7be Author: lburgazzoliAuthored: Wed Sep 27 18:37:57 2017 +0200 Committer: lburgazzoli Committed: Wed Sep 27 18:37:57 2017 +0200 -- components/readme.adoc | 5 - docs/user-manual/en/SUMMARY.md | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/26772c4a/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 234fbdf..503052b 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^ // components: START -Number of Components: 281 in 193 JAR artifacts (17 deprecated) +Number of Components: 282 in 194 JAR artifacts (17 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -518,6 +518,9 @@ Number of Components: 281 in 193 JAR artifacts (17 deprecated) | link:camel-mail/src/main/docs/mail-component.adoc[Mail] (camel-mail) + `imap:host:port` | 1.0 | To send or receive emails using imap/pop3 or smtp protocols. +| link:camel-master/src/main/docs/master-component.adoc[Master] (camel-master) + +`master:namespace:delegateUri` | 2.20 | Camel Master Support + | link:camel-metrics/src/main/docs/metrics-component.adoc[Metrics] (camel-metrics) + `metrics:metricsType:metricsName` | 2.14 | To collect various metrics directly from Camel routes using the DropWizard metrics library. http://git-wip-us.apache.org/repos/asf/camel/blob/26772c4a/docs/user-manual/en/SUMMARY.md -- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index a26e70d..290e261 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -282,6 +282,7 @@ * [Linkedin](linkedin-component.adoc) * [Lucene](lucene-component.adoc) * [Lumberjack](lumberjack-component.adoc) + * [Master](master-component.adoc) * [Metrics](metrics-component.adoc) * [Mina](mina-component.adoc) * [Mina2](mina2-component.adoc)
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master c0fdc2f35 -> 54d735920 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/54d73592 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/54d73592 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/54d73592 Branch: refs/heads/master Commit: 54d7359200d88804fd2dd09fce15d78b9253d37c Parents: c0fdc2f Author: Claus IbsenAuthored: Wed Sep 27 11:12:32 2017 +0200 Committer: Claus Ibsen Committed: Wed Sep 27 11:12:32 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/54d73592/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 a35beb7..46c4fab 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 @@ -129,7 +129,7 @@ commons-io commons-io -2.4 +2.5 commons-logging
[4/4] camel git commit: Regen docs
Regen docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/52296229 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/52296229 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/52296229 Branch: refs/heads/master Commit: 5229622971680ff20a45f81420545008027198da Parents: b3f38d6 Author: Claus IbsenAuthored: Mon Sep 25 09:07:25 2017 +0200 Committer: Claus Ibsen Committed: Mon Sep 25 09:07:25 2017 +0200 -- examples/README.adoc | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/52296229/examples/README.adoc -- diff --git a/examples/README.adoc b/examples/README.adoc index 06b57db..830409a 100644 --- a/examples/README.adoc +++ b/examples/README.adoc @@ -11,10 +11,10 @@ View the individual example READMEs for details. ### Examples // examples: START -Number of Examples: 98 (8 deprecated) +Number of Examples: 97 (8 deprecated) [width="100%",cols="4,2,4",options="header"] -|=== +|=== | Example | Category | Description | link:camel-example-cdi/README.md[CDI] (camel-example-cdi) | Beginner | An example showing how to work with Camel and CDI for dependency injection @@ -44,6 +44,8 @@ Number of Examples: 98 (8 deprecated) | link:camel-example-spring-boot/readme.adoc[Spring Boot] (camel-example-spring-boot) | Beginner | An example showing how to work with Camel and Spring Boot +| link:camel-example-spring-boot-health-checks/readme.adoc[Spring Boot Health Checks] (camel-example-spring-boot-health-checks) | Beginner | An example showing how to work with Camel's Health Checks and Spring Boot + | link:camel-example-spring-boot-live-reload/readme.adoc[Spring Boot Live Reload] (camel-example-spring-boot-live-reload) | Beginner | An example showing how to use the live reload feature of Spring Boot with Camel | link:camel-example-spring-boot-pojo/README.adoc[Spring Boot Pojo] (camel-example-spring-boot-pojo) | Beginner | An example showing how to work with Camel POJO routing with Spring Boot @@ -217,7 +219,7 @@ Number of Examples: 98 (8 deprecated) | link:camel-example-cxf-tomcat/README.md[CXF Tomcat] (camel-example-cxf-tomcat) | WebService | An example using Camel CXF (code first) with Apache Tomcat | link:camel-example-spring-ws/README.md[Spring WebService] (camel-example-spring-ws) | WebService | An example showing how to work with Camel and Spring Web Services -|=== +|=== // examples: END
camel git commit: Regen docs
Repository: camel Updated Branches: refs/heads/master 6a6bfdd38 -> c3dcb77de Regen docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c3dcb77d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c3dcb77d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c3dcb77d Branch: refs/heads/master Commit: c3dcb77de30e6db96dd7d317a1f89853ba14a0bf Parents: 6a6bfdd Author: Claus IbsenAuthored: Sun Sep 24 09:50:09 2017 +0200 Committer: Claus Ibsen Committed: Sun Sep 24 09:50:09 2017 +0200 -- components/readme.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c3dcb77d/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 87e713e..234fbdf 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -356,7 +356,7 @@ Number of Components: 281 in 193 JAR artifacts (17 deprecated) | link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870 Client] (camel-iec60870) + `iec60870-client:endpointUri` | 2.20 | IEC 60870 component used for telecontrol (supervisory control and data acquisition) such as controlling electric power transmission grids and other geographically widespread control systems. -| link:camel-iec60870/src/main/docs/iec60870-server-component.adoc[IEC 60870-5-104 Server] (camel-iec60870) + +| link:camel-iec60870/src/main/docs/iec60870-server-component.adoc[IEC 60870 Server] (camel-iec60870) + `iec60870-server:endpointUri` | 2.20 | IEC 60870 component used for telecontrol (supervisory control and data acquisition) such as controlling electric power transmission grids and other geographically widespread control systems. | link:camel-ignite/src/main/docs/ignite-cache-component.adoc[Ignite Cache] (camel-ignite) + @@ -1089,7 +1089,7 @@ Number of Miscellaneous Components: 37 in 37 JAR artifacts (13 deprecated) | link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3 | Security using Spring Security -| link:camel-swagger/src/main/docs/swagger.adoc[Swagger] (camel-swagger) | 2.14 | *deprecated* Rest-dsl support for using swagger api-doc +| link:camel-swagger/src/main/docs/swagger.adoc[Swagger] (camel-swagger) | 2.14 | *deprecated* Rest-dsl support for using swagger api-doc (uses Scala) | link:camel-swagger-java/src/main/docs/swagger-java.adoc[Swagger Java] (camel-swagger-java) | 2.16 | Rest-dsl support for using swagger api-doc
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 49d3fe94e -> c9c163718 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c9c16371 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c9c16371 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c9c16371 Branch: refs/heads/master Commit: c9c16371825a1168038937a07d0291efea8c51dd Parents: 49d3fe9 Author: Claus IbsenAuthored: Wed Sep 20 09:21:41 2017 +0200 Committer: Claus Ibsen Committed: Wed Sep 20 09:21:41 2017 +0200 -- camel-core/src/main/docs/controlbus-component.adoc | 7 +++ camel-core/src/main/docs/mock-component.adoc | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c9c16371/camel-core/src/main/docs/controlbus-component.adoc -- diff --git a/camel-core/src/main/docs/controlbus-component.adoc b/camel-core/src/main/docs/controlbus-component.adoc index b0d9799..e3b3846 100644 --- a/camel-core/src/main/docs/controlbus-component.adoc +++ b/camel-core/src/main/docs/controlbus-component.adoc @@ -1,6 +1,6 @@ -== Control Bus +== Control Bus Component -*Available as of Camel version 2.11.0* +*Available as of Camel version 2.11* The http://www.eaipatterns.com/ControlBus.html[Control Bus] from the link:enterprise-integration-patterns.html[EIP patterns] allows for the @@ -184,5 +184,4 @@ We use `async=true` to stop Camel asynchronously as otherwise we would be trying to stop Camel while it was in-flight processing the message we sent to the control bus component. -TIP: You can also use other languages such as link:groovy.html[Groovy], etc. - +TIP: You can also use other languages such as link:groovy.html[Groovy], etc. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/c9c16371/camel-core/src/main/docs/mock-component.adoc -- diff --git a/camel-core/src/main/docs/mock-component.adoc b/camel-core/src/main/docs/mock-component.adoc index f8d34db..bf573ff 100644 --- a/camel-core/src/main/docs/mock-component.adoc +++ b/camel-core/src/main/docs/mock-component.adoc @@ -1,5 +1,7 @@ == Mock Component *Available as of Camel version 1.0.0* +*Available as of Camel version 1.0* + link:testing.html[Testing] of distributed and asynchronous processing is notoriously difficult. The link:mock.html[Mock], link:test.html[Test] @@ -478,4 +480,4 @@ In the example above we use `seconds` as the time unit, but Camel offers === See Also * link:spring-testing.html[Spring Testing] -* link:testing.html[Testing] +* link:testing.html[Testing] \ No newline at end of file
[1/2] camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 2e27c3d06 -> 858a7c6c1 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cb37deec Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cb37deec Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cb37deec Branch: refs/heads/master Commit: cb37deec9b41b97bd2a04ede0b01a5bd30146d18 Parents: 2e27c3d Author: Claus IbsenAuthored: Mon Sep 11 21:26:29 2017 +0200 Committer: Claus Ibsen Committed: Mon Sep 11 21:26:29 2017 +0200 -- components/camel-asn1/src/main/docs/asn1-dataformat.adoc | 2 +- .../dataformat/asn1/springboot/ASN1DataFormatConfiguration.java| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/cb37deec/components/camel-asn1/src/main/docs/asn1-dataformat.adoc -- diff --git a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc index eb050c4..80f84d2 100644 --- a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc +++ b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc @@ -15,7 +15,7 @@ The ASN.1 File dataformat supports 3 options which are listed below. |=== | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the asn1 file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. -| clazzName | | String | Name of class to use when unarmshalling +| clazzName | | String | Name of class to use when unmarshalling | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END http://git-wip-us.apache.org/repos/asf/camel/blob/cb37deec/platforms/spring-boot/components-starter/camel-asn1-starter/src/main/java/org/apache/camel/dataformat/asn1/springboot/ASN1DataFormatConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-asn1-starter/src/main/java/org/apache/camel/dataformat/asn1/springboot/ASN1DataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-asn1-starter/src/main/java/org/apache/camel/dataformat/asn1/springboot/ASN1DataFormatConfiguration.java index 45321bb..a8a5d89 100644 --- a/platforms/spring-boot/components-starter/camel-asn1-starter/src/main/java/org/apache/camel/dataformat/asn1/springboot/ASN1DataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-asn1-starter/src/main/java/org/apache/camel/dataformat/asn1/springboot/ASN1DataFormatConfiguration.java @@ -38,7 +38,7 @@ public class ASN1DataFormatConfiguration */ private Boolean usingIterator = false; /** - * Name of class to use when unarmshalling + * Name of class to use when unmarshalling */ private String clazzName; /**
[2/3] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8de99a37 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8de99a37 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8de99a37 Branch: refs/heads/boot2 Commit: 8de99a371d44e60af9b813266dd009ca6a8a9a4c Parents: c8c1c65 Author: Claus IbsenAuthored: Mon Sep 11 14:22:33 2017 +0200 Committer: Claus Ibsen Committed: Mon Sep 11 14:22:33 2017 +0200 -- components/camel-asn1/src/main/docs/asn1-dataformat.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8de99a37/components/camel-asn1/src/main/docs/asn1-dataformat.adoc -- diff --git a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc index 80f84d2..eb050c4 100644 --- a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc +++ b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc @@ -15,7 +15,7 @@ The ASN.1 File dataformat supports 3 options which are listed below. |=== | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the asn1 file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. -| clazzName | | String | Name of class to use when unmarshalling +| clazzName | | String | Name of class to use when unarmshalling | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END
[06/17] camel git commit: Regen camel-hazelcast-starter
Regen camel-hazelcast-starter Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c51fe42e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c51fe42e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c51fe42e Branch: refs/heads/boot2 Commit: c51fe42eb5e407aa7473abee71ce941e0553f233 Parents: 0e818c3 Author: Claus IbsenAuthored: Sun Sep 10 14:24:39 2017 +0200 Committer: Claus Ibsen Committed: Sun Sep 10 14:24:39 2017 +0200 -- .../src/main/docs/asn1-dataformat.adoc | 2 +- .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../HazelcastComponentAutoConfiguration.java| 114 --- .../HazelcastComponentConfiguration.java| 77 - .../AbstractHazelcastInstanceCustomizer.java| 70 ...azelcastInstanceCustomizerConfiguration.java | 46 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 ...dditional-spring-configuration-metadata.json | 76 - .../main/resources/META-INF/spring.factories| 18 +-- .../HazelcastInstanceCustomizerTest.java| 91 --- .../src/test/resources/application.properties | 1 - .../src/test/resources/logback.xml | 52 - 32 files changed, 4 insertions(+), 1269 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c51fe42e/components/camel-asn1/src/main/docs/asn1-dataformat.adoc -- diff --git a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc index 80f84d2..eb050c4 100644 --- a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc +++ b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc @@ -15,7 +15,7 @@ The ASN.1 File dataformat supports 3 options which are listed below. |=== | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the asn1 file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. -| clazzName | | String | Name of class to use when unmarshalling +| clazzName | | String | Name of class to use when unarmshalling | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END http://git-wip-us.apache.org/repos/asf/camel/blob/c51fe42e/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java -- diff --git a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java deleted file mode 100644 index dfbae6c..000 ---
[05/17] camel git commit: Regen camel-hazelcast-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/c51fe42e/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java -- diff --git a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java deleted file mode 100644 index 8bc3e93..000 --- a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.hazelcast.springboot.customizer; - - -import java.util.List; - -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import org.apache.camel.component.hazelcast.HazelcastComponent; -import org.apache.camel.component.hazelcast.list.HazelcastListComponent; -import org.apache.camel.component.hazelcast.set.HazelcastSetComponent; -import org.apache.camel.component.hazelcast.topic.HazelcastTopicComponent; -import org.apache.camel.spi.ComponentCustomizer; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@DirtiesContext -@SpringBootApplication -@SpringBootTest( -classes = { -HazelcastInstanceCustomizerTest.TestConfiguration.class -}, -properties = { -"debug=false", -"camel.component.customizer.enabled=false", -"camel.component.hazelcast.customizer.enabled=true", -"camel.component.hazelcast-set.customizer.enabled=true", -"camel.component.hazelcast-topic.customizer.enabled=true" -}) -public class HazelcastInstanceCustomizerTest { -@Autowired -HazelcastInstance instance; -@Autowired -HazelcastTopicComponent topicComponent; -@Autowired -ListtopicCustomizers; -@Autowired -HazelcastSetComponent setComponent; -@Autowired -List setCustomizers; -@Autowired -HazelcastListComponent listComponent; - -@Test -public void testInstanceCustomizer() throws Exception { -Assert.assertNotNull(instance); - -Assert.assertNotNull(topicComponent); -Assert.assertEquals(1, topicCustomizers.size()); -Assert.assertEquals(instance, topicComponent.getHazelcastInstance()); - -Assert.assertNotNull(setComponent); -Assert.assertEquals(1, setCustomizers.size()); -Assert.assertEquals(instance, setComponent.getHazelcastInstance()); - -Assert.assertNotNull(listComponent); -Assert.assertNull(listComponent.getHazelcastInstance()); -} - -@Configuration -public static class TestConfiguration { -@Bean(destroyMethod = "shutdown") -public HazelcastInstance hazelcastInstance() { -return Hazelcast.newHazelcastInstance(); -} -} -} http://git-wip-us.apache.org/repos/asf/camel/blob/c51fe42e/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties -- diff --git a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties deleted
[13/17] camel git commit: Regen asn1 doc
Regen asn1 doc Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8827c36a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8827c36a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8827c36a Branch: refs/heads/boot2 Commit: 8827c36a752e843049bd2fec534074f0a1c0ab6b Parents: befc483 Author: lburgazzoliAuthored: Mon Sep 11 13:20:39 2017 +0200 Committer: lburgazzoli Committed: Mon Sep 11 13:20:39 2017 +0200 -- components/camel-asn1/src/main/docs/asn1-dataformat.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8827c36a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc -- diff --git a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc index 80f84d2..eb050c4 100644 --- a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc +++ b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc @@ -15,7 +15,7 @@ The ASN.1 File dataformat supports 3 options which are listed below. |=== | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the asn1 file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. -| clazzName | | String | Name of class to use when unmarshalling +| clazzName | | String | Name of class to use when unarmshalling | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END
[3/3] camel git commit: Regen asn1 doc
Regen asn1 doc Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8827c36a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8827c36a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8827c36a Branch: refs/heads/master Commit: 8827c36a752e843049bd2fec534074f0a1c0ab6b Parents: befc483 Author: lburgazzoliAuthored: Mon Sep 11 13:20:39 2017 +0200 Committer: lburgazzoli Committed: Mon Sep 11 13:20:39 2017 +0200 -- components/camel-asn1/src/main/docs/asn1-dataformat.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8827c36a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc -- diff --git a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc index 80f84d2..eb050c4 100644 --- a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc +++ b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc @@ -15,7 +15,7 @@ The ASN.1 File dataformat supports 3 options which are listed below. |=== | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the asn1 file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. -| clazzName | | String | Name of class to use when unmarshalling +| clazzName | | String | Name of class to use when unarmshalling | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END
[3/4] camel git commit: Regen camel-hazelcast-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/c51fe42e/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java -- diff --git a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java deleted file mode 100644 index 8bc3e93..000 --- a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.hazelcast.springboot.customizer; - - -import java.util.List; - -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import org.apache.camel.component.hazelcast.HazelcastComponent; -import org.apache.camel.component.hazelcast.list.HazelcastListComponent; -import org.apache.camel.component.hazelcast.set.HazelcastSetComponent; -import org.apache.camel.component.hazelcast.topic.HazelcastTopicComponent; -import org.apache.camel.spi.ComponentCustomizer; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@DirtiesContext -@SpringBootApplication -@SpringBootTest( -classes = { -HazelcastInstanceCustomizerTest.TestConfiguration.class -}, -properties = { -"debug=false", -"camel.component.customizer.enabled=false", -"camel.component.hazelcast.customizer.enabled=true", -"camel.component.hazelcast-set.customizer.enabled=true", -"camel.component.hazelcast-topic.customizer.enabled=true" -}) -public class HazelcastInstanceCustomizerTest { -@Autowired -HazelcastInstance instance; -@Autowired -HazelcastTopicComponent topicComponent; -@Autowired -ListtopicCustomizers; -@Autowired -HazelcastSetComponent setComponent; -@Autowired -List setCustomizers; -@Autowired -HazelcastListComponent listComponent; - -@Test -public void testInstanceCustomizer() throws Exception { -Assert.assertNotNull(instance); - -Assert.assertNotNull(topicComponent); -Assert.assertEquals(1, topicCustomizers.size()); -Assert.assertEquals(instance, topicComponent.getHazelcastInstance()); - -Assert.assertNotNull(setComponent); -Assert.assertEquals(1, setCustomizers.size()); -Assert.assertEquals(instance, setComponent.getHazelcastInstance()); - -Assert.assertNotNull(listComponent); -Assert.assertNull(listComponent.getHazelcastInstance()); -} - -@Configuration -public static class TestConfiguration { -@Bean(destroyMethod = "shutdown") -public HazelcastInstance hazelcastInstance() { -return Hazelcast.newHazelcastInstance(); -} -} -} http://git-wip-us.apache.org/repos/asf/camel/blob/c51fe42e/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties -- diff --git a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties deleted
[4/4] camel git commit: Regen camel-hazelcast-starter
Regen camel-hazelcast-starter Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c51fe42e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c51fe42e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c51fe42e Branch: refs/heads/master Commit: c51fe42eb5e407aa7473abee71ce941e0553f233 Parents: 0e818c3 Author: Claus IbsenAuthored: Sun Sep 10 14:24:39 2017 +0200 Committer: Claus Ibsen Committed: Sun Sep 10 14:24:39 2017 +0200 -- .../src/main/docs/asn1-dataformat.adoc | 2 +- .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../HazelcastComponentAutoConfiguration.java| 114 --- .../HazelcastComponentConfiguration.java| 77 - .../AbstractHazelcastInstanceCustomizer.java| 70 ...azelcastInstanceCustomizerConfiguration.java | 46 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 ...dditional-spring-configuration-metadata.json | 76 - .../main/resources/META-INF/spring.factories| 18 +-- .../HazelcastInstanceCustomizerTest.java| 91 --- .../src/test/resources/application.properties | 1 - .../src/test/resources/logback.xml | 52 - 32 files changed, 4 insertions(+), 1269 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c51fe42e/components/camel-asn1/src/main/docs/asn1-dataformat.adoc -- diff --git a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc index 80f84d2..eb050c4 100644 --- a/components/camel-asn1/src/main/docs/asn1-dataformat.adoc +++ b/components/camel-asn1/src/main/docs/asn1-dataformat.adoc @@ -15,7 +15,7 @@ The ASN.1 File dataformat supports 3 options which are listed below. |=== | Name | Default | Java Type | Description | usingIterator | false | Boolean | If the asn1 file has more then one entry the setting this option to true allows to work with the splitter EIP to split the data using an iterator in a streaming mode. -| clazzName | | String | Name of class to use when unmarshalling +| clazzName | | String | Name of class to use when unarmshalling | contentTypeHeader | false | Boolean | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML or application/json for data formats marshalling to JSon etc. |=== // dataformat options: END http://git-wip-us.apache.org/repos/asf/camel/blob/c51fe42e/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java -- diff --git a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java deleted file mode 100644 index dfbae6c..000 ---
[5/9] camel git commit: Regen camel-hazelast-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/a5d6ad71/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java -- diff --git a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java deleted file mode 100644 index 8bc3e93..000 --- a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/java/org/apache/camel/component/hazelcast/springboot/customizer/HazelcastInstanceCustomizerTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.hazelcast.springboot.customizer; - - -import java.util.List; - -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import org.apache.camel.component.hazelcast.HazelcastComponent; -import org.apache.camel.component.hazelcast.list.HazelcastListComponent; -import org.apache.camel.component.hazelcast.set.HazelcastSetComponent; -import org.apache.camel.component.hazelcast.topic.HazelcastTopicComponent; -import org.apache.camel.spi.ComponentCustomizer; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@DirtiesContext -@SpringBootApplication -@SpringBootTest( -classes = { -HazelcastInstanceCustomizerTest.TestConfiguration.class -}, -properties = { -"debug=false", -"camel.component.customizer.enabled=false", -"camel.component.hazelcast.customizer.enabled=true", -"camel.component.hazelcast-set.customizer.enabled=true", -"camel.component.hazelcast-topic.customizer.enabled=true" -}) -public class HazelcastInstanceCustomizerTest { -@Autowired -HazelcastInstance instance; -@Autowired -HazelcastTopicComponent topicComponent; -@Autowired -ListtopicCustomizers; -@Autowired -HazelcastSetComponent setComponent; -@Autowired -List setCustomizers; -@Autowired -HazelcastListComponent listComponent; - -@Test -public void testInstanceCustomizer() throws Exception { -Assert.assertNotNull(instance); - -Assert.assertNotNull(topicComponent); -Assert.assertEquals(1, topicCustomizers.size()); -Assert.assertEquals(instance, topicComponent.getHazelcastInstance()); - -Assert.assertNotNull(setComponent); -Assert.assertEquals(1, setCustomizers.size()); -Assert.assertEquals(instance, setComponent.getHazelcastInstance()); - -Assert.assertNotNull(listComponent); -Assert.assertNull(listComponent.getHazelcastInstance()); -} - -@Configuration -public static class TestConfiguration { -@Bean(destroyMethod = "shutdown") -public HazelcastInstance hazelcastInstance() { -return Hazelcast.newHazelcastInstance(); -} -} -} http://git-wip-us.apache.org/repos/asf/camel/blob/a5d6ad71/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties -- diff --git a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/test/resources/application.properties deleted
[6/9] camel git commit: Regen camel-hazelast-starter
Regen camel-hazelast-starter Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a5d6ad71 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a5d6ad71 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a5d6ad71 Branch: refs/heads/boot2 Commit: a5d6ad71281a013b47e2e744416d2a91bb08313c Parents: 3864927 Author: Claus IbsenAuthored: Sun Sep 10 11:17:02 2017 +0200 Committer: Claus Ibsen Committed: Sun Sep 10 11:17:02 2017 +0200 -- .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 .../HazelcastComponentAutoConfiguration.java| 114 --- .../HazelcastComponentConfiguration.java| 77 - .../AbstractHazelcastInstanceCustomizer.java| 70 ...azelcastInstanceCustomizerConfiguration.java | 46 .../customizer/HazelcastInstanceCustomizer.java | 42 --- ...azelcastInstanceCustomizerConfiguration.java | 24 ...dditional-spring-configuration-metadata.json | 76 - .../main/resources/META-INF/spring.factories| 18 +-- .../HazelcastInstanceCustomizerTest.java| 91 --- .../src/test/resources/application.properties | 1 - .../src/test/resources/logback.xml | 52 - 31 files changed, 3 insertions(+), 1268 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a5d6ad71/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java -- diff --git a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java b/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java deleted file mode 100644 index dfbae6c..000 --- a/platforms/spring-boot/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/customizer/HazelcastInstanceCustomizer.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.hazelcast.atomicnumber.springboot.customizer; - -import org.apache.camel.component.hazelcast.atomicnumber.HazelcastAtomicnumberComponent; -import org.apache.camel.component.hazelcast.atomicnumber.springboot.HazelcastAtomicnumberComponentAutoConfiguration; -import org.apache.camel.component.hazelcast.springboot.customizer.AbstractHazelcastInstanceCustomizer; -import org.apache.camel.spring.boot.CamelAutoConfiguration; -import
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 35a7cdb51 -> 6176e415a Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6176e415 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6176e415 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6176e415 Branch: refs/heads/master Commit: 6176e415a67721fb08996e49d1d74ad6bf0da9c9 Parents: 35a7cdb Author: Claus IbsenAuthored: Sat Sep 9 11:17:48 2017 +0200 Committer: Claus Ibsen Committed: Sat Sep 9 11:17:48 2017 +0200 -- components/readme.adoc | 6 +++--- docs/user-manual/en/SUMMARY.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/6176e415/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 6baf3b8..20da4c0 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -110,9 +110,6 @@ Number of Components: 280 in 192 JAR artifacts (17 deprecated) | link:camel-beanstalk/src/main/docs/beanstalk-component.adoc[Beanstalk] (camel-beanstalk) + `beanstalk:connectionSettings` | 2.15 | The beanstalk component is used for job retrieval and post-processing of Beanstalk jobs. -| link:camel-google-bigquery/src/main/docs/bigquery-component.adoc[BigQuery] (camel-google-bigquery) + -`bigquery:projectId:datasetId:tableName` | 2.20 | Google BigQuery data warehouse for analytics. - | link:../camel-core/src/main/docs/binding-component.adoc[Binding] (camel-core) + `binding:bindingName:delegateUri` | 2.11 | *deprecated* The binding component is used for as a of wrapping an Endpoint in a contract with a data format. @@ -275,6 +272,9 @@ Number of Components: 280 in 192 JAR artifacts (17 deprecated) | link:camel-github/src/main/docs/github-component.adoc[GitHub] (camel-github) + `github:type/branchName` | 2.15 | The github component is used for integrating Camel with github. +| link:camel-google-bigquery/src/main/docs/google-bigquery-component.adoc[Google BigQuery] (camel-google-bigquery) + +`google-bigquery:projectId:datasetId:tableName` | 2.20 | Google BigQuery data warehouse for analytics. + | link:camel-google-calendar/src/main/docs/google-calendar-component.adoc[Google Calendar] (camel-google-calendar) + `google-calendar:apiName/methodName` | 2.15 | The google-calendar component provides access to Google Calendar. http://git-wip-us.apache.org/repos/asf/camel/blob/6176e415/docs/user-manual/en/SUMMARY.md -- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index fd51b73..6e8097e 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -157,7 +157,6 @@ * [Azure Storage Queue Service](azure-queue-component.adoc) * [Bean Validator](bean-validator-component.adoc) * [Beanstalk](beanstalk-component.adoc) - * [BigQuery](bigquery-component.adoc) * [Bonita](bonita-component.adoc) * [Box](box-component.adoc) * [Braintree](braintree-component.adoc) @@ -203,6 +202,7 @@ * [Geocoder](geocoder-component.adoc) * [Git](git-component.adoc) * [GitHub](github-component.adoc) + * [Google BigQuery](google-bigquery-component.adoc) * [Google Calendar](google-calendar-component.adoc) * [Google Drive](google-drive-component.adoc) * [Google Mail](google-mail-component.adoc)
[1/3] camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 460fec46c -> e92d8ca5f Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e92d8ca5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e92d8ca5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e92d8ca5 Branch: refs/heads/master Commit: e92d8ca5f1d7e710b9515e1bea9d0c2421af7a4f Parents: 81163bb Author: Claus IbsenAuthored: Sat Sep 9 09:30:08 2017 +0200 Committer: Claus Ibsen Committed: Sat Sep 9 09:30:43 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e92d8ca5/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 19a9914..57d620a 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 @@ -43,7 +43,7 @@ com.alibaba fastjson -1.2.35 +1.2.37 com.atlassian.jira
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master a5fe4f5d8 -> c173bec43 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c173bec4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c173bec4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c173bec4 Branch: refs/heads/master Commit: c173bec4346b0fb10c1d34a41002c6961e7a6499 Parents: a5fe4f5 Author: Claus IbsenAuthored: Thu Sep 7 08:19:11 2017 +0200 Committer: Claus Ibsen Committed: Thu Sep 7 08:19:11 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c173bec4/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 4225efb..19a9914 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 @@ -63,7 +63,7 @@ com.fasterxml.jackson.module jackson-module-jsonSchema -2.8.9 +2.8.7 com.fasterxml.jackson.module
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master c65e45c60 -> 1fa4a201e Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1fa4a201 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1fa4a201 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1fa4a201 Branch: refs/heads/master Commit: 1fa4a201e7ce604973a6ef4c3ceb9ef83260cdda Parents: c65e45c Author: lburgazzoliAuthored: Wed Sep 6 11:21:42 2017 +0200 Committer: lburgazzoli Committed: Wed Sep 6 11:21:42 2017 +0200 -- platforms/myfoo-connector/src/main/resources/camel-connector.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1fa4a201/platforms/myfoo-connector/src/main/resources/camel-connector.json -- diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector.json b/platforms/myfoo-connector/src/main/resources/camel-connector.json index ff58fec..e869857 100644 --- a/platforms/myfoo-connector/src/main/resources/camel-connector.json +++ b/platforms/myfoo-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "timer", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0-20170906.004047-219", + "baseVersion" : "2.20.0-SNAPSHOT", "baseJavaType" : "org.apache.camel.component.timer.TimerComponent", "name" : "MyFoo", "scheme" : "my-foo",
[1/3] camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master b753c17e2 -> c4e2d6a8b Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c4e2d6a8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c4e2d6a8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c4e2d6a8 Branch: refs/heads/master Commit: c4e2d6a8bd179ca7226729aa5b1bb2b0d8c4bdd0 Parents: 9543ae9 Author: lburgazzoliAuthored: Wed Sep 6 08:32:04 2017 +0200 Committer: lburgazzoli Committed: Wed Sep 6 08:32:10 2017 +0200 -- .../examples/foo-connector/src/main/resources/camel-connector.json | 2 +- .../petstore-connector/src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json| 2 +- .../src/main/resources/camel-connector.json| 2 +- platforms/myfoo-connector/src/main/resources/camel-connector.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c4e2d6a8/connectors/examples/foo-connector/src/main/resources/camel-connector.json -- diff --git a/connectors/examples/foo-connector/src/main/resources/camel-connector.json b/connectors/examples/foo-connector/src/main/resources/camel-connector.json index c2bfda1..672717f 100644 --- a/connectors/examples/foo-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/foo-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "timer", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-core", - "baseVersion" : "2.20.0-SNAPSHOT", + "baseVersion" : "2.20.0-20170906.004047-219", "baseJavaType" : "org.apache.camel.component.timer.TimerComponent", "name" : "Foo", "scheme" : "foo", http://git-wip-us.apache.org/repos/asf/camel/blob/c4e2d6a8/connectors/examples/petstore-connector/src/main/resources/camel-connector.json -- diff --git a/connectors/examples/petstore-connector/src/main/resources/camel-connector.json b/connectors/examples/petstore-connector/src/main/resources/camel-connector.json index fb44e52..f701a65 100644 --- a/connectors/examples/petstore-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/petstore-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "rest-swagger", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-rest-swagger", - "baseVersion" : "2.20.0-20170904.034931-187", + "baseVersion" : "2.20.0-SNAPSHOT", "baseJavaType" : "org.apache.camel.component.rest.swagger.RestSwaggerComponent", "name" : "PetStore", "scheme" : "petstore", http://git-wip-us.apache.org/repos/asf/camel/blob/c4e2d6a8/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json -- diff --git a/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json index e548c02..bad488c 100644 --- a/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.20.0-20170904.035306-186", + "baseVersion" : "2.20.0-SNAPSHOT", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceUpsertContact", "scheme" : "salesforce-upsert-contact", http://git-wip-us.apache.org/repos/asf/camel/blob/c4e2d6a8/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json -- diff --git a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json index 5777153..2ab77c2 100644 --- a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json @@ -2,7 +2,7 @@ "baseScheme" : "twitter", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-twitter", - "baseVersion" : "2.20.0-20170904.041524-180", + "baseVersion" : "2.20.0-SNAPSHOT", "baseJavaType" : "org.apache.camel.component.twitter.TwitterComponent", "name" : "TwitterMention",
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master cc6883dcb -> 25ddb5fd8 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/25ddb5fd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/25ddb5fd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/25ddb5fd Branch: refs/heads/master Commit: 25ddb5fd83790818dc834966cd420d0799ac3a1e Parents: cc6883d Author: Andrea CosentinoAuthored: Tue Sep 5 09:39:38 2017 +0200 Committer: Andrea Cosentino Committed: Tue Sep 5 09:39:38 2017 +0200 -- .../xmpp/springboot/XmppComponentAutoConfiguration.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/25ddb5fd/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java index 8fdfe96..f8d2f3d 100644 --- a/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-xmpp-starter/src/main/java/org/apache/camel/component/xmpp/springboot/XmppComponentAutoConfiguration.java @@ -26,6 +26,7 @@ import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spi.HasId; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.CamelPropertiesHelper; import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; @@ -94,16 +95,15 @@ public class XmppComponentAutoConfiguration { IntrospectionSupport.getProperties(value, nestedParameters, null, false); Object nestedProperty = nestedClass.newInstance(); -IntrospectionSupport.setProperties(camelContext, -camelContext.getTypeConverter(), nestedProperty, -nestedParameters); +CamelPropertiesHelper.setCamelProperties(camelContext, +nestedProperty, nestedParameters, false); entry.setValue(nestedProperty); } catch (NoSuchFieldException e) { } } } -IntrospectionSupport.setProperties(camelContext, -camelContext.getTypeConverter(), component, parameters); +CamelPropertiesHelper.setCamelProperties(camelContext, component, +parameters, false); if (ObjectHelper.isNotEmpty(customizers)) { for (ComponentCustomizer customizer : customizers) { boolean useCustomizer = (customizer instanceof HasId)
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master eed918215 -> aefa11f8b Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aefa11f8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aefa11f8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aefa11f8 Branch: refs/heads/master Commit: aefa11f8ba1fcb871177fd95aafcdb03bac0aaef Parents: eed9182 Author: Claus IbsenAuthored: Mon Sep 4 08:52:36 2017 +0200 Committer: Claus Ibsen Committed: Mon Sep 4 08:52:42 2017 +0200 -- components/camel-amqp/src/main/docs/amqp-component.adoc | 4 ++-- .../component/amqp/springboot/AMQPComponentConfiguration.java | 7 --- 2 files changed, 6 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/aefa11f8/components/camel-amqp/src/main/docs/amqp-component.adoc -- diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc index c458977..9af5ce5 100644 --- a/components/camel-amqp/src/main/docs/amqp-component.adoc +++ b/components/camel-amqp/src/main/docs/amqp-component.adoc @@ -113,7 +113,7 @@ The AMQP component supports 76 options which are listed below. | **includeAllJMSX Properties** (advanced) | Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true will include properties such as JMSXAppID and JMSXUserID etc. Note: If you are using a custom headerFilterStrategy then this option does not apply. | false | boolean | **defaultTaskExecutor Type** (consumer) | Specifies what default TaskExecutor type to use in the DefaultMessageListenerContainer for both consumer endpoints and the ReplyTo consumer of producer endpoints. Possible values: SimpleAsync (uses Spring's SimpleAsyncTaskExecutor) or ThreadPool (uses Spring's ThreadPoolTaskExecutor with optimal values - cached threadpool-like). If not set it defaults to the previous behaviour which uses a cached thread pool for consumer endpoints and SimpleAsync for reply consumers. The use of ThreadPool is recommended to reduce thread trash in elastic configurations with dynamically increasing and decreasing concurrent consumers. | | DefaultTaskExecutor Type | **jmsKeyFormatStrategy** (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides two implementations out of the box: default and passthrough. The default strategy will safely marshal dots and hyphens (. and -). The passthrough strategy leaves the key as is. Can be used for JMS brokers which do not care whether JMS header keys contain illegal characters. You can provide your own implementation of the org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the notation. | | JmsKeyFormatStrategy -| **allowAdditionalHeaders** (producer) | This option is used to allow additional headers which may have values that are invalid according to JMS specification. For example some message systems such as WMQ do this vith headers JMS_IBM_MQMD_ that contains byte or other invalid types. You can specify multiple header names separated by comma and use as suffix for wildcard matching. | | String +| **allowAdditionalHeaders** (producer) | This option is used to allow additional headers which may have values that are invalid according to JMS specification. For example some message systems such as WMQ do this with header names using prefix JMS_IBM_MQMD_ containing values with byte array or other invalid types. You can specify multiple header names separated by comma and use as suffix for wildcard matching. | | String | **queueBrowseStrategy** (advanced) | To use a custom QueueBrowseStrategy when browsing queues | | QueueBrowseStrategy | **messageCreatedStrategy** (advanced) | To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of javax.jms.Message objects when Camel is sending a JMS message. | | MessageCreatedStrategy | **waitForProvision CorrelationToBeUpdated Counter** (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int @@ -190,7 +190,7 @@ with the following path and query parameters: | **replyToType** (producer) | Allows for explicitly specifying which kind of strategy to use for replyTo queues when doing request/reply over JMS. Possible values are: Temporary Shared or Exclusive. By default Camel will use temporary queues. However if replyTo has been configured then Shared is used by default. This option
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 07e9ada54 -> 23931fe93 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/23931fe9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/23931fe9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/23931fe9 Branch: refs/heads/master Commit: 23931fe93b74be0de8c9fab9dd98d43d0b5832a8 Parents: 07e9ada Author: Claus IbsenAuthored: Sun Sep 3 09:58:17 2017 +0200 Committer: Claus Ibsen Committed: Sun Sep 3 09:58:17 2017 +0200 -- .../camel-amqp/src/main/docs/amqp-component.adoc| 6 -- .../amqp/springboot/AMQPComponentConfiguration.java | 16 .../components-starter/camel-core-starter/pom.xml | 5 - 3 files changed, 20 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/23931fe9/components/camel-amqp/src/main/docs/amqp-component.adoc -- diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc index 650ee87..c458977 100644 --- a/components/camel-amqp/src/main/docs/amqp-component.adoc +++ b/components/camel-amqp/src/main/docs/amqp-component.adoc @@ -38,7 +38,7 @@ link:../../../../camel-jms/src/main/docs/readme.html[JMS] component after the de // component options: START -The AMQP component supports 75 options which are listed below. +The AMQP component supports 76 options which are listed below. @@ -113,6 +113,7 @@ The AMQP component supports 75 options which are listed below. | **includeAllJMSX Properties** (advanced) | Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true will include properties such as JMSXAppID and JMSXUserID etc. Note: If you are using a custom headerFilterStrategy then this option does not apply. | false | boolean | **defaultTaskExecutor Type** (consumer) | Specifies what default TaskExecutor type to use in the DefaultMessageListenerContainer for both consumer endpoints and the ReplyTo consumer of producer endpoints. Possible values: SimpleAsync (uses Spring's SimpleAsyncTaskExecutor) or ThreadPool (uses Spring's ThreadPoolTaskExecutor with optimal values - cached threadpool-like). If not set it defaults to the previous behaviour which uses a cached thread pool for consumer endpoints and SimpleAsync for reply consumers. The use of ThreadPool is recommended to reduce thread trash in elastic configurations with dynamically increasing and decreasing concurrent consumers. | | DefaultTaskExecutor Type | **jmsKeyFormatStrategy** (advanced) | Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides two implementations out of the box: default and passthrough. The default strategy will safely marshal dots and hyphens (. and -). The passthrough strategy leaves the key as is. Can be used for JMS brokers which do not care whether JMS header keys contain illegal characters. You can provide your own implementation of the org.apache.camel.component.jms.JmsKeyFormatStrategy and refer to it using the notation. | | JmsKeyFormatStrategy +| **allowAdditionalHeaders** (producer) | This option is used to allow additional headers which may have values that are invalid according to JMS specification. For example some message systems such as WMQ do this vith headers JMS_IBM_MQMD_ that contains byte or other invalid types. You can specify multiple header names separated by comma and use as suffix for wildcard matching. | | String | **queueBrowseStrategy** (advanced) | To use a custom QueueBrowseStrategy when browsing queues | | QueueBrowseStrategy | **messageCreatedStrategy** (advanced) | To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of javax.jms.Message objects when Camel is sending a JMS message. | | MessageCreatedStrategy | **waitForProvision CorrelationToBeUpdated Counter** (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int @@ -145,7 +146,7 @@ with the following path and query parameters: | **destinationName** | *Required* Name of the queue or topic to use as destination | | String |=== - Query Parameters (85 parameters): + Query Parameters (86 parameters): [width="100%",cols="2,5,^1,2",options="header"] |=== @@ -189,6 +190,7 @@ with the following path and query
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 325d28b46 -> 12bb84a2b Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/12bb84a2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/12bb84a2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/12bb84a2 Branch: refs/heads/master Commit: 12bb84a2b83ac0fb1974b77054586149eaf93d3a Parents: 325d28b Author: Claus IbsenAuthored: Wed Aug 23 00:59:09 2017 +0200 Committer: Claus Ibsen Committed: Wed Aug 23 00:59:09 2017 +0200 -- .../camel-crypto-cms/src/main/docs/crypto-cms-component.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/12bb84a2/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc -- diff --git a/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc b/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc index 3c2456f..c8f9919 100644 --- a/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc +++ b/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc @@ -81,7 +81,7 @@ with the following path and query parameters: | **includeContent** (sign) | Indicates whether the signed content should be included into the Signed Data instance. If false then a detached Signed Data instance is created in the header CamelCryptoCmsSignedData. | true | Boolean | **signer** (sign) | Signer information: reference to a bean which implements org.apache.camel.component.crypto.cms.api.SignerInfo | | List | **signedDataHeaderBase64** (verify) | Indicates whether the value in the header CamelCryptoCmsSignedData is base64 encoded. Default value is false. Only relevant for detached signatures. In the detached signature case the header contains the Signed Data object. | false | Boolean -| **verifySignaturesOfAllSigners** (verify) | If true then the signatures of all signers contained in the Signed Data object are verified. If false then only one signature whose signer info matches with one of the specified certificates is verified. Default value is true. | true | Boolean +| **verifySignaturesOfAll Signers** (verify) | If true then the signatures of all signers contained in the Signed Data object are verified. If false then only one signature whose signer info matches with one of the specified certificates is verified. Default value is true. | true | Boolean |=== // endpoint options: END @@ -385,4 +385,4 @@ from("direct:start") - \ No newline at end of file +
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master d51365105 -> 4dd073495 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4dd07349 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4dd07349 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4dd07349 Branch: refs/heads/master Commit: 4dd073495b4c27538e4afece9fc7c739af8c5e2f Parents: d513651 Author: Claus IbsenAuthored: Tue Aug 15 00:19:38 2017 +0200 Committer: Claus Ibsen Committed: Tue Aug 15 00:19:38 2017 +0200 -- components/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4dd07349/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 9717e8e..36b5b96 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -111,7 +111,7 @@ Number of Components: 280 in 192 JAR artifacts (17 deprecated) `beanstalk:connectionSettings` | 2.15 | The beanstalk component is used for job retrieval and post-processing of Beanstalk jobs. | link:camel-google-bigquery/src/main/docs/bigquery-component.adoc[BigQuery] (camel-google-bigquery) + -`bigquery:projectId:datasetId[:tableName]` | | BigQuery Endpoint Definition Represents a table within a BigQuery dataset Contains configuration details for a single table and the utility methods (such as check create) to ease operations URI Parameters: Logger ID - To ensure that logging is unified under Route Logger the logger ID can be passed on via an endpoint URI parameter Partitioned - to indicate that the table needs to be partitioned - every UTC day to be written into a timestamped separate table side effect: Australian operational day is always split between two UTC days and therefore tables +`bigquery:projectId:datasetId:tableName` | 2.20 | BigQuery Endpoint Definition Represents a table within a BigQuery dataset Contains configuration details for a single table and the utility methods (such as check create) to ease operations URI Parameters: Logger ID - To ensure that logging is unified under Route Logger the logger ID can be passed on via an endpoint URI parameter Partitioned - to indicate that the table needs to be partitioned - every UTC day to be written into a timestamped separate table side effect: Australian operational day is always split between two UTC days and therefore tables | link:../camel-core/src/main/docs/binding-component.adoc[Binding] (camel-core) + `binding:bindingName:delegateUri` | 2.11 | *deprecated* The binding component is used for as a of wrapping an Endpoint in a contract with a data format.
[6/7] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd6ed426 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd6ed426 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd6ed426 Branch: refs/heads/master Commit: cd6ed426de2e0600440f83bdf6101d46e90d924c Parents: 3ca4fe7 Author: Andrea CosentinoAuthored: Thu Aug 10 13:04:41 2017 +0200 Committer: Andrea Cosentino Committed: Thu Aug 10 13:04:41 2017 +0200 -- components/readme.adoc | 12 +--- docs/user-manual/en/SUMMARY.md | 2 ++ .../spring-boot-dm/camel-spring-boot-bom/pom.xml| 5 + 3 files changed, 12 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/cd6ed426/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 670f5b8..9717e8e 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^ // components: START -Number of Components: 278 in 191 JAR artifacts (17 deprecated) +Number of Components: 280 in 192 JAR artifacts (17 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -354,10 +354,10 @@ Number of Components: 278 in 191 JAR artifacts (17 deprecated) `ibatis:statement` | 1.2 | *deprecated* Performs a query poll insert update or delete in a relational database using Apache iBATIS. | link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870 Client] (camel-iec60870) + -`iec60870-client:endpoint` | 2.20 | A component which acts as client, allowing to remote control IEC 60870-5-104 capable devices. +`iec60870-client:endpointUri` | 2.20 | Camel IEC 60870-5-104 support -| link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870 Client] (camel-iec60870) + -`iec60870-server:endpoint` | 2.20 | A component which acts as server, offering remote control capabilities using IEC 60870-5-104. +| link:camel-iec60870/src/main/docs/iec60870-server-component.adoc[IEC 60870-5-104 server] (camel-iec60870) + +`iec60870-server:endpointUri` | 2.20 | Camel IEC 60870-5-104 support | link:camel-ignite/src/main/docs/ignite-cache-component.adoc[Ignite Cache] (camel-ignite) + `ignite-cache:cacheName` | 2.17 | The Ignite Cache endpoint is one of camel-ignite endpoints which allows you to interact with an Ignite Cache. @@ -1024,7 +1024,7 @@ Miscellaneous Components // others: START -Number of Miscellaneous Components: 38 in 38 JAR artifacts (14 deprecated) +Number of Miscellaneous Components: 37 in 37 JAR artifacts (13 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -1080,8 +1080,6 @@ Number of Miscellaneous Components: 38 in 38 JAR artifacts (14 deprecated) | link:camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc[Spring Cloud Netflix] (camel-spring-cloud-netflix) | 2.19 | Camel Cloud integration with Spring Cloud Netflix -| link:camel-spring-dm/src/main/docs/spring-dm.adoc[Spring DM] (camel-spring-dm) | 2.18 | *deprecated* Camel SpringDM (OSGi) XML DSL - | link:camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc[Spring Java Configuration] (camel-spring-javaconfig) | 2.0 | Using Camel with Spring Java Configuration | link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3 | Security using Spring Security http://git-wip-us.apache.org/repos/asf/camel/blob/cd6ed426/docs/user-manual/en/SUMMARY.md -- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 34bb690..8cbbb55 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -229,6 +229,8 @@ * [HTTP](http-component.adoc) * [HTTP4](http4-component.adoc) * [iBatis](ibatis-component.adoc) + * [IEC 60870 Client](iec60870-client-component.adoc) + * [IEC 60870-5-104 server](iec60870-server-component.adoc) * [Ignite Cache](ignite-cache-component.adoc) * [Ignite Compute](ignite-compute-component.adoc) * [Ignite Events](ignite-events-component.adoc) http://git-wip-us.apache.org/repos/asf/camel/blob/cd6ed426/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml -- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml index
[1/2] camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master a613a589e -> 7ae1aac78 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ae1aac7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ae1aac7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ae1aac7 Branch: refs/heads/master Commit: 7ae1aac781dc0ccc616b8e060f30aaf1a4543fed Parents: 8e19090 Author: Andrea CosentinoAuthored: Wed Aug 9 12:08:39 2017 +0200 Committer: Andrea Cosentino Committed: Wed Aug 9 12:08:53 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7ae1aac7/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 d8dc017..675a182 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 @@ -73,7 +73,7 @@ com.github.dozermapper dozer-core -6.0.0 +6.1.0 com.google.code.scriptengines
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master e821b56ec -> 28ba07448 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/28ba0744 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/28ba0744 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/28ba0744 Branch: refs/heads/master Commit: 28ba0744877f954fd26db8f5fe168972c1204ef5 Parents: e821b56 Author: Claus IbsenAuthored: Sun Aug 6 10:20:25 2017 +0200 Committer: Claus Ibsen Committed: Sun Aug 6 10:20:31 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/28ba0744/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 66651d5..58b0ce0 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 @@ -63,7 +63,7 @@ com.fasterxml.jackson.module jackson-module-jsonSchema -2.9.0 +2.8.9 com.fasterxml.jackson.module
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 109da7c9a -> 567d5a0c4 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/567d5a0c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/567d5a0c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/567d5a0c Branch: refs/heads/master Commit: 567d5a0c4f59b681da304e9d59dcb4d2f5fdf0e5 Parents: 109da7c Author: Claus IbsenAuthored: Sat Aug 5 08:01:54 2017 +0200 Committer: Claus Ibsen Committed: Sat Aug 5 08:01:54 2017 +0200 -- components/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/567d5a0c/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 4393f62..3edbf09 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -683,7 +683,7 @@ Number of Components: 278 in 191 JAR artifacts (17 deprecated) | link:../camel-core/src/main/docs/seda-component.adoc[SEDA] (camel-core) + `seda:name` | 1.1 | The seda component provides asynchronous call to another endpoint from any CamelContext in the same JVM. -| link:camel-servicenow/src/main/docs/servicenow-component.adoc[ServiceNow] (camel-servicenow) + +| link:camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc[ServiceNow] (camel-servicenow) + `servicenow:instanceName` | 2.18 | The servicenow component is used to integrate Camel with ServiceNow cloud services. | link:camel-servlet/src/main/docs/servlet-component.adoc[Servlet] (camel-servlet) +
[1/2] camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 2f1f266eb -> 87147fc25 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36bba151 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36bba151 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36bba151 Branch: refs/heads/master Commit: 36bba151403866cd1e7c41c1a1f589b1e5107579 Parents: 2f1f266 Author: Claus IbsenAuthored: Thu Aug 3 11:18:36 2017 +0200 Committer: Claus Ibsen Committed: Thu Aug 3 11:18:36 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/36bba151/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 405ef55..bd9de05 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 @@ -62,6 +62,11 @@ com.fasterxml.jackson.module +jackson-module-jsonSchema +2.9.0 + + +com.fasterxml.jackson.module jackson-module-scala_2.11 2.8.8
[2/4] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/74a0cd81 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/74a0cd81 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/74a0cd81 Branch: refs/heads/master Commit: 74a0cd81cefd2bfc0abbab9e88da154bb6ed0cd8 Parents: ab3ab46 Author: Claus IbsenAuthored: Mon Jul 31 10:25:40 2017 +0200 Committer: Claus Ibsen Committed: Mon Jul 31 10:25:40 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-bom/pom.xml | 15 +++ .../camel-spring-boot-dependencies/pom.xml | 15 +++ 2 files changed, 30 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/74a0cd81/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml -- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml index 896cf40..4dd4a23 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml @@ -1187,6 +1187,21 @@ org.apache.camel +camel-thrift-starter +${project.version} + + +org.apache.camel +camel-tika-starter +${project.version} + + +org.apache.camel +camel-twillio-starter +${project.version} + + +org.apache.camel camel-twitter-starter ${project.version} http://git-wip-us.apache.org/repos/asf/camel/blob/74a0cd81/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 01f97f1..cef0bf7 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 @@ -2651,16 +2651,31 @@ org.apache.camel +camel-thrift-starter +${project.version} + + +org.apache.camel camel-tika ${project.version} org.apache.camel +camel-tika-starter +${project.version} + + +org.apache.camel camel-twilio ${project.version} org.apache.camel +camel-twillio-starter +${project.version} + + +org.apache.camel camel-twitter ${project.version}
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 2e58b4037 -> 6d0fdee12 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6d0fdee1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6d0fdee1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6d0fdee1 Branch: refs/heads/master Commit: 6d0fdee127d6d7a87285b5931e3e939b72ff642f Parents: 2e58b40 Author: Claus IbsenAuthored: Fri Jul 28 09:48:01 2017 +0200 Committer: Claus Ibsen Committed: Fri Jul 28 09:48:01 2017 +0200 -- components/camel-ftp/src/main/docs/ftp-component.adoc | 2 +- components/camel-ftp/src/main/docs/ftps-component.adoc | 2 +- components/camel-ftp/src/main/docs/sftp-component.adoc | 2 +- components/readme.adoc | 5 - docs/user-manual/en/SUMMARY.md | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/6d0fdee1/components/camel-ftp/src/main/docs/ftp-component.adoc -- diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc b/components/camel-ftp/src/main/docs/ftp-component.adoc index 3c90105..427dee4 100644 --- a/components/camel-ftp/src/main/docs/ftp-component.adoc +++ b/components/camel-ftp/src/main/docs/ftp-component.adoc @@ -176,7 +176,7 @@ with the following path and query parameters: | **readLock** (lock) | Used by consumer to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: none - No read lock is in use markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component changed - Changed is using file length/modification timestamp to detect whether the file is currently being copied or not. Will at least use 1 sec to determine this so this option cannot consume files as fast as the others but can be more reliable as the JDK IO API cannot always determine whether a file is currently being used by another process. The option readLockCheckInterval can be used to set the check frequency. fileLock - is for using java.nio.channels.FileLock. This option is not avail for the FTP component. This approach should be avoided when accessing a r emote file system via a mount/share unless that file system supports distributed file locks. rename - rename is for using a try to rename the file as a test if we can get exclusive read-lock. idempotent - (only for file component) idempotent is for using a idempotentRepository as the read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. idempotent-changed - (only for file component) idempotent-changed is for using a idempotentRepository and changed as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. idempotent-rename - (only for file component) idempotent-rename is for using a idempotentRepository and rename as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. Notice: The various read locks is not all suited to work in clustered mode where concurrent consumers on different nodes is competing for the same files on a shared file system. The markerFile using a close to atomic operation to create the empty marker file but its not guaranteed to work in a cluster. The fileLock may work better but then the file system need to support distributed file locks and so on. Using the idempotent read lock can support clustering if the idempotent repository supports clustering such as Hazelcast Component or Infinispan. | | String | **readLockCheckInterval** (lock) | Interval in millis for the read-lock if supported by the read lock. This interval is used for sleeping between attempts to acquire the read lock. For example when using the changed read lock you can set a higher interval period to cater for slow writes. The default of 1 sec. may be too fast if the producer is very slow writing the file. Notice: For FTP the default readLockCheckInterval is 5000. The readLockTimeout value must be higher than readLockCheckInterval but a rule of thumb is to have a timeout that is at least 2 or more times higher than the readLockCheckInterval. This is needed to ensure that amble time is allowed for the read lock process to try to grab the lock before the timeout was hit. | 1000 | long | **readLockDeleteOrphanLock Files** (lock) | Whether or not
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 2bd1a3d8d -> e7bfaf212 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7bfaf21 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7bfaf21 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7bfaf21 Branch: refs/heads/master Commit: e7bfaf212b76c419739ade4f057309e9ebd517c3 Parents: 2bd1a3d Author: Andrea CosentinoAuthored: Thu Jul 27 12:20:46 2017 +0200 Committer: Andrea Cosentino Committed: Thu Jul 27 12:20:46 2017 +0200 -- camel-core/src/main/docs/file-component.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e7bfaf21/camel-core/src/main/docs/file-component.adoc -- diff --git a/camel-core/src/main/docs/file-component.adoc b/camel-core/src/main/docs/file-component.adoc index 1390e05..f7280a9 100644 --- a/camel-core/src/main/docs/file-component.adoc +++ b/camel-core/src/main/docs/file-component.adoc @@ -136,7 +136,7 @@ with the following path and query parameters: | **readLock** (lock) | Used by consumer to only poll the files if it has exclusive read-lock on the file (i.e. the file is not in-progress or being written). Camel will wait until the file lock is granted. This option provides the build in strategies: none - No read lock is in use markerFile - Camel creates a marker file (fileName.camelLock) and then holds a lock on it. This option is not available for the FTP component changed - Changed is using file length/modification timestamp to detect whether the file is currently being copied or not. Will at least use 1 sec to determine this so this option cannot consume files as fast as the others but can be more reliable as the JDK IO API cannot always determine whether a file is currently being used by another process. The option readLockCheckInterval can be used to set the check frequency. fileLock - is for using java.nio.channels.FileLock. This option is not avail for the FTP component. This approach should be avoided when accessing a r emote file system via a mount/share unless that file system supports distributed file locks. rename - rename is for using a try to rename the file as a test if we can get exclusive read-lock. idempotent - (only for file component) idempotent is for using a idempotentRepository as the read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. idempotent-changed - (only for file component) idempotent-changed is for using a idempotentRepository and changed as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. idempotent-rename - (only for file component) idempotent-rename is for using a idempotentRepository and rename as the combined read-lock. This allows to use read locks that supports clustering if the idempotent repository implementation supports that. Notice: The various read locks is not all suited to work in clustered mode where concurrent consumers on different nodes is competing for the same files on a shared file system. The markerFile using a close to atomic operation to create the empty marker file but its not guaranteed to work in a cluster. The fileLock may work better but then the file system need to support distributed file locks and so on. Using the idempotent read lock can support clustering if the idempotent repository supports clustering such as Hazelcast Component or Infinispan. | | String | **readLockCheckInterval** (lock) | Interval in millis for the read-lock if supported by the read lock. This interval is used for sleeping between attempts to acquire the read lock. For example when using the changed read lock you can set a higher interval period to cater for slow writes. The default of 1 sec. may be too fast if the producer is very slow writing the file. Notice: For FTP the default readLockCheckInterval is 5000. The readLockTimeout value must be higher than readLockCheckInterval but a rule of thumb is to have a timeout that is at least 2 or more times higher than the readLockCheckInterval. This is needed to ensure that amble time is allowed for the read lock process to try to grab the lock before the timeout was hit. | 1000 | long | **readLockDeleteOrphanLock Files** (lock) | Whether or not read lock with marker files should upon startup delete any orphan read lock files which may have been left on the file system if Camel was not properly shutdown (such as a JVM crash). If turning this option to false then any orphaned lock file will cause Camel to not attempt to pickup that file this
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 70202a04c -> 7b921b077 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b921b07 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b921b07 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b921b07 Branch: refs/heads/master Commit: 7b921b077bb35867d6afc2842bad777e5bf3d8f9 Parents: 70202a0 Author: Claus IbsenAuthored: Wed Jul 26 09:38:12 2017 +0200 Committer: Claus Ibsen Committed: Wed Jul 26 09:38:12 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-bom/pom.xml | 5 + .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ++ 2 files changed, 15 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7b921b07/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml -- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml index 5a03913..896cf40 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml @@ -272,6 +272,11 @@ org.apache.camel +camel-crypto-cms-starter +${project.version} + + +org.apache.camel camel-crypto-starter ${project.version} http://git-wip-us.apache.org/repos/asf/camel/blob/7b921b07/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 86ce1b2..01f97f1 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 @@ -690,6 +690,16 @@ org.apache.camel +camel-crypto-cms +${project.version} + + +org.apache.camel +camel-crypto-cms-starter +${project.version} + + +org.apache.camel camel-crypto-starter ${project.version}
[1/2] camel git commit: Regen and add new component to release kit
Repository: camel Updated Branches: refs/heads/master 3ee4c0822 -> 77ac1293d Regen and add new component to release kit Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/21ece1b8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/21ece1b8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/21ece1b8 Branch: refs/heads/master Commit: 21ece1b88dca3dc171aa68edc2006a85ea41092a Parents: 3ee4c08 Author: Claus IbsenAuthored: Tue Jul 25 11:29:27 2017 +0200 Committer: Claus Ibsen Committed: Tue Jul 25 11:29:27 2017 +0200 -- apache-camel/pom.xml| 9 + .../src/main/descriptors/common-bin.xml | 2 + apache-camel/src/main/release/README.txt| 1 + components/readme.adoc | 5 +- docs/user-manual/en/SUMMARY.md | 1 + parent/pom.xml | 10 + .../camel-crypto-cms-starter/pom.xml| 68 +- .../CryptoCmsComponentAutoConfiguration.java| 222 +++ .../CryptoCmsComponentConfiguration.java| 130 ++-- .../spring-boot/components-starter/pom.xml | 648 +-- 10 files changed, 561 insertions(+), 535 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/21ece1b8/apache-camel/pom.xml -- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index 6ea43df..a76d047 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -220,6 +220,10 @@ org.apache.camel + camel-crypto-cms + + + org.apache.camel camel-csv @@ -1313,6 +1317,11 @@ org.apache.camel + camel-crypto-cms-starter + ${project.version} + + + org.apache.camel camel-csv-starter ${project.version} http://git-wip-us.apache.org/repos/asf/camel/blob/21ece1b8/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 c17608e..a79147f 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -68,6 +68,7 @@ org.apache.camel:camel-couchdb org.apache.camel:camel-couchbase org.apache.camel:camel-crypto +org.apache.camel:camel-crypto-cms org.apache.camel:camel-csv org.apache.camel:camel-cxf org.apache.camel:camel-cxf-transport @@ -358,6 +359,7 @@ org.apache.camel:camel-couchdb-starter org.apache.camel:camel-couchbase-starter org.apache.camel:camel-crypto-starter +org.apache.camel:camel-crypto-cms-starter org.apache.camel:camel-csv-starter org.apache.camel:camel-cxf-starter org.apache.camel:camel-cxf-transport-starter http://git-wip-us.apache.org/repos/asf/camel/blob/21ece1b8/apache-camel/src/main/release/README.txt -- diff --git a/apache-camel/src/main/release/README.txt b/apache-camel/src/main/release/README.txt index 843dabf..36ad986 100755 --- a/apache-camel/src/main/release/README.txt +++ b/apache-camel/src/main/release/README.txt @@ -94,6 +94,7 @@ The following provides more details on the included cryptographic software: * camel-ahc can be configured to use https * camel-crypto can be used for secure communications + * camel-crypto-cms can be used for secure communications * camel-cxf can be configured for secure communications * camel-ftp can be configured for secure communications * camel-http can be configured to use https http://git-wip-us.apache.org/repos/asf/camel/blob/21ece1b8/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 32efc98..2a2712c 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^ // components: START -Number of Components: 275 in 189 JAR artifacts (17 deprecated) +Number of Components: 276 in 190 JAR artifacts (17 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -173,6 +173,9 @@ Number of Components: 275 in 189 JAR artifacts (17 deprecated) | link:camel-crypto/src/main/docs/crypto-component.adoc[Crypto (JCE)] (camel-crypto) + `crypto:cryptoOperation:name` | 2.3 | The crypto component is used for signing and verifying exchanges using the Signature Service of the Java Cryptographic Extension (JCE). +|
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 5e875e96f -> fd4b42f78 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd4b42f7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd4b42f7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd4b42f7 Branch: refs/heads/master Commit: fd4b42f78be55a16a8eff5b61905dc8891735190 Parents: 5e875e9 Author: Claus IbsenAuthored: Sun Jul 23 09:35:12 2017 +0200 Committer: Claus Ibsen Committed: Sun Jul 23 09:35:12 2017 +0200 -- .../spring-boot/components-starter/camel-servlet-starter/pom.xml| 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/fd4b42f7/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml -- diff --git a/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml b/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml index d1a9cae..683b772 100644 --- a/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml @@ -50,7 +50,6 @@ javax.servlet-api provided - org.springframework.boot
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 155a58d6b -> 1d1672eda Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1d1672ed Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1d1672ed Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1d1672ed Branch: refs/heads/master Commit: 1d1672eda622157ef1bb5083f8cde12c9f41b9ab Parents: 155a58d Author: Claus IbsenAuthored: Thu Jul 20 17:03:57 2017 +0200 Committer: Claus Ibsen Committed: Thu Jul 20 17:03:57 2017 +0200 -- camel-core/src/main/docs/eips/aggregate-eip.adoc | 2 +- camel-core/src/main/docs/eips/bean-eip.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1d1672ed/camel-core/src/main/docs/eips/aggregate-eip.adoc -- diff --git a/camel-core/src/main/docs/eips/aggregate-eip.adoc b/camel-core/src/main/docs/eips/aggregate-eip.adoc index 5cdbb64..677565e 100644 --- a/camel-core/src/main/docs/eips/aggregate-eip.adoc +++ b/camel-core/src/main/docs/eips/aggregate-eip.adoc @@ -43,7 +43,7 @@ The Aggregate EIP supports 26 options which are listed below: | completionTimeout | Long | Time in millis that an aggregated exchange should be inactive before its complete (timeout). This option can be set as either a fixed value or using an Expression which allows you to evaluate a timeout dynamically - will use Long as result. If both are set Camel will fallback to use the fixed value if the Expression result was null or 0. You cannot use this option together with completionInterval only one of the two can be used. By default the timeout checker runs every second you can use the completionTimeoutCheckerInterval option to configure how frequently to run the checker. The timeout is an approximation and there is no guarantee that the a timeout is triggered exactly after the timeout value. It is not recommended to use very low timeout values or checker intervals. | completionTimeoutCheckerInterval | Long | Interval in millis that is used by the background task that checks for timeouts (org.apache.camel.TimeoutMap). By default the timeout checker runs every second. The timeout is an approximation and there is no guarantee that the a timeout is triggered exactly after the timeout value. It is not recommended to use very low timeout values or checker intervals. | completionFromBatchConsumer | Boolean | Enables the batch completion mode where we aggregate from a org.apache.camel.BatchConsumer and aggregate the total number of exchanges the org.apache.camel.BatchConsumer has reported as total by checking the exchange property link org.apache.camel.ExchangeBATCH_COMPLETE when its complete. -| groupExchanges | Boolean | Enables grouped exchanges so the aggregator will group all aggregated exchanges into a single combined Exchange holding all the aggregated exchanges in a java.util.List. +| groupExchanges | Boolean | *Deprecated* Enables grouped exchanges so the aggregator will group all aggregated exchanges into a single combined Exchange holding all the aggregated exchanges in a java.util.List. | eagerCheckCompletion | Boolean | Use eager completion checking which means that the completionPredicate will use the incoming Exchange. As opposed to without eager completion checking the completionPredicate will use the aggregated Exchange. | ignoreInvalidCorrelationKeys | Boolean | If a correlation key cannot be successfully evaluated it will be ignored by logging a DEBUG and then just ignore the incoming Exchange. | closeCorrelationKeyOnCompletion | Integer | Closes a correlation key when its complete. Any late received exchanges which has a correlation key that has been closed it will be defined and a ClosedCorrelationKeyException is thrown. http://git-wip-us.apache.org/repos/asf/camel/blob/1d1672ed/camel-core/src/main/docs/eips/bean-eip.adoc -- diff --git a/camel-core/src/main/docs/eips/bean-eip.adoc b/camel-core/src/main/docs/eips/bean-eip.adoc index f981cd1..9be102e 100644 --- a/camel-core/src/main/docs/eips/bean-eip.adoc +++ b/camel-core/src/main/docs/eips/bean-eip.adoc @@ -26,7 +26,7 @@ The Bean EIP supports 5 options which are listed below: | method | String | Sets the method name on the bean to use | beanType | String | Sets the Class of the bean | cache | Boolean | Caches the bean lookup to avoid lookup up bean on every usage. -| multiParameterArray | Boolean | Whether the message body is an array type. +| multiParameterArray | Boolean | *Deprecated* Whether the message body is an array type.
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 39299512e -> d32c8bc3c Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d32c8bc3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d32c8bc3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d32c8bc3 Branch: refs/heads/master Commit: d32c8bc3cd1c8be3d26bb8ccf3a4362609bc56cb Parents: 3929951 Author: Claus IbsenAuthored: Tue Jul 18 15:49:53 2017 +0200 Committer: Claus Ibsen Committed: Tue Jul 18 15:49:53 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d32c8bc3/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 b31f02e..5467beb 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 @@ -43,7 +43,7 @@ com.alibaba fastjson -1.2.34 +1.2.35 com.atlassian.jira
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master bc46079f8 -> abd54d4d6 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/abd54d4d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/abd54d4d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/abd54d4d Branch: refs/heads/master Commit: abd54d4d63859c0e9b10ae92bbe9f1d148a2a6e0 Parents: bc46079 Author: Claus IbsenAuthored: Fri Jul 14 09:39:06 2017 +0200 Committer: Claus Ibsen Committed: Fri Jul 14 09:39:06 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/abd54d4d/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 72be6b6..b31f02e 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 @@ -3012,12 +3012,12 @@ org.apache.kafka kafka-clients -0.10.2.1 +0.11.0.0 org.apache.kafka kafka_2.11 -0.10.2.1 +0.11.0.0 org.apache.mina
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 6032163a9 -> 4ab9ff7ec Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ab9ff7e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ab9ff7e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ab9ff7e Branch: refs/heads/master Commit: 4ab9ff7ec6d3226c6aea6eabbc025992b9e57e98 Parents: 6032163 Author: Claus IbsenAuthored: Tue Jul 11 09:30:54 2017 +0200 Committer: Claus Ibsen Committed: Tue Jul 11 09:30:54 2017 +0200 -- components/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4ab9ff7e/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 12e60c2..d2130cf3 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -558,7 +558,7 @@ Number of Components: 275 in 189 JAR artifacts (17 deprecated) `netty4-http:protocol:host:port/path` | 2.14 | Netty HTTP server and client using the Netty 4.x library. | link:camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc[Olingo2] (camel-olingo2) + -`olingo2:apiName/methodName` | | Communicates with OData 2.0 and 3.0 services using Apache Olingo. +`olingo2:apiName/methodName` | 2.14 | Communicates with OData 2.0 services using Apache Olingo. | link:camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc[Olingo4] (camel-olingo4) + `olingo4:apiName/methodName` | 2.19 | Communicates with OData 4.0 services using Apache Olingo OData API.
[7/7] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/78851c0a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/78851c0a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/78851c0a Branch: refs/heads/camel-2.19.x Commit: 78851c0a1c812606f3cad5560f77b4abf8042b52 Parents: 9a136cd Author: Claus IbsenAuthored: Mon Jul 10 22:26:11 2017 +0200 Committer: Claus Ibsen Committed: Mon Jul 10 22:26:46 2017 +0200 -- components/readme.adoc | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/78851c0a/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index b13f816..0495129 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -141,7 +141,7 @@ Number of Components: 238 in 185 JAR artifacts (14 deprecated) `controlbus:command:language` | 2.11 | The controlbus component provides easy management of Camel applications based on the Control Bus EIP pattern. | link:camel-couchbase/src/main/docs/couchbase-component.adoc[Couchbase] (camel-couchbase) + -`couchbase:url` | 2.19 | Represents a Couchbase endpoint that can query Views with a Poll strategy and/or produce various type of operations. +`couchbase:protocol:hostname:port` | 2.19 | Represents a Couchbase endpoint that can query Views with a Poll strategy and/or produce various type of operations. | link:camel-couchdb/src/main/docs/couchdb-component.adoc[CouchDB] (camel-couchdb) + `couchdb:protocol:hostname:port/database` | 2.11 | The couchdb component is used for integrate with CouchDB databases. @@ -294,25 +294,25 @@ Number of Components: 238 in 185 JAR artifacts (14 deprecated) `ibatis:statement` | 1.2 | *deprecated* Performs a query poll insert update or delete in a relational database using Apache iBATIS. | link:camel-ignite/src/main/docs/ignite-cache-component.adoc[Ignite Cache] (camel-ignite) + -`ignite-cache:[cacheName]` | 2.17 | The Ignite Cache endpoint is one of camel-ignite endpoints which allows you to interact with an Ignite Cache. +`ignite-cache:cacheName` | 2.17 | The Ignite Cache endpoint is one of camel-ignite endpoints which allows you to interact with an Ignite Cache. | link:camel-ignite/src/main/docs/ignite-compute-component.adoc[Ignite Compute] (camel-ignite) + -`ignite-compute:[endpointId]` | 2.17 | The Ignite Compute endpoint is one of camel-ignite endpoints which allows you to run compute operations on the cluster by passing in an IgniteCallable an IgniteRunnable an IgniteClosure or collections of them along with their parameters if necessary. +`ignite-compute:endpointId` | 2.17 | The Ignite Compute endpoint is one of camel-ignite endpoints which allows you to run compute operations on the cluster by passing in an IgniteCallable an IgniteRunnable an IgniteClosure or collections of them along with their parameters if necessary. | link:camel-ignite/src/main/docs/ignite-events-component.adoc[Ignite Events] (camel-ignite) + -`ignite-events:[endpointId]` | 2.17 | The Ignite Events endpoint is one of camel-ignite endpoints which allows you to receive events from the Ignite cluster by creating a local event listener. +`ignite-events:endpointId` | 2.17 | The Ignite Events endpoint is one of camel-ignite endpoints which allows you to receive events from the Ignite cluster by creating a local event listener. | link:camel-ignite/src/main/docs/ignite-idgen-component.adoc[Ignite ID Generator] (camel-ignite) + -`ignite-idgen:[name]` | 2.17 | The Ignite ID Generator endpoint is one of camel-ignite endpoints which allows you to interact with Ignite Atomic Sequences and ID Generators. +`ignite-idgen:name` | 2.17 | The Ignite ID Generator endpoint is one of camel-ignite endpoints which allows you to interact with Ignite Atomic Sequences and ID Generators. | link:camel-ignite/src/main/docs/ignite-messaging-component.adoc[Ignite Messaging] (camel-ignite) + -`ignite-messaging:[topic]` | 2.17 | The Ignite Messaging endpoint is one of camel-ignite endpoints which allows you to send and consume messages from an Ignite topic. +`ignite-messaging:topic` | 2.17 | The Ignite Messaging endpoint is one of camel-ignite endpoints which allows you to send and consume messages from an Ignite topic. | link:camel-ignite/src/main/docs/ignite-queue-component.adoc[Ignite Queues] (camel-ignite) + -`ignite-queue:[name]` | 2.17 | The Ignite Queue endpoint is one of camel-ignite endpoints which allows you to interact with Ignite Queue data structures. +`ignite-queue:name` | 2.17 | The Ignite Queue endpoint is one of camel-ignite endpoints which allows you to interact with
[4/7] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/34a05442 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/34a05442 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/34a05442 Branch: refs/heads/master Commit: 34a0544269397446492332c26eba1034e0eb5df8 Parents: 48b7188 Author: Claus IbsenAuthored: Mon Jul 10 22:26:11 2017 +0200 Committer: Claus Ibsen Committed: Mon Jul 10 22:26:11 2017 +0200 -- components/readme.adoc | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/34a05442/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 20ba98d..12e60c2 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -165,7 +165,7 @@ Number of Components: 275 in 189 JAR artifacts (17 deprecated) `controlbus:command:language` | 2.11 | The controlbus component provides easy management of Camel applications based on the Control Bus EIP pattern. | link:camel-couchbase/src/main/docs/couchbase-component.adoc[Couchbase] (camel-couchbase) + -`couchbase:url` | 2.19 | Represents a Couchbase endpoint that can query Views with a Poll strategy and/or produce various type of operations. +`couchbase:protocol:hostname:port` | 2.19 | Represents a Couchbase endpoint that can query Views with a Poll strategy and/or produce various type of operations. | link:camel-couchdb/src/main/docs/couchdb-component.adoc[CouchDB] (camel-couchdb) + `couchdb:protocol:hostname:port/database` | 2.11 | The couchdb component is used for integrate with CouchDB databases. @@ -348,25 +348,25 @@ Number of Components: 275 in 189 JAR artifacts (17 deprecated) `ibatis:statement` | 1.2 | *deprecated* Performs a query poll insert update or delete in a relational database using Apache iBATIS. | link:camel-ignite/src/main/docs/ignite-cache-component.adoc[Ignite Cache] (camel-ignite) + -`ignite-cache:[cacheName]` | 2.17 | The Ignite Cache endpoint is one of camel-ignite endpoints which allows you to interact with an Ignite Cache. +`ignite-cache:cacheName` | 2.17 | The Ignite Cache endpoint is one of camel-ignite endpoints which allows you to interact with an Ignite Cache. | link:camel-ignite/src/main/docs/ignite-compute-component.adoc[Ignite Compute] (camel-ignite) + -`ignite-compute:[endpointId]` | 2.17 | The Ignite Compute endpoint is one of camel-ignite endpoints which allows you to run compute operations on the cluster by passing in an IgniteCallable an IgniteRunnable an IgniteClosure or collections of them along with their parameters if necessary. +`ignite-compute:endpointId` | 2.17 | The Ignite Compute endpoint is one of camel-ignite endpoints which allows you to run compute operations on the cluster by passing in an IgniteCallable an IgniteRunnable an IgniteClosure or collections of them along with their parameters if necessary. | link:camel-ignite/src/main/docs/ignite-events-component.adoc[Ignite Events] (camel-ignite) + -`ignite-events:[endpointId]` | 2.17 | The Ignite Events endpoint is one of camel-ignite endpoints which allows you to receive events from the Ignite cluster by creating a local event listener. +`ignite-events:endpointId` | 2.17 | The Ignite Events endpoint is one of camel-ignite endpoints which allows you to receive events from the Ignite cluster by creating a local event listener. | link:camel-ignite/src/main/docs/ignite-idgen-component.adoc[Ignite ID Generator] (camel-ignite) + -`ignite-idgen:[name]` | 2.17 | The Ignite ID Generator endpoint is one of camel-ignite endpoints which allows you to interact with Ignite Atomic Sequences and ID Generators. +`ignite-idgen:name` | 2.17 | The Ignite ID Generator endpoint is one of camel-ignite endpoints which allows you to interact with Ignite Atomic Sequences and ID Generators. | link:camel-ignite/src/main/docs/ignite-messaging-component.adoc[Ignite Messaging] (camel-ignite) + -`ignite-messaging:[topic]` | 2.17 | The Ignite Messaging endpoint is one of camel-ignite endpoints which allows you to send and consume messages from an Ignite topic. +`ignite-messaging:topic` | 2.17 | The Ignite Messaging endpoint is one of camel-ignite endpoints which allows you to send and consume messages from an Ignite topic. | link:camel-ignite/src/main/docs/ignite-queue-component.adoc[Ignite Queues] (camel-ignite) + -`ignite-queue:[name]` | 2.17 | The Ignite Queue endpoint is one of camel-ignite endpoints which allows you to interact with Ignite Queue data structures. +`ignite-queue:name` | 2.17 | The Ignite Queue endpoint is one of camel-ignite endpoints which allows you to interact with Ignite
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 8bba41405 -> 673488c13 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/673488c1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/673488c1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/673488c1 Branch: refs/heads/master Commit: 673488c13a2611450445a7037808cca103bcbbb4 Parents: 8bba414 Author: Claus IbsenAuthored: Mon Jul 10 19:48:06 2017 +0200 Committer: Claus Ibsen Committed: Mon Jul 10 19:48:06 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/673488c1/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 43e9218..72be6b6 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 @@ -124,7 +124,7 @@ com.thoughtworks.xstream xstream -1.4.9 +1.4.10 commons-httpclient
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master ca2ae1396 -> 47f8aafde Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/47f8aafd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/47f8aafd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/47f8aafd Branch: refs/heads/master Commit: 47f8aafded47cef6954e9aa44ed713e7ba9860b3 Parents: ca2ae13 Author: Claus IbsenAuthored: Sat Jul 8 09:38:42 2017 +0200 Committer: Claus Ibsen Committed: Sat Jul 8 09:38:42 2017 +0200 -- .../camel-spring-boot-dependencies/pom.xml | 38 ++-- 1 file changed, 19 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/47f8aafd/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 a690041..43e9218 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 @@ -2867,97 +2867,97 @@ org.apache.cxf.services.sts cxf-services-sts-core -3.1.11 +3.1.12 org.apache.cxf.services.ws-discovery cxf-services-ws-discovery-api -3.1.11 +3.1.12 org.apache.cxf cxf-core -3.1.11 +3.1.12 org.apache.cxf cxf-rt-bindings-soap -3.1.11 +3.1.12 org.apache.cxf cxf-rt-bindings-xml -3.1.11 +3.1.12 org.apache.cxf cxf-rt-databinding-jaxb -3.1.11 +3.1.12 org.apache.cxf cxf-rt-frontend-jaxrs -3.1.11 +3.1.12 org.apache.cxf cxf-rt-frontend-jaxws -3.1.11 +3.1.12 org.apache.cxf cxf-rt-frontend-simple -3.1.11 +3.1.12 org.apache.cxf cxf-rt-management -3.1.11 +3.1.12 org.apache.cxf cxf-rt-transports-http -3.1.11 +3.1.12 org.apache.cxf cxf-rt-transports-jms -3.1.11 +3.1.12 org.apache.cxf cxf-rt-transports-local -3.1.11 +3.1.12 org.apache.cxf cxf-rt-ws-addr -3.1.11 +3.1.12 org.apache.cxf cxf-rt-ws-mex -3.1.11 +3.1.12 org.apache.cxf cxf-rt-ws-policy -3.1.11 +3.1.12 org.apache.cxf cxf-rt-ws-rm -3.1.11 +3.1.12 org.apache.cxf cxf-rt-ws-security -3.1.11 +3.1.12 org.apache.cxf cxf-rt-wsdl -3.1.11 +3.1.12 org.apache.ftpserver
[8/8] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/763c9e02 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/763c9e02 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/763c9e02 Branch: refs/heads/master Commit: 763c9e0210e879668eab021dc926f0da4222b171 Parents: fe1780c Author: Claus IbsenAuthored: Wed Jul 5 09:28:15 2017 +0200 Committer: Claus Ibsen Committed: Wed Jul 5 09:28:23 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/763c9e02/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 5ee9538..c435edf 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 @@ -43,7 +43,7 @@ com.alibaba fastjson -1.2.33 +1.2.34 com.atlassian.jira
[2/2] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/53164066 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/53164066 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/53164066 Branch: refs/heads/camel-2.18.x Commit: 53164066b7e52772f83ee91fbda3b8aa1c642d2a Parents: 7691cbd Author: Andrea CosentinoAuthored: Wed Jun 28 10:02:14 2017 +0200 Committer: Andrea Cosentino Committed: Wed Jun 28 10:02:14 2017 +0200 -- components/camel-sql/src/main/docs/sql-stored-component.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/53164066/components/camel-sql/src/main/docs/sql-stored-component.adoc -- diff --git a/components/camel-sql/src/main/docs/sql-stored-component.adoc b/components/camel-sql/src/main/docs/sql-stored-component.adoc index b49bcc3..94785bc 100644 --- a/components/camel-sql/src/main/docs/sql-stored-component.adoc +++ b/components/camel-sql/src/main/docs/sql-stored-component.adoc @@ -86,7 +86,7 @@ The SQL StoredProcedure component supports 1 options which are listed below. // endpoint options: START -The SQL StoredProcedure component supports 7 endpoint options which are listed below: +The SQL StoredProcedure component supports 8 endpoint options which are listed below: {% raw %} [width="100%",cols="2,1,1m,1m,5",options="header"] @@ -95,7 +95,7 @@ The SQL StoredProcedure component supports 7 endpoint options which are listed b | template | producer | | String | *Required* Sets the StoredProcedure template to perform | batch | producer | false | boolean | Enables or disables batch mode | dataSource | producer | | DataSource | Sets the DataSource to use to communicate with the database. -| function | producer | false | boolean | *Available as of Camel 2.18* Whether this call is for a function. +| function | producer | false | boolean | Whether this call is for a function. | noop | producer | false | boolean | If set will ignore the results of the template and use the existing IN message as the OUT message for the continuation of processing | outputHeader | producer | | String | Store the template result in a header instead of the message body. By default outputHeader == null and the template result is stored in the message body any existing content in the message body is discarded. If outputHeader is set the value is used as the name of the header to store the template result and the original message body is preserved. | useMessageBodyForTemplate | producer | false | boolean | Whether to use the message body as the template and then headers for parameters. If this option is enabled then the template in the uri is not used.
[1/2] camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 61ad97f02 -> 203498197 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20349819 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20349819 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20349819 Branch: refs/heads/master Commit: 203498197858f8919f7da95a7931a26fef5f9c86 Parents: 14a7cb8 Author: Andrea CosentinoAuthored: Wed Jun 28 09:50:42 2017 +0200 Committer: Andrea Cosentino Committed: Wed Jun 28 09:51:31 2017 +0200 -- components/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/20349819/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index a7005c3..20ba98d 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -288,7 +288,7 @@ Number of Components: 275 in 189 JAR artifacts (17 deprecated) `grape:defaultCoordinates` | 2.16 | Grape component allows you to fetch, load and manage additional jars when CamelContext is running. | link:camel-grpc/src/main/docs/grpc-component.adoc[gRPC] (camel-grpc) + -`grpc:service` | 2.19 | The gRPC component allows to call and expose remote procedures via HTTP/2 with protobuf dataformat +`grpc:host:port/service` | 2.19 | The gRPC component allows to call and expose remote procedures via HTTP/2 with protobuf dataformat | link:camel-guava-eventbus/src/main/docs/guava-eventbus-component.adoc[Guava EventBus] (camel-guava-eventbus) + `guava-eventbus:eventBusRef` | 2.10 | The guava-eventbus component provides integration bridge between Camel and Google Guava EventBus.
[2/4] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/710e9b30 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/710e9b30 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/710e9b30 Branch: refs/heads/master Commit: 710e9b300e3e6418ae96004dc9c4d711a72ba898 Parents: cf6e351 Author: Claus IbsenAuthored: Sat Jun 24 09:39:32 2017 +0200 Committer: Claus Ibsen Committed: Sat Jun 24 09:39:32 2017 +0200 -- components/readme.adoc | 5 - docs/user-manual/en/SUMMARY.md | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/710e9b30/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index edb2e72..a7005c3 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^ // components: START -Number of Components: 274 in 188 JAR artifacts (17 deprecated) +Number of Components: 275 in 189 JAR artifacts (17 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -761,6 +761,9 @@ Number of Components: 274 in 188 JAR artifacts (17 deprecated) | link:../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 + | link:camel-tika/src/main/docs/tika-component.adoc[Tika] (camel-tika) + `tika:operation` | 2.19 | This component integrates with Apache Tika to extract content and metadata from thousands of file types. http://git-wip-us.apache.org/repos/asf/camel/blob/710e9b30/docs/user-manual/en/SUMMARY.md -- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 0470809..39447fc 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -354,6 +354,7 @@ * [Stream](stream-component.adoc) * [String Template](string-template-component.adoc) * [Telegram](telegram-component.adoc) + * [Thrift](thrift-component.adoc) * [Tika](tika-component.adoc) * [Twilio](twilio-component.adoc) * [Twitter](twitter-component.adoc)
[6/7] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e516bf44 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e516bf44 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e516bf44 Branch: refs/heads/master Commit: e516bf446618dc7894fb8a4a7ff8040912f6d877 Parents: aa2a738 Author: Claus IbsenAuthored: Thu Jun 22 10:15:36 2017 +0200 Committer: Claus Ibsen Committed: Thu Jun 22 10:27:34 2017 +0200 -- components/readme.adoc | 17 - docs/user-manual/en/SUMMARY.md | 5 + 2 files changed, 21 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e516bf44/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 1ad0d35..4acb59e 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^ // components: START -Number of Components: 269 in 188 JAR artifacts (17 deprecated) +Number of Components: 274 in 188 JAR artifacts (17 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -41,6 +41,21 @@ Number of Components: 269 in 188 JAR artifacts (17 deprecated) | link:camel-atomix/src/main/docs/atomix-map-component.adoc[Atomix Map] (camel-atomix) + `atomix-map:mapName` | 2.20 | Camel Atomix support +| link:camel-atomix/src/main/docs/atomix-messaging-component.adoc[Atomix Messaging] (camel-atomix) + +`atomix-messaging:group` | 2.20 | Camel Atomix support + +| link:camel-atomix/src/main/docs/atomix-multimap-component.adoc[Atomix MultiMap] (camel-atomix) + +`atomix-multimap:multiMapName` | 2.20 | Camel Atomix support + +| link:camel-atomix/src/main/docs/atomix-queue-component.adoc[Atomix Queue] (camel-atomix) + +`atomix-queue:queueName` | 2.20 | Camel Atomix support + +| link:camel-atomix/src/main/docs/atomix-set-component.adoc[Atomix Set] (camel-atomix) + +`atomix-set:setName` | 2.20 | Camel Atomix support + +| link:camel-atomix/src/main/docs/atomix-value-component.adoc[Atomix Value] (camel-atomix) + +`atomix-value:valueName` | 2.20 | Camel Atomix support + | link:camel-avro/src/main/docs/avro-component.adoc[Avro] (camel-avro) + `avro:transport:host:port/messageName` | 2.10 | Working with Apache Avro for data serialization. http://git-wip-us.apache.org/repos/asf/camel/blob/e516bf44/docs/user-manual/en/SUMMARY.md -- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 0282bfe3..0470809 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -135,6 +135,11 @@ * [Atmosphere Websocket](atmosphere-websocket-component.adoc) * [Atom](atom-component.adoc) * [Atomix Map](atomix-map-component.adoc) + * [Atomix Messaging](atomix-messaging-component.adoc) + * [Atomix MultiMap](atomix-multimap-component.adoc) + * [Atomix Queue](atomix-queue-component.adoc) + * [Atomix Set](atomix-set-component.adoc) + * [Atomix Value](atomix-value-component.adoc) * [Avro](avro-component.adoc) * [AWS CloudWatch](aws-cw-component.adoc) * [AWS DynamoDB](aws-ddb-component.adoc)
[2/2] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef5bf63a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef5bf63a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef5bf63a Branch: refs/heads/master Commit: ef5bf63a4fe4b1a8a215323971ccfcea328090ee Parents: a2cdd0a Author: Claus IbsenAuthored: Sat Jun 17 08:08:46 2017 +0200 Committer: Claus Ibsen Committed: Sat Jun 17 08:08:46 2017 +0200 -- components/readme.adoc | 5 - docs/user-manual/en/SUMMARY.md | 1 + .../spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml| 5 + .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ef5bf63a/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 94c4edc..bff56df 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^ // components: START -Number of Components: 266 in 186 JAR artifacts (17 deprecated) +Number of Components: 267 in 187 JAR artifacts (17 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -38,6 +38,9 @@ Number of Components: 266 in 186 JAR artifacts (17 deprecated) | link:camel-atom/src/main/docs/atom-component.adoc[Atom] (camel-atom) + `atom:feedUri` | 1.2 | The atom component is used for consuming Atom RSS feeds. +| link:camel-atomix/src/main/docs/atomix-map-component.adoc[atomix-map] (camel-atomix) + +`atomix-map:mapName` | 2.20 | Camel Atomix support + | link:camel-avro/src/main/docs/avro-component.adoc[Avro] (camel-avro) + `avro:transport:host:port/messageName` | 2.10 | Working with Apache Avro for data serialization. http://git-wip-us.apache.org/repos/asf/camel/blob/ef5bf63a/docs/user-manual/en/SUMMARY.md -- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 2d96fbc..ee9e823 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -134,6 +134,7 @@ * [Atmos](atmos-component.adoc) * [Atmosphere Websocket](atmosphere-websocket-component.adoc) * [Atom](atom-component.adoc) + * [atomix-map](atomix-map-component.adoc) * [Avro](avro-component.adoc) * [AWS CloudWatch](aws-cw-component.adoc) * [AWS DynamoDB](aws-ddb-component.adoc) http://git-wip-us.apache.org/repos/asf/camel/blob/ef5bf63a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml -- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml index 92d0f68..206441a 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml @@ -67,6 +67,11 @@ org.apache.camel +camel-atomix-starter +${project.version} + + +org.apache.camel camel-avro-starter ${project.version} http://git-wip-us.apache.org/repos/asf/camel/blob/ef5bf63a/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 4e21a2a..ec9c11e 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 @@ -299,7 +299,7 @@ org.apache.camel -camel-atomx +camel-atomix ${project.version}
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 4fec295cb -> 23fe5fba0 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/23fe5fba Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/23fe5fba Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/23fe5fba Branch: refs/heads/master Commit: 23fe5fba01278f4782b1bcd121661116d8d588bc Parents: 4fec295 Author: Claus IbsenAuthored: Fri Jun 16 10:54:35 2017 +0200 Committer: Claus Ibsen Committed: Fri Jun 16 10:54:52 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/23fe5fba/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 323eb4c..bbbfa7f 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 @@ -43,7 +43,7 @@ com.alibaba fastjson -1.2.32 +1.2.33 com.atlassian.jira
camel git commit: Regen and CAMEL-11389 add karaf feature for camel-fastjson
Repository: camel Updated Branches: refs/heads/master 32a83ca81 -> cce160b48 Regen and CAMEL-11389 add karaf feature for camel-fastjson Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cce160b4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cce160b4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cce160b4 Branch: refs/heads/master Commit: cce160b48e8a34090e39f1546746b9b58a703e93 Parents: 32a83ca Author: Andrea CosentinoAuthored: Fri Jun 9 11:03:18 2017 +0200 Committer: Andrea Cosentino Committed: Fri Jun 9 11:39:42 2017 +0200 -- .../features/src/main/resources/features.xml| 5 +++ .../camel-spring-boot-bom/pom.xml | 5 +++ .../camel-spring-boot-dependencies/pom.xml | 5 +++ .../camel/itest/karaf/CamelFastjsonTest.java| 33 4 files changed, 48 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/cce160b4/platforms/karaf/features/src/main/resources/features.xml -- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index cc8d144..d7c7064 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -604,6 +604,11 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.facebook4j/${facebook4j-core-bundle-version} mvn:org.apache.camel/camel-facebook/${project.version} + +camel-core +wrap:mvn:com.alibaba/fastjson/${fastjson-version} +mvn:org.apache.camel/camel-fastjson/${project.version} + camel-core mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version} http://git-wip-us.apache.org/repos/asf/camel/blob/cce160b4/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml -- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml index fc23247..92d0f68 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml @@ -357,6 +357,11 @@ org.apache.camel +camel-fastjson-starter +${project.version} + + +org.apache.camel camel-flatpack-starter ${project.version} http://git-wip-us.apache.org/repos/asf/camel/blob/cce160b4/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 c293e6e..323eb4c 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 @@ -881,6 +881,11 @@ org.apache.camel +camel-fastjson-starter +${project.version} + + +org.apache.camel camel-flatpack ${project.version} http://git-wip-us.apache.org/repos/asf/camel/blob/cce160b4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFastjsonTest.java -- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFastjsonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFastjsonTest.java new file mode 100644 index 000..03a7dfc --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFastjsonTest.java @@ -0,0 +1,33 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package
[1/3] camel git commit: Regen. This closes #1743
Repository: camel Updated Branches: refs/heads/master 13193199d -> 26917885e Regen. This closes #1743 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a3b1ccff Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a3b1ccff Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a3b1ccff Branch: refs/heads/master Commit: a3b1ccff5822868e8c78ea310f922ada2252efd5 Parents: 690b46f Author: Claus IbsenAuthored: Fri Jun 9 09:06:47 2017 +0200 Committer: Claus Ibsen Committed: Fri Jun 9 09:14:18 2017 +0200 -- camel-core/readme.adoc | 2 +- components/readme.adoc | 4 +- docs/user-manual/en/SUMMARY.md | 1 + .../camel-fastjson-starter/pom.xml | 53 .../FastjsonDataFormatAutoConfiguration.java| 132 + .../FastjsonDataFormatConfiguration.java| 279 +++ .../src/main/resources/META-INF/LICENSE.txt | 203 ++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../main/resources/META-INF/spring.factories| 19 ++ .../src/main/resources/META-INF/spring.provides | 17 ++ .../spring-boot/components-starter/pom.xml | 1 + .../camel-spring-boot-dependencies/pom.xml | 10 + 12 files changed, 730 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a3b1ccff/camel-core/readme.adoc -- diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc index 6c4554c..93e7b99 100644 --- a/camel-core/readme.adoc +++ b/camel-core/readme.adoc @@ -103,7 +103,7 @@ Data Formats // dataformats: START -Number of Data Formats: 4 in 37 JAR artifacts (0 deprecated) +Number of Data Formats: 4 in 38 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== http://git-wip-us.apache.org/repos/asf/camel/blob/a3b1ccff/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index 8d898dd..94c4edc 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -814,7 +814,7 @@ Data Formats // dataformats: START -Number of Data Formats: 46 in 37 JAR artifacts (0 deprecated) +Number of Data Formats: 47 in 38 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -860,6 +860,8 @@ Number of Data Formats: 46 in 37 JAR artifacts (0 deprecated) | link:camel-jibx/src/main/docs/jibx-dataformat.adoc[JiBX] (camel-jibx) | 2.6 | Camel Jibx support +| link:camel-fastjson/src/main/docs/json-fastjson-dataformat.adoc[JSon Fastjson] (camel-fastjson) | 2.20 | Camel Fastjson support + | link:camel-gson/src/main/docs/json-gson-dataformat.adoc[JSon GSon] (camel-gson) | 2.10 | Camel Gson support | link:camel-jackson/src/main/docs/json-jackson-dataformat.adoc[JSon Jackson] (camel-jackson) | 2.0 | Camel Jackson support http://git-wip-us.apache.org/repos/asf/camel/blob/a3b1ccff/docs/user-manual/en/SUMMARY.md -- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index c97e486..2d96fbc 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -435,6 +435,7 @@ * [Java Object Serialization](serialization-dataformat.adoc) * [JAXB](jaxb-dataformat.adoc) * [JiBX](jibx-dataformat.adoc) + * [JSon Fastjson](json-fastjson-dataformat.adoc) * [JSon GSon](json-gson-dataformat.adoc) * [JSon Jackson](json-jackson-dataformat.adoc) * [JSon Johnzon](json-johnzon-dataformat.adoc) http://git-wip-us.apache.org/repos/asf/camel/blob/a3b1ccff/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml -- diff --git a/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml b/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml new file mode 100644 index 000..1fef9f0 --- /dev/null +++ b/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml @@ -0,0 +1,53 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + 4.0.0 + +org.apache.camel +components-starter +2.20.0-SNAPSHOT + + camel-fastjson-starter + jar + Spring-Boot Starter :: Camel :: Fastjson + Spring-Boot Starter for Camel Fastjson support
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master d164b35f8 -> ddf228d9f Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ddf228d9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ddf228d9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ddf228d9 Branch: refs/heads/master Commit: ddf228d9fbf9e003606930438f0b25f807edc4b7 Parents: d164b35 Author: Claus IbsenAuthored: Thu Jun 8 09:47:58 2017 +0200 Committer: Claus Ibsen Committed: Thu Jun 8 09:47:58 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ddf228d9/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 0987758..b885e76 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 @@ -184,12 +184,12 @@ org.apache.avro avro -1.8.1 +1.8.2 org.apache.avro avro-ipc -1.8.1 +1.8.2 org.apache.avro
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 851afcba5 -> 1ac6d8dfa Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1ac6d8df Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1ac6d8df Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1ac6d8df Branch: refs/heads/master Commit: 1ac6d8dfaa484ddc8cff0269dfded758d360ec35 Parents: 851afcb Author: Claus IbsenAuthored: Wed Jun 7 09:09:41 2017 +0200 Committer: Claus Ibsen Committed: Wed Jun 7 09:09:41 2017 +0200 -- components/readme.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1ac6d8df/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index a14247c..8d898dd 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^ // components: START -Number of Components: 266 in 186 JAR artifacts (16 deprecated) +Number of Components: 266 in 186 JAR artifacts (17 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -411,7 +411,7 @@ Number of Components: 266 in 186 JAR artifacts (16 deprecated) `kestrel:addresses/queue` | 2.6 | *deprecated* The kestrel component allows messages to be sent to (or consumed from) Kestrel brokers. | link:camel-krati/src/main/docs/krati-component.adoc[Krati] (camel-krati) + -`krati:path` | 2.9 | The krati allows the use krati datastores and datasets inside Camel. +`krati:path` | 2.9 | *deprecated* The krati allows the use krati datastores and datasets inside Camel. | link:camel-kubernetes/src/main/docs/kubernetes-component.adoc[Kubernetes] (camel-kubernetes) + `kubernetes:masterUrl` | 2.17 | *deprecated* Use splitted kubernetes components instead of this composite component.
[2/2] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e1c3bf52 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e1c3bf52 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e1c3bf52 Branch: refs/heads/master Commit: e1c3bf52ad286276da7bbce0bdcb3c4e1ffdb927 Parents: 2c13690 Author: Claus IbsenAuthored: Sat Jun 3 09:34:30 2017 +0200 Committer: Claus Ibsen Committed: Sat Jun 3 09:34:30 2017 +0200 -- .../twilio/springboot/TwilioComponentConfiguration.java | 3 ++- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 + 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e1c3bf52/platforms/spring-boot/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConfiguration.java index 4752328..8e4f77e 100644 --- a/platforms/spring-boot/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-twilio-starter/src/main/java/org/apache/camel/component/twilio/springboot/TwilioComponentConfiguration.java @@ -24,7 +24,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; /** - * Represents a Twilio endpoint. + * The Twilio component allows you to interact with the Twilio REST APIs using + * Twilio Java SDK. * * Generated by camel-package-maven-plugin - do not edit this file! */ http://git-wip-us.apache.org/repos/asf/camel/blob/e1c3bf52/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 9687243..0987758 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 @@ -2611,6 +2611,11 @@ org.apache.camel +camel-thrift +${project.version} + + +org.apache.camel camel-tika ${project.version}
[3/3] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7cd23b0a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7cd23b0a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7cd23b0a Branch: refs/heads/master Commit: 7cd23b0a3eeaafa3017a852325512fed71a6dbd7 Parents: 362a894 Author: Claus IbsenAuthored: Fri Jun 2 13:23:37 2017 +0200 Committer: Claus Ibsen Committed: Fri Jun 2 13:23:37 2017 +0200 -- camel-core/readme.adoc | 2 +- components/readme.adoc | 9 +++-- docs/user-manual/en/SUMMARY.md | 1 + .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 5 + 4 files changed, 14 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7cd23b0a/camel-core/readme.adoc -- diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc index f400b7f..6c4554c 100644 --- a/camel-core/readme.adoc +++ b/camel-core/readme.adoc @@ -103,7 +103,7 @@ Data Formats // dataformats: START -Number of Data Formats: 4 in 36 JAR artifacts (0 deprecated) +Number of Data Formats: 4 in 37 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== http://git-wip-us.apache.org/repos/asf/camel/blob/7cd23b0a/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index f38e4ef..2b69cbf 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -2,7 +2,7 @@ Components ^^ // components: START -Number of Components: 265 in 185 JAR artifacts (16 deprecated) +Number of Components: 266 in 186 JAR artifacts (16 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -743,6 +743,9 @@ Number of Components: 265 in 185 JAR artifacts (16 deprecated) | link:../camel-core/src/main/docs/timer-component.adoc[Timer] (camel-core) + `timer:timerName` | 1.0 | The timer component is used for generating message exchanges when a timer fires. +| link:camel-twilio/src/main/docs/twilio-component.adoc[Twilio] (camel-twilio) + +`twilio:apiName/methodName` | 2.20 | Represents a Twilio endpoint. + | link:camel-twitter/src/main/docs/twitter-component.adoc[Twitter] (camel-twitter) + `twitter:kind` | 2.10 | *deprecated* Use twitter-directmessage twitter-search twitter-streaming and twitter-timeline instead of this component. @@ -811,7 +814,7 @@ Data Formats // dataformats: START -Number of Data Formats: 45 in 36 JAR artifacts (0 deprecated) +Number of Data Formats: 46 in 37 JAR artifacts (0 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -883,6 +886,8 @@ Number of Data Formats: 45 in 36 JAR artifacts (0 deprecated) | link:camel-tarfile/src/main/docs/tarfile-dataformat.adoc[Tar File] (camel-tarfile) | 2.16 | Camel Tar file support +| link:camel-thrift/src/main/docs/thrift-dataformat.adoc[Thrift] (camel-thrift) | 2.20 | Camel Apache Thrift data format and RPC support + | link:camel-tagsoup/src/main/docs/tidyMarkup-dataformat.adoc[TidyMarkup] (camel-tagsoup) | 2.0 | Camel TagSoup support | link:camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc[uniVocity CSV] (camel-univocity-parsers) | 2.15 | Camel UniVocity parsers data format support http://git-wip-us.apache.org/repos/asf/camel/blob/7cd23b0a/docs/user-manual/en/SUMMARY.md -- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index b300274..c97e486 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -448,6 +448,7 @@ * [String Encoding](string-dataformat.adoc) * [Syslog](syslog-dataformat.adoc) * [Tar File](tarfile-dataformat.adoc) + * [Thrift](thrift-dataformat.adoc) * [TidyMarkup](tidyMarkup-dataformat.adoc) * [uniVocity CSV](univocity-csv-dataformat.adoc) * [uniVocity Fixed Length](univocity-fixed-dataformat.adoc) http://git-wip-us.apache.org/repos/asf/camel/blob/7cd23b0a/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 69e2860..9687243 100644 ---
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 8f3d9ea4d -> 6c1c81609 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6c1c8160 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6c1c8160 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6c1c8160 Branch: refs/heads/master Commit: 6c1c81609da56e4c97e596db26a833bcf01b4a2a Parents: 8f3d9ea Author: Claus IbsenAuthored: Thu Jun 1 08:57:27 2017 +0200 Committer: Claus Ibsen Committed: Thu Jun 1 08:57:27 2017 +0200 -- .../components-starter/camel-tika-starter/pom.xml| 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/6c1c8160/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml -- diff --git a/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml b/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml index 20d7e71..edf84df 100644 --- a/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml +++ b/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml @@ -38,6 +38,14 @@ org.apache.camel camel-tika ${project.version} + + + + commons-logging + commons-logging + + +
[9/9] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/67962722 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67962722 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67962722 Branch: refs/heads/master Commit: 67962722d3df3344add38303530aa7f4b30be61f Parents: ee2cfe6 Author: Claus IbsenAuthored: Sat May 27 09:28:53 2017 +0200 Committer: Claus Ibsen Committed: Sat May 27 09:28:53 2017 +0200 -- .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/67962722/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 9b591c2..90a884e 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 @@ -61,6 +61,11 @@ 2.8.8 +com.github.dozermapper +dozer-core +6.0.0 + + com.google.code.scriptengines scriptengines-javascript 1.1.1 @@ -157,11 +162,6 @@ 4.2.2 -com.github.dozermapper -dozer-core -6.0.0 - - net.sf.saxon Saxon-HE 9.7.0-18
[2/3] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9bba604c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9bba604c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9bba604c Branch: refs/heads/master Commit: 9bba604c91b2333ccfc6db0c7a0b41a8df54fb32 Parents: 36f66c6 Author: Claus IbsenAuthored: Thu May 25 21:46:53 2017 +0200 Committer: Claus Ibsen Committed: Fri May 26 09:53:17 2017 +0200 -- components/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/9bba604c/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index f2b2930..d267821 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -264,7 +264,7 @@ Number of Components: 252 in 185 JAR artifacts (15 deprecated) `grape:defaultCoordinates` | 2.16 | Grape component allows you to fetch, load and manage additional jars when CamelContext is running. | link:camel-grpc/src/main/docs/grpc-component.adoc[gRPC] (camel-grpc) + -`grpc:service` | 2.19 | The gRPC component is using for calling remote procedures via HTTP/2 +`grpc:service` | 2.19 | The gRPC component allows to call and expose remote procedures via HTTP/2 with protobuf dataformat | link:camel-guava-eventbus/src/main/docs/guava-eventbus-component.adoc[Guava EventBus] (camel-guava-eventbus) + `guava-eventbus:eventBusRef` | 2.10 | The guava-eventbus component provides integration bridge between Camel and Google Guava EventBus.
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 1dfc3109f -> a055cd1ea Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a055cd1e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a055cd1e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a055cd1e Branch: refs/heads/master Commit: a055cd1ea876efb4096139945a48b088d48781ec Parents: 1dfc310 Author: Claus IbsenAuthored: Thu May 25 12:26:26 2017 +0200 Committer: Claus Ibsen Committed: Thu May 25 12:26:37 2017 +0200 -- .../ehcache/springboot/EhcacheComponentConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a055cd1e/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java index 4f7288d..e11b4f1 100644 --- a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java @@ -19,7 +19,7 @@ package org.apache.camel.component.ehcache.springboot; import java.util.Map; import java.util.Set; import javax.annotation.Generated; - +import org.apache.camel.component.ehcache.EhcacheComponent; import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; import org.ehcache.CacheManager; import org.ehcache.config.CacheConfiguration;
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 2994c4384 -> 9a54dcc13 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a54dcc1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a54dcc1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a54dcc1 Branch: refs/heads/master Commit: 9a54dcc131442384c600eb536503395d105e959d Parents: 2994c43 Author: Claus IbsenAuthored: Tue May 23 09:24:36 2017 +0200 Committer: Claus Ibsen Committed: Tue May 23 09:24:36 2017 +0200 -- .../SnakeYAMLDataFormatAutoConfiguration.java | 2 +- .../camel-spring-boot-bom/pom.xml | 10 .../camel-spring-boot-dependencies/pom.xml | 25 3 files changed, 36 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/9a54dcc1/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java index 9c107bb..4c07edd 100644 --- a/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java @@ -129,4 +129,4 @@ public class SnakeYAMLDataFormatAutoConfiguration { } }; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9a54dcc1/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml -- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml index 0df8c43..fc23247 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml @@ -842,6 +842,11 @@ org.apache.camel +camel-olingo4-starter +${project.version} + + +org.apache.camel camel-openshift-starter ${project.version} @@ -912,6 +917,11 @@ org.apache.camel +camel-rest-swagger-starter +${project.version} + + +org.apache.camel camel-restlet-starter ${project.version} http://git-wip-us.apache.org/repos/asf/camel/blob/9a54dcc1/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 a1df619..2f4f225 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 @@ -1876,6 +1876,21 @@ org.apache.camel +camel-olingo4 +${project.version} + + +org.apache.camel +camel-olingo4-api +${project.version} + + +org.apache.camel +camel-olingo4-starter +${project.version} + + +org.apache.camel camel-openshift ${project.version} @@ -2031,6 +2046,16 @@ org.apache.camel +camel-rest-swagger +${project.version} + + +org.apache.camel +camel-rest-swagger-starter +${project.version} + + +org.apache.camel camel-restlet ${project.version}
camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master da27f0dff -> 7af6508d4 Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7af6508d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7af6508d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7af6508d Branch: refs/heads/master Commit: 7af6508d4193f1bfc55a49ffc7f727ea89740f82 Parents: da27f0d Author: Claus IbsenAuthored: Mon May 22 09:32:35 2017 +0200 Committer: Claus Ibsen Committed: Mon May 22 09:32:47 2017 +0200 -- .../ehcache/springboot/EhcacheComponentAutoConfiguration.java | 2 +- .../groovy/springboot/GroovyLanguageAutoConfiguration.java| 2 +- .../http/springboot/NettyHttpComponentAutoConfiguration.java | 2 +- .../springboot/SnakeYAMLDataFormatAutoConfiguration.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7af6508d/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java index 6a84465..9b75f0c 100644 --- a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.Generated; - import org.apache.camel.CamelContext; import org.apache.camel.component.ehcache.EhcacheComponent; import org.apache.camel.spi.ComponentCustomizer; @@ -34,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; http://git-wip-us.apache.org/repos/asf/camel/blob/7af6508d/platforms/spring-boot/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java index a4d0471..7f6869c 100644 --- a/platforms/spring-boot/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.Generated; - import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.language.groovy.GroovyLanguage; @@ -36,6 +35,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; http://git-wip-us.apache.org/repos/asf/camel/blob/7af6508d/platforms/spring-boot/components-starter/camel-netty4-http-starter/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java -- diff
[04/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java index 44f2995..7c8c9c0 100644 --- a/platforms/spring-boot/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.paho.PahoComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(PahoComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +PahoComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, PahoComponentConfiguration.class}) -public class PahoComponentAutoConfiguration extends AllNestedConditions { +public class PahoComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(PahoComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class PahoComponentAutoConfiguration extends AllNestedConditions { @Autowired private PahoComponentConfiguration componentConfiguration; -public PahoComponentAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.component", "camel.component.paho"); } } @Lazy @Bean(name = "paho-component") -@ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(PahoComponent.class) public PahoComponent configurePahoComponent() throws Exception { PahoComponent component = new PahoComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java index d0b50b1..5744d96 100644 --- a/platforms/spring-boot/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.pdf.PdfComponent; import org.apache.camel.spi.ComponentCustomizer;
[14/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java index b31381d..1cacacb 100644 --- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.aws.sdb.SdbComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(SdbComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +SdbComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, SdbComponentConfiguration.class}) -public class SdbComponentAutoConfiguration extends AllNestedConditions { +public class SdbComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(SdbComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class SdbComponentAutoConfiguration extends AllNestedConditions { @Autowired private SdbComponentConfiguration componentConfiguration; -public SdbComponentAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.component", "camel.component.aws-sdb"); } } @Lazy @Bean(name = "aws-sdb-component") -@ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SdbComponent.class) public SdbComponent configureSdbComponent() throws Exception { SdbComponent component = new SdbComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java index 742c777..da9954e 100644 --- a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.aws.ses.SesComponent; import
[13/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java index 66a8cd3..d9b1f9d 100644 --- a/platforms/spring-boot/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java @@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer; import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.DataFormatConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -36,9 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(CastorDataFormatAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +CastorDataFormatAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @EnableConfigurationProperties({DataFormatConfigurationProperties.class, CastorDataFormatConfiguration.class}) -public class CastorDataFormatAutoConfiguration extends AllNestedConditions { +public class CastorDataFormatAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(CastorDataFormatAutoConfiguration.class); @@ -67,31 +67,18 @@ public class CastorDataFormatAutoConfiguration extends AllNestedConditions { @Autowired private CastorDataFormatConfiguration dataformatConfiguration; -public CastorDataFormatAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.dataformat", "camel.dataformat.castor"); } } @Bean(name = "castor-dataformat-factory") -@ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(CastorDataFormat.class) public DataFormatFactory configureCastorDataFormatFactory() throws Exception { return new DataFormatFactory() { +@Override public DataFormat newInstance() { CastorDataFormat dataformat = new CastorDataFormat(); if (CamelContextAware.class http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-chronicle-starter/src/main/java/org/apache/camel/component/chronicle/engine/springboot/ChronicleEngineComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-chronicle-starter/src/main/java/org/apache/camel/component/chronicle/engine/springboot/ChronicleEngineComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-chronicle-starter/src/main/java/org/apache/camel/component/chronicle/engine/springboot/ChronicleEngineComponentAutoConfiguration.java index
[09/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java index e8b433a..a78f345 100644 --- a/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.google.mail.GoogleMailComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(GoogleMailComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +GoogleMailComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, GoogleMailComponentConfiguration.class}) -public class GoogleMailComponentAutoConfiguration extends AllNestedConditions { +public class GoogleMailComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(GoogleMailComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class GoogleMailComponentAutoConfiguration extends AllNestedConditions { @Autowired private GoogleMailComponentConfiguration componentConfiguration; -public GoogleMailComponentAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.component", "camel.component.google-mail"); } } @Lazy @Bean(name = "google-mail-component") -@ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(GoogleMailComponent.class) public GoogleMailComponent configureGoogleMailComponent() throws Exception { GoogleMailComponent component = new GoogleMailComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentAutoConfiguration.java index 6a844de..9467826 100644 ---
[08/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java index db0d9b5..a409983 100644 --- a/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java @@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer; import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.DataFormatConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -36,9 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(HessianDataFormatAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +HessianDataFormatAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @EnableConfigurationProperties({DataFormatConfigurationProperties.class, HessianDataFormatConfiguration.class}) -public class HessianDataFormatAutoConfiguration extends AllNestedConditions { +public class HessianDataFormatAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(HessianDataFormatAutoConfiguration.class); @@ -67,31 +67,18 @@ public class HessianDataFormatAutoConfiguration extends AllNestedConditions { @Autowired private HessianDataFormatConfiguration dataformatConfiguration; -public HessianDataFormatAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.dataformat", "camel.dataformat.hessian"); } } @Bean(name = "hessian-dataformat-factory") -@ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HessianDataFormat.class) public DataFormatFactory configureHessianDataFormatFactory() throws Exception { return new DataFormatFactory() { +@Override public DataFormat newInstance() { HessianDataFormat dataformat = new HessianDataFormat(); if (CamelContextAware.class http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java index 045eb7c..96cf954 100644 ---
[07/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java index bb5b528..0f7f2de 100644 --- a/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java @@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer; import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.DataFormatConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -36,9 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(JaxbDataFormatAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +JaxbDataFormatAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @EnableConfigurationProperties({DataFormatConfigurationProperties.class, JaxbDataFormatConfiguration.class}) -public class JaxbDataFormatAutoConfiguration extends AllNestedConditions { +public class JaxbDataFormatAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(JaxbDataFormatAutoConfiguration.class); @@ -67,30 +67,17 @@ public class JaxbDataFormatAutoConfiguration extends AllNestedConditions { @Autowired private JaxbDataFormatConfiguration dataformatConfiguration; -public JaxbDataFormatAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.dataformat", "camel.dataformat.jaxb"); } } @Bean(name = "jaxb-dataformat-factory") -@ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JaxbDataFormat.class) public DataFormatFactory configureJaxbDataFormatFactory() throws Exception { return new DataFormatFactory() { +@Override public DataFormat newInstance() { JaxbDataFormat dataformat = new JaxbDataFormat(); if (CamelContextAware.class http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-jbpm-starter/src/main/java/org/apache/camel/component/jbpm/springboot/JBPMComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-jbpm-starter/src/main/java/org/apache/camel/component/jbpm/springboot/JBPMComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jbpm-starter/src/main/java/org/apache/camel/component/jbpm/springboot/JBPMComponentAutoConfiguration.java index b9ae50d..6f29dda 100644 ---
[03/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java index 64d1f67..cd18ed7 100644 --- a/platforms/spring-boot/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java @@ -26,16 +26,16 @@ import org.apache.camel.language.xquery.XQueryLanguage; import org.apache.camel.spi.LanguageCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.LanguageConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -48,11 +48,12 @@ import org.springframework.context.annotation.Scope; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(XQueryLanguageAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +XQueryLanguageAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({LanguageConfigurationProperties.class, XQueryLanguageConfiguration.class}) -public class XQueryLanguageAutoConfiguration extends AllNestedConditions { +public class XQueryLanguageAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(XQueryLanguageAutoConfiguration.class); @@ -65,28 +66,14 @@ public class XQueryLanguageAutoConfiguration extends AllNestedConditions { @Autowired private XQueryLanguageConfiguration languageConfiguration; -public XQueryLanguageAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.component", "camel.component.xquery"); } } @Bean(name = "xquery-language") -@Scope("prototype") -@ConditionalOnClass(CamelContext.class) +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @ConditionalOnMissingBean(XQueryLanguage.class) public XQueryLanguage configureXQueryLanguage() throws Exception { XQueryLanguage language = new XQueryLanguage(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java index 3a5b076..5b7831e 100644 ---
[15/16] camel git commit: Regen spring-boot components-starter
Regen spring-boot components-starter Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd54a966 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd54a966 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd54a966 Branch: refs/heads/master Commit: cd54a9665de1f0dddfa343a4d2fbe260769880bf Parents: 545f3f7 Author: lburgazzoliAuthored: Sat May 20 18:37:03 2017 +0200 Committer: lburgazzoli Committed: Sat May 20 18:37:43 2017 +0200 -- .../AhcComponentAutoConfiguration.java | 25 +++-- .../WsComponentAutoConfiguration.java | 25 +++-- .../AMQPComponentAutoConfiguration.java | 25 +++-- .../ApnsComponentAutoConfiguration.java | 25 +++-- .../AsteriskComponentAutoConfiguration.java | 25 +++-- .../AtmosComponentAutoConfiguration.java| 25 +++-- .../WebsocketComponentAutoConfiguration.java| 25 +++-- .../AtomComponentAutoConfiguration.java | 25 +++-- .../AvroComponentAutoConfiguration.java | 25 +++-- .../AvroDataFormatAutoConfiguration.java| 27 +++--- .../CwComponentAutoConfiguration.java | 25 +++-- .../DdbComponentAutoConfiguration.java | 25 +++-- .../DdbStreamComponentAutoConfiguration.java| 25 +++-- .../EC2ComponentAutoConfiguration.java | 25 +++-- ...nesisFirehoseComponentAutoConfiguration.java | 27 +++--- .../KinesisComponentAutoConfiguration.java | 25 +++-- .../S3ComponentAutoConfiguration.java | 25 +++-- .../SdbComponentAutoConfiguration.java | 25 +++-- .../SesComponentAutoConfiguration.java | 25 +++-- .../SnsComponentAutoConfiguration.java | 25 +++-- .../SqsComponentAutoConfiguration.java | 25 +++-- .../SWFComponentAutoConfiguration.java | 25 +++-- .../BlobServiceComponentAutoConfiguration.java | 25 +++-- .../QueueServiceComponentAutoConfiguration.java | 25 +++-- .../BarcodeDataFormatAutoConfiguration.java | 27 +++--- .../Base64DataFormatAutoConfiguration.java | 27 +++--- ...BeanValidatorComponentAutoConfiguration.java | 27 +++--- .../BeanIODataFormatAutoConfiguration.java | 27 +++--- .../BeanstalkComponentAutoConfiguration.java| 25 +++-- .../BindyCsvDataFormatAutoConfiguration.java| 27 +++--- ...yFixedLengthDataFormatAutoConfiguration.java | 29 +++ ...KeyValuePairDataFormatAutoConfiguration.java | 29 +++ .../BonitaComponentAutoConfiguration.java | 25 +++-- .../BoonDataFormatAutoConfiguration.java| 27 +++--- .../BoxComponentAutoConfiguration.java | 25 +++-- .../BraintreeComponentAutoConfiguration.java| 25 +++-- .../CacheComponentAutoConfiguration.java| 25 +++-- .../CassandraComponentAutoConfiguration.java| 25 +++-- .../CastorDataFormatAutoConfiguration.java | 27 +++--- ...ronicleEngineComponentAutoConfiguration.java | 27 +++--- .../ChunkComponentAutoConfiguration.java| 25 +++-- .../CMComponentAutoConfiguration.java | 25 +++-- .../CMISComponentAutoConfiguration.java | 25 +++-- .../CoAPComponentAutoConfiguration.java | 25 +++-- .../CometdComponentAutoConfiguration.java | 25 +++-- .../ConsulComponentAutoConfiguration.java | 25 +++-- ...lifiedContextComponentAutoConfiguration.java | 27 +++--- .../BeanComponentAutoConfiguration.java | 25 +++-- .../ClassComponentAutoConfiguration.java| 25 +++-- .../BindingNameComponentAutoConfiguration.java | 25 +++-- .../BrowseComponentAutoConfiguration.java | 25 +++-- .../ControlBusComponentAutoConfiguration.java | 25 +++-- .../DataFormatComponentAutoConfiguration.java | 25 +++-- .../DataSetComponentAutoConfiguration.java | 25 +++-- .../DirectComponentAutoConfiguration.java | 25 +++-- .../DirectVmComponentAutoConfiguration.java | 25 +++-- .../FileComponentAutoConfiguration.java | 25 +++-- .../LanguageComponentAutoConfiguration.java | 25 +++-- .../LogComponentAutoConfiguration.java | 25 +++-- .../MockComponentAutoConfiguration.java | 25 +++-- .../PropertiesComponentAutoConfiguration.java | 25 +++-- .../RefComponentAutoConfiguration.java | 25 +++-- .../RestApiComponentAutoConfiguration.java | 25 +++-- .../RestComponentAutoConfiguration.java | 25 +++-- .../SchedulerComponentAutoConfiguration.java| 25 +++-- .../SedaComponentAutoConfiguration.java | 25 +++-- .../StubComponentAutoConfiguration.java | 25 +++-- .../TestComponentAutoConfiguration.java | 25
[06/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java index a591369..84112b2 100644 --- a/platforms/spring-boot/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.kestrel.KestrelComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(KestrelComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +KestrelComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, KestrelComponentConfiguration.class}) -public class KestrelComponentAutoConfiguration extends AllNestedConditions { +public class KestrelComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(KestrelComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class KestrelComponentAutoConfiguration extends AllNestedConditions { @Autowired private KestrelComponentConfiguration componentConfiguration; -public KestrelComponentAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.component", "camel.component.kestrel"); } } @Lazy @Bean(name = "kestrel-component") -@ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(KestrelComponent.class) public KestrelComponent configureKestrelComponent() throws Exception { KestrelComponent component = new KestrelComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-krati-starter/src/main/java/org/apache/camel/component/krati/springboot/KratiComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-krati-starter/src/main/java/org/apache/camel/component/krati/springboot/KratiComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-krati-starter/src/main/java/org/apache/camel/component/krati/springboot/KratiComponentAutoConfiguration.java index b394541..703d8c7 100644 --- a/platforms/spring-boot/components-starter/camel-krati-starter/src/main/java/org/apache/camel/component/krati/springboot/KratiComponentAutoConfiguration.java +++
[12/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java index 11d8b9f..0867c37 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.properties.PropertiesComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(PropertiesComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +PropertiesComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, PropertiesComponentConfiguration.class}) -public class PropertiesComponentAutoConfiguration extends AllNestedConditions { +public class PropertiesComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(PropertiesComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class PropertiesComponentAutoConfiguration extends AllNestedConditions { @Autowired private PropertiesComponentConfiguration componentConfiguration; -public PropertiesComponentAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.component", "camel.component.properties"); } } @Lazy @Bean(name = "properties-component") -@ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(PropertiesComponent.class) public PropertiesComponent configurePropertiesComponent() throws Exception { PropertiesComponent component = new PropertiesComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java index 4add425..8e1e763 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java +++
[11/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java index d0fbc8e..9f46faf 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java @@ -26,16 +26,16 @@ import org.apache.camel.language.simple.SimpleLanguage; import org.apache.camel.spi.LanguageCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.LanguageConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -48,11 +48,12 @@ import org.springframework.context.annotation.Scope; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(SimpleLanguageAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +SimpleLanguageAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({LanguageConfigurationProperties.class, SimpleLanguageConfiguration.class}) -public class SimpleLanguageAutoConfiguration extends AllNestedConditions { +public class SimpleLanguageAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(SimpleLanguageAutoConfiguration.class); @@ -65,28 +66,14 @@ public class SimpleLanguageAutoConfiguration extends AllNestedConditions { @Autowired private SimpleLanguageConfiguration languageConfiguration; -public SimpleLanguageAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.component", "camel.component.simple"); } } @Bean(name = "simple-language") -@Scope("prototype") -@ConditionalOnClass(CamelContext.class) +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @ConditionalOnMissingBean(SimpleLanguage.class) public SimpleLanguage configureSimpleLanguage() throws Exception { SimpleLanguage language = new SimpleLanguage(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java index 0a38257..bea928e 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java +++
[01/16] camel git commit: Regen spring-boot components-starter
Repository: camel Updated Branches: refs/heads/master c3d7668ca -> cd54a9665 http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java index 9d66cd3..95c5064 100644 --- a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java @@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer; import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.DataFormatConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -36,9 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -50,13 +49,12 @@ import org.springframework.context.annotation.Configuration; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(UniVocityFixedWidthDataFormatAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +UniVocityFixedWidthDataFormatAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(name = "org.apache.camel.spring.boot.CamelAutoConfiguration") @EnableConfigurationProperties({DataFormatConfigurationProperties.class, UniVocityFixedWidthDataFormatConfiguration.class}) -public class UniVocityFixedWidthDataFormatAutoConfiguration -extends -AllNestedConditions { +public class UniVocityFixedWidthDataFormatAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(UniVocityFixedWidthDataFormatAutoConfiguration.class); @@ -69,31 +67,18 @@ public class UniVocityFixedWidthDataFormatAutoConfiguration @Autowired private UniVocityFixedWidthDataFormatConfiguration dataformatConfiguration; -public UniVocityFixedWidthDataFormatAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.dataformat", "camel.dataformat.univocity-fixed"); } } @Bean(name = "univocity-fixed-dataformat-factory") -@ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(UniVocityFixedWidthDataFormat.class) public DataFormatFactory configureUniVocityFixedWidthDataFormatFactory() throws Exception { return new DataFormatFactory() { +@Override public DataFormat newInstance() { UniVocityFixedWidthDataFormat dataformat = new UniVocityFixedWidthDataFormat(); if (CamelContextAware.class http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java
[05/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java index e43763a..29124e8 100644 --- a/platforms/spring-boot/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java @@ -26,16 +26,16 @@ import org.apache.camel.language.mvel.MvelLanguage; import org.apache.camel.spi.LanguageCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.LanguageConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -48,11 +48,12 @@ import org.springframework.context.annotation.Scope; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(MvelLanguageAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +MvelLanguageAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({LanguageConfigurationProperties.class, MvelLanguageConfiguration.class}) -public class MvelLanguageAutoConfiguration extends AllNestedConditions { +public class MvelLanguageAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(MvelLanguageAutoConfiguration.class); @@ -65,28 +66,14 @@ public class MvelLanguageAutoConfiguration extends AllNestedConditions { @Autowired private MvelLanguageConfiguration languageConfiguration; -public MvelLanguageAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.component", "camel.component.mvel"); } } @Bean(name = "mvel-language") -@Scope("prototype") -@ConditionalOnClass(CamelContext.class) +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) @ConditionalOnMissingBean(MvelLanguage.class) public MvelLanguage configureMvelLanguage() throws Exception { MvelLanguage language = new MvelLanguage(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java index a01e0bd..5294480 100644 --- a/platforms/spring-boot/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java +++
[10/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizer.java -- diff --git a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizer.java b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizer.java index 4942169..13cfe54 100644 --- a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizer.java +++ b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizer.java @@ -28,6 +28,7 @@ import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; @@ -41,29 +42,24 @@ import org.springframework.core.annotation.Order; * * 1. globally using: *camel.component.customizer.enable = true/false - * * 2. for component: *camel.component.ehcache.customizer.enabled = true/false - * * 3. individually: *camel.component.ehcache.customizer.cache-manager.enabled = true/false */ @Order(Ordered.LOWEST_PRECEDENCE) @Configuration +@Conditional(CacheManagerCustomizer.NestedConditions.class) @ConditionalOnProperty(name = "camel.component.ehcache.customizer.cache-manager.enabled", matchIfMissing = true) @AutoConfigureAfter(CamelAutoConfiguration.class) @AutoConfigureBefore(EhcacheComponentAutoConfiguration.class) @EnableConfigurationProperties(CacheManagerCustomizerConfiguration.class) -public class CacheManagerCustomizer extends AllNestedConditions implements ComponentCustomizer { +public class CacheManagerCustomizer implements ComponentCustomizer { @Autowired private CacheManager cacheManager; @Autowired private CacheManagerCustomizerConfiguration configuration; -public CacheManagerCustomizer() { -super(ConfigurationPhase.REGISTER_BEAN); -} - @Override public void customize(EhcacheComponent component) { // Set the cache manager only if the customizer is configured to always @@ -75,20 +71,27 @@ public class CacheManagerCustomizer extends AllNestedConditions implements Compo // * // By default ConditionalOnBean works using an OR operation so if you list -// a number of classes, the condition succeeds if a single instance of the -// classes is found. +// a number of classes, the condition succeeds if a single instance of any +// class is found. // // A workaround is to use AllNestedConditions and creates some dummy classes -// annotated @ConditionalOnBean +// annotated with @ConditionalOnBean // // This should be fixed in spring-boot 2.0 where ConditionalOnBean uses and // AND operation instead of the OR as it does today. // * -@ConditionalOnBean(CacheManager.class) -static class OnCacheManager { -} -@ConditionalOnBean(CamelAutoConfiguration.class) -static class OnCamelAutoConfiguration { +static class NestedConditions extends AllNestedConditions { +public NestedConditions() { +super(ConfigurationPhase.REGISTER_BEAN); +} + +@ConditionalOnBean(CacheManager.class) +static class OnCacheManager { +} + +@ConditionalOnBean(CamelAutoConfiguration.class) +static class OnCamelAutoConfiguration { +} } } http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/CacheManagerCustomizerWithoutCacheManagerTest.java -- diff --git a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/CacheManagerCustomizerWithoutCacheManagerTest.java
[02/16] camel git commit: Regen spring-boot components-starter
http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java index b0f6797..b38745e 100644 --- a/platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java @@ -25,6 +25,7 @@ import org.apache.camel.component.springldap.SpringLdapComponent; import org.apache.camel.spi.ComponentCustomizer; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; import org.apache.camel.spring.boot.util.GroupCondition; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; @@ -32,9 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.AllNestedConditions; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy; */ @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo") @Configuration -@Conditional(SpringLdapComponentAutoConfiguration.Condition.class) +@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class, +SpringLdapComponentAutoConfiguration.GroupConditions.class}) @AutoConfigureAfter(CamelAutoConfiguration.class) @EnableConfigurationProperties({ComponentConfigurationProperties.class, SpringLdapComponentConfiguration.class}) -public class SpringLdapComponentAutoConfiguration extends AllNestedConditions { +public class SpringLdapComponentAutoConfiguration { private static final Logger LOGGER = LoggerFactory .getLogger(SpringLdapComponentAutoConfiguration.class); @@ -64,27 +64,14 @@ public class SpringLdapComponentAutoConfiguration extends AllNestedConditions { @Autowired private SpringLdapComponentConfiguration componentConfiguration; -public SpringLdapComponentAutoConfiguration() { -super(ConfigurationPhase.REGISTER_BEAN); -} - -@ConditionalOnBean(CamelContext.class) -public static class OnCamelContext { -} - -@ConditionalOnBean(CamelAutoConfiguration.class) -public static class OnCamelAutoConfiguration { -} - -public static class Condition extends GroupCondition { -public Condition() { +static class GroupConditions extends GroupCondition { +public GroupConditions() { super("camel.component", "camel.component.spring-ldap"); } } @Lazy @Bean(name = "spring-ldap-component") -@ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SpringLdapComponent.class) public SpringLdapComponent configureSpringLdapComponent() throws Exception { SpringLdapComponent component = new SpringLdapComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java index c189510..dfda106 100644 --- a/platforms/spring-boot/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java +++
[1/2] camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master be6a2dce0 -> ae20c877f Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8134d77 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8134d77 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8134d77 Branch: refs/heads/master Commit: a8134d77a919f8211704fb9a06b6a0b0e3f6a1e3 Parents: be6a2dc Author: Claus IbsenAuthored: Fri May 19 18:54:14 2017 +0200 Committer: Claus Ibsen Committed: Fri May 19 18:54:14 2017 +0200 -- components/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a8134d77/components/readme.adoc -- diff --git a/components/readme.adoc b/components/readme.adoc index d3e0644..8c92719 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -956,7 +956,7 @@ Number of Miscellaneous Components: 37 in 37 JAR artifacts (14 deprecated) | link:camel-opentracing/src/main/docs/opentracing.adoc[OpenTracing] (camel-opentracing) | 2.19 | Distributed tracing using OpenTracing -| link:camel-reactor/src/main/docs/reactor.adoc[Reactor] (camel-reactor) | 2.20 | Camel Reactor Component +| link:camel-reactor/src/main/docs/reactor.adoc[Reactor] (camel-reactor) | 2.20 | Reactor based back-end for Camel's reactive streams component | link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18 | Using Netflix Ribbon for client side load balancing
[2/3] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e3c42ab7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3c42ab7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3c42ab7 Branch: refs/heads/master Commit: e3c42ab77af211da3979c880db33072a6e77d7ab Parents: 91a66fc Author: Claus IbsenAuthored: Mon May 15 11:45:37 2017 +0200 Committer: Claus Ibsen Committed: Mon May 15 11:57:09 2017 +0200 -- .../main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 38 .../main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 40 .../main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 48 ++-- ...orceUpsertContactConnectorConfiguration.java | 2 +- .../main/resources/camel-connector-schema.json | 4 +- .../src/main/resources/camel-connector.json | 4 +- .../main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 4 +- .../java/org/foo/MentionAddContractRoute.java | 2 +- .../main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 46 ++- 14 files changed, 101 insertions(+), 97 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json -- diff --git a/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json index 734c9f5..46b9216 100644 --- a/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json @@ -14,7 +14,7 @@ "javaType": "org.foo.connector.BarComponent", "groupId": "org.foo", "artifactId": "bar-connector", -"version": "2.19.0-SNAPSHOT" +"version": "2.20.0-SNAPSHOT" }, "componentProperties": { }, http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/bar-connector/src/main/resources/camel-connector.json -- diff --git a/connectors/examples/bar-connector/src/main/resources/camel-connector.json b/connectors/examples/bar-connector/src/main/resources/camel-connector.json index 4c1acd2..6ded687 100644 --- a/connectors/examples/bar-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/bar-connector/src/main/resources/camel-connector.json @@ -1,22 +1,22 @@ { - "baseScheme": "beverage", - "baseGroupId": "org.foo", - "baseArtifactId": "beverage-component", - "baseVersion": "2.19.0-SNAPSHOT", - "baseJavaType": "org.beverage.BeverageComponent", - "name": "Bar", - "scheme": "bar", - "javaType": "org.foo.connector.BarComponent", - "groupId": "org.foo", - "artifactId": "wine-connector", - "version": "2.19.0-SNAPSHOT", - "description": "To order drinks from the bar", - "labels": [ "bar" ], - "pattern": "To", - "inputDataType": "*", - "outputDataType": "text", - "endpointOptions": [ "drink", "amount", "celebrity" ], - "endpointValues": { -"amount": 2 + "baseScheme" : "beverage", + "baseGroupId" : "org.foo", + "baseArtifactId" : "beverage-component", + "baseVersion" : "2.20.0-SNAPSHOT", + "baseJavaType" : "org.beverage.BeverageComponent", + "name" : "Bar", + "scheme" : "bar", + "javaType" : "org.foo.connector.BarComponent", + "groupId" : "org.foo", + "artifactId" : "wine-connector", + "version" : "2.20.0-SNAPSHOT", + "description" : "To order drinks from the bar", + "labels" : [ "bar" ], + "pattern" : "To", + "inputDataType" : "*", + "outputDataType" : "text", + "endpointOptions" : [ "drink", "amount", "celebrity" ], + "endpointValues" : { +"amount" : 2 } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json -- diff --git a/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json index 6e877bd..416faf6 100644 --- a/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json @@ -14,7 +14,7 @@ "javaType": "org.foo.connector.FooComponent", "groupId": "org.foo",
[2/4] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0aeba63a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0aeba63a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0aeba63a Branch: refs/heads/camel-2.19.x Commit: 0aeba63ac67fe9a5d6843df28f4ab060676bcf56 Parents: c4d99ac Author: Claus IbsenAuthored: Mon May 8 14:11:43 2017 +0200 Committer: Claus Ibsen Committed: Mon May 8 14:23:26 2017 +0200 -- .../template/generated/SSPTParserTokenManager.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/0aeba63a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java -- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java index d93d9ff..ebca5cb 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java @@ -120,7 +120,7 @@ private int jjMoveNfa_0(int startState, int curPos) switch(jjstateSet[--i]) { case 10: - if ((0x3ff609cL & l) != 0L) + if ((0x7ff609cL & l) != 0L) { if (kind > 14) kind = 14; @@ -132,8 +132,6 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 7; jjCheckNAddStates(0, 5); } - else if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 11; else if (curChar == 41) { if (kind > 11) @@ -158,6 +156,8 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 3; jjCheckNAdd(0); } + else if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 11; else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 7; break; @@ -234,7 +234,7 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(6); break; case 8: - if ((0x3ff609dL & l) != 0L) + if ((0x7ff609dL & l) != 0L) jjAddStates(6, 7); break; case 11: @@ -242,7 +242,7 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(12); break; case 12: - if ((0x3ff609cL & l) == 0L) + if ((0x7ff609cL & l) == 0L) break; if (kind > 13) kind = 13; @@ -253,7 +253,7 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 11; break; case 14: - if ((0x3ff609cL & l) == 0L) + if ((0x7ff609cL & l) == 0L) break; if (kind > 14) kind = 14;
[4/4] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1afb5b0a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1afb5b0a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1afb5b0a Branch: refs/heads/camel-2.18.x Commit: 1afb5b0a7fbe9799a93a45c6ca68b232dac8b95d Parents: c63be35 Author: Claus IbsenAuthored: Mon May 8 14:11:43 2017 +0200 Committer: Claus Ibsen Committed: Mon May 8 14:35:00 2017 +0200 -- .../template/generated/SSPTParserTokenManager.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1afb5b0a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java -- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java index d93d9ff..ebca5cb 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java @@ -120,7 +120,7 @@ private int jjMoveNfa_0(int startState, int curPos) switch(jjstateSet[--i]) { case 10: - if ((0x3ff609cL & l) != 0L) + if ((0x7ff609cL & l) != 0L) { if (kind > 14) kind = 14; @@ -132,8 +132,6 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 7; jjCheckNAddStates(0, 5); } - else if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 11; else if (curChar == 41) { if (kind > 11) @@ -158,6 +156,8 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 3; jjCheckNAdd(0); } + else if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 11; else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 7; break; @@ -234,7 +234,7 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(6); break; case 8: - if ((0x3ff609dL & l) != 0L) + if ((0x7ff609dL & l) != 0L) jjAddStates(6, 7); break; case 11: @@ -242,7 +242,7 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(12); break; case 12: - if ((0x3ff609cL & l) == 0L) + if ((0x7ff609cL & l) == 0L) break; if (kind > 13) kind = 13; @@ -253,7 +253,7 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 11; break; case 14: - if ((0x3ff609cL & l) == 0L) + if ((0x7ff609cL & l) == 0L) break; if (kind > 14) kind = 14;
[1/2] camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master 895c47491 -> bcd4577bd Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bcd4577b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bcd4577b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bcd4577b Branch: refs/heads/master Commit: bcd4577bdef15414cb3f0d1279ba0f7de08436dd Parents: 0bb2844 Author: Claus IbsenAuthored: Mon May 8 14:11:43 2017 +0200 Committer: Claus Ibsen Committed: Mon May 8 14:35:26 2017 +0200 -- .../template/generated/SSPTParserTokenManager.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/bcd4577b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java -- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java index d93d9ff..ebca5cb 100644 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/template/generated/SSPTParserTokenManager.java @@ -120,7 +120,7 @@ private int jjMoveNfa_0(int startState, int curPos) switch(jjstateSet[--i]) { case 10: - if ((0x3ff609cL & l) != 0L) + if ((0x7ff609cL & l) != 0L) { if (kind > 14) kind = 14; @@ -132,8 +132,6 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 7; jjCheckNAddStates(0, 5); } - else if (curChar == 58) - jjstateSet[jjnewStateCnt++] = 11; else if (curChar == 41) { if (kind > 11) @@ -158,6 +156,8 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 3; jjCheckNAdd(0); } + else if (curChar == 58) + jjstateSet[jjnewStateCnt++] = 11; else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 7; break; @@ -234,7 +234,7 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(6); break; case 8: - if ((0x3ff609dL & l) != 0L) + if ((0x7ff609dL & l) != 0L) jjAddStates(6, 7); break; case 11: @@ -242,7 +242,7 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(12); break; case 12: - if ((0x3ff609cL & l) == 0L) + if ((0x7ff609cL & l) == 0L) break; if (kind > 13) kind = 13; @@ -253,7 +253,7 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 11; break; case 14: - if ((0x3ff609cL & l) == 0L) + if ((0x7ff609cL & l) == 0L) break; if (kind > 14) kind = 14;
[5/8] camel git commit: Regen
http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java index 72e8091..883e8f2 100644 --- a/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java @@ -80,4 +80,4 @@ public class SftpComponentAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java index acc7e58..3d2fa32 100644 --- a/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java @@ -111,4 +111,4 @@ public class GangliaComponentAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java index 8029349..6f82f77 100644 --- a/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java @@ -239,4 +239,4 @@ public class GangliaComponentConfiguration { this.dmax = dmax; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentAutoConfiguration.java index dae7873..a0291e0 100644 --- a/platforms/spring-boot/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentAutoConfiguration.java @@ -80,4 +80,4 @@ public class GeoCoderComponentAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-git-starter/src/main/java/org/apache/camel/component/git/springboot/GitComponentAutoConfiguration.java
[8/8] camel git commit: Regen
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f59cd084 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f59cd084 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f59cd084 Branch: refs/heads/master Commit: f59cd084a050c82c43ee2e2c26c35a1c88d98b08 Parents: d7da6c9 Author: Andrea CosentinoAuthored: Mon May 8 10:46:43 2017 +0200 Committer: Andrea Cosentino Committed: Mon May 8 10:46:43 2017 +0200 -- .../component/ahc/springboot/AhcComponentAutoConfiguration.java| 2 +- .../camel/component/ahc/springboot/AhcComponentConfiguration.java | 2 +- .../component/ahc/ws/springboot/WsComponentAutoConfiguration.java | 2 +- .../component/ahc/ws/springboot/WsComponentConfiguration.java | 2 +- .../component/amqp/springboot/AMQPComponentAutoConfiguration.java | 2 +- .../component/amqp/springboot/AMQPComponentConfiguration.java | 2 +- .../component/apns/springboot/ApnsComponentAutoConfiguration.java | 2 +- .../component/apns/springboot/ApnsComponentConfiguration.java | 2 +- .../asterisk/springboot/AsteriskComponentAutoConfiguration.java| 2 +- .../atmos/springboot/AtmosComponentAutoConfiguration.java | 2 +- .../websocket/springboot/WebsocketComponentAutoConfiguration.java | 2 +- .../websocket/springboot/WebsocketComponentConfiguration.java | 2 +- .../component/atom/springboot/AtomComponentAutoConfiguration.java | 2 +- .../component/avro/springboot/AvroComponentAutoConfiguration.java | 2 +- .../component/avro/springboot/AvroComponentConfiguration.java | 2 +- .../avro/springboot/AvroDataFormatAutoConfiguration.java | 2 +- .../dataformat/avro/springboot/AvroDataFormatConfiguration.java| 2 +- .../component/aws/cw/springboot/CwComponentAutoConfiguration.java | 2 +- .../aws/ddb/springboot/DdbComponentAutoConfiguration.java | 2 +- .../ddbstream/springboot/DdbStreamComponentAutoConfiguration.java | 2 +- .../aws/ec2/springboot/EC2ComponentAutoConfiguration.java | 2 +- .../springboot/KinesisFirehoseComponentAutoConfiguration.java | 2 +- .../aws/kinesis/springboot/KinesisComponentAutoConfiguration.java | 2 +- .../component/aws/s3/springboot/S3ComponentAutoConfiguration.java | 2 +- .../aws/sdb/springboot/SdbComponentAutoConfiguration.java | 2 +- .../aws/ses/springboot/SesComponentAutoConfiguration.java | 2 +- .../aws/sns/springboot/SnsComponentAutoConfiguration.java | 2 +- .../aws/sqs/springboot/SqsComponentAutoConfiguration.java | 2 +- .../aws/swf/springboot/SWFComponentAutoConfiguration.java | 2 +- .../blob/springboot/BlobServiceComponentAutoConfiguration.java | 2 +- .../queue/springboot/QueueServiceComponentAutoConfiguration.java | 2 +- .../barcode/springboot/BarcodeDataFormatAutoConfiguration.java | 2 +- .../barcode/springboot/BarcodeDataFormatConfiguration.java | 2 +- .../base64/springboot/Base64DataFormatAutoConfiguration.java | 2 +- .../base64/springboot/Base64DataFormatConfiguration.java | 2 +- .../springboot/BeanValidatorComponentAutoConfiguration.java| 2 +- .../beanio/springboot/BeanIODataFormatAutoConfiguration.java | 2 +- .../beanio/springboot/BeanIODataFormatConfiguration.java | 2 +- .../beanstalk/springboot/BeanstalkComponentAutoConfiguration.java | 2 +- .../beanstalk/springboot/BeanstalkComponentConfiguration.java | 2 +- .../bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java | 2 +- .../bindy/csv/springboot/BindyCsvDataFormatConfiguration.java | 2 +- .../springboot/BindyFixedLengthDataFormatAutoConfiguration.java| 2 +- .../fixed/springboot/BindyFixedLengthDataFormatConfiguration.java | 2 +- .../springboot/BindyKeyValuePairDataFormatAutoConfiguration.java | 2 +- .../kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java | 2 +- .../bonita/springboot/BonitaComponentAutoConfiguration.java| 2 +- .../component/boon/springboot/BoonDataFormatAutoConfiguration.java | 2 +- .../component/boon/springboot/BoonDataFormatConfiguration.java | 2 +- .../component/box/springboot/BoxComponentAutoConfiguration.java| 2 +- .../camel/component/box/springboot/BoxComponentConfiguration.java | 2 +- .../braintree/springboot/BraintreeComponentAutoConfiguration.java | 2 +- .../braintree/springboot/BraintreeComponentConfiguration.java | 2 +- .../cache/springboot/CacheComponentAutoConfiguration.java | 2 +- .../component/cache/springboot/CacheComponentConfiguration.java| 2 +- .../cassandra/springboot/CassandraComponentAutoConfiguration.java | 2 +- .../castor/springboot/CastorDataFormatAutoConfiguration.java | 2 +- .../castor/springboot/CastorDataFormatConfiguration.java | 2 +-
[2/8] camel git commit: Regen
http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java index 19d09bd..82cd4cb 100644 --- a/platforms/spring-boot/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-snmp-starter/src/main/java/org/apache/camel/component/snmp/springboot/SnmpComponentAutoConfiguration.java @@ -80,4 +80,4 @@ public class SnmpComponentAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatAutoConfiguration.java index 3e7cf53..6b575e0 100644 --- a/platforms/spring-boot/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatAutoConfiguration.java @@ -109,4 +109,4 @@ public class SoapJaxbDataFormatAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatConfiguration.java index 0d50da5..a1769ac 100644 --- a/platforms/spring-boot/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-soap-starter/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatConfiguration.java @@ -136,4 +136,4 @@ public class SoapJaxbDataFormatConfiguration { public void setContentTypeHeader(Boolean contentTypeHeader) { this.contentTypeHeader = contentTypeHeader; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java index 83685de..1afb281 100644 --- a/platforms/spring-boot/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentAutoConfiguration.java @@ -80,4 +80,4 @@ public class SolrComponentAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-spark-starter/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java -- diff
[7/8] camel git commit: Regen
http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java index b787e5b..0292d8f 100644 --- a/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java @@ -81,4 +81,4 @@ public class BindyFixedLengthDataFormatConfiguration { public void setContentTypeHeader(Boolean contentTypeHeader) { this.contentTypeHeader = contentTypeHeader; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java index 13b26c03..77de985 100644 --- a/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java @@ -109,4 +109,4 @@ public class BindyKeyValuePairDataFormatAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java index 7a857f1..f812e60 100644 --- a/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java @@ -81,4 +81,4 @@ public class BindyKeyValuePairDataFormatConfiguration { public void setContentTypeHeader(Boolean contentTypeHeader) { this.contentTypeHeader = contentTypeHeader; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java index 197282c..8bfa8d8 100644 --- a/platforms/spring-boot/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java @@ -80,4 +80,4 @@ public class BonitaComponentAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +}
[4/8] camel git commit: Regen
http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java -- diff --git a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java index 024e611..c887d25 100644 --- a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java +++ b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java @@ -111,4 +111,4 @@ public class JettyHttpComponentAutoConfiguration9 { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java -- diff --git a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java index a083e51..dc841bb 100644 --- a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java +++ b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java @@ -484,4 +484,4 @@ public class JettyHttpComponentConfiguration9 { Boolean resolvePropertyPlaceholders) { this.resolvePropertyPlaceholders = resolvePropertyPlaceholders; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java index 1cadd05..492439c 100644 --- a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java @@ -111,4 +111,4 @@ public class JGroupsComponentAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentConfiguration.java index 1aa3e4f..0c2e812 100644 --- a/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jgroups-starter/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentConfiguration.java @@ -85,4 +85,4 @@ public class JGroupsComponentConfiguration { Boolean resolvePropertyPlaceholders) { this.resolvePropertyPlaceholders = resolvePropertyPlaceholders; } -} +} \ No newline at end of file
[1/8] camel git commit: Regen
Repository: camel Updated Branches: refs/heads/master d7da6c989 -> f59cd084a http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentConfiguration.java index 6f40891..e81d23f 100644 --- a/platforms/spring-boot/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-zendesk-starter/src/main/java/org/apache/camel/component/zendesk/springboot/ZendeskComponentConfiguration.java @@ -165,4 +165,4 @@ public class ZendeskComponentConfiguration { this.password = password; } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java index fc4b4be..9772e7d 100644 --- a/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java @@ -109,4 +109,4 @@ public class ZipFileDataFormatAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java b/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java index 7e23899..d08996a 100644 --- a/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-zipfile-starter/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java @@ -70,4 +70,4 @@ public class ZipFileDataFormatConfiguration { public void setContentTypeHeader(Boolean contentTypeHeader) { this.contentTypeHeader = contentTypeHeader; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/f59cd084/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentAutoConfiguration.java -- diff --git a/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentAutoConfiguration.java index 65c8ec7..1162a59 100644 --- a/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/src/main/java/org/apache/camel/component/zookeepermaster/springboot/MasterComponentAutoConfiguration.java @@ -110,4 +110,4 @@ public class MasterComponentAutoConfiguration { return resolver.getProperty("enabled", Boolean.class, defaultValue); } } -} +} \ No newline at end of file