You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2014/08/22 16:17:36 UTC
[1/2] Don't use the deprecated pax-exam classes.
Repository: camel
Updated Branches:
refs/heads/master 7a2e5197f -> a2aa6ac83
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
index 490eb94..eee924c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java
@@ -27,15 +27,15 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CxfBeanBlueprintRouterTest extends OSGiBlueprintTestSupport {
protected void doPostSetup() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
index 81fbfe2..5dc34e3 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
@@ -29,16 +29,16 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CxfBlueprintRouterTest extends OSGiBlueprintTestSupport {
private static Server server;
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
index f456e27..1e2d252 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
@@ -36,15 +36,15 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CxfRsBlueprintRouterTest extends OSGiBlueprintTestSupport {
private static final String PUT_REQUEST = "<Customer><name>Mary</name><id>123</id></Customer>";
private static final String POST_REQUEST = "<Customer><name>Jack</name></Customer>";
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
index 1ff6dbc..95d66d2 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.apache.camel.itest.osgi.dozer.service.Customer;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -32,7 +32,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class DozerTest extends OSGiIntegrationSpringTestSupport {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java
index 827eb37..36867c2 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java
@@ -21,13 +21,13 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("We need a test which runs on all platforms")
public class ExecTest extends OSGiIntegrationTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java
index bcda540..36e5a95 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java
@@ -23,9 +23,9 @@ import java.io.InputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.util.IOHelper;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class FreemarkerFileTest extends FreemarkerTest {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java
index a37718c..d19c171 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java
@@ -24,13 +24,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class FreemarkerTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java
index ceb7609..bc4285a 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java
@@ -19,14 +19,14 @@ package org.apache.camel.itest.osgi.ftp;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class FtpConsumeTest extends OSGiIntegrationSpringTestSupport {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java
index 8b27178..8890989 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java
@@ -26,13 +26,13 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class HawtDBAggregateRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
index 903ab71..8ff20c8 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
@@ -21,14 +21,14 @@ import org.apache.camel.component.hazelcast.HazelcastConstants;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class HazelcastTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java
index e644f9f..d273884 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java
@@ -22,16 +22,16 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class HdfsBlueprintRouteTest extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java
index 6e4dbb3..3752090 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java
@@ -21,13 +21,13 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class HL7DataFormatTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java
index 07019f9..3653c28 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java
@@ -24,14 +24,14 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("TODO need to find a way fix the hl7codec setting issue")
public class HL7MLLPCodec2Test extends OSGiIntegrationSpringTestSupport implements Processor {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
index 8f12a25..6859c46 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java
@@ -22,14 +22,14 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("TODO need to find a way fix the hl7codec setting issue")
public class HL7MLLPCodecTest extends OSGiIntegrationSpringTestSupport implements Processor {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java
index 823d334..b4e7f11 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java
@@ -21,16 +21,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class HttpTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java
index ce172a1..5eb54cd 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java
@@ -30,13 +30,13 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class HttpTypeConverterTest extends OSGiIntegrationTestSupport {
static HttpServletResponse servletResponse = new HttpServletResponse() {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java
index 9ed0214..8f2d09d 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java
@@ -21,16 +21,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class Http4Test extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
index c65e783..a9c9e51 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java
@@ -22,13 +22,13 @@ import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class JasyptTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
index fb8d5f5..93a7081 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
@@ -20,14 +20,14 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class JaxbFallbackConverterSpringTest extends OSGiIntegrationSpringTestSupport {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
index c3b05c7..de4f9e5 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
@@ -21,13 +21,13 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class JaxbFallbackConverterTest extends OSGiIntegrationTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java
index 5301539..a9e9a0b 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java
@@ -29,15 +29,15 @@ import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BlobStoreRouteTest extends OSGiIntegrationTestSupport {
private static final String TEST_CONTAINER = "testContainer";
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java
index 2d81f61..07c6f09 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.itest.osgi.jetty;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
@@ -34,7 +34,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
* and thus, sharing the same container-wide Jetty Connector, do not share the classloader. The TCCL should
* be different in each case, as for each route it should be the Classloader of their containing bundle.
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class OSGiJettyCamelContextsClassloaderTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
index 81d1e12..ca993c7 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
@@ -20,9 +20,9 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
@@ -30,7 +30,7 @@ import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class OSGiMulitJettyCamelContextsTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
index ce40365..74ea5f3 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
@@ -28,9 +28,9 @@ import org.apache.camel.util.IOHelper;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleContext;
import org.springframework.orm.jpa.JpaTemplate;
import org.springframework.orm.jpa.JpaTransactionManager;
@@ -43,7 +43,7 @@ import org.springframework.transaction.support.TransactionTemplate;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class JpaRouteTest extends OSGiIntegrationTestSupport {
protected static final String SELECT_ALL_STRING = "select x from " + SendEmail.class.getName() + " x";
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java
index 94dbb73..563a4e0 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java
@@ -22,14 +22,14 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Not fully implemented, see TODO")
public class ScpTest extends OSGiIntegrationSpringTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
index 6b57a1e..e6bbe8e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
@@ -23,16 +23,16 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class KratiBlueprintRouteTest extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java
index c26752b..16be8b2 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java
@@ -26,15 +26,15 @@ import org.apache.camel.spring.SpringCamelContext;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleContext;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class KratiRouteTest extends OSGiIntegrationTestSupport {
protected OsgiBundleXmlApplicationContext applicationContext;
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java
index 0a25baf..eaf630b 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java
@@ -27,13 +27,13 @@ import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("leveldb artifact needs to be osgi bundle.")
public class LevelDBAggregateRouteTest extends OSGiIntegrationTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java
index b664e5b..810fd44 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java
@@ -20,13 +20,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class MinaTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java
index 9bc2ffd..1101395 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java
@@ -22,14 +22,14 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.itest.osgi.core.bean.MyFooBean;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class MvelTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java
index b2f8d0b..d7449d0 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java
@@ -27,9 +27,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -37,7 +37,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Loading OSGi driver in OSGi is ***** hard")
public class MyBatisTest extends OSGiIntegrationTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java
index ca3f043..32c179e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java
@@ -20,13 +20,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class NettyTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
index dc6c637..d1cc40c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
@@ -25,13 +25,13 @@ import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ProtobufRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
index f99d5e5..174a763 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java
@@ -21,13 +21,13 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class QuartzCronRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java
index 4296ccd..51f0ff1 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java
@@ -25,13 +25,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class RestletTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java
index 8d8a528..0516628 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -31,7 +31,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("PaxExam hang on shutdown of this test")
public class RestletDomainServiceTest extends OSGiIntegrationSpringTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java
index ad81ae1..680b722 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java
@@ -29,13 +29,13 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("abdera-core bundle has a wrong stax api dependency")
public class RssPollingConsumerTest extends OSGiIntegrationTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java
index bea39a2..ab1535f 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java
@@ -22,16 +22,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
/**
* Test camel-script for groovy expressions in OSGi
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class GroovyScriptOsgiTest extends OSGiIntegrationTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java
index eed3848..4b0e181 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java
@@ -22,16 +22,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
/**
* Test camel-script for Ruby expressions in OSGi
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("You need an OSGi-ified version of JRuby for this to pass")
public class RubyOsgiTest extends OSGiIntegrationTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
index f2227f8..900dc1c2 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
@@ -31,14 +31,14 @@ import org.apache.shiro.authc.LockedAccountException;
import org.apache.shiro.authc.UnknownAccountException;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ShiroAuthenticationTest extends OSGiIntegrationTestSupport {
@EndpointInject(uri = "mock:success")
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/bean/SpringBeanRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/bean/SpringBeanRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/bean/SpringBeanRouteTest.java
index a142e2b..f1bf75c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/bean/SpringBeanRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/bean/SpringBeanRouteTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.itest.osgi.spring.bean;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class SpringBeanRouteTest extends OSGiIntegrationSpringTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/event/EventRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/event/EventRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/event/EventRouteTest.java
index 781f335..fd30c04 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/event/EventRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/event/EventRouteTest.java
@@ -22,11 +22,11 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class EventRouteTest extends OSGiIntegrationSpringTestSupport {
protected Object expectedBody = "Hello there!";
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java
index 3ab9ee8..0711d8a 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java
@@ -33,9 +33,9 @@ import org.apache.camel.util.IOHelper;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -45,7 +45,7 @@ import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class SqlRouteTest extends OSGiIntegrationTestSupport {
String driverClass = "org.apache.derby.jdbc.EmbeddedDriver";
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
index 1eb22f2..4c5bc73 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
@@ -20,13 +20,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class StreamTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java
index 52108f0..ae0b606 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java
@@ -32,14 +32,14 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.spi.DataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class SyslogTest extends OSGiIntegrationTestSupport {
private final int serverPort = 10514;
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java
index 0ac33c4..d37d2d0 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java
@@ -25,10 +25,10 @@ import org.apache.camel.util.jsse.KeyStoreParameters;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class JsseUtilTest extends OSGiIntegrationSpringTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java
index fdab827..2f55fcc 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java
@@ -25,16 +25,16 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class VelocityBlueprintTest extends OSGiBlueprintTestSupport {
private CamelContext camelContext;
private ProducerTemplate mytemplate;
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java
index 7b555fd..97a9b5c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java
@@ -23,9 +23,9 @@ import java.io.InputStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.util.IOHelper;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class VelocityFileTest extends VelocityTest {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
index 2a6e71a..4041417 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java
@@ -24,13 +24,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class VelocityTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java
index 4f71c4f..0797940 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java
@@ -23,9 +23,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -35,7 +35,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* OSGi integration test for camel-xmljson
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class XmlJsonBlueprintRouteTest extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
index 4ef3fc9..12bed11 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
@@ -23,9 +23,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
@@ -33,7 +33,7 @@ import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class XstreamBlueprintRouteTest extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java
index 41a1fe4..affea26 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java
@@ -34,12 +34,12 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_CREATE_MODE;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_NODE;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Causes processes to not cleanly shutdown. "
+ "And There is an issue with the zookeeper bundle, so the server cannot be started in pax-exam karaf container")
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
index c8f5a35..2796100 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
@@ -52,8 +52,8 @@ import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
[2/2] git commit: Don't use the deprecated pax-exam classes.
Posted by dk...@apache.org.
Don't use the deprecated pax-exam classes.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2aa6ac8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2aa6ac8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2aa6ac8
Branch: refs/heads/master
Commit: a2aa6ac8300a84a1f74a8b19fae86e328865db8f
Parents: 7a2e519
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 22 10:16:50 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 22 10:16:50 2014 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java | 6 +++---
.../org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java | 4 ++--
.../test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java | 4 ++--
.../org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java | 4 ++--
.../test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java | 4 ++--
.../org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java | 4 ++--
.../test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java | 4 ++--
.../org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java | 4 ++--
.../test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java | 4 ++--
.../org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java | 4 ++--
.../test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java | 4 ++--
.../java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java | 2 +-
.../camel/itest/osgi/bean/validator/BeanValidatorTest.java | 6 +++---
.../camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java | 6 +++---
.../apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java | 6 +++---
.../osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java | 6 +++---
.../camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java | 6 +++---
.../osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java | 6 +++---
.../blueprint/BlueprintPropertiesCustomPrefixRouteTest.java | 6 +++---
.../osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java | 6 +++---
.../itest/osgi/blueprint/BlueprintPropertiesRouteTest.java | 6 +++---
.../apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java | 6 +++---
.../apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java | 6 +++---
.../apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java | 6 +++---
.../apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java | 6 +++---
.../apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java | 6 +++---
.../apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java | 6 +++---
.../apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java | 6 +++---
.../blueprint/CamelBlueprintManagedNamePatternFixedTest.java | 6 +++---
.../camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java | 6 +++---
.../apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java | 6 +++---
.../itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java | 6 +++---
.../itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java | 6 +++---
.../camel/itest/osgi/cache/CacheManagerFactoryRefTest.java | 6 +++---
.../camel/itest/osgi/cache/CacheRoutesManagementTest.java | 6 +++---
.../test/java/org/apache/camel/itest/osgi/cache/CacheTest.java | 6 +++---
.../apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java | 4 ++--
.../apache/camel/itest/osgi/core/TypeConverterLoaderTest.java | 4 ++--
.../org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java | 4 ++--
.../apache/camel/itest/osgi/core/browse/BrowseRouteTest.java | 4 ++--
.../org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java | 4 ++--
.../osgi/core/dataformat/SerializationDataFormatTest.java | 4 ++--
.../apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java | 4 ++--
.../org/apache/camel/itest/osgi/core/direct/DirectTest.java | 4 ++--
.../apache/camel/itest/osgi/core/file/FileComponentTest.java | 4 ++--
.../apache/camel/itest/osgi/core/file/FileRouteDelayTest.java | 4 ++--
.../org/apache/camel/itest/osgi/core/file/FileRouteTest.java | 4 ++--
.../camel/itest/osgi/core/language/LanguageRouteTest.java | 4 ++--
.../org/apache/camel/itest/osgi/core/language/SimpleTest.java | 4 ++--
.../org/apache/camel/itest/osgi/core/log/LogRouteTest.java | 4 ++--
.../org/apache/camel/itest/osgi/core/mock/MockXPathTest.java | 4 ++--
.../camel/itest/osgi/core/packages/OSGiPackageScanTest.java | 4 ++--
.../camel/itest/osgi/core/properties/PropertiesRouteTest.java | 4 ++--
.../apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java | 4 ++--
.../java/org/apache/camel/itest/osgi/core/seda/SedaTest.java | 4 ++--
.../org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java | 4 ++--
.../camel/itest/osgi/core/validator/ValidatorRouteTest.java | 4 ++--
.../test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java | 4 ++--
.../camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java | 6 +++---
.../org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java | 4 ++--
.../apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java | 6 +++---
.../org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java | 6 +++---
.../itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java | 6 +++---
.../camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java | 6 +++---
.../itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java | 6 +++---
.../test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java | 6 +++---
.../test/java/org/apache/camel/itest/osgi/exec/ExecTest.java | 6 +++---
.../apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java | 4 ++--
.../org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java | 6 +++---
.../java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java | 6 +++---
.../camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java | 6 +++---
.../org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java | 6 +++---
.../apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java | 6 +++---
.../org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java | 6 +++---
.../org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java | 6 +++---
.../java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java | 6 +++---
.../test/java/org/apache/camel/itest/osgi/http/HttpTest.java | 6 +++---
.../apache/camel/itest/osgi/http/HttpTypeConverterTest.java | 6 +++---
.../test/java/org/apache/camel/itest/osgi/http4/Http4Test.java | 6 +++---
.../java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java | 6 +++---
.../camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java | 6 +++---
.../camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java | 6 +++---
.../apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java | 6 +++---
.../osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java | 6 +++---
.../itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java | 6 +++---
.../java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java | 6 +++---
.../test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java | 6 +++---
.../apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java | 6 +++---
.../java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java | 6 +++---
.../camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java | 6 +++---
.../test/java/org/apache/camel/itest/osgi/mina/MinaTest.java | 6 +++---
.../test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java | 6 +++---
.../java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java | 6 +++---
.../test/java/org/apache/camel/itest/osgi/netty/NettyTest.java | 6 +++---
.../apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java | 6 +++---
.../apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java | 6 +++---
.../java/org/apache/camel/itest/osgi/restlet/RestletTest.java | 6 +++---
.../itest/osgi/restlet/example/RestletDomainServiceTest.java | 6 +++---
.../apache/camel/itest/osgi/rss/RssPollingConsumerTest.java | 6 +++---
.../apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java | 6 +++---
.../java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java | 6 +++---
.../apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java | 6 +++---
.../camel/itest/osgi/spring/bean/SpringBeanRouteTest.java | 4 ++--
.../apache/camel/itest/osgi/spring/event/EventRouteTest.java | 4 ++--
.../java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java | 6 +++---
.../java/org/apache/camel/itest/osgi/stream/StreamTest.java | 6 +++---
.../java/org/apache/camel/itest/osgi/syslog/SyslogTest.java | 6 +++---
.../org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java | 4 ++--
.../camel/itest/osgi/velocity/VelocityBlueprintTest.java | 6 +++---
.../org/apache/camel/itest/osgi/velocity/VelocityFileTest.java | 4 ++--
.../org/apache/camel/itest/osgi/velocity/VelocityTest.java | 6 +++---
.../camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java | 6 +++---
.../camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java | 6 +++---
.../apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java | 4 ++--
.../camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java | 2 +-
115 files changed, 302 insertions(+), 302 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
index 6f0766c..0d30d03 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java
@@ -21,17 +21,17 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
import static org.ops4j.pax.exam.OptionUtils.combine;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
public class AhcTest extends OSGiIntegrationTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java
index 6be307e..8b490fa 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java
@@ -28,10 +28,10 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Test fails")
public class AwsS3IntegrationTest extends AwsTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
index c900bb5..63a457e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java
@@ -27,10 +27,10 @@ import org.apache.camel.component.aws.s3.S3Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class AwsS3Test extends AwsTestSupport {
@EndpointInject(uri = "mock:result-s3")
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java
index 4d987f0..7a49890 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java
@@ -32,10 +32,10 @@ import org.apache.camel.component.aws.sdb.SdbOperations;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Must be manually tested. Provide your own accessKey and secretKey!")
public class AwsSdbIntegrationTest extends AwsTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java
index 4edac9f..139d157 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java
@@ -34,10 +34,10 @@ import org.apache.camel.impl.DefaultProducerTemplate;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class AwsSdbTest extends AwsTestSupport {
private AmazonSDBClientMock amazonSDBClient;
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java
index b3084f6..3b0b7e7 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java
@@ -22,10 +22,10 @@ import org.apache.camel.component.aws.ses.SesConstants;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Must be manually tested. Provide your own accessKey and secretKey in CamelIntegrationContext.xml!")
public class AwsSesIntegrationTest extends AwsTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java
index 3a6d391..83f9649 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.Processor;
import org.apache.camel.component.aws.ses.SesConstants;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class AwsSesTest extends AwsTestSupport {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java
index 68c9439..5054f21 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java
@@ -23,10 +23,10 @@ import org.apache.camel.component.aws.sns.SnsConstants;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Must be manually tested. Provide your own accessKey and secretKey in CamelIntegrationContext.xml!")
public class AwsSnsIntegrationTest extends AwsTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
index 7983318..66e5d08 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java
@@ -22,10 +22,10 @@ import org.apache.camel.Processor;
import org.apache.camel.component.aws.sns.SnsConstants;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class AwsSnsTest extends AwsTestSupport {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java
index 3b9288a..c4bf03c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java
@@ -25,10 +25,10 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Must be manually tested. Provide your own accessKey and secretKey in CamelIntegrationContext.xml!")
public class AwsSqsIntegrationTest extends AwsTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java
index 9a8c508..1bc909f 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java
@@ -24,11 +24,11 @@ import org.apache.camel.component.aws.sqs.SqsConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class AwsSqsTest extends AwsTestSupport {
@EndpointInject(uri = "mock:result")
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java
index 1941ffa..71ca810 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java
@@ -18,8 +18,8 @@
package org.apache.camel.itest.osgi.aws;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
import static org.ops4j.pax.exam.OptionUtils.combine;
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java
index ecae32f..d106b5a 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java
@@ -22,13 +22,13 @@ import org.apache.camel.Processor;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BeanValidatorTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java
index 3d172cd..ad0feca 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java
@@ -28,16 +28,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.spi.DataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BeanIODataFormatSimpleTest extends OSGiIntegrationTestSupport {
private static final String FIXED_DATA = "Joe,Smith,Developer,75000,10012009" + LS
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java
index dfed422..65bccfd 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java
@@ -28,16 +28,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.spi.DataFormat;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BindyDataFormatCsvTest extends OSGiIntegrationTestSupport {
private static final String FIXED_DATA = "Joe,Smith,Developer,75000,10012009" + "\n"
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java
index 9f8fb0f..8addfe5 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java
@@ -25,9 +25,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -35,7 +35,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BindySpringDataFormatCsvJavaRouteTest extends OSGiIntegrationSpringTestSupport {
private static final String FIXED_DATA = "Joe,Smith,Developer,75000,10012009" + "\n"
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java
index 3b264bd..514b466 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java
@@ -25,9 +25,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -35,7 +35,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BindySpringDataFormatCsvTest extends OSGiIntegrationSpringTestSupport {
private static final String FIXED_DATA = "Joe,Smith,Developer,75000,10012009" + "\n"
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
index dce7440..33d0a74 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BlueprintExplicitPropertiesRouteTest extends OSGiBlueprintTestSupport {
private String name = BlueprintExplicitPropertiesRouteTest.class.getName();
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesCustomPrefixRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesCustomPrefixRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesCustomPrefixRouteTest.java
index 7419098..08565c5 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesCustomPrefixRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesCustomPrefixRouteTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.options.extra.VMOption;
import org.osgi.framework.Constants;
@@ -33,7 +33,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BlueprintPropertiesCustomPrefixRouteTest extends OSGiBlueprintTestSupport {
private String name = BlueprintPropertiesCustomPrefixRouteTest.class.getName();
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java
index d4b4ab0..e898085 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BlueprintPropertiesJasyptRouteTest extends OSGiBlueprintTestSupport {
private String name = BlueprintPropertiesJasyptRouteTest.class.getName();
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
index d0ce0ff..a4f3954 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
*
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BlueprintPropertiesRouteTest extends OSGiBlueprintTestSupport {
private String name = BlueprintPropertiesRouteTest.class.getName();
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
index 7fdf2bf..fca75ae 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
@@ -22,9 +22,9 @@ import org.apache.camel.model.RouteDefinition;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import org.osgi.service.blueprint.container.BlueprintContainer;
@@ -34,7 +34,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBlueprint2Test extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
index 80e6b61..94376f8 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java
@@ -19,9 +19,9 @@ package org.apache.camel.itest.osgi.blueprint;
import org.apache.camel.CamelContext;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import org.osgi.service.blueprint.container.BlueprintContainer;
@@ -31,7 +31,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBlueprint3Test extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
index 0d43e89..e62d475 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java
@@ -21,9 +21,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -33,7 +33,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBlueprint4Test extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java
index 26d17c4..b137e9c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java
@@ -21,9 +21,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBlueprint5Test extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java
index 70ee0b4..eebc69a 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java
@@ -21,9 +21,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBlueprint6Test extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java
index 33353ed..05f45d4 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java
@@ -21,9 +21,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBlueprint7Test extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java
index 4159ce2..2d2e428 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java
@@ -21,9 +21,9 @@ import java.lang.reflect.Method;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import org.osgi.service.blueprint.container.BlueprintContainer;
@@ -33,7 +33,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBlueprint8Test extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java
index a4b914f..cc2c0ca 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java
@@ -24,9 +24,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -35,7 +35,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBlueprintManagedNamePatternFixedTest extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java
index 5cc7908..2c1deb3 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java
@@ -25,9 +25,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
@@ -40,7 +40,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
*
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBlueprintTcclTest extends OSGiBlueprintTestSupport {
private static final String BUNDLE_SYMBOLICNAME = "CamelBlueprintTcclTestBundle";
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
index ad03053..630c61f 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.itest.osgi.blueprint;
import org.apache.camel.CamelContext;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import org.osgi.service.blueprint.container.BlueprintContainer;
@@ -31,7 +31,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CamelBlueprintTest extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
index c9f77c5..05c161a 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java
@@ -22,9 +22,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -33,7 +33,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class OSGiBlueprintHelloWorldTest extends OSGiBlueprintTestSupport {
private static final String NAME = OSGiBlueprintHelloWorldTest.class.getName();
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java
index fae4496..3daf917 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java
@@ -22,9 +22,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -33,7 +33,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class OSGiBlueprintQuarz2SchedulerTest extends OSGiBlueprintTestSupport {
private static final String NAME = OSGiBlueprintQuarz2SchedulerTest.class.getName();
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java
index fc413b1..f53efe7 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java
@@ -28,14 +28,14 @@ import org.apache.camel.component.cache.CacheManagerFactory;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CacheManagerFactoryRefTest extends OSGiIntegrationTestSupport {
private static final String CACHE_URI = "cache:foo?cacheManagerFactory=#cacheManagerFactory";
private TestingCacheManagerFactory cmfRef = new TestingCacheManagerFactory("ehcache_test.xml");
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java
index 3c38beb..32fec5e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java
@@ -28,14 +28,14 @@ import org.apache.camel.component.cache.CacheManagerFactory;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CacheRoutesManagementTest extends OSGiIntegrationTestSupport {
private static final String CACHE_URI = "cache:foo?cacheManagerFactory=#cacheManagerFactory";
private static final String ROUTE1_ID = "TEST_ROUTE_1";
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java
index ef01cb1..a9bec7e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java
@@ -21,13 +21,13 @@ import org.apache.camel.component.cache.CacheConstants;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CacheTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java
index b291dad..3f64c06 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.spi.FactoryFinder;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class OsgiFactoryFinderTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/TypeConverterLoaderTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/TypeConverterLoaderTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/TypeConverterLoaderTest.java
index ee0e257..eca1894 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/TypeConverterLoaderTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/TypeConverterLoaderTest.java
@@ -20,9 +20,9 @@ import org.apache.camel.spi.FactoryFinder;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class TypeConverterLoaderTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java
index 63d26cb..0b692ff 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java
@@ -21,11 +21,11 @@ import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BeanRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/browse/BrowseRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/browse/BrowseRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/browse/BrowseRouteTest.java
index 14e62c9..10562c2 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/browse/BrowseRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/browse/BrowseRouteTest.java
@@ -22,9 +22,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.spi.BrowsableEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class BrowseRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java
index 3c5cc3f..3465d92 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java
@@ -20,10 +20,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ClassRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java
index 004dafc..ee87e49 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java
@@ -20,9 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class SerializationDataFormatTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java
index ce6bfbf..2e8b910 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java
@@ -23,10 +23,10 @@ import org.apache.camel.component.dataset.SimpleDataSet;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class DataSetRouteTest extends OSGiIntegrationTestSupport {
protected SimpleDataSet dataSet = new SimpleDataSet(20);
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java
index 9a267b4..a24bcd9 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class DirectTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java
index 9ac8033..a1a2db7 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class FileComponentTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java
index 915250b..891ce60 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java
@@ -23,9 +23,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.util.StopWatch;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class FileRouteDelayTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java
index 27feb23..d2387a5 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java
@@ -22,9 +22,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class FileRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/LanguageRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/LanguageRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/LanguageRouteTest.java
index 059f0d1..7caed99 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/LanguageRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/LanguageRouteTest.java
@@ -20,9 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class LanguageRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java
index 512ce8e..ce19e04 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class SimpleTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteTest.java
index 139daeb..160d6b0 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.itest.osgi.core.log;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class LogRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/mock/MockXPathTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/mock/MockXPathTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/mock/MockXPathTest.java
index 8191777..45553fc 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/mock/MockXPathTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/mock/MockXPathTest.java
@@ -22,9 +22,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.model.language.XPathExpression;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class MockXPathTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java
index 0a48645..2fa143b 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java
@@ -20,10 +20,10 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class OSGiPackageScanTest extends OSGiIntegrationSpringTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/properties/PropertiesRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/properties/PropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/properties/PropertiesRouteTest.java
index f7bedd3..c28a009 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/properties/PropertiesRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/properties/PropertiesRouteTest.java
@@ -21,10 +21,10 @@ import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class PropertiesRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java
index 2361549..87e10c3 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java
@@ -23,9 +23,9 @@ import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class RefFileEndpointTest extends OSGiIntegrationTestSupport {
private JndiRegistry jndi;
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
index a46d59c..1be2d07 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
@@ -22,12 +22,12 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class SedaTest extends OSGiIntegrationTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java
index a8e505a..4b793d0 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java
@@ -22,9 +22,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class TimerFiredTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java
index 534e288..148af2d 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java
@@ -21,9 +21,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ValidatorRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java
index bdd601f..2320dd3 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java
@@ -20,12 +20,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class VmTest extends OSGiIntegrationTestSupport {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java
index 4f1b991..deea855 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java
@@ -26,16 +26,16 @@ import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class XsltBlueprintRouteTest extends OSGiBlueprintTestSupport {
private CamelContext camelContext;
private ProducerTemplate mytemplate;
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java
index 27187bb..e2324e9 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java
@@ -21,11 +21,11 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class XsltRouteTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
index ebf2366..eed51ec 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java
@@ -26,9 +26,9 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -36,7 +36,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CxfBeanSpringRouteTest extends OSGiIntegrationSpringTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
index 8b4c34b..70f2ff3 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java
@@ -23,9 +23,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import static org.ops4j.pax.exam.CoreOptions.provision;
@@ -33,7 +33,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class CxfProxyExampleTest extends OSGiIntegrationSpringTestSupport {
protected static ReportIncidentEndpoint createCXFClient() {