Index: nbbuild/build.properties
===================================================================
RCS file: /cvs/nbbuild/build.properties,v
retrieving revision 1.106
diff -u -r1.106 build.properties
--- nbbuild/build.properties	8 Oct 2003 18:23:03 -0000	1.106
+++ nbbuild/build.properties	15 Oct 2003 08:34:08 -0000
@@ -61,8 +61,22 @@
 # Dist directory for L10N kits
 l10n.dist.dir=l10ndist
 
+local.config.openide29458=\
+        openide/awt, \
+        openide/actions, \
+        openide/options, \
+        openide/text, \
+        openide/windows, \
+        openide/explorer, \
+        openide/nodes, \
+        openide/modules, \
+        openide/fs, \
+        openide/dialogs, \
+        openide/util, \
+        openide/compat
+
 config.fixedmodules.platform=core, \
-        openide, \
+        ${local.config.openide29458}, \
         openide/io, \
         openide/loaders, \
         core/term, \
@@ -75,7 +89,7 @@
         text
 
 config.fixedmodules.superslim=core, \
-        openide, \
+        ${local.config.openide29458}, \
         openide/compiler, \
         libs/regexp, \
         openide/deprecated, \
@@ -319,7 +333,9 @@
 # take care of dependencies when reordering modules for javadoc
 # some javadocs must be built earlier than others for package-list
 # the javadocs will be built in the *exact* order specified here
-config.fixedmodules.javadoc=openide, \
+config.fixedmodules.javadoc=\
+        openide, \
+        ${local.config.openide29458}, \
         openide/compiler, \
         openide/execution, \
         openide/io, \
Index: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.365
diff -u -r1.365 build.xml
--- nbbuild/build.xml	9 Oct 2003 11:20:18 -0000	1.365
+++ nbbuild/build.xml	15 Oct 2003 08:34:09 -0000
@@ -147,10 +147,59 @@
   </target>
 
   <!-- How to build the IDE core: -->
-  <target name="all-openide" depends="init">
+  <target name="all-openide" depends="init,all-openide/windows,all-openide/fs,all-openide/explorer,all-openide/nodes,all-openide/text,all-openide/util,all-openide/options,all-openide/awt,all-openide/modules,all-openide/actions,all-openide/compat">
     <echo message="Building Open APIs..."/>
     <ant dir="../openide" target="netbeans"/>
   </target>
+  <!-- needed compatibility stuff -->
+  <target name="all-openide/compat" depends="all-openide/fs,all-openide/nodes,all-openide/util">
+    <echo message="Building openide/compat"/>
+    <ant dir="../openide/compat" target="netbeans"/>
+  </target>
+  <target name="all-openide/util" depends="init">
+    <echo message="Building openide/util"/>
+    <ant dir="../openide/util" target="netbeans"/>
+  </target>
+  <target name="all-openide/fs" depends="all-openide/util">
+    <echo message="Building openide/fs"/>
+    <ant dir="../openide/fs" target="netbeans"/>
+  </target>
+  <target name="all-openide/modules" depends="all-openide/util">
+    <echo message="Building openide/modules"/>
+    <ant dir="../openide/modules" target="netbeans"/>
+  </target>
+  <target name="all-openide/awt" depends="all-openide/util">
+    <echo message="Building openide/awt"/>
+    <ant dir="../openide/awt" target="netbeans"/>
+  </target>
+  <target name="all-openide/options" depends="all-openide/util">
+    <echo message="Building openide/options"/>
+    <ant dir="../openide/options" target="netbeans"/>
+  </target>
+  <target name="all-openide/dialogs" depends="all-openide/util,all-openide/awt">
+    <echo message="Building openide/dialogs"/>
+    <ant dir="../openide/dialogs" target="netbeans"/>
+  </target>
+  <target name="all-openide/nodes" depends="all-openide/util,all-openide/dialogs">
+    <echo message="Building openide/nodes"/>
+    <ant dir="../openide/nodes" target="netbeans"/>
+  </target>
+  <target name="all-openide/explorer" depends="all-openide/nodes,all-openide/dialogs,all-openide/options">
+    <echo message="Building openide/explorer"/>
+    <ant dir="../openide/explorer" target="netbeans"/>
+  </target>
+  <target name="all-openide/windows" depends="all-openide/nodes">
+    <echo message="Building openide/windows"/>
+    <ant dir="../openide/windows" target="netbeans"/>
+  </target>
+  <target name="all-openide/text" depends="all-openide/windows,all-openide/options">
+    <echo message="Building openide/text"/>
+    <ant dir="../openide/text" target="netbeans"/>
+  </target>
+  <target name="all-openide/actions" depends="all-openide/windows,all-openide/fs,all-openide/explorer,all-openide/nodes,all-openide/text">
+    <echo message="Building openide/actions"/>
+    <ant dir="../openide/actions" target="netbeans"/>
+  </target>
   <target name="all-openide/deprecated" depends="all-openide,all-java/srcmodel,all-debuggercore/oldapi,all-openide/compiler,all-openide/io,all-openide/execution">
     <echo message="Building openide/deprecated..."/>
     <ant dir="../openide/deprecated" target="netbeans"/>
@@ -991,6 +1040,8 @@
              mergedependentmodules="${merge.dependent.modules}" >
       <suppress locale="ja" unless="netbeans.japanese"/>
     </nbmerge>
+    <!-- if copied, remove this file as it is not needed much -->
+    <delete file="${netbeans.dest}/lib/openide.jar" />
     <chmod perm="ugo+x">
       <fileset dir="${netbeans.dest}">
         <include name="bin/**/*.sh"/>
@@ -1033,7 +1084,7 @@
   </target>
 
   <target name="check-for-build">
-    <available property="have-build" file="${netbeans.dest}/lib/openide.jar"/>
+    <available property="have-build" file="${netbeans.dest}/lib/core.jar"/>
   </target>
   <target name="maybe-build-nozip" depends="check-for-build" unless="have-build">
     <ant dir="." target="build-nozip"/>
Index: nbbuild/javadoctools/template.xml
===================================================================
RCS file: /cvs/nbbuild/javadoctools/template.xml,v
retrieving revision 1.24
diff -u -r1.24 template.xml
--- nbbuild/javadoctools/template.xml	9 Oct 2003 00:42:04 -0000	1.24
+++ nbbuild/javadoctools/template.xml	15 Oct 2003 08:34:13 -0000
@@ -24,6 +24,7 @@
 ${javadoc.packages}   list of packages to build, e.g. "org.netbeans.api.foo,org.netbeans.spi.foo"
 ${javadoc.classpath}  classpath for source files (probably same as what you use for <javac>)
 Optional:
+${javadoc.files}      selector describing which files to build
 ${javadoc.main.page}  link to main page, e.g. org/netbeans/api/foo/doc-files/api.html
 ${javadoc.docfiles}   doc-files directory such as ${javadoc.base}/api/doc; default none
 ${javadoc.apichanges} API change list XML file; default no change list
@@ -84,6 +85,9 @@
         <property name="javadoc.docs.openide/registry" value="${javadoc.web.root}/RegistryAPI"/>
         <property name="javadoc.docs.openide/convertor" value="${javadoc.web.root}/ConvertorAPI"/>
         <property name="javadoc.docs.openide/looks" value="${javadoc.web.root}/LooksAPI"/>
+        <property name="javadoc.docs.openide/registry" value="${javadoc.web.root}/RegistryAPI"/>
+        <property name="javadoc.docs.openide/convertor" value="${javadoc.web.root}/ConvertorAPI"/>
+        <property name="javadoc.docs.openide/looks" value="${javadoc.web.root}/LooksAPI"/>
         <!-- add more here as needed... -->
         <property name="javadoc.css.dir" location="."/>
         <property name="javadoc.css.main" location="${javadoc.css.dir}/javadoc.css"/>
@@ -96,9 +100,16 @@
     </target>
 
     <target name="javadoc-check-timestamps" depends="javadoc-init">
+        <selector id="all-java-files" >
+            <filename name="**/*.java" />
+        </selector>
+        <property name="javadoc.files" value="all-java-files" />
         <uptodate targetfile="${javadoc.out.zip}" property="javadoc.up.to.date">
             <srcfiles dir="${javadoc.src}">
-                <include name="**/*.java"/>
+                <and>
+                    <selector refid="${javadoc.files}" />
+                    <filename name="**/*.java" />
+                </and>
             </srcfiles>
             <srcfiles dir="${javadoc.docfiles}"/>
             <srcfiles refid="javadoc.css.files"/>
@@ -118,7 +129,22 @@
         <property name="javadoc.hyperlinked.title" value='&lt;a href="@TOP@${javadoc.main.page}"&gt;${javadoc.title}&lt;/a&gt;'/>
     </target>
     
-    <target name="javadoc-stage-main" depends="javadoc-init,javadoc-check-timestamps,javadoc-make-plain-title,javadoc-make-hyperlinked-title" unless="javadoc.up.to.date">
+    <target name="javadoc-stage-main" depends="javadoc-init,javadoc-check-timestamps,javadoc-exec-files,javadoc-exec-packages" unless="javadoc.up.to.date" >
+        <copy todir="${javadoc.out.dir}">
+            <fileset refid="javadoc.css.files"/>
+        </copy>
+    </target>
+    
+    <target name="javadoc-exec-condition" >
+        <condition property="javadoc.files|javadoc.up.to.date">
+            <or>
+                <isset property="javadoc.files"/>
+                <isset property="javadoc.up.to.date"/>
+            </or>
+        </condition>
+    </target>
+    
+    <target name="javadoc-exec-packages" depends="javadoc-init,javadoc-check-timestamps,javadoc-make-plain-title,javadoc-make-hyperlinked-title,javadoc-exec-condition" unless="javadoc.files|javadoc.up.to.date" >
         <tstamp/>
         <property name="javadoc.footer" value='&lt;span class="footnote"&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/span&gt;'/>
         <javadoc source="1.4" author="false" destdir="${javadoc.out.dir}" packagenames="${javadoc.packages}" stylesheetfile="${javadoc.css.main}" windowtitle="NetBeans ${javadoc.title}" overview="${javadoc.overview}" splitindex="true" use="true" version="false">
@@ -148,9 +174,41 @@
             <header>${javadoc.header}</header>
             <bottom>${javadoc.footer}</bottom>
         </javadoc>
-        <copy todir="${javadoc.out.dir}">
-            <fileset refid="javadoc.css.files"/>
-        </copy>
+    </target>
+    
+    <target name="javadoc-exec-files" depends="javadoc-init,javadoc-check-timestamps,javadoc-make-plain-title,javadoc-make-hyperlinked-title" if="javadoc.files" unless="javadoc.up.to.date" >
+        <tstamp/>
+        <property name="javadoc.footer" value='&lt;span class="footnote"&gt;Built on ${TODAY}.&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.&lt;/span&gt;'/>
+        <javadoc source="1.4" author="false" destdir="${javadoc.out.dir}" packagenames="${javadoc.packages}" stylesheetfile="${javadoc.css.main}" windowtitle="NetBeans ${javadoc.title}" overview="${javadoc.overview}" splitindex="true" use="true" version="false">
+            <fileset dir="${javadoc.docfiles}"/>
+            <fileset dir="${javadoc.src}" >
+                <and>
+                    <selector refid="${javadoc.files}" />
+                    <filename name="**/*.java" />
+                </and>
+            </fileset>
+            <classpath path="${javadoc.classpath}"/>
+            <!-- XXX note, this does not support more than one group -->
+            <group packages="${javadoc.packages}">
+                <title>${javadoc.hyperlinked.title}</title>
+            </group>
+            <link href="${javadoc.docs.jdk}" offline="true" packagelistloc="../../openide/api/doc"/>
+            <link href="${javadoc.docs.openide}" offline="true" packagelistloc="../../openide/javadoc/OpenAPIs"/>
+            <link href="${javadoc.docs.openide/io}" offline="true" packagelistloc="../../openide/io/javadoc/InputOutputAPI"/>
+            <link href="${javadoc.docs.openide/execution}" offline="true" packagelistloc="../../openide/execution/javadoc/ExecutionAPI"/>
+            <link href="${javadoc.docs.openide/compiler}" offline="true" packagelistloc="../../openide/compiler/javadoc/CompilerAPI"/>
+            <link href="${javadoc.docs.openide/loaders}" offline="true" packagelistloc="../../openide/loaders/javadoc/LoadersAPI"/>
+            <link href="${javadoc.docs.core/javahelp}" offline="true" packagelistloc="../../core/javahelp/javadoc/JavaHelpAPI"/>
+            <link href="${javadoc.docs.core/term}" offline="true" packagelistloc="../../core/term/javadoc/TerminalEmulatorAPI"/>
+            <link href="${javadoc.docs.java/api}" offline="true" packagelistloc="../../java/api/javadoc/JavaSupportAPIs"/>
+            <link href="${javadoc.docs.java/srcmodel}" offline="true" packagelistloc="../../java/srcmodel/javadoc/JavaHierarchyAPI"/>
+            <link href="${javadoc.docs.openide/registry}" offline="true" packagelistloc="../../openide/registry/javadoc/RegistryAPI"/>
+            <link href="${javadoc.docs.openide/convertor}" offline="true" packagelistloc="../../openide/convertor/javadoc/ConvertorAPI"/>
+            <link href="${javadoc.docs.openide/looks}" offline="true" packagelistloc="../../openide/looks/javadoc/LooksAPI"/>
+            <doctitle>NetBeans ${javadoc.title}</doctitle>
+            <header>${javadoc.header}</header>
+            <bottom>${javadoc.footer}</bottom>
+        </javadoc>
     </target>
 
     <target name="javadoc-stage-apichanges" depends="javadoc-init,javadoc-check-timestamps" unless="javadoc.up.to.date">
Index: openide/.cvsignore
===================================================================
RCS file: /cvs/openide/.cvsignore,v
retrieving revision 1.21
diff -u -r1.21 .cvsignore
--- openide/.cvsignore	20 Jun 2003 22:17:41 -0000	1.21
+++ openide/.cvsignore	15 Oct 2003 08:34:13 -0000
@@ -1,7 +1,6 @@
 netbeans
-*-subst.mf
+manifest-subst.mf
 openide-13javac-workaround.jar
-standalone
 nb-api-tutorial.zip
 openide.nbm
 Info
Index: openide/build.xml
===================================================================
RCS file: /cvs/openide/build.xml,v
retrieving revision 1.157
diff -u -r1.157 build.xml
--- openide/build.xml	9 Oct 2003 00:36:40 -0000	1.157
+++ openide/build.xml	15 Oct 2003 08:34:13 -0000
@@ -23,11 +23,6 @@
 
   <property name="nbm_alias" value="nb_ide"/>
 
-  <taskdef name="enhanceclass" classname="org.netbeans.nbbuild.NbEnhanceClass" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
-  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
-
   <target name="init">
     <ant dir="../core/external" target="unscramble"/>
     <path id="openide-cp">
@@ -126,35 +121,14 @@
     </jar>
   </target>
 
-  <!-- See #11746. -->
-  <target name="vers-prep-1">
-    <uptodate targetfile="manifest-subst.mf" property="spec-vers-up-to-date">
-      <srcfiles dir=".">
-        <include name="openide-spec-vers.properties"/>
-      </srcfiles>
-    </uptodate>
-  </target>
-  <target name="vers-prep-2" depends="vers-prep-1" unless="spec-vers-up-to-date">
-    <!-- Either manifest-subst.mf is missing or openide-spec-vers.properties is newer. -->
-    <delete>
-      <fileset dir=".">
-        <include name="*-subst.mf"/>
-      </fileset>
-    </delete>
-  </target>
-  <target name="vers-prep" depends="vers-prep-2">
-    <property file="openide-spec-vers.properties"/>
-    <filter token="SPEC_VERS_SUBST" value="${org.openide.specification.version}"/>
+  <target name="vers-prep">
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
   </target>
   
   <target name="old-jars" depends="compile,13javac-workaround,vers-prep,loaders_32143-compat" description="Create JAR files.">
     <mkdir dir="netbeans/lib"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide.jar"
-            manifest="manifest-subst.mf"
-	    compress="false">
-      <locale name="ja"/>
+    <jar jarfile="netbeans/lib/openide.jar" manifest="manifest-subst.mf" compress="false">
       
       <fileset dir="src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
       <fileset dir="windows/src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
@@ -166,7 +140,7 @@
            <include name="**/$$*$$Patch$$.class" />
       </fileset>
       
-    </locjar>
+    </jar>
   </target>
 
   <target name="loaders_32143-compat" depends="libs" unless="loaders_32143-compat.skip" >
@@ -186,11 +160,12 @@
     </copy>
   </target>
 
-  <target name="netbeans" depends="jars-from-libs,release" description="Build everything needed for inclusion in the IDE.">
-    <genlist targetname="nbm" outputfiledir="netbeans"/>
+  <target name="netbeans" depends="jars-from-libs,release,libs,compile-compat,loaders_32143-compat" description="Build everything needed for inclusion in the IDE.">
+<!--    <genlist targetname="nbm" outputfiledir="netbeans"/> -->
   </target>
 
   <target name="nbm" depends="netbeans">
+    <!-- PENDING
     <makenbm file="openide.nbm"
              topdir="."
              module="netbeans/lib/openide.jar"
@@ -199,12 +174,17 @@
       <license file="${license.file}"/>
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
+    -->
   </target>
 
   <!-- Define the sets of files for various libraries -->
   <selector id="openide.actions" >
     <or>
         <filename name="**/openide/actions/*" />
+        
+        <!-- resource -->
+        <filename name="**/openide/resources/actions/*" />
+        <filename name="**/openide/resources/propertysheet/customize.gif" />
 
         <!-- these might one day get deprecated, but until that
           lets keep them here -->
@@ -223,6 +203,10 @@
       <filename name="**/openide/text/*" />
       <filename name="**/openide/cookies/LineCookie*" />
       <filename name="**/openide/cookies/EditorCookie*" />
+
+      <!-- resources -->
+      <filename name="**/openide/resources/editorMode*" />
+      <filename name="**/openide/resources/printSettings*" />
     </or>
   </selector>
   <selector id="openide.nodes" >
@@ -232,7 +216,10 @@
          <filename name="**/openide/cookies/*" />
          <filename name="**/openide/util/actions/NodeAction*" />
          <filename name="**/openide/util/actions/CookieAction*" />
-         <filename name="**/openide/resources/defaultNode*"/>
+         
+         <!-- resources -->
+         <filename name="**/openide/resources/defaultNode*" />
+         <filename name="**/openide/resources/beans*" />
        </or>
        <not>
          <selector refid="openide.text" />
@@ -240,7 +227,14 @@
     </and>
   </selector>
   <selector id="openide.awt" >
-    <filename name="**/openide/awt/*" />
+    <or>
+        <filename name="**/openide/awt/*" />
+
+        <!-- resources -->
+        <filename name="**/openide/resources/html/*" />
+        <!-- already in openide.util -->
+        <!-- <filename name="**/openide/resources/actions/empty.gif" /> -->
+    </or>
   </selector>
   <selector id="openide.util" >
      <and>
@@ -254,6 +248,9 @@
             <filename name="**/openide/util/io/*" />
             <filename name="**/openide/util/actions/*" />
             <filename name="**/openide/xml/*" />         
+
+            <!-- resources -->
+            <filename name="**/openide/resources/actions/empty.gif" />
             <filename name="**/openide/resources/progress-cursor*"/>
         </or>
         
@@ -267,6 +264,8 @@
     <and>
         <or>
             <filename name="**/openide/*" />
+            <!-- resources -->
+            <filename name="**/openide/resources/defaultWizard.gif" />
         </or>
         <not>
             <selector refid="openide.util" />
@@ -287,10 +286,32 @@
   </selector>
   <selector id="openide.explorer" >
     <and>
-      <filename name="**/openide/explorer/**" />
-      <not>
+      <or>
+        <filename name="**/openide/explorer/**" />
+        
+        <!-- resources -->
+        <filename name="**/openide/resources/propertysheet/propertySheetHelp.gif" />
+        <filename name="**/openide/resources/propertysheet/propertySheetHelp.gif" />
+        <filename name="**/openide/resources/actions/setDefaultValue.gif" />
+        <filename name="**/openide/resources/propertysheet/invalid.gif" />
+        <filename name="**/openide/resources/propertysheet/modified.gif" />
+        <filename name="**/openide/resources/cursorscopysingle.gif" />
+        <filename name="**/openide/resources/cursorsnone.gif" />
+        <filename name="**/openide/resources/cursorsmovesingle.gif" />
+        <filename name="**/openide/resources/cursorsnone.gif" />
+        <filename name="**/openide/resources/cursorsunknownsingle.gif" />
+        <filename name="**/openide/resources/cursorsnone.gif" />
+        <filename name="**/openide/resources/cursorsnone.gif" />
+        <filename name="**/openide/resources/cursorscopysingle.gif" />
+        <filename name="**/openide/resources/defaultNode.gif" />
+        <filename name="**/openide/resources/columns.gif" />
+        <filename name="**/openide/resources/columnsSortedAsc.gif" />
+        <filename name="**/openide/resources/columnsSortedDesc.gif" />
+      </or>
+      <none>
         <selector refid="openide.actions" />
-      </not>
+        <selector refid="openide.nodes" />
+      </none>
     </and>
   </selector>
   
@@ -322,19 +343,32 @@
       </fileset>
     </copy>
   </target>
-  
+
+  <target name="do-lib-javadoc" >
+    <ant dir="${nbroot}/nbbuild/javadoctools" antfile="template.xml" target="javadoc" inheritRefs="true" >
+      <property name="javadoc.base" location="${localdir}/.."/>
+      <property name="javadoc.src" location="src"/>
+      <property name="javadoc.classpath" refid="classpath"/>
+      <property name="javadoc.apichanges" location="api/doc/changes/apichanges.xml"/>      
+<!--      <property name="javadoc.docfiles" location="api/doc"/>
+      <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+      
+      <property name="javadoc.files" value="${selector}" />
+    </ant>
+  </target>
   <!-- Build whole openide.jar from separate libraries -->
-  <target name="jars-from-libs" depends="libs,vers-prep,compile-compat,loaders_32143-compat" description="Create JAR files from copied directories.">
+  <target name="jars-from-libs" depends="libs,vers-prep,compile-compat,loaders_32143-compat" description="Create JAR files from copied directories." unless="no-openide.jar">
     <property name="openide.jar" value="netbeans/lib/openide.jar" />
     <mkdir dir="netbeans/lib"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="${openide.jar}"
-            manifest="manifest-subst.mf"
-	    compress="false">
-      <locale name="ja"/>
+    <jar jarfile="${openide.jar}" manifest="manifest-subst.mf" compress="false">
       
       <fileset dir="actions/src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
-      <fileset dir="awt/src" excludesfile="../nbbuild/standard-jar-excludes.txt"/>
+      <fileset dir="awt/src" excludesfile="../nbbuild/standard-jar-excludes.txt">
+        <!-- Bogus version, already supplied by windows/src/: -->
+        <exclude name="org/openide/awt/HtmlBrowser$BrowserComponent.class"/>
+        <!-- To find others, use: zipinfo netbeans/lib/openide.jar|fgrep stor|cut -c21-29,54-|sort -k2|uniq|uniq -d -s9 -->
+      </fileset>
       <fileset dir="dialogs/src" excludesfile="../nbbuild/standard-jar-excludes.txt">
          <!-- will be provided by openide-windows -->
          <exclude name="org/openide/awt/HtmlBrowser$$BrowserComponent.class" />
@@ -362,7 +396,7 @@
            <include name="**/$$*$$Patch$$.class" />
       </fileset>
       
-    </locjar>
+    </jar>
   </target>
   
   
@@ -394,6 +428,7 @@
         <ant dir="text" target="clean" />
         <ant dir="util" target="clean" />
         <ant dir="windows" target="clean" />
+        <ant dir="compat" target="clean" />
   </target>
     
   
@@ -458,16 +493,13 @@
                   <include name="org/openide/util/*Lookup*"/>
                   <include name="org/openide/util/WeakSet*"/>
                   <include name="org/openide/util/enum/*"/>
-                  
-                  <!- exlude localized resources, they are part of openide.jar ->
-                  <exclude name="org/openide/**/*_*" />
-                  <exclude name="org/openide/util/*_*" />
              </fileset>
         </jar>
         -->
   </target>        
   
   
+  <!-- PENDING
   <target  name="lookup-src" description="Creates zip file with lookup sources.">
     <mkdir dir="standalone"/>
     <zip compress="true" zipfile="standalone/lookup-src.zip">
@@ -485,6 +517,7 @@
         </fileset>
     </zip>
   </target>
+  -->
   
   <!-- dependencies between libraries -->
   
@@ -550,8 +583,40 @@
 </echo>
   </target>
   
-  <target name="javadoc" depends="javadoc-plain,export-interfaces" if="open-apis-force-rebuild"
-          description="Create Open API documentation." />
+  <target name="javadoc" depends="javadoc-plain,export-interfaces" if="open-apis-force-rebuild" />
+  <target name="export-interfaces" depends="javadoc-plain" if="export.interfaces" >
+  	<!-- is there just because the openide APIs are not separated and do not use javadoctools -->
+    <taskdef name="arch" classname="org.netbeans.nbbuild.Arch">
+      <classpath>
+        <pathelement location="../nbbuild/nbantext.jar"/>
+        <fileset dir="../libs/external">
+          <include name="xerces*.jar"/>
+        </fileset>
+      </classpath>
+    </taskdef>
+    
+    <!-- Warn about incorrect question version, but do not make build fail: -->
+    <property name="arch.warn" value="true"/>
+    <property name="arch.xsl" location="../nbbuild/javadoctools/exportInterfaces.xsl" />
+    <property name="arch.target" value="OpenAPIs/arch" />
+    <arch answers="../nbbuild/javadoctools/arch-empty.xml" output="${export.interfaces}/OpenAPIs.html" />
+    
+  </target>
+          
+  <target name="all-javadoc" description="Create Open API documentation." >
+        <ant dir="util" target="javadoc" />
+        <ant dir="awt" target="javadoc" />
+        <ant dir="dialogs" target="javadoc" />
+        <ant dir="explorer" target="javadoc" />
+        <ant dir="fs" target="javadoc" />
+        <ant dir="nodes" target="javadoc" />
+        <ant dir="modules" target="javadoc" />
+        <ant dir="options" target="javadoc" />
+        <ant dir="text" target="javadoc" />
+        <ant dir="windows" target="javadoc" />
+        <ant dir="actions" target="javadoc" />
+  </target>
+          
           
           
   <target name="javadoc-plain" depends="init,open-apis-check-timestamps,open-apis-maybe-skip" if="open-apis-force-rebuild" >
@@ -698,35 +763,6 @@
     <zip zipfile="javadoc/OpenAPIs.zip" basedir="javadoc/OpenAPIs"/>
   </target>
   
-  <target name="export-interfaces" depends="javadoc-plain" if="export.interfaces" >
-  	<!-- is there just because the openide APIs are not separated and do not use javadoctools -->
-    <taskdef name="arch" classname="org.netbeans.nbbuild.Arch">
-      <classpath>
-        <pathelement location="../nbbuild/nbantext.jar"/>
-        <fileset dir="../libs/external">
-          <include name="xerces*.jar"/>
-        </fileset>
-      </classpath>
-    </taskdef>
-    
-    <!-- Warn about incorrect question version, but do not make build fail: -->
-    <property name="arch.warn" value="true"/>
-    <property name="arch.xsl" location="../nbbuild/javadoctools/exportInterfaces.xsl" />
-    <property name="arch.target" value="OpenAPIs/arch" />
-    <arch answers="arch/arch-openide-modules.xml" output="${export.interfaces}/openide-modules.html" />
-    <arch answers="arch/arch-openide-dialogs.xml" output="${export.interfaces}/openide-dialogs.html" />
-    <arch answers="arch/arch-openide-lookup.xml" output="${export.interfaces}/openide-lookup.html" />
-    <arch answers="arch/arch-openide-filesystems.xml" output="${export.interfaces}/openide-filesystems.html" />
-    <arch answers="arch/arch-openide-nodes.xml" output="${export.interfaces}/openide-nodes.html" />
-    <arch answers="arch/arch-openide-explorer.xml" output="${export.interfaces}/openide-explorer.html" />
-    <arch answers="arch/arch-openide-actions.xml" output="${export.interfaces}/openide-actions.html" />
-    <arch answers="arch/arch-openide-windowsystem.xml" output="${export.interfaces}/openide-windowsystem.html" />
-    <arch answers="arch/arch-openide-utilities.xml" output="${export.interfaces}/openide-utilities.html" />
-    <arch answers="arch/arch-openide-editor.xml" output="${export.interfaces}/openide-editor.html" />
-    <arch answers="arch/arch-openide-propertysheet.xml" output="${export.interfaces}/openide-propertysheet.html" />
-    
-  </target>
-
   <target name="apis-tidy" description="Run the Tidy HTML checker on API prose documents.">
     <apply parallel="true" failonerror="true" executable="tidy">
       <fileset dir="api/doc">
@@ -768,12 +804,15 @@
     <delete file="openide-13javac-workaround.jar"/>
     <delete dir="javadoc"/>
     <delete file="nb-api-tutorial.zip"/>
+    <!-- PENDING
     <delete dir="standalone"/>
+    -->
     <delete dir="Info"/>
     <delete file="openide.nbm"/>
     <ant dir="api/examples" target="clean"/>
   </target>
 
+  <!-- PENDING
     <target  name="standalone-fs" depends="standalone-fs-prepare" description="Creates ZIP file suitable for download. ZIP file contains all JARs necessary for using standalone filesystems (excluding a JAXP implementation).">
         <zip compress="true" zipfile="standalone/nbfilesystems.zip">
             <fileset dir="standalone">
@@ -803,5 +842,6 @@
 ]]></echo>
 
     </target>
+  -->
 
 </project>
Index: openide/manifest.mf
===================================================================
RCS file: /cvs/openide/manifest.mf,v
retrieving revision 1.32
diff -u -r1.32 manifest.mf
--- openide/manifest.mf	21 Aug 2003 09:21:27 -0000	1.32
+++ openide/manifest.mf	15 Oct 2003 08:34:13 -0000
@@ -1,17 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.openide/1
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-X-Comment: change specification version in openide-spec-vers.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-X-Comment-2: XXX later remove all the stuff below; should only be in openide/modules/manifest.mf; needed only while everything merged into one openide.jar with no individual manifests
-Specification-Title: IDE/1
-Specification-Version: @SPEC_VERS_SUBST@
-Specification-Vendor: NetBeans
-Implementation-Title: NetBeans Modules API
-Implementation-Version: @BUILD_NUMBER_SUBST@
-Implementation-Vendor: NetBeans
-
-Name: /org/openide/modules/
-Package-Title: org.openide.modules
 
Index: openide/openide-lookup.mf
===================================================================
RCS file: openide/openide-lookup.mf
diff -N openide/openide-lookup.mf
--- openide/openide-lookup.mf	21 Aug 2003 09:21:28 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Specification-Title: IDE/1
-Specification-Version: @SPEC_VERS_SUBST@
-Specification-Vendor: NetBeans
-Implementation-Title: NetBeans Open APIs
-Implementation-Version: @BUILD_NUMBER_SUBST@
-Implementation-Vendor: NetBeans
-
-Name: /org/openide/
-Package-Title: org.openide
-
-Name: /org/openide/util/
-Package-Title: org.openide.util
-
-Name: /org/openide/util/lookup/
-Package-Title: org.openide.util.lookup
-
Index: openide/openide-spec-vers.properties
===================================================================
RCS file: openide/openide-spec-vers.properties
diff -N openide/openide-spec-vers.properties
--- openide/openide-spec-vers.properties	2 Sep 2003 16:37:45 -0000	1.120
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-# Single place to change the API specification version.
-# Will be applied to several manifests for openide libraries.
-
-# Must always be numeric (numbers separated by '.', e.g. 4.11).
-# See http://openide.netbeans.org/versioning-policy.html for more.
-
-org.openide.specification.version=4.12
Index: openide/actions/.cvsignore
===================================================================
RCS file: /cvs/openide/actions/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/actions/.cvsignore	21 Aug 2003 09:21:30 -0000	1.2
+++ openide/actions/.cvsignore	15 Oct 2003 08:34:13 -0000
@@ -1,3 +1,4 @@
 netbeans
 manifest-subst.mf
 gensrc
+javadoc
Index: openide/actions/build.xml
===================================================================
RCS file: /cvs/openide/actions/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- openide/actions/build.xml	25 Aug 2003 19:28:47 -0000	1.5
+++ openide/actions/build.xml	15 Oct 2003 08:34:13 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,20 +22,20 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
+  
+  <path id="classpath" >
+     <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
+     <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
+     <pathelement location="${nbroot}/openide/windows/netbeans/lib/openide-windows.jar"/>
+     <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
+     <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
+     <pathelement location="${nbroot}/openide/text/netbeans/lib/openide-text.jar"/>
+     <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
+     <pathelement location="${nbroot}/openide/explorer/netbeans/lib/openide-explorer.jar"/>
+     <pathelement location="${nbroot}/openide/fs/netbeans/lib/openide-fs.jar"/>
+  </path>
   
   <target name="compile" >
-    <path id="classpath" >
-       <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
-       <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
-       <pathelement location="${nbroot}/openide/windows/netbeans/lib/openide-windows.jar"/>
-       <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
-       <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
-       <pathelement location="${nbroot}/openide/text/netbeans/lib/openide-text.jar"/>
-       <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
-       <pathelement location="${nbroot}/openide/explorer/netbeans/lib/openide-explorer.jar"/>
-       <pathelement location="${nbroot}/openide/fs/netbeans/lib/openide-fs.jar"/>
-    </path>
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="include" value="org/openide/cookies/InstanceCookie$$Origin.java" />
       <property name="localdir" location="src" />
@@ -86,21 +86,18 @@
     </target>
   
   <target name="jars" depends="compile">
+    <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-actions.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-actions.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -115,6 +112,21 @@
     </makenbm>
   </target>
 
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.actions" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="ActionsAPI"/>
+      <property name="javadoc.title" value="Old Actions API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <property name="javadoc.arch" location="../arch/arch-openide-actions.xml"/>
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+
   <target name="clean">
     <delete dir="src/org/openide/actions" />
     <delete dir="src/org/openide/util" />
@@ -123,6 +135,7 @@
     <delete file="manifest-subst.mf"/>
     <delete file="treefs.nbm"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
     <delete>
Index: openide/actions/manifest.mf
===================================================================
RCS file: /cvs/openide/actions/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/actions/manifest.mf	21 Aug 2003 09:21:31 -0000	1.2
+++ openide/actions/manifest.mf	15 Oct 2003 08:34:13 -0000
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.actions/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.nodes/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.explorer/1 > 1.0, org.openide.windows/1 > 1.0, org.openide.text/1 > 1.0, org.openide.filesystems/1 > 1.0, org.openide.options/1 > 1.0, org.openide.awt/1 > 1.0
+OpenIDE-Module: org.openide.actions
+OpenIDE-Module-Module-Dependencies: org.openide.util > 4.20, org.openide.nodes > 4.20, org.openide.dialogs > 4.20, org.openide.explorer > 4.20, org.openide.windows > 4.20, org.openide.text > 4.20, org.openide.filesystems > 4.20, org.openide.options > 4.20, org.openide.awt > 4.20
 X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: openide/actions/src/org/openide/.cvsignore
===================================================================
RCS file: /cvs/openide/actions/src/org/openide/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/actions/src/org/openide/.cvsignore	21 Aug 2003 09:21:31 -0000	1.2
+++ openide/actions/src/org/openide/.cvsignore	15 Oct 2003 08:34:13 -0000
@@ -1,3 +1,4 @@
 actions
 explorer
 util
+resources
Index: openide/awt/.cvsignore
===================================================================
RCS file: /cvs/openide/awt/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/awt/.cvsignore	21 Aug 2003 09:21:33 -0000	1.2
+++ openide/awt/.cvsignore	15 Oct 2003 08:34:16 -0000
@@ -1,2 +1,3 @@
 manifest-subst.mf
 netbeans
+javadoc
Index: openide/awt/build.xml
===================================================================
RCS file: /cvs/openide/awt/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- openide/awt/build.xml	25 Aug 2003 19:28:48 -0000	1.3
+++ openide/awt/build.xml	15 Oct 2003 08:34:18 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,12 +22,12 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   
+  <path id="classpath" >
+    <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
+  </path>
+    
   <target name="compile" >
-    <path id="classpath" >
-      <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
-    </path>
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.awt" />
@@ -35,22 +35,20 @@
   </target>
   
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-awt.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-awt.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+        <!-- Bogus version, already supplied by windows/src/: -->
+        <exclude name="org/openide/awt/HtmlBrowser$BrowserComponent.class"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -65,6 +63,21 @@
     </makenbm>
   </target>
 
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.awt" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="AWTAPI"/>
+      <property name="javadoc.title" value="AWT Extensions API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <!-- <property name="javadoc.arch" location="../arch/arch-openide-utilities.xml"/> -->
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+
   <target name="clean">
     <delete dir="src/org/openide" />
     <delete >
@@ -75,6 +88,7 @@
     <delete file="manifest-subst.mf"/>
     <delete file="openide-awt.nbm"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
   </target>
Index: openide/awt/manifest.mf
===================================================================
RCS file: /cvs/openide/awt/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/awt/manifest.mf	21 Aug 2003 09:21:33 -0000	1.2
+++ openide/awt/manifest.mf	15 Oct 2003 08:34:18 -0000
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.awt/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1
+OpenIDE-Module: org.openide.awt
+OpenIDE-Module-Module-Dependencies: org.openide.util > 4.20
 X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: openide/compat/.cvsignore
===================================================================
RCS file: /cvs/openide/compat/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/compat/.cvsignore	14 Aug 2002 14:16:04 -0000	1.2
+++ openide/compat/.cvsignore	15 Oct 2003 08:34:18 -0000
@@ -1 +1,4 @@
 patched
+javadoc
+netbeans
+manifest-subst.mf
Index: openide/compat/build.xml
===================================================================
RCS file: openide/compat/build.xml
diff -N openide/compat/build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/compat/build.xml	15 Oct 2003 08:34:18 -0000
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='ISO-8859-1' ?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+
+<project name="openide/compat" default="netbeans" basedir=".">
+  <property name="nbroot" location="../.." />
+
+  <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="${nbroot}/nbbuild/standard-nbm-license.txt"/>
+
+  <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
+  <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
+  
+  <target name="compile" >
+    <path id="classpath" >
+      <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
+      <pathelement location="${nbroot}/openide/fs/netbeans/lib/openide-fs.jar" />
+      <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar" />
+    </path>
+    <javac sourcepath="" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
+      <src path="src" />
+      <classpath refid="classpath" />
+    </javac>
+  </target>
+  
+  <target name="jars" depends="compile">
+    <mkdir dir="netbeans/lib"/>
+    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
+    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
+    <jar jarfile="netbeans/lib/openide-compat.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+      <fileset dir="../src">
+    <!--    <include name="org/openide/resources/**" /> -->
+        <include name="META-INF/**" />
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
+  </target>
+
+  <target name="netbeans" depends="jars">
+    <!-- No! Not yet. Not an actual module, should be merged into other libs instead?
+    <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
+    -->
+  </target>
+
+  <!-- Dummy target -->
+  <target name="javadoc"/>
+
+  <target name="nbm" depends="netbeans">
+    <!-- PENDING
+    <makenbm file="openide-compat.nbm"
+             topdir="."
+             module="netbeans/lib/openide-compat.jar"
+	     homepage="http://openide.${homepage.base}/"
+             needsrestart="false"
+	     distribution="http://${dist.base}/openide-compat.nbm">
+      <license file="${license.file}"/>
+      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
+    </makenbm>
+    -->
+  </target>
+
+  <target name="clean">
+    <delete >
+      <fileset dir="src" >
+        <include name="**/*.class" />
+      </fileset>
+    </delete>
+    <delete file="manifest-subst.mf"/>
+    <delete file="openide-compat.nbm"/>
+    <delete dir="netbeans"/>
+    <delete dir="Info"/>
+  </target>
+
+</project>
Index: openide/compat/manifest.mf
===================================================================
RCS file: openide/compat/manifest.mf
diff -N openide/compat/manifest.mf
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/compat/manifest.mf	15 Oct 2003 08:34:18 -0000
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+X-Build-Number: @BUILD_NUMBER_SUBST@
+X-Intentionally-Blank: yes; cf. #29458
+
Index: openide/dialogs/.cvsignore
===================================================================
RCS file: /cvs/openide/dialogs/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/dialogs/.cvsignore	21 Aug 2003 09:21:36 -0000	1.2
+++ openide/dialogs/.cvsignore	15 Oct 2003 08:34:19 -0000
@@ -1,3 +1,4 @@
 src
 netbeans
 manifest-subst.mf
+javadoc
Index: openide/dialogs/build.xml
===================================================================
RCS file: /cvs/openide/dialogs/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- openide/dialogs/build.xml	25 Aug 2003 19:28:48 -0000	1.3
+++ openide/dialogs/build.xml	15 Oct 2003 08:34:19 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,13 +22,13 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
+  
+  <path id="classpath" >
+    <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
+    <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
+  </path>
   
   <target name="compile" >
-    <path id="classpath" >
-      <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
-      <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
-    </path>
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.dialogs" />
@@ -36,24 +36,20 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-dialogs.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-      <!-- will be provided by openide-windows.jar -->
-      <exclude name="org/openide/awt/HtmlBrowser$$BrowserComponent.class" />
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-dialogs.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <!-- will be provided by openide-windows.jar -->
+        <exclude name="org/openide/awt/HtmlBrowser$$BrowserComponent.class" />
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -68,10 +64,26 @@
     </makenbm>
   </target>
 
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.dialogs" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="DialogsAPI"/>
+      <property name="javadoc.title" value="Dialogs and Wizards API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <property name="javadoc.arch" location="../arch/arch-openide-dialogs.xml"/>
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+  
   <target name="clean">
     <delete dir="src" />
     <delete file="manifest-subst.mf"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
   </target>
Index: openide/dialogs/manifest.mf
===================================================================
RCS file: /cvs/openide/dialogs/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/dialogs/manifest.mf	21 Aug 2003 09:21:37 -0000	1.2
+++ openide/dialogs/manifest.mf	15 Oct 2003 08:34:19 -0000
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.dialogs/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.awt/1 > 1.0
+OpenIDE-Module: org.openide.dialogs
+OpenIDE-Module-Module-Dependencies: org.openide.util > 4.20, org.openide.awt > 4.20
 X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: openide/explorer/.cvsignore
===================================================================
RCS file: /cvs/openide/explorer/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/explorer/.cvsignore	21 Aug 2003 09:21:38 -0000	1.2
+++ openide/explorer/.cvsignore	15 Oct 2003 08:34:19 -0000
@@ -1,3 +1,4 @@
 src
 netbeans
 manifest-subst.mf
+javadoc
Index: openide/explorer/build.xml
===================================================================
RCS file: /cvs/openide/explorer/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- openide/explorer/build.xml	25 Aug 2003 19:28:48 -0000	1.3
+++ openide/explorer/build.xml	15 Oct 2003 08:34:19 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,17 +22,16 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   
+  <path id="classpath" >
+       <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
+       <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
+       <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
+       <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
+       <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
+  </path>
   
   <target name="compile" >
-    <path id="classpath" >
-         <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
-         <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
-         <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
-         <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
-         <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
-    </path>
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.explorer" />
@@ -61,22 +60,18 @@
   </target>
 
   <target name="jars" depends="compile,patch">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-explorer.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-explorer.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -91,6 +86,21 @@
     </makenbm>
   </target>
 
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.explorer" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="ExplorerAPI"/>
+      <property name="javadoc.title" value="Explorer API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <property name="javadoc.arch" location="../arch/arch-openide-explorer.xml"/>
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+
   <target name="clean">
     <delete dir="src/org/openide" />
     <delete>
@@ -101,6 +111,7 @@
     <delete file="manifest-subst.mf"/>
     <delete file="treefs.nbm"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
   </target>
Index: openide/explorer/manifest.mf
===================================================================
RCS file: /cvs/openide/explorer/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/explorer/manifest.mf	21 Aug 2003 09:21:38 -0000	1.2
+++ openide/explorer/manifest.mf	15 Oct 2003 08:34:19 -0000
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.explorer/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0,org.openide.nodes/1 > 1.0,org.openide.dialogs/1 > 1.0, org.openide.options/1 > 1.0, org.openide.awt/1 > 1.0
+OpenIDE-Module: org.openide.explorer
+OpenIDE-Module-Module-Dependencies: org.openide.util > 4.20, org.openide.nodes > 4.20,org.openide.dialogs > 4.20, org.openide.options > 4.20, org.openide.awt > 4.20
 X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: openide/fs/.cvsignore
===================================================================
RCS file: /cvs/openide/fs/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/fs/.cvsignore	21 Aug 2003 09:21:40 -0000	1.2
+++ openide/fs/.cvsignore	15 Oct 2003 08:34:19 -0000
@@ -1,3 +1,4 @@
 src
 netbeans
 manifest-subst.mf
+javadoc
Index: openide/fs/build.xml
===================================================================
RCS file: /cvs/openide/fs/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- openide/fs/build.xml	25 Aug 2003 19:28:48 -0000	1.3
+++ openide/fs/build.xml	15 Oct 2003 08:34:19 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,12 +22,12 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
+
+  <path id="classpath" >
+    <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
+  </path>
   
   <target name="compile" >
-    <path id="classpath" >
-      <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
-    </path>
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.fs" />
@@ -102,22 +102,18 @@
   </target>
 
   <target name="jars" depends="compile,patch">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-fs.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-fs.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -132,11 +128,27 @@
     </makenbm>
   </target>
 
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.fs" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="FsAPI"/>
+      <property name="javadoc.title" value="FileSystems API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <property name="javadoc.arch" location="../arch/arch-openide-filesystems.xml"/>
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+
   <target name="clean">
     <delete dir="src" />
     <delete file="manifest-subst.mf"/>
     <delete file="treefs.nbm"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
   </target>
Index: openide/fs/manifest.mf
===================================================================
RCS file: /cvs/openide/fs/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/fs/manifest.mf	21 Aug 2003 09:21:40 -0000	1.2
+++ openide/fs/manifest.mf	15 Oct 2003 08:34:19 -0000
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.filesystems/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1
+OpenIDE-Module: org.openide.filesystems
+OpenIDE-Module-Module-Dependencies: org.openide.util > 4.20
 X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: openide/loaders/src/org/openide/actions/CustomizeBeanAction.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/actions/CustomizeBeanAction.java,v
retrieving revision 1.3
diff -u -r1.3 CustomizeBeanAction.java
--- openide/loaders/src/org/openide/actions/CustomizeBeanAction.java	27 Aug 2003 20:34:59 -0000	1.3
+++ openide/loaders/src/org/openide/actions/CustomizeBeanAction.java	15 Oct 2003 08:34:19 -0000
@@ -99,7 +99,7 @@
     }
 
     protected String resourceIcon () {
-        return "/org/openide/resources/actions/customize.gif"; // NOI18N
+        return "/org/openide/actions/customize.gif"; // NOI18N
     }
 
     /** Customize a Bean.
Index: openide/loaders/src/org/openide/actions/NewTemplateAction.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/actions/NewTemplateAction.java,v
retrieving revision 1.6
diff -u -r1.6 NewTemplateAction.java
--- openide/loaders/src/org/openide/actions/NewTemplateAction.java	27 Aug 2003 20:39:09 -0000	1.6
+++ openide/loaders/src/org/openide/actions/NewTemplateAction.java	15 Oct 2003 08:34:19 -0000
@@ -169,7 +169,7 @@
     }
 
     protected String iconResource () {
-        return "org/openide/resources/actions/new.gif"; // NOI18N
+        return "org/openide/actions/new.gif"; // NOI18N
     }
     
     public JMenuItem getMenuPresenter() {
Index: openide/loaders/src/org/openide/actions/SaveAllAction.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/actions/SaveAllAction.java,v
retrieving revision 1.4
diff -u -r1.4 SaveAllAction.java
--- openide/loaders/src/org/openide/actions/SaveAllAction.java	6 Sep 2003 16:12:23 -0000	1.4
+++ openide/loaders/src/org/openide/actions/SaveAllAction.java	15 Oct 2003 08:34:19 -0000
@@ -59,7 +59,7 @@
     }
 
     protected String iconResource () {
-        return "org/openide/resources/actions/saveAll.gif"; // NOI18N
+        return "org/openide/actions/saveAll.gif"; // NOI18N
     }
 
     public void performAction() {
Index: openide/loaders/src/org/openide/actions/customize.gif
===================================================================
RCS file: openide/loaders/src/org/openide/actions/customize.gif
diff -N openide/loaders/src/org/openide/actions/customize.gif
Binary files /dev/null and customize.gif differ
Index: openide/loaders/src/org/openide/actions/new.gif
===================================================================
RCS file: openide/loaders/src/org/openide/actions/new.gif
diff -N openide/loaders/src/org/openide/actions/new.gif
Binary files /dev/null and new.gif differ
Index: openide/loaders/src/org/openide/actions/saveAll.gif
===================================================================
RCS file: openide/loaders/src/org/openide/actions/saveAll.gif
diff -N openide/loaders/src/org/openide/actions/saveAll.gif
Binary files /dev/null and saveAll.gif differ
Index: openide/loaders/src/org/openide/loaders/BrokenDataShadow.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/loaders/BrokenDataShadow.java,v
retrieving revision 1.2
diff -u -r1.2 BrokenDataShadow.java
--- openide/loaders/src/org/openide/loaders/BrokenDataShadow.java	2 Apr 2003 09:45:47 -0000	1.2
+++ openide/loaders/src/org/openide/loaders/BrokenDataShadow.java	15 Oct 2003 08:34:19 -0000
@@ -213,7 +213,7 @@
         /** the sheet computed for this node or null */
         private Sheet sheet;
 
-        private static final String ICON_NAME = "org/openide/resources/brokenShadow"; // NOI18N
+        private static final String ICON_NAME = "org/openide/loaders/brokenShadow"; // NOI18N
 
         /** Create a node.
          * @param broken data shadow
Index: openide/loaders/src/org/openide/loaders/DataFolder.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/loaders/DataFolder.java,v
retrieving revision 1.11
diff -u -r1.11 DataFolder.java
--- openide/loaders/src/org/openide/loaders/DataFolder.java	9 Sep 2003 19:59:56 -0000	1.11
+++ openide/loaders/src/org/openide/loaders/DataFolder.java	15 Oct 2003 08:34:19 -0000
@@ -68,7 +68,7 @@
 
     /** Icon resource string for folder node */
     static final String FOLDER_ICON_BASE =
-        "org/openide/resources/defaultFolder"; // NOI18N
+        "org/openide/loaders/defaultFolder"; // NOI18N
 
     /** name of a shadow file for a root */
     private static final String ROOT_SHADOW_NAME = "Root"; // NOI18N
Index: openide/loaders/src/org/openide/loaders/InstanceDataObject.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/loaders/InstanceDataObject.java,v
retrieving revision 1.7
diff -u -r1.7 InstanceDataObject.java
--- openide/loaders/src/org/openide/loaders/InstanceDataObject.java	3 Jul 2003 09:32:47 -0000	1.7
+++ openide/loaders/src/org/openide/loaders/InstanceDataObject.java	15 Oct 2003 08:34:20 -0000
@@ -468,7 +468,7 @@
         public UnrecognizedSettingNode() {
             super(Children.LEAF);
             setName(NbBundle.getMessage(InstanceDataObject.class, "LBL_BrokenSettings")); //NOI18N
-            setIconBase("org/openide/resources/instanceBroken"); //NOI18N
+            setIconBase("org/openide/loaders/instanceBroken"); //NOI18N
             setShortDescription(InstanceDataObject.this.getPrimaryFile().toString());
         }
 
Index: openide/loaders/src/org/openide/loaders/InstanceNode.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/loaders/InstanceNode.java,v
retrieving revision 1.2
diff -u -r1.2 InstanceNode.java
--- openide/loaders/src/org/openide/loaders/InstanceNode.java	2 Apr 2003 09:45:57 -0000	1.2
+++ openide/loaders/src/org/openide/loaders/InstanceNode.java	15 Oct 2003 08:34:20 -0000
@@ -45,7 +45,7 @@
     
     /** icon base */
     private static final String INSTANCE_ICON_BASE =
-        "org/openide/resources/instanceObject"; // NOI18N
+        "org/openide/loaders/instanceObject"; // NOI18N
     
     /** File extension for xml settings. */
     private static final String XML_EXT = "settings"; //NOI18N
@@ -106,7 +106,7 @@
         InstanceCookie.Of ic = ic();
         String iconBase = INSTANCE_ICON_BASE;
         if (ic == null) {//XXX && io.instanceOf(XMLSettingsSupport.BrokenSettings.class)) {
-            iconBase = "org/openide/resources/instanceBroken"; // NOI18N
+            iconBase = "org/openide/loaders/instanceBroken"; // NOI18N
         }
         setIconBase(iconBase);
     }
@@ -232,7 +232,7 @@
                 if (icon instanceof ImageIcon) {
                     beanInfoIcon = ((ImageIcon)icon).getImage();
                 } else {
-                    beanInfoIcon = Utilities.loadImage("org/openide/resources/actions/empty.gif", true); // NOI18N
+                    beanInfoIcon = Utilities.loadImage("org/openide/loaders/empty.gif", true); // NOI18N
                 }
             }
         } catch (Exception e) {
Index: openide/loaders/src/org/openide/loaders/XMLDataObject.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/loaders/XMLDataObject.java,v
retrieving revision 1.6
diff -u -r1.6 XMLDataObject.java
--- openide/loaders/src/org/openide/loaders/XMLDataObject.java	29 Sep 2003 22:52:37 -0000	1.6
+++ openide/loaders/src/org/openide/loaders/XMLDataObject.java	15 Oct 2003 08:34:20 -0000
@@ -1808,7 +1808,7 @@
 
         if (n == null) {
             DataNode d = new DataNode (XMLDataObject.this, Children.LEAF);
-            d.setIconBase ("org/openide/resources/xmlObject"); // NOI18N
+            d.setIconBase ("org/openide/loaders/xmlObject"); // NOI18N
             d.setDefaultAction (SystemAction.get (OpenAction.class));
             return d;
         } else {
Index: openide/loaders/src/org/openide/loaders/brokenShadow.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/brokenShadow.gif
diff -N openide/loaders/src/org/openide/loaders/brokenShadow.gif
Binary files /dev/null and brokenShadow.gif differ
Index: openide/loaders/src/org/openide/loaders/brokenShadow32.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/brokenShadow32.gif
diff -N openide/loaders/src/org/openide/loaders/brokenShadow32.gif
Binary files /dev/null and brokenShadow32.gif differ
Index: openide/loaders/src/org/openide/loaders/defaultFolder.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/defaultFolder.gif
diff -N openide/loaders/src/org/openide/loaders/defaultFolder.gif
Binary files /dev/null and defaultFolder.gif differ
Index: openide/loaders/src/org/openide/loaders/defaultFolder32.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/defaultFolder32.gif
diff -N openide/loaders/src/org/openide/loaders/defaultFolder32.gif
Binary files /dev/null and defaultFolder32.gif differ
Index: openide/loaders/src/org/openide/loaders/defaultFolderOpen.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/defaultFolderOpen.gif
diff -N openide/loaders/src/org/openide/loaders/defaultFolderOpen.gif
Binary files /dev/null and defaultFolderOpen.gif differ
Index: openide/loaders/src/org/openide/loaders/defaultFolderOpen32.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/defaultFolderOpen32.gif
diff -N openide/loaders/src/org/openide/loaders/defaultFolderOpen32.gif
Binary files /dev/null and defaultFolderOpen32.gif differ
Index: openide/loaders/src/org/openide/loaders/empty.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/empty.gif
diff -N openide/loaders/src/org/openide/loaders/empty.gif
Binary files /dev/null and empty.gif differ
Index: openide/loaders/src/org/openide/loaders/instanceBroken.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/instanceBroken.gif
diff -N openide/loaders/src/org/openide/loaders/instanceBroken.gif
Binary files /dev/null and instanceBroken.gif differ
Index: openide/loaders/src/org/openide/loaders/instanceObject.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/instanceObject.gif
diff -N openide/loaders/src/org/openide/loaders/instanceObject.gif
Binary files /dev/null and instanceObject.gif differ
Index: openide/loaders/src/org/openide/loaders/instanceObject32.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/instanceObject32.gif
diff -N openide/loaders/src/org/openide/loaders/instanceObject32.gif
Binary files /dev/null and instanceObject32.gif differ
Index: openide/loaders/src/org/openide/loaders/xmlObject.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/xmlObject.gif
diff -N openide/loaders/src/org/openide/loaders/xmlObject.gif
Binary files /dev/null and xmlObject.gif differ
Index: openide/loaders/src/org/openide/loaders/xmlObject32.gif
===================================================================
RCS file: openide/loaders/src/org/openide/loaders/xmlObject32.gif
diff -N openide/loaders/src/org/openide/loaders/xmlObject32.gif
Binary files /dev/null and xmlObject32.gif differ
Index: openide/loaders/src/org/openide/resources/sessionsettings-1_0.dtd
===================================================================
RCS file: openide/loaders/src/org/openide/resources/sessionsettings-1_0.dtd
diff -N openide/loaders/src/org/openide/resources/sessionsettings-1_0.dtd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/loaders/src/org/openide/resources/sessionsettings-1_0.dtd	15 Oct 2003 08:34:20 -0000
@@ -0,0 +1,46 @@
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 2001 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+
+<!--
+-//NetBeans//DTD Session settings 1.0//EN
+Represents session settings
+either a default instance or a serialized bean.
+-->
+
+<!ELEMENT settings      (module?, instanceof*, (instance | serialdata)) >
+<!ATTLIST settings
+          version       (1.0) "1.0"
+>
+
+<!ELEMENT module        EMPTY >
+<!ATTLIST module
+          name          CDATA   #IMPLIED
+          spec          CDATA   #IMPLIED
+          impl          CDATA   #IMPLIED
+>
+
+<!ELEMENT instanceof    EMPTY >
+<!ATTLIST instanceof
+          class         CDATA   #REQUIRED
+>
+
+<!ELEMENT instance      EMPTY >
+<!ATTLIST instance
+          class         CDATA   #REQUIRED
+          method        CDATA   #IMPLIED
+>
+
+<!ELEMENT serialdata    (#PCDATA) >
+<!ATTLIST serialdata
+          class         CDATA   #REQUIRED
+>
Index: openide/loaders/src/org/openide/resources/xmlinfo.dtd
===================================================================
RCS file: openide/loaders/src/org/openide/resources/xmlinfo.dtd
diff -N openide/loaders/src/org/openide/resources/xmlinfo.dtd
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/loaders/src/org/openide/resources/xmlinfo.dtd	15 Oct 2003 08:34:20 -0000
@@ -0,0 +1,11 @@
+  <!ELEMENT Info (Processor*,Icon?)>
+
+  <!ELEMENT Processor EMPTY>
+  <!ATTLIST Processor
+    class CDATA #REQUIRED
+  >
+
+  <!ELEMENT Icon EMPTY>
+  <!ATTLIST Icon
+    base CDATA #REQUIRED
+  >
Index: openide/modules/.cvsignore
===================================================================
RCS file: /cvs/openide/modules/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/modules/.cvsignore	21 Aug 2003 09:21:41 -0000	1.2
+++ openide/modules/.cvsignore	15 Oct 2003 08:34:21 -0000
@@ -1,3 +1,4 @@
 src
 netbeans
 manifest-subst.mf
+javadoc
Index: openide/modules/build.xml
===================================================================
RCS file: /cvs/openide/modules/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- openide/modules/build.xml	25 Aug 2003 19:28:49 -0000	1.3
+++ openide/modules/build.xml	15 Oct 2003 08:34:21 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,13 +22,12 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   
+  <path id="classpath" >
+    <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
+  </path>
 
   <target name="compile" >
-    <path id="classpath" >
-      <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
-    </path>
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.modules" />
@@ -36,22 +35,20 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-modules.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-modules.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
+    <copy file="../manifest.mf" tofile="../manifest-subst.mf" filtering="on"/>
+    <jar jarfile="netbeans/lib/openide-placeholder.jar" manifest="../manifest-subst.mf"/>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -66,11 +63,28 @@
     </makenbm>
   </target>
 
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.modules" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="ModulesAPI"/>
+      <property name="javadoc.title" value="Modules API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <property name="javadoc.arch" location="../arch/arch-openide-modules.xml"/>
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+
+
   <target name="clean">
     <delete dir="src" />
     <delete file="manifest-subst.mf"/>
     <delete file="modules.nbm"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
   </target>
Index: openide/modules/manifest.mf
===================================================================
RCS file: /cvs/openide/modules/manifest.mf,v
retrieving revision 1.3
diff -u -r1.3 manifest.mf
--- openide/modules/manifest.mf	25 Aug 2003 19:29:45 -0000	1.3
+++ openide/modules/manifest.mf	15 Oct 2003 08:34:21 -0000
@@ -1,17 +1,16 @@
 Manifest-Version: 1.0
 X-Comment: CAREFUL; Specification-Title, Specification-Version, and Implementation-Version should not be changed gratuitously (they are used by Modules API!)
 Specification-Title: IDE/1
-X-Comment-2: change specification version in openide-spec-vers.properties
-Specification-Version: @SPEC_VERS_SUBST@
+Specification-Version: 4.20
 Specification-Vendor: NetBeans
 Implementation-Title: NetBeans Modules API
 Implementation-Version: @BUILD_NUMBER_SUBST@
 Implementation-Vendor: NetBeans
-OpenIDE-Module: org.openide.modules/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1
+OpenIDE-Module: org.openide.modules
+OpenIDE-Module-Module-Dependencies: org.openide.util > 4.20
 X-Comment-3: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
 Name: /org/openide/modules/
Index: openide/nodes/.cvsignore
===================================================================
RCS file: /cvs/openide/nodes/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/nodes/.cvsignore	21 Aug 2003 09:21:43 -0000	1.2
+++ openide/nodes/.cvsignore	15 Oct 2003 08:34:21 -0000
@@ -1,3 +1,4 @@
 src
 netbeans
 manifest-subst.mf
+javadoc
Index: openide/nodes/build.xml
===================================================================
RCS file: /cvs/openide/nodes/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- openide/nodes/build.xml	25 Aug 2003 19:28:49 -0000	1.3
+++ openide/nodes/build.xml	15 Oct 2003 08:34:21 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,14 +22,14 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
 
+  <path id="classpath" >
+    <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
+    <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
+    <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar" />
+  </path>
+  
   <target name="compile" >
-    <path id="classpath" >
-      <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
-      <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
-      <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar" />
-    </path>
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.nodes" />
@@ -56,24 +56,20 @@
   </target>
 
   <target name="jars" depends="compile,patch">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-nodes.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-      <!-- will be included by openide-actions.jar -->
-      <exclude name="org/openide/cookies/InstanceCookie$$Origin.class" />
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-nodes.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <!-- will be included by openide-actions.jar -->
+        <exclude name="org/openide/cookies/InstanceCookie$$Origin.class" />
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -88,10 +84,27 @@
     </makenbm>
   </target>
 
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.nodes" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="NodesAPI"/>
+      <property name="javadoc.title" value="Nodes API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <property name="javadoc.arch" location="../arch/arch-openide-nodes.xml"/>
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+
+
   <target name="clean">
     <delete dir="src" />
     <delete file="manifest-subst.mf"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
   </target>
Index: openide/nodes/manifest.mf
===================================================================
RCS file: /cvs/openide/nodes/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/nodes/manifest.mf	21 Aug 2003 09:21:43 -0000	1.2
+++ openide/nodes/manifest.mf	15 Oct 2003 08:34:21 -0000
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.nodes/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.awt/1 > 1.0
+OpenIDE-Module: org.openide.nodes
+OpenIDE-Module-Module-Dependencies: org.openide.util > 4.20, org.openide.dialogs > 4.20, org.openide.awt > 4.20
 X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: openide/options/.cvsignore
===================================================================
RCS file: /cvs/openide/options/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/options/.cvsignore	21 Aug 2003 09:21:44 -0000	1.2
+++ openide/options/.cvsignore	15 Oct 2003 08:34:21 -0000
@@ -1,3 +1,4 @@
 src
 netbeans
 manifest-subst.mf
+javadoc
Index: openide/options/build.xml
===================================================================
RCS file: /cvs/openide/options/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- openide/options/build.xml	25 Aug 2003 19:28:49 -0000	1.3
+++ openide/options/build.xml	15 Oct 2003 08:34:21 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,12 +22,12 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   
+  <path id="classpath" >
+    <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
+  </path>
+    
   <target name="compile" >
-    <path id="classpath" >
-      <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
-    </path>
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.options" />
@@ -35,22 +35,18 @@
   </target>
 
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-options.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-options.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -65,11 +61,27 @@
     </makenbm>
   </target>
 
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.options" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="OptionsAPI"/>
+      <property name="javadoc.title" value="Options API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <property name="javadoc.arch" location="../arch/arch-openide-settings.xml"/>
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+
   <target name="clean">
     <delete dir="src" />
     <delete file="manifest-subst.mf"/>
     <delete file="treefs.nbm"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
   </target>
Index: openide/options/manifest.mf
===================================================================
RCS file: /cvs/openide/options/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/options/manifest.mf	21 Aug 2003 09:21:44 -0000	1.2
+++ openide/options/manifest.mf	15 Oct 2003 08:34:21 -0000
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.options/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1
+OpenIDE-Module: org.openide.options
+OpenIDE-Module-Module-Dependencies: org.openide.util > 4.20
 X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: openide/src/org/openide/resources/brokenShadow.gif
===================================================================
RCS file: openide/src/org/openide/resources/brokenShadow.gif
diff -N openide/src/org/openide/resources/brokenShadow.gif
Binary files /tmp/cvsSsaajk and /dev/null differ
Index: openide/src/org/openide/resources/brokenShadow32.gif
===================================================================
RCS file: openide/src/org/openide/resources/brokenShadow32.gif
diff -N openide/src/org/openide/resources/brokenShadow32.gif
Binary files /tmp/cvsTsaajk and /dev/null differ
Index: openide/src/org/openide/resources/defaultFolder.gif
===================================================================
RCS file: openide/src/org/openide/resources/defaultFolder.gif
diff -N openide/src/org/openide/resources/defaultFolder.gif
Binary files /tmp/cvsUsaajk and /dev/null differ
Index: openide/src/org/openide/resources/defaultFolder32.gif
===================================================================
RCS file: openide/src/org/openide/resources/defaultFolder32.gif
diff -N openide/src/org/openide/resources/defaultFolder32.gif
Binary files /tmp/cvsVsaajk and /dev/null differ
Index: openide/src/org/openide/resources/defaultFolderOpen.gif
===================================================================
RCS file: openide/src/org/openide/resources/defaultFolderOpen.gif
diff -N openide/src/org/openide/resources/defaultFolderOpen.gif
Binary files /tmp/cvsWsaajk and /dev/null differ
Index: openide/src/org/openide/resources/defaultFolderOpen32.gif
===================================================================
RCS file: openide/src/org/openide/resources/defaultFolderOpen32.gif
diff -N openide/src/org/openide/resources/defaultFolderOpen32.gif
Binary files /tmp/cvsXsaajk and /dev/null differ
Index: openide/src/org/openide/resources/groupShadow.gif
===================================================================
RCS file: openide/src/org/openide/resources/groupShadow.gif
diff -N openide/src/org/openide/resources/groupShadow.gif
Binary files /tmp/cvsYsaajk and /dev/null differ
Index: openide/src/org/openide/resources/groupShadow32.gif
===================================================================
RCS file: openide/src/org/openide/resources/groupShadow32.gif
diff -N openide/src/org/openide/resources/groupShadow32.gif
Binary files /tmp/cvsZsaajk and /dev/null differ
Index: openide/src/org/openide/resources/instanceBroken.gif
===================================================================
RCS file: openide/src/org/openide/resources/instanceBroken.gif
diff -N openide/src/org/openide/resources/instanceBroken.gif
Binary files /tmp/cvs0saajk and /dev/null differ
Index: openide/src/org/openide/resources/instanceObject.gif
===================================================================
RCS file: openide/src/org/openide/resources/instanceObject.gif
diff -N openide/src/org/openide/resources/instanceObject.gif
Binary files /tmp/cvs1saajk and /dev/null differ
Index: openide/src/org/openide/resources/instanceObject32.gif
===================================================================
RCS file: openide/src/org/openide/resources/instanceObject32.gif
diff -N openide/src/org/openide/resources/instanceObject32.gif
Binary files /tmp/cvs2saajk and /dev/null differ
Index: openide/src/org/openide/resources/sessionsettings-1_0.dtd
===================================================================
RCS file: openide/src/org/openide/resources/sessionsettings-1_0.dtd
diff -N openide/src/org/openide/resources/sessionsettings-1_0.dtd
--- openide/src/org/openide/resources/sessionsettings-1_0.dtd	29 Aug 2001 21:58:35 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-<!--
-                Sun Public License Notice
-
-The contents of this file are subject to the Sun Public License
-Version 1.0 (the "License"). You may not use this file except in
-compliance with the License. A copy of the License is available at
-http://www.sun.com/
-
-The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 2001 Sun
-Microsystems, Inc. All Rights Reserved.
--->
-
-<!--
--//NetBeans//DTD Session settings 1.0//EN
-Represents session settings
-either a default instance or a serialized bean.
--->
-
-<!ELEMENT settings      (module?, instanceof*, (instance | serialdata)) >
-<!ATTLIST settings
-          version       (1.0) "1.0"
->
-
-<!ELEMENT module        EMPTY >
-<!ATTLIST module
-          name          CDATA   #IMPLIED
-          spec          CDATA   #IMPLIED
-          impl          CDATA   #IMPLIED
->
-
-<!ELEMENT instanceof    EMPTY >
-<!ATTLIST instanceof
-          class         CDATA   #REQUIRED
->
-
-<!ELEMENT instance      EMPTY >
-<!ATTLIST instance
-          class         CDATA   #REQUIRED
-          method        CDATA   #IMPLIED
->
-
-<!ELEMENT serialdata    (#PCDATA) >
-<!ATTLIST serialdata
-          class         CDATA   #REQUIRED
->
Index: openide/src/org/openide/resources/xmlError.gif
===================================================================
RCS file: openide/src/org/openide/resources/xmlError.gif
diff -N openide/src/org/openide/resources/xmlError.gif
Binary files /tmp/cvs4saajk and /dev/null differ
Index: openide/src/org/openide/resources/xmlError32.gif
===================================================================
RCS file: openide/src/org/openide/resources/xmlError32.gif
diff -N openide/src/org/openide/resources/xmlError32.gif
Binary files /tmp/cvs5saajk and /dev/null differ
Index: openide/src/org/openide/resources/xmlObject.gif
===================================================================
RCS file: openide/src/org/openide/resources/xmlObject.gif
diff -N openide/src/org/openide/resources/xmlObject.gif
Binary files /tmp/cvs6saajk and /dev/null differ
Index: openide/src/org/openide/resources/xmlObject32.gif
===================================================================
RCS file: openide/src/org/openide/resources/xmlObject32.gif
diff -N openide/src/org/openide/resources/xmlObject32.gif
Binary files /tmp/cvs7saajk and /dev/null differ
Index: openide/src/org/openide/resources/xmlinfo.dtd
===================================================================
RCS file: openide/src/org/openide/resources/xmlinfo.dtd
diff -N openide/src/org/openide/resources/xmlinfo.dtd
--- openide/src/org/openide/resources/xmlinfo.dtd	26 Feb 2001 14:19:50 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-  <!ELEMENT Info (Processor*,Icon?)>
-
-  <!ELEMENT Processor EMPTY>
-  <!ATTLIST Processor
-    class CDATA #REQUIRED
-  >
-
-  <!ELEMENT Icon EMPTY>
-  <!ATTLIST Icon
-    base CDATA #REQUIRED
-  >
Index: openide/src/org/openide/resources/actions/customize.gif
===================================================================
RCS file: openide/src/org/openide/resources/actions/customize.gif
diff -N openide/src/org/openide/resources/actions/customize.gif
Binary files /tmp/cvs9saajk and /dev/null differ
Index: openide/src/org/openide/resources/actions/new.gif
===================================================================
RCS file: openide/src/org/openide/resources/actions/new.gif
diff -N openide/src/org/openide/resources/actions/new.gif
Binary files /tmp/cvs.saajk and /dev/null differ
Index: openide/src/org/openide/resources/actions/saveAll.gif
===================================================================
RCS file: openide/src/org/openide/resources/actions/saveAll.gif
diff -N openide/src/org/openide/resources/actions/saveAll.gif
Binary files /tmp/cvs_saajk and /dev/null differ
Index: openide/test/cfg-stdalone.xml
===================================================================
RCS file: openide/test/cfg-stdalone.xml
diff -N openide/test/cfg-stdalone.xml
--- openide/test/cfg-stdalone.xml	6 Feb 2002 12:01:23 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-                Sun Public License Notice
-
-The contents of this file are subject to the Sun Public License
-Version 1.0 (the "License"). You may not use this file except in
-compliance with the License. A copy of the License is available at
-http://www.sun.com/
-
-The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
-Microsystems, Inc. All Rights Reserved.
--->
-<!DOCTYPE mconfig PUBLIC "-//NetBeans//DTD XTest cfg 1.0//EN" "http://www.netbeans.org/dtds/xtest-cfg-1_0.dtd">
-<mconfig>
-    <testbag testattribs="stable" name="testbag_1" resultsprocessor="unit">
-        <testset dir="stdalone/src">
-            <patternset>
-                <include name="org/openide/stdalonetest/*.class"/>
-            </patternset>
-        </testset>      
-    </testbag>
-    <executor name="code" default="true" antfile="stdalone-build.xml" target="run"/>
-    <compiler name="unit-compiler" default="true" antfile="stdalone-build.xml" target="build"/>
-    <resultsprocessor name="unit" antfile="stdalone-build.xml" target="test_report" default="true"/>
-</mconfig>
Index: openide/test/stdalone-build.xml
===================================================================
RCS file: openide/test/stdalone-build.xml
diff -N openide/test/stdalone-build.xml
--- openide/test/stdalone-build.xml	6 Feb 2002 12:01:23 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-                Sun Public License Notice
-
-The contents of this file are subject to the Sun Public License
-Version 1.0 (the "License"). You may not use this file except in
-compliance with the License. A copy of the License is available at
-http://www.sun.com/
-
-The Original Code is NetBeans. The Initial Developer of the Original
-Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
-Microsystems, Inc. All Rights Reserved.
--->
-<!--
-See #17431.
-Author: Jesse Glick
--->
-<project name="build stdalone tests" basedir="." default="runtests">
-    <property name="nbroot" location="../.."/>
-    <property name="build.sysclasspath" value="ignore"/>
-    <property name="xtest.module" value="openide"/>
-    <property name="xtest.home" location="${nbroot}/xtest"/>
-    <property name="xtest.testtype" value="stdalone"/>
-    <property name="xtest.attribs" value="stable"/>
-    <property name="xtest.executors" value="code"/>
-    <property name="xtest.module_harness.antfile" location="${xtest.home}/lib/module_harness.xml"/>
-    <property name="classfile.jar" location="${nbroot}/classfile/netbeans/modules/autoload/classfile.jar"/>
-    <property name="xtest.extra.jars" value="${classfile.jar}"/>
-    <property name="xtest.source.location" value="src"/>
-    <property name="compile.srcdir" value="stdalone/src"/>
-    <property name="openide.root" location="${nbroot}/openide"/>
-    <target name="all" depends="build"/>
-    <target name="build">
-        <ant dir="${nbroot}/classfile"/>
-        <ant dir="${nbroot}/openide" target="jars"/>
-        <ant dir="${nbroot}/openide" target="jars-with-lib"/>
-        <ant dir="." antfile="${xtest.module_harness.antfile}" target="buildtests"/>
-    </target>
-    <target name="run">
-        <echo file="stdalone/src/org/openide/stdalonetest/data/run.properties">
-        openide.root=${openide.root}
-        </echo>
-        <ant dir="." antfile="${xtest.module_harness.antfile}" target="test">
-            <property name="xtest.exectype" value="code"/>
-        </ant>
-    </target>
-    <target name="buildtests">
-       <ant dir="." antfile="${xtest.module_harness.antfile}" target="compiler-launcher"/>
-    </target>
-    <target name="cleantests">
-       <delete file="stdalone/src/org/openide/stdalonetest/data/run.properties"/>
-       <ant dir="." antfile="${xtest.module_harness.antfile}" target="cleantests"/>
-    </target> 
-    <target name="runtests" depends="buildtests">
-        <echo message="Module: Running tests for ${xtest.module}, testtype ${xtest.testtype}, attribs=${xtest.attribs}"/>
-        <ant dir="." antfile="${xtest.module_harness.antfile}" target="runtests"/>
-    </target>
-    <target name="test_report">
-        <ant dir="." antfile="${xtest.module_harness.antfile}" target="test_report"/>
-    </target>
-    <target name="cleanresults">
-        <ant dir="." antfile="${xtest.module_harness.antfile}" target="cleanresults"/>
-    </target>
-    <target name="realclean" depends="cleantests,cleanresults">
-        <ant dir="." antfile="${xtest.module_harness.antfile}" target="realclean"/>
-    </target>
-    <target name="printconfig">
-        <echo message="Default config is testtype: ${xtest.testtype}, attributes: ${xtest.attribs}."/>
-    </target>
-</project>
Index: openide/test/stdalone/src/org/openide/stdalonetest/TestClassResolution.java
===================================================================
RCS file: openide/test/stdalone/src/org/openide/stdalonetest/TestClassResolution.java
diff -N openide/test/stdalone/src/org/openide/stdalonetest/TestClassResolution.java
--- openide/test/stdalone/src/org/openide/stdalonetest/TestClassResolution.java	21 Mar 2002 16:56:16 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,189 +0,0 @@
-/*
- *                 Sun Public License Notice
- *
- * The contents of this file are subject to the Sun Public License
- * Version 1.0 (the "License"). You may not use this file except in
- * compliance with the License. A copy of the License is available at
- * http://www.sun.com/
- *
- * The Original Code is NetBeans. The Initial Developer of the Original
- * Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
- * Microsystems, Inc. All Rights Reserved.
- */
-
-package org.openide.stdalonetest;
-
-import org.netbeans.junit.*;
-import junit.textui.TestRunner;
-import org.netbeans.modules.classfile.*;
-import java.util.zip.*;
-import java.util.jar.*;
-import java.util.*;
-import java.io.*;
-
-/** Test that classes loaded from library JARs do not contain
- * references to classes they cannot resolve.
- * @author Jesse Glick
- */
-public class TestClassResolution extends TestInfraHid {
-    
-    public TestClassResolution(String name) {
-        super(name);
-    }
-    
-    public static void main(String[] args) {
-        TestRunner.run(new NbTestSuite(TestClassResolution.class));
-    }
-    
-    // This is tricky. Actually *all* inner classes get constant
-    // pool entries. In most cases the inner classes are used in
-    // other ways than being listed as Inner-Classes, but it is not
-    // easy to tell. So for now just hardcode the list of inner
-    // class substrings which are known not to be referenced at compile time.
-    private static final String[] dynamicInners = new String[] {
-        "org/openide/nodes/TMUtil$",
-        "org/openide/explorer/propertysheet/PropertyDialogManager$CreateDialogInvoker",
-        "org/openide/explorer/propertysheet/PropertyPanel$PropertySheetSettingsInvoker",
-        "org/openide/explorer/propertysheet/PropertySheet$PropertySheetSettingsInvoker",
-        "org/openide/explorer/propertysheet/PropertySheet$CustomizationInvoker",
-        "org/openide/explorer/propertysheet/PropertySheet$HelpInvoker",
-        "org/openide/explorer/view/DragDropUtilities$WarningInvoker",
-        "org/openide/explorer/ExplorerActions$DestroyInvoker",
-        "org/openide/explorer/ExplorerActions$ConfirmationInvoker",
-        "org/openide/actions/PropertiesAction$ShowPropertiesInvoker",
-        "org/openide/actions/CustomizeAction$CustomizationInvoker",
-        "org/openide/awt/Actions$GlobalKeymapL",
-    };
-    
-    public void testClassResolution() throws Exception {
-        boolean ok = true;
-        for (int i = 0; i < openideLibs.length; i++) {
-            JarFile lib = openideLibs[i];
-            String libname = simpleName(lib);
-            List classpath = new LinkedList(); // List<JarFile>
-            traverseClassPath(lib, classpath);
-            System.err.println("Scanning " + simpleName(lib) + " with classpath " + prettyClasspath(classpath));
-            Enumeration entries = lib.entries();
-            Set resolved = new HashSet(); // Set<String>
-            while (entries.hasMoreElements()) {
-                JarEntry entry = (JarEntry)entries.nextElement();
-                if (entry.isDirectory()) {
-                    continue;
-                }
-                String filename = entry.getName();
-                if (!filename.endsWith(".class")) {
-                    continue;
-                }
-                // Restrict ourselves to searching public entry points.
-                ClassFile cf = new ClassFile(lib.getInputStream(entry));
-                if (!Access.isPublic(cf.getAccess())) {
-                    continue;
-                }
-                String toload = filename.substring(0, filename.length() - 6);
-                // Too much detail:
-                //System.err.println("Found public class " + prettify(toload));
-                if (!load(toload, resolved, classpath, "<<should not happen>>")) {
-                    ok = false;
-                }
-            }
-        }
-        assertTrue("Not all compile-time references were resolvable", ok);
-    }
-    
-    private String prettyClasspath(List classpath) {
-        StringBuffer buf = new StringBuffer();
-        Iterator it = classpath.iterator();
-        while (it.hasNext()) {
-            JarFile j = (JarFile)it.next();
-            if (buf.length() > 0) buf.append(File.pathSeparatorChar);
-            buf.append(simpleName(j));
-        }
-        return buf.toString();
-    }
-    
-    private boolean load(String jvmname, Set resolved, List classpath, String caller) throws IOException {
-        if (jvmname.startsWith("java/") ||
-            jvmname.startsWith("javax/") ||
-            jvmname.startsWith("org/xml/") ||
-            jvmname.startsWith("org/w3c/")
-            ) {
-            // Standard JRE, presumably. Or some extension we are assuming is there.
-            // Or some common library.
-            return true;
-        }
-        if (!resolved.add(jvmname)) {
-            return true;
-        }
-        for (int i = 0; i < dynamicInners.length; i++) {
-            if (jvmname.indexOf(dynamicInners[i]) != -1) {
-                // Skip this one, it is only in the constant pool because
-                // it is an inner class; not actually referred to at compile time.
-                //System.err.println("Skipping " + prettify(jvmname));
-                return true;
-            }
-        }
-        Iterator jars = classpath.iterator();
-        while (jars.hasNext()) {
-            JarFile jar = (JarFile)jars.next();
-            JarEntry entry = jar.getJarEntry(jvmname + ".class");
-            if (entry != null) {
-                ClassFile clazz = new ClassFile(jar.getInputStream(entry));
-                ConstantPool pool = clazz.getConstantPool();
-                Iterator referenced = pool.getAllClassNames().iterator();
-                boolean ok = true;
-                while (referenced.hasNext()) {
-                    ClassName rname = (ClassName)referenced.next();
-                    String other = rname.getType();
-                    while (other.startsWith("[")) {
-                        other = other.substring(1);
-                    }
-                    if (other.length() == 1) {
-                        // Primitive: "Z", etc.
-                        continue;
-                    }
-                    if (!load(other, resolved, classpath, jvmname)) {
-                        ok = false;
-                    }
-                }
-                return ok;
-            }
-        }
-        System.err.println(findSource(caller) + "Could not find class " + prettify(jvmname) + " from " + prettify(caller));
-        return false;
-    }
-    
-    private String prettify(String jvmname) {
-        return jvmname.replace('/', '.').replace('$', '.');
-    }
-    
-    private String findSource(String jvmname) {
-        int idx = jvmname.indexOf('$');
-        if (idx != -1) {
-            jvmname = jvmname.substring(0, idx);
-        }
-        File s = new File(sourcedir, jvmname.replace('/', File.separatorChar) + ".java");
-        return s.isFile() ? (s.getAbsolutePath() + ": ") : ("[missing " + s.getAbsolutePath() + "] ");
-    }
-    
-    private void traverseClassPath(JarFile lib, List classpath) throws IOException {
-        if (!classpath.contains(lib)) {
-            classpath.add(lib);
-            Manifest m = lib.getManifest();
-            Attributes a = m.getMainAttributes();
-            String cp = a.getValue(Attributes.Name.CLASS_PATH);
-            if (cp != null) {
-                StringTokenizer tok = new StringTokenizer(cp, ", ");
-                while (tok.hasMoreTokens()) {
-                    String relurl = tok.nextToken();
-                    File other = new File(new File(lib.getName()).getParentFile(), relurl);
-                    if (other.isFile()) {
-                        traverseClassPath(findJar(other), classpath);
-                    } else {
-                        System.err.println("WARNING: invalid classpath entry " + other);
-                    }
-                }
-            }
-        }
-    }
-    
-}
Index: openide/test/stdalone/src/org/openide/stdalonetest/TestDisjointJARContents.java
===================================================================
RCS file: openide/test/stdalone/src/org/openide/stdalonetest/TestDisjointJARContents.java
diff -N openide/test/stdalone/src/org/openide/stdalonetest/TestDisjointJARContents.java
--- openide/test/stdalone/src/org/openide/stdalonetest/TestDisjointJARContents.java	6 Feb 2002 12:01:23 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,103 +0,0 @@
-/*
- *                 Sun Public License Notice
- *
- * The contents of this file are subject to the Sun Public License
- * Version 1.0 (the "License"). You may not use this file except in
- * compliance with the License. A copy of the License is available at
- * http://www.sun.com/
- *
- * The Original Code is NetBeans. The Initial Developer of the Original
- * Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
- * Microsystems, Inc. All Rights Reserved.
- */
-
-package org.openide.stdalonetest;
-
-import org.netbeans.junit.*;
-import junit.textui.TestRunner;
-import java.util.*;
-import java.util.zip.*;
-import java.util.jar.*;
-
-/** Test that standalone JARs do not overlap.
- * Also that they collectively cover everything not in openide-remainder.jar.
- * @author Jesse Glick
- */
-public class TestDisjointJARContents extends TestInfraHid {
-    
-    public TestDisjointJARContents(String name) {
-        super(name);
-    }
-    
-    public static void main(String[] args) {
-        TestRunner.run(new NbTestSuite(TestDisjointJARContents.class));
-    }
-    
-    public void testDisjointness() throws Exception {
-        JarFile[] jars = new JarFile[openideLibs.length + 1];
-        System.arraycopy(openideLibs, 0, jars, 0, openideLibs.length);
-        jars[openideLibs.length] = openideRemainder;
-        boolean ok = true;
-        Map entries = new HashMap(5000); // Map<String,JarFile>
-        for (int i = 0; i < jars.length; i++) {
-            Enumeration e = jars[i].entries();
-            while (e.hasMoreElements()) {
-                ZipEntry entry = (ZipEntry)e.nextElement();
-                if (entry.isDirectory()) {
-                    continue;
-                }
-                String name = entry.getName();
-                if (name.startsWith("META-INF/")) {
-                    continue;
-                }
-                if (entries.containsKey(name)) {
-                    JarFile first = (JarFile)entries.get(name);
-                    ok = false;
-                    System.err.println("Entry " + name + " in " + simpleName(jars[i]) + " is a duplicate of that in " + simpleName(first));
-                } else {
-                    entries.put(name, jars[i]);
-                }
-            }
-        }
-        assertTrue("There were duplicate JAR entries", ok);
-    }
-    
-    public void testCoverage() throws Exception {
-        JarFile[] jars = new JarFile[openideLibs.length + 1];
-        System.arraycopy(openideLibs, 0, jars, 0, openideLibs.length);
-        jars[openideLibs.length] = openideRemainder;
-        Set entries = new HashSet(5000); // Set<String>
-        for (int i = 0; i < jars.length; i++) {
-            Enumeration e = jars[i].entries();
-            while (e.hasMoreElements()) {
-                ZipEntry entry = (ZipEntry)e.nextElement();
-                if (entry.isDirectory()) {
-                    continue;
-                }
-                String name = entry.getName();
-                if (name.startsWith("META-INF/")) {
-                    continue;
-                }
-                entries.add(name);
-            }
-        }
-        boolean ok = true;
-        Enumeration e = openide.entries();
-        while (e.hasMoreElements()) {
-            ZipEntry entry = (ZipEntry)e.nextElement();
-            if (entry.isDirectory()) {
-                continue;
-            }
-            String name = entry.getName();
-            if (name.startsWith("META-INF/")) {
-                continue;
-            }
-            if (!entries.contains(name)) {
-                ok = false;
-                System.err.println("No part JAR contains " + name);
-            }
-        }
-        assertTrue("All entries in " + simpleName(openide) + " were covered", ok);
-    }
-    
-}
Index: openide/test/stdalone/src/org/openide/stdalonetest/TestInfraHid.java
===================================================================
RCS file: openide/test/stdalone/src/org/openide/stdalonetest/TestInfraHid.java
diff -N openide/test/stdalone/src/org/openide/stdalonetest/TestInfraHid.java
--- openide/test/stdalone/src/org/openide/stdalonetest/TestInfraHid.java	18 Dec 2002 23:41:37 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@
-/*
- *                 Sun Public License Notice
- *
- * The contents of this file are subject to the Sun Public License
- * Version 1.0 (the "License"). You may not use this file except in
- * compliance with the License. A copy of the License is available at
- * http://www.sun.com/
- *
- * The Original Code is NetBeans. The Initial Developer of the Original
- * Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
- * Microsystems, Inc. All Rights Reserved.
- */
-
-package org.openide.stdalonetest;
-
-import org.netbeans.junit.*;
-import junit.textui.TestRunner;
-import java.util.jar.JarFile;
-import java.util.*;
-import java.io.*;
-
-/** Basic infrastructure for testing standalone libs.
- * @author Jesse Glick
- * @see "#17431"
- */
-abstract class TestInfraHid extends NbTestCase {
-    
-    protected TestInfraHid(String name) {
-        super(name);
-    }
-    
-    private static final String[] libnames = new String[] {
-        "openide-util.jar",
-        "openide-fs.jar",
-        "openide-nodes.jar",
-        "openide-explorer.jar",
-        "openide-lookup.jar"
-    };
-
-    protected JarFile openide, openideRemainder;
-    protected JarFile[] openideLibs;
-    protected File sourcedir;
-    private Map jarcache; // Map<File,JarFile>
-    protected void setUp() throws Exception {
-        jarcache = new HashMap();
-        Properties p = new Properties();
-        InputStream is = TestInfraHid.class.getResourceAsStream("data/run.properties");
-        if (is == null) {
-            File where = new File(TestInfraHid.class.getProtectionDomain().getCodeSource().getLocation().getPath());
-            File here = new File(new File(new File(where, "org"), "openide"), "stdalonetest");
-            throw new IllegalStateException("Cannot find run.properties; code source: " + where + " files: " + java.util.Arrays.asList(here.list()));
-        }
-        p.load(is);
-        File openideRoot = new File(p.getProperty("openide.root"));
-        sourcedir = new File(openideRoot, "src");
-        openide = new JarFile(new File(new File(new File(openideRoot, "netbeans"), "lib"), "openide.jar"));
-        jarcache.put(new File(openide.getName()), openide);
-        File stdalone = new File(openideRoot, "standalone");
-        openideRemainder = new JarFile(new File(stdalone, "openide-remainder.jar"));
-        jarcache.put(new File(openideRemainder.getName()), openideRemainder);
-        openideLibs = new JarFile[libnames.length];
-        for (int i = 0; i < libnames.length; i++) {
-            openideLibs[i] = new JarFile(new File(stdalone, libnames[i]));
-            jarcache.put(new File(openideLibs[i].getName()), openideLibs[i]);
-        }
-    }
-    protected void tearDown() throws Exception {
-        Iterator it = jarcache.values().iterator();
-        while (it.hasNext()) {
-            ((JarFile)it.next()).close();
-        }
-    }
-    
-    protected JarFile findJar(File jar) throws IOException {
-        File key = jar.getCanonicalFile();
-        JarFile jf = (JarFile)jarcache.get(key);
-        if (jf == null) {
-            jarcache.put(key, jf = new JarFile(jar));
-        }
-        return jf;
-    }
-    
-    protected String simpleName(JarFile z) {
-        return new File(z.getName()).getName();
-    }
-
-}
Index: openide/test/stdalone/src/org/openide/stdalonetest/data/.cvsignore
===================================================================
RCS file: openide/test/stdalone/src/org/openide/stdalonetest/data/.cvsignore
diff -N openide/test/stdalone/src/org/openide/stdalonetest/data/.cvsignore
--- openide/test/stdalone/src/org/openide/stdalonetest/data/.cvsignore	6 Feb 2002 12:01:24 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-run.properties
Index: openide/text/.cvsignore
===================================================================
RCS file: /cvs/openide/text/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/text/.cvsignore	21 Aug 2003 09:21:48 -0000	1.2
+++ openide/text/.cvsignore	15 Oct 2003 08:34:28 -0000
@@ -2,3 +2,4 @@
 netbeans
 manifest-subst.mf
 gensrc
+javadoc
Index: openide/text/build.xml
===================================================================
RCS file: /cvs/openide/text/build.xml,v
retrieving revision 1.4
diff -u -r1.4 build.xml
--- openide/text/build.xml	25 Aug 2003 19:28:50 -0000	1.4
+++ openide/text/build.xml	15 Oct 2003 08:34:28 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,18 +22,17 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   
+  <path id="classpath" >
+       <pathelement location="${nbroot}/openide/windows/netbeans/lib/openide-windows.jar"/>
+       <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
+       <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
+       <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
+       <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
+       <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
+  </path>
   
   <target name="compile" >
-    <path id="classpath" >
-         <pathelement location="${nbroot}/openide/windows/netbeans/lib/openide-windows.jar"/>
-         <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
-         <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
-         <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
-         <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
-         <pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
-    </path>
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.text" />
@@ -78,22 +77,18 @@
     </target>
   
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-text.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-text.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -108,12 +103,28 @@
     </makenbm>
   </target>
 
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.text" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="TextAPI"/>
+      <property name="javadoc.title" value="Text API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <property name="javadoc.arch" location="../arch/arch-openide-editor.xml"/>
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+
   <target name="clean">
     <delete dir="gensrc" />
     <delete dir="src" />
     <delete file="manifest-subst.mf"/>
     <delete file="treefs.nbm"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
   </target>
Index: openide/text/manifest.mf
===================================================================
RCS file: /cvs/openide/text/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/text/manifest.mf	21 Aug 2003 09:21:49 -0000	1.2
+++ openide/text/manifest.mf	15 Oct 2003 08:34:28 -0000
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.text/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.windows/1 > 1.0, org.openide.nodes/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.options/1 > 1.0, org.openide.awt/1 > 1.0
+OpenIDE-Module: org.openide.text
+OpenIDE-Module-Module-Dependencies: org.openide.util > 4.20, org.openide.windows > 4.20, org.openide.nodes > 4.20, org.openide.dialogs > 4.20, org.openide.options > 4.20, org.openide.awt > 4.20
 X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: openide/util/.cvsignore
===================================================================
RCS file: /cvs/openide/util/.cvsignore,v
retrieving revision 1.3
diff -u -r1.3 .cvsignore
--- openide/util/.cvsignore	21 Aug 2003 09:55:38 -0000	1.3
+++ openide/util/.cvsignore	15 Oct 2003 08:34:28 -0000
@@ -1,2 +1,3 @@
 netbeans
 manifest-subst.mf
+javadoc
Index: openide/util/build.xml
===================================================================
RCS file: /cvs/openide/util/build.xml,v
retrieving revision 1.3
diff -u -r1.3 build.xml
--- openide/util/build.xml	25 Aug 2003 19:28:50 -0000	1.3
+++ openide/util/build.xml	15 Oct 2003 08:34:28 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,12 +22,12 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   
-  <target name="compile" >
-    <path id="classpath" >
+  <path id="classpath" >
       <pathelement location="src" />
-    </path>
+  </path>
+  
+  <target name="compile" >
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="localdir" location="src" />
       <property name="selector" value="openide.util" />
@@ -57,19 +57,15 @@
     <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-util.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-util.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -83,6 +79,22 @@
       <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
     </makenbm>
   </target>
+  
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.util" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="UtilitiesAPI"/>
+      <property name="javadoc.title" value="Utilities API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <property name="javadoc.arch" location="../arch/arch-openide-utilities.xml"/>
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+  
 
   <target name="clean">
     <delete dir="src/org/openide" />
@@ -94,6 +106,7 @@
     <delete file="manifest-subst.mf"/>
     <delete file="treefs.nbm"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
   </target>
Index: openide/util/manifest.mf
===================================================================
RCS file: /cvs/openide/util/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/util/manifest.mf	21 Aug 2003 09:21:50 -0000	1.2
+++ openide/util/manifest.mf	15 Oct 2003 08:34:28 -0000
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.util/1
+OpenIDE-Module: org.openide.util
 X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: openide/windows/.cvsignore
===================================================================
RCS file: /cvs/openide/windows/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- openide/windows/.cvsignore	21 Aug 2003 09:21:51 -0000	1.2
+++ openide/windows/.cvsignore	15 Oct 2003 08:34:28 -0000
@@ -1,3 +1,4 @@
 netbeans
 manifest-subst.mf
 gensrc
+javadoc
Index: openide/windows/build.xml
===================================================================
RCS file: /cvs/openide/windows/build.xml,v
retrieving revision 1.5
diff -u -r1.5 build.xml
--- openide/windows/build.xml	25 Aug 2003 19:28:50 -0000	1.5
+++ openide/windows/build.xml	15 Oct 2003 08:34:28 -0000
@@ -8,7 +8,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-2003 Sun
 Microsystems, Inc. All Rights Reserved.
 -->
 
@@ -22,15 +22,15 @@
 
   <taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
   <taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
-  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
+  
+  <path id="classpath" >
+       <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
+       <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
+       <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
+       <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
+  </path>
   
   <target name="compile" >
-    <path id="classpath" >
-         <pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
-         <pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
-         <pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
-         <pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
-    </path>
     <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
       <property name="include" value="org/openide/awt/HtmlBrowser$$BrowserComponent.java" />
       <property name="localdir" location="src" />
@@ -74,22 +74,18 @@
     </target>
   
   <target name="jars" depends="compile">
-    <mkdir dir="netbeans/modules"/>
+    <mkdir dir="netbeans/lib"/>
     <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
     <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
-    <locjar jarfile="netbeans/lib/openide-windows.jar"
-            manifest="manifest-subst.mf"
-            basedir="src"
-	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
-	    compress="false">
-      <locale name="ja"/>
-    </locjar>
+    <jar jarfile="netbeans/lib/openide-windows.jar" manifest="manifest-subst.mf" compress="false">
+      <fileset dir="src">
+        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
+      </fileset>
+    </jar>
   </target>
 
   <target name="netbeans" depends="jars">
-    <!-- No! Not yet. Not until it is really a module.
     <genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
-    -->
   </target>
 
   <target name="nbm" depends="netbeans">
@@ -104,11 +100,27 @@
     </makenbm>
   </target>
 
+  <target name="javadoc">
+    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
+      <property name="localdir" location="src" />
+      <property name="selector" value="openide.windows" />
+      
+      <property name="javadoc.base" location="."/>
+      <property name="javadoc.name" value="WindowsAPI"/>
+      <property name="javadoc.title" value="Windows API"/>
+      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
+      <property name="javadoc.arch" location="../arch/arch-openide-windowsystem.xml"/>
+      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
+      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
+    </ant>
+  </target>
+
   <target name="clean">
     <delete dir="gensrc" />
     <delete dir="src/org/openide/windows/" />
     <delete file="manifest-subst.mf"/>
     <delete dir="netbeans"/>
+    <delete dir="javadoc"/>
     <delete dir="Info"/>
     <delete dir="reload"/>
     <delete>
Index: openide/windows/manifest.mf
===================================================================
RCS file: /cvs/openide/windows/manifest.mf,v
retrieving revision 1.2
diff -u -r1.2 manifest.mf
--- openide/windows/manifest.mf	21 Aug 2003 09:21:51 -0000	1.2
+++ openide/windows/manifest.mf	15 Oct 2003 08:34:28 -0000
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.windows/1
+OpenIDE-Module: org.openide.windows
 X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.nodes/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.awt/1 > 1.0
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+X-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Module-Dependencies: org.openide.util > 4.20, org.openide.nodes > 4.20, org.openide.dialogs > 4.20, org.openide.awt > 4.20
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Public-Packages: org.openide.**