1.1 --- a/ko-felix-test/pom.xml Thu Nov 05 23:38:18 2015 +0100
1.2 +++ b/ko-felix-test/pom.xml Thu Nov 05 23:53:34 2015 +0100
1.3 @@ -125,11 +125,5 @@
1.4 <groupId>org.apache.felix</groupId>
1.5 <artifactId>org.apache.felix.framework</artifactId>
1.6 </dependency>
1.7 - <dependency>
1.8 - <groupId>org.glassfish.grizzly</groupId>
1.9 - <artifactId>grizzly-npn-osgi</artifactId>
1.10 - <version>1.1</version>
1.11 - <scope>runtime</scope>
1.12 - </dependency>
1.13 </dependencies>
1.14 </project>
1.15 \ No newline at end of file
2.1 --- a/ko-felix-test/src/test/java/org/netbeans/html/ko/felix/test/KnockoutFelixIT.java Thu Nov 05 23:38:18 2015 +0100
2.2 +++ b/ko-felix-test/src/test/java/org/netbeans/html/ko/felix/test/KnockoutFelixIT.java Thu Nov 05 23:53:34 2015 +0100
2.3 @@ -122,13 +122,13 @@
2.4 if (b.getSymbolicName().contains("felix.framework")) {
2.5 continue;
2.6 }
2.7 - if (b.getSymbolicName().contains("grizzly.websockets-server")) {
2.8 + if (b.getSymbolicName().contains("glassfish.grizzly")) {
2.9 continue;
2.10 }
2.11 b.start();
2.12 LOG.log(Level.INFO, "Started {0}", b.getSymbolicName());
2.13 } catch (BundleException ex) {
2.14 - fail("Cannot start bundle " + b.getSymbolicName(), ex);
2.15 + throw new IllegalStateException("Cannot start bundle " + b.getSymbolicName(), ex);
2.16 }
2.17 }
2.18 return framework;
3.1 --- a/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java Thu Nov 05 23:38:18 2015 +0100
3.2 +++ b/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java Thu Nov 05 23:53:34 2015 +0100
3.3 @@ -122,13 +122,13 @@
3.4 if (b.getSymbolicName().contains("equinox-agentclass-hook")) {
3.5 continue;
3.6 }
3.7 - if (b.getSymbolicName().contains("grizzly.websockets-server")) {
3.8 + if (b.getSymbolicName().contains("glassfish.grizzly")) {
3.9 continue;
3.10 }
3.11 b.start();
3.12 LOG.log(Level.INFO, "Started {0}", b.getSymbolicName());
3.13 } catch (BundleException ex) {
3.14 - LOG.log(Level.WARNING, "Cannot start bundle " + b.getSymbolicName(), ex);
3.15 + throw new IllegalStateException("Cannot start bundle " + b.getSymbolicName(), ex);
3.16 }
3.17 }
3.18 return framework;