CAMEL-9162: camel-elsql component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7241cadb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7241cadb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7241cadb Branch: refs/heads/master Commit: 7241cadbec7096a6536a5e57e6260c7bfc3c45d3 Parents: f6fcecf Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Oct 5 10:53:04 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Oct 5 10:54:55 2015 +0200 ---------------------------------------------------------------------- components/camel-elsql/pom.xml | 2 +- parent/pom.xml | 1 + .../features/src/main/resources/features.xml | 5 +++ .../camel/itest/karaf/CamelElsqlTest.java | 40 ++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7241cadb/components/camel-elsql/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-elsql/pom.xml b/components/camel-elsql/pom.xml index f45f7e6..8b22a3b 100644 --- a/components/camel-elsql/pom.xml +++ b/components/camel-elsql/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>com.opengamma</groupId> <artifactId>elsql</artifactId> - <version>1.1</version> + <version>${elsql-version}</version> </dependency> <!-- test dependencies --> http://git-wip-us.apache.org/repos/asf/camel/blob/7241cadb/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index b1c8655..c3a30f8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -146,6 +146,7 @@ <egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version> <elasticsearch-bundle-version>1.7.1_1</elasticsearch-bundle-version> <elasticsearch-version>1.7.1</elasticsearch-version> + <elsql-version>1.1</elsql-version> <el-api-1.0-version>1.0.1</el-api-1.0-version> <embedmongo-version>1.50.0</embedmongo-version> <exec-maven-plugin-version>1.2.1</exec-maven-plugin-version> http://git-wip-us.apache.org/repos/asf/camel/blob/7241cadb/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 c42e201..083a478 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -381,6 +381,11 @@ <bundle dependency='true'>wrap:mvn:com.squareup.okio/okio/${squareup-okio-version}</bundle> <bundle>mvn:org.apache.camel/camel-dropbox/${project.version}</bundle> </feature> + <feature name='camel-elsql' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version="${project.version}">camel-sql</feature> + <bundle dependency="true">wrap:mvn:com.opengamma/elsql/${elsql-version}</bundle> + <bundle>mvn:org.apache.camel/camel-elsql/${project.version}</bundle> + </feature> <feature name='camel-elasticsearch' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <feature>http</feature> http://git-wip-us.apache.org/repos/asf/camel/blob/7241cadb/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java new file mode 100644 index 0000000..78eb7b2 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java @@ -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. + */ +package org.apache.camel.itest.karaf; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.junit.PaxExam; + +@RunWith(PaxExam.class) +public class CamelElsqlTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelElsqlTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +}