1.1 --- a/boot/src/main/java/org/apidesign/html/boot/impl/JsClassLoader.java	Wed Jun 19 12:52:23 2013 +0200
     1.2 +++ b/boot/src/main/java/org/apidesign/html/boot/impl/JsClassLoader.java	Wed Jun 19 12:55:41 2013 +0200
     1.3 @@ -70,6 +70,9 @@
     1.4          if (name.equals(Fn.class.getName())) {
     1.5              return Fn.class;
     1.6          }
     1.7 +        if (name.equals(FnUtils.class.getName())) {
     1.8 +            return FnUtils.class;
     1.9 +        }
    1.10          URL u = findResource(name.replace('.', '/') + ".class");
    1.11          if (u != null) {
    1.12              InputStream is = null;
    1.13 @@ -108,7 +111,10 @@
    1.14                  }
    1.15              }
    1.16          }
    1.17 -        if (name.startsWith("org.apidesign.html.boot.spi.Fn")) {
    1.18 +        if (
    1.19 +            name.equals("org.apidesign.html.boot.spi.Fn") ||
    1.20 +            name.equals("org.apidesign.html.boot.impl.FnUtils")
    1.21 +        ) {
    1.22              return Class.forName(name);
    1.23          }
    1.24          
    1.25 @@ -207,7 +213,7 @@
    1.26                      super.visitInsn(Opcodes.AASTORE);
    1.27                  }
    1.28                  super.visitMethodInsn(Opcodes.INVOKESTATIC, 
    1.29 -                    "org/apidesign/html/boot/spi/Fn", "define", 
    1.30 +                    "org/apidesign/html/boot/impl/FnUtils", "define", 
    1.31                      "(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/String;)Lorg/apidesign/html/boot/spi/Fn;"
    1.32                  );
    1.33                  // end of Fn init