camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/3] camel git commit: camel-itest-karaf to use base class and make it work again due recent refactor.
Date Tue, 19 Apr 2016 09:11:31 GMT
camel-itest-karaf to use base class and make it work again due recent refactor.


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

Branch: refs/heads/master
Commit: 2bc61ae73437480322481e36fc91fc675729cf06
Parents: e26868b
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Apr 19 11:10:59 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Apr 19 11:11:16 2016 +0200

----------------------------------------------------------------------
 .../camel/test/karaf/AbstractFeatureTest.java   |  8 +++--
 .../apache/camel/itest/karaf/BaseKarafTest.java | 31 ++++++++++++++++++++
 .../apache/camel/itest/karaf/CamelAhcTest.java  |  3 +-
 .../camel/itest/karaf/CamelAhcWsTest.java       |  3 +-
 .../apache/camel/itest/karaf/CamelAmqpTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelApnsTest.java |  3 +-
 .../karaf/CamelAtmosphereWebsocketTest.java     |  3 +-
 .../apache/camel/itest/karaf/CamelAtomTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelAvroTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelAwsTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelBamTest.java  |  3 +-
 .../camel/itest/karaf/CamelBarcodeTest.java     |  3 +-
 .../camel/itest/karaf/CamelBase64Test.java      |  3 +-
 .../itest/karaf/CamelBeanValidatorTest.java     |  3 +-
 .../camel/itest/karaf/CamelBeanioTest.java      |  3 +-
 .../camel/itest/karaf/CamelBeanstalkTest.java   |  3 +-
 .../camel/itest/karaf/CamelBindyTest.java       |  3 +-
 .../apache/camel/itest/karaf/CamelBoonTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelBoxTest.java  |  3 +-
 .../camel/itest/karaf/CamelBraintreeTest.java   |  3 +-
 .../camel/itest/karaf/CamelCacheTest.java       |  3 +-
 .../camel/itest/karaf/CamelCassandraqlTest.java |  3 +-
 .../camel/itest/karaf/CamelCastorTest.java      |  3 +-
 .../camel/itest/karaf/CamelChunkTest.java       |  3 +-
 .../camel/itest/karaf/CamelCmSmsTest.java       |  3 +-
 .../apache/camel/itest/karaf/CamelCmisTest.java |  3 +-
 .../camel/itest/karaf/CamelCometdTest.java      |  3 +-
 .../camel/itest/karaf/CamelContextTest.java     |  3 +-
 .../camel/itest/karaf/CamelCouchDBTest.java     |  3 +-
 .../camel/itest/karaf/CamelCryptoTest.java      |  3 +-
 .../apache/camel/itest/karaf/CamelCsvTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelCxfTest.java  |  3 +-
 .../camel/itest/karaf/CamelDisruptorTest.java   |  3 +-
 .../apache/camel/itest/karaf/CamelDnsTest.java  |  3 +-
 .../camel/itest/karaf/CamelDockerTest.java      |  3 +-
 .../camel/itest/karaf/CamelDozerTest.java       |  3 +-
 .../camel/itest/karaf/CamelDropboxTest.java     |  3 +-
 .../itest/karaf/CamelElasticsearchTest.java     |  3 +-
 .../camel/itest/karaf/CamelElsqlTest.java       |  3 +-
 .../apache/camel/itest/karaf/CamelEtcdTest.java |  3 +-
 .../camel/itest/karaf/CamelEventadminTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelExecTest.java |  3 +-
 .../camel/itest/karaf/CamelFacebookTest.java    |  3 +-
 .../camel/itest/karaf/CamelFlatpackTest.java    |  3 +-
 .../apache/camel/itest/karaf/CamelFopTest.java  |  3 +-
 .../camel/itest/karaf/CamelFreemarkerTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelFtpTest.java  |  3 +-
 .../camel/itest/karaf/CamelGangliaTest.java     |  3 +-
 .../camel/itest/karaf/CamelGeocoderTest.java    |  3 +-
 .../apache/camel/itest/karaf/CamelGitTest.java  |  3 +-
 .../camel/itest/karaf/CamelGithubTest.java      |  3 +-
 .../itest/karaf/CamelGoogleCalendarTest.java    |  3 +-
 .../camel/itest/karaf/CamelGoogleDriveTest.java |  3 +-
 .../camel/itest/karaf/CamelGoogleMailTest.java  |  3 +-
 .../camel/itest/karaf/CamelGroovyTest.java      |  3 +-
 .../apache/camel/itest/karaf/CamelGsonTest.java |  3 +-
 .../itest/karaf/CamelGuavaEventBusTest.java     |  3 +-
 .../camel/itest/karaf/CamelGuiceTest.java       |  3 +-
 .../camel/itest/karaf/CamelHazelcastTest.java   |  3 +-
 .../camel/itest/karaf/CamelHbaseTest.java       |  3 +-
 .../camel/itest/karaf/CamelHdfs2Test.java       |  3 +-
 .../apache/camel/itest/karaf/CamelHdfsTest.java |  3 +-
 .../camel/itest/karaf/CamelHessianTest.java     |  3 +-
 .../camel/itest/karaf/CamelHipchatTest.java     |  3 +-
 .../apache/camel/itest/karaf/CamelHl7Test.java  |  3 +-
 .../camel/itest/karaf/CamelHttp4Test.java       |  3 +-
 .../apache/camel/itest/karaf/CamelHttpTest.java |  3 +-
 .../camel/itest/karaf/CamelHystrixTest.java     |  3 +-
 .../camel/itest/karaf/CamelIbatisTest.java      |  3 +-
 .../apache/camel/itest/karaf/CamelIcalTest.java |  3 +-
 .../camel/itest/karaf/CamelIgniteTest.java      |  3 +-
 .../camel/itest/karaf/CamelInfinispanTest.java  |  5 ++--
 .../apache/camel/itest/karaf/CamelIrcTest.java  |  3 +-
 .../camel/itest/karaf/CamelIronmqTest.java      |  5 ++--
 .../camel/itest/karaf/CamelJCacheTest.java      |  3 +-
 .../camel/itest/karaf/CamelJacksonTest.java     |  3 +-
 .../camel/itest/karaf/CamelJacksonxmlTest.java  |  3 +-
 .../camel/itest/karaf/CamelJasyptTest.java      |  3 +-
 .../apache/camel/itest/karaf/CamelJaxbTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelJbpmTest.java |  3 +-
 .../camel/itest/karaf/CamelJcloudsTest.java     |  3 +-
 .../apache/camel/itest/karaf/CamelJcrTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelJdbcTest.java |  3 +-
 .../camel/itest/karaf/CamelJettyTest.java       |  3 +-
 .../camel/itest/karaf/CamelJgroupsTest.java     |  3 +-
 .../apache/camel/itest/karaf/CamelJibxTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelJingTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelJmsTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelJmxTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelJoltTest.java |  3 +-
 .../camel/itest/karaf/CamelJosqlTest.java       |  3 +-
 .../apache/camel/itest/karaf/CamelJpaTest.java  |  3 +-
 .../camel/itest/karaf/CamelJsonpathTest.java    |  3 +-
 .../camel/itest/karaf/CamelJt400Test.java       |  3 +-
 .../apache/camel/itest/karaf/CamelJuelTest.java |  3 +-
 .../camel/itest/karaf/CamelJxpathTest.java      |  3 +-
 .../camel/itest/karaf/CamelKafkaTest.java       |  3 +-
 .../camel/itest/karaf/CamelKratiTest.java       |  3 +-
 .../camel/itest/karaf/CamelKubernetesTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelLdapTest.java |  3 +-
 .../camel/itest/karaf/CamelLinkedinTest.java    |  3 +-
 .../camel/itest/karaf/CamelLuceneTest.java      |  4 +--
 .../apache/camel/itest/karaf/CamelLzfTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelMailTest.java |  3 +-
 .../camel/itest/karaf/CamelMetricsTest.java     |  3 +-
 .../camel/itest/karaf/CamelMina2Test.java       |  3 +-
 .../apache/camel/itest/karaf/CamelMinaTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelMllpTest.java |  3 +-
 .../camel/itest/karaf/CamelMongodbTest.java     |  3 +-
 .../apache/camel/itest/karaf/CamelMqttTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelMsvTest.java  |  3 +-
 .../camel/itest/karaf/CamelMustacheTest.java    |  3 +-
 .../apache/camel/itest/karaf/CamelMvelTest.java |  3 +-
 .../camel/itest/karaf/CamelMyBatisTest.java     |  3 +-
 .../apache/camel/itest/karaf/CamelNatsTest.java |  3 +-
 .../camel/itest/karaf/CamelNetty4HttpTest.java  |  3 +-
 .../camel/itest/karaf/CamelNetty4Test.java      |  3 +-
 .../camel/itest/karaf/CamelNettyHttpTest.java   |  3 +-
 .../camel/itest/karaf/CamelNettyTest.java       |  3 +-
 .../apache/camel/itest/karaf/CamelOgnlTest.java |  3 +-
 .../camel/itest/karaf/CamelOlingo2Test.java     |  3 +-
 .../camel/itest/karaf/CamelOpenshiftTest.java   |  3 +-
 .../camel/itest/karaf/CamelOptaplannerTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelPahoTest.java |  3 +-
 .../camel/itest/karaf/CamelPaxloggingTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelPdfTest.java  |  3 +-
 .../camel/itest/karaf/CamelPgeventTest.java     |  3 +-
 .../camel/itest/karaf/CamelPrinterTest.java     |  3 +-
 .../camel/itest/karaf/CamelProtobufTest.java    |  3 +-
 .../camel/itest/karaf/CamelQuartz2Test.java     |  3 +-
 .../camel/itest/karaf/CamelQuartzTest.java      |  3 +-
 .../camel/itest/karaf/CamelQuickFixTest.java    |  3 +-
 .../camel/itest/karaf/CamelRabbitmqTest.java    |  3 +-
 .../camel/itest/karaf/CamelRestletTest.java     |  3 +-
 .../apache/camel/itest/karaf/CamelRmiTest.java  |  3 +-
 .../camel/itest/karaf/CamelRouteboxTest.java    |  3 +-
 .../apache/camel/itest/karaf/CamelRssTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelRxTest.java   |  3 +-
 .../camel/itest/karaf/CamelSalesforceTest.java  |  3 +-
 .../itest/karaf/CamelSapNetweaverTest.java      |  3 +-
 .../camel/itest/karaf/CamelSaxonTest.java       |  3 +-
 .../camel/itest/karaf/CamelScalaTest.java       |  3 +-
 .../camel/itest/karaf/CamelSchematronTest.java  |  3 +-
 .../camel/itest/karaf/CamelScriptTest.java      |  3 +-
 .../camel/itest/karaf/CamelServicenowTest.java  |  3 +-
 .../camel/itest/karaf/CamelServletTest.java     |  3 +-
 .../apache/camel/itest/karaf/CamelSipTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelSjmsTest.java |  3 +-
 .../camel/itest/karaf/CamelSlackTest.java       |  3 +-
 .../apache/camel/itest/karaf/CamelSmppTest.java |  3 +-
 .../camel/itest/karaf/CamelSnakeyamlTest.java   |  3 +-
 .../apache/camel/itest/karaf/CamelSnmpTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelSoapTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelSolrTest.java |  3 +-
 .../camel/itest/karaf/CamelSplunkTest.java      |  3 +-
 .../camel/itest/karaf/CamelSpringBatchTest.java |  3 +-
 .../itest/karaf/CamelSpringJavaconfigTest.java  |  3 +-
 .../camel/itest/karaf/CamelSpringLdapTest.java  |  3 +-
 .../camel/itest/karaf/CamelSpringRedisTest.java |  3 +-
 .../itest/karaf/CamelSpringWebServiceTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelSqlTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelSshTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelStAXTest.java |  3 +-
 .../camel/itest/karaf/CamelStompTest.java       |  3 +-
 .../camel/itest/karaf/CamelStreamTest.java      |  3 +-
 .../itest/karaf/CamelStringTemplateTest.java    |  3 +-
 .../camel/itest/karaf/CamelSwaggerJavaTest.java |  3 +-
 .../camel/itest/karaf/CamelSwaggerTest.java     |  3 +-
 .../camel/itest/karaf/CamelSyslogTest.java      |  3 +-
 .../camel/itest/karaf/CamelTagsoupTest.java     |  3 +-
 .../camel/itest/karaf/CamelTarfileTest.java     |  3 +-
 .../camel/itest/karaf/CamelTestSpringTest.java  |  3 +-
 .../apache/camel/itest/karaf/CamelTestTest.java |  3 +-
 .../camel/itest/karaf/CamelTwitterTest.java     |  3 +-
 .../camel/itest/karaf/CamelUndertowTest.java    |  3 +-
 .../itest/karaf/CamelUnivocityParsersTest.java  |  3 +-
 .../camel/itest/karaf/CamelUrlrewriteTest.java  |  3 +-
 .../camel/itest/karaf/CamelVelocityTest.java    |  3 +-
 .../camel/itest/karaf/CamelVertxTest.java       |  3 +-
 .../camel/itest/karaf/CamelWeatherTest.java     |  3 +-
 .../camel/itest/karaf/CamelWebsocketTest.java   |  3 +-
 .../camel/itest/karaf/CamelXmlbeansTest.java    |  3 +-
 .../camel/itest/karaf/CamelXmljsonTest.java     |  3 +-
 .../camel/itest/karaf/CamelXmlrpcTest.java      |  3 +-
 .../camel/itest/karaf/CamelXmlsecurityTest.java |  3 +-
 .../apache/camel/itest/karaf/CamelXmppTest.java |  3 +-
 .../camel/itest/karaf/CamelXstreamTest.java     |  3 +-
 .../apache/camel/itest/karaf/CamelYamlTest.java |  3 +-
 .../camel/itest/karaf/CamelYammerTest.java      |  3 +-
 .../camel/itest/karaf/CamelZipfileTest.java     |  3 +-
 .../camel/itest/karaf/CamelZipkinTest.java      |  3 +-
 .../camel/itest/karaf/CamelZookeeperTest.java   |  3 +-
 192 files changed, 228 insertions(+), 386 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
index 238804e..a2acca6 100644
--- a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
+++ b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
@@ -153,7 +153,7 @@ public abstract class AbstractFeatureTest {
 
         installCamelFeature(mainFeature);
 
-        CamelContext camelContext = getOsgiService(bundleContext, CamelContext.class, "(camel.context.name=myCamel)", 20000);
+        CamelContext camelContext = getOsgiService(bundleContext, CamelContext.class, "(camel.context.name=myCamel)", SERVICE_TIMEOUT);
         assertNotNull("Cannot find CamelContext with name myCamel", camelContext);
 
         LOG.info("Getting Camel component: {}", component);
@@ -173,7 +173,7 @@ public abstract class AbstractFeatureTest {
 
         installCamelFeature(mainFeature);
 
-        CamelContext camelContext = getOsgiService(bundleContext, CamelContext.class, "(camel.context.name=myCamel)", 20000);
+        CamelContext camelContext = getOsgiService(bundleContext, CamelContext.class, "(camel.context.name=myCamel)", SERVICE_TIMEOUT);
         assertNotNull("Cannot find CamelContext with name myCamel", camelContext);
 
         LOG.info("Getting Camel dataformat: {}", dataFormat);
@@ -258,7 +258,6 @@ public abstract class AbstractFeatureTest {
 
         List<String> camel = new ArrayList<>();
         camel.add("camel");
-        camel.add("camel-test-karaf");
         if (extra != null && extra.length > 0) {
             for (String e : extra) {
                 camel.add(e);
@@ -306,6 +305,9 @@ public abstract class AbstractFeatureTest {
 
             // install camel
             features(getCamelKarafFeatureUrl(), camelFeatures),
+
+            // install camel-test-karaf as bundle (not feature as the feature causes a bundle refresh that invalidates the @Inject bundleContext)
+            mavenBundle().groupId("org.apache.camel").artifactId("camel-test-karaf").versionAsInProject()
         };
 
         return options;

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/BaseKarafTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/BaseKarafTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/BaseKarafTest.java
new file mode 100644
index 0000000..16fc91d
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/BaseKarafTest.java
@@ -0,0 +1,31 @@
+/**
+ * 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.apache.camel.test.karaf.AbstractFeatureTest;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+
+public abstract class BaseKarafTest extends AbstractFeatureTest {
+
+    @Configuration
+    public static Option[] configure() {
+        // use the standard from AbstractFeatureTest as we install in each test what we need to test
+        return AbstractFeatureTest.configure();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
index 74400a1..1bba526 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelAhcTest extends AbstractFeatureTest {
+public class CamelAhcTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelAhcTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcWsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcWsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcWsTest.java
index 35a074b..863b0d5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcWsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcWsTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelAhcWsTest extends AbstractFeatureTest {
+public class CamelAhcWsTest extends BaseKarafTest {
     public static final String COMPONENT = extractName(CamelAhcWsTest.class);
 
     @Test

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
index 8bf35fa..730b0d9 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelAmqpTest extends AbstractFeatureTest {
+public class CamelAmqpTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelAmqpTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
index 88649a4..80bfb83 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelApnsTest extends AbstractFeatureTest {
+public class CamelApnsTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelApnsTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtmosphereWebsocketTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtmosphereWebsocketTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtmosphereWebsocketTest.java
index ceab9a5..a8f3e6b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtmosphereWebsocketTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtmosphereWebsocketTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelAtmosphereWebsocketTest extends AbstractFeatureTest {
+public class CamelAtmosphereWebsocketTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelAtmosphereWebsocketTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
index ff30e94..704b442 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelAtomTest extends AbstractFeatureTest {
+public class CamelAtomTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelAtomTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
index bc1728a..0e9adb0 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelAvroTest extends AbstractFeatureTest {
+public class CamelAvroTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelAvroTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
index e266d45..a77c23f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelAwsTest extends AbstractFeatureTest {
+public class CamelAwsTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelAwsTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
index 2560d2b..c26dd64 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelBamTest extends AbstractFeatureTest {
+public class CamelBamTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelBamTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
index 0ce1b1b..4424a53 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBarcodeTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelBarcodeTest extends AbstractFeatureTest {
+public class CamelBarcodeTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelBarcodeTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
index 521801d..156d26b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelBase64Test extends AbstractFeatureTest {
+public class CamelBase64Test extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelBase64Test.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
index 0abb31e..37afc8a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelBeanValidatorTest extends AbstractFeatureTest {
+public class CamelBeanValidatorTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelBeanValidatorTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
index dc4066e..01a4cf0 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelBeanioTest extends AbstractFeatureTest {
+public class CamelBeanioTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelBeanioTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanstalkTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanstalkTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanstalkTest.java
index 4738704..88093a3 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanstalkTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanstalkTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelBeanstalkTest extends AbstractFeatureTest {
+public class CamelBeanstalkTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelBeanstalkTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
index 1c589bb..09d29fb 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelBindyTest extends AbstractFeatureTest {
+public class CamelBindyTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelBindyTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
index f556baf..213ab29 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoonTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelBoonTest extends AbstractFeatureTest {
+public class CamelBoonTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelBoonTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
index a1d0010..ae8f77b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBoxTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelBoxTest extends AbstractFeatureTest {
+public class CamelBoxTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelBoxTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBraintreeTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBraintreeTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBraintreeTest.java
index 57af3a9..c718be8 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBraintreeTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBraintreeTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelBraintreeTest extends AbstractFeatureTest {
+public class CamelBraintreeTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelBraintreeTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
index 9e91600..c9b5c4f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelCacheTest extends AbstractFeatureTest {
+public class CamelCacheTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelCacheTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java
index 6104ff2..f0fd3c4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCassandraqlTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelCassandraqlTest extends AbstractFeatureTest {
+public class CamelCassandraqlTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelCassandraqlTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
index 2be5101..b22b130 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelCastorTest extends AbstractFeatureTest {
+public class CamelCastorTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelCastorTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelChunkTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelChunkTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelChunkTest.java
index 0e38ee1..3e7a6f3 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelChunkTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelChunkTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelChunkTest extends AbstractFeatureTest {
+public class CamelChunkTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelChunkTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
index 87e2f9b..770f201 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmSmsTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelCmSmsTest extends AbstractFeatureTest {
+public class CamelCmSmsTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelCmSmsTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
index a5c5244..b4e225f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelCmisTest extends AbstractFeatureTest {
+public class CamelCmisTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelCmisTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
index 88adc95..d8a4e04 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelCometdTest extends AbstractFeatureTest {
+public class CamelCometdTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelCometdTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
index 1496a59..8a8c605 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelContextTest extends AbstractFeatureTest {
+public class CamelContextTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelContextTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
index 965c7dc..3f914a8 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelCouchDBTest extends AbstractFeatureTest {
+public class CamelCouchDBTest extends BaseKarafTest {
 
     public static final String COMPONENT = "couchdb";
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
index b0cfae5..d9854db 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelCryptoTest extends AbstractFeatureTest {
+public class CamelCryptoTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelCryptoTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
index 217613c..142494a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelCsvTest extends AbstractFeatureTest {
+public class CamelCsvTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelCsvTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
index 138505b..a8db8ed 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelCxfTest extends AbstractFeatureTest {
+public class CamelCxfTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelCxfTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
index 171a554..818723c 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelDisruptorTest extends AbstractFeatureTest {
+public class CamelDisruptorTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelDisruptorTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
index 3d74cd7..8e8f15b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelDnsTest extends AbstractFeatureTest {
+public class CamelDnsTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelDnsTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
index 23614b4..1724e4d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,7 +23,7 @@ import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
 @Ignore("camel-docker do not work in OSGi")
-public class CamelDockerTest extends AbstractFeatureTest {
+public class CamelDockerTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelDockerTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDozerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDozerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDozerTest.java
index c4cfe4a..b4ed107 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDozerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDozerTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelDozerTest extends AbstractFeatureTest {
+public class CamelDozerTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelDozerTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
index 54d5fd9..afd2433 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelDropboxTest extends AbstractFeatureTest {
+public class CamelDropboxTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelDropboxTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
index 889d07d..e1ca23f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelElasticsearchTest extends AbstractFeatureTest {
+public class CamelElasticsearchTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelElasticsearchTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java
index b07a5c7..13b5e6d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElsqlTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelElsqlTest extends AbstractFeatureTest {
+public class CamelElsqlTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelElsqlTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEtcdTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEtcdTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEtcdTest.java
index 44bc149..5b0ddb5 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEtcdTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEtcdTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelEtcdTest extends AbstractFeatureTest {
+public class CamelEtcdTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelEtcdTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEventadminTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEventadminTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEventadminTest.java
index 63ce410..33b9b13 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEventadminTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelEventadminTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelEventadminTest extends AbstractFeatureTest {
+public class CamelEventadminTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelEventadminTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
index f4435ac..fdc826d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelExecTest extends AbstractFeatureTest {
+public class CamelExecTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelExecTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
index 4a5746b..1e6df65 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelFacebookTest extends AbstractFeatureTest {
+public class CamelFacebookTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelFacebookTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
index 0b32bd2..46066f0 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelFlatpackTest extends AbstractFeatureTest {
+public class CamelFlatpackTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelFlatpackTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
index b7209b1..4900062 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelFopTest extends AbstractFeatureTest {
+public class CamelFopTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelFopTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
index f5df96e..c84b324 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelFreemarkerTest extends AbstractFeatureTest {
+public class CamelFreemarkerTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelFreemarkerTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
index e0b1faa..1e4a9d9 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelFtpTest extends AbstractFeatureTest {
+public class CamelFtpTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelFtpTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGangliaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGangliaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGangliaTest.java
index 4bb09e3..d8b1632 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGangliaTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGangliaTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGangliaTest extends AbstractFeatureTest {
+public class CamelGangliaTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelGangliaTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
index 5501fbe..0206929 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGeocoderTest extends AbstractFeatureTest {
+public class CamelGeocoderTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelGeocoderTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGitTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGitTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGitTest.java
index bf6a7cd..dc5babc 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGitTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGitTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGitTest extends AbstractFeatureTest {
+public class CamelGitTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelGitTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGithubTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGithubTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGithubTest.java
index 40a51d9..b6feae1 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGithubTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGithubTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGithubTest extends AbstractFeatureTest {
+public class CamelGithubTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelGithubTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java
index 231c7e4..4af67a8 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleCalendarTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGoogleCalendarTest extends AbstractFeatureTest {
+public class CamelGoogleCalendarTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelGoogleCalendarTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java
index 210928d..197ff6b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleDriveTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGoogleDriveTest extends AbstractFeatureTest {
+public class CamelGoogleDriveTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelGoogleDriveTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java
index 43fa71b..569a4a3 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleMailTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGoogleMailTest extends AbstractFeatureTest {
+public class CamelGoogleMailTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelGoogleMailTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
index 591cb9c..27036b9 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGroovyTest extends AbstractFeatureTest {
+public class CamelGroovyTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelGroovyTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
index 3aefb2e..4ce7e61 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGsonTest extends AbstractFeatureTest {
+public class CamelGsonTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelGsonTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java
index 204b1eb..f25704b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGuavaEventBusTest extends AbstractFeatureTest {
+public class CamelGuavaEventBusTest extends BaseKarafTest {
 
     public static final String COMPONENT = "guava-eventbus";
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
index b59cb17..865cfc7 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelGuiceTest extends AbstractFeatureTest {
+public class CamelGuiceTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelGuiceTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java
index 7d68a53..15bacdc 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelHazelcastTest extends AbstractFeatureTest {
+public class CamelHazelcastTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelHazelcastTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
index d938788..d622b2e 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,7 +23,7 @@ import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
 @Ignore("Need OSGi bundles of hadoop, and it does not run well in OSGi neither")
-public class CamelHbaseTest extends AbstractFeatureTest {
+public class CamelHbaseTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelHbaseTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java
index 46b9b1c..0274aa2 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelHdfs2Test extends AbstractFeatureTest {
+public class CamelHdfs2Test extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelHdfs2Test.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java
index 639431d..8dec8f2 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelHdfsTest extends AbstractFeatureTest {
+public class CamelHdfsTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelHdfsTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHessianTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHessianTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHessianTest.java
index a0b15e8..c3b36f2 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHessianTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHessianTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelHessianTest extends AbstractFeatureTest {
+public class CamelHessianTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelHessianTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHipchatTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHipchatTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHipchatTest.java
index 967faf7..5b1eb15 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHipchatTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHipchatTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelHipchatTest extends AbstractFeatureTest {
+public class CamelHipchatTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelHipchatTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java
index 0a76c6f..bb05da3 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelHl7Test extends AbstractFeatureTest {
+public class CamelHl7Test extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelHl7Test.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java
index 7a91ef2..19f14d8 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelHttp4Test extends AbstractFeatureTest {
+public class CamelHttp4Test extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelHttp4Test.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java
index 2567b13..489202a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelHttpTest extends AbstractFeatureTest {
+public class CamelHttpTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelHttpTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
index 36cd6c2..941647b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHystrixTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,7 +23,7 @@ import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
 @Ignore("Need a new hystrix SMX bundle")
-public class CamelHystrixTest extends AbstractFeatureTest {
+public class CamelHystrixTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelHystrixTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java
index f810e4e..4f909eb 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelIbatisTest extends AbstractFeatureTest {
+public class CamelIbatisTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelIbatisTest.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIcalTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIcalTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIcalTest.java
index c93d709..a8428a7 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIcalTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIcalTest.java
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
 @RunWith(PaxExam.class)
-public class CamelIcalTest extends AbstractFeatureTest {
+public class CamelIcalTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelIcalTest.class);
 


Mime
View raw message