1.1 --- a/ko-felix-test/src/main/java/org/netbeans/html/ko/felix/test/KnockoutFelixTCKImpl.java	Wed Apr 15 10:39:20 2015 +0200
     1.2 +++ b/ko-felix-test/src/main/java/org/netbeans/html/ko/felix/test/KnockoutFelixTCKImpl.java	Thu Nov 26 20:59:51 2015 +0100
     1.3 @@ -101,18 +101,20 @@
     1.4          return testClasses();
     1.5      }
     1.6      
     1.7 -    public static void start(URI server) throws Exception {
     1.8 +    public static void start(String callBackClass, URI server, final boolean useAllClassloader) throws Exception {
     1.9          final BrowserBuilder bb = BrowserBuilder.newBrowser().loadClass(KnockoutFelixTCKImpl.class).
    1.10              loadPage(server.toString()).
    1.11 -            invoke("initialized");
    1.12 +            invoke("initialized", callBackClass);
    1.13  
    1.14          Executors.newSingleThreadExecutor().submit(new Runnable() {
    1.15              @Override
    1.16              public void run() {
    1.17                  try {
    1.18                      Bundle[] arr = FrameworkUtil.getBundle(BrowserBuilder.class).getBundleContext().getBundles();
    1.19 -                    final ClassLoader osgiClassLoader = new AllBundlesLoader(arr);
    1.20 -                    bb.classloader(osgiClassLoader);
    1.21 +                    if (useAllClassloader) {
    1.22 +                        final ClassLoader osgiClassLoader = new AllBundlesLoader(arr);
    1.23 +                        bb.classloader(osgiClassLoader);
    1.24 +                    }
    1.25                      bb.showAndWait();
    1.26                  } catch (Throwable t) {
    1.27                      t.printStackTrace();
    1.28 @@ -121,16 +123,14 @@
    1.29          });
    1.30      }
    1.31  
    1.32 -    public static void initialized() throws Exception {
    1.33 +    public static void initialized(String... args) throws Exception {
    1.34          Bundle bundle = FrameworkUtil.getBundle(KnockoutFelixTCKImpl.class);
    1.35          if (bundle == null) {
    1.36              throw new IllegalStateException(
    1.37                  "Should be loaded from a bundle. But was: " + KnockoutFelixTCKImpl.class.getClassLoader()
    1.38              );
    1.39          }
    1.40 -        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(
    1.41 -            "org.netbeans.html.ko.felix.test.KnockoutFelixIT"
    1.42 -        );
    1.43 +        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(args[0]);
    1.44          Method m = classpathClass.getMethod("initialized", Class.class, Object.class);
    1.45          browserContext = Fn.activePresenter();
    1.46          m.invoke(null, KnockoutFelixTCKImpl.class, browserContext);