Repository: camel Updated Branches: refs/heads/master a7b9f7278 -> a255c3580
Regen Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a255c358 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a255c358 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a255c358 Branch: refs/heads/master Commit: a255c3580631030017f4ee3da5b5d2e09ed02520 Parents: a7b9f72 Author: lburgazzoli <lburgazz...@gmail.com> Authored: Fri Mar 24 17:00:29 2017 +0100 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Fri Mar 24 17:00:29 2017 +0100 ---------------------------------------------------------------------- components/readme.adoc | 6 +- docs/user-manual/en/SUMMARY.md | 1 + .../Olingo2ComponentConfiguration.java | 2 +- .../SalesforceComponentConfiguration.java | 226 +++++++++---------- 4 files changed, 119 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a255c358/components/readme.adoc ---------------------------------------------------------------------- diff --git a/components/readme.adoc b/components/readme.adoc index 5333b37..778861d 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -438,7 +438,7 @@ Number of Components: 225 in 179 JAR artifacts (13 deprecated) `netty4-http:protocol:host:port/path` | 2.14 | Netty HTTP server and client using the Netty 4.x library. | link:camel-olingo2/src/main/docs/olingo2-component.adoc[Olingo2] (camel-olingo2) + -`olingo2:apiName/methodName` | 2.14 | Communicates with OData 2.0 and 3.0 services using Apache Olingo. +`olingo2:apiName/methodName` | 2.14 | Communicates with OData 2.0 services using Apache Olingo. | link:camel-openshift/src/main/docs/openshift-component.adoc[OpenShift] (camel-openshift) + `openshift:clientId` | 2.14 | *deprecated* To manage your Openshift 2.x applications. @@ -855,7 +855,7 @@ Miscellaneous Components ^^^^^^^^^^^^^^^^^^^^^^^^ // others: START -Number of Miscellaneous Components: 36 in 36 JAR artifacts (14 deprecated) +Number of Miscellaneous Components: 37 in 37 JAR artifacts (14 deprecated) [width="100%",cols="4,1,5",options="header"] |======================================================================= @@ -885,6 +885,8 @@ Number of Miscellaneous Components: 36 in 36 JAR artifacts (14 deprecated) | link:camel-leveldb/src/main/docs/leveldb.adoc[LevelDB] (camel-leveldb) | 2.10 | Using LevelDB as persistent EIP store +| link:camel-olingo4-parent/src/main/docs/olingo4-parent.adoc[Olingo4 Parent] (camel-olingo4-parent) | | Camel Olingo4 parent + | link:camel-opentracing/src/main/docs/opentracing.adoc[OpenTracing] (camel-opentracing) | 2.19 | Distributed tracing using OpenTracing | link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18 | Using Netflix Ribbon for client side load balancing http://git-wip-us.apache.org/repos/asf/camel/blob/a255c358/docs/user-manual/en/SUMMARY.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 4f3bd3b..cd12eef 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -343,6 +343,7 @@ * [Jasypt](jasypt.adoc) * [Kura](kura.adoc) * [LevelDB](leveldb.adoc) + * [Olingo4 Parent](olingo4-parent.adoc) * [OpenTracing](opentracing.adoc) * [Ribbon](ribbon.adoc) * [Ruby](ruby.adoc) http://git-wip-us.apache.org/repos/asf/camel/blob/a255c358/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java index e0029cf..4214b78 100644 --- a/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; /** - * Communicates with OData 2.0 and 3.0 services using Apache Olingo. + * Communicates with OData 2.0 services using Apache Olingo. * * Generated by camel-package-maven-plugin - do not edit this file! */ http://git-wip-us.apache.org/repos/asf/camel/blob/a255c358/platforms/spring-boot/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java ---------------------------------------------------------------------- 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 22fa14e..bef0db4 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 @@ -368,119 +368,6 @@ public class SalesforceComponentConfiguration { this.resolvePropertyPlaceholders = resolvePropertyPlaceholders; } - public static class SalesforceLoginConfigNestedConfiguration { - public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.salesforce.SalesforceLoginConfig.class; - /** - * Salesforce login URL, defaults to https://login.salesforce.com - */ - private String loginUrl; - /** - * Salesforce connected application Consumer Key - */ - private String clientId; - /** - * Salesforce connected application Consumer Secret - */ - private String clientSecret; - /** - * Keystore parameters for keystore containing certificate and private - * key needed for OAuth 2.0 JWT Bearer Token Flow. - */ - @NestedConfigurationProperty - private KeyStoreParameters keystore; - /** - * Salesforce connected application Consumer token - */ - private String refreshToken; - private AuthenticationType type; - /** - * Salesforce account user name - */ - private String userName; - /** - * Salesforce account password - */ - private String password; - /** - * Flag to enable/disable lazy OAuth, default is false. When enabled, - * OAuth token retrieval or generation is not done until the first API - * call - */ - private Boolean lazyLogin; - - public String getLoginUrl() { - return loginUrl; - } - - public void setLoginUrl(String loginUrl) { - this.loginUrl = loginUrl; - } - - public String getClientId() { - return clientId; - } - - public void setClientId(String clientId) { - this.clientId = clientId; - } - - public String getClientSecret() { - return clientSecret; - } - - public void setClientSecret(String clientSecret) { - this.clientSecret = clientSecret; - } - - public KeyStoreParameters getKeystore() { - return keystore; - } - - public void setKeystore(KeyStoreParameters keystore) { - this.keystore = keystore; - } - - public String getRefreshToken() { - return refreshToken; - } - - public void setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - } - - public AuthenticationType getType() { - return type; - } - - public void setType(AuthenticationType type) { - this.type = type; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public Boolean getLazyLogin() { - return lazyLogin; - } - - public void setLazyLogin(Boolean lazyLogin) { - this.lazyLogin = lazyLogin; - } - } - public static class SalesforceEndpointConfigNestedConfiguration { public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.salesforce.SalesforceEndpointConfig.class; /** @@ -1057,4 +944,117 @@ public class SalesforceComponentConfiguration { this.approvalSkipEntryCriteria = approvalSkipEntryCriteria; } } + + public static class SalesforceLoginConfigNestedConfiguration { + public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.salesforce.SalesforceLoginConfig.class; + /** + * Salesforce login URL, defaults to https://login.salesforce.com + */ + private String loginUrl; + /** + * Salesforce connected application Consumer Key + */ + private String clientId; + /** + * Salesforce connected application Consumer Secret + */ + private String clientSecret; + /** + * Keystore parameters for keystore containing certificate and private + * key needed for OAuth 2.0 JWT Bearer Token Flow. + */ + @NestedConfigurationProperty + private KeyStoreParameters keystore; + /** + * Salesforce connected application Consumer token + */ + private String refreshToken; + private AuthenticationType type; + /** + * Salesforce account user name + */ + private String userName; + /** + * Salesforce account password + */ + private String password; + /** + * Flag to enable/disable lazy OAuth, default is false. When enabled, + * OAuth token retrieval or generation is not done until the first API + * call + */ + private Boolean lazyLogin; + + public String getLoginUrl() { + return loginUrl; + } + + public void setLoginUrl(String loginUrl) { + this.loginUrl = loginUrl; + } + + public String getClientId() { + return clientId; + } + + public void setClientId(String clientId) { + this.clientId = clientId; + } + + public String getClientSecret() { + return clientSecret; + } + + public void setClientSecret(String clientSecret) { + this.clientSecret = clientSecret; + } + + public KeyStoreParameters getKeystore() { + return keystore; + } + + public void setKeystore(KeyStoreParameters keystore) { + this.keystore = keystore; + } + + public String getRefreshToken() { + return refreshToken; + } + + public void setRefreshToken(String refreshToken) { + this.refreshToken = refreshToken; + } + + public AuthenticationType getType() { + return type; + } + + public void setType(AuthenticationType type) { + this.type = type; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public Boolean getLazyLogin() { + return lazyLogin; + } + + public void setLazyLogin(Boolean lazyLogin) { + this.lazyLogin = lazyLogin; + } + } } \ No newline at end of file
