This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 22f3cd08dbd2338270e7b50fea9fa8cff163cd7f
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu May 23 09:03:57 2019 +0200
CAMEL-13529 - Fixed PR and regen
---
camel-core/readme.adoc | 6 +++---
components/camel-ahc/src/main/docs/ahc-component.adoc | 2 +-
.../java/org/apache/camel/component/jdbc/JdbcProducer.java | 3 ++-
.../src/main/docs/rest-swagger-component.adoc | 10 +++++-----
components/readme.adoc | 2 +-
docs/components/modules/ROOT/nav.adoc | 8 ++++----
.../src/main/resources/camel-connector-schema.json | 2 +-
.../myfoo-connector/src/main/resources/camel-connector.json | 6 +++---
8 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc
index 25473fc..601cc9a 100644
--- a/camel-core/readme.adoc
+++ b/camel-core/readme.adoc
@@ -106,7 +106,7 @@ Data Formats
// dataformats: START
-Number of Data Formats: 4 in 39 JAR artifacts (3 deprecated)
+Number of Data Formats: 4 in 39 JAR artifacts (5 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -114,9 +114,9 @@ Number of Data Formats: 4 in 39 JAR artifacts (3 deprecated)
| link:src/main/docs/gzip-dataformat.adoc[GZip] (camel-core) | 2.0 | The GZip
data format is a message compression and de-compression format (which works
with the popular gzip/gunzip tools).
-| link:src/main/docs/serialization-dataformat.adoc[Java Object Serialization]
(camel-core) | 2.12 | Serialization is a data format which uses the standard
Java Serialization mechanism to unmarshal a binary payload into Java objects or
to marshal Java objects into a binary blob.
+| link:src/main/docs/serialization-dataformat.adoc[Java Object Serialization]
(camel-core) | 2.12 | *deprecated* Serialization is a data format which uses
the standard Java Serialization mechanism to unmarshal a binary payload into
Java objects or to marshal Java objects into a binary blob.
-| link:src/main/docs/string-dataformat.adoc[String Encoding] (camel-core) |
2.12 | String data format is a textual based format that supports character
encoding.
+| link:src/main/docs/string-dataformat.adoc[String Encoding] (camel-core) |
2.12 | *deprecated* String data format is a textual based format that supports
character encoding.
| link:src/main/docs/zip-dataformat.adoc[Zip Deflate Compression] (camel-core)
| 2.12 | Zip Deflate Compression data format is a message compression and
de-compression format (not zip files).
|===
diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc
b/components/camel-ahc/src/main/docs/ahc-component.adoc
index 64ad05e..0f2759d 100644
--- a/components/camel-ahc/src/main/docs/ahc-component.adoc
+++ b/components/camel-ahc/src/main/docs/ahc-component.adoc
@@ -72,7 +72,7 @@ with the following path and query parameters:
| *bridgeEndpoint* (producer) | If the option is true, then the
Exchange.HTTP_URI header is ignored, and use the endpoint's URI for request.
You may also set the throwExceptionOnFailure to be false to let the AhcProducer
send all the fault response back. | false | boolean
| *bufferSize* (producer) | The initial in-memory buffer size used when
transferring data between Camel and AHC Client. | 4096 | int
| *connectionClose* (producer) | Define if the Connection Close header has to
be added to HTTP Request. This parameter is false by default | false | boolean
-| *cookieHandler* (producer) | Configure a cookie handler to maintain a HTTP
session. If this parameter is defined together with the clientConfig parameter,
make sure that the latter does not contain a cookie handler. | | CookieHandler
+| *cookieHandler* (producer) | Configure a cookie handler to maintain a HTTP
session | | CookieHandler
| *headerFilterStrategy* (producer) | To use a custom HeaderFilterStrategy to
filter header to and from Camel message. | | HeaderFilterStrategy
| *throwExceptionOnFailure* (producer) | Option to disable throwing the
AhcOperationFailedException in case of failed responses from the remote server.
This allows you to get all responses regardless of the HTTP status code. | true
| boolean
| *transferException* (producer) | If enabled and an Exchange failed
processing on the consumer side, and if the caused Exception was send back
serialized in the response as a application/x-java-serialized-object content
type (for example using Jetty or Servlet Camel components). On the producer
side the exception will be deserialized and thrown as is, instead of the
AhcOperationFailedException. The caused exception is required to be serialized.
This is by default turned off. If you enab [...]
diff --git
a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
index bd8243f..6af7937 100644
---
a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
+++
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
@@ -37,6 +37,7 @@ import org.apache.camel.spi.Synchronization;
import org.apache.camel.util.IntrospectionSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.datasource.DataSourceUtils;
/**
* @version
@@ -112,7 +113,7 @@ public class JdbcProducer extends DefaultProducer {
conn = DataSourceUtils.getConnection(dataSource);
shouldCloseResources = createAndExecuteSqlStatement(exchange, sql,
conn);
} finally {
- if (shouldCloseResources &&
!DataSourceUtils.isConnectionTransactional(conn, dataSource) {
+ if (shouldCloseResources &&
!DataSourceUtils.isConnectionTransactional(conn, dataSource)) {
closeQuietly(conn);
}
}
diff --git
a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc
b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc
index 08baabe..636d545 100644
--- a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc
+++ b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc
@@ -149,13 +149,13 @@ The component supports 10 options, which are listed below.
|===
| Name | Description | Default | Type
| *camel.component.rest-swagger.base-path* | API basePath, for example /v2.
Default is unset, if set overrides the value present in Swagger specification.
| | String
-| *camel.component.rest-swagger.component-name* | Name of the Camel component
that will perform the requests. The compnent must be present in Camel registry
and it must implement RestProducerFactory service provider interface. If not
set CLASSPATH is searched for single component that implements
RestProducerFactory SPI. Can be overriden in endpoint configuration. | | String
-| *camel.component.rest-swagger.consumes* | What payload type this component
capable of consuming. Could be one type, like application/json or multiple
types as application/json, application/xml; q=0.5 according to the RFC7231.
This equates to the value of Accept HTTP header. If set overrides any value
found in the Swagger specification. Can be overriden in endpoint configuration
| | String
+| *camel.component.rest-swagger.component-name* | Name of the Camel component
that will perform the requests. The component must be present in Camel registry
and it must implement RestProducerFactory service provider interface. If not
set CLASSPATH is searched for single component that implements
RestProducerFactory SPI. Can be overridden in endpoint configuration. | |
String
+| *camel.component.rest-swagger.consumes* | What payload type this component
capable of consuming. Could be one type, like application/json or multiple
types as application/json, application/xml; q=0.5 according to the RFC7231.
This equates to the value of Accept HTTP header. If set overrides any value
found in the Swagger specification. Can be overridden in endpoint configuration
| | String
| *camel.component.rest-swagger.enabled* | Enable rest-swagger component |
true | Boolean
-| *camel.component.rest-swagger.host* | Scheme hostname and port to direct the
HTTP requests to in the form of https://hostname:port. Can be configured at the
endpoint, component or in the correspoding REST configuration in the Camel
Context. If you give this component a name (e.g. petstore) that REST
configuration is consulted first, rest-swagger next, and global configuration
last. If set overrides any value found in the Swagger specification,
RestConfiguration. Can be overriden in end [...]
-| *camel.component.rest-swagger.produces* | What payload type this component
is producing. For example application/json according to the RFC7231. This
equates to the value of Content-Type HTTP header. If set overrides any value
present in the Swagger specification. Can be overriden in endpoint
configuration. | | String
+| *camel.component.rest-swagger.host* | Scheme hostname and port to direct the
HTTP requests to in the form of https://hostname:port. Can be configured at the
endpoint, component or in the correspoding REST configuration in the Camel
Context. If you give this component a name (e.g. petstore) that REST
configuration is consulted first, rest-swagger next, and global configuration
last. If set overrides any value found in the Swagger specification,
RestConfiguration. Can be overridden in en [...]
+| *camel.component.rest-swagger.produces* | What payload type this component
is producing. For example application/json according to the RFC7231. This
equates to the value of Content-Type HTTP header. If set overrides any value
present in the Swagger specification. Can be overridden in endpoint
configuration. | | String
| *camel.component.rest-swagger.resolve-property-placeholders* | Whether the
component should resolve property placeholders on itself when starting. Only
properties which are of String type can use property placeholders. | true |
Boolean
-| *camel.component.rest-swagger.specification-uri* | Path to the Swagger
specification file. The scheme, host base path are taken from this
specification, but these can be overriden with properties on the component or
endpoint level. If not given the component tries to load swagger.json resource.
Note that the host defined on the component and endpoint of this Component
should contain the scheme, hostname and optionally the port in the URI syntax
(i.e. https://api.example.com:8080). Can [...]
+| *camel.component.rest-swagger.specification-uri* | Path to the Swagger
specification file. The scheme, host base path are taken from this
specification, but these can be overriden with properties on the component or
endpoint level. If not given the component tries to load swagger.json resource.
Note that the host defined on the component and endpoint of this Component
should contain the scheme, hostname and optionally the port in the URI syntax
(i.e. https://api.example.com:8080). Can [...]
| *camel.component.rest-swagger.ssl-context-parameters* | Customize TLS
parameters used by the component. If not set defaults to the TLS parameters set
in the Camel context. The option is a
org.apache.camel.util.jsse.SSLContextParameters type. | | String
| *camel.component.rest-swagger.use-global-ssl-context-parameters* | Enable
usage of global SSL context parameters. | false | Boolean
|===
diff --git a/components/readme.adoc b/components/readme.adoc
index 9f5519d..6ae13d7 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -949,7 +949,7 @@ Data Formats
^^^^^^^^^^^^
// dataformats: START
-Number of Data Formats: 49 in 39 JAR artifacts (3 deprecated)
+Number of Data Formats: 49 in 39 JAR artifacts (5 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index 3fd0770..1cc553e 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -1,21 +1,20 @@
* xref:ahc-component.adoc[AHC Component]
* xref:ahc-ws-component.adoc[AHC Websocket Component]
-* xref:amqp-component.adoc[AMQP Component]
* xref:apns-component.adoc[APNS Component]
+* xref:amqp-component.adoc[AMQP Component]
* xref:asn1-dataformat.adoc[ASN.1 File DataFormat]
* xref:asterisk-component.adoc[Asterisk Component]
* xref:atmos-component.adoc[Atmos Component]
* xref:atmosphere-websocket-component.adoc[Atmosphere Websocket Component]
* xref:atom-component.adoc[Atom Component]
-* xref:avro-component.adoc[Avro Component]
-* xref:avro-dataformat.adoc[Avro DataFormat]
* xref:atomix-map-component.adoc[Atomix Map Component]
* xref:atomix-messaging-component.adoc[Atomix Messaging Component]
* xref:atomix-multimap-component.adoc[Atomix MultiMap Component]
* xref:atomix-queue-component.adoc[Atomix Queue Component]
* xref:atomix-set-component.adoc[Atomix Set Component]
* xref:atomix-value-component.adoc[Atomix Value Component]
-* xref:aws-xray.adoc[AWS XRay Component]
+* xref:avro-component.adoc[Avro Component]
+* xref:avro-dataformat.adoc[Avro DataFormat]
* xref:aws-cw-component.adoc[AWS CloudWatch Component]
* xref:aws-ddb-component.adoc[AWS DynamoDB Component]
* xref:aws-ddbstream-component.adoc[AWS DynamoDB Streams Component]
@@ -33,6 +32,7 @@
* xref:aws-sqs-component.adoc[AWS Simple Queue Service Component]
* xref:aws-swf-component.adoc[AWS Simple Workflow Component]
* xref:aws.adoc[Camel Components for Amazon Web Services]
+* xref:aws-xray.adoc[AWS XRay Component]
* xref:azure-blob-component.adoc[Azure Storage Blob Service Component]
* xref:azure-queue-component.adoc[Azure Storage Queue Service Component]
* xref:azure.adoc[Camel Components for Windows Azure Services]
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 5d40e92..6a1becb 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.24.0-SNAPSHOT"
+ "version":"2.24.1-SNAPSHOT"
},
"componentProperties":{
diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector.json
b/platforms/myfoo-connector/src/main/resources/camel-connector.json
index 0647d81..27f90c1 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.24.0-SNAPSHOT",
+ "baseVersion" : "2.24.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.24.0-SNAPSHOT",
+ "version" : "2.24.1-SNAPSHOT",
"description" : "Something cool",
"labels" : [ "foo", "timer" ],
"pattern" : "From",
@@ -18,4 +18,4 @@
"fixedRate" : true,
"period" : 5000
}
-}
+}
\ No newline at end of file
