Repository: camel Updated Branches: refs/heads/master a2aa6ac83 -> 6706b5b4e
Update to pax-exam provided tinybundles to allow more of the tests to pass Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6706b5b4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6706b5b4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6706b5b4 Branch: refs/heads/master Commit: 6706b5b4ece1c653135ce2909f4cd67ed70d60f8 Parents: a2aa6ac Author: Daniel Kulp <dk...@apache.org> Authored: Fri Aug 22 10:53:45 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Fri Aug 22 10:53:45 2014 -0400 ---------------------------------------------------------------------- tests/camel-itest-osgi/pom.xml | 5 -- .../BlueprintExplicitPropertiesRouteTest.java | 6 ++- ...lueprintPropertiesCustomPrefixRouteTest.java | 6 ++- .../BlueprintPropertiesJasyptRouteTest.java | 6 ++- .../blueprint/BlueprintPropertiesRouteTest.java | 6 ++- .../osgi/blueprint/CamelBlueprint2Test.java | 12 +++-- .../osgi/blueprint/CamelBlueprint3Test.java | 12 +++-- .../osgi/blueprint/CamelBlueprint4Test.java | 15 +++--- .../osgi/blueprint/CamelBlueprint5Test.java | 6 ++- .../osgi/blueprint/CamelBlueprint6Test.java | 6 ++- .../osgi/blueprint/CamelBlueprint7Test.java | 6 ++- .../osgi/blueprint/CamelBlueprint8Test.java | 8 +-- ...melBlueprintManagedNamePatternFixedTest.java | 6 ++- .../osgi/blueprint/CamelBlueprintTcclTest.java | 7 ++- .../osgi/blueprint/CamelBlueprintTest.java | 14 ++--- .../CamelMultiVersionBlueprintTest.java | 6 ++- .../blueprint/OSGiBlueprintHelloWorldTest.java | 6 ++- .../OSGiBlueprintQuarz2SchedulerTest.java | 6 ++- .../OSGiIntegrationManagedCamelContextTest.java | 6 ++- .../osgi/core/xslt/XsltBlueprintRouteTest.java | 8 +-- .../itest/osgi/cxf/CxfBeanSpringRouteTest.java | 9 ++-- .../itest/osgi/cxf/CxfProxyExampleTest.java | 9 ++-- .../blueprint/CxfBeanBlueprintRouterTest.java | 6 ++- .../cxf/blueprint/CxfBlueprintRouterTest.java | 56 ++++++++++++-------- .../cxf/blueprint/CxfRsBlueprintRouterTest.java | 6 ++- .../itest/osgi/hdfs/HdfsBlueprintRouteTest.java | 6 ++- .../jclouds/BlobStoreBlueprintRouteTest.java | 8 +-- .../OSGiJettyCamelContextsClassloaderTest.java | 9 ++-- .../jetty/OSGiMulitJettyCamelContextsTest.java | 9 ++-- .../itest/osgi/jpa/JpaBlueprintRouteTest.java | 6 ++- .../osgi/krati/KratiBlueprintRouteTest.java | 6 ++- .../camel/itest/osgi/sql/SqlBlueprintRoute.java | 9 ++-- .../osgi/velocity/VelocityBlueprintTest.java | 9 ++-- .../osgi/xmljson/XmlJsonBlueprintRouteTest.java | 6 ++- .../osgi/xstream/XstreamBlueprintRouteTest.java | 7 +-- 35 files changed, 189 insertions(+), 125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/tests/camel-itest-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml index 7001415..f95115e 100644 --- a/tests/camel-itest-osgi/pom.xml +++ b/tests/camel-itest-osgi/pom.xml @@ -60,11 +60,6 @@ </dependency> <dependency> - <groupId>org.ops4j.pax.swissbox</groupId> - <artifactId>pax-swissbox-tinybundles</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.karaf</groupId> <artifactId>apache-karaf</artifactId> <version>${karaf-version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 33d0a74..7316da9 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 @@ -19,15 +19,17 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @@ -68,7 +70,7 @@ public class BlueprintExplicitPropertiesRouteTest extends OSGiBlueprintTestSuppo Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", BlueprintExplicitPropertiesRouteTest.class.getResource("blueprint-16.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintExplicitPropertiesRouteTest.class.getName()) .set(Constants.BUNDLE_VERSION, "1.0.0") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 08565c5..d705e5a 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 @@ -19,16 +19,18 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; 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.PaxExam; import org.ops4j.pax.exam.options.extra.VMOption; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @@ -67,7 +69,7 @@ public class BlueprintPropertiesCustomPrefixRouteTest extends OSGiBlueprintTestS Option[] options = combine( getDefaultCamelKarafOptions(), new VMOption("-Dcontainer.stage=test"), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", BlueprintPropertiesCustomPrefixRouteTest.class.getResource("blueprint-27.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintPropertiesCustomPrefixRouteTest.class.getName()) .set(Constants.BUNDLE_VERSION, "1.0.0") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 e898085..cd81b0f 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 @@ -19,15 +19,17 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @@ -68,7 +70,7 @@ public class BlueprintPropertiesJasyptRouteTest extends OSGiBlueprintTestSupport Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", BlueprintPropertiesJasyptRouteTest.class.getResource("blueprint-26.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintPropertiesJasyptRouteTest.class.getName()) .set(Constants.BUNDLE_VERSION, "1.0.0") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 a4f3954..13f7f67 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 @@ -19,15 +19,17 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @@ -68,7 +70,7 @@ public class BlueprintPropertiesRouteTest extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", BlueprintPropertiesRouteTest.class.getResource("blueprint-17.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintPropertiesRouteTest.class.getName()) .set(Constants.BUNDLE_VERSION, "1.0.0") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 fca75ae..7854fd9 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 @@ -19,17 +19,19 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; import org.apache.camel.builder.DeadLetterChannelBuilder; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import org.osgi.service.blueprint.container.BlueprintContainer; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version @@ -82,26 +84,26 @@ public class CamelBlueprint2Test extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-11.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle11") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-12.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle12") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-14.xml")) .add(TestProxySender.class) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle14") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-15.xml")) .add(TestProxySender.class) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle15") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 94376f8..bb56db6 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 @@ -17,16 +17,18 @@ 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import org.osgi.service.blueprint.container.BlueprintContainer; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version @@ -73,27 +75,27 @@ public class CamelBlueprint3Test extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-6.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle6") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-7.xml")) .add(TestInterceptStrategy.class) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle7") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-8.xml")) .add("org/apache/camel/component/properties/cheese.properties", OSGiBlueprintTestSupport.class.getResource("cheese.properties")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle8") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-9.xml")) .add(TestRouteBuilder.class) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle9") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 e62d475..8a3e619 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 @@ -19,16 +19,17 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; 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; /** * @version @@ -103,29 +104,29 @@ public class CamelBlueprint4Test extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-19.xml")) .add("org/apache/camel/itest/osgi/blueprint/example.xsl", OSGiBlueprintTestSupport.class.getResource("example.xsl")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle19") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-20.xml")) .add("org/apache/camel/itest/osgi/blueprint/example.vm", OSGiBlueprintTestSupport.class.getResource("example.vm")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle20") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-21.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle21") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-13.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle22") .add(TestRouteBuilder.class) - .build(withBnd())).noStart(), + .build(TinyBundles.withBnd())).noStart(), // using the features to install the camel components loadCamelFeatures("camel-blueprint", "camel-velocity")); http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 b137e9c..de039a5 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 @@ -19,15 +19,17 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version @@ -62,7 +64,7 @@ public class CamelBlueprint5Test extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-23.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle23") .add(MyException.class) http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 eebc69a..f30fbca 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 @@ -19,15 +19,17 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version @@ -57,7 +59,7 @@ public class CamelBlueprint6Test extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-24.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle24") .add("org/apache/camel/component/properties/cheese.properties", OSGiBlueprintTestSupport.class.getResource("cheese.properties")) http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 05f45d4..d0ea4da 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 @@ -19,15 +19,17 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version @@ -57,7 +59,7 @@ public class CamelBlueprint7Test extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-25.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle25") .add("org/apache/camel/component/properties/cheese.properties", OSGiBlueprintTestSupport.class.getResource("cheese.properties")) http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 2d2e428..78ec14b 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 @@ -19,16 +19,18 @@ package org.apache.camel.itest.osgi.blueprint; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import org.osgi.service.blueprint.container.BlueprintContainer; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version @@ -88,7 +90,7 @@ public class CamelBlueprint8Test extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-10.xml")) .add(TestProducer.class) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle10") @@ -96,7 +98,7 @@ public class CamelBlueprint8Test extends OSGiBlueprintTestSupport { .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-18.xml")) .add(JsseUtilTester.class) .add("localhost.ks", OSGiBlueprintTestSupport.class.getResourceAsStream("/org/apache/camel/itest/osgi/util/jsse/localhost.ks")) http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 cc2c0ca..8ea3f94 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 @@ -22,15 +22,17 @@ import javax.management.ObjectName; import org.apache.camel.CamelContext; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version @@ -64,7 +66,7 @@ public class CamelBlueprintManagedNamePatternFixedTest extends OSGiBlueprintTest Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-fixed.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundleFixed") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 2c1deb3..d5d36a5 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 @@ -18,21 +18,24 @@ package org.apache.camel.itest.osgi.blueprint; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; + import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Processor; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * Test cases to ensure that the Blueprint component is correctly setting the Thread's context classloader when starting @@ -80,7 +83,7 @@ public class CamelBlueprintTcclTest extends OSGiBlueprintTestSupport { return combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-tccl.xml")) .add(ThreadContextClassLoaderBean.class) .set(Constants.BUNDLE_SYMBOLICNAME, BUNDLE_SYMBOLICNAME) http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 630c61f..9d6a158 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 @@ -17,16 +17,18 @@ 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import org.osgi.service.blueprint.container.BlueprintContainer; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version @@ -112,32 +114,32 @@ public class CamelBlueprintTest extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-1.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle1") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-2.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle2") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-3.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle3") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-4.xml")) .add(TestRouteBuilder.class) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle4") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") .build()).noStart(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-5.xml")) .add(TestRouteBuilder.class) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle5") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelMultiVersionBlueprintTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelMultiVersionBlueprintTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelMultiVersionBlueprintTest.java index 1329f04..b4f05c7 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelMultiVersionBlueprintTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelMultiVersionBlueprintTest.java @@ -20,16 +20,18 @@ import org.apache.camel.CamelContext; import org.apache.camel.Exchange; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import org.osgi.service.blueprint.container.BlueprintContainer; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; @RunWith(PaxExam.class) public class CamelMultiVersionBlueprintTest extends OSGiBlueprintTestSupport { @@ -70,7 +72,7 @@ public class CamelMultiVersionBlueprintTest extends OSGiBlueprintTestSupport { scanFeatures(getCamelKarafFeatureUrl("2.8.0"), "camel-core"), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/fileRoute.xml", OSGiBlueprintTestSupport.class.getResource("fileRouteBlueprint.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle1") .build()).noStart(), http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 05c161a..96a0fa0 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 @@ -20,15 +20,17 @@ import org.apache.camel.CamelContext; import org.apache.camel.Exchange; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version @@ -72,7 +74,7 @@ public class OSGiBlueprintHelloWorldTest extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-13.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, NAME) .build()).noStart(), http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 3daf917..1b2c279 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 @@ -20,15 +20,17 @@ import org.apache.camel.CamelContext; import org.apache.camel.Exchange; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version @@ -72,7 +74,7 @@ public class OSGiBlueprintQuarz2SchedulerTest extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-28.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, NAME) .build()).noStart(), http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java index 39db6cf..afa4496 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java @@ -23,17 +23,19 @@ import javax.management.MBeanServer; import javax.management.ObjectName; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import static org.ops4j.pax.exam.CoreOptions.options; import static org.ops4j.pax.exam.CoreOptions.provision; import static org.ops4j.pax.exam.CoreOptions.workingDirectory; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; @RunWith(PaxExam.class) @Ignore("TODO: fix me") @@ -80,7 +82,7 @@ public class OSGiIntegrationManagedCamelContextTest extends OSGiIntegrationTestS scanFeatures(getCamelKarafFeatureUrl(), "camel-core", "camel-spring", "camel-test"), //set up the camel context bundle first - provision(newBundle().add("META-INF/spring/CamelContext.xml", getCamelContextInputStream()) + provision(TinyBundles.bundle().add("META-INF/spring/CamelContext.xml", getCamelContextInputStream()) .set(org.osgi.framework.Constants.BUNDLE_SYMBOLICNAME, "org.apache.camel.itest.osgi.CamelContextTinyBundle") .set(org.osgi.framework.Constants.BUNDLE_NAME, "CamelContextTinyBundle").build()), http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 deea855..05803eb 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,14 +26,14 @@ 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; 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(PaxExam.class) public class XsltBlueprintRouteTest extends OSGiBlueprintTestSupport { @@ -77,12 +77,12 @@ public class XsltBlueprintRouteTest extends OSGiBlueprintTestSupport { // using the features to install the camel components loadCamelFeatures("camel-blueprint"), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", XsltBlueprintRouteTest.class.getResource("XsltBlueprintRouter.xml")) .add("transform.xsl", XsltBlueprintRouteTest.class.getResource("transform.xsl")) .set(Constants.BUNDLE_SYMBOLICNAME, "XsltBlueprintRouteTest") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") - .build(withBnd())).noStart() + .build(TinyBundles.withBnd())).noStart() ); http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 eed51ec..0815064 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 @@ -24,17 +24,18 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.DefaultHttpClient; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; 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; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd; @RunWith(PaxExam.class) public class CxfBeanSpringRouteTest extends OSGiIntegrationSpringTestSupport { @@ -69,13 +70,13 @@ public class CxfBeanSpringRouteTest extends OSGiIntegrationSpringTestSupport { loadCamelFeatures( "camel-jetty", "camel-http4", "camel-cxf"), - provision(newBundle() + provision(TinyBundles.bundle() .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Customer.class) .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService.class) .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerServiceResource.class) .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Order.class) .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Product.class) - .build(withBnd()))//, + .build(TinyBundles.withBnd()))//, //vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006") ); http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 70f2ff3..4b42a28 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 @@ -21,17 +21,18 @@ import org.apache.camel.example.reportincident.OutputReportIncident; import org.apache.camel.example.reportincident.ReportIncidentEndpoint; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; 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; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd; @RunWith(PaxExam.class) public class CxfProxyExampleTest extends OSGiIntegrationSpringTestSupport { @@ -83,13 +84,13 @@ public class CxfProxyExampleTest extends OSGiIntegrationSpringTestSupport { loadCamelFeatures("camel-http", "camel-cxf"), // need to install the generated src as the pax-exam doesn't wrap this bundles - provision(newBundle() + provision(TinyBundles.bundle() .add(org.apache.camel.example.reportincident.InputReportIncident.class) .add(org.apache.camel.example.reportincident.OutputReportIncident.class) .add(org.apache.camel.example.reportincident.ReportIncidentEndpoint.class) .add(org.apache.camel.example.reportincident.ReportIncidentEndpointService.class) .add(org.apache.camel.example.reportincident.ObjectFactory.class) - .build(withBnd()))); + .build(TinyBundles.withBnd()))); return options; } http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 eee924c..2d71d54 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 @@ -25,15 +25,17 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.DefaultHttpClient; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; @RunWith(PaxExam.class) public class CxfBeanBlueprintRouterTest extends OSGiBlueprintTestSupport { @@ -85,7 +87,7 @@ public class CxfBeanBlueprintRouterTest extends OSGiBlueprintTestSupport { loadCamelFeatures( "camel-blueprint", "camel-jetty", "camel-http4", "camel-cxf"), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", CxfRsBlueprintRouterTest.class.getResource("CxfBeanBlueprintRouter.xml")) .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Customer.class) .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService.class) http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 5dc34e3..882e4ee 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 @@ -16,6 +16,8 @@ */ package org.apache.camel.itest.osgi.cxf.blueprint; +import java.io.InputStream; + import org.apache.camel.CamelContext; import org.apache.camel.example.reportincident.InputReportIncident; import org.apache.camel.example.reportincident.OutputReportIncident; @@ -25,18 +27,19 @@ import org.apache.camel.itest.osgi.cxf.ReportIncidentEndpointService; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.apache.cxf.jaxws.JaxWsServerFactoryBean; + 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; 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(PaxExam.class) public class CxfBlueprintRouterTest extends OSGiBlueprintTestSupport { @@ -94,26 +97,33 @@ public class CxfBlueprintRouterTest extends OSGiBlueprintTestSupport { @Configuration public static Option[] configure() throws Exception { - Option[] options = combine( - getDefaultCamelKarafOptions(), - // using the features to install the camel components - loadCamelFeatures( - "camel-blueprint", "camel-cxf"), - - bundle(newBundle() - .add("OSGI-INF/blueprint/test.xml", CxfBlueprintRouterTest.class.getResource("CxfBlueprintRouter.xml")) - .add("WSDL/report_incident.wsdl", CxfBlueprintRouterTest.class.getResource("/report_incident.wsdl")) - .add(org.apache.camel.example.reportincident.InputReportIncident.class) - .add(org.apache.camel.example.reportincident.OutputReportIncident.class) - .add(org.apache.camel.example.reportincident.ReportIncidentEndpoint.class) - .add(org.apache.camel.example.reportincident.ReportIncidentEndpointService.class) - .add(org.apache.camel.example.reportincident.ObjectFactory.class) - .set(Constants.BUNDLE_SYMBOLICNAME, "CxfBlueprintRouterTest") - .set(Constants.DYNAMICIMPORT_PACKAGE, "*") - .build(withBnd())).noStart() - - ); - - return options; + try { + InputStream ins = TinyBundles.bundle() + .add("OSGI-INF/blueprint/test.xml", CxfBlueprintRouterTest.class.getResource("CxfBlueprintRouter.xml")) + .add("WSDL/report_incident.wsdl", CxfBlueprintRouterTest.class.getResource("/report_incident.wsdl")) + .add(org.apache.camel.example.reportincident.InputReportIncident.class) + .add(org.apache.camel.example.reportincident.OutputReportIncident.class) + .add(org.apache.camel.example.reportincident.ReportIncidentEndpoint.class) + .add(org.apache.camel.example.reportincident.ReportIncidentEndpointService.class) + .add(org.apache.camel.example.reportincident.ObjectFactory.class) + .set(Constants.BUNDLE_SYMBOLICNAME, "CxfBlueprintRouterTest") + .set(Constants.DYNAMICIMPORT_PACKAGE, "*") + .build(TinyBundles.withBnd()); + + Option[] options = combine( + getDefaultCamelKarafOptions(), + // using the features to install the camel components + loadCamelFeatures( + "camel-blueprint", "camel-cxf"), + + bundle(ins).noStart() + + ); + + return options; + } catch (Throwable ite) { + ite.printStackTrace(); + throw new RuntimeException(ite); + } } } http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 1e2d252..1a74be5 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 @@ -32,17 +32,19 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; + 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; @RunWith(PaxExam.class) public class CxfRsBlueprintRouterTest extends OSGiBlueprintTestSupport { @@ -193,7 +195,7 @@ public class CxfRsBlueprintRouterTest extends OSGiBlueprintTestSupport { loadCamelFeatures( "camel-blueprint", "camel-http4", "camel-cxf"), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", CxfRsBlueprintRouterTest.class.getResource("CxfRsBlueprintRouter.xml")) .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Customer.class) .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService.class) http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 d273884..009cd44 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 @@ -20,16 +20,18 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; 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(PaxExam.class) public class HdfsBlueprintRouteTest extends OSGiBlueprintTestSupport { @@ -62,7 +64,7 @@ public class HdfsBlueprintRouteTest extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - provision(newBundle() + provision(TinyBundles.bundle() .add("core-default.xml", HdfsRouteTest.class.getResource("/core-default.xml")) .add("hdfs-default.xml", HdfsRouteTest.class.getResource("/hdfs-default.xml")) .add("OSGI-INF/blueprint/test.xml", HdfsRouteTest.class.getResource("blueprintCamelContext.xml")) http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java index f448df7..4811156 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java @@ -25,17 +25,19 @@ import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport; import org.jclouds.ContextBuilder; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.CoreOptions.provision; import static org.ops4j.pax.exam.CoreOptions.workingDirectory; import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; @RunWith(PaxExam.class) public class BlobStoreBlueprintRouteTest extends OSGiBlueprintTestSupport { @@ -74,7 +76,7 @@ public class BlobStoreBlueprintRouteTest extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), //Helper.setLogLevel("INFO"), - provision(newBundle() + provision(TinyBundles.bundle() .add("META-INF/persistence.xml", BlobStoreBlueprintRouteTest.class.getResource("/META-INF/persistence.xml")) .add("OSGI-INF/blueprint/test.xml", BlobStoreBlueprintRouteTest.class.getResource("blueprintCamelContext.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintJcloudsTestBundle") @@ -82,7 +84,7 @@ public class BlobStoreBlueprintRouteTest extends OSGiBlueprintTestSupport { .set("Meta-Persistence", "META-INF/persistence.xml") .build()), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", BlobStoreBlueprintRouteTest.class.getResource("blueprintBlobStoreService.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "org.apache.camel.jclouds.blobstore.service") .set(Constants.BUNDLE_VERSION, "1.0.0") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 07c6f09..eb17223 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 @@ -17,17 +17,18 @@ 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.PaxExam; - +import org.ops4j.pax.tinybundles.core.TinyBundles; 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; /** * CAMEL-5722: Test to verify that routes sitting in different bundles but listening on the same Jetty port, @@ -86,7 +87,7 @@ public class OSGiJettyCamelContextsClassloaderTest extends OSGiIntegrationTestSu // using the features to install the other camel components loadCamelFeatures("camel-jetty"), //set up the camel context bundle1 - provision(newBundle().add("META-INF/spring/Classloader-CamelContext1.xml", OSGiJettyCamelContextsClassloaderTest.class.getResource("Classloader-CamelContext1.xml")) + provision(TinyBundles.bundle().add("META-INF/spring/Classloader-CamelContext1.xml", OSGiJettyCamelContextsClassloaderTest.class.getResource("Classloader-CamelContext1.xml")) .add(JettyClassloaderCheckProcessor.class) .set(Constants.BUNDLE_SYMBOLICNAME, "org.apache.camel.itest.osgi.CamelContextBundle1") .set(Constants.BUNDLE_NAME, "CamelContext1") @@ -94,7 +95,7 @@ public class OSGiJettyCamelContextsClassloaderTest extends OSGiIntegrationTestSu .build()), //set up the camel context bundle1 - provision(newBundle().add("META-INF/spring/Classloader-CamelContext2.xml", OSGiJettyCamelContextsClassloaderTest.class.getResource("Classloader-CamelContext2.xml")) + provision(TinyBundles.bundle().add("META-INF/spring/Classloader-CamelContext2.xml", OSGiJettyCamelContextsClassloaderTest.class.getResource("Classloader-CamelContext2.xml")) .add(JettyClassloaderCheckProcessor.class) .set(Constants.BUNDLE_SYMBOLICNAME, "org.apache.camel.itest.osgi.CamelContextBundle2") .set(Constants.BUNDLE_NAME, "CamelContext2") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 ca993c7..ce8dbb1 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 @@ -18,17 +18,18 @@ package org.apache.camel.itest.osgi.jetty; 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.PaxExam; - +import org.ops4j.pax.tinybundles.core.TinyBundles; 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(PaxExam.class) public class OSGiMulitJettyCamelContextsTest extends OSGiIntegrationTestSupport { @@ -67,7 +68,7 @@ public class OSGiMulitJettyCamelContextsTest extends OSGiIntegrationTestSupport // using the features to install the other camel components loadCamelFeatures("camel-jetty"), //set up the camel context bundle1 - provision(newBundle().add("META-INF/spring/CamelContext1.xml", OSGiMulitJettyCamelContextsTest.class.getResource("CamelContext1.xml")) + provision(TinyBundles.bundle().add("META-INF/spring/CamelContext1.xml", OSGiMulitJettyCamelContextsTest.class.getResource("CamelContext1.xml")) .add(JettyProcessor.class) .set(Constants.BUNDLE_SYMBOLICNAME, "org.apache.camel.itest.osgi.CamelContextBundle1") .set(Constants.BUNDLE_NAME, "CamelContext1") @@ -75,7 +76,7 @@ public class OSGiMulitJettyCamelContextsTest extends OSGiIntegrationTestSupport .build()), //set up the camel context bundle1 - provision(newBundle().add("META-INF/spring/CamelContext2.xml", OSGiMulitJettyCamelContextsTest.class.getResource("CamelContext2.xml")) + provision(TinyBundles.bundle().add("META-INF/spring/CamelContext2.xml", OSGiMulitJettyCamelContextsTest.class.getResource("CamelContext2.xml")) .add(JettyProcessor.class) .set(Constants.BUNDLE_SYMBOLICNAME, "org.apache.camel.itest.osgi.CamelContextBundle2") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java index 4e2936a..3675e3e 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java @@ -21,17 +21,19 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport; + 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; 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(PaxExam.class) @Ignore("Does not work properly") @@ -57,7 +59,7 @@ public class JpaBlueprintRouteTest extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - provision(newBundle() + provision(TinyBundles.bundle() .add(SendEmail.class) .add(MyProcessor.class) .add("META-INF/persistence.xml", JpaBlueprintRouteTest.class.getResource("/META-INF/persistence.xml")) http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 e6bbe8e..3d92330 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 @@ -21,16 +21,18 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.krati.KratiConstants; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; 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(PaxExam.class) public class KratiBlueprintRouteTest extends OSGiBlueprintTestSupport { @@ -60,7 +62,7 @@ public class KratiBlueprintRouteTest extends OSGiBlueprintTestSupport { // using the features to install the camel components loadCamelFeatures("camel-blueprint", "camel-krati"), - provision(newBundle() + provision(TinyBundles.bundle() .add(SomeObject.class) .add("META-INF/persistence.xml", KratiBlueprintRouteTest.class.getResource("/META-INF/persistence.xml")) .add("OSGI-INF/blueprint/test.xml", KratiBlueprintRouteTest.class.getResource("blueprintCamelContext.xml")) http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java index 849937b..5ef84bf 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java @@ -23,27 +23,30 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; + import javax.sql.DataSource; + import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.sql.SqlConstants; 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.Customizer; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; import org.osgi.framework.Constants; import org.springframework.dao.DataAccessException; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; - import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.modifyBundle; @RunWith(PaxExam.class) public class SqlBlueprintRoute extends OSGiBlueprintTestSupport { @@ -133,7 +136,7 @@ public class SqlBlueprintRoute extends OSGiBlueprintTestSupport { new Customizer() { @Override public InputStream customizeTestProbe(InputStream testProbe) { - return modifyBundle(testProbe) + return TinyBundles.bundle().read(testProbe) .add("OSGI-INF/blueprint/test.xml", SqlBlueprintRoute.class.getResource("blueprintSqlCamelContext.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintSqlTestBundle") .set(Constants.DYNAMICIMPORT_PACKAGE, "*") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 2f55fcc..6a681fe 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 @@ -23,16 +23,17 @@ import org.apache.camel.Message; import org.apache.camel.Processor; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; 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(PaxExam.class) public class VelocityBlueprintTest extends OSGiBlueprintTestSupport { @@ -71,11 +72,11 @@ public class VelocityBlueprintTest extends OSGiBlueprintTestSupport { loadCamelFeatures( "camel-blueprint", "camel-velocity"), - bundle(newBundle() + bundle(TinyBundles.bundle() .add("OSGI-INF/blueprint/test.xml", VelocityBlueprintTest.class.getResource("VelocityBlueprintRouter.xml")) .add("example.vm", VelocityBlueprintTest.class.getResource("example.vm")) .set(Constants.BUNDLE_SYMBOLICNAME, "VelocityBlueprintRouterTest") - .build(withBnd())).noStart() + .build(TinyBundles.withBnd())).noStart() ); http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 0797940..abbdfb6 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 @@ -21,16 +21,18 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; 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; /** * OSGi integration test for camel-xmljson @@ -64,7 +66,7 @@ public class XmlJsonBlueprintRouteTest extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - provision(newBundle() + provision(TinyBundles.bundle() .add(XmlJsonRouteBuilder.class) .add("OSGI-INF/blueprint/test.xml", XmlJsonBlueprintRouteTest.class.getResource("xmlJsonBlueprintCamelContext.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintXmlJsonTestBundle") http://git-wip-us.apache.org/repos/asf/camel/blob/6706b5b4/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 12bed11..99ede54 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 @@ -21,17 +21,18 @@ import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; 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.PaxExam; +import org.ops4j.pax.tinybundles.core.TinyBundles; 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(PaxExam.class) public class XstreamBlueprintRouteTest extends OSGiBlueprintTestSupport { @@ -61,7 +62,7 @@ public class XstreamBlueprintRouteTest extends OSGiBlueprintTestSupport { Option[] options = combine( getDefaultCamelKarafOptions(), - provision(newBundle() + provision(TinyBundles.bundle() .add(SampleObject.class) .add(XstreamRouteBuilder.class) .add("OSGI-INF/blueprint/test.xml", XstreamBlueprintRouteTest.class.getResource("blueprintCamelContext.xml"))
