Index: core/build.xml =================================================================== RCS file: /cvs/core/build.xml,v retrieving revision 1.77 retrieving revision 1.77.4.4 diff -u -r1.77 -r1.77.4.4 --- core/build.xml 9 Mar 2004 15:57:32 -0000 1.77 +++ core/build.xml 16 Mar 2004 17:34:01 -0000 1.77.4.4 @@ -19,10 +19,8 @@ - - - - + + @@ -38,7 +36,8 @@ - + + @@ -50,9 +49,11 @@ + + - - + @@ -72,10 +73,16 @@ + + + + + + Index: core/bootstrap/src/org/netbeans/Main.java =================================================================== RCS file: /cvs/core/bootstrap/src/org/netbeans/Main.java,v retrieving revision 1.16 retrieving revision 1.16.20.1 diff -u -r1.16 -r1.16.20.1 --- core/bootstrap/src/org/netbeans/Main.java 9 Jan 2004 23:55:03 -0000 1.16 +++ core/bootstrap/src/org/netbeans/Main.java 15 Mar 2004 12:42:02 -0000 1.16.20.1 @@ -216,8 +216,8 @@ private static void build_cp(File base, Collection toAdd, boolean localeOnly) { if (!localeOnly) { - append_jars_to_cp (new File (base, "lib/patches"), toAdd); - append_jars_to_cp (new File (base, "lib"), toAdd); + append_jars_to_cp (new File (base, "boot/patches"), toAdd); + append_jars_to_cp (new File (base, "boot"), toAdd); } // XXX a minor optimization: exclude any unused locale JARs // For example, lib/locale/ might contain: @@ -231,6 +231,6 @@ // [etc.] // Only some of these will apply to the current session, based on the // current values of Locale.default and NbBundle.branding. - append_jars_to_cp (new File (base, "lib/locale"), toAdd); + append_jars_to_cp (new File (base, "boot/locale"), toAdd); } } Index: core/execution/build.xml =================================================================== RCS file: /cvs/core/execution/build.xml,v retrieving revision 1.12 retrieving revision 1.12.4.1 diff -u -r1.12 -r1.12.4.1 --- core/execution/build.xml 9 Mar 2004 09:53:20 -0000 1.12 +++ core/execution/build.xml 15 Mar 2004 12:42:03 -0000 1.12.4.1 @@ -27,7 +27,7 @@ - + Index: core/ide/build.xml =================================================================== RCS file: /cvs/core/ide/build.xml,v retrieving revision 1.18 retrieving revision 1.18.4.1 diff -u -r1.18 -r1.18.4.1 --- core/ide/build.xml 9 Mar 2004 15:57:33 -0000 1.18 +++ core/ide/build.xml 16 Mar 2004 17:34:02 -0000 1.18.4.1 @@ -19,7 +19,7 @@ - + Index: core/release/bin/.runide_defaults.sh =================================================================== RCS file: core/release/bin/.runide_defaults.sh diff -N core/release/bin/.runide_defaults.sh --- core/release/bin/.runide_defaults.sh 15 Dec 2002 23:59:49 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,38 +0,0 @@ -# Sun Public License Notice -# -# The contents of this file are subject to the Sun Public License -# Version 1.0 (the "License"). You may not use this file except in -# compliance with the License. A copy of the License is available at -# http://www.sun.com/ -# -# The Original Code is NetBeans. The Initial Developer of the Original -# Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun -# Microsystems, Inc. All Rights Reserved. - -# For use from runide.sh, do not run directly. - -# Default userdir, can be overridden by -userdir switch. This value should be -# changed for each new version so that the user can switch between versions of -# the IDE without risking loss of settings, e.g. ~/.netbeans/dev for dev builds, -# ~/.netbeans/3.4 for NB 3.4, etc. -# -# Note: string after last slash in value of userdir variable is used -# by installer build to identify release of NetBeans and to set -# userdir by "OS native" NetBeans installer. -# Please change userdir only with advance notification to NB -# buildmasters. - -userdir=${HOME}/.netbeans/dev - -# Default JDK home, can be overridden by the -jdkhome switch, or the -# value of the $NB_JDK_HOME environment variable. If both are present -# the -jdkhome switch has precedence. -# -# If desired, this is a good place for an installer program to record -# the JDK that was found at installation time. For example, on Linux -# systems /etc/profile.d/netbeans.sh could: export NB_JDK_HOME=/usr/java -# -# Note: setting this variable will cause NetBeans to ignore the value of -# the ${JDK_HOME} and ${JAVA_PATH} environment variables. - -jdkhome="$NB_JDK_HOME" Index: core/release/bin/ide.cfg =================================================================== RCS file: core/release/bin/ide.cfg diff -N core/release/bin/ide.cfg --- core/release/bin/ide.cfg 7 Jun 2003 19:44:20 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ --J-Xms24m -J-Xmx96m --J-Dnetbeans.logger.console=true --J-ea Index: core/release/bin/runide.sh =================================================================== RCS file: /cvs/core/release/bin/runide.sh,v retrieving revision 1.57 retrieving revision 1.57.6.5 diff -u -r1.57 -r1.57.6.5 --- core/release/bin/runide.sh 3 Mar 2004 15:16:12 -0000 1.57 +++ core/release/bin/runide.sh 18 Mar 2004 09:24:04 -0000 1.57.6.5 @@ -15,8 +15,7 @@ # Normally, editing this script should not be required. # ----------------------------------------------------- -# use $JDK_HOME or $NB_JDK_HOME or the -jdkhome switch, do not edit this here -# (see below for info on .runide_defaults.sh) +# use $JDK_HOME or the -jdkhome switch, do not edit this here jdkhome="" # append on command line or ide.cfg, with -J prefix on each @@ -47,21 +46,9 @@ oldpwd=`pwd` ; cd "${idehome}"; idehome=`pwd`; cd "${oldpwd}"; unset oldpwd -# calculate branding to brand userdir with -defaults="$idehome/bin/.runide_defaults.sh" -if [ -r "$idehome/lib/branding" ]; then - branding=`cat "$idehome/lib/branding"` - if [ -r "$idehome/bin/.runide_defaults_$branding.sh" ]; then - defaults="$idehome/bin/.runide_defaults_$branding.sh" - fi -fi -# This script should set the var userdir at the least: -# (another likely option would be $jdkhome, see #18628) -. "$defaults" - jargs=${jreflags} jargs="$jargs -Dnetbeans.home=\"$idehome\"" -jargs="$jargs -Djava.security.policy=\"$idehome/bin/ide.policy\"" +jargs="$jargs -Djava.security.policy=\"$idehome/launcher/security.policy\"" args="" @@ -87,6 +74,15 @@ jdkhome="$JAVA_PATH" fi +if [ ! -z "$NB_PATH" ]; then + nbpath="$NB_PATH" +else + nbpath="$progdir/../.." +fi + +# default value for dirs argument, starts only platform +nbdirs=platform* + # # parse arguments # @@ -130,7 +126,12 @@ prefixcp=$prefixcp$1; fi ;; - + --dirs) + shift; + if [ $# -gt 0 ] ; then + nbdirs="$1" + fi + ;; -J*) jopt=`expr "X-$1" : 'X--J\(.*\)'`; jargs="$jargs \"$jopt\"";; *) args="$args \"$1\"" ;; esac @@ -138,13 +139,16 @@ done } # parse_args() -# Process any ./ide.cfg or ~/ide.cfg. +# Process any system config +# Note that there is no quoting scheme for these files. +if [ -r "${NB_CONFIG_SYSTEM}" ]; then + parse_args `cat "${NB_CONFIG_SYSTEM}"` +fi + +# Process user config # Note that there is no quoting scheme for these files. -if [ -r "${HOME}/ide.cfg" ]; then - parse_args `cat "${HOME}"/ide.cfg` -elif [ -r "${progdir}/ide.cfg" ]; then - parse_args `cat "${progdir}"/ide.cfg` -# else leave as is +if [ -r "${NB_CONFIG_USER}" ]; then + parse_args `cat "${NB_CONFIG_USER}"` fi if [ -f /usr/j2se/opt/javahelp/lib/jhall.jar ]; then @@ -156,6 +160,41 @@ # Process arguments given on the command line. parse_args "$@" + +resolvedirs() { + # iterate thru $2 == $nbdirs to find them + SEP="" + echo $nbdirs | tr ':' '\n' | while read CLUSTER; do + # iterate thru $1 == $nbpath + FOUND=`echo $nbpath | tr ':' '\n' | while read DIR; do + if [ -d "$CLUSTER" ]; then + echo $CLUSTER + else + ls -d "$DIR"/$CLUSTER 2>/dev/null + fi + done | sort -u -r` + + if [ -z "$FOUND" ]; then + echo Cannot found directory \"$CLUSTER\" in search locations \"$nbpath\" + exit 2 + fi + + echo -n "$SEP" + echo -n "$FOUND" + SEP=":" + done +} # end of resolvedirs + +dirsresult=`resolvedirs \"$nbpath\" \"$nbdirs\"` +exitcode=$? +if [ "0" != "$exitcode" ]; then + echo $dirsresult + exit 5 +fi + +jargs="$jargs -Dnetbeans.dirs=\"$dirsresult\"" + + # # check JDK # @@ -177,10 +216,16 @@ # check userdir # -if [ ! -z "$userdir" ] ; then - args="--userdir \"${userdir}\" $args" +if [ -z "$userdir" ]; then + if [ -z "$NB_USER_DIR" ]; then + echo Need to specify user dir using env variable NB_USER_DIR or command line option --userdir + exit 7 + fi + userdir="$NB_USER_DIR" fi +args="--userdir \"${userdir}\" $args" + # # increase file descriptor's limit, on Solaris it's set to 64, too small for # fastjavac @@ -202,8 +247,8 @@ build_cp() { base="$1" - append_jars_to_cp "${base}/lib/ext" - append_jars_to_cp "${base}/lib/ext/locale" + append_jars_to_cp "${base}/launcher" + append_jars_to_cp "${base}/launcher/locale" } do_run_updater() { @@ -287,8 +332,8 @@ build_cp "${idehome}" - if [ -f "${idehome}/lib/updater.jar" ] ; then - updatercp="${idehome}/lib/updater.jar" + if [ -f "${idehome}/boot/updater.jar" ] ; then + updatercp="${idehome}/boot/updater.jar" fi # JDK tools Index: core/src/org/netbeans/core/Bundle.properties =================================================================== RCS file: /cvs/core/src/org/netbeans/core/Bundle.properties,v retrieving revision 1.379 retrieving revision 1.379.10.1 diff -u -r1.379 -r1.379.10.1 --- core/src/org/netbeans/core/Bundle.properties 29 Feb 2004 04:39:00 -0000 1.379 +++ core/src/org/netbeans/core/Bundle.properties 16 Mar 2004 17:34:05 -0000 1.379.10.1 @@ -163,8 +163,8 @@ NTF_ExceptionalException=\ A {0} exception has occurred.\n\ Please report this at http://www.netbeans.org/issues.html,\n\ - including a copy of your ide.log file as an attachment.\n\ - The ide.log file is located in your {1} folder. + including a copy of your messages.log file as an attachment.\n\ + The messages.log file is located in your {1} folder. NTF_ExceptionalExceptionTitle=Unexpected Exception # {0} - class name of exception NTF_ExceptionWarning=\ Index: core/src/org/netbeans/core/CLIOptions.java =================================================================== RCS file: /cvs/core/src/org/netbeans/core/CLIOptions.java,v retrieving revision 1.4 retrieving revision 1.4.22.1 diff -u -r1.4 -r1.4.22.1 --- core/src/org/netbeans/core/CLIOptions.java 9 Jan 2004 23:55:08 -0000 1.4 +++ core/src/org/netbeans/core/CLIOptions.java 15 Mar 2004 12:42:04 -0000 1.4.22.1 @@ -178,7 +178,7 @@ if (!NonGui.noLogging) { try { - NonGui.logger = new TopLogging(NonGui.getSystemDir()); + NonGui.logger = new TopLogging(NonGui.getLogDir()); } catch (IOException e) { System.err.println("Cannot create log file. Logging disabled."); // NOI18N e.printStackTrace(); Index: core/src/org/netbeans/core/LookupCache.java =================================================================== RCS file: /cvs/core/src/org/netbeans/core/LookupCache.java,v retrieving revision 1.3 retrieving revision 1.3.124.1 diff -u -r1.3 -r1.3.124.1 --- core/src/org/netbeans/core/LookupCache.java 27 Feb 2003 23:33:25 -0000 1.3 +++ core/src/org/netbeans/core/LookupCache.java 15 Mar 2004 12:42:05 -0000 1.3.124.1 @@ -155,7 +155,7 @@ private static File cacheFile() { String ud = System.getProperty("netbeans.user"); if (ud != null) { - File cachedir = new File(ud, "cache"); // NOI18N + File cachedir = new File(new File (ud, "var"), "cache"); // NOI18N cachedir.mkdirs(); return new File(cachedir, "folder-lookup.ser"); // NOI18N } else { @@ -170,7 +170,7 @@ private static File stampFile() { String ud = System.getProperty("netbeans.user"); if (ud != null) { - File cachedir = new File(ud, "cache"); // NOI18N + File cachedir = new File(new File (ud, "var"), "cache"); // NOI18N cachedir.mkdirs(); return new File(cachedir, "lookup-stamp.txt"); // NOI18N } else { Index: core/src/org/netbeans/core/NbRepository.java =================================================================== RCS file: /cvs/core/src/org/netbeans/core/NbRepository.java,v retrieving revision 1.9 retrieving revision 1.9.30.1 diff -u -r1.9 -r1.9.30.1 --- core/src/org/netbeans/core/NbRepository.java 16 Nov 2003 22:42:16 -0000 1.9 +++ core/src/org/netbeans/core/NbRepository.java 15 Mar 2004 12:42:05 -0000 1.9.30.1 @@ -28,7 +28,7 @@ */ public final class NbRepository extends Repository { /** name of system folder to be located in the USER_DIR and HOME_DIR */ - static final String SYSTEM_FOLDER = "system"; // NOI18N + static final String SYSTEM_FOLDER = "config"; // NOI18N /** * Create a repository based on the normal system file system. Index: core/src/org/netbeans/core/NonGui.java =================================================================== RCS file: /cvs/core/src/org/netbeans/core/NonGui.java,v retrieving revision 1.104 retrieving revision 1.104.6.1 diff -u -r1.104 -r1.104.6.1 --- core/src/org/netbeans/core/NonGui.java 4 Mar 2004 14:21:49 -0000 1.104 +++ core/src/org/netbeans/core/NonGui.java 15 Mar 2004 12:42:05 -0000 1.104.6.1 @@ -150,6 +150,12 @@ } } + /** Directory to place logs into logging. + */ + protected static String getLogDir () { + return new File (new File (getUserDir (), "var"), "log").toString (); + } + /** System directory getter. */ protected static String getSystemDir () { Index: core/src/org/netbeans/core/NotifyException.java =================================================================== RCS file: /cvs/core/src/org/netbeans/core/NotifyException.java,v retrieving revision 1.54 retrieving revision 1.54.4.2 diff -u -r1.54 -r1.54.4.2 --- core/src/org/netbeans/core/NotifyException.java 8 Mar 2004 16:26:45 -0000 1.54 +++ core/src/org/netbeans/core/NotifyException.java 16 Mar 2004 17:34:06 -0000 1.54.4.2 @@ -314,7 +314,7 @@ curBundle.getString("NTF_ExceptionalException"), new Object[] { current.getClassName (), - new File (System.getProperty("netbeans.user"), "system") // NOI18N + NonGui.getLogDir () } ) ); Index: core/src/org/netbeans/core/TopLogging.java =================================================================== RCS file: /cvs/core/src/org/netbeans/core/TopLogging.java,v retrieving revision 1.43 retrieving revision 1.43.6.2 diff -u -r1.43 -r1.43.6.2 --- core/src/org/netbeans/core/TopLogging.java 4 Mar 2004 15:35:35 -0000 1.43 +++ core/src/org/netbeans/core/TopLogging.java 16 Mar 2004 17:34:07 -0000 1.43.6.2 @@ -29,7 +29,7 @@ public class TopLogging { /** The name of the log file */ - public static final String LOG_FILE_NAME = "ide.log"; // NOI18N + public static final String LOG_FILE_NAME = "messages.log"; // NOI18N private static boolean disabledConsole = true; @@ -49,7 +49,7 @@ /** Creates a new TopLogging - redirects the System.err to a log file. * @param logDir A directory for the log file */ - public TopLogging (String logDir) throws IOException { + TopLogging (String logDir) throws IOException { topLogging = this; File logFileDir = new File (logDir); @@ -87,7 +87,7 @@ private static TopLogging getDefault() { if (topLogging == null) { try { - new TopLogging(NonGui.getSystemDir()); + new TopLogging(NonGui.getLogDir()); } catch (IOException x) { org.openide.ErrorManager.getDefault().notify(x); } Index: core/src/org/netbeans/core/modules/ModuleList.java =================================================================== RCS file: /cvs/core/src/org/netbeans/core/modules/ModuleList.java,v retrieving revision 1.49 retrieving revision 1.49.30.1 diff -u -r1.49 -r1.49.30.1 --- core/src/org/netbeans/core/modules/ModuleList.java 9 Dec 2003 15:48:12 -0000 1.49 +++ core/src/org/netbeans/core/modules/ModuleList.java 15 Mar 2004 12:42:08 -0000 1.49.30.1 @@ -805,7 +805,7 @@ } File instmod = new File(dir.folder, "installedModules.xml"); // NOI18N if (instmod.isFile()) { - File sysmod = new File(new File(dir.folder.getParentFile(), "system"), "Modules"); // NOI18N + File sysmod = new File(new File(dir.folder.getParentFile(), "config"), "Modules"); // NOI18N sysmod.mkdirs(); // Whether we will try to write to the proper directory, or just // write to the system file system (= user dir) instead. Index: core/src/org/netbeans/core/modules/NbInstaller.java =================================================================== RCS file: /cvs/core/src/org/netbeans/core/modules/NbInstaller.java,v retrieving revision 1.73 retrieving revision 1.73.40.1 diff -u -r1.73 -r1.73.40.1 --- core/src/org/netbeans/core/modules/NbInstaller.java 20 Oct 2003 00:41:01 -0000 1.73 +++ core/src/org/netbeans/core/modules/NbInstaller.java 15 Mar 2004 12:42:09 -0000 1.73.40.1 @@ -1168,7 +1168,7 @@ if (usingManifestCache) { String userdir = System.getProperty("netbeans.user"); if (userdir != null) { - manifestCacheFile = new File(new File(new File(userdir), "cache"), "all-manifests.dat"); // NOI18N + manifestCacheFile = new File(new File(new File(new File (userdir), "var"), "cache"), "all-manifests.dat"); // NOI18N Util.err.log("Using manifest cache in " + manifestCacheFile); } else { // Some special startup mode, e.g. with Plain. Index: core/src/org/netbeans/core/projects/SystemFileSystem.java =================================================================== RCS file: /cvs/core/src/org/netbeans/core/projects/SystemFileSystem.java,v retrieving revision 1.38 retrieving revision 1.38.54.1 diff -u -r1.38 -r1.38.54.1 --- core/src/org/netbeans/core/projects/SystemFileSystem.java 12 Aug 2003 09:38:27 -0000 1.38 +++ core/src/org/netbeans/core/projects/SystemFileSystem.java 15 Mar 2004 12:42:10 -0000 1.38.54.1 @@ -366,6 +366,9 @@ if (userDir != null) { // only one file system + if (!userDir.exists ()) { + userDir.mkdirs (); + } LocalFileSystem l = new LocalFileSystemEx (); l.setRootDirectory (userDir); user = l; @@ -391,7 +394,7 @@ FileSystem[] arr = new FileSystem[home == null ? 2 : 3]; arr[0] = new ModuleLayeredFileSystem(user, new FileSystem[0], null); if (home != null) { - File cachedir = new File(userDir.getParentFile(), "cache"); // NOI18N + File cachedir = new File(new File (userDir.getParentFile(), "var"), "cache"); // NOI18N arr[1] = new ModuleLayeredFileSystem(home, extras, cachedir); } FixedFileSystem.deflt = new FixedFileSystem Index: editor/build.xml =================================================================== RCS file: /cvs/editor/build.xml,v retrieving revision 1.42 retrieving revision 1.42.4.1 diff -u -r1.42 -r1.42.4.1 --- editor/build.xml 9 Mar 2004 09:53:28 -0000 1.42 +++ editor/build.xml 15 Mar 2004 15:31:14 -0000 1.42.4.1 @@ -67,6 +67,7 @@ + Index: nbbuild/build.properties =================================================================== RCS file: /cvs/nbbuild/build.properties,v retrieving revision 1.130 retrieving revision 1.130.4.1 diff -u -r1.130 -r1.130.4.1 --- nbbuild/build.properties 4 Mar 2004 17:03:45 -0000 1.130 +++ nbbuild/build.properties 15 Mar 2004 12:42:11 -0000 1.130.4.1 @@ -71,6 +71,8 @@ core/windows config.modules.platform=autoupdate, \ core/settings, \ + core/execution, \ + openide/execution, \ core/javahelp, \ text Index: nbbuild/build.xml =================================================================== RCS file: /cvs/nbbuild/build.xml,v retrieving revision 1.414 retrieving revision 1.414.4.5 diff -u -r1.414 -r1.414.4.5 --- nbbuild/build.xml 11 Mar 2004 18:04:54 -0000 1.414 +++ nbbuild/build.xml 16 Mar 2004 17:34:08 -0000 1.414.4.5 @@ -1090,10 +1090,46 @@ + + + + + + #!/bin/sh +# +# resolve symlinks +# +PRG=$0 + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null` + if expr "$link" : '^/' 2> /dev/null >/dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi +done + +progdir=`dirname "$PRG"` +export NB_USER_DIR=$HOME/.netbeans/dev +export NB_CONFIG_SYSTEM="$progdir"/../etc/netbeans.conf +export NB_CONFIG_USER=$NB_USER_DIR/config +exec /bin/sh $progdir/../${nb.cluster.platform.dir}/${nb.bin.dir}/nbexec --dirs ${nb.cluster.platform.dir}:${nb.cluster.ide.dir}:${nb.cluster.nb.dir} "$@" + + + + -J-Xms24m -J-Xmx96m +-J-Dnetbeans.logger.console=true +-J-ea + + + - - - + + + + Build created; see NetBeans-${buildnum}.zip (in nbbuild/). @@ -1169,7 +1205,7 @@ - + @@ -1179,8 +1215,8 @@ Finished starting the IDE, pay attention to any reported errors. - - + + @@ -1206,7 +1242,7 @@ - + @@ -1227,7 +1263,7 @@ - + Index: nbbuild/cluster.properties =================================================================== RCS file: /cvs/nbbuild/cluster.properties,v retrieving revision 1.6 retrieving revision 1.6.4.4 diff -u -r1.6 -r1.6.4.4 --- nbbuild/cluster.properties 11 Mar 2004 18:05:39 -0000 1.6 +++ nbbuild/cluster.properties 15 Mar 2004 17:17:23 -0000 1.6.4.4 @@ -23,11 +23,10 @@ vcsgeneric/profiles/pvcs, \ vcsgeneric/profiles/vss -clusters.list=nb.cluster.platform,nb.cluster.ide +clusters.list=nb.cluster.platform,nb.cluster.ide,nb.cluster.nb nb.cluster.platform=core, \ openide, \ - openide/compiler, \ openide/util, \ openide/actions, \ openide/awt, \ @@ -38,31 +37,33 @@ openide/compat, \ openide/text, \ openide/windows, \ - openide/deprecated, \ openide/loaders, \ openide/io, \ openide/execution, \ + autoupdate, \ core/term, \ core/output, \ core/settings, \ - core/deprecated, \ - java/srcmodel, \ - libs/regexp, \ - debuggercore/oldapi, \ core/javahelp, \ - core/compiler, \ + libs/regexp, \ core/execution, \ core/ui, \ - core/windows, \ - core/ide + core/windows -nb.cluster.platform.dir=netbeans +nb.cluster.platform.dir=platform4 nb.cluster.ide=classfile, \ clazz, \ editor, \ html, \ image, \ + openide/deprecated, \ + openide/compiler, \ + core/deprecated, \ + core/ide, \ + core/compiler, \ + java/srcmodel, \ + debuggercore/oldapi, \ java/api, \ java, \ junit, \ @@ -71,8 +72,6 @@ text, \ utilities, \ utilities/group,\ - autoupdate, \ - autoupdate/updatecenters, \ apisupport, \ apisupport/ant, \ apisupport/apidocs, \ @@ -110,7 +109,6 @@ schema2beans/dev, \ tomcatint/tomcat5, \ tomcatint/tomcat5/bundled, \ - ui/welcome, \ usersguide, \ vcscore, \ vcscvs/compat, \ @@ -129,7 +127,13 @@ ${local.config.vcsprofiles}, \ ${local.config.tasklist4barracuda} -nb.cluster.ide.dir=netbeans +nb.cluster.ide.dir=ide4 + +# special cluster for NetBeans only extensions +nb.cluster.nb=ui/welcome,\ + autoupdate/updatecenters +nb.cluster.nb.dir=nb4.0 + nb.cluster.test=xtest/plugins_src/deprecated, \ xtest/plugins_src/ide Index: nbbuild/default-properties.xml =================================================================== RCS file: /cvs/nbbuild/default-properties.xml,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -u -r1.1 -r1.1.6.1 --- nbbuild/default-properties.xml 9 Mar 2004 09:53:41 -0000 1.1 +++ nbbuild/default-properties.xml 15 Mar 2004 12:42:13 -0000 1.1.6.1 @@ -8,7 +8,7 @@ - + Index: nbbuild/directories.properties =================================================================== RCS file: /cvs/nbbuild/directories.properties,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -r1.2 -r1.2.6.1 --- nbbuild/directories.properties 9 Mar 2004 09:53:42 -0000 1.2 +++ nbbuild/directories.properties 15 Mar 2004 12:42:13 -0000 1.2.6.1 @@ -1,7 +1,7 @@ nb.beans.dir=beans -nb.bin.dir=bin +nb.bin.dir=launcher nb.docs.dir=docs -nb.lib.dir=lib +nb.lib.dir=boot nb.lib/patches.dir=${nb.lib.dir}/patches nb.modules.dir=modules nb.modules/autoload.dir=${nb.modules.dir}/autoload @@ -11,5 +11,5 @@ nb.modules/eager.dir=${nb.modules.dir}/eager nb.modules/patches.dir=${nb.modules.dir}/patches nb.sources.dir=sources -nb.system.dir=system +nb.system.dir=config nb.update_tracking.dir=update_tracking Index: nbbuild/antsrc/org/netbeans/nbbuild/GetModuleName.java =================================================================== RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/GetModuleName.java,v retrieving revision 1.5.2.1 retrieving revision 1.5 diff -u -r1.5.2.1 -r1.5 --- nbbuild/antsrc/org/netbeans/nbbuild/GetModuleName.java 16 Mar 2004 12:36:34 -0000 1.5.2.1 +++ nbbuild/antsrc/org/netbeans/nbbuild/GetModuleName.java 11 Mar 2004 18:03:58 -0000 1.5 @@ -47,7 +47,7 @@ log("Basedir: " + basedir + " rootdir: " + rootdir, Project.MSG_VERBOSE); if (!basedir.startsWith(rootdir)) throw new BuildException( "This module in on different path than the root dir",this.getLocation()); String modulename = basedir.substring(rootdir.length() + 1).replace(File.separatorChar,'/'); - this.getProject().setProperty( name, modulename); + this.getProject().setNewProperty( name, modulename); } catch (IOException ex) { throw new BuildException("Root dir or module's base dir wasn't recognized", ex, this.getLocation()); Index: openide/build.xml =================================================================== RCS file: /cvs/openide/build.xml,v retrieving revision 1.165 retrieving revision 1.165.4.2 diff -u -r1.165 -r1.165.4.2 --- openide/build.xml 9 Mar 2004 09:53:46 -0000 1.165 +++ openide/build.xml 15 Mar 2004 15:31:17 -0000 1.165.4.2 @@ -154,7 +154,9 @@ work in loaders_32143 branch. Shall provide enough time to module writers using the old code to update to new replacements. --> - + + + @@ -163,6 +165,7 @@ + Index: openide/compat/build.xml =================================================================== RCS file: /cvs/openide/compat/build.xml,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -r1.6 -r1.6.4.1 --- openide/compat/build.xml 9 Mar 2004 09:53:47 -0000 1.6 +++ openide/compat/build.xml 15 Mar 2004 15:31:18 -0000 1.6.4.1 @@ -85,7 +85,7 @@ Index: openide/compat/test/build.xml =================================================================== RCS file: /cvs/openide/compat/test/build.xml,v retrieving revision 1.11 retrieving revision 1.11.90.1 diff -u -r1.11 -r1.11.90.1 --- openide/compat/test/build.xml 2 Apr 2003 09:45:41 -0000 1.11 +++ openide/compat/test/build.xml 15 Mar 2004 12:41:50 -0000 1.11.90.1 @@ -62,7 +62,7 @@ Generating compatibility APIs from ${netbeans.home}/lib/openide.jar - + Index: openide/compiler/build.xml =================================================================== RCS file: /cvs/openide/compiler/build.xml,v retrieving revision 1.15 retrieving revision 1.15.4.2 diff -u -r1.15 -r1.15.4.2 --- openide/compiler/build.xml 9 Mar 2004 09:53:47 -0000 1.15 +++ openide/compiler/build.xml 15 Mar 2004 15:31:19 -0000 1.15.4.2 @@ -35,7 +35,8 @@ - + + Index: openide/deprecated/build.xml =================================================================== RCS file: /cvs/openide/deprecated/build.xml,v retrieving revision 1.18 retrieving revision 1.18.4.1 diff -u -r1.18 -r1.18.4.1 --- openide/deprecated/build.xml 9 Mar 2004 09:53:48 -0000 1.18 +++ openide/deprecated/build.xml 15 Mar 2004 12:41:52 -0000 1.18.4.1 @@ -52,6 +52,7 @@ + Index: openide/explorer/build.xml =================================================================== RCS file: /cvs/openide/explorer/build.xml,v retrieving revision 1.5 retrieving revision 1.5.4.2 diff -u -r1.5 -r1.5.4.2 --- openide/explorer/build.xml 9 Mar 2004 09:53:49 -0000 1.5 +++ openide/explorer/build.xml 15 Mar 2004 15:31:20 -0000 1.5.4.2 @@ -50,7 +50,8 @@ - + + Index: openide/fs/build.xml =================================================================== RCS file: /cvs/openide/fs/build.xml,v retrieving revision 1.5 retrieving revision 1.5.4.2 diff -u -r1.5 -r1.5.4.2 --- openide/fs/build.xml 9 Mar 2004 09:53:49 -0000 1.5 +++ openide/fs/build.xml 15 Mar 2004 15:31:21 -0000 1.5.4.2 @@ -47,7 +47,8 @@ - + + Index: openide/io/build.xml =================================================================== RCS file: /cvs/openide/io/build.xml,v retrieving revision 1.14 retrieving revision 1.14.4.2 diff -u -r1.14 -r1.14.4.2 --- openide/io/build.xml 10 Mar 2004 16:14:26 -0000 1.14 +++ openide/io/build.xml 15 Mar 2004 15:31:22 -0000 1.14.4.2 @@ -35,7 +35,8 @@ classpath="${nb_all}/nbbuild/nbantext.jar"/> - + + Index: openide/loaders/build.xml =================================================================== RCS file: /cvs/openide/loaders/build.xml,v retrieving revision 1.16 retrieving revision 1.16.4.2 diff -u -r1.16 -r1.16.4.2 --- openide/loaders/build.xml 9 Mar 2004 09:53:50 -0000 1.16 +++ openide/loaders/build.xml 15 Mar 2004 15:31:24 -0000 1.16.4.2 @@ -44,7 +44,8 @@ - + + Index: openide/nodes/build.xml =================================================================== RCS file: /cvs/openide/nodes/build.xml,v retrieving revision 1.5 retrieving revision 1.5.4.2 diff -u -r1.5 -r1.5.4.2 --- openide/nodes/build.xml 9 Mar 2004 09:53:50 -0000 1.5 +++ openide/nodes/build.xml 15 Mar 2004 15:31:25 -0000 1.5.4.2 @@ -48,7 +48,8 @@ - + + Index: openide/test/build.xml =================================================================== RCS file: /cvs/openide/test/build.xml,v retrieving revision 1.55 retrieving revision 1.55.4.1 diff -u -r1.55 -r1.55.4.1 --- openide/test/build.xml 9 Mar 2004 09:53:51 -0000 1.55 +++ openide/test/build.xml 15 Mar 2004 12:41:59 -0000 1.55.4.1 @@ -252,7 +252,7 @@ - + @@ -267,7 +267,7 @@ --> - + @@ -306,7 +306,7 @@ - + @@ -327,7 +327,7 @@ --> - + Index: openide/util/build.xml =================================================================== RCS file: /cvs/openide/util/build.xml,v retrieving revision 1.6 retrieving revision 1.6.4.2 diff -u -r1.6 -r1.6.4.2 --- openide/util/build.xml 9 Mar 2004 09:53:53 -0000 1.6 +++ openide/util/build.xml 15 Mar 2004 15:31:26 -0000 1.6.4.2 @@ -15,7 +15,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -46,7 +46,8 @@ - + + Index: utilities/build.xml =================================================================== RCS file: /cvs/utilities/build.xml,v retrieving revision 1.44 retrieving revision 1.44.4.1 diff -u -r1.44 -r1.44.4.1 --- utilities/build.xml 9 Mar 2004 09:54:00 -0000 1.44 +++ utilities/build.xml 15 Mar 2004 12:42:15 -0000 1.44.4.1 @@ -37,7 +37,7 @@ - + Index: xtest/lib/module_harness.xml =================================================================== RCS file: /cvs/xtest/lib/module_harness.xml,v retrieving revision 1.86 retrieving revision 1.86.6.1 diff -u -r1.86 -r1.86.6.1 --- xtest/lib/module_harness.xml 9 Mar 2004 14:49:26 -0000 1.86 +++ xtest/lib/module_harness.xml 16 Mar 2004 16:11:41 -0000 1.86.6.1 @@ -155,7 +155,11 @@ + + + + Index: xtest/plugins_src/deprecated/build.xml =================================================================== RCS file: /cvs/xtest/plugins_src/deprecated/build.xml,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -u -r1.4 -r1.4.6.1 --- xtest/plugins_src/deprecated/build.xml 9 Mar 2004 09:54:17 -0000 1.4 +++ xtest/plugins_src/deprecated/build.xml 15 Mar 2004 15:31:27 -0000 1.4.6.1 @@ -27,7 +27,7 @@ - + Index: xtest/plugins_src/ide/build.xml =================================================================== RCS file: /cvs/xtest/plugins_src/ide/build.xml,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -u -r1.3 -r1.3.6.1 --- xtest/plugins_src/ide/build.xml 9 Mar 2004 09:54:17 -0000 1.3 +++ xtest/plugins_src/ide/build.xml 15 Mar 2004 15:31:28 -0000 1.3.6.1 @@ -27,7 +27,7 @@ - +