CAMEL-4228 Use the customer configuration for camel-itest-osgi

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1147133 13f79535-47bb-0310-9956-ffa450edef68
apache · Jul 15, 2011 · 265c94d · 265c94d
1 parent 88a3e9c
commit 265c94d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 36 deletions.
diff --git a/...test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java b/...test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
@@ -78,29 +78,16 @@ public void testBlueprintProperties() throws Exception {
     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("INFO")),
-
-            // install blueprint requirements
-            mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
-
+            getDefaultCamelKarafOptions(),
+
             bundle(newBundle()
                 .add("OSGI-INF/blueprint/test.xml", BlueprintExplicitPropertiesRouteTest.class.getResource("blueprint-16.xml"))
                 .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintExplicitPropertiesRouteTest.class.getName())
                 .build()).noStart(),
-
-                // 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-blueprint", "camel-test"),
-
-                workingDirectory("target/paxrunner/"),
-
-                felix());
+            // using the features to install the camel components
+            scanFeatures(getCamelKarafFeatureUrl(),
+                        "camel-blueprint"));
 
         return options;
     }

diff --git a/...sgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java b/...sgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
@@ -74,31 +74,16 @@ public void testBlueprintProperties() throws Exception {
     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("INFO")),
+                getDefaultCamelKarafOptions(),
+
                 bundle(newBundle()
                         .add("OSGI-INF/blueprint/test.xml", BlueprintPropertiesRouteTest.class.getResource("blueprint-17.xml"))
                         .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintPropertiesRouteTest.class.getName())
                         .build()).noStart(),
 
-                // install the spring dm profile
-                profile("spring.dm").version("1.2.0"),
-                mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint", "0.2-incubating"),
-
-                // install blueprint requirements
-                mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
-
-                // 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-blueprint", "camel-test"),
-
-                workingDirectory("target/paxrunner/"),
-
-                felix()/*, equinox()*/);
+                                    "camel-blueprint"));
 
         return options;
     }