karaf feature and test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0c0811ea Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0c0811ea Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0c0811ea Branch: refs/heads/master Commit: 0c0811ea339c1a2e422ee1ab016ed99f5d4c9eb4 Parents: f84f70d Author: Fabrizio Spataro <fabrizio.spat...@bizmate.it> Authored: Mon Oct 17 11:14:52 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Mon Oct 17 13:11:29 2016 +0200 ---------------------------------------------------------------------- components/camel-drill/pom.xml | 13 ++++++++++--- .../camel-drill/src/main/docs/drill-component.adoc | 14 +++++--------- .../karaf/features/src/main/resources/features.xml | 3 ++- 3 files changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0c0811ea/components/camel-drill/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-drill/pom.xml b/components/camel-drill/pom.xml index 1d2b47d..cb7f3bc 100644 --- a/components/camel-drill/pom.xml +++ b/components/camel-drill/pom.xml @@ -30,9 +30,16 @@ <description>Camel Apache Drill support</description> <properties> - <camel.osgi.export.pkg>org.apache.camel.component.drill.*</camel.osgi.export.pkg> - <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=drill</camel.osgi.export.service> - </properties> + <camel.osgi.export.pkg> + org.apache.camel.component.drill.*;${camel.osgi.version} + </camel.osgi.export.pkg> + <camel.osgi.import.pkg> + !org.apache.camel.component.drill.*, + ${camel.osgi.import.defaults}, + * + </camel.osgi.import.pkg> + <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=drill</camel.osgi.export.service> + </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/0c0811ea/components/camel-drill/src/main/docs/drill-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-drill/src/main/docs/drill-component.adoc b/components/camel-drill/src/main/docs/drill-component.adoc index 0999a96..7902860 100644 --- a/components/camel-drill/src/main/docs/drill-component.adoc +++ b/components/camel-drill/src/main/docs/drill-component.adoc @@ -50,22 +50,18 @@ The DRILL component has no options. // endpoint options: START -The DRILL component supports 5 endpoint options which are listed below: +The DRILL component supports 6 endpoint options which are listed below: {% raw %} [width="100%",cols="2,1,1m,1m,5",options="header"] |======================================================================= | Name | Group | Default | Java Type | Description -| port | producer | 2181 | Integer | Connection port +| host | producer | | String | *Required* ZooKeeper host name or IP address. Use local instead of a host name or IP address to connect to the local Drillbit | clusterId | producer | | String | Cluster ID https://drill.apache.org/docs/using-the-jdbc-driver/determining-the-cluster-id | directory | producer | | String | Drill directory in ZooKeeper -| mode | producer | zk | DrillConnectionMode | Connection mode: - - - DrillConnectionMode.ZK: Zookeeper - - - DrillConnectionMode.DRILLBIT: Drillbit direct connection - - https://drill.apache.org/docs/using-the-jdbc-driver/ +| mode | producer | ZK | DrillConnectionMode | Connection mode: zk: Zookeeper drillbit: Drillbit direct connection https://drill.apache.org/docs/using-the-jdbc-driver/ +| port | producer | | Integer | ZooKeeper port number +| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). |======================================================================= {% endraw %} // endpoint options: END http://git-wip-us.apache.org/repos/asf/camel/blob/0c0811ea/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 dc40094..692a308 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -423,7 +423,8 @@ </feature> <feature name='camel-drill' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.apachedrill/${apache-drill-bundle-version}</bundle> + <feature version='${spring-version-range}'>spring-jdbc</feature> + <bundle dependency='true'>wrap:mvn:org.apache.drill.exec/drill-jdbc-all/${apache-drill-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-drill/${project.version}</bundle> </feature> <feature name='camel-dozer' version='${project.version}' resolver='(obr)' start-level='50'>
