Index: core/build.xml
===================================================================
RCS file: /cvs/core/build.xml,v
retrieving revision 1.78
diff -u -r1.78 build.xml
--- core/build.xml 25 Mar 2004 16:05:51 -0000 1.78
+++ core/build.xml 29 Mar 2004 08:56:26 -0000
@@ -24,12 +24,16 @@
+
+
+
@@ -53,10 +57,16 @@
+
+
+
+
+
+
Index: core/bootstrap/nbproject/project.properties
===================================================================
RCS file: /cvs/core/bootstrap/nbproject/project.properties,v
retrieving revision 1.1
diff -u -r1.1 project.properties
--- core/bootstrap/nbproject/project.properties 25 Mar 2004 16:05:48 -0000 1.1
+++ core/bootstrap/nbproject/project.properties 29 Mar 2004 08:56:26 -0000
@@ -9,5 +9,5 @@
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
# Microsystems, Inc. All Rights Reserved.
-module.jar.dir=lib/ext
+module.jar.dir=${nb.lib/ext.dir}
module.jar.basename=boot.jar
Index: core/bootstrap/src/org/netbeans/Main.java
===================================================================
RCS file: /cvs/core/bootstrap/src/org/netbeans/Main.java,v
retrieving revision 1.16
diff -u -r1.16 Main.java
--- core/bootstrap/src/org/netbeans/Main.java 9 Jan 2004 23:55:03 -0000 1.16
+++ core/bootstrap/src/org/netbeans/Main.java 29 Mar 2004 08:56:29 -0000
@@ -73,16 +73,18 @@
) throws Exception {
ArrayList list = new ArrayList ();
+ HashSet processedDirs = new HashSet ();
String home = System.getProperty ("netbeans.home"); // NOI18N
if (home != null) {
- build_cp (new File (home), list, false);
+ build_cp (new File (home), list, false, processedDirs);
}
// #34069: need to do the same for nbdirs.
String nbdirs = System.getProperty("netbeans.dirs"); // NOI18N
if (nbdirs != null) {
StringTokenizer tok = new StringTokenizer(nbdirs, File.pathSeparator);
while (tok.hasMoreTokens()) {
- build_cp(new File(tok.nextToken()), list, true);
+ // passing false as last argument as we need to initialize openfile-cli.jar
+ build_cp(new File(tok.nextToken()), list, false, processedDirs);
}
}
@@ -214,10 +216,17 @@
}
- private static void build_cp(File base, Collection toAdd, boolean localeOnly) {
+ private static void build_cp(File base, Collection toAdd, boolean localeOnly, Set processedDirs)
+ throws java.io.IOException {
+ base = base.getCanonicalFile ();
+ if (!processedDirs.add (base)) {
+ // already processed
+ return;
+ }
+
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 +240,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/release/bin/runide.sh
===================================================================
RCS file: /cvs/core/release/bin/runide.sh,v
retrieving revision 1.57
diff -u -r1.57 runide.sh
--- core/release/bin/runide.sh 3 Mar 2004 15:16:12 -0000 1.57
+++ core/release/bin/runide.sh 29 Mar 2004 08:56:30 -0000
@@ -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.385
diff -u -r1.385 Bundle.properties
--- core/src/org/netbeans/core/Bundle.properties 29 Mar 2004 00:32:13 -0000 1.385
+++ core/src/org/netbeans/core/Bundle.properties 29 Mar 2004 08:56:30 -0000
@@ -162,8 +162,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
diff -u -r1.4 CLIOptions.java
--- core/src/org/netbeans/core/CLIOptions.java 9 Jan 2004 23:55:08 -0000 1.4
+++ core/src/org/netbeans/core/CLIOptions.java 29 Mar 2004 08:56:30 -0000
@@ -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
diff -u -r1.3 LookupCache.java
--- core/src/org/netbeans/core/LookupCache.java 27 Feb 2003 23:33:25 -0000 1.3
+++ core/src/org/netbeans/core/LookupCache.java 29 Mar 2004 08:56:30 -0000
@@ -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
diff -u -r1.9 NbRepository.java
--- core/src/org/netbeans/core/NbRepository.java 16 Nov 2003 22:42:16 -0000 1.9
+++ core/src/org/netbeans/core/NbRepository.java 29 Mar 2004 08:56:30 -0000
@@ -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.107
diff -u -r1.107 NonGui.java
--- core/src/org/netbeans/core/NonGui.java 29 Mar 2004 00:30:54 -0000 1.107
+++ core/src/org/netbeans/core/NonGui.java 29 Mar 2004 08:56:30 -0000
@@ -137,6 +137,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
diff -u -r1.54 NotifyException.java
--- core/src/org/netbeans/core/NotifyException.java 8 Mar 2004 16:26:45 -0000 1.54
+++ core/src/org/netbeans/core/NotifyException.java 29 Mar 2004 08:56:30 -0000
@@ -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
diff -u -r1.43 TopLogging.java
--- core/src/org/netbeans/core/TopLogging.java 4 Mar 2004 15:35:35 -0000 1.43
+++ core/src/org/netbeans/core/TopLogging.java 29 Mar 2004 08:56:30 -0000
@@ -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/Module.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/Module.java,v
retrieving revision 1.51
diff -u -r1.51 Module.java
--- core/src/org/netbeans/core/modules/Module.java 17 Mar 2004 15:07:46 -0000 1.51
+++ core/src/org/netbeans/core/modules/Module.java 29 Mar 2004 08:56:30 -0000
@@ -1104,7 +1104,7 @@
/** look for JNI libraries also in modules/bin/ */
protected String findLibrary(String libname) {
String mapped = System.mapLibraryName(libname);
- File lib = new File(new File(jar.getParentFile(), "bin"), mapped); // NOI18N
+ File lib = new File(new File(jar.getParentFile(), "lib"), mapped); // NOI18N
if (lib.isFile()) {
return lib.getAbsolutePath();
} else {
Index: core/src/org/netbeans/core/modules/NbInstaller.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/NbInstaller.java,v
retrieving revision 1.74
diff -u -r1.74 NbInstaller.java
--- core/src/org/netbeans/core/modules/NbInstaller.java 19 Mar 2004 12:09:16 -0000 1.74
+++ core/src/org/netbeans/core/modules/NbInstaller.java 29 Mar 2004 08:56:30 -0000
@@ -1098,7 +1098,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.39
diff -u -r1.39 SystemFileSystem.java
--- core/src/org/netbeans/core/projects/SystemFileSystem.java 17 Mar 2004 15:03:35 -0000 1.39
+++ core/src/org/netbeans/core/projects/SystemFileSystem.java 29 Mar 2004 08:56:37 -0000
@@ -286,6 +286,9 @@
if (userDir != null) {
// only one file system
+ if (!userDir.exists ()) {
+ userDir.mkdirs ();
+ }
LocalFileSystem l = new LocalFileSystemEx ();
l.setRootDirectory (userDir);
user = l;
@@ -311,7 +314,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: core/test/unit/src/org/netbeans/CLIHandlerTest.java
===================================================================
RCS file: /cvs/core/test/unit/src/org/netbeans/CLIHandlerTest.java,v
retrieving revision 1.5
diff -u -r1.5 CLIHandlerTest.java
--- core/test/unit/src/org/netbeans/CLIHandlerTest.java 12 Dec 2003 16:39:05 -0000 1.5
+++ core/test/unit/src/org/netbeans/CLIHandlerTest.java 29 Mar 2004 08:56:37 -0000
@@ -33,7 +33,13 @@
}
public static void main(String[] args) {
- TestRunner.run(new NbTestSuite(CLIHandlerTest.class));
+ junit.framework.Test t;
+ if (args.length == 0) {
+ t = new NbTestSuite(CLIHandlerTest.class);
+ } else {
+ t = new CLIHandlerTest (args[0]);
+ }
+ TestRunner.run(t);
}
protected void setUp() throws Exception {
Index: nbbuild/build.properties
===================================================================
RCS file: /cvs/nbbuild/build.properties,v
retrieving revision 1.142
diff -u -r1.142 build.properties
--- nbbuild/build.properties 29 Mar 2004 00:10:58 -0000 1.142
+++ nbbuild/build.properties 29 Mar 2004 08:57:59 -0000
@@ -161,6 +161,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.424
diff -u -r1.424 build.xml
--- nbbuild/build.xml 29 Mar 2004 00:30:45 -0000 1.424
+++ nbbuild/build.xml 29 Mar 2004 08:58:12 -0000
@@ -267,7 +267,7 @@
-
+
@@ -1109,10 +1109,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/).
@@ -1188,7 +1224,7 @@
-
+
@@ -1198,8 +1234,8 @@
Finished starting the IDE, pay attention to any reported errors.
-
-
+
+
@@ -1225,7 +1261,7 @@
-
+
@@ -1246,7 +1282,7 @@
-
+
Index: nbbuild/cluster.properties
===================================================================
RCS file: /cvs/nbbuild/cluster.properties,v
retrieving revision 1.13
diff -u -r1.13 cluster.properties
--- nbbuild/cluster.properties 18 Mar 2004 14:28:04 -0000 1.13
+++ nbbuild/cluster.properties 29 Mar 2004 08:58:12 -0000
@@ -35,13 +35,12 @@
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
# XXX need to revisit clusterization w/ build system modules added
nb.cluster.platform=core, \
openide, \
- openide/compiler, \
openide/util, \
openide/actions, \
openide/awt, \
@@ -49,37 +48,39 @@
openide/nodes, \
openide/explorer, \
openide/fs, \
- openide/compat, \
openide/text, \
openide/windows, \
- openide/deprecated, \
openide/loaders, \
openide/io, \
openide/execution, \
- openide/execution/deprecated, \
openide/masterfs, \
core/term, \
core/output, \
core/settings, \
- core/deprecated, \
- java/srcmodel, \
- libs/regexp, \
- debuggercore/oldapi, \
core/javahelp, \
- core/compiler, \
core/execution, \
+ core/bootstrap, \
core/ui, \
core/windows, \
- core/ide, \
+ autoupdate, \
projects/queries
-nb.cluster.platform.dir=netbeans
+nb.cluster.platform.dir=platform4
nb.cluster.ide=classfile, \
clazz, \
+ openide/compiler, \
+ core/compiler, \
+ openide/execution/deprecated, \
+ openide/deprecated, \
+ core/deprecated, \
+ openide/compat, \
+ core/ide, \
+ libs/regexp, \
editor, \
html, \
image, \
+ java/srcmodel, \
java/api, \
java, \
junit, \
@@ -88,13 +89,12 @@
text, \
utilities, \
utilities/group,\
- autoupdate, \
- autoupdate/updatecenters, \
apisupport, \
apisupport/apidocs, \
apisupport/lite, \
beans, \
debuggercore, \
+ debuggercore/oldapi, \
debuggerjpda, \
form, \
httpserver, \
@@ -132,7 +132,6 @@
tomcatint/tomcat5, \
tomcatint/tomcat5/bundled, \
treefs, \
- ui/welcome, \
usersguide, \
vcscore, \
vcscvs/compat, \
@@ -170,7 +169,14 @@
${local.config.tasklist4barracuda}, \
${local.config.tasklist4barracuda_auc}
-nb.cluster.ide.dir=netbeans
+nb.cluster.ide.dir=ide4
+
+# special cluster for NetBeans IDE only extensions
+nb.cluster.nb=\
+ autoupdate/updatecenters, \
+ ui/welcome
+
+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
diff -u -r1.1 default-properties.xml
--- nbbuild/default-properties.xml 9 Mar 2004 09:53:41 -0000 1.1
+++ nbbuild/default-properties.xml 29 Mar 2004 08:58:12 -0000
@@ -8,7 +8,7 @@
-
+
Index: nbbuild/directories.properties
===================================================================
RCS file: /cvs/nbbuild/directories.properties,v
retrieving revision 1.3
diff -u -r1.3 directories.properties
--- nbbuild/directories.properties 16 Mar 2004 15:33:38 -0000 1.3
+++ nbbuild/directories.properties 29 Mar 2004 08:58:12 -0000
@@ -1,16 +1,16 @@
nb.beans.dir=beans
-nb.bin.dir=bin
+nb.bin.dir=launcher
nb.docs.dir=docs
-nb.lib.dir=lib
-nb.lib/ext.dir=lib/ext
+nb.lib.dir=boot
+nb.lib/ext.dir=launcher
nb.lib/patches.dir=${nb.lib.dir}/patches
nb.modules.dir=modules
nb.modules/autoload.dir=${nb.modules.dir}/autoload
nb.modules/autoload/docs.dir=${nb.modules/autoload.dir}/docs
-nb.modules/bin.dir=${nb.modules.dir}/bin
+nb.modules/bin.dir=${nb.modules.dir}/lib
nb.modules/docs.dir=${nb.modules.dir}/docs
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: xtest/lib/default-module-build.xml
===================================================================
RCS file: /cvs/xtest/lib/default-module-build.xml,v
retrieving revision 1.5
diff -u -r1.5 default-module-build.xml
--- xtest/lib/default-module-build.xml 25 Mar 2004 14:39:36 -0000 1.5
+++ xtest/lib/default-module-build.xml 29 Mar 2004 09:00:35 -0000
@@ -26,7 +26,7 @@
-
+
Index: xtest/lib/module_harness.xml
===================================================================
RCS file: /cvs/xtest/lib/module_harness.xml,v
retrieving revision 1.86
diff -u -r1.86 module_harness.xml
--- xtest/lib/module_harness.xml 9 Mar 2004 14:49:26 -0000 1.86
+++ xtest/lib/module_harness.xml 29 Mar 2004 09:00:35 -0000
@@ -155,7 +155,11 @@
+
+
+
+
Index: xtest/plugins_src/deprecated/lib/ide_execution_targets.xml
===================================================================
RCS file: /cvs/xtest/plugins_src/deprecated/lib/ide_execution_targets.xml,v
retrieving revision 1.8
diff -u -r1.8 ide_execution_targets.xml
--- xtest/plugins_src/deprecated/lib/ide_execution_targets.xml 15 Mar 2004 09:23:26 -0000 1.8
+++ xtest/plugins_src/deprecated/lib/ide_execution_targets.xml 29 Mar 2004 09:00:35 -0000
@@ -228,7 +228,7 @@
os="Linux SunOS Solaris Mac OS X"
enableAssertions="${xtest.enable.assertions}" debugPort="${xtest.debug.port}" debugSuspend="${xtest.debug.suspend}"
failonerror="no" timeout="${xtest.ide.timeout}" ideuserdir="${xtest.userdir}">
-
+