svn commit: r1147133 - in /camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint: BlueprintExplicitPropertiesRouteTest.java BlueprintPropertiesRouteTest.java

[ningjiang]

Author: ningjiang
Date: Fri Jul 15 12:55:53 2011
New Revision: 1147133

URL: http://svn.apache.org/viewvc?rev=1147133&view=rev
Log:
CAMEL-4228 Use the customer configuration for camel-itest-osgi

Modified:
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java?rev=1147133&r1=1147132&r2=1147133&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java
 Fri Jul 15 12:55:53 2011
@@ -78,29 +78,16 @@ public class BlueprintExplicitProperties
     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;
     }

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java?rev=1147133&r1=1147132&r2=1147133&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java
 Fri Jul 15 12:55:53 2011
@@ -74,31 +74,16 @@ public class BlueprintPropertiesRouteTes
     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;
     }