Index: apisupport/ant/nbproject/project.properties
===================================================================
RCS file: /cvs/apisupport/ant/nbproject/project.properties,v
retrieving revision 1.7
diff -u -r1.7 project.properties
--- apisupport/ant/nbproject/project.properties	6 May 2005 05:03:24 -0000	1.7
+++ apisupport/ant/nbproject/project.properties	6 May 2005 09:24:57 -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	6 May 2005 09:24:57 -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: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.668
diff -u -r1.668 build.xml
--- nbbuild/build.xml	28 Apr 2005 09:24:08 -0000	1.668
+++ nbbuild/build.xml	6 May 2005 09:24:58 -0000
@@ -3600,7 +3600,7 @@
   
   <target 
     name="commit-validation" 
-    depends="commit-verification,commitValidation,no-commit-validation" 
+    depends="commitValidation,no-commit-validation" 
     description="Runs tests to validate IDE before commit."
   />
 
Index: xml/tax/build.xml
===================================================================
RCS file: /cvs/xml/tax/build.xml,v
retrieving revision 1.62
diff -u -r1.62 build.xml
--- xml/tax/build.xml	28 Apr 2005 04:49:32 -0000	1.62
+++ xml/tax/build.xml	6 May 2005 09:24:58 -0000
@@ -29,7 +29,7 @@
       </patternset>
       <path id="cp">
          <pathelement location="${openide.dir}/core/openide.jar"/>
-         <pathelement location="${openide/loaders.dir}/core/openide-loaders.jar"/>
+         <pathelement location="${openide/loaders.dir}/modules/org-openide-loaders.jar"/>
          <pathelement location="${lib_root}/src"/>
          <pathelement location="${xml/api.dir}/modules/org-netbeans-api-xml.jar"/>
          <pathelement location="${xml/core.dir}/modules/org-netbeans-modules-xml-core.jar"/>
Index: xtest/plugins_src/ide/build.xml
===================================================================
RCS file: /cvs/xtest/plugins_src/ide/build.xml,v
retrieving revision 1.16
diff -u -r1.16 build.xml
--- xtest/plugins_src/ide/build.xml	18 Apr 2005 22:17:37 -0000	1.16
+++ xtest/plugins_src/ide/build.xml	6 May 2005 09:24:58 -0000
@@ -19,11 +19,33 @@
     <property name="plugins.install.dir" location="../../plugins"/>
 
     <target name="compile">
-        <path id="basecp">
-            <pathelement location="${openide.dir}/core/openide.jar" />
-            <pathelement location="${openide/loaders.dir}/core/openide-loaders.jar" />
+        <path id="bootcp" >
+            <pathelement location="${openide/util.dir}/lib/org-openide-util.jar" />
+            <pathelement location="${openide/util.dir}/lib/org-openide-modules.jar" />
+            <pathelement location="${core/bootstrap.dir}/lib/boot.jar"/>
+            <!-- use junit with already compiled extensions -->        
+            <pathelement location="../../lib/xtest.jar"/>
+            <pathelement location="../../lib/xtest-junit-testrunner.jar"/>
+            <pathelement location="../../lib/nbjunit.jar"/>
+            <pathelement location="${ant.home}/lib/ant.jar"/>
+            <fileset dir="../../external">
+                <include name="junit*.jar"/>
+            </fileset>            
+        </path>
+
+        <path id="dynamiccp" >
+            <path refid="bootcp" />
+        
             <pathelement location="${core.dir}/core/core.jar"/>
-            <pathelement location="${core.dir}/lib/boot.jar"/>
+            <pathelement location="${openide/fs.dir}/core/org-openide-filesystems.jar"/>
+        </path>    
+    
+        <path id="basecp">
+            <path refid="dynamiccp" />
+        
+            <pathelement location="${openide/nodes.dir}/modules/org-openide-nodes.jar" />
+            <pathelement location="${openide/loaders.dir}/modules/org-openide-loaders.jar" />
+            <pathelement location="${core.dir}/modules/org-netbeans-core.jar" />
             <pathelement location="${openide/execution.dir}/modules/org-openide-execution.jar"/>
             <pathelement location="${openide/io.dir}/modules/org-openide-io.jar"/>
             <pathelement location="${core/execution.dir}/modules/org-netbeans-core-execution.jar"/>
@@ -35,23 +57,44 @@
             <!-- metadata repository support classpath -->
             <pathelement location="${java/javacore.dir}/modules/org-netbeans-modules-javacore.jar"/>
             <pathelement location="${mdr/nbjmiutils.dir}/modules/ext/jmiutils.jar"/>
-            <!-- use junit with already compiled extensions -->        
-            <pathelement location="../../lib/xtest.jar"/>
-            <pathelement location="../../lib/xtest-junit-testrunner.jar"/>
-            <pathelement location="../../lib/nbjunit.jar"/>
-            <pathelement location="${ant.home}/lib/ant.jar"/>
-            <fileset dir="../../external">
-                <include name="junit*.jar"/>
-            </fileset>            
         </path>
         <mkdir dir="build/classes"/>
+        
+        <javac srcdir="src" destdir="build/classes"
+           deprecation="${build.compiler.deprecation}"
+           debug="${build.compiler.debug}">          
+          <classpath refid="dynamiccp"/>
+          
+          <selector refid="xtest.ide.main" />
+        </javac> 
+        
+        
         <javac srcdir="src" destdir="build/classes"
            deprecation="${build.compiler.deprecation}"
            debug="${build.compiler.debug}">          
           <classpath refid="basecp"/>
+          <selector refid="xtest.ide.plugin" />
         </javac> 
     </target>
+
+    
+        
+    <selector id="xtest.ide.main" >
+      <or>
+        <filename name="org/netbeans/xtest/plugin/ide/Main.java"/>
+        <filename name="org/netbeans/xtest/plugin/ide/Main*.class"/>
+        <!-- Stuff needed for xtest error manager functionality controled by xtest.ide.error.manager property -->
+        <filename name="org/netbeans/xtest/plugin/ide/services/XTestErrorManager*"/>
+        <filename name="META-INF/**"/>
+      </or>
+    </selector>
     
+    <selector id="xtest.ide.plugin">
+      <or>
+        <filename name="org/netbeans/xtest/plugin/ide/MainWithExec*"/>
+        <filename name="org/netbeans/xtest/plugin/ide/Ide*"/>
+      </or>
+    </selector>
     
     <target name="jar" depends="compile">
         <!-- ant tasks used in ide_plugin_targets.xml -->
@@ -59,7 +102,7 @@
             basedir="build/classes"
             excludesfile="../../../nbbuild/standard-jar-excludes.txt"
             compress="false">
-            <include name="org/netbeans/xtest/plugin/ide/Ide*.class"/>
+            <selector refid="xtest.ide.plugin" />
         </jar>
         <!-- load by system classloader (-J-Dnetbeans.systemclassloader.patches) -->
         <jar jarfile="lib/xtest-ide-testexec.jar"
@@ -75,11 +118,8 @@
             basedir="build/classes"
             excludesfile="../../../nbbuild/standard-jar-excludes.txt"
             compress="false">
-            <include name="org/netbeans/xtest/plugin/ide/Main*.class"/>
-            <include name="org/netbeans/xtest/plugin/ide/MainWithExec*.class"/>
-            <!-- Stuff needed for xtest error manager functionality controled by xtest.ide.error.manager property -->
-            <include name="org/netbeans/xtest/plugin/ide/services/XTestErrorManager.class"/>
-            <include name="META-INF/**"/>
+            
+            <selector refid="xtest.ide.main" />
         </jar>        
     </target>
     
Index: xtest/plugins_src/ide/src/org/netbeans/xtest/plugin/ide/Main.java
===================================================================
RCS file: /cvs/xtest/plugins_src/ide/src/org/netbeans/xtest/plugin/ide/Main.java,v
retrieving revision 1.17
diff -u -r1.17 Main.java
--- xtest/plugins_src/ide/src/org/netbeans/xtest/plugin/ide/Main.java	22 Dec 2004 11:01:33 -0000	1.17
+++ xtest/plugins_src/ide/src/org/netbeans/xtest/plugin/ide/Main.java	6 May 2005 09:24:58 -0000
@@ -30,12 +30,9 @@
 import java.net.URLClassLoader;
 import java.util.Date;
 import org.netbeans.TopSecurityManager;
-import org.netbeans.core.NbTopManager;
 import org.netbeans.xtest.util.JNIKill;
 import org.netbeans.xtest.util.PNGEncoder;
 import org.openide.ErrorManager;
-import org.openide.LifecycleManager;
-import org.openide.loaders.DataObject;
 
 /**
  * Main part of XTest starter. Must not use anything outside lib/*.jar and lib/ext/*.jar.
@@ -103,6 +100,9 @@
     public static void main(String args[]) {
         
         System.out.println("!!!!! testlist is "+System.getProperty("testlist"));
+        
+        // use the console logging
+        System.setProperty ("netbeans.logger.console", "true");
                         
         // create the IDE flag file
         String workdir = System.getProperty("xtest.workdir");
@@ -194,6 +194,9 @@
         catch (RuntimeException ex) {
             ex.printStackTrace();
         }
+        catch (Error err) {
+            err.printStackTrace();
+        }
     }
     
     
@@ -226,9 +229,6 @@
     }
     
     private static void doTestPart() {
-        
-        NbTopManager.get();
-        
         final MainWithExecInterface handle;
         try {
             handle = (MainWithExecInterface)new WithExecClassLoader().loadClass("org.netbeans.xtest.plugin.ide.MainWithExec").newInstance();
@@ -323,6 +323,7 @@
                         System.out.println("Exception when terminating processes started from IDE");
                         e.printStackTrace();
                     }
+                    /* JST-PENDING: Needs to be moved to some module
                     // discard all changes in modified files
                     Object[] dobs = DataObject.getRegistry().getModifiedSet().toArray();
                     if(dobs.length > 0) {
@@ -333,8 +334,9 @@
                             obj.setModified(false);
                         }
                     }
+                     */
                     // exit IDE
-                    LifecycleManager.getDefault().exit();
+                    TopSecurityManager.exit (0);
                 }
             });
             // try to exit nicely first