# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1411731735 -7200
# Node ID 6db177c4f72c693e55752504febd933c010e7011
# Parent  ce898bccdbc8abae36eeb3f33f779c04d6d9e165
Need to be able to load classes from classpath to find out if a method overrides something in a superclass.

diff -r ce898bccdbc8 -r 6db177c4f72c rt/aot/src/main/java/org/apidesign/bck2brwsr/aot/Bck2BrwsrJars.java
--- a/rt/aot/src/main/java/org/apidesign/bck2brwsr/aot/Bck2BrwsrJars.java	Fri Sep 26 10:44:54 2014 +0200
+++ b/rt/aot/src/main/java/org/apidesign/bck2brwsr/aot/Bck2BrwsrJars.java	Fri Sep 26 13:42:15 2014 +0200
@@ -68,8 +68,33 @@
      * @throws IOException if something goes wrong
      */
     public static Bck2Brwsr configureFrom(Bck2Brwsr c, File jar) throws IOException {
+        return configureFrom(c, jar, null);
+    }
+    
+    /** Creates new compiler pre-configured from the content of 
+     * provided JAR file. The compiler will compile all classes.
+     * The system understands OSGi manifest entries and will export
+     * all packages that are exported in the JAR file. The system
+     * also recognizes META-INF/services and makes sure the class names
+     * are not mangled.
+     * 
+     * @param c the compiler to {@link Bck2Brwsr#addClasses(java.lang.String...) add classes},
+     *    {@link Bck2Brwsr#addResources(java.lang.String...) add resources} and
+     *    {@link Bck2Brwsr#addExported(java.lang.String...) exported objects} to.
+     *    Can be <code>null</code> - in such case an 
+     *    {@link Bck2Brwsr#newCompiler() empty compiler} is constructed.
+     * @param jar the file to process
+     * @param classpath additional resources to make available during
+     *   compilation, but not include them in the generated JavaScript
+     * @return newly configured compiler
+     * @throws IOException if something goes wrong
+     * @since 0.11
+     */
+    public static Bck2Brwsr configureFrom(
+        Bck2Brwsr c, File jar, final ClassLoader classpath
+    ) throws IOException {
         if (jar.isDirectory()) {
-            return configureDir(c, jar);
+            return configureDir(c, jar, classpath);
         }
         final JarFile jf = new JarFile(jar);
         final List<String> classes = new ArrayList<>();
@@ -77,7 +102,7 @@
         Set<String> exported = new HashSet<>();
         class JarRes extends EmulationResources implements Bck2Brwsr.Resources {
             JarRes() {
-                super(classes);
+                super(classpath, classes);
             }
             @Override
             public InputStream get(String resource) throws IOException {
@@ -94,14 +119,14 @@
         listJAR(jf, jarRes, resources, exported);
         
         String cp = jf.getManifest().getMainAttributes().getValue("Class-Path"); // NOI18N
-        String[] classpath = cp == null ? new String[0] : cp.split(" ");
+        String[] parts = cp == null ? new String[0] : cp.split(" ");
 
         if (c == null) {
             c = Bck2Brwsr.newCompiler();
         }
         
         return c
-            .library(classpath)
+            .library(parts)
             .addClasses(classes.toArray(new String[classes.size()]))
             .addExported(exported.toArray(new String[exported.size()]))
             .addResources(resources.toArray(new String[resources.size()]))
@@ -189,9 +214,11 @@
         private final List<String> classes;
         private final Map<String,byte[]> converted = new HashMap<>();
         private final BytecodeProcessor proc;
+        private final ClassLoader cp;
 
-        protected EmulationResources(List<String> classes) {
+        protected EmulationResources(ClassLoader cp, List<String> classes) {
             this.classes = classes;
+            this.cp = cp != null ? cp : Bck2BrwsrJars.class.getClassLoader();
             BytecodeProcessor p;
             try {
                 Class<?> bpClass = Class.forName("org.apidesign.bck2brwsr.aot.RetroLambda");
@@ -216,7 +243,7 @@
             if (is != null) {
                 return is;
             }
-            Enumeration<URL> en = Bck2BrwsrJars.class.getClassLoader().getResources(name);
+            Enumeration<URL> en = cp.getResources(name);
             URL u = null;
             while (en.hasMoreElements()) {
                 u = en.nextElement();
@@ -259,12 +286,12 @@
         }
     }
     
-    private static Bck2Brwsr configureDir(Bck2Brwsr c, final File dir) throws IOException {
+    private static Bck2Brwsr configureDir(Bck2Brwsr c, final File dir, ClassLoader cp) throws IOException {
         List<String> arr = new ArrayList<>();
         List<String> classes = new ArrayList<>();
         class DirRes extends EmulationResources {
-            public DirRes(List<String> classes) {
-                super(classes);
+            public DirRes(ClassLoader cp, List<String> classes) {
+                super(cp, classes);
             }
 
             @Override
@@ -280,7 +307,7 @@
                 return null;
             }
         }
-        DirRes dirRes = new DirRes(classes);
+        DirRes dirRes = new DirRes(cp, classes);
         listDir(dir, null, dirRes, arr);
         if (c == null) {
             c = Bck2Brwsr.newCompiler();
diff -r ce898bccdbc8 -r 6db177c4f72c rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/AheadOfTime.java
--- a/rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/AheadOfTime.java	Fri Sep 26 10:44:54 2014 +0200
+++ b/rt/mojo/src/main/java/org/apidesign/bck2brwsr/mojo/AheadOfTime.java	Fri Sep 26 13:42:15 2014 +0200
@@ -121,7 +121,7 @@
                 getLog().info("Skipping " + mainJavaScript + " as it already exists.");
             } else {
                 getLog().info("Generating " + mainJavaScript);
-                Bck2Brwsr c = Bck2BrwsrJars.configureFrom(null, mainJar);
+                Bck2Brwsr c = Bck2BrwsrJars.configureFrom(null, mainJar, loader);
                 if (exports != null) {
                     for (String e : exports) {
                         c = c.addExported(e.replace('.', '/'));
@@ -159,10 +159,9 @@
 
     private void aotLibrary(Artifact a, File js, URLClassLoader loader) throws IOException {
         FileWriter w = new FileWriter(js);
-        Bck2Brwsr c = Bck2BrwsrJars.configureFrom(null, a.getFile());
+        Bck2Brwsr c = Bck2BrwsrJars.configureFrom(null, a.getFile(), loader);
         c.
             obfuscation(obfuscation).
-            resources(loader).
             generate(w);
         w.close();
     }