Index: ant/build.xml
===================================================================
RCS file: /cvs/ant/build.xml,v
retrieving revision 1.40
diff -u -t -r1.40 build.xml
--- ant/build.xml	24 Sep 2001 18:50:55 -0000	1.40
+++ ant/build.xml	1 Oct 2001 19:01:09 -0000
@@ -96,7 +96,7 @@
   <target name="nbm" depends="netbeans" description="Build module NBM file.">
     <makenbm file="ant.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/ant.jar"
              homepage="http://ant.${homepage.base}/"
              distribution="http://${dist.base}/ant.nbm">
       <license name="ant-license.txt">
@@ -105,9 +105,6 @@
         For the Ant runtime and manual:
         <file location="Ant_License"/>
       </license>
-      <description>
-        Support for Ant build scripts.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: apisupport/build.xml
===================================================================
RCS file: /cvs/apisupport/build.xml,v
retrieving revision 1.48
diff -u -t -r1.48 build.xml
--- apisupport/build.xml	24 Sep 2001 19:02:08 -0000	1.48
+++ apisupport/build.xml	1 Oct 2001 19:01:09 -0000
@@ -116,7 +116,7 @@
   <target name="main-nbm" depends="netbeans">
     <makenbm file="apisupport.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/apisupport.jar"
              homepage="http://apisupport.${homepage.base}/"
              distribution="http://${dist.base}/apisupport.nbm">
       <license file="${license.file}"/>
@@ -133,7 +133,7 @@
     </copy>
     <makenbm file="apisupport-ant.nbm"
              topdir="ant-nbm-tmp"
-             manifest="apisupport-ant-subst.mf"
+             module="netbeans/modules/apisupport-ant.jar"
              homepage="http://apisupport.${homepage.base}/"
              distribution="http://${dist.base}/apisupport-ant.nbm">
       <license file="${license.file}"/>
Index: apisupport/lite/build.xml
===================================================================
RCS file: /cvs/apisupport/lite/build.xml,v
retrieving revision 1.10
diff -u -t -r1.10 build.xml
--- apisupport/lite/build.xml	24 Sep 2001 12:13:25 -0000	1.10
+++ apisupport/lite/build.xml	1 Oct 2001 19:01:09 -0000
@@ -62,7 +62,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="../apisupport-lite.nbm"
              topdir="."
-             manifest="../apisupport-lite-subst.mf"
+             module="netbeans/modules/apisupport-lite.jar"
              homepage="http://apisupport.${homepage.base}/"
              distribution="http://${dist.base}/apisupport-lite.nbm">
       <license file="${license.file}"/>
Index: applet/build.xml
===================================================================
RCS file: /cvs/applet/build.xml,v
retrieving revision 1.21
diff -u -t -r1.21 build.xml
--- applet/build.xml	24 Sep 2001 12:13:25 -0000	1.21
+++ applet/build.xml	1 Oct 2001 19:01:09 -0000
@@ -58,7 +58,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="applet.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/applet.jar"
              homepage="http://applet.${homepage.base}/"
              distribution="http://${dist.base}/applet.nbm">
       <license file="${license.file}"/>
Index: autoupdate/build.xml
===================================================================
RCS file: /cvs/autoupdate/build.xml,v
retrieving revision 1.26
diff -u -t -r1.26 build.xml
--- autoupdate/build.xml	24 Sep 2001 12:13:25 -0000	1.26
+++ autoupdate/build.xml	1 Oct 2001 19:01:09 -0000
@@ -89,7 +89,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="autoupdate.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/autoupdate.jar"
              homepage="http://${homepage.base}/"
              distribution="http://{dist.base}/autoupdate.nbm">
       <license file="${license.file}"/>
Index: beans/build.xml
===================================================================
RCS file: /cvs/beans/build.xml,v
retrieving revision 1.19
diff -u -t -r1.19 build.xml
--- beans/build.xml	24 Sep 2001 12:13:25 -0000	1.19
+++ beans/build.xml	1 Oct 2001 19:01:09 -0000
@@ -57,14 +57,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="beans.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/beans.jar"
              homepage="http://beans.${homepage.base}/"
              distribution="http://${dist.base}/beans.nbm">
       <license file="${license.file}"/>
-      <description>
-        Development of JavaBeans components, including bean
-        properties, info, and event sets.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: classfile/build.xml
===================================================================
RCS file: /cvs/classfile/build.xml,v
retrieving revision 1.7
diff -u -t -r1.7 build.xml
--- classfile/build.xml	24 Sep 2001 12:13:25 -0000	1.7
+++ classfile/build.xml	1 Oct 2001 19:01:09 -0000
@@ -46,13 +46,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="classfile.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/autoload/classfile.jar"
              homepage="http://classfile.${homepage.base}/"
              distribution="http://${dist.base}/classfile.nbm">
       <license file="${license.file}"/>
-      <description>
-        Query all aspects of specified classfiles.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: clazz/build.xml
===================================================================
RCS file: /cvs/clazz/build.xml,v
retrieving revision 1.20
diff -u -t -r1.20 build.xml
--- clazz/build.xml	24 Sep 2001 12:13:25 -0000	1.20
+++ clazz/build.xml	1 Oct 2001 19:01:10 -0000
@@ -54,16 +54,14 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="clazz.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/clazz.jar"
              homepage="http://clazz.${homepage.base}/"
              distribution="http://{dist.base}/clazz.nbm">
       <license file="${license.file}"/>
-      <description>
-        Sourceless Java classes and serialized JavaBeans components.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: corba/build.xml
===================================================================
RCS file: /cvs/corba/build.xml,v
retrieving revision 1.31
diff -u -t -r1.31 build.xml
--- corba/build.xml	24 Sep 2001 14:37:32 -0000	1.31
+++ corba/build.xml	1 Oct 2001 19:01:10 -0000
@@ -138,13 +138,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="corba.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/corba.jar"
              homepage="http://corba.${homepage.base}/corba.html"
              distribution="http://${dist.base}/corba.nbm" >
       <license file="${license.file}" />
-      <description>
-        CORBA ...
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: cpp/build.xml
===================================================================
RCS file: /cvs/cpp/build.xml,v
retrieving revision 1.4
diff -u -t -r1.4 build.xml
--- cpp/build.xml	24 Sep 2001 17:08:16 -0000	1.4
+++ cpp/build.xml	1 Oct 2001 19:01:10 -0000
@@ -79,14 +79,10 @@
     <!-- Make one NBM with both module JARs. -->
     <makenbm file="cpp.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/cpp.jar"
              homepage="http://cpp.${homepage.base}/"
              distribution="http://${dist.base}/cpp.nbm">
       <license file="${license.file}"/>
-      <description>
-        Editing of cpp files (resource bundles), including a
-        table-oriented view with keys and locales.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: cpplite/build.xml
===================================================================
RCS file: /cvs/cpplite/build.xml,v
retrieving revision 1.18
diff -u -t -r1.18 build.xml
--- cpplite/build.xml	29 Sep 2001 13:47:52 -0000	1.18
+++ cpplite/build.xml	1 Oct 2001 19:01:10 -0000
@@ -123,17 +123,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="cpplite.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/cpplite.jar"
              homepage="http://cpplite.${homepage.base}/"
              distribution="http://${dist.base}/cpplite.nbm">
       <license file="${license.file}"/>
-      <description>
-        Lightweight support for C/C++.
-        It supports editting, compiling and linking of executables and static
-        linked libraries.
-        Homepage: http://cpplite.netbeans.org
-        Tutorial: http://cpplite.netbeans.org/docs/tutorial.html
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
     </makenbm>
   </target>
Index: cpplite/manifest.mf
===================================================================
RCS file: /cvs/cpplite/manifest.mf,v
retrieving revision 1.12
diff -u -t -r1.12 manifest.mf
--- cpplite/manifest.mf	29 Sep 2001 13:47:52 -0000	1.12
+++ cpplite/manifest.mf	1 Oct 2001 19:01:10 -0000
@@ -3,6 +3,11 @@
 OpenIDE-Module-Install: org/netbeans/modules/cpplite/CPPModule.class
 OpenIDE-Module-Name: CPP support
 OpenIDE-Module-Short-Description: Supports work with C/C++ files.
+OpenIDE-Module-Long-Description: Lightweight support for C/C++.
+  It supports editing, compiling and linking of executables and static
+  linked libraries.
+  Homepage: http://cpplite.netbeans.org/
+  Tutorial: http://cpplite.netbeans.org/docs/tutorial.html
 OpenIDE-Module-Display-Category: C/C++
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Specification-Version: 1.4
Index: db/build.xml
===================================================================
RCS file: /cvs/db/build.xml,v
retrieving revision 1.23
diff -u -t -r1.23 build.xml
--- db/build.xml	20 Sep 2001 17:58:41 -0000	1.23
+++ db/build.xml	1 Oct 2001 19:01:10 -0000
@@ -103,13 +103,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="db.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/db.jar"
              homepage="http://${homepage.base}/db.html"
              distribution="${dist.base}/db.nbm">
       <license file="${license.file}"/>
-      <description>
-        Database Explorer
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: debuggercore/build.xml
===================================================================
RCS file: /cvs/debuggercore/build.xml,v
retrieving revision 1.27
diff -u -t -r1.27 build.xml
--- debuggercore/build.xml	24 Sep 2001 12:13:26 -0000	1.27
+++ debuggercore/build.xml	1 Oct 2001 19:01:10 -0000
@@ -57,13 +57,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="debuggercore.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/autoload/debuggerCore.jar"
              homepage="http://debuggercore.${homepage.base}/"
              distribution="http://${dist.base}/debuggercore.nbm">
       <license file="${license.file}"/>
-      <description>
-        Foundation for the IDE's debugger.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: debuggerjpda/build.xml
===================================================================
RCS file: /cvs/debuggerjpda/build.xml,v
retrieving revision 1.21
diff -u -t -r1.21 build.xml
--- debuggerjpda/build.xml	24 Sep 2001 12:13:26 -0000	1.21
+++ debuggerjpda/build.xml	1 Oct 2001 19:01:11 -0000
@@ -72,15 +72,10 @@
   <target name="nbm" depends="check,netbeans" if="jpda">
     <makenbm file="debuggerjpda.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/jpdaDebugger.jar"
              homepage="http://debuggerjpda.${homepage.base}/"
              distribution="http://${dist.base}/debuggerjpda.nbm">
       <license file="${license.file}"/>
-      <description>
-        JPDA (Java Platform Debugger Architecture) debugger support.
-        Requires that you have jpda.jar installed (or are using JDK
-        1.3).
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: debuggertools/build.xml
===================================================================
RCS file: /cvs/debuggertools/build.xml,v
retrieving revision 1.20
diff -u -t -r1.20 build.xml
--- debuggertools/build.xml	24 Sep 2001 12:13:26 -0000	1.20
+++ debuggertools/build.xml	1 Oct 2001 19:01:11 -0000
@@ -65,13 +65,10 @@
   <target name="nbm" depends="check,netbeans" if="jdk11_debugger">
     <makenbm file="debuggertools.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/toolsDebugger.jar"
              homepage="http://debuggertools.${homepage.base}/"
              distribution="http://${dit.base}/debuggertools.nbm">
       <license file="${license.file}"/>
-      <description>
-        Debugger based on old-style tools debugger in JSDK.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: editor/build.xml
===================================================================
RCS file: /cvs/editor/build.xml,v
retrieving revision 1.23
diff -u -t -r1.23 build.xml
--- editor/build.xml	24 Sep 2001 12:13:27 -0000	1.23
+++ editor/build.xml	1 Oct 2001 19:01:11 -0000
@@ -78,13 +78,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="editor.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/editor.jar"
              homepage="http://editor.${homepage.base}/"
              distribution="http://{dist.base}/editor.nbm">
       <license file="${license.file}"/>
-      <description>
-        IDE's standard source editor.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: extbrowser/build.xml
===================================================================
RCS file: /cvs/extbrowser/build.xml,v
retrieving revision 1.17
diff -u -t -r1.17 build.xml
--- extbrowser/build.xml	24 Sep 2001 12:13:27 -0000	1.17
+++ extbrowser/build.xml	1 Oct 2001 19:01:11 -0000
@@ -67,7 +67,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="extbrowser.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/extbrowser.jar"
              homepage="http://extbrowser.${homepage.base}/"
              distribution="http://${dist.base}/extbrowser.nbm">
       <license file="${license.file}"/>
Index: externaleditor/build.xml
===================================================================
RCS file: /cvs/externaleditor/build.xml,v
retrieving revision 1.5
diff -u -t -r1.5 build.xml
--- externaleditor/build.xml	1 Oct 2001 01:15:45 -0000	1.5
+++ externaleditor/build.xml	1 Oct 2001 19:01:11 -0000
@@ -95,13 +95,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="externaleditor.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/externaleditor.jar"
              homepage="http://externaleditor.${homepage.base}/"
              distribution="http://${dist.base}/externaleditor.nbm">
       <license file="${license.file}"/>
-      <description>
-        Support for XEmacs, Vim and other external editors as the IDE's editor.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
     </makenbm>
   </target>
Index: externaleditor/src/org/netbeans/modules/externaleditor/Bundle.properties
===================================================================
RCS file: /cvs/externaleditor/src/org/netbeans/modules/externaleditor/Bundle.properties,v
retrieving revision 1.6
diff -u -t -r1.6 Bundle.properties
--- externaleditor/src/org/netbeans/modules/externaleditor/Bundle.properties	28 Sep 2001 23:10:15 -0000	1.6
+++ externaleditor/src/org/netbeans/modules/externaleditor/Bundle.properties	1 Oct 2001 19:01:11 -0000
@@ -6,7 +6,7 @@
 # manifest localization
 
 OpenIDE-Module-Name=External Editor Support
-
+OpenIDE-Module-Long-Description=Support for XEmacs, Vim and other external editors as the IDE's editor.
 
 ############################################################################
 ## Error messages;  ERR_ goes to stderr, EXC_ is in exception, EMSG_ is the
Index: filecopy/build.xml
===================================================================
RCS file: /cvs/filecopy/build.xml,v
retrieving revision 1.23
diff -u -t -r1.23 build.xml
--- filecopy/build.xml	1 Oct 2001 08:56:18 -0000	1.23
+++ filecopy/build.xml	1 Oct 2001 19:01:11 -0000
@@ -74,13 +74,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="filecopy.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/filecopy.jar"
              homepage="http://filecopy.${homepage.base}"
              distribution="${dist.base}/filecopy.nbm">
       <license file="${license.file}"/>
-      <description>
-        Filecopy module
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: form/build.xml
===================================================================
RCS file: /cvs/form/build.xml,v
retrieving revision 1.29
diff -u -t -r1.29 build.xml
--- form/build.xml	24 Sep 2001 12:13:27 -0000	1.29
+++ form/build.xml	1 Oct 2001 19:01:11 -0000
@@ -70,13 +70,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="form.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/form.jar"
              homepage="http://form.${homepage.base}/"
              distribution="http://${dist.base}/form.nbm">
       <license file="${license.file}"/>
-      <description>
-        The visual Form Editor.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: freestylebrowser/build.xml
===================================================================
RCS file: /cvs/freestylebrowser/build.xml,v
retrieving revision 1.2
diff -u -t -r1.2 build.xml
--- freestylebrowser/build.xml	7 Aug 2001 17:15:17 -0000	1.2
+++ freestylebrowser/build.xml	1 Oct 2001 19:01:12 -0000
@@ -57,13 +57,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="freestylebrowser.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/freestylebrowser.jar"
              homepage="http://freestylebrowser.${homepage.base}/"
              distribution="http://${dist.base}/freestylebrowser.nbm">
       <license file="${license.file}"/>
-      <description>
-        New Object Browser for NetBeans
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: html/build.xml
===================================================================
RCS file: /cvs/html/build.xml,v
retrieving revision 1.19
diff -u -t -r1.19 build.xml
--- html/build.xml	24 Sep 2001 12:13:27 -0000	1.19
+++ html/build.xml	1 Oct 2001 19:01:12 -0000
@@ -55,7 +55,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="html.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/html.jar"
              homepage="http://html.${homepage.base}/"
              distribution="http://${dist.base}/html.nbm">
       <license file="${license.file}"/>
Index: httpserver/build.xml
===================================================================
RCS file: /cvs/httpserver/build.xml,v
retrieving revision 1.25
diff -u -t -r1.25 build.xml
--- httpserver/build.xml	24 Sep 2001 12:13:27 -0000	1.25
+++ httpserver/build.xml	1 Oct 2001 19:01:12 -0000
@@ -68,7 +68,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="httpserver.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/httpserver.jar"
              homepage="http://httpserver.${hompage.base}/"
              distribution="http://${dist.base}/httpserver.nbm">
       <license file="${license.file}"/>
Index: i18n/build.xml
===================================================================
RCS file: /cvs/i18n/build.xml,v
retrieving revision 1.31
diff -u -t -r1.31 build.xml
--- i18n/build.xml	24 Sep 2001 12:13:28 -0000	1.31
+++ i18n/build.xml	1 Oct 2001 19:01:12 -0000
@@ -85,13 +85,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="i18n.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/i18n.jar"
              homepage="http://i18n.${homepage.base}/"
              distribution="http://${dist.base}/i18n.nbm">
       <license file="${license.file}"/>
-      <description>
-        Internationalization wizard.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: icebrowser/build.xml
===================================================================
RCS file: /cvs/icebrowser/build.xml,v
retrieving revision 1.25
diff -u -t -r1.25 build.xml
--- icebrowser/build.xml	24 Sep 2001 12:13:28 -0000	1.25
+++ icebrowser/build.xml	1 Oct 2001 19:01:12 -0000
@@ -67,7 +67,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="icebrowser.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/icebrowser.jar"
              homepage="http://icebrowser.${homepage.base}/"
              distribution="http://${dist.base}/icebrowser.nbm">
       <license file="${license.file}"/>
Index: image/build.xml
===================================================================
RCS file: /cvs/image/build.xml,v
retrieving revision 1.20
diff -u -t -r1.20 build.xml
--- image/build.xml	24 Sep 2001 12:13:28 -0000	1.20
+++ image/build.xml	1 Oct 2001 19:01:12 -0000
@@ -54,13 +54,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="image.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/image.jar"
              homepage="http://image.${homepage.base}/"
              distribution="http://${dist.base}/image.nbm">
       <license file="${license.file}"/>
-      <description>
-        Provides support for viewing images such as GIFs and JPEGs in the IDE.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: innertesters/build.xml
===================================================================
RCS file: /cvs/innertesters/build.xml,v
retrieving revision 1.14
diff -u -t -r1.14 build.xml
--- innertesters/build.xml	24 Sep 2001 12:13:28 -0000	1.14
+++ innertesters/build.xml	1 Oct 2001 19:01:12 -0000
@@ -61,7 +61,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="innertesters.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/innertesters.jar"
              homepage="http://innertesters.${homepage.base}/"
              distribution="http://${dist.base}/innertesters.nbm">
       <license file="${license.file}"/>
Index: itutor/build.xml
===================================================================
RCS file: /cvs/itutor/build.xml,v
retrieving revision 1.2
diff -u -t -r1.2 build.xml
--- itutor/build.xml	31 Jan 2001 15:22:49 -0000	1.2
+++ itutor/build.xml	1 Oct 2001 19:01:12 -0000
@@ -50,13 +50,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="itutor.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             manifest="netbeans/modules/itutor.jar"
              homepage="http://itutor.netbeans.org/"
              distribution="http://www.netbeans.org/download/nbms/40/itutor.nbm">
       <license file="../nbbuild/standard-nbm-license.txt"/>
-      <description>
-        Editing of plain text files.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
     </makenbm>
   </target>
Index: j2eeserver/build.xml
===================================================================
RCS file: /cvs/j2eeserver/build.xml,v
retrieving revision 1.9
diff -u -t -r1.9 build.xml
--- j2eeserver/build.xml	23 Aug 2001 07:59:26 -0000	1.9
+++ j2eeserver/build.xml	1 Oct 2001 19:01:12 -0000
@@ -18,6 +18,9 @@
   <property name="binroot" location="../../nbextra"/>
   <property name="nbext" location="${nbroot}/nbbuild"/>
   <property name="nbm_alias" value="nb_ide"/>
+  <property name="homepage.base" value="netbeans.org"/>
+  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
+  <property name="license.file" value="../nbbuild/standard-nbm-license.txt"/>
 
   <taskdef name="jhindexer" classname="org.netbeans.nbbuild.JHIndexer" classpath="${nbext}/nbantext.jar"/>
   <taskdef classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbext}/nbantext.jar" name="locjar"/>
@@ -32,7 +35,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="j2eeserver.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/autoload/j2eeserver.jar"
              homepage="http://${homepage.base}/j2eeserver.html"
              distribution="${dist.base}/j2eeserver.nbm">
       <license file="${license.file}" />
@@ -126,7 +129,7 @@
     <copy file="manifest.mf" tofile="manifest-subst.mf"
           filtering="on"/>
 
-    <locjar compress="false" jarfile="netbeans/modules/j2eeserver.jar" manifest="manifest-subst.mf">
+    <locjar compress="false" jarfile="netbeans/modules/autoload/j2eeserver.jar" manifest="manifest-subst.mf">
       <locale name="ja"/>
       <branding name="f4j"/>
       <branding name="f4j_ce"/>
Index: jarpackager/build.xml
===================================================================
RCS file: /cvs/jarpackager/build.xml,v
retrieving revision 1.24
diff -u -t -r1.24 build.xml
--- jarpackager/build.xml	24 Sep 2001 12:13:29 -0000	1.24
+++ jarpackager/build.xml	1 Oct 2001 19:01:12 -0000
@@ -56,14 +56,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="jarpackager.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/jarpackager.jar"
              homepage="http://jarpackager.${homepage.base}/"
              distribution="http://${dist.base}/jarpackager.nbm">
       <license file="${license.file}"/>
-      <description>
-        JAR Packager for interactive creation and maintenance of JAR
-        files.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: jasm/Manifest.mf
===================================================================
RCS file: /cvs/jasm/Manifest.mf,v
retrieving revision 1.6
diff -u -t -r1.6 Manifest.mf
--- jasm/Manifest.mf	30 Apr 2001 08:11:00 -0000	1.6
+++ jasm/Manifest.mf	1 Oct 2001 19:01:12 -0000
@@ -1,5 +1,6 @@
 OpenIDE-Module: org.netbeans.modules.jasm/1
 OpenIDE-Module-Name: JASM
+OpenIDE-Module-Long-Description: Java assembler/disassembler module.
 OpenIDE-Module-Display-Category: Java
 OpenIDE-Module-Module-Dependencies: org.netbeans.modules.editor/1 > 1.4
 OpenIDE-Module-Install: org/netbeans/modules/jasm/JASMModule.class
Index: jasm/build.xml
===================================================================
RCS file: /cvs/jasm/build.xml,v
retrieving revision 1.7
diff -u -t -r1.7 build.xml
--- jasm/build.xml	24 Sep 2001 12:13:29 -0000	1.7
+++ jasm/build.xml	1 Oct 2001 19:01:12 -0000
@@ -58,14 +58,11 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="jasm.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/jasm.jar"
              homepage="http://jasm.netbeans.org/"
              distribution="http://${dist.base}/jasm.nbm">
       <license file="${license.file}"/>
       <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
-      <description>
-      Java assembler/disassembler module.
-      </description>
     </makenbm>
   </target>
 
Index: java/build.xml
===================================================================
RCS file: /cvs/java/build.xml,v
retrieving revision 1.30
diff -u -t -r1.30 build.xml
--- java/build.xml	24 Sep 2001 12:13:29 -0000	1.30
+++ java/build.xml	1 Oct 2001 19:01:13 -0000
@@ -67,13 +67,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="java.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/java.jar"
              homepage="http://java.${homepage.base}/"
              distribution="http://${dist.base}/java.nbm">
       <license file="${license.file}"/>
-      <description>
-        Basic ability to edit Java source files.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: java3d/build.xml
===================================================================
RCS file: /cvs/java3d/build.xml,v
retrieving revision 1.2
diff -u -t -r1.2 build.xml
--- java3d/build.xml	19 Sep 2001 16:41:02 -0000	1.2
+++ java3d/build.xml	1 Oct 2001 19:01:13 -0000
@@ -60,13 +60,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="java3d.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/java3d.jar"
              homepage="http://java3D.${homepage.base}/"
              distribution="http://{dist.base}/java3d.nbm">
       <license file="${license.file}"/>
-      <description>
-        Java 3D
-      </description>
     </makenbm>
   </target>
 
Index: javacvs/build.xml
===================================================================
RCS file: /cvs/javacvs/build.xml,v
retrieving revision 1.19
diff -u -t -r1.19 build.xml
--- javacvs/build.xml	24 Sep 2001 12:13:29 -0000	1.19
+++ javacvs/build.xml	1 Oct 2001 19:01:13 -0000
@@ -62,11 +62,8 @@
   </target>
 
   <target depends="netbeans" name="nbm">
-    <makenbm distribution="http://{dist.base}/javacvs.nbm" file="javacvs.nbm" homepage="http://javacvs.${homepage.base}/" manifest="manifest-subst.mf" topdir=".">
+    <makenbm distribution="http://{dist.base}/javacvs.nbm" file="javacvs.nbm" homepage="http://javacvs.${homepage.base}/" module="netbeans/modules/javacvs.jar" topdir=".">
       <license file="${license.file}"/>
-      <description>
-        cvs filesystem that uses it&apos;s own java cvs library.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: javadoc/build.xml
===================================================================
RCS file: /cvs/javadoc/build.xml,v
retrieving revision 1.22
diff -u -t -r1.22 build.xml
--- javadoc/build.xml	24 Sep 2001 12:13:29 -0000	1.22
+++ javadoc/build.xml	1 Oct 2001 19:01:13 -0000
@@ -59,13 +59,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="javadoc.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/javadoc.jar"
              homepage="http://javadoc.${homepage.base}/"
              distribution="http://${dist.base}/javadoc.nbm">
       <license file="${license.file}"/>
-      <description>
-        View and generate Javadoc class documentation.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: jini/build.xml
===================================================================
RCS file: /cvs/jini/build.xml,v
retrieving revision 1.19
diff -u -t -r1.19 build.xml
--- jini/build.xml	24 Sep 2001 12:13:29 -0000	1.19
+++ jini/build.xml	1 Oct 2001 19:01:13 -0000
@@ -81,16 +81,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="jini.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/jini.jar"
              homepage="http://jini.${homepage.base}/"
              distribution="http://${dist.base}/jini.nbm">
       <license file="${license.file}"/>
-      <description>
-        Provides support for development of Jini applications. It requires
-        jini-core.jar, jini-ext.jar, and sun-util.jar in your classpath. These JARs
-        are part of the Jini Technology Starter Kit (see http://www.sun.com/jini/).
-        You may add them to your NetBeans or JRE lib/ext/ directories.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
     </makenbm>
   </target>
Index: jini/manifest.mf
===================================================================
RCS file: /cvs/jini/manifest.mf,v
retrieving revision 1.33
diff -u -t -r1.33 manifest.mf
--- jini/manifest.mf	15 Aug 2001 15:17:38 -0000	1.33
+++ jini/manifest.mf	1 Oct 2001 19:01:27 -0000
@@ -1,5 +1,9 @@
 OpenIDE-Module: org.netbeans.modules.jini/1
 OpenIDE-Module-Name: Jini
+OpenIDE-Module-Long-Description: Provides support for development of Jini applications. It requires
+  jini-core.jar, jini-ext.jar, and sun-util.jar in your classpath. These JARs
+  are part of the Jini Technology Starter Kit (see http://www.sun.com/jini/).
+  You may add them to your NetBeans or JRE lib/ext/ directories.
 OpenIDE-Module-Install: org/netbeans/modules/jini/JiniModule.class
 OpenIDE-Module-IDE-Dependencies: IDE/1 > 1.2
 OpenIDE-Module-Module-Dependencies: org.netbeans.modules.httpserver/1 > 1.2
Index: jndi/build.xml
===================================================================
RCS file: /cvs/jndi/build.xml,v
retrieving revision 1.27
diff -u -t -r1.27 build.xml
--- jndi/build.xml	24 Sep 2001 12:13:30 -0000	1.27
+++ jndi/build.xml	1 Oct 2001 19:01:27 -0000
@@ -71,13 +71,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="jndi.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/jndi.jar"
              homepage="http://http://${homepage.base}/jndi.html"
              distribution="${dist.base}/jndi.nbm">
       <license file="${license.file}"/>
-      <description>
-        JNDI module
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: junit/build.xml
===================================================================
RCS file: /cvs/junit/build.xml,v
retrieving revision 1.8
diff -u -t -r1.8 build.xml
--- junit/build.xml	20 Sep 2001 09:43:54 -0000	1.8
+++ junit/build.xml	1 Oct 2001 19:01:27 -0000
@@ -67,7 +67,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="junit.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/junit.jar"
              homepage="http://junit.netbeans.org/"
              distribution="http://www.netbeans.org/download/nbms/40/junit.nbm">
       <license name="junit-license.txt">
Index: logger/build.xml
===================================================================
RCS file: /cvs/logger/build.xml,v
retrieving revision 1.10
diff -u -t -r1.10 build.xml
--- logger/build.xml	23 Aug 2001 07:59:28 -0000	1.10
+++ logger/build.xml	1 Oct 2001 19:01:27 -0000
@@ -78,13 +78,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="logger.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/loggerModule.jar"
              homepage="http://logger.${homepage.base}/"
              distribution="http://${dist.base}/logger.nbm">
       <license file="${license.file}"/>
-      <description>
-        The TraceLogger library and module.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: makefile/build.xml
===================================================================
RCS file: /cvs/makefile/build.xml,v
retrieving revision 1.10
diff -u -t -r1.10 build.xml
--- makefile/build.xml	24 Sep 2001 12:13:30 -0000	1.10
+++ makefile/build.xml	1 Oct 2001 19:01:27 -0000
@@ -56,13 +56,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="makefile.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/makefile.jar"
              homepage="http://makefile.${homepage.base}/"
              distribution="http://${dist.base}/makefile.nbm">
       <license file="${license.file}"/>
-      <description>
-        Basic support for running Makefiles from inside the IDE.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
     </makenbm>
   </target>
Index: makefile/manifest.mf
===================================================================
RCS file: /cvs/makefile/manifest.mf,v
retrieving revision 1.24
diff -u -t -r1.24 manifest.mf
--- makefile/manifest.mf	1 Mar 2001 13:10:57 -0000	1.24
+++ makefile/manifest.mf	1 Oct 2001 19:01:27 -0000
@@ -1,5 +1,6 @@
 OpenIDE-Module: org.netbeans.modules.makefile/1
 OpenIDE-Module-Name: Makefiles
+OpenIDE-Module-Long-Description: Basic support for running Makefiles from inside the IDE.
 OpenIDE-Module-Description: org.netbeans.modules.makefile.docs.makefileHelpSet
 OpenIDE-Module-Specification-Version: 1.4
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
Index: multicompile/build.xml
===================================================================
RCS file: /cvs/multicompile/build.xml,v
retrieving revision 1.11
diff -u -t -r1.11 build.xml
--- multicompile/build.xml	24 Sep 2001 12:13:30 -0000	1.11
+++ multicompile/build.xml	1 Oct 2001 19:01:27 -0000
@@ -50,14 +50,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="multicompile.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/multicompile.jar"
              homepage="http://multicompile.${homepage.base}/"
              distribution="http://${dist.base}/multicompile.nbm">
       <license file="${license.file}"/>
-      <description>
-        Experimental support for user-defined object types and
-        special compilation procedures.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
     </makenbm>
   </target>
Index: multicompile/manifest.mf
===================================================================
RCS file: /cvs/multicompile/manifest.mf,v
retrieving revision 1.6
diff -u -t -r1.6 manifest.mf
--- multicompile/manifest.mf	1 Mar 2001 13:10:58 -0000	1.6
+++ multicompile/manifest.mf	1 Oct 2001 19:01:27 -0000
@@ -1,6 +1,8 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.multicompile
 OpenIDE-Module-Name: Multi-Stage Compilation
+OpenIDE-Module-Long-Description: Experimental support for user-defined object types and
+  special compilation procedures.
 OpenIDE-Module-Specification-Version: 0.5
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java,v
retrieving revision 1.5
diff -u -t -r1.5 MakeListOfNBM.java
--- nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java	25 Sep 2001 09:03:36 -0000	1.5
+++ nbbuild/antsrc/org/netbeans/nbbuild/MakeListOfNBM.java	1 Oct 2001 19:01:27 -0000
@@ -62,23 +62,11 @@
                 } catch (Exception ex) {
                     throw new BuildException( "Can't get fileset of NBM", ex, location );
                 }
-                File manifest = null;
+                Attributes attr;
                 try {
-                    manifest = (File)nbms[i].getClass().getMethod("getManifest",null).invoke(nbms[i],null);
+                    attr = (Attributes)nbms[i].getClass().getMethod("getAttributes",null).invoke(nbms[i],null);
                 } catch (Exception ex) {
-                    throw new BuildException( "Can't get name of manifest file", ex, location );
-                }
-                
-                Attributes attr = null;
-                try {
-                    InputStream manifestStream = new FileInputStream (manifest);
-                    try {
-                        attr = new Manifest (manifestStream).getMainAttributes ();
-                    } finally {
-                        manifestStream.close ();
-                    }
-                } catch (IOException e) {
-                    throw new BuildException ("exception when reading manifest " + manifest, e, location);
+                    throw new BuildException( "Can't get manifest attributes", ex, location );
                 }
                 
                 String codenamebase = attr.getValue ("OpenIDE-Module");
@@ -101,6 +89,7 @@
                 
                 String include[] = ds.getIncludedFiles();
                 for( int j=0; j < include.length; j++ ){
+                    if (include[j].equals("Info/info.xml")) continue;
                     try {
                         File inFile = new File( ds.getBasedir(), include[j] );
                         FileInputStream inFileStream = new FileInputStream( inFile );
@@ -109,8 +98,10 @@
                         inFileStream.read( array );
                         inFileStream.close();
                         crc.update( array );
-
-                        version.addFileWithCrc( inFile.getAbsolutePath().substring((ds.getBasedir().getAbsolutePath() + "/netbeans/").length() ), Long.toString( crc.getValue() ) );
+                        String abs = inFile.getAbsolutePath();
+                        String prefix = ds.getBasedir().getAbsolutePath() + "/netbeans/";
+                        if (! abs.startsWith(prefix)) throw new IllegalStateException(abs);
+                        version.addFileWithCrc(abs.substring(prefix.length()), Long.toString( crc.getValue() ) );
 //                        log( "File : " + inFile.getAbsolutePath().substring((ds.getBasedir().getAbsolutePath() + "/netbeans/").length() ) + " has CRC " + crc.getValue() );
                     } catch (IOException ex) {
                         log ( ex.toString() );
Index: nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java
===================================================================
RCS file: /cvs/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java,v
retrieving revision 1.14
diff -u -t -r1.14 MakeNBM.java
--- nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java	23 Aug 2001 09:27:17 -0000	1.14
+++ nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java	1 Oct 2001 19:01:27 -0000
@@ -7,7 +7,7 @@
  * http://www.sun.com/
  * 
  * The Original Code is NetBeans. The Initial Developer of the Original
- * Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
+ * Code is Sun Microsystems, Inc. Portions Copyright 1997-2001 Sun
  * Microsystems, Inc. All Rights Reserved.
  */
 
@@ -16,6 +16,7 @@
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
+import java.util.zip.*;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Location;
@@ -61,7 +62,7 @@
                         is.close ();
                     }
                 } catch (IOException ioe) {
-                    throw new BuildException ("Exception reading blurb from " + file, ioe, getLocation1 ());
+                    throw new BuildException ("Exception reading blurb from " + file, ioe, getLocation ());
                 }
             }
         }
@@ -122,27 +123,9 @@
             }
         }
         public String getText () {
-            if (Boolean.valueOf (getProject ().getProperty ("makenbm.nocdata")).booleanValue ()) {
-                int max = text.length ();
-                StringBuffer text2 = new StringBuffer ((int) (max * 1.1 + 1));
-                for (int i = 0; i < max; i++) {
-                    char c = text.charAt (i);
-                    switch (c) {
-                    case '<':
-                        text2.append ("&lt;");
-                        break;
-                    case '>':
-                        text2.append ("&gt;");
-                        break;
-                    case '&':
-                        text2.append ("&amp;");
-                        break;
-                    default:
-                        text2.append (c);
-                        break;
-                    }
-                }
-                return text2.toString ();
+            String nocdata = getProject().getProperty("makenbm.nocdata");
+            if (nocdata != null && Project.toBoolean(nocdata)) {
+                return xmlEscape(text.toString());
             } else {
                 return "<![CDATA[" + text.toString () + "]]>";
             }
@@ -164,14 +147,33 @@
             // Default for the name too, as a convenience.
             if (name == null) name = file.getName ();
         }
-        // Javac 1.2 workaround, maybe:
-        private Location getLocation1 () {
-            return getLocation0 ();
-        }
     }
-    // Javac 1.2 workaround:
-    private Location getLocation0 () {
-        return location;
+    
+    // Similar to org.openide.xml.XMLUtil methods.
+    private static String xmlEscape(String s) {
+        int max = s.length();
+        StringBuffer s2 = new StringBuffer((int)(max * 1.1 + 1));
+        for (int i = 0; i < max; i++) {
+            char c = s.charAt(i);
+            switch (c) {
+                case '<':
+                    s2.append("&lt;");
+                    break;
+                case '>':
+                    s2.append("&gt;");
+                    break;
+                case '&':
+                    s2.append("&amp;");
+                    break;
+                case '"':
+                    s2.append("&quot;");
+                    break;
+                default:
+                    s2.append(c);
+                    break;
+            }
+        }
+        return s2.toString();
     }
 
     /** <samp>&lt;signature&gt;</samp> subelement for signing the NBM. */
@@ -198,12 +200,14 @@
     private File file = null;
     private File topdir = null;
     private File manifest = null;
+    /** see #13850 for explanation */
+    private File module = null;
     private String homepage = null;
     private String distribution = null;
     private Blurb license = null;
     private Blurb description = null;
     private Signature signature = null;
-    long mostRecentInput = 0L;
+    private long mostRecentInput = 0L;
 
     /** Name of resulting NBM file. */
     public void setFile (File file) {
@@ -217,11 +221,29 @@
     public void setTopdir (File topdir) {
         this.topdir = topdir;
     }
-    /** Module manifest needed for versioning. */
+    /** Module manifest needed for versioning.
+     * @deprecated Use {@link #setModule} instead.
+     */
     public void setManifest (File manifest) {
         this.manifest = manifest;
         long lmod = manifest.lastModified ();
         if (lmod > mostRecentInput) mostRecentInput = lmod;
+        log(getLocation() + "The 'manifest' attr on <makenbm> is deprecated, please use 'module' instead", Project.MSG_WARN);
+    }
+    /** Module JAR needed for generating the info file.
+     * Information may be gotten either from its manifest,
+     * or if it declares OpenIDE-Module-Localizing-Bundle in its
+     * manifest, from that bundle.
+     * The base locale variant, if any, is also checked if necessary
+     * for the named bundle.
+     * Currently no other locale variants of the module are examined;
+     * the information is available but there is no published specification
+     * of what the resulting variant NBMs (or variant information within
+     * the NBM) should look like.
+     */
+    public void setModule(File module) {
+        this.module = module;
+        // mostRecentInput updated below...
     }
     /** URL to a home page describing the module. */
     public void setHomepage (String homepage) {
@@ -235,6 +257,7 @@
         return (license = new Blurb ());
     }
     public Blurb createDescription () {
+        log(getLocation() + "The <description> subelement in <makenbm> is deprecated except for emergency patches, please ensure your module has an OpenIDE-Module-Long-Description instead", Project.MSG_WARN);
         return (description = new Blurb ());
     }
     public Signature createSignature () {
@@ -244,12 +267,70 @@
     public void execute () throws BuildException {
         if (file == null)
             throw new BuildException ("must set file for makenbm", location);
-        if (manifest == null)
-            throw new BuildException ("must set manifest for makenbm", location);
+        if (manifest == null && module == null)
+            throw new BuildException ("must set module for makenbm", location);
+        if (manifest != null && module != null)
+            throw new BuildException("cannot set both manifest and module for makenbm", location);
         // Will create a file Info/info.xml to be stored alongside netbeans/ contents.
         File infodir = new File (topdir, "Info");
         infodir.mkdirs ();
         File infofile = new File (infodir, "info.xml");
+        Attributes attr = null;
+        if (module != null) {
+            // The normal case; read attributes from its manifest and maybe bundle.
+            long mMod = module.lastModified();
+            if (mostRecentInput < mMod) mostRecentInput = mMod;
+            try {
+                JarFile modulejar = new JarFile(module);
+                try {
+                    attr = modulejar.getManifest().getMainAttributes();
+                    String bundlename = attr.getValue("OpenIDE-Module-Localizing-Bundle");
+                    if (bundlename != null) {
+                        Properties p = new Properties();
+                        ZipEntry bundleentry = modulejar.getEntry(bundlename);
+                        if (bundleentry != null) {
+                            InputStream is = modulejar.getInputStream(bundleentry);
+                            try {
+                                p.load(is);
+                            } finally {
+                                is.close();
+                            }
+                        } else {
+                            // Not found in main JAR, check locale variant JAR.
+                            File variant = new File(new File(module.getParentFile(), "locale"), module.getName());
+                            if (! variant.isFile()) throw new BuildException(bundlename + " not found in " + module, location);
+                            long vmMod = variant.lastModified();
+                            if (mostRecentInput < vmMod) mostRecentInput = vmMod;
+                            ZipFile variantjar = new ZipFile(variant);
+                            try {
+                                bundleentry = variantjar.getEntry(bundlename);
+                                if (bundleentry == null) throw new BuildException(bundlename + " not found in " + module + " nor in " + variant, location);
+                                InputStream is = variantjar.getInputStream(bundleentry);
+                                try {
+                                    p.load(is);
+                                } finally {
+                                    is.close();
+                                }
+                            } finally {
+                                variantjar.close();
+                            }
+                        }
+                        // Now pick up attributes from the bundle.
+                        Iterator it = p.entrySet().iterator();
+                        while (it.hasNext()) {
+                            Map.Entry entry = (Map.Entry)it.next();
+                            String name = (String)entry.getKey();
+                            if (! name.startsWith("OpenIDE-Module-")) continue;
+                            attr.putValue(name, (String)entry.getValue());
+                        }
+                    } // else all loc attrs in main manifest, OK
+                } finally {
+                    modulejar.close();
+                }
+            } catch (IOException ioe) {
+                throw new BuildException("exception while reading " + module, ioe, location);
+            }
+        } // else we will read attr later if info file is out of date
         boolean skipInfo = false;
         if (infofile.exists ()) {
             // Check for up-to-date w.r.t. manifest and maybe license file.
@@ -259,25 +340,25 @@
         }
         if (! skipInfo) {
             log ("Creating NBM info file " + infofile);
-            Attributes attr;
-            // Read module manifest for main attributes.
-            try {
-                InputStream manifestStream = new FileInputStream (manifest);
-                try {
-                    attr = new Manifest (manifestStream).getMainAttributes ();
-                } finally {
-                    manifestStream.close ();
-                }
-            } catch (IOException e) {
-                throw new BuildException ("exception when reading manifest " + manifest, e, location);
-            }
+            if (manifest != null) {
+                // Read module manifest for main attributes.
+                try {
+                    InputStream manifestStream = new FileInputStream (manifest);
+                    try {
+                        attr = new Manifest (manifestStream).getMainAttributes ();
+                    } finally {
+                        manifestStream.close ();
+                    }
+                } catch (IOException e) {
+                    throw new BuildException ("exception when reading manifest " + manifest, e, location);
+                }
+            } // else we read attr before
             try {
                 OutputStream infoStream = new FileOutputStream (infofile);
                 try {
-                    PrintStream ps = new PrintStream (infoStream);
+                    PrintWriter ps = new PrintWriter(new OutputStreamWriter(infoStream, "UTF-8"));
                     // Begin writing XML.
-                    ps.println ("<?xml version='1.0'?>");
-                    ps.println ();
+                    ps.println ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
                     String codenamebase = attr.getValue ("OpenIDE-Module");
                     if (codenamebase == null)
                         throw new BuildException ("invalid manifest, does not contain OpenIDE-Module", location);
@@ -286,15 +367,15 @@
                     if (idx != -1) codenamebase = codenamebase.substring (0, idx);
                     ps.println ("<module codenamebase=\"" + codenamebase + "\"");
                     if (homepage != null)
-                        ps.println ("        homepage=\"" + homepage + "\"");
+                        ps.println ("        homepage=\"" + xmlEscape(homepage) + "\"");
                     if (distribution != null)
-                        ps.println ("        distribution=\"" + distribution + "\"");
+                        ps.println ("        distribution=\"" + xmlEscape(distribution) + "\"");
                     // Here we only write a name for the license.
                     if (license != null) {
                         String name = license.getName ();
                         if (name == null)
                             throw new BuildException ("Every license must have a name or file attribute", location);
-                        ps.println ("        license=\"" + name + "\"");
+                        ps.println ("        license=\"" + xmlEscape(name) + "\"");
                     }
                     ps.println ("        downloadsize=\"0\"");
                     ps.println (">");
@@ -302,38 +383,35 @@
                         ps.print ("  <description>");
                         ps.print (description.getText ());
                         ps.println ("</description>");
-                        /* Not needed since Auto Update now reads this attribute directly:
-                    } else {
-                        // Automatically inherit description from manifest.
-                        String longDesc = attr.getValue ("OpenIDE-Module-Long-Description");
-                        if (longDesc != null) {
-                            ps.print ("  <description>");
-                            ps.print (longDesc);
-                            ps.println ("</description>");
-                        }
-                        */
                     }
                     // Write manifest attributes.
                     ps.print ("  <manifest ");
                     boolean firstline = true;
                     Iterator it = attr.entrySet ().iterator ();
                     while (it.hasNext ()) {
+                        Map.Entry entry = (Map.Entry) it.next ();
+                        String name = ((Attributes.Name)entry.getKey()).toString();
+                        // Ignore irrelevant attributes:
+                        if (! name.startsWith("OpenIDE-Module")) continue;
+                        if (name.equals("OpenIDE-Module-Localizing-Bundle")) continue;
+                        if (name.equals("OpenIDE-Module-Install")) continue;
+                        if (name.equals("OpenIDE-Module-Layer")) continue;
+                        if (name.equals("OpenIDE-Module-Description")) continue;
                         if (firstline)
                             firstline = false;
                         else
                             ps.print ("            ");
-                        Map.Entry entry = (Map.Entry) it.next ();
-                        // [PENDING] ought to escape the value for characters in ["&<>]
-                        ps.println (entry.getKey () + "=\"" + entry.getValue () + "\"");
+                        ps.println(name + "=\"" + xmlEscape((String)entry.getValue()) + "\"");
                     }
                     ps.println ("  />");
                     // Maybe write out license text.
                     if (license != null) {
-                        ps.print ("  <license name=\"" + license.getName () + "\">");
+                        ps.print ("  <license name=\"" + xmlEscape(license.getName ()) + "\">");
                         ps.print (license.getText ());
                         ps.println ("</license>");
                     }
                     ps.println ("</module>");
+                    ps.flush();
                 } finally {
                     infoStream.close ();
                 }
@@ -347,29 +425,7 @@
         Jar jar = (Jar) project.createTask ("jar");
         jar.setJarfile (file);
         //jar.setBasedir (topdir.getAbsolutePath ());
-//      jar.setCompress ("true");
-        try {
-            Class[] params = {Boolean.TYPE};
-            Object[] objs = {Boolean.TRUE};
-            // Trying to invoke setCompess with parameter Boolean - ANT 1.3
-            Zip.class.getDeclaredMethod("setCompress",params).invoke(jar,objs);
-            // Looks like ANT 1.3 - I hope that is ANT 1.3
-        }
-        catch (NoSuchMethodException ex)
-        {
-            // Looks like ANT 1.2 so use setCompress with String
-            Class[] params = {String.class};
-            Object[] objs = {"true"};
-            try {
-                Zip.class.getDeclaredMethod("setCompress",params).invoke(jar,objs);
-            }
-            catch (Exception ex1) {
-                throw new BuildException(ex1.fillInStackTrace());
-            }
-        }
-        catch (Exception ex) {
-            throw new BuildException(ex.fillInStackTrace());
-        }
+        jar.setCompress(true);
         //jar.createInclude ().setName ("netbeans/");
         //jar.createInclude ().setName ("Info/info.xml");
         jar.addFileset (getFileSet());
@@ -400,6 +456,8 @@
         }
     }
    
+    // Reflection access from MakeListOfNBM:
+    
     public FileSet getFileSet() {
         FileSet fs = fileset;           //makes in apperance to excludes and includes files defined in XML
         fs.setDir (topdir);
@@ -408,7 +466,23 @@
         return fs;
     }
 
-    public File getManifest() {
-        return manifest;
+    public Attributes getAttributes() throws IOException {
+        if (manifest != null) {
+            InputStream is = new FileInputStream(manifest);
+            try {
+                return new Manifest(is).getMainAttributes();
+            } finally {
+                is.close();
+            }
+        } else if (module != null) {
+            JarFile jar = new JarFile(module);
+            try {
+                return jar.getManifest().getMainAttributes();
+            } finally {
+                jar.close();
+            }
+        } else {
+            throw new IOException(location + "must give either 'manifest' or 'module' on <makenbm>");
+        }
     }
 }
Index: nbbuild/www/ant-extending.html
===================================================================
RCS file: /cvs/nbbuild/www/ant-extending.html,v
retrieving revision 1.11
diff -u -t -r1.11 ant-extending.html
--- nbbuild/www/ant-extending.html	24 Jun 2001 09:51:16 -0000	1.11
+++ nbbuild/www/ant-extending.html	1 Oct 2001 19:01:27 -0000
@@ -260,7 +260,7 @@
 &lt;target name="nbm" depends="netbeans"&gt;
   &lt;makenbm file="mymodule.nbm"
            topdir="."
-           manifest="manifest-subst.mf"
+           module="netbeans/modules/mymodule.jar"
            homepage="http://mymodule.netbeans.org/"
            distribution="http://www.netbeans.org/download/nbms/40/mymodule.nbm"&gt;
     &lt;license file="../nbbuild/standard-nbm-license.txt"/&gt;
@@ -327,33 +327,32 @@
 Info
 </PRE>
 
-<H3><CODE>test</CODE> Target</H3>
+<H3><CODE>reload</CODE> Target</H3>
 
 Developers may wish to use the API Support module to test their module
 as a reloadable JAR file. To this end, it can be useful to have a
-<CODE>test</CODE> target that creates a special version of the module
+<CODE>reload</CODE> target that creates a special version of the module
 for testing, including all relevant extensions and documentation in
 one JAR to make sure it is reloadable. The API Support includes a
 special Ant task to do the final reloading. For example:
 
 <PRE>
-&lt;target name="test" depends="compile,javahelp"&gt;
-  &lt;mkdir dir="test"/&gt;
+&lt;target name="reload" depends="compile,javahelp"&gt;
+  &lt;mkdir dir="reload"/&gt;
   &lt;filter token="BUILD_NUMBER_SUBST" value="testing"/&gt;
   &lt;copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/&gt;
-  &lt;jar jarfile="test/some-module.jar"
+  &lt;jar jarfile="reload/some-module.jar"
        manifest="manifest-subst.mf"
        compress="false"&gt;
     &lt;fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/&gt;
     &lt;fileset dir="javahelp" excludesfile="../nbbuild/standard-jar-excludes.txt"/&gt;
     &lt;fileset src="release/modules/ext/some-extension.jar" excludes="META-INF/MANIFEST.MF"/&gt;
   &lt;/jar&gt;
-  &lt;taskdef name="nbinstall" classname="org.netbeans.modules.apisupport.ant.InstallModuleTask"/&gt;
-  &lt;nbinstall module="test/some-module.jar" action="reinstall"/&gt;
+  &lt;nbinstaller module="reload/some-module.jar" action="reinstall"/&gt;
 &lt;/target&gt;
 </PRE>
 
-And do not forget to add this <SAMP>test</SAMP> directory to the
+And do not forget to add this <SAMP>reload</SAMP> directory to the
 <CODE>clean</CODE> target and the <SAMP>.cvsignore</SAMP> file.
 
 <H2>Documentation for NetBeans-Specific Tasks</H2>
Index: objectbrowser/build.xml
===================================================================
RCS file: /cvs/objectbrowser/build.xml,v
retrieving revision 1.25
diff -u -t -r1.25 build.xml
--- objectbrowser/build.xml	26 Sep 2001 14:09:16 -0000	1.25
+++ objectbrowser/build.xml	1 Oct 2001 19:01:27 -0000
@@ -83,14 +83,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="objectbrowser.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/browser.jar"
              homepage="http://objectbrowser.${homepage.base}/"
              distribution="http://${dist.base}/objectbrowser.nbm">
       <license file="${license.file}"/>
-      <description>
-        Alternate object-oriented way of browsing classes and other
-        objects.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: openidex/build.xml
===================================================================
RCS file: /cvs/openidex/build.xml,v
retrieving revision 1.23
diff -u -t -r1.23 build.xml
--- openidex/build.xml	24 Sep 2001 12:13:31 -0000	1.23
+++ openidex/build.xml	1 Oct 2001 19:01:28 -0000
@@ -58,14 +58,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="openidex.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/autoload/openidex.jar"
              homepage="http://openidex.${homepage.base}/"
              distribution="http://${dist.base}/openidex.nbm">
       <license file="${license.file}"/>
-      <description>
-        Common utility classes needed by many other modules. API
-        extensions.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: projects/build.xml
===================================================================
RCS file: /cvs/projects/build.xml,v
retrieving revision 1.22
diff -u -t -r1.22 build.xml
--- projects/build.xml	24 Sep 2001 12:13:31 -0000	1.22
+++ projects/build.xml	1 Oct 2001 19:01:28 -0000
@@ -59,13 +59,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="projects.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/projects.jar"
              homepage="http://projects.${homepage.base}/"
              distribution="http://${dist.base}/projects.nbm">
       <license file="${license.file}"/>
-      <description>
-        Handles switchable projects.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: properties/build.xml
===================================================================
RCS file: /cvs/properties/build.xml,v
retrieving revision 1.21
diff -u -t -r1.21 build.xml
--- properties/build.xml	24 Sep 2001 12:13:31 -0000	1.21
+++ properties/build.xml	1 Oct 2001 19:01:28 -0000
@@ -77,14 +77,10 @@
     <!-- Make one NBM with both module JARs. -->
     <makenbm file="properties.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/properties.jar"
              homepage="http://properties.${homepage.base}/"
              distribution="http://${dist.base}/properties.nbm">
       <license file="${license.file}"/>
-      <description>
-        Editing of properties files (resource bundles), including a
-        table-oriented view with keys and locales.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: remotefs/build.xml
===================================================================
RCS file: /cvs/remotefs/build.xml,v
retrieving revision 1.8
diff -u -t -r1.8 build.xml
--- remotefs/build.xml	24 Sep 2001 12:13:31 -0000	1.8
+++ remotefs/build.xml	1 Oct 2001 19:01:28 -0000
@@ -50,13 +50,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="remotefs.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/remotefs.jar"
              homepage="http://remotefs.${homepage.base}/"
              distribution="http://${dist.base}/remotefs.nbm">
       <license file="${license.file}"/>
-      <description>
-        Remote file system support, currently FTP.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
     </makenbm>
   </target>
Index: remotefs/manifest.mf
===================================================================
RCS file: /cvs/remotefs/manifest.mf,v
retrieving revision 1.6
diff -u -t -r1.6 manifest.mf
--- remotefs/manifest.mf	1 Mar 2001 13:11:01 -0000	1.6
+++ remotefs/manifest.mf	1 Oct 2001 19:01:28 -0000
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.remotefs/1
 OpenIDE-Module-Name: FTP FileSystem
+OpenIDE-Module-Long-Description: Remote file system support, currently FTP.
 OpenIDE-Module-Install: org/netbeans/modules/remotefs/ftpfs/FTPfsModule.class
 OpenIDE-Module-Specification-Version: 1.3
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
Index: rmi/build.xml
===================================================================
RCS file: /cvs/rmi/build.xml,v
retrieving revision 1.33
diff -u -t -r1.33 build.xml
--- rmi/build.xml	1 Oct 2001 08:53:20 -0000	1.33
+++ rmi/build.xml	1 Oct 2001 19:01:28 -0000
@@ -94,13 +94,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="rmi.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/rmi.jar"
              homepage="http://rmi.${homepage.base}"
              distribution="${dist.base}/rmi.nbm">
       <license file="${license.file}"/>
-      <description>
-        RMI module
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: scripting/build.xml
===================================================================
RCS file: /cvs/scripting/build.xml,v
retrieving revision 1.31
diff -u -t -r1.31 build.xml
--- scripting/build.xml	24 Sep 2001 12:13:31 -0000	1.31
+++ scripting/build.xml	1 Oct 2001 19:01:28 -0000
@@ -94,13 +94,10 @@
     <target name="nbm" depends="jars,release">
         <makenbm file="scripting.nbm"
             topdir="."
-            manifest="manifest-subst.mf"
+            module="netbeans/modules/scripting.jar"
             homepage="http://scripting.${homepage.base}/"
             distribution="http://${dist.base}/scripting.nbm">
             <license file="${license.file}"/>
-            <description>
-                Scripting support.
-            </description>
             <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
         </makenbm>
     </target>
Index: serialversion/build.xml
===================================================================
RCS file: /cvs/serialversion/build.xml,v
retrieving revision 1.10
diff -u -t -r1.10 build.xml
--- serialversion/build.xml	24 Sep 2001 12:13:31 -0000	1.10
+++ serialversion/build.xml	1 Oct 2001 19:01:28 -0000
@@ -50,14 +50,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="serialversion.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/serialversion.jar"
              homepage="http://serialversion.${homepage.base}/"
              distribution="http://${dist.base}/serialversion.nbm">
       <license file="${license.file}"/>
-      <description>
-        Update serialization version UIDs for serializable classes.
-        Wizard-style dialog also shows you serialization-related Javadoc.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
     </makenbm>
   </target>
Index: serialversion/manifest.mf
===================================================================
RCS file: /cvs/serialversion/manifest.mf,v
retrieving revision 1.6
diff -u -t -r1.6 manifest.mf
--- serialversion/manifest.mf	1 Mar 2001 13:11:02 -0000	1.6
+++ serialversion/manifest.mf	1 Oct 2001 19:01:28 -0000
@@ -1,5 +1,7 @@
 OpenIDE-Module: org.netbeans.modules.serialversion/1
 OpenIDE-Module-Name: Serial Version UIDs
+OpenIDE-Module-Long-Description: Update serialization version UIDs for serializable classes.
+  Wizard-style dialog also shows you serialization-related Javadoc.
 OpenIDE-Module-Specification-Version: 0.5
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: spellchecker/build.xml
===================================================================
RCS file: /cvs/spellchecker/build.xml,v
retrieving revision 1.2
diff -u -t -r1.2 build.xml
--- spellchecker/build.xml	29 Aug 2001 12:16:51 -0000	1.2
+++ spellchecker/build.xml	1 Oct 2001 19:01:28 -0000
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+f<?xml version='1.0' encoding='ISO-8859-1' ?>
 <!--
                 Sun Public License Notice
 
@@ -57,13 +57,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="spellchecker.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/spellchecker.jar"
              homepage="http://spellchecker.${homepage.base}/"
              distribution="http://${dist.base}/spellchecker.nbm">
       <license file="${license.file}"/>
-      <description>
-        Provides support for viewing images such as GIFs and JPEGs in the IDE.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: sysprops/build.xml
===================================================================
RCS file: /cvs/sysprops/build.xml,v
retrieving revision 1.11
diff -u -t -r1.11 build.xml
--- sysprops/build.xml	24 Sep 2001 12:13:31 -0000	1.11
+++ sysprops/build.xml	1 Oct 2001 19:01:28 -0000
@@ -50,7 +50,7 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="sysprops.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/sysprops.jar"
              homepage="http://sysprops.${homepage.base}/"
              distribution="http://${dist.base}/sysprops.nbm">
       <license file="${license.file}"/>
Index: text/build.xml
===================================================================
RCS file: /cvs/text/build.xml,v
retrieving revision 1.16
diff -u -t -r1.16 build.xml
--- text/build.xml	24 Sep 2001 12:13:32 -0000	1.16
+++ text/build.xml	1 Oct 2001 19:01:28 -0000
@@ -54,13 +54,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="text.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/text.jar"
              homepage="http://text.${homepage.base}/"
              distribution="http://${dist.base}/text.nbm">
       <license file="${license.file}"/>
-      <description>
-        Editing of plain text files.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: usersguide/build.xml
===================================================================
RCS file: /cvs/usersguide/build.xml,v
retrieving revision 1.23
diff -u -t -r1.23 build.xml
--- usersguide/build.xml	24 Sep 2001 12:13:32 -0000	1.23
+++ usersguide/build.xml	1 Oct 2001 19:01:28 -0000
@@ -94,13 +94,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="usersguide.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/usersguide.jar"
              homepage="http://usersguide.${homepage.base}/"
              distribution="http://${dist.base}/usersguide.nbm">
       <license file="${license.file}"/>
-      <description>
-        Online help for the IDE in JavaHelp format.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: utilities/build.xml
===================================================================
RCS file: /cvs/utilities/build.xml,v
retrieving revision 1.24
diff -u -t -r1.24 build.xml
--- utilities/build.xml	24 Sep 2001 12:13:32 -0000	1.24
+++ utilities/build.xml	1 Oct 2001 19:01:28 -0000
@@ -58,14 +58,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="utilities.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/utilities.jar"
              homepage="http://utilities.${homepage.base}/"
              distribution="http://${dist.base}/utilities.nbm">
       <license file="${license.file}"/>
-      <description>
-        Various smaller features collected: groups of files, open
-        file, searching, URL bookmarks.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: vcscore/build.xml
===================================================================
RCS file: /cvs/vcscore/build.xml,v
retrieving revision 1.22
diff -u -t -r1.22 build.xml
--- vcscore/build.xml	24 Sep 2001 12:13:32 -0000	1.22
+++ vcscore/build.xml	1 Oct 2001 19:01:28 -0000
@@ -67,13 +67,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="vcscore.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/autoload/vcscore.jar"
              homepage="http://vcscore.${homepage.base}/"
              distribution="http://${dist.base}/vcscore.nbm">
       <license file="${license.file}"/>
-      <description>
-        Core version-control support.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: vcscvs/build.xml
===================================================================
RCS file: /cvs/vcscvs/build.xml,v
retrieving revision 1.26
diff -u -t -r1.26 build.xml
--- vcscvs/build.xml	24 Sep 2001 12:13:32 -0000	1.26
+++ vcscvs/build.xml	1 Oct 2001 19:01:28 -0000
@@ -57,13 +57,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="vcscvs.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/cvs.jar"
              homepage="http://vcscvs.${homepage.base}/"
              distribution="http://${dist.base}/vcscvs.nbm">
       <license file="${license.file}"/>
-      <description>
-        CVS version-control support.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
@@ -81,5 +78,3 @@
   </target>
 
 </project>
-
-
Index: vcscvs/compat/build.xml
===================================================================
RCS file: /cvs/vcscvs/compat/build.xml,v
retrieving revision 1.2
diff -u -t -r1.2 build.xml
--- vcscvs/compat/build.xml	24 Sep 2001 12:13:32 -0000	1.2
+++ vcscvs/compat/build.xml	1 Oct 2001 19:01:28 -0000
@@ -58,13 +58,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="vcscvscompat.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/cvscompat.jar"
              homepage="http://vcscvs.${homepage.base}/"
              distribution="http://${dist.base}/vcscvscompat.nbm">
       <license file="${license.file}"/>
-      <description>
-        CVS version-control support converter.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: vcsgeneric/build.xml
===================================================================
RCS file: /cvs/vcsgeneric/build.xml,v
retrieving revision 1.38
diff -u -t -r1.38 build.xml
--- vcsgeneric/build.xml	24 Sep 2001 12:13:33 -0000	1.38
+++ vcsgeneric/build.xml	1 Oct 2001 19:01:28 -0000
@@ -121,13 +121,10 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="vcsgen.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/vcsgen.jar"
              homepage="http://${homepage.base}/vcsgeneric.html"
              distribution="${dist.base}/vcsgen.nbm">
       <license file="${license.file}"/>
-      <description>
-        Vcs generic module
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: web/build.xml
===================================================================
RCS file: /cvs/web/build.xml,v
retrieving revision 1.48
diff -u -t -r1.48 build.xml
--- web/build.xml	24 Sep 2001 12:13:33 -0000	1.48
+++ web/build.xml	1 Oct 2001 19:01:28 -0000
@@ -139,7 +139,7 @@
     <delete dir="Info"/>
     <makenbm file="web-jsp.nbm"
              topdir="."
-             manifest="manifest-jsp-subst.mf"
+             module="netbeans/modules/jsp.jar"
              homepage="http://web.${homepage.base}/"
              distribution="http://${dist.base}/web-jsp.nbm">
       <license file="${license.file}"/>
@@ -152,7 +152,7 @@
     <delete dir="Info"/>
     <makenbm file="web-jsp-syntax.nbm"
              topdir="."
-           manifest="manifest-jsp-syntax-subst.mf"
+           module="netbeans/modules/jsp-syntax.jar"
            homepage="http://web.${homepage.base}/"
            distribution="http://${dist.base}/web-jsp-syntax.nbm">
       <license file="${license.file}"/>
@@ -166,7 +166,7 @@
     <delete dir="Info"/>
     <makenbm file="web-jsp-tomcat.nbm"
              topdir="."
-           manifest="manifest-jsp-tomcat-subst.mf"
+           module="netbeans/modules/jsp-tomcat.jar"
            homepage="http://web.${homepage.base}/"
            distribution="http://${dist.base}/web-jsp-tomcat.nbm">
       <license file="${license.file}"/>
Index: webl/build.xml
===================================================================
RCS file: /cvs/webl/build.xml,v
retrieving revision 1.1
diff -u -t -r1.1 build.xml
--- webl/build.xml	24 May 2001 16:07:04 -0000	1.1
+++ webl/build.xml	1 Oct 2001 19:01:28 -0000
@@ -52,14 +52,11 @@
   <target name="nbm" depends="netbeans">
     <makenbm file="webl.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/webl-module.jar"
              homepage="http://webl.${homepage.base}/"
              distribution="http://${dist.base}/webl.nbm">
       <license file="${license.file}"/>
-      <description>
-        Editing and executing WebL scripting language files.
-      </description>
-      <!--<signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>-->
+      <signature keystore="${keystore}" storepass="${storepass}" alias="nb_ide"/>
     </makenbm>
   </target>
 
Index: xml/catalog/build.xml
===================================================================
RCS file: /cvs/xml/catalog/build.xml,v
retrieving revision 1.4
diff -u -t -r1.4 build.xml
--- xml/catalog/build.xml	27 Sep 2001 12:50:35 -0000	1.4
+++ xml/catalog/build.xml	1 Oct 2001 19:01:28 -0000
@@ -80,13 +80,10 @@
     <delete dir="Info"/>
     <makenbm file="../xml-catalog.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/xml-catalog.jar"
              homepage="http://${homepage.base}/xml-catalog.html"
              distribution="${dist.base}/xml-catalog.nbm">
       <license file="${license.file}"/>
-      <description>
-        The module allows to persistently mount entity catalogs. This implementation support NetBeans native catalog and standard XML catalog. Module also offer SPI to support another catalog implementation plug in.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: xml/core/build.xml
===================================================================
RCS file: /cvs/xml/core/build.xml,v
retrieving revision 1.5
diff -u -t -r1.5 build.xml
--- xml/core/build.xml	27 Sep 2001 12:50:36 -0000	1.5
+++ xml/core/build.xml	1 Oct 2001 19:01:28 -0000
@@ -83,13 +83,10 @@
     <delete dir="Info"/>
     <makenbm file="../xml-core.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/xml-core.jar"
              homepage="http://${homepage.base}/xml-core.html"
              distribution="${dist.base}/xml-core.nbm">
       <license file="${license.file}"/>
-      <description>
-        The module is a base for all XML related modules. It recognizes XML and DTD documents, which can be opened in text editor. It supports parsing of those documents into TAX (Tree API for XML) representation. It supports synchronization among document representations. It also holds all settings shared among all XML related modules.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: xml/css/build.xml
===================================================================
RCS file: /cvs/xml/css/build.xml,v
retrieving revision 1.4
diff -u -t -r1.4 build.xml
--- xml/css/build.xml	27 Sep 2001 12:50:36 -0000	1.4
+++ xml/css/build.xml	1 Oct 2001 19:01:28 -0000
@@ -80,13 +80,10 @@
     <delete dir="Info"/>
     <makenbm file="../css.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/css.jar"
              homepage="http://${homepage.base}/css.html"
              distribution="${dist.base}/css.nbm">
       <license file="${license.file}"/>
-      <description>
-        The module provides very basic support for CSS editing. CSS documents can be opened in text editor with syntax coloring. There is a syntax check action.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: xml/tax/build.xml
===================================================================
RCS file: /cvs/xml/tax/build.xml,v
retrieving revision 1.4
diff -u -t -r1.4 build.xml
--- xml/tax/build.xml	27 Sep 2001 12:50:36 -0000	1.4
+++ xml/tax/build.xml	1 Oct 2001 19:01:28 -0000
@@ -89,13 +89,10 @@
     <delete dir="Info"/>
     <makenbm file="../xml-tax.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/autoload/xml-tax.jar"
              homepage="http://${homepage.base}/xml-tax.html"
              distribution="${dist.base}/xml-tax.nbm">
       <license file="${license.file}"/>
-      <description>
-        The module contains Tree API for XML ("TAX") library. It allows tree manipulation of XML and DTD documents structure, including event, traversal and i/o support.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: xml/text-edit/build.xml
===================================================================
RCS file: /cvs/xml/text-edit/build.xml,v
retrieving revision 1.4
diff -u -t -r1.4 build.xml
--- xml/text-edit/build.xml	27 Sep 2001 12:50:36 -0000	1.4
+++ xml/text-edit/build.xml	1 Oct 2001 19:01:28 -0000
@@ -84,13 +84,10 @@
     <delete dir="Info"/>
     <makenbm file="../xml-text-edit.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/xml-text-edit.jar"
              homepage="http://${homepage.base}/xml-text-edit.html"
              distribution="${dist.base}/xml-text-edit.nbm">
       <license file="${license.file}"/>
-      <description>
-        The module provides text editing capabilities. It adds syntax coloring, abbreviation support and simple indentation engine into text editing of XML and DTD documents.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: xml/tools/build.xml
===================================================================
RCS file: /cvs/xml/tools/build.xml,v
retrieving revision 1.4
diff -u -t -r1.4 build.xml
--- xml/tools/build.xml	27 Sep 2001 12:50:36 -0000	1.4
+++ xml/tools/build.xml	1 Oct 2001 19:01:28 -0000
@@ -84,13 +84,10 @@
     <delete dir="Info"/>
     <makenbm file="../xml-tools.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/xml-tools.jar"
              homepage="http://${homepage.base}/xml-tools.html"
              distribution="${dist.base}/xml-tools.nbm">
       <license file="${license.file}"/>
-      <description>
-        The module contains various actions, generators and tools. Especially action to generate simple DTD from XML document, or wizard which generate SAX handler implementation according to selected DTD document.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
Index: xml/tree-edit/build.xml
===================================================================
RCS file: /cvs/xml/tree-edit/build.xml,v
retrieving revision 1.5
diff -u -t -r1.5 build.xml
--- xml/tree-edit/build.xml	27 Sep 2001 12:50:36 -0000	1.5
+++ xml/tree-edit/build.xml	1 Oct 2001 19:01:28 -0000
@@ -84,13 +84,10 @@
     <delete dir="Info"/>
     <makenbm file="../xml-tree-edit.nbm"
              topdir="."
-             manifest="manifest-subst.mf"
+             module="netbeans/modules/xml-tree-edit.jar"
              homepage="http://${homepage.base}/xml-tree-edit.html"
              distribution="${dist.base}/xml-tree-edit.nbm">
       <license file="${license.file}"/>
-      <description>
-        The module provides visual editor of XML and DTD document. It guards document well-formedness. A user can set filters which can customize XML and DTD documents look.
-      </description>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>