camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject camel git commit: CAMEL-10614 - Camel-Openstack Karaf support
Date Sat, 17 Dec 2016 13:31:00 GMT
Repository: camel
Updated Branches:
  refs/heads/master 0364018f7 -> 0009b8f2c


CAMEL-10614 - Camel-Openstack Karaf support


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0009b8f2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0009b8f2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0009b8f2

Branch: refs/heads/master
Commit: 0009b8f2cbc1ee5c094cf01e91d50dc0837fecb1
Parents: 0364018
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Sat Dec 17 14:30:21 2016 +0100
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Sat Dec 17 14:30:21 2016 +0100

----------------------------------------------------------------------
 components/camel-openstack/pom.xml              |  2 +-
 parent/pom.xml                                  |  2 ++
 .../features/src/main/resources/features.xml    | 13 +++++++
 .../camel/itest/karaf/CamelOpenstackTest.java   | 38 ++++++++++++++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0009b8f2/components/camel-openstack/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml
index 06167fa..cfaf117 100644
--- a/components/camel-openstack/pom.xml
+++ b/components/camel-openstack/pom.xml
@@ -40,7 +40,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.pacesys.openstack4j.connectors</groupId>
-			<artifactId>openstack4j-jersey2</artifactId>
+			<artifactId>openstack4j-okhttp</artifactId>
 			<version>${openstack4j-version}</version>
 		</dependency>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/0009b8f2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1f39f7e..6e591d1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -51,6 +51,7 @@
     <aries-blueprint-core-version>1.4.4</aries-blueprint-core-version>
     <aries-blueprint-proxy-version>1.0.1</aries-blueprint-proxy-version>
     <aries-blueprint-proxy-impl-version>1.0.4</aries-blueprint-proxy-impl-version>
+    <aries-spifly-version>1.0.8</aries-spifly-version>
     <aries-util-version>1.1.1</aries-util-version>
     <arquillian-container-se-managed-version>1.0.0.Final</arquillian-container-se-managed-version>
     <arquillian-version>1.1.11.Final</arquillian-version>
@@ -474,6 +475,7 @@
     <openshift-java-client-version>2.7.0.Final</openshift-java-client-version>
     <openshift-client-version>1.4.27</openshift-client-version>
     <openstack4j-version>3.0.2</openstack4j-version>
+    <openstack4j-guava-version>17.0</openstack4j-guava-version>
     <optaplanner-version>6.5.0.Final</optaplanner-version>
     <oro-bundle-version>2.0.8_6</oro-bundle-version>
     <oscache-bundle-version>2.4_5</oscache-bundle-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/0009b8f2/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 ab63b73..f9bee2e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1375,6 +1375,19 @@
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle>
   </feature>
+  <feature name='camel-openstack' version='${project.version}' resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    <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>
+    <bundle dependency='true'>mvn:com.google.guava/guava/${openstack4j-guava-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.pacesys/openstack4j-core/${openstack4j-version}</bundle>
+    <bundle dependency='true'>mvn:org.pacesys.openstack4j.connectors/openstack4j-okhttp/${openstack4j-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-openstack/${project.version}</bundle>
+  </feature>
   <feature name='camel-paho' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.eclipse.paho/org.eclipse.paho.client.mqttv3/${paho-version}</bundle>

http://git-wip-us.apache.org/repos/asf/camel/blob/0009b8f2/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenstackTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenstackTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenstackTest.java
new file mode 100644
index 0000000..0935bd0
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelOpenstackTest.java
@@ -0,0 +1,38 @@
+/**
+ * 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.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelOpenstackTest extends BaseKarafTest {
+
+    public static final String COMPONENT = extractName(CamelOpenstackTest.class);
+
+    @Test
+    public void test() throws Exception {
+        testComponent(COMPONENT, "openstack-cinder");
+        testComponent(COMPONENT, "openstack-glance");
+        testComponent(COMPONENT, "openstack-keystone");
+        testComponent(COMPONENT, "openstack-neutron");
+        testComponent(COMPONENT, "openstack-nova");
+        testComponent(COMPONENT, "openstack-swift");
+    }
+
+}


Mime
View raw message