camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/2] git commit: CAMEL-6974 Added this Missing fields in RestResources DTO of Salesforce component with thanks to Dhiraj
Date Tue, 19 Nov 2013 03:11:35 GMT
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/053255f9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/053255f9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/053255f9

Branch: refs/heads/camel-2.12.x
Commit: 053255f9a2c75a128948ff2daca09c5857078135
Parents: e49fdd1
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Tue Nov 19 11:09:03 2013 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Tue Nov 19 11:09:36 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/053255f9/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/053255f9/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()) {


Mime
View raw message