Repository: camel Updated Branches: refs/heads/camel-2.12.x fcbdf874a -> 31d5438ef
fixed the compiler error in camel-itest-osgi Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/31d5438e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/31d5438e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/31d5438e Branch: refs/heads/camel-2.12.x Commit: 31d5438efcafa97c2b1012e5e523acfd5e3504a3 Parents: fcbdf87 Author: Christian Mueller <cmuel...@apache.org> Authored: Sun Oct 19 00:49:27 2014 +0200 Committer: Christian Mueller <cmuel...@apache.org> Committed: Sun Oct 19 00:49:27 2014 +0200 ---------------------------------------------------------------------- .../log/LogRouteWithLoggersPresentInRegistryTest.java | 4 ++-- .../core/log/LogRouteWithNonDefaultLoggerTest.java | 14 +++++++------- .../camel/itest/osgi/cxf/CxfProxyExampleTest.java | 9 ++++----- .../osgi/cxf/blueprint/CxfBlueprintRouterTest.java | 7 +++---- 4 files changed, 16 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/31d5438e/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithLoggersPresentInRegistryTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithLoggersPresentInRegistryTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithLoggersPresentInRegistryTest.java index 2a15d73..8b110ed 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithLoggersPresentInRegistryTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithLoggersPresentInRegistryTest.java @@ -20,10 +20,10 @@ import org.apache.camel.CamelContext; import org.apache.camel.impl.SimpleRegistry; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.osgi.CamelContextFactory; -import org.apache.karaf.tooling.exam.options.DoNotModifyLogOption; -import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFileReplacementOption; import org.junit.Test; import org.junit.runner.RunWith; +import org.openengsb.labs.paxexam.karaf.options.DoNotModifyLogOption; +import org.openengsb.labs.paxexam.karaf.options.KarafDistributionConfigurationFileReplacementOption; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; http://git-wip-us.apache.org/repos/asf/camel/blob/31d5438e/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithNonDefaultLoggerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithNonDefaultLoggerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithNonDefaultLoggerTest.java index 408b7d8..4ec4af7 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithNonDefaultLoggerTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithNonDefaultLoggerTest.java @@ -16,24 +16,24 @@ */ package org.apache.camel.itest.osgi.core.log; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.ops4j.pax.exam.OptionUtils.combine; + +import java.io.File; + import org.apache.camel.CamelContext; import org.apache.camel.impl.SimpleRegistry; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.osgi.CamelContextFactory; -import org.apache.karaf.tooling.exam.options.DoNotModifyLogOption; -import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFileReplacementOption; import org.junit.Test; import org.junit.runner.RunWith; +import org.openengsb.labs.paxexam.karaf.options.DoNotModifyLogOption; +import org.openengsb.labs.paxexam.karaf.options.KarafDistributionConfigurationFileReplacementOption; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.slf4j.LoggerFactory; -import java.io.File; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.ops4j.pax.exam.OptionUtils.combine; - @RunWith(JUnit4TestRunner.class) public class LogRouteWithNonDefaultLoggerTest extends OSGiIntegrationTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/31d5438e/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java index 8b4c34b..9f63b64 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 @@ -16,6 +16,10 @@ */ package org.apache.camel.itest.osgi.cxf; +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; import org.apache.camel.example.reportincident.InputReportIncident; import org.apache.camel.example.reportincident.OutputReportIncident; import org.apache.camel.example.reportincident.ReportIncidentEndpoint; @@ -28,11 +32,6 @@ import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; 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(JUnit4TestRunner.class) public class CxfProxyExampleTest extends OSGiIntegrationSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/31d5438e/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java index 81fbfe2..7a65fe9 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,9 @@ */ package org.apache.camel.itest.osgi.cxf.blueprint; +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; import org.apache.camel.CamelContext; import org.apache.camel.example.reportincident.InputReportIncident; import org.apache.camel.example.reportincident.OutputReportIncident; @@ -34,10 +37,6 @@ import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.osgi.framework.Constants; -import static org.ops4j.pax.exam.OptionUtils.combine; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; -import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd; - @RunWith(JUnit4TestRunner.class) public class CxfBlueprintRouterTest extends OSGiBlueprintTestSupport { private static Server server;
