# HG changeset patch # User Jaroslav Tulach # Date 1381150761 -7200 # Node ID 9cc0e1034f929837490651101f2cca6839e3e409 # Parent 511e4f7352d6ca53fa1a581f3d459117f2360e92 Now, when the minimal API profile is not self contained, we need to ignore classes coming from the boot classpath diff -r 511e4f7352d6 -r 9cc0e1034f92 ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/VerifyArchetypeTest.java --- a/ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/VerifyArchetypeTest.java Mon Oct 07 14:24:15 2013 +0200 +++ b/ko/archetype-test/src/test/java/org/apidesign/bck2brwsr/ko/archetype/test/VerifyArchetypeTest.java Mon Oct 07 14:59:21 2013 +0200 @@ -74,8 +74,8 @@ v.verifyErrorFreeLog(); - // does pre-compilation to JavaScript - v.verifyTextInLog("j2js"); + // no longer does pre-compilation to JavaScript + // v.verifyTextInLog("j2js"); // uses Bck2BrwsrLauncher v.verifyTextInLog("BaseHTTPLauncher showBrwsr"); // building zip: diff -r 511e4f7352d6 -r 9cc0e1034f92 launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java --- a/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java Mon Oct 07 14:24:15 2013 +0200 +++ b/launcher/fx/src/main/java/org/apidesign/bck2brwsr/launcher/BaseHTTPLauncher.java Mon Oct 07 14:59:21 2013 +0200 @@ -585,7 +585,8 @@ } if (u != null) { if (u.toExternalForm().contains("rt.jar")) { - LOG.log(Level.WARNING, "Fallback to bootclasspath for {0}", u); + LOG.log(Level.WARNING, "No fallback to bootclasspath for {0}", u); + return null; } return u.openStream(); } diff -r 511e4f7352d6 -r 9cc0e1034f92 launcher/http/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java --- a/launcher/http/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java Mon Oct 07 14:24:15 2013 +0200 +++ b/launcher/http/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java Mon Oct 07 14:59:21 2013 +0200 @@ -126,6 +126,10 @@ u = en.nextElement(); } if (u != null) { + if (u.toExternalForm().contains("rt.jar")) { + LOG.log(Level.WARNING, "No fallback to bootclasspath for {0}", u); + return null; + } return u.openStream(); } }