[camel] 08/21: CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Karaf integration test and feature updated

[ac...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit da71f3f2c49810a4773c692078c48325be672ad4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 8 11:26:32 2019 +0200

    CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Karaf integration test and feature updated
---
 platforms/karaf/features/src/main/resources/features.xml            | 4 ++--
 .../karaf/{CamelNetty4HttpTest.java => CamelNettyHttpTest.java}     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 384ba35..06e0a78 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1854,10 +1854,10 @@
     <bundle>mvn:org.apache.camel/camel-http-common/${project.version}</bundle>
     <bundle>mvn:org.apache.camel/camel-netty/${project.version}</bundle>
   </feature>
-  <feature name='camel-netty4-http' version='${project.version}' start-level='50'>
+  <feature name='camel-netty-http' version='${project.version}' start-level='50'>
     <feature version='${project.version}'>camel-netty</feature>
     <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-netty4-http/${project.version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-netty-http/${project.version}</bundle>
   </feature>
   <feature name='camel-nsq' version='${project.version}' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
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/CamelNettyHttpTest.java
similarity index 93%
rename from tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNetty4HttpTest.java
rename to tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyHttpTest.java
index cffc1c1..b1b0b8d 100644
--- 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/CamelNettyHttpTest.java
@@ -21,9 +21,9 @@ import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelNetty4HttpTest extends BaseKarafTest {
+public class CamelNettyHttpTest extends BaseKarafTest {
 
-    public static final String COMPONENT = extractName(CamelNetty4HttpTest.class);
+    public static final String COMPONENT = extractName(CamelNettyHttpTest.class);
 
     @Test
     public void test() throws Exception {
@@ -31,4 +31,4 @@ public class CamelNetty4HttpTest extends BaseKarafTest {
     }
 
 
-}
\ No newline at end of file
+}