You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/04/19 14:02:41 UTC
[02/12] camel git commit: camel-itest-karaf to use base class and
make it work again due recent refactor.
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java
index 548afe5..b57f1f4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSolrTest.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 CamelSolrTest extends AbstractFeatureTest {
+public class CamelSolrTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSolrTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java
index 944e1f2..5d92b94 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSplunkTest.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 CamelSplunkTest extends AbstractFeatureTest {
+public class CamelSplunkTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSplunkTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
index fdbd891..543e8bf 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringBatchTest.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 CamelSpringBatchTest extends AbstractFeatureTest {
+public class CamelSpringBatchTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSpringBatchTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java
index 93fafbd..43bcbb4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.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 CamelSpringJavaconfigTest extends AbstractFeatureTest {
+public class CamelSpringJavaconfigTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSpringJavaconfigTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java
index a12ec52..b992389 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringLdapTest.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 CamelSpringLdapTest extends AbstractFeatureTest {
+public class CamelSpringLdapTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSpringLdapTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
index 2677234..5fc0851 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringRedisTest.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 CamelSpringRedisTest extends AbstractFeatureTest {
+public class CamelSpringRedisTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSpringRedisTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
index 606d8ba..eac2602 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.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 CamelSpringWebServiceTest extends AbstractFeatureTest {
+public class CamelSpringWebServiceTest extends BaseKarafTest {
public static final String COMPONENT = "spring-ws";
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java
index 7d1a84c..8135cfb 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSqlTest.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 CamelSqlTest extends AbstractFeatureTest {
+public class CamelSqlTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSqlTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java
index d19b7a8..a5819a9 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSshTest.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 CamelSshTest extends AbstractFeatureTest {
+public class CamelSshTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSshTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java
index bed6b1e..8d28379 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStAXTest.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 CamelStAXTest extends AbstractFeatureTest {
+public class CamelStAXTest extends BaseKarafTest {
public static final String COMPONENT = "stax";
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java
index 7b9acd4..f06a391 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStompTest.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 CamelStompTest extends AbstractFeatureTest {
+public class CamelStompTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelStompTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java
index 9aa18ec..3a2596d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStreamTest.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 CamelStreamTest extends AbstractFeatureTest {
+public class CamelStreamTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelStreamTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java
index a547220..e5f8ce1 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelStringTemplateTest.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 CamelStringTemplateTest extends AbstractFeatureTest {
+public class CamelStringTemplateTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelStringTemplateTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerJavaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerJavaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerJavaTest.java
index 3250114..9d32e02 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerJavaTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerJavaTest.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 CamelSwaggerJavaTest extends AbstractFeatureTest {
+public class CamelSwaggerJavaTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSwaggerJavaTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerTest.java
index 02de0ad..f0eaa99 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSwaggerTest.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 CamelSwaggerTest extends AbstractFeatureTest {
+public class CamelSwaggerTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSwaggerTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java
index cf57dbf..60730d1 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.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 CamelSyslogTest extends AbstractFeatureTest {
+public class CamelSyslogTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelSyslogTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java
index 9d25efc..9345ec9 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTagsoupTest.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 CamelTagsoupTest extends AbstractFeatureTest {
+public class CamelTagsoupTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelTagsoupTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTarfileTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTarfileTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTarfileTest.java
index 9fa82af..05ac396 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTarfileTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTarfileTest.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 CamelTarfileTest extends AbstractFeatureTest {
+public class CamelTarfileTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelTarfileTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
index 3ee3a06..dd60b4a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.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 CamelTestSpringTest extends AbstractFeatureTest {
+public class CamelTestSpringTest extends BaseKarafTest {
public static final String COMPONENT = "test-spring";
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java
index c49911e..ee1564a 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestTest.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 CamelTestTest extends AbstractFeatureTest {
+public class CamelTestTest extends BaseKarafTest {
public static final String COMPONENT = "test";
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
index e58484f..7e164a3 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTwitterTest.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 CamelTwitterTest extends AbstractFeatureTest {
+public class CamelTwitterTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelTwitterTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java
index 114fc50..9d9fd5d 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUndertowTest.java
@@ -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 CamelUndertowTest extends AbstractFeatureTest {
+public class CamelUndertowTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelUndertowTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUnivocityParsersTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUnivocityParsersTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUnivocityParsersTest.java
index 23c8d38..9c505eb 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUnivocityParsersTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUnivocityParsersTest.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 CamelUnivocityParsersTest extends AbstractFeatureTest {
+public class CamelUnivocityParsersTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelUnivocityParsersTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java
index 2a774d3..ca7a2c9 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelUrlrewriteTest.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 CamelUrlrewriteTest extends AbstractFeatureTest {
+public class CamelUrlrewriteTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelUrlrewriteTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java
index f70e00e..e8a59ef 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVelocityTest.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 CamelVelocityTest extends AbstractFeatureTest {
+public class CamelVelocityTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelVelocityTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java
index 8ab58ad..6c0ed4d4 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelVertxTest.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 CamelVertxTest extends AbstractFeatureTest {
+public class CamelVertxTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelVertxTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java
index 0f1bebb..23cd272 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWeatherTest.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 CamelWeatherTest extends AbstractFeatureTest {
+public class CamelWeatherTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelWeatherTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java
index 8924cef..af44ded 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelWebsocketTest.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 CamelWebsocketTest extends AbstractFeatureTest {
+public class CamelWebsocketTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelWebsocketTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java
index c06a7e6..487c097 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlbeansTest.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 CamelXmlbeansTest extends AbstractFeatureTest {
+public class CamelXmlbeansTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelXmlbeansTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java
index 2547c3b..445d187 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmljsonTest.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 CamelXmljsonTest extends AbstractFeatureTest {
+public class CamelXmljsonTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelXmljsonTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java
index 58bfb6d..0355cc2 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlrpcTest.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 CamelXmlrpcTest extends AbstractFeatureTest {
+public class CamelXmlrpcTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelXmlrpcTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java
index 9a78cd0..91f4489 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmlsecurityTest.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 CamelXmlsecurityTest extends AbstractFeatureTest {
+public class CamelXmlsecurityTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelXmlsecurityTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java
index 5d83ed9..b937ad9 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXmppTest.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 CamelXmppTest extends AbstractFeatureTest {
+public class CamelXmppTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelXmppTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java
index 41547e9..8a78d54 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelXstreamTest.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 CamelXstreamTest extends AbstractFeatureTest {
+public class CamelXstreamTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelXstreamTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYamlTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYamlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYamlTest.java
index 30d4cc5..238d109 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYamlTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYamlTest.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 CamelYamlTest extends AbstractFeatureTest {
+public class CamelYamlTest extends BaseKarafTest {
public static final String COMPONENT = "snakeyaml";
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java
index 14b50eb..fa0fcfc 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelYammerTest.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 CamelYammerTest extends AbstractFeatureTest {
+public class CamelYammerTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelYammerTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java
index b838866..44c91e7 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipfileTest.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 CamelZipfileTest extends AbstractFeatureTest {
+public class CamelZipfileTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelZipfileTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
index b17c760..4c38500 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.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("Does not yet work in OSGi: https://issues.apache.org/jira/browse/SMX4-1983")
-public class CamelZipkinTest extends AbstractFeatureTest {
+public class CamelZipkinTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelZipkinTest.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/2bc61ae7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java
index 6d9d02d..b7cd7b7 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZookeeperTest.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 CamelZookeeperTest extends AbstractFeatureTest {
+public class CamelZookeeperTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelZookeeperTest.class);