Now, when the minimal API profile is not self contained, we need to ignore classes coming from the boot classpath
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Mon, 07 Oct 2013 14:59:21 +0200
changeset 13479cc0e1034f92
parent 1346 511e4f7352d6
child 1349 7df5f83fff8d
Now, when the minimal API profile is not self contained, we need to ignore classes coming from the boot classpath
ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/VerifyArchetypeTest.java
launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java
launcher/http/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java
     1.1 --- a/ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/VerifyArchetypeTest.java	Mon Oct 07 14:24:15 2013 +0200
     1.2 +++ b/ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/VerifyArchetypeTest.java	Mon Oct 07 14:59:21 2013 +0200
     1.3 @@ -74,8 +74,8 @@
     1.4          
     1.5          v.verifyErrorFreeLog();
     1.6          
     1.7 -        // does pre-compilation to JavaScript
     1.8 -        v.verifyTextInLog("j2js");
     1.9 +        // no longer does pre-compilation to JavaScript
    1.10 +        // v.verifyTextInLog("j2js");
    1.11          // uses Bck2BrwsrLauncher
    1.12          v.verifyTextInLog("BaseHTTPLauncher showBrwsr");
    1.13          // building zip:
     2.1 --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java	Mon Oct 07 14:24:15 2013 +0200
     2.2 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java	Mon Oct 07 14:59:21 2013 +0200
     2.3 @@ -585,7 +585,8 @@
     2.4              }
     2.5              if (u != null) {
     2.6                  if (u.toExternalForm().contains("rt.jar")) {
     2.7 -                    LOG.log(Level.WARNING, "Fallback to bootclasspath for {0}", u);
     2.8 +                    LOG.log(Level.WARNING, "No fallback to bootclasspath for {0}", u);
     2.9 +                    return null;
    2.10                  }
    2.11                  return u.openStream();
    2.12              }
     3.1 --- a/launcher/http/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java	Mon Oct 07 14:24:15 2013 +0200
     3.2 +++ b/launcher/http/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java	Mon Oct 07 14:59:21 2013 +0200
     3.3 @@ -126,6 +126,10 @@
     3.4                      u = en.nextElement();
     3.5                  }
     3.6                  if (u != null) {
     3.7 +                    if (u.toExternalForm().contains("rt.jar")) {
     3.8 +                        LOG.log(Level.WARNING, "No fallback to bootclasspath for {0}", u);
     3.9 +                        return null;
    3.10 +                    }
    3.11                      return u.openStream();
    3.12                  }
    3.13              }