svn commit: r1044000 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/

[reto]

Author: reto
Date: Thu Dec  9 15:17:44 2010
New Revision: 1044000

URL: http://svn.apache.org/viewvc?rev=1044000&view=rev
Log:
using dsProfile as no issue found

Modified:
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java?rev=1044000&r1=1043999&r2=1044000&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.tests/src/test/java/org/apache/clerezza/platform/dashboard/blackbox/osgi/FelixContextualMenuGeneratorTest.java
 Thu Dec  9 15:17:44 2010
@@ -67,16 +67,10 @@ public class FelixContextualMenuGenerato
        
        @Configuration
        public static Option[] configuration() {
+               System.out.println("configuration");
                return options(
                                mavenConfiguration(),
-                               //using old ds because of issues with 1.0.8
-                               
mavenBundle().groupId("org.apache.felix").artifactId(
-                               "org.apache.felix.scr").version("1.0.6"),
-                               
mavenBundle().groupId("org.apache.felix").artifactId(
-                               "org.apache.felix.eventadmin").version("1.0.0"),
-                               
mavenBundle().groupId("org.apache.felix").artifactId(
-                               "org.apache.felix.metatype").version("1.0.2"),
-                               /*dsProfile(),*/
+                               dsProfile(),
                                configProfile(),
                                webProfile(),
                                junitBundles(),
@@ -95,9 +89,10 @@ public class FelixContextualMenuGenerato
 
        @Before
        public void registerServices() throws Exception {
+               System.out.println("@Before");
                webServerExist = waitForWebserver();
                if (webServerExist) {
-                       waitFor(Handler.class, 300000);
+                       waitFor(Handler.class, 10000);
                        
bundleContext.registerService(GlobalMenuItemsProvider.class.getName(),
                                        new GlobalMenuItemsProviderA(), null);
                        Thread.sleep(10000);