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 2018/12/18 06:53:42 UTC
[camel] branch sandbox/camel-3.x updated (a48ed03 -> 6f4fdc1)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a48ed03 Destroy PrivateKey instances in a few places when we are finished with them
new 7ec1ce3 camel-salesforce: Fix component name in README.md URLs
new 71174dd camel-salesforce: Fix some typos in the documentation
new ab62575 Regen
new 6f4fdc1 Regen
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel-salesforce/camel-salesforce-component/README.md | 10 +++++-----
.../src/main/docs/salesforce-component.adoc | 14 +++++++-------
.../camel/component/salesforce/SalesforceComponent.java | 4 ++--
.../springboot/SalesforceComponentConfiguration.java | 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
[camel] 01/04: camel-salesforce: Fix component name in README.md
URLs
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7ec1ce3db770695ca6e742214d02327073b88f00
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Mon Dec 17 19:04:06 2018 +0100
camel-salesforce: Fix component name in README.md URLs
---
components/camel-salesforce/camel-salesforce-component/README.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/README.md b/components/camel-salesforce/camel-salesforce-component/README.md
index 00c65cc..e18b196 100644
--- a/components/camel-salesforce/camel-salesforce-component/README.md
+++ b/components/camel-salesforce/camel-salesforce-component/README.md
@@ -29,7 +29,7 @@ For example, the following producer endpoint uses the upsertSObject API, with th
The request message body should be an SObject DTO generated using the maven plugin.
The response message will either be NULL if an existing record was updated, or [CreateSObjectResult] with an id of the new record, or a list of errors while creating the new object.
- ...to("force:upsertSObject?sObjectIdName=Name")...
+ ...to("salesforce:upsertSObject?sObjectIdName=Name")...
## Bulk API ##
@@ -53,7 +53,7 @@ and the response may also be saved to a file to be correlated with the request.
For example, the following producer endpoint uses the createBatch API to create a Job Batch.
The in message must contain a body that can be converted into an InputStream (usually UTF-8 CSV or XML content from a file, etc.) and header fields 'jobId' for the Job and 'contentType' for the Job content type, which can be XML, CSV, ZIP\_XML or ZIP\_CSV. The put message body will contain [BatchInfo] on success, or throw a [SalesforceException] on error.
- ...to("force:createBatchJob")..
+ ...to("salesforce:createBatchJob")..
## Streaming API ##
@@ -61,11 +61,11 @@ Consumer endpoints can use the following sytax for streaming endpoints to receiv
To create and subscribe to a topic
- from("force:CamelTestTopic?notifyForFields=ALL¬ifyForOperations=ALL&sObjectName=Merchandise__c&updateTopic=true&sObjectQuery=SELECT Id, Name FROM Merchandise__c")...
+ from("salesforce:CamelTestTopic?notifyForFields=ALL¬ifyForOperations=ALL&sObjectName=Merchandise__c&updateTopic=true&sObjectQuery=SELECT Id, Name FROM Merchandise__c")...
To subscribe to an existing topic
- from("force:CamelTestTopic&sObjectName=Merchandise__c")...
+ from("salesforce:CamelTestTopic&sObjectName=Merchandise__c")...
## Developing the Camel Salesforce component
[camel] 02/04: camel-salesforce: Fix some typos in the documentation
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 71174dd42c1539d1480af6f4f7f752dcc771b1c1
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Mon Dec 17 19:11:31 2018 +0100
camel-salesforce: Fix some typos in the documentation
Conflicts:
components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
---
.../camel-salesforce/camel-salesforce-component/README.md | 2 +-
.../src/main/docs/salesforce-component.adoc | 14 ++++++--------
.../camel/component/salesforce/SalesforceComponent.java | 4 ++--
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/README.md b/components/camel-salesforce/camel-salesforce-component/README.md
index e18b196..c0f145b 100644
--- a/components/camel-salesforce/camel-salesforce-component/README.md
+++ b/components/camel-salesforce/camel-salesforce-component/README.md
@@ -57,7 +57,7 @@ The in message must contain a body that can be converted into an InputStream (us
## Streaming API ##
-Consumer endpoints can use the following sytax for streaming endpoints to receive Salesforce notifications on create/update.
+Consumer endpoints can use the following syntax for streaming endpoints to receive Salesforce notifications on create/update.
To create and subscribe to a topic
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index 6e62fad..c9e4933 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -81,7 +81,7 @@ You can append query options to the URI in the following format,
With Camel 2.21 there is support to pass https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/headers.htm[Salesforce headers]
via inbound message headers, header names that start with `Sforce` or
`x-sfdc` on the Camel message will be passed on in the request, and
-response headers that start with `Sforce` will be present in the outboud
+response headers that start with `Sforce` will be present in the outbound
message headers.
For example to fetch API limits you can specify:
@@ -204,7 +204,7 @@ error.
==== Rest Streaming API
-Consumer endpoints can use the following sytax for streaming endpoints
+Consumer endpoints can use the following syntax for streaming endpoints
to receive Salesforce notifications on create/update.
To create and subscribe to a topic
@@ -227,7 +227,7 @@ To emit a platform event use `createSObject` operation. And set the
message body can be JSON string or InputStream with key-value data --
in that case `sObjectName` needs to be set to the API name of the
event, or a class that extends from AbstractDTOBase with the
-appropriate class name for the event.
+appropriate class name for the event.
For example using a DTO:
@@ -605,7 +605,7 @@ The Salesforce component supports 29 options, which are listed below.
| Name | Description | Default | Type
| *authenticationType* (security) | Explicit authentication method to be used, one of USERNAME_PASSWORD, REFRESH_TOKEN or JWT. Salesforce component can auto-determine the authentication method to use from the properties set, set this property to eliminate any ambiguity. | | AuthenticationType
| *loginConfig* (security) | All authentication configuration in one nested bean, all properties set there can be set directly on the component as well | | SalesforceLoginConfig
-| *instanceUrl* (security) | URL of the Salesforce instance used after authantication, by default received from Salesforce on successful authentication | | String
+| *instanceUrl* (security) | URL of the Salesforce instance used after authentication, by default received from Salesforce on successful authentication | | String
| *loginUrl* (security) | *Required* URL of the Salesforce instance used for authentication, by default set to https://login.salesforce.com | https://login.salesforce.com | String
| *clientId* (security) | *Required* 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. | | String
| *clientSecret* (security) | OAuth Consumer Secret of the connected app configured in the Salesforce instance setup. | | String
@@ -613,7 +613,7 @@ The Salesforce component supports 29 options, which are listed below.
| *refreshToken* (security) | Refresh token already obtained in the refresh token OAuth flow. One needs to setup a web application and configure a callback URL to receive the refresh token, or configure using the builtin callback at https://login.salesforce.com/services/oauth2/success or https://test.salesforce.com/services/oauth2/success and then retrive the refresh_token from the URL at the end of the flow. Note that in development organizations Salesforce allows hosting the callback w [...]
| *userName* (security) | Username used in OAuth flow to gain access to access token. It's easy to get started with password OAuth flow, but in general one should avoid it as it is deemed less secure than other flows. | | String
| *password* (security) | Password used in OAuth flow to gain access to access token. It's easy to get started with password OAuth flow, but in general one should avoid it as it is deemed less secure than other flows. Make sure that you append security token to the end of the password if using one. | | String
-| *lazyLogin* (security) | If set to true prevents the component from authenticating to Salesforce with the start of the component. You would generaly set this to the (default) false and authenticate early and be immediately aware of any authentication issues. | false | boolean
+| *lazyLogin* (security) | 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
| *config* (common) | Global endpoint configuration - use to set values that are common to all endpoints | | SalesforceEndpoint Config
| *httpClientProperties* (common) | Used to set any properties that can be configured on the underlying HTTP client. Have a look at properties of SalesforceHttpClient and the Jetty HttpClient for all available options. | | Map
| *longPollingTransport Properties* (common) | Used to set any properties that can be configured on the LongPollingTransport used by the BayeuxClient (CometD) used by the streaming api | | Map
@@ -788,11 +788,9 @@ The component supports 85 options, which are listed below.
| *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-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.instance-url* | URL of the Salesforce instance used after authantication, by default received from Salesforce on successful authentication | | 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.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 generaly set this to the (default) false and authenticate early and be immediately aware of any authentication issues. | false | Boolean
| *camel.component.salesforce.login-config.client-id* | Salesforce connected application Consumer Key | | String
| *camel.component.salesforce.login-config.client-secret* | Salesforce connected application Consumer Secret | | String
| *camel.component.salesforce.login-config.instance-url* | | | String
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index dab7609..1392c74 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -83,7 +83,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP
+ " directly on the component as well", label = "common,security")
private SalesforceLoginConfig loginConfig;
- @Metadata(description = "URL of the Salesforce instance used after authantication, by default received from"
+ @Metadata(description = "URL of the Salesforce instance used after authentication, by default received from"
+ " Salesforce on successful authentication", label = "common,security")
private String instanceUrl;
@@ -134,7 +134,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP
private AuthenticationType authenticationType;
@Metadata(description = "If set to true prevents the component from authenticating to Salesforce with the start of"
- + " the component. You would generaly set this to the (default) false and authenticate early and be immediately"
+ + " the component. You would generally set this to the (default) false and authenticate early and be immediately"
+ " aware of any authentication issues.", defaultValue = "false", label = "common,security")
private boolean lazyLogin;
[camel] 04/04: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6f4fdc1ec953f829a6dab76e18660cf26df7e6c1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Dec 18 07:53:19 2018 +0100
Regen
---
.../camel-salesforce-component/src/main/docs/salesforce-component.adoc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index c9e4933..c257406 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -791,6 +791,8 @@ The component supports 85 options, which are listed below.
| *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.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
| *camel.component.salesforce.login-config.client-id* | Salesforce connected application Consumer Key | | String
| *camel.component.salesforce.login-config.client-secret* | Salesforce connected application Consumer Secret | | String
| *camel.component.salesforce.login-config.instance-url* | | | String
[camel] 03/04: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ab62575e275aacc3e53df8c563c442db54ba97ab
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Dec 18 07:52:08 2018 +0100
Regen
---
.../salesforce/springboot/SalesforceComponentConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 3f8c88e..6fa7a6e 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.
*/