# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1446764014 -3600
# Node ID 82ec9872793a26abbe9a4a4eefe97b6f2f655329
# Parent  10427ce1c0eeb10de5eeb17f9e13714a00626451
Don't explicitly start the Grizzly bundles

diff -r 10427ce1c0ee -r 82ec9872793a ko-felix-test/pom.xml
--- a/ko-felix-test/pom.xml	Thu Nov 05 23:38:18 2015 +0100
+++ b/ko-felix-test/pom.xml	Thu Nov 05 23:53:34 2015 +0100
@@ -125,11 +125,5 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.grizzly</groupId>
-            <artifactId>grizzly-npn-osgi</artifactId>
-            <version>1.1</version>
-            <scope>runtime</scope>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff -r 10427ce1c0ee -r 82ec9872793a ko-felix-test/src/test/java/org/netbeans/html/ko/felix/test/KnockoutFelixIT.java
--- a/ko-felix-test/src/test/java/org/netbeans/html/ko/felix/test/KnockoutFelixIT.java	Thu Nov 05 23:38:18 2015 +0100
+++ b/ko-felix-test/src/test/java/org/netbeans/html/ko/felix/test/KnockoutFelixIT.java	Thu Nov 05 23:53:34 2015 +0100
@@ -122,13 +122,13 @@
                     if (b.getSymbolicName().contains("felix.framework")) {
                         continue;
                     }
-                    if (b.getSymbolicName().contains("grizzly.websockets-server")) {
+                    if (b.getSymbolicName().contains("glassfish.grizzly")) {
                         continue;
                     }
                     b.start();
                     LOG.log(Level.INFO, "Started {0}", b.getSymbolicName());
                 } catch (BundleException ex) {
-                    fail("Cannot start bundle " + b.getSymbolicName(), ex);
+                    throw new IllegalStateException("Cannot start bundle " + b.getSymbolicName(), ex);
                 }
             }
             return framework;
diff -r 10427ce1c0ee -r 82ec9872793a ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java
--- a/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java	Thu Nov 05 23:38:18 2015 +0100
+++ b/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java	Thu Nov 05 23:53:34 2015 +0100
@@ -122,13 +122,13 @@
                     if (b.getSymbolicName().contains("equinox-agentclass-hook")) {
                         continue;
                     }
-                    if (b.getSymbolicName().contains("grizzly.websockets-server")) {
+                    if (b.getSymbolicName().contains("glassfish.grizzly")) {
                         continue;
                     }
                     b.start();
                     LOG.log(Level.INFO, "Started {0}", b.getSymbolicName());
                 } catch (BundleException ex) {
-                    LOG.log(Level.WARNING, "Cannot start bundle " + b.getSymbolicName(), ex);
+                    throw new IllegalStateException("Cannot start bundle " + b.getSymbolicName(), ex);
                 }
             }
             return framework;