Updated Branches: refs/heads/camel-2.12.x e49fdd146 -> 053255f9a refs/heads/master ee40f994e -> e1764350e
CAMEL-6974 Added this Missing fields in RestResources DTO of Salesforce component with thanks to Dhiraj Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e1764350 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e1764350 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e1764350 Branch: refs/heads/master Commit: e1764350e5a1b31eb9a728876fc2e2d4474cf2f1 Parents: ee40f99 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Tue Nov 19 11:09:03 2013 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Tue Nov 19 11:09:03 2013 +0800 ---------------------------------------------------------------------- .../salesforce/api/dto/RestResources.java | 17 +++++++++++++++++ .../maven/CamelSalesforceMojoIntegrationTest.java | 5 +++-- 2 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e1764350/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestResources.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestResources.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestResources.java index 9e7c644..ce108b1 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestResources.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/RestResources.java @@ -32,6 +32,8 @@ public class RestResources extends AbstractDTOBase { private String chatter; private String recent; private String tooling; + private String licensing; + private String analytics; public String getSobjects() { return sobjects; @@ -97,4 +99,19 @@ public class RestResources extends AbstractDTOBase { this.tooling = tooling; } + public String getLicensing() { + return licensing; + } + + public void setLicensing(String licensing) { + this.licensing = licensing; + } + + public String getAnalytics() { + return analytics; + } + + public void setAnalytics(String analytics) { + this.analytics = analytics; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/e1764350/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java index c6df2ac..406ce5f 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoIntegrationTest.java @@ -19,6 +19,7 @@ package org.apache.camel.maven; import java.io.*; import java.util.Properties; +import org.apache.camel.component.salesforce.SalesforceEndpointConfig; import org.apache.maven.plugin.logging.SystemStreamLog; import org.junit.Assert; import org.junit.Test; @@ -37,12 +38,12 @@ public class CamelSalesforceMojoIntegrationTest { setLoginProperties(mojo); // set defaults - mojo.version = "27.0"; + mojo.version = System.getProperty("apiVersion", SalesforceEndpointConfig.DEFAULT_VERSION); mojo.outputDirectory = new File("target/generated-sources/camel-salesforce"); mojo.packageName = "org.apache.camel.salesforce.dto"; // set code generation properties - mojo.includePattern = "(.*__c)|(PushTopic)"; + mojo.includePattern = "(.*__c)|(PushTopic)|(Document)"; // remove generated code directory if (mojo.outputDirectory.exists()) {
