This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 56724dd Regen 56724dd is described below commit 56724ddb126bc74804aba2c4cdeaea7c3a1a9c2e Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Dec 18 09:21:38 2018 +0100 Regen --- .../camel-as2-component/src/main/docs/as2-component.adoc | 2 +- components/camel-jetty9/src/main/docs/jetty-component.adoc | 2 +- components/camel-script/src/main/docs/javaScript-language.adoc | 2 ++ docs/components/modules/ROOT/nav.adoc | 8 ++++---- .../salesforce/springboot/SalesforceComponentConfiguration.java | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc index 7ff1595..9e76b5a 100644 --- a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc +++ b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc @@ -127,12 +127,12 @@ The component supports 29 options, which are listed below. | *camel.component.as2.configuration.as2-version* | The version of the AS2 protocol. | 1.1 | String | *camel.component.as2.configuration.client-fqdn* | The Client Fully Qualified Domain Name (FQDN). Used in message ids sent by endpoint. | camel.apache.org | String | *camel.component.as2.configuration.compression-algorithm* | The algorithm used to compress EDI message. | | AS2Compression Algorithm +| *camel.component.as2.configuration.decrypting-private-key* | The key used to encrypt the EDI message. | | PrivateKey | *camel.component.as2.configuration.disposition-notification-to* | The value of the Disposition-Notification-To header. Assigning a value to this parameter requests a message disposition notification (MDN) for the AS2 message. | | String | *camel.component.as2.configuration.edi-message-transfer-encoding* | The transfer encoding of EDI message. | | String | *camel.component.as2.configuration.edi-message-type* | The content type of EDI message. One of application/edifact, application/edi-x12, application/edi-consent | | ContentType | *camel.component.as2.configuration.encrypting-algorithm* | The algorithm used to encrypt EDI message. | | AS2EncryptionAlgorithm | *camel.component.as2.configuration.encrypting-certificate-chain* | The chain of certificates used to encrypt EDI message. | | Certificate[] -| *camel.component.as2.configuration.encrypting-private-key* | The key used to encrypt the EDI message. | | PrivateKey | *camel.component.as2.configuration.from* | The value of the From header of AS2 message. | | String | *camel.component.as2.configuration.method-name* | What sub operation to use for the selected operation | | String | *camel.component.as2.configuration.request-uri* | The request URI of EDI message. | / | String diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc b/components/camel-jetty9/src/main/docs/jetty-component.adoc index 4afa137..e0e9cb5 100644 --- a/components/camel-jetty9/src/main/docs/jetty-component.adoc +++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc @@ -218,7 +218,7 @@ The component supports 34 options, which are listed below. | *camel.component.jetty.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.jetty.response-buffer-size* | Allows to configure a custom value of the response buffer size on the Jetty connectors. | | Integer | *camel.component.jetty.response-header-size* | Allows to configure a custom value of the response header size on the Jetty connectors. | | Integer -| *camel.component.jetty.send-server-version* | If the option is true, jetty server will send the date header to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port, otherwise this option may not work as expected. | true | Boolean +| *camel.component.jetty.send-server-version* | If the option is true, jetty will send the server header with the jetty version information to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port, otherwise this option may not work as expected. | true | Boolean | *camel.component.jetty.socket-connector-properties* | A map which contains general HTTP connector properties. Uses the same principle as sslSocketConnectorProperties. The option is a java.util.Map<java.lang.String,java.lang.Object> type. | | String | *camel.component.jetty.socket-connectors* | A map which contains per port number specific HTTP connectors. Uses the same principle as sslSocketConnectors. The option is a java.util.Map<java.lang.Integer,org.eclipse.jetty.server.Connector> type. | | String | *camel.component.jetty.ssl-context-parameters* | To configure security using SSLContextParameters. The option is a org.apache.camel.util.jsse.SSLContextParameters type. | | String diff --git a/components/camel-script/src/main/docs/javaScript-language.adoc b/components/camel-script/src/main/docs/javaScript-language.adoc index 9955f88..719a4c3 100644 --- a/components/camel-script/src/main/docs/javaScript-language.adoc +++ b/components/camel-script/src/main/docs/javaScript-language.adoc @@ -1,6 +1,8 @@ +[[javaScript-language]] == JavaScript Language (deprecated) *Available as of Camel version 1.0* + *Available as of Camel version 1.0* diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index 72136b7..f54437b 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -3,8 +3,8 @@ * xref:amqp-component.adoc[AMQP Component] * xref:apns-component.adoc[APNS Component] * xref:asn1-dataformat.adoc[ASN.1 File DataFormat] -* xref:atmos-component.adoc[Atmos Component] * 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:atomix-map-component.adoc[Atomix Map Component] @@ -52,8 +52,8 @@ * xref:caffeine-cache-component.adoc[Caffeine Cache Component] * xref:caffeine-loadcache-component.adoc[Caffeine LoadCache Component] * xref:cql-component.adoc[Cassandra CQL Component] -* xref:castor-dataformat.adoc[Castor DataFormat (deprecated)] * xref:cdi.adoc[Camel CDI] +* xref:castor-dataformat.adoc[Castor DataFormat (deprecated)] * xref:chronicle-engine-component.adoc[Chronicle Engine Component] * xref:chunk-component.adoc[Chunk Component] * xref:cm-sms-component.adoc[CM SMS Gateway Component] @@ -64,10 +64,10 @@ * xref:context-component.adoc[Camel Context Component (deprecated)] * xref:corda-component.adoc[corda Component] * xref:couchbase-component.adoc[Couchbase Component] -* xref:couchdb-component.adoc[CouchDB Component] * xref:crypto-component.adoc[Crypto (JCE) Component] * xref:crypto-dataformat.adoc[Crypto (Java Cryptographic Extension) DataFormat] * xref:pgp-dataformat.adoc[PGP DataFormat] +* xref:couchdb-component.adoc[CouchDB Component] * xref:crypto-cms-component.adoc[Crypto CMS Component] * xref:csv-dataformat.adoc[CSV DataFormat] * xref:cxf-component.adoc[CXF Component] @@ -290,7 +290,7 @@ * xref:scala.adoc[About the Scala DSL] * xref:schematron-component.adoc[Schematron Component] * xref:scr.adoc[Camel SCR (deprecated)] -* xref:javaScript-language.adoc[JavaScript Language] +* xref:javaScript-language.adoc[JavaScript Language (deprecated)] * xref:php-language.adoc[PHP Language (deprecated)] * xref:python-language.adoc[Python Language (deprecated)] * xref:ruby-language.adoc[Ruby Language (deprecated)] diff --git a/platforms/spring-boot/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java index 02b685f..24a69eb 100644 --- a/platforms/spring-boot/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java @@ -64,7 +64,7 @@ public class SalesforceComponentConfiguration */ private SalesforceLoginConfigNestedConfiguration loginConfig; /** - * URL of the Salesforce instance used after authantication, by default + * URL of the Salesforce instance used after authentication, by default * received from Salesforce on successful authentication */ private String instanceUrl; @@ -119,7 +119,7 @@ public class SalesforceComponentConfiguration private String password; /** * If set to true prevents the component from authenticating to Salesforce - * with the start of the component. You would generaly set this to the + * with the start of the component. You would generally set this to the * (default) false and authenticate early and be immediately aware of any * authentication issues. */