You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/03 16:27:48 UTC
git commit: Get camel-linkedin and camel-olingo2 feature to work
Repository: camel
Updated Branches:
refs/heads/master ff9b96a61 -> c07da37df
Get camel-linkedin and camel-olingo2 feature to work
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c07da37d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c07da37d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c07da37d
Branch: refs/heads/master
Commit: c07da37df8a87f43e8c299078e7746f647a1b575
Parents: ff9b96a
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Sep 3 22:27:14 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Sep 3 22:27:27 2014 +0800
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../features/src/main/resources/features.xml | 35 ++++++++++++------
.../camel/itest/karaf/CamelLinkedinTest.java | 39 ++++++++++++++++++++
.../camel/itest/karaf/CamelOlingo2Test.java | 39 ++++++++++++++++++++
4 files changed, 103 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c07da37d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 717b600..e3ce036 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -104,7 +104,7 @@
<commons-jxpath-version>1.3</commons-jxpath-version>
<commons-lang-version>2.6</commons-lang-version>
<commons-lang-version-xmljson>2.5</commons-lang-version-xmljson>
- <commons-lang3-version>3.1</commons-lang3-version>
+ <commons-lang3-version>3.3.2</commons-lang3-version>
<commons-logging-version>1.1.3</commons-logging-version>
<commons-math-version>2.2</commons-math-version>
<commons-math3-version>3.3</commons-math3-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/c07da37d/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 762a321..5a57309 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -174,12 +174,11 @@
<feature name='camel-box' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-box/${project.version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpcore/${httpcore4-version}$Export-Package=org.apache.http.*;version=${httpcore4-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpclient/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.apache.httpcomponents/httpclient-cache/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</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'>wrap:mvn:org.apache.httpcomponents/httpmime/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
- <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <!--bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle-->
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
@@ -774,18 +773,31 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-ldap/${project.version}</bundle>
</feature>
- <!-- TODO this feature doesn't work, we need to create htmlunit bundle first -->
- <!--feature name='camel-linkedin' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature name='camel-linkedin' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${cxf-version-range}'>cxf-core</feature>
<feature version='${cxf-version-range}'>cxf-jaxrs</feature>
<feature version='${cxf-version-range}'>cxf-http-jetty</feature>
+ <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'>wrap:mvn:org.apache.httpcomponents/httpmime/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
+ <!-- TODO need to replace it with org.apache.servicemix.bundles.httpunit -->
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit/${htmlunit.version}</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.htmlunit/htmlunit-core-js/${htmlunit.version}</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.14</bundle>
+ <bundle dependency='true'>wrap:mvn:org.w3c.css/sac/1.3</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.21</bundle>
<bundle>mvn:org.apache.camel.component.linkedin/camel-linkedin-api/${project.version}</bundle>
<bundle>mvn:org.apache.camel.component.linkedin/camel-linkedin/${project.version}</bundle>
- </feature-->
+ </feature>
<feature name='camel-leveldb' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>wrap:mvn:org.fusesource.leveldbjni/leveldbjni-all/${leveldbjni-version}$Bundle-Version=${leveldbjni-version}&Export-Package=*;-noimport:=true;version="${leveldbjni-version}"</bundle>
@@ -904,8 +916,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ognl/${project.version}</bundle>
</feature>
- <!--TODO this feature doesn't work olingo-odata2-core need to export more package -->
- <!--feature name='camel-olingo2' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature name='camel-olingo2' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${project.version}'>camel-core</feature>
<feature>http</feature>
@@ -913,12 +924,14 @@
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle dependency='true'>mvn:org.apache.httpcomponents/httpasyncclient-osgi/${httpasyncclient-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
<bundle dependency='true'>mvn:org.apache.olingo/olingo-odata2-api/${olingo2-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.olingo/olingo-odata2-core/${olingo2-version}</bundle>
+ <!-- need to use the released bundle-->
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.olingo-odata2-core/2.0.0_1-SNAPSHOT</bundle>
<bundle>mvn:org.apache.camel.component.olingo2/camel-olingo2-api/${project.version}</bundle>
<bundle>mvn:org.apache.camel.component.olingo2/camel-olingo2/${project.version}</bundle>
- </feature-->
+ </feature>
<feature name='camel-openshift' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>wrap:mvn:com.openshift/openshift-java-client/${openshift-java-client-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/c07da37d/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLinkedinTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLinkedinTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLinkedinTest.java
new file mode 100644
index 0000000..091b918
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLinkedinTest.java
@@ -0,0 +1,39 @@
+/**
+ * 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 CamelLinkedinTest extends AbstractFeatureTest {
+ public static final String COMPONENT = extractName(CamelLinkedinTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+ @Configuration
+ public Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/c07da37d/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo2Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo2Test.java
new file mode 100644
index 0000000..3ca27e0
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOlingo2Test.java
@@ -0,0 +1,39 @@
+/**
+ * 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 CamelOlingo2Test extends AbstractFeatureTest {
+ public static final String COMPONENT = extractName(CamelOlingo2Test.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+ @Configuration
+ public Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}