Index: apisupport/ant/nbproject/project.properties
===================================================================
RCS file: /cvs/apisupport/ant/nbproject/project.properties,v
retrieving revision 1.8
diff -u -r1.8 project.properties
--- apisupport/ant/nbproject/project.properties	11 May 2005 03:14:55 -0000	1.8
+++ apisupport/ant/nbproject/project.properties	12 May 2005 07:48:02 -0000
@@ -12,7 +12,8 @@
 cli.jar=core/org-netbeans-modules-apisupport-ant-cli.jar
 cli.jar.absolute=${netbeans.dest.dir}/${cluster.dir}/${cli.jar}
 
-cp.extra=${cli.jar.absolute}
+cp.extra=${cli.jar.absolute}:${core.dir}/core/core.jar
+
 
 cli.cp=\
     ${openide.dir}/core/openide.jar:\
Index: autoupdate/nbproject/project.properties
===================================================================
RCS file: /cvs/autoupdate/nbproject/project.properties,v
retrieving revision 1.6
diff -u -r1.6 project.properties
--- autoupdate/nbproject/project.properties	25 Apr 2005 12:44:19 -0000	1.6
+++ autoupdate/nbproject/project.properties	12 May 2005 07:48:02 -0000
@@ -9,7 +9,7 @@
 # Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
 # Microsystems, Inc. All Rights Reserved.
 
-cp.extra=${netbeans.dest.dir}/${cluster.dir}/core/updater.jar
+cp.extra=${netbeans.dest.dir}/${cluster.dir}/core/updater.jar:${netbeans.dest.dir}/${cluster.dir}/core/core.jar
 extra.module.files=core/updater.jar
 
 # javadoc.apichanges=${basedir}/api/doc/changes/apichanges.xml
Index: ide/nbproject/project.properties
===================================================================
RCS file: /cvs/ide/nbproject/project.properties,v
retrieving revision 1.2
diff -u -r1.2 project.properties
--- ide/nbproject/project.properties	18 Apr 2005 22:16:47 -0000	1.2
+++ ide/nbproject/project.properties	12 May 2005 07:48:16 -0000
@@ -11,6 +11,6 @@
 
 #test.unit.cp.extra=
 #test.unit.run.cp.extra=
-test.qa-functional.cp.extra=${openide.dir}/core/openide.jar
+test.qa-functional.cp.extra=${openide/windows.dir}/modules/org-openide-windows.jar
 #test.qa-functional.run.cp.extra=
 
Index: xml/tax/build.xml
===================================================================
RCS file: /cvs/xml/tax/build.xml,v
retrieving revision 1.63
diff -u -r1.63 build.xml
--- xml/tax/build.xml	10 May 2005 08:13:25 -0000	1.63
+++ xml/tax/build.xml	12 May 2005 07:48:56 -0000
@@ -35,7 +35,7 @@
          <pathelement location="${openide/nodes.dir}/modules/org-openide-nodes.jar"/>
          <pathelement location="${openide/explorer.dir}/modules/org-openide-explorer.jar"/>
          <pathelement location="${openide/dialogs.dir}/modules/org-openide-dialogs.jar"/>
-         <pathelement location="${openide/loaders.dir}/core/openide-loaders.jar"/>
+         <pathelement location="${openide/loaders.dir}/modules/org-openide-loaders.jar"/>
          <pathelement location="${openide/text.dir}/modules/org-openide-text.jar"/>
          <pathelement location="${lib_root}/src"/>
          <pathelement location="${xml/api.dir}/modules/org-netbeans-api-xml.jar"/>