Repository: camel Updated Branches: refs/heads/master dba22f93a -> 38d5374aa
http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/components/camel-consul/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/components/camel-consul/src/main/resources/META-INF/LICENSE.txt b/components/camel-consul/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000..6b0b127 --- /dev/null +++ b/components/camel-consul/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/components/camel-consul/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/components/camel-consul/src/main/resources/META-INF/NOTICE.txt b/components/camel-consul/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..2e215bf --- /dev/null +++ b/components/camel-consul/src/main/resources/META-INF/NOTICE.txt @@ -0,0 +1,11 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache Camel distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/components/camel-consul/src/main/resources/META-INF/services/org/apache/camel/component/consul ---------------------------------------------------------------------- diff --git a/components/camel-consul/src/main/resources/META-INF/services/org/apache/camel/component/consul b/components/camel-consul/src/main/resources/META-INF/services/org/apache/camel/component/consul new file mode 100644 index 0000000..e1e36dc --- /dev/null +++ b/components/camel-consul/src/main/resources/META-INF/services/org/apache/camel/component/consul @@ -0,0 +1 @@ +class=org.apache.camel.component.consul.ConsulComponent http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java ---------------------------------------------------------------------- diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java new file mode 100644 index 0000000..372b592 --- /dev/null +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventTest.java @@ -0,0 +1,68 @@ +/** + * 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. + */ + +package org.apache.camel.component.consul; + +import java.util.List; + +import com.orbitz.consul.model.EventResponse; +import com.orbitz.consul.model.event.Event; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.consul.enpoint.ConsulEventActions; +import org.apache.camel.component.mock.MockEndpoint; +import org.junit.Test; + + +public class ConsulEventTest extends ConsulTestSupport { + + @Test + public void testFireEvent() throws Exception { + String key = generateRandomString(); + String val = generateRandomString(); + + MockEndpoint mock = getMockEndpoint("mock:event"); + mock.expectedMinimumMessageCount(1); + mock.expectedHeaderReceived(ConsulConstants.CONSUL_RESULT, true); + + fluentTemplate() + .withHeader(ConsulConstants.CONSUL_ACTION, ConsulEventActions.FIRE) + .withHeader(ConsulConstants.CONSUL_KEY, key) + .withBody(val) + .to("direct:event") + .send(); + + mock.assertIsSatisfied(); + + EventResponse response = getConsul().eventClient().listEvents(key); + List<Event> events = response.getEvents(); + + assertFalse(events.isEmpty()); + assertTrue(events.get(0).getPayload().isPresent()); + assertEquals(val, events.get(0).getPayload().get()); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() { + from("direct:event") + .to("consul:event") + .to("mock:event"); + } + }; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java ---------------------------------------------------------------------- diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java new file mode 100644 index 0000000..591c79c --- /dev/null +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulEventWatchTest.java @@ -0,0 +1,60 @@ +/** + * 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. + */ +package org.apache.camel.component.consul; + +import java.util.List; + +import com.orbitz.consul.EventClient; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.junit.Test; + +public class ConsulEventWatchTest extends ConsulTestSupport { + private String key; + private EventClient client; + + @Override + public void doPreSetup() { + key = generateRandomString(); + client = getConsul().eventClient(); + } + + @Test + public void testWatchEvent() throws Exception { + List<String> values = generateRandomListOfStrings(3); + + MockEndpoint mock = getMockEndpoint("mock:event-watch"); + mock.expectedMessageCount(values.size()); + mock.expectedBodiesReceived(values); + mock.expectedHeaderReceived(ConsulConstants.CONSUL_RESULT, true); + + values.forEach(v -> client.fireEvent(key, v)); + + mock.assertIsSatisfied(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() { + fromF("consul:event?key=%s", key) + .to("log:org.apache.camel.component.consul?level=INFO&showAll=true") + .to("mock:event-watch"); + } + }; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java ---------------------------------------------------------------------- diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java new file mode 100644 index 0000000..798acc7 --- /dev/null +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueTest.java @@ -0,0 +1,62 @@ +/** + * 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. + */ +package org.apache.camel.component.consul; + +import com.google.common.base.Optional; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.consul.enpoint.ConsulKeyValueActions; +import org.apache.camel.component.mock.MockEndpoint; +import org.junit.Test; + +public class ConsulKeyValueTest extends ConsulTestSupport { + + @Test + public void testKeyPut() throws Exception { + String key = generateKey(); + String val = generateRandomString(); + + MockEndpoint mock = getMockEndpoint("mock:kv"); + mock.expectedMinimumMessageCount(1); + mock.expectedBodiesReceived(val); + mock.expectedHeaderReceived(ConsulConstants.CONSUL_RESULT, true); + + fluentTemplate() + .withHeader(ConsulConstants.CONSUL_ACTION, ConsulKeyValueActions.PUT) + .withHeader(ConsulConstants.CONSUL_KEY, key) + .withBody(val) + .to("direct:kv") + .send(); + + mock.assertIsSatisfied(); + + Optional<String> keyVal = getConsul().keyValueClient().getValueAsString(key); + + assertTrue(keyVal.isPresent()); + assertEquals(val, keyVal.get()); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() { + from("direct:kv") + .to("consul:kv") + .to("mock:kv"); + } + }; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java ---------------------------------------------------------------------- diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java new file mode 100644 index 0000000..71dfbf5 --- /dev/null +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulKeyValueWatchTest.java @@ -0,0 +1,66 @@ +/** + * 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. + */ +package org.apache.camel.component.consul; + +import java.util.List; +import java.util.Random; + +import com.orbitz.consul.KeyValueClient; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.junit.Test; + +public class ConsulKeyValueWatchTest extends ConsulTestSupport { + private String key; + private KeyValueClient client; + private Random random; + + @Override + public void doPreSetup() { + key = generateKey(); + client = getConsul().keyValueClient(); + random = new Random(); + } + + @Test + public void testWatchKey() throws Exception { + List<String> values = generateRandomListOfStrings(3); + + MockEndpoint mock = getMockEndpoint("mock:kv-watch"); + mock.expectedMessageCount(values.size()); + mock.expectedBodiesReceived(values); + mock.expectedHeaderReceived(ConsulConstants.CONSUL_RESULT, true); + + for (String val : values) { + client.putValue(key, val); + Thread.sleep(250 + random.nextInt(250)); + } + + mock.assertIsSatisfied(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() { + fromF("consul:kv?key=%s&valueAsString=true", key) + .to("log:org.apache.camel.component.consul?level=INFO&showAll=true") + .to("mock:kv-watch"); + } + }; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java new file mode 100644 index 0000000..6cf3683 --- /dev/null +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java @@ -0,0 +1,64 @@ +/** + * 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. + */ +package org.apache.camel.component.consul; + +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +import com.orbitz.consul.Consul; +import com.orbitz.consul.KeyValueClient; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Rule; +import org.junit.rules.TestName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ConsulTestSupport extends CamelTestSupport { + public static final Logger LOGGER = LoggerFactory.getLogger(ConsulTestSupport.class); + public static final String KV_PREFIX = "/camel"; + + @Rule + public final TestName testName = new TestName(); + + protected Consul getConsul() { + return Consul.builder().build(); + } + + protected KeyValueClient getKeyValueClient() { + return getConsul().keyValueClient(); + } + + protected String generateRandomString() { + return UUID.randomUUID().toString(); + } + + protected String[] generateRandomArrayOfStrings(int size) { + String[] array = new String[size]; + Arrays.setAll(array, i -> generateRandomString()); + + return array; + } + + protected List<String> generateRandomListOfStrings(int size) { + return Arrays.asList(generateRandomArrayOfStrings(size)); + } + + protected String generateKey() { + return KV_PREFIX + "/" + testName.getMethodName() + "/" + generateRandomString(); + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/components/camel-consul/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-consul/src/test/resources/log4j.properties b/components/camel-consul/src/test/resources/log4j.properties new file mode 100644 index 0000000..4103089 --- /dev/null +++ b/components/camel-consul/src/test/resources/log4j.properties @@ -0,0 +1,20 @@ +# +# The logging properties used +# +log4j.rootLogger=INFO, file + +# uncomment the following line to turn on Camel debugging +log4j.logger.org.apache.camel.component.consul=DEBUG + +# CONSOLE appender not used by default +log4j.appender.out=org.apache.log4j.ConsoleAppender +log4j.appender.out.layout=org.apache.log4j.PatternLayout +log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n +#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n + +# File appender +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +log4j.appender.file.file=target/camel-consul-test.log +log4j.appender.file.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index 66ff56a..e84bf7f 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -86,6 +86,7 @@ <module>camel-cmis</module> <module>camel-coap</module> <module>camel-cometd</module> + <module>camel-consul</module> <module>camel-context</module> <module>camel-couchdb</module> <module>camel-crypto</module> http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d58e2d9..5aa1953 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -131,6 +131,8 @@ <commons-pool2-version>2.4.2</commons-pool2-version> <commons-vfs2-version>2.0</commons-vfs2-version> <compress-lzf-version>1.0.3</compress-lzf-version> + <consul-client-version>0.12.0</consul-client-version> + <consul-client-bundle-version>0.12.0_1</consul-client-bundle-version> <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version> <cxf-version>3.1.6</cxf-version> <cxf-version-range>[3.0,4.0)</cxf-version-range> @@ -822,6 +824,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-consul</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-context</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/platforms/karaf/features/src/main/resources/bundles.properties ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/bundles.properties b/platforms/karaf/features/src/main/resources/bundles.properties index affa23a..022290b 100644 --- a/platforms/karaf/features/src/main/resources/bundles.properties +++ b/platforms/karaf/features/src/main/resources/bundles.properties @@ -38,6 +38,7 @@ org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/${common org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}/jar +org.apache.servicemix.bundles/org.apache.servicemix.bundles.orbitz-consul-client/${consul-client-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}/jar org.apache.servicemix.bundles/org.apache.servicemix.bundles.fop/${fop-bundle-version}/jar http://git-wip-us.apache.org/repos/asf/camel/blob/38d5374a/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 97f04e1..3c9b2de 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -328,6 +328,12 @@ <bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-server}</bundle> <bundle>mvn:org.apache.camel/camel-cometd/${project.version}</bundle> </feature> + <feature name='camel-consul' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-core</feature> + <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.orbitz-consul-client/${consul-client-bundle-version}</bundle> + <bundle>mvn:org.apache.camel/camel-consul/${project.version}</bundle> + </feature> <feature name='camel-context' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-context/${project.version}</bundle>
