camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [1/3] camel git commit: CAMEL-10346 - Added Camel-asterisk Karaf feature and related test
Date Fri, 30 Sep 2016 11:43:04 GMT
Repository: camel
Updated Branches:
  refs/heads/master 8ec3c2c96 -> 3cdd10598


CAMEL-10346 - Added Camel-asterisk Karaf feature and related test


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

Branch: refs/heads/master
Commit: 9b2f31f5604ba1168e050bb897b9cfcc9fdcc494
Parents: 8ec3c2c
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Fri Sep 30 12:54:22 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Fri Sep 30 12:54:22 2016 +0200

----------------------------------------------------------------------
 parent/pom.xml                                  |  1 +
 .../features/src/main/resources/features.xml    |  5 +++
 .../camel/itest/karaf/CamelAsteriskTest.java    | 33 ++++++++++++++++++++
 3 files changed, 39 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9b2f31f5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0c5a5aa..666ccf8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -58,6 +58,7 @@
     <asm-version>3.3.1</asm-version>
     <aspectj-version>1.8.9</aspectj-version>
     <asterisk-java-version>1.0.0-final</asterisk-java-version>
+    <asterisk-java-bundle-version>1.0.0-final_1</asterisk-java-bundle-version>
     <atmos-client-version>2.2.2</atmos-client-version>
     <atmosphere-version>2.4.7</atmosphere-version>
     <atmosphere-version-range>[2.4,3.0)</atmosphere-version-range>

http://git-wip-us.apache.org/repos/asf/camel/blob/9b2f31f5/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 6014605..df432a8 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -117,6 +117,11 @@
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.java-apns/${java-apns-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-apns/${project.version}</bundle>
   </feature>
+  <feature name='camel-asterisk' 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.asterisk-java/${asterisk-java-bundle-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-asterisk/${project.version}</bundle>
+  </feature>
   <feature name='camel-atmosphere-websocket' version='${project.version}' resolver='(obr)'
start-level='50'>
     <feature version='${project.version}'>camel-servlet</feature>
     <bundle dependency='true'>mvn:org.atmosphere/atmosphere-runtime/${atmosphere-version}</bundle>

http://git-wip-us.apache.org/repos/asf/camel/blob/9b2f31f5/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAsteriskTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAsteriskTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAsteriskTest.java
new file mode 100644
index 0000000..221707c
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAsteriskTest.java
@@ -0,0 +1,33 @@
+/**
+ * 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 CamelAsteriskTest extends BaseKarafTest {
+
+    public static final String COMPONENT = extractName(CamelAsteriskTest.class);
+
+    @Test
+    public void test() throws Exception {
+        testComponent(COMPONENT);
+    }
+
+}
\ No newline at end of file


Mime
View raw message