camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/7] camel git commit: Cleanup checkstyle errors
Date Sat, 02 Apr 2016 14:38:28 GMT
Cleanup checkstyle errors


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

Branch: refs/heads/master
Commit: a46fd0dd4f6b255c844cbb7f2d9f7fde2480b989
Parents: dec1c09
Author: Quinn Stevenson <quinn@pronoia-solutions.com>
Authored: Wed Mar 30 19:35:54 2016 -0600
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Apr 2 16:38:11 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/components/camel-test-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-test-karaf/pom.xml b/components/camel-test-karaf/pom.xml
index 8497df5..aba4c2b 100644
--- a/components/camel-test-karaf/pom.xml
+++ b/components/camel-test-karaf/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>camel-test-karaf</artifactId>
   <name>Camel :: Test :: Karaf</name>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <description>Camel Testing Library using Pax Exam, Karaf and JUnit</description>
 
   <properties>

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 a893799..86dd2d0 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
@@ -63,6 +63,7 @@ import static org.ops4j.pax.exam.CoreOptions.vmOption;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
 
 public abstract class AbstractFeatureTest {
 
@@ -233,6 +234,7 @@ public abstract class AbstractFeatureTest {
                     .karafVersion(karafVersion)
                     .name("Apache Karaf")
                     .useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")),
+            logLevel(LogLevelOption.LogLevel.WARN),
 
             // keep the folder so we can look inside when something fails
             keepRuntimeFolder(),
@@ -249,7 +251,7 @@ public abstract class AbstractFeatureTest {
             editConfigurationFilePut("etc/custom.properties", "karaf.shutdown.port", "-1"),
 
             // Assign unique ports for Karaf
-            editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", Integer.toString(AvailablePortFinder.getNextAvailable()) ),
+            editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", Integer.toString(AvailablePortFinder.getNextAvailable())),
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", Integer.toString(AvailablePortFinder.getNextAvailable())),
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", Integer.toString(AvailablePortFinder.getNextAvailable())),
 

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/CamelKarafTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/CamelKarafTestSupport.java b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/CamelKarafTestSupport.java
index eb64d64..e3a7951 100644
--- a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/CamelKarafTestSupport.java
+++ b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/CamelKarafTestSupport.java
@@ -1,7 +1,10 @@
-/*
- * Licensed 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
+/**
+ * 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
  *
@@ -32,7 +35,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
-
 import javax.inject.Inject;
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
@@ -57,10 +59,13 @@ import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 
-import org.junit.Assert;
-
+import static org.junit.Assert.fail;
 import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.*;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.replaceConfigurationFile;
 
 /*
    TODO:  This file is a copy of KarafTestSupport.java from the Karaf 4 repository.  
@@ -72,7 +77,7 @@ public class CamelKarafTestSupport {
     static final Long COMMAND_TIMEOUT = 30000L;
     static final Long SERVICE_TIMEOUT = 30000L;
 
-    ExecutorService executor = Executors.newCachedThreadPool();
+    protected ExecutorService executor = Executors.newCachedThreadPool();
 
     @Inject
     protected BundleContext bundleContext;
@@ -326,7 +331,7 @@ public class CamelKarafTestSupport {
                 return;
             }
         }
-        Assert.fail("Feature " + featureName + " should be installed but is not");
+        fail("Feature " + featureName + " should be installed but is not");
     }
 
     public void assertFeatureInstalled(String featureName, String featureVersion) {
@@ -336,7 +341,7 @@ public class CamelKarafTestSupport {
                 return;
             }
         }
-        Assert.fail("Feature " + featureName + "/" + featureVersion + " should be installed but is not");
+        fail("Feature " + featureName + "/" + featureVersion + " should be installed but is not");
     }
     
     protected void installAndAssertFeature(String feature) throws Exception {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 92e51c8..74400a1 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelAhcTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 bfa85db..35a074b 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelAhcWsTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 8e9902c..8bf35fa 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelAmqpTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 cc38a85..88649a4 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelApnsTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 b07c3f8..ceab9a5 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelAtmosphereWebsocketTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 200495e..ff30e94 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelAtomTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 09f9853..bc1728a 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelAvroTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 e55894c..e266d45 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelAwsTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 533990b..2560d2b 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelBamTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 b9ea9d2..0ce1b1b 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelBarcodeTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 fbfbdc2..521801d 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelBase64Test extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 afa5bcc..0abb31e 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelBeanValidatorTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 ca59bd0..dc4066e 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelBeanioTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 6082555..4738704 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelBeanstalkTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 d89b4f7..1c589bb 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelBindyTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 6c0cff4..f556baf 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelBoonTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 da53d14..a1d0010 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelBoxTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 017ad4d..57af3a9 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelBraintreeTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 692cd61..9e91600 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelCacheTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 3541b9a..6104ff2 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelCassandraqlTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 00f2130..2be5101 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelCastorTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 744c921..0e38ee1 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelChunkTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 e5fc759..87e2f9b 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelCmSmsTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 286ae72..a5c5244 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelCmisTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 aa7d600..88adc95 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelCometdTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 a8b011d..1496a59 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelContextTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 39471ed..965c7dc 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelCouchDBTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 af99ceb..b0cfae5 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelCryptoTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 0925f3a..217613c 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelCsvTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 84d9f44..138505b 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelCxfTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 0f469de..171a554 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelDisruptorTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 359bcb1..3d74cd7 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelDnsTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 07ef079..23614b4 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,11 +16,11 @@
  */
 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;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 @Ignore("camel-docker do not work in OSGi")

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 db8d90b..c4cfe4a 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelDozerTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 aed0b2f..54d5fd9 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelDropboxTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 b9f06c1..889d07d 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelElasticsearchTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 fc25755..b07a5c7 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelElsqlTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 806f7e6..44bc149 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelEtcdTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 add8434..63ce410 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelEventadminTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 445f9cf..f4435ac 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelExecTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 cf50bd8..4a5746b 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelFacebookTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 d4cbf20..0b32bd2 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelFlatpackTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 7e06f87..b7209b1 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelFopTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 081c2a4..f5df96e 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelFreemarkerTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 0e969c7..e0b1faa 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelFtpTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 541b594..4bb09e3 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelGangliaTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 516a480..5501fbe 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelGeocoderTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 1498796..bf6a7cd 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelGitTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 da29a6e..40a51d9 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelGithubTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 b997ee2..231c7e4 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelGoogleCalendarTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 4e9ccbb..210928d 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelGoogleDriveTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 69f09fc..43fa71b 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelGoogleMailTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 f62cb52..591cb9c 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelGroovyTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 c2133a9..3aefb2e 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelGsonTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 e3a936f..204b1eb 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelGuavaEventBusTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 c93c48c..efbf70b 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,11 +16,11 @@
  */
 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;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 @Ignore("camel-guice does not work in OSGi")

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 ab14b65..7d68a53 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelHazelcastTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 b5e9076..d938788 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,11 +16,11 @@
  */
 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;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 @Ignore("Need OSGi bundles of hadoop, and it does not run well in OSGi neither")

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 6c5cd3a..46b9b1c 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelHdfs2Test extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 9313d73..639431d 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelHdfsTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 898eafd..a0b15e8 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelHessianTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 f9b987a..967faf7 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelHipchatTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 3dcfb91..0a76c6f 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelHl7Test extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 01f1b30..7a91ef2 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelHttp4Test extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 331359c..2567b13 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelHttpTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 35bfc9b..36cd6c2 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,11 +16,11 @@
  */
 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;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 @Ignore("Need a new hystrix SMX bundle")

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 a8d5354..f810e4e 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelIbatisTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/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 afe2f03..c93d709 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,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelIcalTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java
index 958f850..2b5dc1a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.itest.karaf;
 
 import java.net.URI;
 
+import org.apache.camel.test.karaf.AbstractFeatureTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelIgniteTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java
index 7882144..5137b1f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.junit.Test;
+import org.apache.camel.test.karaf.AbstractFeatureTest;
+ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelInfinispanTest extends AbstractFeatureTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/a46fd0dd/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java
index a5768a8..ba2236e 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java
@@ -16,10 +16,10 @@
  */
 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;
-import org.apache.camel.test.karaf.AbstractFeatureTest;
 
 @RunWith(PaxExam.class)
 public class CamelIrcTest extends AbstractFeatureTest {


Mime
View raw message