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 2017/10/04 07:44:10 UTC
camel git commit: CAMEL-11853: Added camel-reactor karaf feature
Repository: camel
Updated Branches:
refs/heads/master 58b29d8e7 -> a9fe036f5
CAMEL-11853: Added camel-reactor karaf feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9fe036f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9fe036f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9fe036f
Branch: refs/heads/master
Commit: a9fe036f513068779e72ba2e8039af58b2ccc52a
Parents: 58b29d8
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Oct 4 09:41:52 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Oct 4 09:41:52 2017 +0200
----------------------------------------------------------------------
.../features/src/main/resources/features.xml | 6 ++++
.../itest/karaf/CamelReactiveStreamsTest.java | 1 -
.../camel/itest/karaf/CamelReactorTest.java | 33 ++++++++++++++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a9fe036f/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 37c1b5a..2305675 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1734,6 +1734,12 @@
<bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
<bundle>mvn:org.apache.camel/camel-reactive-streams/${project.version}</bundle>
</feature>
+ <feature name='camel-reactor' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-reactive-streams</feature>
+ <bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
+ <bundle dependency='true'>mvn:io.projectreactor/reactor-core/${reactor-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-reactor/${project.version}</bundle>
+ </feature>
<feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
http://git-wip-us.apache.org/repos/asf/camel/blob/a9fe036f/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
index 108409a..c340482 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java
@@ -30,5 +30,4 @@ public class CamelReactiveStreamsTest extends BaseKarafTest {
testComponent(COMPONENT);
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a9fe036f/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactorTest.java
new file mode 100644
index 0000000..19fa2cb
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactorTest.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 CamelReactorTest extends BaseKarafTest {
+
+ public static final String COMPONENT = extractName(CamelReactorTest.class);
+
+ @Test
+ public void test() throws Exception {
+ installCamelFeature(COMPONENT);
+ }
+
+}