You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/10/23 07:45:17 UTC
[4/4] camel git commit: CAMEL-9145: Remove camel-hbase feature as it
does not really work in OSGi. And would also need a total new set of OSGi
bundles for Hadoop 2.x and its sister projects.
CAMEL-9145: Remove camel-hbase feature as it does not really work in OSGi. And would also need a total new set of OSGi bundles for Hadoop 2.x and its sister projects.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0706d470
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0706d470
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0706d470
Branch: refs/heads/master
Commit: 0706d4702326368bfac325221cdab8215902724c
Parents: 59328cb
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 23 07:47:40 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 23 07:47:40 2015 +0200
----------------------------------------------------------------------
.../features/src/main/resources/features.xml | 67 --------------------
.../camel/itest/karaf/CamelHbaseTest.java | 2 +
2 files changed, 2 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0706d470/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 113c9fd..66144a3 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -587,73 +587,6 @@
<bundle dependency='true'>mvn:com.hazelcast/hazelcast-client/${hazelcast-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hazelcast/${project.version}</bundle>
</feature>
- <feature name='camel-hbase' version='${project.version}' resolver='(obr)' start-level='50'>
- <details>The camel-hbase feature can only run if you have libsnappyjava.dylib in java.library.path</details>
- <!-- see https://issues.apache.org/jira/browse/HADOOP-7101 -->
- <details>Hadoop does not currently work properly in OSGi environment.</details>
- <feature version='${project.version}'>camel-core</feature>
- <feature version='${cxf-version-range}'>cxf-specs</feature>
- <bundle dependency="true">wrap:mvn:javax.servlet.jsp/jsp-api/2.1</bundle>
- <feature>war</feature>
- <bundle dependency='true'>mvn:org.osgi/org.osgi.compendium/${osgi-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-interceptor_1.1_spec/1.0</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
- <bundle dependency='true'>mvn:javax.mail/mail/${javax-mail-version}</bundle>
- <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
- <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}</bundle>
- <bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
- <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle>
- <bundle dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
- <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
- <bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
- <bundle dependency='true'>mvn:commons-daemon/commons-daemon/${commons-daemon-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.commons/commons-math/${commons-math-version}</bundle>
- <bundle dependency='true'>mvn:commons-net/commons-net/${commons-net-version}</bundle>
- <!-- need to use old version of commons-io due SMX bundle bug -->
- <bundle dependency='true'>mvn:commons-io/commons-io/1.4</bundle>
- <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-jaxrs/${jackson-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasper/${jasper-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hadoop-core/${hadoop-bundle-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hbase/${hbase-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-hbase/${project.version}</bundle>
- <!-- the following bundles can be removed when osgi metadata is fixed in commons-configuration and hbase, to have resolution=:option on packages that are optional -->
- <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.commons/commons-vfs2/${commons-vfs2-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-ipc-bundle-version}</bundle>
- <bundle dependency='true'>mvn:javax.jmdns/jmdns/3.4.1</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libthrift/0.9.0_1</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_6</bundle>
- <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jets3t/0.9.0_2</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jopt-simple/4.3_1</bundle>
- <bundle dependency='true'>mvn:org.xerial.snappy/snappy-java/${snappy-version}</bundle>
- <bundle dependency='true'>wrap:mvn:bsf/bsf/2.4.0</bundle>
- </feature>
<feature name='camel-hdfs' version='${project.version}' resolver='(obr)' start-level='50'>
<!-- see https://issues.apache.org/jira/browse/HADOOP-7101 -->
<details>Hadoop does not currently work properly in OSGi environment.</details>
http://git-wip-us.apache.org/repos/asf/camel/blob/0706d470/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
index 887816b..d941ff5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.itest.karaf;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -23,6 +24,7 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
+@Ignore("Need OSGi bundles of hadoop, and it does not run well in OSGi neither")
public class CamelHbaseTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelHbaseTest.class);