Merging into main development line
authorJaroslav Tulach <jtulach@netbeans.org>
Sun, 03 Aug 2014 08:31:08 +0200
changeset 793bce4f1019d47
parent 791 0923378f4424
parent 792 0fb8acec473b
child 794 bbece6a5a52f
child 809 57c6bd4c5261
Merging into main development line
     1.1 --- a/html4j-maven-plugin/src/main/java/org/netbeans/html/mojo/ProcessJsAnnotationsMojo.java	Sat Aug 02 13:07:17 2014 +0200
     1.2 +++ b/html4j-maven-plugin/src/main/java/org/netbeans/html/mojo/ProcessJsAnnotationsMojo.java	Sun Aug 03 08:31:08 2014 +0200
     1.3 @@ -106,8 +106,9 @@
     1.4              URL loc = ClassReader.class.getProtectionDomain().getCodeSource().getLocation();
     1.5              arr.addFirst(loc);
     1.6          }
     1.7 -        URLClassLoader l = new URLClassLoader(arr.toArray(new URL[arr.size()]));
     1.8          try {
     1.9 +            arr.add(classes.toURI().toURL());
    1.10 +            URLClassLoader l = new URLClassLoader(arr.toArray(new URL[arr.size()]));
    1.11              File master = new File(new File(classes, "META-INF"), "net.java.html.js.classes");
    1.12              processClasses(l, master, classes);
    1.13          } catch (IOException ex) {