You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/22 11:59:58 UTC
[camel-spring-boot] branch master updated: Regen after master build
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 301c7dc Regen after master build
301c7dc is described below
commit 301c7dc4d833e2e7000119fcc7011ed06c5d46d2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sun Mar 22 12:59:40 2020 +0100
Regen after master build
---
.../camel/springboot/catalog/components/elsql.json | 2 +-
.../springboot/catalog/components/milo-server.json | 10 ++--
.../springboot/catalog/components/salesforce.json | 4 +-
.../camel/springboot/catalog/components/sql.json | 2 +-
components-starter/camel-corda-starter/pom.xml | 12 ++++
.../src/main/docs/milo-starter.adoc | 10 ++--
.../MiloServerComponentConfiguration.java | 70 +++++++++++-----------
.../src/main/docs/salesforce-starter.adoc | 4 +-
.../SalesforceComponentConfiguration.java | 34 +++++------
docs/modules/ROOT/pages/milo-starter.adoc | 10 ++--
docs/modules/ROOT/pages/salesforce-starter.adoc | 4 +-
11 files changed, 87 insertions(+), 75 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elsql.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elsql.json
index 0ec6d60..4d540d7 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elsql.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elsql.json
@@ -56,7 +56,7 @@
"batch": { "kind": "parameter", "displayName": "Batch", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables or disables batch mode" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the [...]
"noop": { "kind": "parameter", "displayName": "Noop", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set, will ignore the results of the SQL query and use the existing IN message as the OUT message for the continuation of processing" },
- "useMessageBodyForSql": { "kind": "parameter", "displayName": "Use Message Body For Sql", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to use the message body as the SQL and then headers for parameters. If this option is enabled then the SQL in the uri is not used.Note that query parameters in the message body are represented by a question mar [...]
+ "useMessageBodyForSql": { "kind": "parameter", "displayName": "Use Message Body For Sql", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to use the message body as the SQL and then headers for parameters. If this option is enabled then the SQL in the uri is not used. Note that query parameters in the message body are represented by a question ma [...]
"alwaysPopulateStatement": { "kind": "parameter", "displayName": "Always Populate Statement", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then the populateStatement method from org.apache.camel.component.sql.SqlPrepareStatementStrategy is always invoked, also if there is no expected parameters to be prepared. When this is false then the po [...]
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
"elSqlConfig": { "kind": "parameter", "displayName": "El Sql Config", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.opengamma.elsql.ElSqlConfig", "deprecated": false, "secret": false, "description": "To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead." },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json
index e50fd98..2f7eed8 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json
@@ -22,18 +22,18 @@
"applicationName": { "kind": "property", "displayName": "Application Name", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The application name" },
"applicationUri": { "kind": "property", "displayName": "Application Uri", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The application URI" },
"bindAddresses": { "kind": "property", "displayName": "Bind Addresses", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set the addresses of the local addresses the server should bind to" },
- "bindPort": { "kind": "property", "displayName": "Bind Port", "group": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The TCP port the server binds to" },
"buildInfo": { "kind": "property", "displayName": "Build Info", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo", "deprecated": false, "secret": false, "description": "Server build info" },
+ "certificate": { "kind": "property", "displayName": "Certificate", "group": "common", "required": false, "type": "object", "javaType": "java.security.cert.X509Certificate", "deprecated": false, "secret": false, "description": "Server certificate" },
"certificateManager": { "kind": "property", "displayName": "Certificate Manager", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.security.CertificateManager", "deprecated": false, "secret": false, "description": "Server certificate manager" },
- "certificateValidator": { "kind": "property", "displayName": "Certificate Validator", "group": "common", "required": false, "type": "object", "javaType": "java.util.function.Supplier<org.eclipse.milo.opcua.stack.core.security.CertificateValidator>", "deprecated": false, "secret": false, "description": "Validator for client certificates" },
- "defaultCertificateValidator": { "kind": "property", "displayName": "Default Certificate Validator", "group": "common", "required": false, "type": "string", "javaType": "java.io.File", "deprecated": false, "secret": false, "description": "Validator for client certificates using default file based approach" },
+ "certificateValidator": { "kind": "property", "displayName": "Certificate Validator", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.security.CertificateValidator", "deprecated": false, "secret": false, "description": "Validator for client certificates" },
+ "defaultCertificateValidator": { "kind": "property", "displayName": "Default Certificate Validator", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Validator for client certificates using default file based approach" },
"enableAnonymousAuthentication": { "kind": "property", "displayName": "Enable Anonymous Authentication", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enable anonymous authentication, disabled by default" },
"namespaceUri": { "kind": "property", "displayName": "Namespace Uri", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The URI of the namespace, defaults to urn:org:apache:camel" },
"path": { "kind": "property", "displayName": "Path", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The path to be appended to the end of the endpoint url. (doesn't need to start with '\/')" },
+ "port": { "kind": "property", "displayName": "Port", "group": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The TCP port the server binds to" },
"productUri": { "kind": "property", "displayName": "Product Uri", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The product URI" },
"securityPolicies": { "kind": "property", "displayName": "Security Policies", "group": "common", "required": false, "type": "object", "javaType": "java.util.Set<org.eclipse.milo.opcua.stack.core.security.SecurityPolicy>", "deprecated": false, "secret": false, "description": "Security policies" },
- "securityPoliciesById": { "kind": "property", "displayName": "Security Policies By Id", "group": "common", "required": false, "type": "array", "javaType": "java.util.Collection<java.lang.String>", "deprecated": false, "secret": false, "description": "Security policies by URI or name" },
- "serverCertificate": { "kind": "property", "displayName": "Server Certificate", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.milo.KeyStoreLoader.Result", "deprecated": false, "secret": false, "description": "Server certificate" },
+ "securityPoliciesById": { "kind": "property", "displayName": "Security Policies By Id", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Security policies by URI or name. Multiple policies can be separated by comma." },
"userAuthenticationCredentials": { "kind": "property", "displayName": "User Authentication Credentials", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Set user password combinations in the form of user1:pwd1,user2:pwd2 Usernames and passwords will be URL decoded" },
"usernameSecurityPolicyUri": { "kind": "property", "displayName": "Username Security Policy Uri", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.milo.opcua.stack.core.security.SecurityPolicy", "enum": [ "None", "Basic128Rsa15", "Basic256", "Basic256Sha256", "Aes128_Sha256_RsaOaep", "Aes256_Sha256_RsaPss" ], "deprecated": false, "secret": false, "description": "Set the UserTokenPolicy used when" },
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...]
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
index 3654d1d..0e3b705 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
@@ -72,17 +72,17 @@
"httpProxyHost": { "kind": "property", "displayName": "Http Proxy Host", "group": "proxy", "label": "common,proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Hostname of the HTTP proxy server to use." },
"httpProxyIncludedAddresses": { "kind": "property", "displayName": "Http Proxy Included Addresses", "group": "proxy", "label": "common,proxy", "required": false, "type": "object", "javaType": "java.util.Set<java.lang.String>", "deprecated": false, "secret": false, "description": "A list of addresses for which HTTP proxy server should be used." },
"httpProxyPort": { "kind": "property", "displayName": "Http Proxy Port", "group": "proxy", "label": "common,proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Port number of the HTTP proxy server to use." },
- "isHttpProxySocks4": { "kind": "property", "displayName": "Is Http Proxy Socks4", "group": "proxy", "label": "common,proxy", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "If set to true the configures the HTTP proxy to use as a SOCKS4 proxy." },
+ "httpProxySocks4": { "kind": "property", "displayName": "Http Proxy Socks4", "group": "proxy", "label": "common,proxy", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "If set to true the configures the HTTP proxy to use as a SOCKS4 proxy." },
"authenticationType": { "kind": "property", "displayName": "Authentication Type", "group": "security", "label": "common,security", "required": false, "type": "object", "javaType": "org.apache.camel.component.salesforce.AuthenticationType", "enum": [ "USERNAME_PASSWORD", "REFRESH_TOKEN", "JWT" ], "deprecated": false, "secret": false, "description": "Explicit authentication method to be used, one of USERNAME_PASSWORD, REFRESH_TOKEN or JWT. Salesforce component can auto-determine the au [...]
"clientId": { "kind": "property", "displayName": "Client Id", "group": "security", "label": "common,security", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "OAuth Consumer Key of the connected app configured in the Salesforce instance setup. Typically a connected app needs to be configured but one can be provided by installing a package." },
"clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "OAuth Consumer Secret of the connected app configured in the Salesforce instance setup." },
"httpProxyAuthUri": { "kind": "property", "displayName": "Http Proxy Auth Uri", "group": "security", "label": "common,proxy,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Used in authentication against the HTTP proxy server, needs to match the URI of the proxy server in order for the httpProxyUsername and httpProxyPassword to be used for authentication." },
"httpProxyPassword": { "kind": "property", "displayName": "Http Proxy Password", "group": "security", "label": "common,proxy,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Password to use to authenticate against the HTTP proxy server." },
"httpProxyRealm": { "kind": "property", "displayName": "Http Proxy Realm", "group": "security", "label": "common,proxy,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Realm of the proxy server, used in preemptive Basic\/Digest authentication methods against the HTTP proxy server." },
+ "httpProxySecure": { "kind": "property", "displayName": "Http Proxy Secure", "group": "security", "label": "common,proxy,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If set to false disables the use of TLS when accessing the HTTP proxy." },
"httpProxyUseDigestAuth": { "kind": "property", "displayName": "Http Proxy Use Digest Auth", "group": "security", "label": "common,proxy,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "If set to true Digest authentication will be used when authenticating to the HTTP proxy, otherwise Basic authorization method will be used" },
"httpProxyUsername": { "kind": "property", "displayName": "Http Proxy Username", "group": "security", "label": "common,proxy,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Username to use to authenticate against the HTTP proxy server." },
"instanceUrl": { "kind": "property", "displayName": "Instance Url", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "URL of the Salesforce instance used after authentication, by default received from Salesforce on successful authentication" },
- "isHttpProxySecure": { "kind": "property", "displayName": "Is Http Proxy Secure", "group": "security", "label": "common,proxy,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If set to false disables the use of TLS when accessing the HTTP proxy." },
"keystore": { "kind": "property", "displayName": "Keystore", "group": "security", "label": "common,security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.KeyStoreParameters", "deprecated": false, "secret": true, "description": "KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only one entry with private key and certificate. Salesforce does not verify the certificate chain, so this can easily be a selfsigned certificate. Mak [...]
"lazyLogin": { "kind": "property", "displayName": "Lazy Login", "group": "security", "label": "common,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "If set to true prevents the component from authenticating to Salesforce 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." },
"loginConfig": { "kind": "property", "displayName": "Login Config", "group": "security", "label": "common,security", "required": false, "type": "object", "javaType": "org.apache.camel.component.salesforce.SalesforceLoginConfig", "deprecated": false, "secret": false, "description": "All authentication configuration in one nested bean, all properties set there can be set directly on the component as well" },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql.json
index aeb7962..ea12ff1 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql.json
@@ -52,7 +52,7 @@
"batch": { "kind": "parameter", "displayName": "Batch", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables or disables batch mode" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the [...]
"noop": { "kind": "parameter", "displayName": "Noop", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set, will ignore the results of the SQL query and use the existing IN message as the OUT message for the continuation of processing" },
- "useMessageBodyForSql": { "kind": "parameter", "displayName": "Use Message Body For Sql", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to use the message body as the SQL and then headers for parameters. If this option is enabled then the SQL in the uri is not used.Note that query parameters in the message body are represented by a question mar [...]
+ "useMessageBodyForSql": { "kind": "parameter", "displayName": "Use Message Body For Sql", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to use the message body as the SQL and then headers for parameters. If this option is enabled then the SQL in the uri is not used. Note that query parameters in the message body are represented by a question ma [...]
"alwaysPopulateStatement": { "kind": "parameter", "displayName": "Always Populate Statement", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If enabled then the populateStatement method from org.apache.camel.component.sql.SqlPrepareStatementStrategy is always invoked, also if there is no expected parameters to be prepared. When this is false then the po [...]
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
"parametersCount": { "kind": "parameter", "displayName": "Parameters Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "If set greater than zero, then Camel will use this count value of parameters to replace instead of querying via JDBC metadata API. This is useful if the JDBC vendor could not return correct parameters count, then user may override instead." },
diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml
index 61d6d32..cba8670 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-milo-starter/src/main/docs/milo-starter.adoc b/components-starter/camel-milo-starter/src/main/docs/milo-starter.adoc
index 33fef7b..6b4d6f0 100644
--- a/components-starter/camel-milo-starter/src/main/docs/milo-starter.adoc
+++ b/components-starter/camel-milo-starter/src/main/docs/milo-starter.adoc
@@ -52,21 +52,21 @@ The component supports 45 options, which are listed below.
| *camel.component.milo-server.application-uri* | The application URI | | String
| *camel.component.milo-server.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.milo-server.bind-addresses* | Set the addresses of the local addresses the server should bind to | | String
-| *camel.component.milo-server.bind-port* | The TCP port the server binds to | | Integer
| *camel.component.milo-server.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
| *camel.component.milo-server.build-info* | Server build info. The option is a org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo type. | | String
+| *camel.component.milo-server.certificate* | Server certificate. The option is a java.security.cert.X509Certificate type. | | String
| *camel.component.milo-server.certificate-manager* | Server certificate manager. The option is a org.eclipse.milo.opcua.stack.core.security.CertificateManager type. | | String
-| *camel.component.milo-server.certificate-validator* | Validator for client certificates. The option is a java.util.function.Supplier<org.eclipse.milo.opcua.stack.core.security.CertificateValidator> type. | | String
-| *camel.component.milo-server.default-certificate-validator* | Validator for client certificates using default file based approach | | File
+| *camel.component.milo-server.certificate-validator* | Validator for client certificates. The option is a org.eclipse.milo.opcua.stack.core.security.CertificateValidator type. | | String
+| *camel.component.milo-server.default-certificate-validator* | Validator for client certificates using default file based approach | | String
| *camel.component.milo-server.enable-anonymous-authentication* | Enable anonymous authentication, disabled by default | false | Boolean
| *camel.component.milo-server.enabled* | Whether to enable auto configuration of the milo-server component. This is enabled by default. | | Boolean
| *camel.component.milo-server.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processe [...]
| *camel.component.milo-server.namespace-uri* | The URI of the namespace, defaults to urn:org:apache:camel | | String
| *camel.component.milo-server.path* | The path to be appended to the end of the endpoint url. (doesn't need to start with '/') | | String
+| *camel.component.milo-server.port* | The TCP port the server binds to | | Integer
| *camel.component.milo-server.product-uri* | The product URI | | String
| *camel.component.milo-server.security-policies* | Security policies | | Set
-| *camel.component.milo-server.security-policies-by-id* | Security policies by URI or name | | Collection
-| *camel.component.milo-server.server-certificate* | Server certificate. The option is a org.apache.camel.component.milo.KeyStoreLoader.Result type. | | String
+| *camel.component.milo-server.security-policies-by-id* | Security policies by URI or name. Multiple policies can be separated by comma. | | String
| *camel.component.milo-server.user-authentication-credentials* | Set user password combinations in the form of user1:pwd1,user2:pwd2 Usernames and passwords will be URL decoded | | String
| *camel.component.milo-server.username-security-policy-uri* | Set the UserTokenPolicy used when | | SecurityPolicy
|===
diff --git a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java
index 9784eb9..e4e83e9 100644
--- a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java
+++ b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.milo.server.springboot;
-import java.io.File;
-import java.util.Collection;
import java.util.Set;
import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
@@ -53,28 +51,29 @@ public class MiloServerComponentConfiguration
*/
private String bindAddresses;
/**
- * The TCP port the server binds to
- */
- private Integer bindPort;
- /**
* Server build info. The option is a
* org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo type.
*/
private String buildInfo;
/**
+ * Server certificate. The option is a java.security.cert.X509Certificate
+ * type.
+ */
+ private String certificate;
+ /**
* Server certificate manager. The option is a
* org.eclipse.milo.opcua.stack.core.security.CertificateManager type.
*/
private String certificateManager;
/**
* Validator for client certificates. The option is a
- * java.util.function.Supplier<org.eclipse.milo.opcua.stack.core.security.CertificateValidator> type.
+ * org.eclipse.milo.opcua.stack.core.security.CertificateValidator type.
*/
private String certificateValidator;
/**
* Validator for client certificates using default file based approach
*/
- private File defaultCertificateValidator;
+ private String defaultCertificateValidator;
/**
* Enable anonymous authentication, disabled by default
*/
@@ -89,6 +88,10 @@ public class MiloServerComponentConfiguration
*/
private String path;
/**
+ * The TCP port the server binds to
+ */
+ private Integer port;
+ /**
* The product URI
*/
private String productUri;
@@ -97,14 +100,10 @@ public class MiloServerComponentConfiguration
*/
private Set<SecurityPolicy> securityPolicies;
/**
- * Security policies by URI or name
- */
- private Collection<String> securityPoliciesById;
- /**
- * Server certificate. The option is a
- * org.apache.camel.component.milo.KeyStoreLoader.Result type.
+ * Security policies by URI or name. Multiple policies can be separated by
+ * comma.
*/
- private String serverCertificate;
+ private String securityPoliciesById;
/**
* Set user password combinations in the form of user1:pwd1,user2:pwd2
* Usernames and passwords will be URL decoded
@@ -164,14 +163,6 @@ public class MiloServerComponentConfiguration
this.bindAddresses = bindAddresses;
}
- public Integer getBindPort() {
- return bindPort;
- }
-
- public void setBindPort(Integer bindPort) {
- this.bindPort = bindPort;
- }
-
public String getBuildInfo() {
return buildInfo;
}
@@ -180,6 +171,14 @@ public class MiloServerComponentConfiguration
this.buildInfo = buildInfo;
}
+ public String getCertificate() {
+ return certificate;
+ }
+
+ public void setCertificate(String certificate) {
+ this.certificate = certificate;
+ }
+
public String getCertificateManager() {
return certificateManager;
}
@@ -196,11 +195,12 @@ public class MiloServerComponentConfiguration
this.certificateValidator = certificateValidator;
}
- public File getDefaultCertificateValidator() {
+ public String getDefaultCertificateValidator() {
return defaultCertificateValidator;
}
- public void setDefaultCertificateValidator(File defaultCertificateValidator) {
+ public void setDefaultCertificateValidator(
+ String defaultCertificateValidator) {
this.defaultCertificateValidator = defaultCertificateValidator;
}
@@ -229,6 +229,14 @@ public class MiloServerComponentConfiguration
this.path = path;
}
+ public Integer getPort() {
+ return port;
+ }
+
+ public void setPort(Integer port) {
+ this.port = port;
+ }
+
public String getProductUri() {
return productUri;
}
@@ -245,22 +253,14 @@ public class MiloServerComponentConfiguration
this.securityPolicies = securityPolicies;
}
- public Collection<String> getSecurityPoliciesById() {
+ public String getSecurityPoliciesById() {
return securityPoliciesById;
}
- public void setSecurityPoliciesById(Collection<String> securityPoliciesById) {
+ public void setSecurityPoliciesById(String securityPoliciesById) {
this.securityPoliciesById = securityPoliciesById;
}
- public String getServerCertificate() {
- return serverCertificate;
- }
-
- public void setServerCertificate(String serverCertificate) {
- this.serverCertificate = serverCertificate;
- }
-
public String getUserAuthenticationCredentials() {
return userAuthenticationCredentials;
}
diff --git a/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc b/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc
index 198c8e4..61f3ce2 100644
--- a/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc
+++ b/components-starter/camel-salesforce-starter/src/main/docs/salesforce-starter.adoc
@@ -52,14 +52,14 @@ The component supports 73 options, which are listed below.
| *camel.component.salesforce.http-proxy-password* | Password to use to authenticate against the HTTP proxy server. | | String
| *camel.component.salesforce.http-proxy-port* | Port number of the HTTP proxy server to use. | | Integer
| *camel.component.salesforce.http-proxy-realm* | Realm of the proxy server, used in preemptive Basic/Digest authentication methods against the HTTP proxy server. | | String
+| *camel.component.salesforce.http-proxy-secure* | If set to false disables the use of TLS when accessing the HTTP proxy. | true | Boolean
+| *camel.component.salesforce.http-proxy-socks4* | If set to true the configures the HTTP proxy to use as a SOCKS4 proxy. | false | Boolean
| *camel.component.salesforce.http-proxy-use-digest-auth* | If set to true Digest authentication will be used when authenticating to the HTTP proxy, otherwise Basic authorization method will be used | false | Boolean
| *camel.component.salesforce.http-proxy-username* | Username to use to authenticate against the HTTP proxy server. | | String
| *camel.component.salesforce.include-details* | Include details in Salesforce1 Analytics report, defaults to false. | | Boolean
| *camel.component.salesforce.initial-replay-id-map* | Replay IDs to start from per channel name. | | Map
| *camel.component.salesforce.instance-id* | Salesforce1 Analytics report execution instance ID | | String
| *camel.component.salesforce.instance-url* | URL of the Salesforce instance used after authentication, by default received from Salesforce on successful authentication | | String
-| *camel.component.salesforce.is-http-proxy-secure* | If set to false disables the use of TLS when accessing the HTTP proxy. | true | Boolean
-| *camel.component.salesforce.is-http-proxy-socks4* | If set to true the configures the HTTP proxy to use as a SOCKS4 proxy. | false | Boolean
| *camel.component.salesforce.job-id* | Bulk API Job ID | | String
| *camel.component.salesforce.keystore* | KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only one entry with private key and certificate. Salesforce does not verify the certificate chain, so this can easily be a selfsigned certificate. Make sure that you upload the certificate to the corresponding connected app. The option is a org.apache.camel.support.jsse.KeyStoreParameters type. | | String
| *camel.component.salesforce.lazy-login* | If set to true prevents the component from authenticating to Salesforce 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. | false | Boolean
diff --git a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
index f1d702a..1246b9c 100644
--- a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
+++ b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
@@ -296,7 +296,7 @@ public class SalesforceComponentConfiguration
/**
* If set to true the configures the HTTP proxy to use as a SOCKS4 proxy.
*/
- private Boolean isHttpProxySocks4 = false;
+ private Boolean httpProxySocks4 = false;
/**
* Explicit authentication method to be used, one of USERNAME_PASSWORD,
* REFRESH_TOKEN or JWT. Salesforce component can auto-determine the
@@ -331,6 +331,10 @@ public class SalesforceComponentConfiguration
*/
private String httpProxyRealm;
/**
+ * If set to false disables the use of TLS when accessing the HTTP proxy.
+ */
+ private Boolean httpProxySecure = true;
+ /**
* If set to true Digest authentication will be used when authenticating to
* the HTTP proxy, otherwise Basic authorization method will be used
*/
@@ -345,10 +349,6 @@ public class SalesforceComponentConfiguration
*/
private String instanceUrl;
/**
- * If set to false disables the use of TLS when accessing the HTTP proxy.
- */
- private Boolean isHttpProxySecure = true;
- /**
* KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain
* only one entry with private key and certificate. Salesforce does not
* verify the certificate chain, so this can easily be a selfsigned
@@ -830,12 +830,12 @@ public class SalesforceComponentConfiguration
this.httpProxyPort = httpProxyPort;
}
- public Boolean getIsHttpProxySocks4() {
- return isHttpProxySocks4;
+ public Boolean getHttpProxySocks4() {
+ return httpProxySocks4;
}
- public void setIsHttpProxySocks4(Boolean isHttpProxySocks4) {
- this.isHttpProxySocks4 = isHttpProxySocks4;
+ public void setHttpProxySocks4(Boolean httpProxySocks4) {
+ this.httpProxySocks4 = httpProxySocks4;
}
public AuthenticationType getAuthenticationType() {
@@ -886,6 +886,14 @@ public class SalesforceComponentConfiguration
this.httpProxyRealm = httpProxyRealm;
}
+ public Boolean getHttpProxySecure() {
+ return httpProxySecure;
+ }
+
+ public void setHttpProxySecure(Boolean httpProxySecure) {
+ this.httpProxySecure = httpProxySecure;
+ }
+
public Boolean getHttpProxyUseDigestAuth() {
return httpProxyUseDigestAuth;
}
@@ -910,14 +918,6 @@ public class SalesforceComponentConfiguration
this.instanceUrl = instanceUrl;
}
- public Boolean getIsHttpProxySecure() {
- return isHttpProxySecure;
- }
-
- public void setIsHttpProxySecure(Boolean isHttpProxySecure) {
- this.isHttpProxySecure = isHttpProxySecure;
- }
-
public String getKeystore() {
return keystore;
}
diff --git a/docs/modules/ROOT/pages/milo-starter.adoc b/docs/modules/ROOT/pages/milo-starter.adoc
index 33fef7b..6b4d6f0 100644
--- a/docs/modules/ROOT/pages/milo-starter.adoc
+++ b/docs/modules/ROOT/pages/milo-starter.adoc
@@ -52,21 +52,21 @@ The component supports 45 options, which are listed below.
| *camel.component.milo-server.application-uri* | The application URI | | String
| *camel.component.milo-server.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
| *camel.component.milo-server.bind-addresses* | Set the addresses of the local addresses the server should bind to | | String
-| *camel.component.milo-server.bind-port* | The TCP port the server binds to | | Integer
| *camel.component.milo-server.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
| *camel.component.milo-server.build-info* | Server build info. The option is a org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo type. | | String
+| *camel.component.milo-server.certificate* | Server certificate. The option is a java.security.cert.X509Certificate type. | | String
| *camel.component.milo-server.certificate-manager* | Server certificate manager. The option is a org.eclipse.milo.opcua.stack.core.security.CertificateManager type. | | String
-| *camel.component.milo-server.certificate-validator* | Validator for client certificates. The option is a java.util.function.Supplier<org.eclipse.milo.opcua.stack.core.security.CertificateValidator> type. | | String
-| *camel.component.milo-server.default-certificate-validator* | Validator for client certificates using default file based approach | | File
+| *camel.component.milo-server.certificate-validator* | Validator for client certificates. The option is a org.eclipse.milo.opcua.stack.core.security.CertificateValidator type. | | String
+| *camel.component.milo-server.default-certificate-validator* | Validator for client certificates using default file based approach | | String
| *camel.component.milo-server.enable-anonymous-authentication* | Enable anonymous authentication, disabled by default | false | Boolean
| *camel.component.milo-server.enabled* | Whether to enable auto configuration of the milo-server component. This is enabled by default. | | Boolean
| *camel.component.milo-server.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processe [...]
| *camel.component.milo-server.namespace-uri* | The URI of the namespace, defaults to urn:org:apache:camel | | String
| *camel.component.milo-server.path* | The path to be appended to the end of the endpoint url. (doesn't need to start with '/') | | String
+| *camel.component.milo-server.port* | The TCP port the server binds to | | Integer
| *camel.component.milo-server.product-uri* | The product URI | | String
| *camel.component.milo-server.security-policies* | Security policies | | Set
-| *camel.component.milo-server.security-policies-by-id* | Security policies by URI or name | | Collection
-| *camel.component.milo-server.server-certificate* | Server certificate. The option is a org.apache.camel.component.milo.KeyStoreLoader.Result type. | | String
+| *camel.component.milo-server.security-policies-by-id* | Security policies by URI or name. Multiple policies can be separated by comma. | | String
| *camel.component.milo-server.user-authentication-credentials* | Set user password combinations in the form of user1:pwd1,user2:pwd2 Usernames and passwords will be URL decoded | | String
| *camel.component.milo-server.username-security-policy-uri* | Set the UserTokenPolicy used when | | SecurityPolicy
|===
diff --git a/docs/modules/ROOT/pages/salesforce-starter.adoc b/docs/modules/ROOT/pages/salesforce-starter.adoc
index 198c8e4..61f3ce2 100644
--- a/docs/modules/ROOT/pages/salesforce-starter.adoc
+++ b/docs/modules/ROOT/pages/salesforce-starter.adoc
@@ -52,14 +52,14 @@ The component supports 73 options, which are listed below.
| *camel.component.salesforce.http-proxy-password* | Password to use to authenticate against the HTTP proxy server. | | String
| *camel.component.salesforce.http-proxy-port* | Port number of the HTTP proxy server to use. | | Integer
| *camel.component.salesforce.http-proxy-realm* | Realm of the proxy server, used in preemptive Basic/Digest authentication methods against the HTTP proxy server. | | String
+| *camel.component.salesforce.http-proxy-secure* | If set to false disables the use of TLS when accessing the HTTP proxy. | true | Boolean
+| *camel.component.salesforce.http-proxy-socks4* | If set to true the configures the HTTP proxy to use as a SOCKS4 proxy. | false | Boolean
| *camel.component.salesforce.http-proxy-use-digest-auth* | If set to true Digest authentication will be used when authenticating to the HTTP proxy, otherwise Basic authorization method will be used | false | Boolean
| *camel.component.salesforce.http-proxy-username* | Username to use to authenticate against the HTTP proxy server. | | String
| *camel.component.salesforce.include-details* | Include details in Salesforce1 Analytics report, defaults to false. | | Boolean
| *camel.component.salesforce.initial-replay-id-map* | Replay IDs to start from per channel name. | | Map
| *camel.component.salesforce.instance-id* | Salesforce1 Analytics report execution instance ID | | String
| *camel.component.salesforce.instance-url* | URL of the Salesforce instance used after authentication, by default received from Salesforce on successful authentication | | String
-| *camel.component.salesforce.is-http-proxy-secure* | If set to false disables the use of TLS when accessing the HTTP proxy. | true | Boolean
-| *camel.component.salesforce.is-http-proxy-socks4* | If set to true the configures the HTTP proxy to use as a SOCKS4 proxy. | false | Boolean
| *camel.component.salesforce.job-id* | Bulk API Job ID | | String
| *camel.component.salesforce.keystore* | KeyStore parameters to use in OAuth JWT flow. The KeyStore should contain only one entry with private key and certificate. Salesforce does not verify the certificate chain, so this can easily be a selfsigned certificate. Make sure that you upload the certificate to the corresponding connected app. The option is a org.apache.camel.support.jsse.KeyStoreParameters type. | | String
| *camel.component.salesforce.lazy-login* | If set to true prevents the component from authenticating to Salesforce 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. | false | Boolean