CAMEL-7782 Added camel-netty4-http feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3c59647 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3c59647 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3c59647 Branch: refs/heads/master Commit: d3c59647e24d032bdffff630f1fb36a7ccbe045b Parents: db88eed Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Sep 5 21:03:36 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Sep 5 21:03:36 2014 +0800 ---------------------------------------------------------------------- apache-camel/pom.xml | 12 ++++-- .../src/main/descriptors/common-bin.xml | 1 + .../features/src/main/resources/features.xml | 5 +++ .../camel/itest/karaf/CamelNetty4HttpTest.java | 40 ++++++++++++++++++++ 4 files changed, 54 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d3c59647/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index e84be57..95a5601 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -174,7 +174,7 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-dropbox</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-eclipse</artifactId> @@ -310,7 +310,7 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jclouds</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jcr</artifactId> @@ -409,7 +409,7 @@ <dependency> <groupId>org.apache.camel.component.linkedin</groupId> <artifactId>camel-linkedin</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-mail</artifactId> @@ -468,6 +468,10 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-netty4-http</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-ognl</artifactId> </dependency> <dependency> @@ -477,7 +481,7 @@ <dependency> <groupId>org.apache.camel.component.olingo2</groupId> <artifactId>camel-olingo2</artifactId> - </dependency> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-openshift</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/d3c59647/apache-camel/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml index 4e389cc..ea6b37a 100644 --- a/apache-camel/src/main/descriptors/common-bin.xml +++ b/apache-camel/src/main/descriptors/common-bin.xml @@ -128,6 +128,7 @@ <include>org.apache.camel:camel-netty</include> <include>org.apache.camel:camel-netty4</include> <include>org.apache.camel:camel-netty-http</include> + <include>org.apache.camel:camel-netty4-http</include> <include>org.apache.camel:camel-ognl</include> <include>org.apache.camel.component.olingo2:camel-olingo2-api</include> <include>org.apache.camel.component.olingo2:camel-olingo2</include> http://git-wip-us.apache.org/repos/asf/camel/blob/d3c59647/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 5a57309..1a9732d 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -910,6 +910,11 @@ <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> <bundle>mvn:org.apache.camel/camel-netty4/${project.version}</bundle> </feature> + <feature name='camel-netty4-http' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-netty4</feature> + <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle> + <bundle>mvn:org.apache.camel/camel-netty4-http/${project.version}</bundle> + </feature> <feature name='camel-ognl' 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.ognl/${ognl-version}</bundle> http://git-wip-us.apache.org/repos/asf/camel/blob/d3c59647/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4HttpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4HttpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4HttpTest.java new file mode 100644 index 0000000..e48bc21 --- /dev/null +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4HttpTest.java @@ -0,0 +1,40 @@ +/** + * 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 CamelNetty4HttpTest extends AbstractFeatureTest { + + public static final String COMPONENT = extractName(CamelNetty4HttpTest.class); + + @Test + public void test() throws Exception { + testComponent(COMPONENT); + } + + @Configuration + public static Option[] configure() { + return configure(COMPONENT); + } + +} \ No newline at end of file
