You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/09/11 17:16:09 UTC
camel git commit: CAMEL-9120: Add Camel-Undertow to Camel features
Repository: camel
Updated Branches:
refs/heads/master 64971720d -> dcd4d378d
CAMEL-9120: Add Camel-Undertow to Camel features
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dcd4d378
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dcd4d378
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dcd4d378
Branch: refs/heads/master
Commit: dcd4d378d61789007e66bf77382dda1e95b676e1
Parents: 6497172
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Sep 11 17:13:35 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Sep 11 17:15:39 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 +
.../features/src/main/resources/features.xml | 6 +++
.../camel/itest/karaf/CamelUndertowTest.java | 39 ++++++++++++++++++++
3 files changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dcd4d378/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index eed58f5..35250df 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -256,6 +256,7 @@
<jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
<jboss-logging-version>3.3.0.Final</jboss-logging-version>
<jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
+ <jboss-xnio-version>3.3.1.Final</jboss-xnio-version>
<jclouds-version>1.9.1</jclouds-version>
<!-- jclouds must use this guava version -->
<jclouds-google-guava-version>16.0.1</jclouds-google-guava-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/dcd4d378/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 cf5cd88..8083e67 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1570,6 +1570,12 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-twitter/${project.version}</bundle>
</feature>
+ <feature name='camel-undertow' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>wrap:mvn:io.undertow/undertow-core/${undertow-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.jboss.xnio/xnio-api/${jboss-xnio-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-undertow/${project.version}</bundle>
+ </feature>
<feature name='camel-univocity-parsers' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:com.univocity/univocity-parsers/${univocity-parsers-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
http://git-wip-us.apache.org/repos/asf/camel/blob/dcd4d378/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java
new file mode 100644
index 0000000..a8950b2
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.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 CamelUndertowTest extends AbstractFeatureTest {
+ public static final String COMPONENT = extractName(CamelUndertowTest.class);
+
+ @Test
+ public void test() throws Exception {
+ testComponent(COMPONENT);
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ return configure(COMPONENT);
+ }
+
+}
\ No newline at end of file