? 49113.diff
? a.diff
? var
Index: src/org/netbeans/modules/ant/freeform/Classpaths.java
===================================================================
RCS file: /cvs/ant/freeform/src/org/netbeans/modules/ant/freeform/Classpaths.java,v
retrieving revision 1.9
diff -u -r1.9 Classpaths.java
--- src/org/netbeans/modules/ant/freeform/Classpaths.java	12 Aug 2004 04:56:52 -0000	1.9
+++ src/org/netbeans/modules/ant/freeform/Classpaths.java	16 Sep 2004 10:57:25 -0000
@@ -380,7 +380,7 @@
         return Arrays.asList(pathURL);
     }
     
-    private List/*<URL>*/ createExecuteClasspath(Element compilationUnitEl) {
+    private List/*<URL>*/ createExecuteClasspath(List/*<String>*/ packageRoots, Element compilationUnitEl) {
         Iterator/*<Element>*/ it = Util.findSubElements(compilationUnitEl).iterator();
         while (it.hasNext()) {
             Element e = (Element)it.next();
@@ -390,7 +390,12 @@
         }
         // None specified; assume it is same as compile classpath.
         // XXX but add built-to dirs
-        return createCompileClasspath(compilationUnitEl);
+        List urls = new ArrayList();
+        // #49113 - EXECUTE classpath needs to contains also bundles etc.
+        // Add source package roots to resolve that.
+        urls.addAll(createSourcePath(packageRoots));
+        urls.addAll(createCompileClasspath(compilationUnitEl));
+        return urls;
     }
     
     private List/*<URL>*/ createBootClasspath(Element compilationUnitEl) {
@@ -515,7 +520,7 @@
             } else if (type.equals(ClassPath.COMPILE)) {
                 roots = createCompileClasspath(compilationUnitEl);
             } else if (type.equals(ClassPath.EXECUTE)) {
-                roots = createExecuteClasspath(compilationUnitEl);
+                roots = createExecuteClasspath(packageRootNames, compilationUnitEl);
             } else {
                 assert type.equals(ClassPath.BOOT) : type;
                 roots = createBootClasspath(compilationUnitEl);