Repository: camel Updated Branches: refs/heads/master b831203b8 -> 66049a922
CAMEL-11570: Renamed application.properties to example.properties application.properties caused confusion with spring boot applications Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b3bb8a24 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b3bb8a24 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b3bb8a24 Branch: refs/heads/master Commit: b3bb8a246daf18b12fc342e7587c7ce138e58410 Parents: ab0b4ac Author: sarelp <sa...@yannitech.com> Authored: Tue Jul 25 10:14:19 2017 +1000 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jul 25 10:45:31 2017 +0200 ---------------------------------------------------------------------- .../google/pubsub/MessageConsumerClient.java | 2 +- .../google/pubsub/MessagePublisherClient.java | 2 +- .../camel/example/google/pubsub/PubsubUtil.java | 2 +- .../src/main/resources/application.properties | 40 -------------------- .../src/main/resources/example.properties | 40 ++++++++++++++++++++ 5 files changed, 43 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b3bb8a24/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/MessageConsumerClient.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/MessageConsumerClient.java b/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/MessageConsumerClient.java index ce6e93d..153abdb 100644 --- a/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/MessageConsumerClient.java +++ b/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/MessageConsumerClient.java @@ -46,7 +46,7 @@ public final class MessageConsumerClient { camelContext.addRoutes(new RouteBuilder() { public void configure() { PropertiesComponent pc = getContext().getComponent("properties", PropertiesComponent.class); - pc.setLocation("classpath:application.properties"); + pc.setLocation("classpath:example.properties"); log.info("About to start route: Google Pubsub -> Log "); http://git-wip-us.apache.org/repos/asf/camel/blob/b3bb8a24/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/MessagePublisherClient.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/MessagePublisherClient.java b/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/MessagePublisherClient.java index 06ea9b3..c4f63dc 100644 --- a/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/MessagePublisherClient.java +++ b/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/MessagePublisherClient.java @@ -49,7 +49,7 @@ public final class MessagePublisherClient { camelContext.addRoutes(new RouteBuilder() { public void configure() { PropertiesComponent pc = getContext().getComponent("properties", PropertiesComponent.class); - pc.setLocation("classpath:application.properties"); + pc.setLocation("classpath:example.properties"); // setup google pubsub component GooglePubsubComponent googlePubsub = PubsubUtil.createComponent(); http://git-wip-us.apache.org/repos/asf/camel/blob/b3bb8a24/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/PubsubUtil.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/PubsubUtil.java b/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/PubsubUtil.java index 7ebd4c8..1e6b70d 100644 --- a/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/PubsubUtil.java +++ b/examples/camel-example-google-pubsub/src/main/java/org/apache/camel/example/google/pubsub/PubsubUtil.java @@ -43,7 +43,7 @@ public interface PubsubUtil { static Properties loadProperties() { Properties properties = new Properties(); - InputStream fileIn = PubsubUtil.class.getClassLoader().getResourceAsStream("application.properties"); + InputStream fileIn = PubsubUtil.class.getClassLoader().getResourceAsStream("example.properties"); try { properties.load(fileIn); http://git-wip-us.apache.org/repos/asf/camel/blob/b3bb8a24/examples/camel-example-google-pubsub/src/main/resources/application.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-google-pubsub/src/main/resources/application.properties b/examples/camel-example-google-pubsub/src/main/resources/application.properties deleted file mode 100644 index 680832a..0000000 --- a/examples/camel-example-google-pubsub/src/main/resources/application.properties +++ /dev/null @@ -1,40 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -# Consumer properties - -# No of simultaneous pull requests -consumer.concurrentConsumers=1 - -# Max number of messages per poll -consumer.maxMessagesPerPoll=10 - -# Pubsub service url. Defaults to google cloud default endpoint -# pubsub.serviceUrl=localhost:8383 - -pubsub.projectId=scg-bi-sandbox - -# Google Pubsub topic -pubsub.topic=camel-google-pubsub-example -# Google Pubsub subscription -pubsub.subscription=camel-google-pubsub-example.sub - - -#credentials.fileLocation= -#credentials.account=test-acco...@camel-pubsub-component.iam.gserviceaccount.com -#credentials.key=-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCfCiEwLed3hJ+h\n3zkpsGZj+MEB8MbpbqdUsiAp+Ok05zchGHM8iEG5s4gh013CI0rnta4zYDTrB98p\nBD+BX0TFP4S1QecSK0RoaJ8OmLYgYN56olobbedPRRdZIwopvQ7wSIqrEwWtez6Y\nRXcQzykYzETDEc2s0JyJU9BI2ZAENPbMheZICUkLHJdX0FqVf5WTtRDXnyL79CiW\nRirqN+eJdhq46Dz/TlEymuMePZVWAdcx0v8xv102H9bqFWtJvin8pD6fIT6f2iL1\ne/lQjNUVvX7Sx2EuLWZlPo+mWNvRCTXZymTcluj0jleAYhjuMc2xVEDx2RaCt2sx\nCo2Nb0edAgMBAAECggEAIFEJn2WkhCfB3D2kuvDqTWQtq/xGHwbqH462dHDsymA1\nVpdGS0WQvXBauCzf/2P2g5DqXewttJh74zTGxr4aFk6q474JeyqpkuG3eFrVn0yv\nyJGW5730Y6oxbV5uYT7We0LyUoLiA3dop75tzE+cFTrkuhKzDWuyc0FBsJvs5L2e\nl/xJh7M8I6+9h+NlP9p90NujxSTIIYD/Ft7+KucG5q8ZlQksHnS6RavLPJ/lShmZ\nFmoGwJnNTwBSZnlz8txnWVjSDtTiqdrKrQVTeT8Vu8X0tw9lu49t9OsdrLkAVhHe\nyEF8WJmYlOhxIN8vgz6XYIUGzC1k00JB4fHTFaXygQKBgQD5HtUZL1ZtDDa+N/wx\npxQitmcI/ZkHHTIbRvy65XOAXBr4Ipa/eOHdrCZw7GAlj2zHIZJwIOg+6vfF2959\nirWBiwmLSvldMlGL6QaCWgqfhHJH8UIjeeYnmU1q6YBsFr1m8jDgzp/QLNpTKMjW\nvfN6cqJedRJiym1tTvtXjhip4QK BgQCjbnd3dLAYIOMsARKOj7rAjzDWVgFRIhOR\nUgPY+zCsgLp/ffKUqH2fhS9R6RAXosVeMBChn6kePVxxbVXjw18fGKdXgSjBXjQh\neyXjkKHe7gPT9MyuAk22tNpkAWcht5nR+mA8wLT23C0CYBblch7dDm+dc6QtLlHt\np4xuvHptPQKBgGBqAmdg3r4NgBJWcJB27WAR4Aamv1b1gbL04lMjAnSnMPjfyiAI\nlMHKIoaJtRxUSfE3mQk0cy4GmiZFVfKYgG7GdMcoGSJsmwrfANnqJzpddC1LviEk\nyGKC/mdmP4GVu2/gQ/J9hXR4J3cPzcrucRDu1NBh1t/NIFSxwKy+HeWBAoGATOoB\nKWPuN/zKTPxYOmWkM1lwV370cbWC1gJuMyDMYHLY0oV4s8O0E23/viHcY/NDxbcD\nLL1SPxwLtIoLQPzCeIUGxGTRxGdMS3GEfFumAp+rh4YPCdmlr1Xf7e7HFZQtvSeD\nQTRENmWafSKxw9v4cHqJxuUUn/rLrfgLXFYxm9UCgYEAwlPP5J4pr19rokKIoS00\nRLrIKipEmiQoo1ENP4efjuAFMMxLQnXnx1NusiVEHb5RUiHAEY5sm5OxyP1XN+RF\nch2BhWnx+4+quIsspNkc9qfQKS9Xvb/GulhRTS/NKQSBNjs+Qe80LxBcuHdFhf1y\nrskSCZARtDqGrfblLQo26Mg=\n-----END PRIVATE KEY----- - http://git-wip-us.apache.org/repos/asf/camel/blob/b3bb8a24/examples/camel-example-google-pubsub/src/main/resources/example.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-google-pubsub/src/main/resources/example.properties b/examples/camel-example-google-pubsub/src/main/resources/example.properties new file mode 100644 index 0000000..680832a --- /dev/null +++ b/examples/camel-example-google-pubsub/src/main/resources/example.properties @@ -0,0 +1,40 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +# Consumer properties + +# No of simultaneous pull requests +consumer.concurrentConsumers=1 + +# Max number of messages per poll +consumer.maxMessagesPerPoll=10 + +# Pubsub service url. Defaults to google cloud default endpoint +# pubsub.serviceUrl=localhost:8383 + +pubsub.projectId=scg-bi-sandbox + +# Google Pubsub topic +pubsub.topic=camel-google-pubsub-example +# Google Pubsub subscription +pubsub.subscription=camel-google-pubsub-example.sub + + +#credentials.fileLocation= +#credentials.account=test-acco...@camel-pubsub-component.iam.gserviceaccount.com +#credentials.key=-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCfCiEwLed3hJ+h\n3zkpsGZj+MEB8MbpbqdUsiAp+Ok05zchGHM8iEG5s4gh013CI0rnta4zYDTrB98p\nBD+BX0TFP4S1QecSK0RoaJ8OmLYgYN56olobbedPRRdZIwopvQ7wSIqrEwWtez6Y\nRXcQzykYzETDEc2s0JyJU9BI2ZAENPbMheZICUkLHJdX0FqVf5WTtRDXnyL79CiW\nRirqN+eJdhq46Dz/TlEymuMePZVWAdcx0v8xv102H9bqFWtJvin8pD6fIT6f2iL1\ne/lQjNUVvX7Sx2EuLWZlPo+mWNvRCTXZymTcluj0jleAYhjuMc2xVEDx2RaCt2sx\nCo2Nb0edAgMBAAECggEAIFEJn2WkhCfB3D2kuvDqTWQtq/xGHwbqH462dHDsymA1\nVpdGS0WQvXBauCzf/2P2g5DqXewttJh74zTGxr4aFk6q474JeyqpkuG3eFrVn0yv\nyJGW5730Y6oxbV5uYT7We0LyUoLiA3dop75tzE+cFTrkuhKzDWuyc0FBsJvs5L2e\nl/xJh7M8I6+9h+NlP9p90NujxSTIIYD/Ft7+KucG5q8ZlQksHnS6RavLPJ/lShmZ\nFmoGwJnNTwBSZnlz8txnWVjSDtTiqdrKrQVTeT8Vu8X0tw9lu49t9OsdrLkAVhHe\nyEF8WJmYlOhxIN8vgz6XYIUGzC1k00JB4fHTFaXygQKBgQD5HtUZL1ZtDDa+N/wx\npxQitmcI/ZkHHTIbRvy65XOAXBr4Ipa/eOHdrCZw7GAlj2zHIZJwIOg+6vfF2959\nirWBiwmLSvldMlGL6QaCWgqfhHJH8UIjeeYnmU1q6YBsFr1m8jDgzp/QLNpTKMjW\nvfN6cqJedRJiym1tTvtXjhip4QK BgQCjbnd3dLAYIOMsARKOj7rAjzDWVgFRIhOR\nUgPY+zCsgLp/ffKUqH2fhS9R6RAXosVeMBChn6kePVxxbVXjw18fGKdXgSjBXjQh\neyXjkKHe7gPT9MyuAk22tNpkAWcht5nR+mA8wLT23C0CYBblch7dDm+dc6QtLlHt\np4xuvHptPQKBgGBqAmdg3r4NgBJWcJB27WAR4Aamv1b1gbL04lMjAnSnMPjfyiAI\nlMHKIoaJtRxUSfE3mQk0cy4GmiZFVfKYgG7GdMcoGSJsmwrfANnqJzpddC1LviEk\nyGKC/mdmP4GVu2/gQ/J9hXR4J3cPzcrucRDu1NBh1t/NIFSxwKy+HeWBAoGATOoB\nKWPuN/zKTPxYOmWkM1lwV370cbWC1gJuMyDMYHLY0oV4s8O0E23/viHcY/NDxbcD\nLL1SPxwLtIoLQPzCeIUGxGTRxGdMS3GEfFumAp+rh4YPCdmlr1Xf7e7HFZQtvSeD\nQTRENmWafSKxw9v4cHqJxuUUn/rLrfgLXFYxm9UCgYEAwlPP5J4pr19rokKIoS00\nRLrIKipEmiQoo1ENP4efjuAFMMxLQnXnx1NusiVEHb5RUiHAEY5sm5OxyP1XN+RF\nch2BhWnx+4+quIsspNkc9qfQKS9Xvb/GulhRTS/NKQSBNjs+Qe80LxBcuHdFhf1y\nrskSCZARtDqGrfblLQo26Mg=\n-----END PRIVATE KEY----- +
