Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java Wed Jun 8 13:31:03 2011 @@ -27,17 +27,13 @@ import org.ops4j.pax.exam.junit.Configur import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.ops4j.pax.swissbox.tinybundles.dp.Constants; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; - import static org.ops4j.pax.exam.CoreOptions.provision; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; @RunWith(JUnit4TestRunner.class) -@Ignore("TODO: fix me") +//@Ignore("TODO: fix me") public class OSGiMulitJettyCamelContextsTest extends OSGiIntegrationTestSupport { @Test @@ -66,16 +62,13 @@ public class OSGiMulitJettyCamelContexts response = template.requestBody(endpointURI, "Hello World", String.class); assertEquals("response is " , "camelContext2", response); } + @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-spring", "camel-test", "camel-jetty"), + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-jetty"), //set up the camel context bundle1 provision(newBundle().add("META-INF/spring/CamelContext1.xml", OSGiMulitJettyCamelContextsTest.class.getResource("CamelContext1.xml")) .add(JettyProcessor.class) @@ -89,15 +82,11 @@ public class OSGiMulitJettyCamelContexts .add(JettyProcessor.class) .set(Constants.BUNDLE_SYMBOLICNAME, "org.apache.camel.itest.osgi.CamelContextBundle2") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") - .set(Constants.BUNDLE_NAME, "CamelContext2").build()), - - - workingDirectory("target/paxrunner/"), - - equinox(), - felix()); + .set(Constants.BUNDLE_NAME, "CamelContext2").build()) + ); return options; } + }
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java Wed Jun 8 13:31:03 2011 @@ -17,7 +17,6 @@ package org.apache.camel.itest.osgi.jms; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; -import org.apache.karaf.testing.Helper; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; @@ -25,11 +24,8 @@ import org.ops4j.pax.exam.junit.Configur import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; /** * @version @@ -54,21 +50,13 @@ public class JmsTest extends OSGiIntegra @Configuration public static Option[] configure() throws Exception { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), + getDefaultCamelKarafOptions(), // using the features to install AMQ scanFeatures("mvn:org.apache.activemq/activemq-karaf/5.4.0/xml/features", "activemq"), // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-spring", "camel-test", "camel-jms"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); + scanFeatures(getCamelKarafFeatureUrl(), "camel-jms")); return options; } Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java Wed Jun 8 13:31:03 2011 @@ -132,7 +132,10 @@ public class JpaRouteTest extends OSGiIn // Default karaf environment Helper.getDefaultOptions( // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), + Helper.setLogLevel("WARN")), + + // install the spring, http features first + scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"), // using the features to install the camel components scanFeatures(getCamelKarafFeatureUrl(), "camel-core", "camel-spring", "camel-test", "camel-jpa"), Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java Wed Jun 8 13:31:03 2011 @@ -125,6 +125,9 @@ public class MailRouteTest extends OSGiI Helper.getDefaultOptions( // this is how you set the default log level when using pax logging (logProfile) Helper.setLogLevel("WARN")), + // install the spring, http features first + scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"), + // using the features to install the camel components scanFeatures(getCamelKarafFeatureUrl(), "camel-core", "camel-spring", "camel-test"), Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java Wed Jun 8 13:31:03 2011 @@ -18,18 +18,14 @@ package org.apache.camel.itest.osgi.mina import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; -import org.apache.karaf.testing.Helper; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; @RunWith(JUnit4TestRunner.class) public class MinaTest extends OSGiIntegrationTestSupport { @@ -55,20 +51,13 @@ public class MinaTest extends OSGiIntegr } @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-test", "camel-mina"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-mina")); return options; } + } \ No newline at end of file Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java Wed Jun 8 13:31:03 2011 @@ -112,6 +112,9 @@ public class MyBatisTest extends OSGiInt // this is how you set the default log level when using pax logging (logProfile) Helper.setLogLevel("WARN")), + // install the spring, http features first + scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"), + mavenBundle().groupId("org.apache.derby").artifactId("derby").version("10.4.2.0"), // using the features to install the camel components Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java Wed Jun 8 13:31:03 2011 @@ -18,18 +18,14 @@ package org.apache.camel.itest.osgi.nett import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; -import org.apache.karaf.testing.Helper; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; @RunWith(JUnit4TestRunner.class) public class NettyTest extends OSGiIntegrationTestSupport { @@ -55,20 +51,13 @@ public class NettyTest extends OSGiInteg } @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-test", "camel-netty"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-netty")); return options; } + } \ No newline at end of file Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java Wed Jun 8 13:31:03 2011 @@ -23,18 +23,14 @@ import org.apache.camel.component.mock.M import org.apache.camel.dataformat.protobuf.ProtobufDataFormat; import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; -import org.apache.karaf.testing.Helper; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; @RunWith(JUnit4TestRunner.class) public class ProtobufRouteTest extends OSGiIntegrationTestSupport { @@ -109,21 +105,13 @@ public class ProtobufRouteTest extends O } @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-spring", "camel-test", "camel-protobuf"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-protobuf")); return options; } - + } Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java Wed Jun 8 13:31:03 2011 @@ -60,6 +60,9 @@ public class QuartzCronRouteTest extends Helper.getDefaultOptions( // this is how you set the default log level when using pax logging (logProfile) Helper.setLogLevel("WARN")), + // install the spring, http features first + scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"), + // using the features to install the camel components scanFeatures(getCamelKarafFeatureUrl(), "camel-core", "camel-spring", "camel-test", "camel-quartz"), Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java Wed Jun 8 13:31:03 2011 @@ -23,18 +23,14 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; -import org.apache.karaf.testing.Helper; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; @RunWith(JUnit4TestRunner.class) public class RestletTest extends OSGiIntegrationTestSupport { @@ -63,22 +59,15 @@ public class RestletTest extends OSGiInt } }; } - + @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-spring", "camel-test", "camel-restlet"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); - + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-restlet")); + return options; } + } \ No newline at end of file Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java Wed Jun 8 13:31:03 2011 @@ -18,7 +18,6 @@ package org.apache.camel.itest.osgi.rest import org.apache.camel.Exchange; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; -import org.apache.karaf.testing.Helper; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,11 +26,8 @@ import org.ops4j.pax.exam.junit.Configur import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; /** * @version @@ -65,23 +61,16 @@ public class RestletDomainServiceTest ex assertEquals("{www.google.com}", response); } - + @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-spring", "camel-test", "camel-cxf", "camel-restlet"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); - + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-cxf", "camel-restlet")); + return options; } + } Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java Wed Jun 8 13:31:03 2011 @@ -26,18 +26,14 @@ import org.apache.camel.builder.RouteBui import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.rss.RssConstants; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; -import org.apache.karaf.testing.Helper; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; @RunWith(JUnit4TestRunner.class) public class RssPollingConsumerTest extends OSGiIntegrationTestSupport { @@ -76,21 +72,13 @@ public class RssPollingConsumerTest exte } @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-spring", "camel-test", "camel-rss"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-rss")); return options; } - + } Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java Wed Jun 8 13:31:03 2011 @@ -19,19 +19,16 @@ package org.apache.camel.itest.osgi.scri import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; -import org.apache.karaf.testing.Helper; + import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; + import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; /** * Test camel-script for groovy expressions in OSGi @@ -54,25 +51,14 @@ public class GroovyScriptOsgiTest extend assertMockEndpointsSatisfied(); } - + @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-spring", "camel-test", "camel-script"), - - mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.ant").version("1.7.0_3"), - mavenBundle().groupId("org.codehaus.groovy").artifactId("groovy-all").version("1.7.9"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); - + getDefaultCamelKarafOptions(), + scanFeatures(getCamelKarafFeatureUrl(), "camel-script", "camel-groovy")); return options; } + + } Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java Wed Jun 8 13:31:03 2011 @@ -55,22 +55,15 @@ public class RubyOsgiTest extends OSGiIn template.sendBody("direct:start", "Hello"); assertMockEndpointsSatisfied(); } - + @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-spring", "camel-test", "camel-script", "camel-ruby"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); - + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-script", "camel-ruby")); + return options; } + } Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java Wed Jun 8 13:31:03 2011 @@ -50,7 +50,7 @@ public class ServletComponentTest extend Helper.getDefaultOptions( // this is how you set the default log level when using pax logging (logProfile) Helper.setLogLevel("WARN")), - Helper.loadKarafStandardFeatures("http", "war"), + Helper.loadKarafStandardFeatures("spring", "jetty", "http", "war"), // set the system property for pax web org.ops4j.pax.exam.CoreOptions.systemProperty("org.osgi.service.http.port").value("9080"), Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java Wed Jun 8 13:31:03 2011 @@ -49,7 +49,7 @@ public class ServletServicesTest extends Helper.getDefaultOptions( // this is how you set the default log level when using pax logging (logProfile) Helper.setLogLevel("WARN")), - Helper.loadKarafStandardFeatures("http", "war"), + Helper.loadKarafStandardFeatures("spring", "http", "war"), // set the system property for pax web org.ops4j.pax.exam.CoreOptions.systemProperty("org.osgi.service.http.port").value("9080"), Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java Wed Jun 8 13:31:03 2011 @@ -26,7 +26,6 @@ import org.apache.camel.component.shiro. import org.apache.camel.component.shiro.security.ShiroSecurityToken; import org.apache.camel.component.shiro.security.ShiroSecurityTokenInjector; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; -import org.apache.karaf.testing.Helper; import org.apache.shiro.authc.IncorrectCredentialsException; import org.apache.shiro.authc.LockedAccountException; import org.apache.shiro.authc.UnknownAccountException; @@ -36,11 +35,8 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; @RunWith(JUnit4TestRunner.class) public class ShiroAuthenticationTest extends OSGiIntegrationTestSupport { @@ -88,24 +84,15 @@ public class ShiroAuthenticationTest ext } @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-spring", "camel-test", "camel-shiro"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-shiro")); return options; } - - + protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() { Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java Wed Jun 8 13:31:03 2011 @@ -52,22 +52,14 @@ public class StreamTest extends OSGiInte } }; } - @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-test", "camel-stream"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-stream")); return options; } + } \ No newline at end of file Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java Wed Jun 8 13:31:03 2011 @@ -30,7 +30,6 @@ import org.apache.camel.component.syslog import org.apache.camel.component.syslog.SyslogMessage; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.spi.DataFormat; -import org.apache.karaf.testing.Helper; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; @@ -38,11 +37,9 @@ import org.ops4j.pax.exam.junit.Configur import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; + @RunWith(JUnit4TestRunner.class) public class SyslogTest extends OSGiIntegrationTestSupport { @@ -100,19 +97,13 @@ public class SyslogTest extends OSGiInte } @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), "camel-core", "camel-test", "camel-mina", "camel-syslog"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); - + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-mina", "camel-syslog")); + return options; } + } Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java Wed Jun 8 13:31:03 2011 @@ -22,18 +22,14 @@ import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; -import org.apache.karaf.testing.Helper; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import static org.ops4j.pax.exam.CoreOptions.equinox; -import static org.ops4j.pax.exam.CoreOptions.felix; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; -import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory; @RunWith(JUnit4TestRunner.class) public class VelocityTest extends OSGiIntegrationTestSupport { @@ -65,20 +61,14 @@ public class VelocityTest extends OSGiIn } @Configuration - public static Option[] configure() throws Exception { + public static Option[] configure() { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("WARN")), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-spring", "camel-test", "camel-velocity"), - - workingDirectory("target/paxrunner/"), - - felix(), equinox()); + getDefaultCamelKarafOptions(), + // using the features to install the other camel components + scanFeatures(getCamelKarafFeatureUrl(), "camel-velocity")); return options; } + + } \ No newline at end of file Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml Wed Jun 8 13:31:03 2011 @@ -29,7 +29,7 @@ <camelContext id="camelContext1" xmlns="http://camel.apache.org/schema/spring";> <camel:route> - <camel:from uri="jetty:http://localhost:9010/context1/"/> + <camel:from uri="jetty:http://0.0.0.0:9010/context1/"/> <camel:process ref="jettyProcessor"/> </camel:route> </camelContext> Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml?rev=1133394&r1=1133393&r2=1133394&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml Wed Jun 8 13:31:03 2011 @@ -29,7 +29,7 @@ <camelContext id="camelContext2" xmlns="http://camel.apache.org/schema/spring";> <camel:route> - <camel:from uri="jetty:http://localhost:9010/context2/"/> + <camel:from uri="jetty:http://0.0.0.0:9010/context2/"/> <camel:process ref="jettyProcessor"/> </camel:route> </camelContext>
