1.1 --- a/boot-fx/src/test/java/org/netbeans/html/boot/fx/BootstrapTest.java	Fri Jan 24 08:30:47 2014 +0100
     1.2 +++ b/boot-fx/src/test/java/org/netbeans/html/boot/fx/BootstrapTest.java	Fri Jan 24 08:59:32 2014 +0100
     1.3 @@ -50,6 +50,7 @@
     1.4  import net.java.html.boot.BrowserBuilder;
     1.5  import org.apidesign.html.boot.spi.Fn;
     1.6  import org.apidesign.html.json.tck.KOTest;
     1.7 +import org.testng.Assert;
     1.8  import org.testng.annotations.Factory;
     1.9  
    1.10  /**
    1.11 @@ -105,8 +106,11 @@
    1.12      }
    1.13      
    1.14      public static void initialized() throws Exception {
    1.15 -        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(BootstrapTest.class.getName());
    1.16 -        Method m = classpathClass.getMethod("ready", Class.class);
    1.17 -        m.invoke(null, FxJavaScriptTst.class);
    1.18 +        Assert.assertSame(
    1.19 +            BootstrapTest.class.getClassLoader(),
    1.20 +            ClassLoader.getSystemClassLoader(),
    1.21 +            "No special classloaders"
    1.22 +        );
    1.23 +        BootstrapTest.ready(FxJavaScriptTst.class);
    1.24      }
    1.25  }

     2.1 --- a/boot-fx/src/test/java/org/netbeans/html/boot/fx/FXJavaScriptTest.java	Fri Jan 24 08:30:47 2014 +0100
     2.2 +++ b/boot-fx/src/test/java/org/netbeans/html/boot/fx/FXJavaScriptTest.java	Fri Jan 24 08:59:32 2014 +0100
     2.3 @@ -50,12 +50,8 @@
     2.4  import net.java.html.boot.BrowserBuilder;
     2.5  import org.apidesign.html.boot.spi.Fn;
     2.6  import org.apidesign.html.json.tck.KOTest;
     2.7 -import org.netbeans.html.boot.impl.FnContext;
     2.8 -import org.apidesign.html.boot.spi.Fn;
     2.9 -import org.apidesign.html.json.tck.JavaScriptTCK;
    2.10 -import org.apidesign.html.json.tck.KOTest;
    2.11 +import org.testng.Assert;
    2.12  import org.testng.annotations.Factory;
    2.13 -import org.testng.annotations.Test;
    2.14  
    2.15  /**
    2.16   *
    2.17 @@ -110,8 +106,11 @@
    2.18      }
    2.19      
    2.20      public static void initialized() throws Exception {
    2.21 -        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(FXJavaScriptTest.class.getName());
    2.22 -        Method m = classpathClass.getMethod("ready", Class.class);
    2.23 -        m.invoke(null, FxJavaScriptTst.class);
    2.24 +        Assert.assertSame(
    2.25 +            FXJavaScriptTest.class.getClassLoader(),
    2.26 +            ClassLoader.getSystemClassLoader(),
    2.27 +            "No special classloaders"
    2.28 +        );
    2.29 +        FXJavaScriptTest.ready(FxJavaScriptTst.class);
    2.30      }
    2.31  }

     3.1 --- a/boot/src/main/java/net/java/html/boot/BrowserBuilder.java	Fri Jan 24 08:30:47 2014 +0100
     3.2 +++ b/boot/src/main/java/net/java/html/boot/BrowserBuilder.java	Fri Jan 24 08:59:32 2014 +0100
     3.3 @@ -226,12 +226,12 @@
     3.4          }
     3.5          
     3.6          final ClassLoader loader;
     3.7 -        if (FnUtils.isJavaScriptCapable(clazz.getClassLoader())) {
     3.8 +//        if (FnUtils.isJavaScriptCapable(clazz.getClassLoader())) {
     3.9              loader = clazz.getClassLoader();
    3.10 -        } else {
    3.11 -            FImpl impl = new FImpl(clazz.getClassLoader());
    3.12 -            loader = FnUtils.newLoader(impl, dfnr, clazz.getClassLoader().getParent());
    3.13 -        }
    3.14 +//        } else {
    3.15 +//            FImpl impl = new FImpl(clazz.getClassLoader());
    3.16 +//            loader = FnUtils.newLoader(impl, dfnr, clazz.getClassLoader().getParent());
    3.17 +//        }
    3.18  
    3.19          final Fn.Presenter currentP = dfnr;
    3.20          class OnPageLoad implements Runnable {

     4.1 --- a/ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusKnockoutTest.java	Fri Jan 24 08:30:47 2014 +0100
     4.2 +++ b/ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusKnockoutTest.java	Fri Jan 24 08:59:32 2014 +0100
     4.3 @@ -70,6 +70,7 @@
     4.4  import org.netbeans.html.boot.impl.FnContext;
     4.5  import org.netbeans.html.ko4j.KO4J;
     4.6  import org.openide.util.lookup.ServiceProvider;
     4.7 +import org.testng.Assert;
     4.8  import static org.testng.Assert.*;
     4.9  import org.testng.annotations.Factory;
    4.10  
    4.11 @@ -138,10 +139,12 @@
    4.12      }
    4.13      
    4.14      public static void initialized() throws Exception {
    4.15 -        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(TyrusKnockoutTest.class.getName());
    4.16 -        Method m = classpathClass.getMethod("initialized", Class.class);
    4.17 -        m.invoke(null, TyrusKnockoutTest.class);
    4.18 -        browserContext = Fn.activePresenter();
    4.19 +        Assert.assertSame(
    4.20 +            TyrusKnockoutTest.class.getClassLoader(),
    4.21 +            ClassLoader.getSystemClassLoader(),
    4.22 +            "No special classloaders"
    4.23 +        );
    4.24 +        TyrusKnockoutTest.initialized(TyrusKnockoutTest.class);
    4.25      }
    4.26      
    4.27      @Override

     5.1 --- a/ko4j/src/test/java/org/netbeans/html/ko4j/KnockoutFXTest.java	Fri Jan 24 08:30:47 2014 +0100
     5.2 +++ b/ko4j/src/test/java/org/netbeans/html/ko4j/KnockoutFXTest.java	Fri Jan 24 08:59:32 2014 +0100
     5.3 @@ -58,7 +58,6 @@
     5.4  import net.java.html.BrwsrCtx;
     5.5  import net.java.html.boot.BrowserBuilder;
     5.6  import net.java.html.js.JavaScriptBody;
     5.7 -import org.netbeans.html.boot.impl.FnContext;
     5.8  import org.apidesign.html.boot.spi.Fn;
     5.9  import org.apidesign.html.context.spi.Contexts;
    5.10  import org.apidesign.html.json.spi.Technology;
    5.11 @@ -66,9 +65,11 @@
    5.12  import org.apidesign.html.json.spi.WSTransfer;
    5.13  import org.apidesign.html.json.tck.KOTest;
    5.14  import org.apidesign.html.json.tck.KnockoutTCK;
    5.15 +import org.netbeans.html.boot.impl.FnContext;
    5.16  import org.openide.util.lookup.ServiceProvider;
    5.17 +import org.testng.Assert;
    5.18 +import static org.testng.Assert.*;
    5.19  import org.testng.annotations.Factory;
    5.20 -import static org.testng.Assert.*;
    5.21  
    5.22  /**
    5.23   *
    5.24 @@ -141,9 +142,12 @@
    5.25      }
    5.26      
    5.27      public static void initialized() throws Exception {
    5.28 -        Class<?> classpathClass = ClassLoader.getSystemClassLoader().loadClass(KnockoutFXTest.class.getName());
    5.29 -        Method m = classpathClass.getMethod("initialized", Class.class);
    5.30 -        m.invoke(null, KnockoutFXTest.class);
    5.31 +        Assert.assertSame(
    5.32 +            KnockoutFXTest.class.getClassLoader(),
    5.33 +            ClassLoader.getSystemClassLoader(),
    5.34 +            "No special classloaders"
    5.35 +        );
    5.36 +        KnockoutFXTest.initialized(KnockoutFXTest.class);
    5.37          browserContext = Fn.activePresenter();
    5.38      }
    5.39