Regen
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e3c42ab7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3c42ab7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3c42ab7 Branch: refs/heads/master Commit: e3c42ab77af211da3979c880db33072a6e77d7ab Parents: 91a66fc Author: Claus Ibsen <davscl...@apache.org> Authored: Mon May 15 11:45:37 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon May 15 11:57:09 2017 +0200 ---------------------------------------------------------------------- .../main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 38 ++++++++-------- .../main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 40 ++++++++-------- .../main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 48 ++++++++++---------- ...orceUpsertContactConnectorConfiguration.java | 2 +- .../main/resources/camel-connector-schema.json | 4 +- .../src/main/resources/camel-connector.json | 4 +- .../main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 4 +- .../java/org/foo/MentionAddContractRoute.java | 2 +- .../main/resources/camel-connector-schema.json | 2 +- .../src/main/resources/camel-connector.json | 46 ++++++++++--------- 14 files changed, 101 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json ---------------------------------------------------------------------- diff --git a/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json index 734c9f5..46b9216 100644 --- a/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/bar-connector/src/main/resources/camel-connector-schema.json @@ -14,7 +14,7 @@ "javaType": "org.foo.connector.BarComponent", "groupId": "org.foo", "artifactId": "bar-connector", - "version": "2.19.0-SNAPSHOT" + "version": "2.20.0-SNAPSHOT" }, "componentProperties": { }, http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/bar-connector/src/main/resources/camel-connector.json ---------------------------------------------------------------------- diff --git a/connectors/examples/bar-connector/src/main/resources/camel-connector.json b/connectors/examples/bar-connector/src/main/resources/camel-connector.json index 4c1acd2..6ded687 100644 --- a/connectors/examples/bar-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/bar-connector/src/main/resources/camel-connector.json @@ -1,22 +1,22 @@ { - "baseScheme": "beverage", - "baseGroupId": "org.foo", - "baseArtifactId": "beverage-component", - "baseVersion": "2.19.0-SNAPSHOT", - "baseJavaType": "org.beverage.BeverageComponent", - "name": "Bar", - "scheme": "bar", - "javaType": "org.foo.connector.BarComponent", - "groupId": "org.foo", - "artifactId": "wine-connector", - "version": "2.19.0-SNAPSHOT", - "description": "To order drinks from the bar", - "labels": [ "bar" ], - "pattern": "To", - "inputDataType": "*", - "outputDataType": "text", - "endpointOptions": [ "drink", "amount", "celebrity" ], - "endpointValues": { - "amount": 2 + "baseScheme" : "beverage", + "baseGroupId" : "org.foo", + "baseArtifactId" : "beverage-component", + "baseVersion" : "2.20.0-SNAPSHOT", + "baseJavaType" : "org.beverage.BeverageComponent", + "name" : "Bar", + "scheme" : "bar", + "javaType" : "org.foo.connector.BarComponent", + "groupId" : "org.foo", + "artifactId" : "wine-connector", + "version" : "2.20.0-SNAPSHOT", + "description" : "To order drinks from the bar", + "labels" : [ "bar" ], + "pattern" : "To", + "inputDataType" : "*", + "outputDataType" : "text", + "endpointOptions" : [ "drink", "amount", "celebrity" ], + "endpointValues" : { + "amount" : 2 } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json ---------------------------------------------------------------------- diff --git a/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json index 6e877bd..416faf6 100644 --- a/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/foo-connector/src/main/resources/camel-connector-schema.json @@ -14,7 +14,7 @@ "javaType": "org.foo.connector.FooComponent", "groupId": "org.foo", "artifactId": "foo-connector", - "version": "2.19.0-SNAPSHOT" + "version": "2.20.0-SNAPSHOT" }, "componentProperties": { }, http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/foo-connector/src/main/resources/camel-connector.json ---------------------------------------------------------------------- diff --git a/connectors/examples/foo-connector/src/main/resources/camel-connector.json b/connectors/examples/foo-connector/src/main/resources/camel-connector.json index 13f196f..c2bfda1 100644 --- a/connectors/examples/foo-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/foo-connector/src/main/resources/camel-connector.json @@ -1,23 +1,23 @@ { - "baseScheme": "timer", - "baseGroupId": "org.apache.camel", - "baseArtifactId": "camel-core", - "baseVersion": "2.19.0-SNAPSHOT", - "baseJavaType": "org.apache.camel.component.timer.TimerComponent", - "name": "Foo", - "scheme": "foo", - "javaType": "org.foo.connector.FooComponent", - "groupId": "org.foo", - "artifactId": "foo-connector", - "version": "2.19.0-SNAPSHOT", - "description": "Something cool", - "labels": [ "foo", "timer" ], - "pattern": "From", - "inputDataType": "none", - "outputDataType": "none", - "endpointOptions": [ "timerName", "period", "repeatCount" ], - "endpointValues": { - "fixedRate": true, - "period": 5000 + "baseScheme" : "timer", + "baseGroupId" : "org.apache.camel", + "baseArtifactId" : "camel-core", + "baseVersion" : "2.20.0-SNAPSHOT", + "baseJavaType" : "org.apache.camel.component.timer.TimerComponent", + "name" : "Foo", + "scheme" : "foo", + "javaType" : "org.foo.connector.FooComponent", + "groupId" : "org.foo", + "artifactId" : "foo-connector", + "version" : "2.20.0-SNAPSHOT", + "description" : "Something cool", + "labels" : [ "foo", "timer" ], + "pattern" : "From", + "inputDataType" : "none", + "outputDataType" : "none", + "endpointOptions" : [ "timerName", "period", "repeatCount" ], + "endpointValues" : { + "fixedRate" : true, + "period" : 5000 } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/petstore-connector/src/main/resources/camel-connector-schema.json ---------------------------------------------------------------------- diff --git a/connectors/examples/petstore-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/petstore-connector/src/main/resources/camel-connector-schema.json index 17302d8..04bcd73 100644 --- a/connectors/examples/petstore-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/petstore-connector/src/main/resources/camel-connector-schema.json @@ -14,7 +14,7 @@ "javaType": "org.foo.connector.PetStoreComponent", "groupId": "org.foo", "artifactId": "petstore-connector", - "version": "2.19.0-SNAPSHOT" + "version": "2.20.0-SNAPSHOT" }, "componentProperties": { "specificationUri": { "kind": "property", "displayName": "Specification Uri", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "defaultValue": "http://petstore.swagger.io/v2/swagger.json";, "description": "Path to the Swagger specification file. The scheme host base path are taken from this specification but these can be overriden with properties on the component or endpoint level. If not given the component tries to load swagger.json resource. Note that the host defined on the component and endpoint of this Component should contain the scheme hostname and optionally the port in the URI syntax (i.e. https://api.example.com:8080). Can be overriden in endpoint configuration." } http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/petstore-connector/src/main/resources/camel-connector.json ---------------------------------------------------------------------- diff --git a/connectors/examples/petstore-connector/src/main/resources/camel-connector.json b/connectors/examples/petstore-connector/src/main/resources/camel-connector.json index 463c5e5..f701a65 100644 --- a/connectors/examples/petstore-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/petstore-connector/src/main/resources/camel-connector.json @@ -1,28 +1,28 @@ { - "baseScheme": "rest-swagger", - "baseGroupId": "org.apache.camel", - "baseArtifactId": "camel-rest-swagger", - "baseVersion": "2.19.0-SNAPSHOT", - "baseJavaType": "org.apache.camel.component.rest.swagger.RestSwaggerComponent", - "name": "PetStore", - "scheme": "petstore", - "javaType": "org.foo.connector.PetStoreComponent", - "groupId": "org.foo", - "artifactId": "petstore-connector", - "version": "2.19.0-SNAPSHOT", - "description": "Pets in the store", - "labels": [ "api", "rest" ], - "pattern": "From", - "scheduler": "timer", - "inputDataType": "none", - "outputDataType": "json", - "componentOptions": [ "specificationUri" ], - "globalOptions": [ "specificationUri" ], - "endpointOptions": [ "operationId", "schedulerPeriod" ], - "componentValues": { - "specificationUri": "http://petstore.swagger.io/v2/swagger.json"; + "baseScheme" : "rest-swagger", + "baseGroupId" : "org.apache.camel", + "baseArtifactId" : "camel-rest-swagger", + "baseVersion" : "2.20.0-SNAPSHOT", + "baseJavaType" : "org.apache.camel.component.rest.swagger.RestSwaggerComponent", + "name" : "PetStore", + "scheme" : "petstore", + "javaType" : "org.foo.connector.PetStoreComponent", + "groupId" : "org.foo", + "artifactId" : "petstore-connector", + "version" : "2.20.0-SNAPSHOT", + "description" : "Pets in the store", + "labels" : [ "api", "rest" ], + "pattern" : "From", + "scheduler" : "timer", + "inputDataType" : "none", + "outputDataType" : "json", + "componentOptions" : [ "specificationUri" ], + "globalOptions" : [ "specificationUri" ], + "endpointOptions" : [ "operationId", "schedulerPeriod" ], + "componentValues" : { + "specificationUri" : "http://petstore.swagger.io/v2/swagger.json"; }, - "endpointValues": { - "schedulerPeriod": 5000 + "endpointValues" : { + "schedulerPeriod" : 5000 } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/salesforce-upsert-contact-connector/src/main/java/org/foo/salesforce/contact/springboot/SalesforceUpsertContactConnectorConfiguration.java ---------------------------------------------------------------------- diff --git a/connectors/examples/salesforce-upsert-contact-connector/src/main/java/org/foo/salesforce/contact/springboot/SalesforceUpsertContactConnectorConfiguration.java b/connectors/examples/salesforce-upsert-contact-connector/src/main/java/org/foo/salesforce/contact/springboot/SalesforceUpsertContactConnectorConfiguration.java index 52484a2..740cb70 100644 --- a/connectors/examples/salesforce-upsert-contact-connector/src/main/java/org/foo/salesforce/contact/springboot/SalesforceUpsertContactConnectorConfiguration.java +++ b/connectors/examples/salesforce-upsert-contact-connector/src/main/java/org/foo/salesforce/contact/springboot/SalesforceUpsertContactConnectorConfiguration.java @@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class SalesforceUpsertContactConnectorConfiguration { /** - * URL of the Salesforce instance by default set to + * URL of the Salesforce instance used for authentication by default set to * https://login.salesforce.com */ private String loginUrl = "https://login.salesforce.com";; http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector-schema.json ---------------------------------------------------------------------- diff --git a/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector-schema.json index b552235..6e3813b 100644 --- a/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector-schema.json @@ -14,10 +14,10 @@ "javaType": "org.foo.salesforce.contact.SalesforceUpsertContactComponent", "groupId": "org.foo", "artifactId": "salesforce-upsert-contact-connector", - "version": "2.19.0-SNAPSHOT" + "version": "2.20.0-SNAPSHOT" }, "componentProperties": { - "loginUrl": { "kind": "property", "displayName": "Login Url", "group": "security", "label": "common,security", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "https://login.salesforce.com";, "description": "URL of the Salesforce instance by default set to https://login.salesforce.com"; }, + "loginUrl": { "kind": "property", "displayName": "Login Url", "group": "security", "label": "common,security", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "https://login.salesforce.com";, "description": "URL of the Salesforce instance used for authentication by default set to https://login.salesforce.com"; }, "clientId": { "kind": "property", "displayName": "Client Id", "group": "security", "label": "common,security", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "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." }, "refreshToken": { "kind": "property", "displayName": "Refresh Token", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "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 web application at localhost." } http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json ---------------------------------------------------------------------- diff --git a/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json index 79f2c10..bad488c 100644 --- a/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json @@ -2,14 +2,14 @@ "baseScheme" : "salesforce", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-salesforce", - "baseVersion" : "2.19.0-SNAPSHOT", + "baseVersion" : "2.20.0-SNAPSHOT", "baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent", "name" : "SalesforceUpsertContact", "scheme" : "salesforce-upsert-contact", "javaType" : "org.foo.salesforce.contact.SalesforceUpsertContactComponent", "groupId" : "org.foo", "artifactId" : "salesforce-upsert-contact-connector", - "version" : "2.19.0-SNAPSHOT", + "version" : "2.20.0-SNAPSHOT", "description" : "Create or update Salesforce Contact SObject", "labels" : [ "salesforce" ], "pattern" : "To", http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector-schema.json ---------------------------------------------------------------------- diff --git a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector-schema.json index 113f006..1e8c895 100644 --- a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector-schema.json @@ -14,7 +14,7 @@ "javaType": "org.foo.mention.TwitterMentionComponent", "groupId": "org.foo", "artifactId": "twitter-mention-connector", - "version": "2.19.0-SNAPSHOT" + "version": "2.20.0-SNAPSHOT" }, "componentProperties": { "accessToken": { "kind": "property", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "The access token" }, http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json ---------------------------------------------------------------------- diff --git a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json index 357a830..2ab77c2 100644 --- a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json @@ -2,14 +2,14 @@ "baseScheme" : "twitter", "baseGroupId" : "org.apache.camel", "baseArtifactId" : "camel-twitter", - "baseVersion" : "2.19.0-SNAPSHOT", + "baseVersion" : "2.20.0-SNAPSHOT", "baseJavaType" : "org.apache.camel.component.twitter.TwitterComponent", "name" : "TwitterMention", "scheme" : "twitter-mention", "javaType" : "org.foo.mention.TwitterMentionComponent", "groupId" : "org.foo", "artifactId" : "twitter-mention-connector", - "version" : "2.19.0-SNAPSHOT", + "version" : "2.20.0-SNAPSHOT", "description" : "Connection from twitter when anyone mention you", "labels" : [ "twitter" ], "pattern" : "From", http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/twitter-salesforce-example/src/main/java/org/foo/MentionAddContractRoute.java ---------------------------------------------------------------------- diff --git a/connectors/examples/twitter-salesforce-example/src/main/java/org/foo/MentionAddContractRoute.java b/connectors/examples/twitter-salesforce-example/src/main/java/org/foo/MentionAddContractRoute.java index f58625f..d7632b4 100644 --- a/connectors/examples/twitter-salesforce-example/src/main/java/org/foo/MentionAddContractRoute.java +++ b/connectors/examples/twitter-salesforce-example/src/main/java/org/foo/MentionAddContractRoute.java @@ -25,7 +25,7 @@ public class MentionAddContractRoute extends RouteBuilder { @Override public void configure() throws Exception { from("twitter-mention") - .log("I was mentioned by ${body}") + .log("Tweet id: ${body.id}. I was mentioned by: ${body}") .process("tweetToContactMapper") .to("salesforce-upsert-contact?sObjectIdName=TwitterScreenName__c"); } http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/wine-connector/src/main/resources/camel-connector-schema.json ---------------------------------------------------------------------- diff --git a/connectors/examples/wine-connector/src/main/resources/camel-connector-schema.json b/connectors/examples/wine-connector/src/main/resources/camel-connector-schema.json index 8fc2009..957f612 100644 --- a/connectors/examples/wine-connector/src/main/resources/camel-connector-schema.json +++ b/connectors/examples/wine-connector/src/main/resources/camel-connector-schema.json @@ -14,7 +14,7 @@ "javaType": "org.foo.connector.WineComponent", "groupId": "org.foo", "artifactId": "wine-connector", - "version": "2.19.0-SNAPSHOT" + "version": "2.20.0-SNAPSHOT" }, "componentProperties": { }, http://git-wip-us.apache.org/repos/asf/camel/blob/e3c42ab7/connectors/examples/wine-connector/src/main/resources/camel-connector.json ---------------------------------------------------------------------- diff --git a/connectors/examples/wine-connector/src/main/resources/camel-connector.json b/connectors/examples/wine-connector/src/main/resources/camel-connector.json index 683a1ab..98c8d8d 100644 --- a/connectors/examples/wine-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/wine-connector/src/main/resources/camel-connector.json @@ -1,25 +1,29 @@ { - "baseScheme": "beverage", - "baseGroupId": "org.foo", - "baseArtifactId": "beverage-component", - "baseVersion": "2.19.0-SNAPSHOT", - "baseJavaType": "org.beverage.BeverageComponent", - "name": "Wine", - "scheme": "wine", - "javaType": "org.foo.connector.WineComponent", - "groupId": "org.foo", - "artifactId": "wine-connector", - "version": "2.19.0-SNAPSHOT", - "description": "To order wine from the bar", - "labels": [ "bar" ], - "pattern": "To", - "inputDataType": "*", - "outputDataType": "text", - "endpointOptions": [ "drink", "amount" ], - "endpointValues": { - "drink": "Wine" + "baseScheme" : "beverage", + "baseGroupId" : "org.foo", + "baseArtifactId" : "beverage-component", + "baseVersion" : "2.20.0-SNAPSHOT", + "baseJavaType" : "org.beverage.BeverageComponent", + "name" : "Wine", + "scheme" : "wine", + "javaType" : "org.foo.connector.WineComponent", + "groupId" : "org.foo", + "artifactId" : "wine-connector", + "version" : "2.20.0-SNAPSHOT", + "description" : "To order wine from the bar", + "labels" : [ "bar" ], + "pattern" : "To", + "inputDataType" : "*", + "outputDataType" : "text", + "endpointOptions" : [ "drink", "amount" ], + "endpointValues" : { + "drink" : "Wine" }, - "endpointOverrides": { - "drink": { "displayName": "Wine Bottle", "enum": [ "Wine" ], "description": "You can only order wine" } + "endpointOverrides" : { + "drink" : { + "displayName" : "Wine Bottle", + "enum" : [ "Wine" ], + "description" : "You can only order wine" + } } } \ No newline at end of file
