Repository: camel Updated Branches: refs/heads/master 065561d24 -> 388b787bb
CAMEL-10721: Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe9d104c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe9d104c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe9d104c Branch: refs/heads/master Commit: fe9d104cc39044349f3b3690a467b35d0b1b6dd5 Parents: 065561d Author: Claus Ibsen <[email protected]> Authored: Thu Jan 19 12:52:06 2017 +0100 Committer: Claus Ibsen <[email protected]> Committed: Thu Jan 19 12:52:06 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/maven/connector/ConnectorMojo.java | 6 +++--- .../bar-connector/src/main/resources/camel-connector.json | 2 +- .../foo-connector/src/main/resources/camel-connector.json | 2 +- .../wine-connector/src/main/resources/camel-connector.json | 2 +- .../src/main/resources/camel-connector.json | 8 +++++++- 5 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fe9d104c/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java ---------------------------------------------------------------------- diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java index 208c4e5..31123cc 100644 --- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java +++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java @@ -266,7 +266,6 @@ public class ConnectorMojo extends AbstractJarMojo { private String buildComponentHeaderSchema(List<Map<String, String>> rows, Map dto, String gitUrl) throws Exception { String baseScheme = (String) dto.get("baseScheme"); - String source = (String) dto.get("source"); String title = (String) dto.get("name"); String scheme = StringHelper.camelCaseToDash(title); String baseSyntax = getOption(rows, "syntax"); @@ -280,8 +279,9 @@ public class ConnectorMojo extends AbstractJarMojo { label = labels.stream().collect(Collectors.joining(",")); } String async = getOption(rows, "async"); - String producerOnly = "To".equals(source) ? "true" : null; - String consumerOnly = "From".equals(source) ? "true" : null; + String pattern = (String) dto.get("pattern"); + String producerOnly = "To".equalsIgnoreCase(pattern) ? "true" : null; + String consumerOnly = "From".equalsIgnoreCase(pattern) ? "true" : null; String lenientProperties = getOption(rows, "lenientProperties"); String javaType = extractJavaType(scheme); String groupId = getProject().getGroupId(); http://git-wip-us.apache.org/repos/asf/camel/blob/fe9d104c/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 a85257c..d3ebcac 100644 --- a/connectors/examples/bar-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/bar-connector/src/main/resources/camel-connector.json @@ -12,7 +12,7 @@ "version" : "2.19.0-SNAPSHOT", "description" : "To order two drinks from the bar", "labels" : [ "bar" ], - "source" : "To", + "pattern" : "To", "endpointOptions" : [ "drink", "amount" ], "endpointValues" : { "amount" : "2" http://git-wip-us.apache.org/repos/asf/camel/blob/fe9d104c/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 6b683b3..31e81ea 100644 --- a/connectors/examples/foo-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/foo-connector/src/main/resources/camel-connector.json @@ -12,7 +12,7 @@ "version" : "2.19.0-SNAPSHOT", "description" : "Something cool", "labels" : [ "foo", "timer" ], - "source" : "From", + "pattern" : "From", "endpointOptions" : [ "timerName", "period", "repeatCount" ], "endpointValues" : { "fixedRate" : "true", http://git-wip-us.apache.org/repos/asf/camel/blob/fe9d104c/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 f49cb4d..def291c 100644 --- a/connectors/examples/wine-connector/src/main/resources/camel-connector.json +++ b/connectors/examples/wine-connector/src/main/resources/camel-connector.json @@ -12,7 +12,7 @@ "version" : "2.19.0-SNAPSHOT", "description" : "To order wine from the bar", "labels" : [ "bar" ], - "source" : "To", + "pattern" : "To", "endpointOptions" : [ "drink", "amount" ], "endpointValues" : { "drink" : "Wine" http://git-wip-us.apache.org/repos/asf/camel/blob/fe9d104c/tooling/archetypes/camel-archetype-connector/src/main/resources/archetype-resources/src/main/resources/camel-connector.json ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-connector/src/main/resources/archetype-resources/src/main/resources/camel-connector.json b/tooling/archetypes/camel-archetype-connector/src/main/resources/archetype-resources/src/main/resources/camel-connector.json index df1e313..6a77cb3 100644 --- a/tooling/archetypes/camel-archetype-connector/src/main/resources/archetype-resources/src/main/resources/camel-connector.json +++ b/tooling/archetypes/camel-archetype-connector/src/main/resources/archetype-resources/src/main/resources/camel-connector.json @@ -9,5 +9,11 @@ "groupId": "${groupId}", "artifactId": "${artifactId}", "version": "${version}", - "description": "${description}" + "description": "${description}", + "labels" : [ "foo", "bar" ], + "pattern": "From", + "endpointOptions" : [ "foo", "bar" ], + "endpointValues" : { + "foo" : "2" + } } \ No newline at end of file
