Index: core/build.xml
===================================================================
RCS file: /cvs/core/build.xml,v
retrieving revision 1.52
diff -c -r1.52 build.xml
*** core/build.xml	3 Jun 2002 23:26:38 -0000	1.52
--- core/build.xml	9 Jul 2002 09:35:56 -0000
***************
*** 57,65 ****
--- 57,74 ----
              basedir="src"
              manifest="manifest-subst.mf"
              excludesfile="../nbbuild/standard-jar-excludes.txt"
+             excludes="org/netbeans/Main*class"
  	    compress="false">
        <locale name="ja"/>
      </locjar>
+     
+     <jar jarfile="netbeans/lib/boot/boot.jar"
+             basedir="src"
+             excludesfile="../nbbuild/standard-jar-excludes.txt"
+             includes="org/netbeans/Main*class" 
+ 	    compress="false">
+     </jar>
+     
      <locjar jarfile="netbeans/lib/ext/terminalemulator.jar"
              basedir="libsrc"
              excludesfile="../nbbuild/standard-jar-excludes.txt"
Index: core/release/bin/runide.sh
===================================================================
RCS file: /cvs/core/release/bin/runide.sh,v
retrieving revision 1.36
diff -c -r1.36 runide.sh
*** core/release/bin/runide.sh	2 Jul 2002 08:00:09 -0000	1.36
--- core/release/bin/runide.sh	9 Jul 2002 09:35:58 -0000
***************
*** 253,258 ****
--- 253,262 ----
      done
  }
  
+ build_cp_new () {
+     cp="$1"/lib/boot/boot.jar
+ }
+ 
  build_cp() {
      base="$1"
  
***************
*** 337,343 ****
      # userdir comes first
      
      if [ ! -z "${userdir}" ] ; then
!         build_cp "${userdir}"
          
          # XXX really ought not be an updater.jar in userdir...
          if [ -f "${userdir}/lib/updater.jar" ] ; then
--- 341,347 ----
      # userdir comes first
      
      if [ ! -z "${userdir}" ] ; then
!         build_cp_new "${userdir}"
          
          # XXX really ought not be an updater.jar in userdir...
          if [ -f "${userdir}/lib/updater.jar" ] ; then
***************
*** 347,353 ****
  
      # idehome comes second
      
!     build_cp "${idehome}"
      
      if [ -f "${idehome}/lib/updater.jar" ] ; then
          if [ ! -z "$updatercp" ] ; then updatercp="${updatercp}:" ; fi
--- 351,357 ----
  
      # idehome comes second
      
!     build_cp_new "${idehome}"
      
      if [ -f "${idehome}/lib/updater.jar" ] ; then
          if [ ! -z "$updatercp" ] ; then updatercp="${updatercp}:" ; fi
Index: core/src/org/netbeans/Main.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/Main.java,v
retrieving revision 1.12
diff -c -r1.12 Main.java
*** core/src/org/netbeans/Main.java	27 Jun 2001 14:36:03 -0000	1.12
--- core/src/org/netbeans/Main.java	9 Jul 2002 09:35:59 -0000
***************
*** 13,18 ****
--- 13,25 ----
  
  package org.netbeans;
  
+ import java.io.File;
+ import java.net.URL;
+ import java.net.URLClassLoader;
+ import java.util.ArrayList;
+ import java.util.StringTokenizer;
+ import java.lang.reflect.Method;
+ import java.util.Collection;
  import org.netbeans.core.perftool.StartLog;
  
  /** The Corona's main class. Starts up the IDE.
***************
*** 23,30 ****
      /** Starts the IDE.
      * @param args the command line arguments
      */
!     public static void main (String args[]) {
! 	StartLog.logStart( "Forwarding to topThreadGroup" ); // NOI18N
!         org.netbeans.core.Main.start(args);
      }
  }
--- 30,104 ----
      /** Starts the IDE.
      * @param args the command line arguments
      */
!     public static void main (String args[]) throws Exception {
! 	//StartLog.logStart( "Forwarding to topThreadGroup" ); // NOI18N
! 
!         ArrayList list = new ArrayList ();
! 
!         String user = System.getProperty("netbeans.user"); // NOI18N
!         if (user != null) {
!             build_cp (new File (user), list);
!         }
!         
!         String home = System.getProperty ("netbeans.home"); // NOI18N
!         if (home != null) {
!             build_cp (new File (home), list);
!         }
!         
!         java.util.ListIterator it = list.listIterator();
!         while (it.hasNext()) {
!             File f = (File)it.next();
!             it.set(f.toURL());
!         }
!         
!             
!         URLClassLoader loader = new URLClassLoader ((URL[])list.toArray (new URL[0]));
!         Class c = loader.loadClass("org.netbeans.core.Main");
!         Method m = c.getMethod ("start", new Class[] { String[].class });
!         
!         Thread.currentThread().setContextClassLoader (loader);
!         m.invoke (null, new Object[] { args });
!     }
!     
!     
!     private static void append_jars_to_cp (File dir, Collection toAdd) {
!         /*
!         for ex in jar zip ; do
!             if [ "`echo "${dir}"/*.$ex`" != "${dir}/*.$ex" ] ; then
!                 for x in "${dir}"/*.$ex ; do
!                     # XXX also filter out lib/locale/updater*.jar to make Japanese startup faster
!                     # (and put it back in below when building ${updatercp}
!                     if [ "$x" != "$idehome/lib/updater.jar" -a "$x" != "$userdir/lib/updater.jar" ] ; then
!                         if [ ! -z "$cp" ] ; then cp="$cp:" ; fi
!                         cp="$cp$x"
!                     fi
!                 done
!             fi
!         done
!          */
!         
!         if (!dir.isDirectory()) return;
!         
!         File[] arr = dir.listFiles();
!         for (int i = 0; i < arr.length; i++) {
!             String n = arr[i].getName ();
!             if (n.endsWith("jar") || n.endsWith ("zip")) { // NOI18N
!                 toAdd.add (arr[i]);
!             }
!         }
!     }
!         
!     
!     private static void build_cp(File base, Collection toAdd) {
!         append_jars_to_cp (new File (base, "lib/patches/locale"), toAdd);
!         append_jars_to_cp (new File (base, "lib/patches"), toAdd);
! 
!         append_jars_to_cp (new File (base, "lib/locale"), toAdd);
!         append_jars_to_cp (new File (base, "lib"), toAdd);
! 
!         append_jars_to_cp (new File (base, "lib/ext/locale"), toAdd);
!         append_jars_to_cp (new File (base, "lib/ext"), toAdd);
      }
+     
+     
  }