? openide/actions/src/org/openide/resources
? openide/src/org/netbeans
Index: nbbuild/build.properties
===================================================================
RCS file: /cvs/nbbuild/build.properties,v
retrieving revision 1.105
diff -u -r1.105 build.properties
--- nbbuild/build.properties	29 Sep 2003 23:14:20 -0000	1.105
+++ nbbuild/build.properties	5 Oct 2003 11:58:17 -0000
@@ -308,25 +308,35 @@
 # 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, \
-        openide/compiler, \
-        openide/execution, \
-        openide/io, \
-        openide/deprecated, \
-        openide/loaders, \
-        ant, \
-        core/javahelp, \
-        core/naming, \
-        core/settings, \
-        diff, \
-        java/api, \
-        java/srcmodel, \
-        debuggercore/oldapi, \
-        lexer, \
-        mdr, \
-        vcscore, \
-        xml/api, \
-	tasklist/api
+config.fixedmodules.javadoc=openide/awt, 
+        openide/actions, 
+        openide/options, 
+        openide/text, 
+        openide/windows, 
+        openide/explorer, 
+        openide/nodes, 
+        openide/modules, 
+        openide/fs, 
+        openide/dialogs, 
+        openide/util, 
+        openide, 
+        openide/compiler, 
+        openide/execution, 
+        openide/io, 
+        openide/deprecated, 
+        openide/loaders, 
+        ant, 
+        core/javahelp, 
+        core/naming, 
+        core/settings, 
+        diff, 
+        java/api, 
+        java/srcmodel, 
+        debuggercore/oldapi, 
+        lexer, 
+        vcscore, 
+        xml/api, 
+        tasklist/api
 config.modules.javadoc=jemmy, \
         jellytools, \
         openide/registry, \
Index: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.363
diff -u -r1.363 build.xml
--- nbbuild/build.xml	2 Oct 2003 08:03:35 -0000	1.363
+++ nbbuild/build.xml	5 Oct 2003 11:58:18 -0000
@@ -149,10 +149,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="init,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="init,all-openide/util" >
+    <echo message="Building openide/fs"/>
+    <ant dir="../openide/fs" target="netbeans"/>
+  </target>
+  <target name="all-openide/modules" depends="init,all-openide/util" >
+    <echo message="Building openide/modules"/>
+    <ant dir="../openide/modules" target="netbeans"/>
+  </target>
+  <target name="all-openide/awt" depends="init,all-openide/util" >
+    <echo message="Building openide/awt"/>
+    <ant dir="../openide/awt" target="netbeans"/>
+  </target>
+  <target name="all-openide/options" depends="init,all-openide/util" >
+    <echo message="Building openide/options"/>
+    <ant dir="../openide/options" target="netbeans"/>
+  </target>
+  <target name="all-openide/dialogs" depends="init,all-openide/util,all-openide/awt" >
+    <echo message="Building openide/dialogs"/>
+    <ant dir="../openide/dialogs" target="netbeans"/>
+  </target>
+  <target name="all-openide/nodes" depends="init,all-openide/util,all-openide/dialogs" >
+    <echo message="Building openide/nodes"/>
+    <ant dir="../openide/nodes" target="netbeans"/>
+  </target>
+  <target name="all-openide/explorer" depends="init,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="init,all-openide/nodes" >
+    <echo message="Building openide/windows"/>
+    <ant dir="../openide/windows" target="netbeans"/>
+  </target>
+  <target name="all-openide/text" depends="init,all-openide/windows,all-openide/options" >
+    <echo message="Building openide/text"/>
+    <ant dir="../openide/text" target="netbeans"/>
+  </target>
+  <target name="all-openide/actions" depends="init,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"/>
@@ -993,6 +1042,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"/>
@@ -1035,7 +1086,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.23
diff -u -r1.23 template.xml
--- nbbuild/javadoctools/template.xml	29 Sep 2003 23:14:21 -0000	1.23
+++ nbbuild/javadoctools/template.xml	5 Oct 2003 11:58:18 -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
@@ -95,9 +96,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"/>
@@ -117,7 +125,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">
+            <and>
+                <isset property="javadoc.files"/>
+                <isset property="javadoc.up.to.date"/>
+            </and>
+        </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">
@@ -146,9 +169,37 @@
             <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"/>
+            <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/build.xml
===================================================================
RCS file: /cvs/openide/build.xml,v
retrieving revision 1.156
diff -u -r1.156 build.xml
--- openide/build.xml	2 Oct 2003 20:02:02 -0000	1.156
+++ openide/build.xml	5 Oct 2003 11:58:19 -0000
@@ -186,8 +186,8 @@
     </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,vers-prep,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">
@@ -205,6 +205,10 @@
   <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 +227,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 +240,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 +251,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 +272,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 +288,8 @@
     <and>
         <or>
             <filename name="**/openide/*" />
+            <!-- resources -->
+            <filename name="**/openide/resources/defaultWizard.gif" />
         </or>
         <not>
             <selector refid="openide.util" />
@@ -287,10 +310,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,9 +367,21 @@
       </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"/>
@@ -394,6 +451,7 @@
         <ant dir="text" target="clean" />
         <ant dir="util" target="clean" />
         <ant dir="windows" target="clean" />
+        <ant dir="compat" target="clean" />
   </target>
     
   
@@ -550,8 +608,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" >
@@ -701,35 +791,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">
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	5 Oct 2003 11:58:20 -0000
@@ -2,7 +2,7 @@
 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
Index: openide/openide-spec-vers.properties
===================================================================
RCS file: /cvs/openide/openide-spec-vers.properties,v
retrieving revision 1.120
diff -u -r1.120 openide-spec-vers.properties
--- openide/openide-spec-vers.properties	2 Sep 2003 16:37:45 -0000	1.120
+++ openide/openide-spec-vers.properties	5 Oct 2003 11:58:20 -0000
@@ -4,4 +4,4 @@
 # 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
+org.openide.specification.version=4.20
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	5 Oct 2003 11:58:20 -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	5 Oct 2003 11:58:20 -0000
@@ -24,18 +24,19 @@
   <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" />
@@ -115,6 +116,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 +139,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	5 Oct 2003 11:58:20 -0000
@@ -3,6 +3,6 @@
 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
 X-COMMENT: XXX WRONG!
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
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	5 Oct 2003 11:58:20 -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	5 Oct 2003 11:58:20 -0000
@@ -24,10 +24,11 @@
   <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" />
@@ -65,6 +66,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 +91,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	5 Oct 2003 11:58:20 -0000
@@ -3,6 +3,6 @@
 OpenIDE-Module-Module-Dependencies: org.openide.util/1
 X-COMMENT: XXX WRONG!
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+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	5 Oct 2003 11:58:20 -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	5 Oct 2003 11:58:20 -0000
@@ -0,0 +1,87 @@
+<?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-2000 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"/>
+  <taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" 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"/>
+    <locjar jarfile="netbeans/lib/openide-compat.jar"
+            manifest="manifest-subst.mf"
+            basedir="src"
+	    excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
+	    compress="false">
+      <locale name="ja"/>
+      <fileset dir="../src" excludesfile="../../nbbuild/standard-jar-excludes.txt" >
+    <!--    <include name="org/openide/resources/**" /> -->
+        <include name="META-INF/**" />
+      </fileset>
+    </locjar>
+  </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">
+    <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"/>
+    <delete dir="reload"/>
+  </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	5 Oct 2003 11:58:20 -0000
@@ -0,0 +1,17 @@
+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: 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/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	5 Oct 2003 11:58:21 -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	5 Oct 2003 11:58:21 -0000
@@ -24,11 +24,12 @@
   <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" />
@@ -68,10 +69,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	5 Oct 2003 11:58:21 -0000
@@ -3,6 +3,6 @@
 OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.awt/1 > 1.0
 X-COMMENT: XXX WRONG!
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+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	5 Oct 2003 11:58:21 -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	5 Oct 2003 11:58:21 -0000
@@ -24,15 +24,15 @@
   <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" />
@@ -91,6 +91,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 +116,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	5 Oct 2003 11:58:21 -0000
@@ -3,6 +3,6 @@
 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
 X-COMMENT: XXX WRONG!
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+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	5 Oct 2003 11:58:21 -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	5 Oct 2003 11:58:21 -0000
@@ -23,11 +23,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" />
@@ -132,11 +133,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	5 Oct 2003 11:58:21 -0000
@@ -3,6 +3,6 @@
 OpenIDE-Module-Module-Dependencies: org.openide.util/1
 X-COMMENT: XXX WRONG!
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+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	5 Oct 2003 11:58:21 -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	5 Oct 2003 11:58:22 -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	5 Oct 2003 11:58:22 -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	5 Oct 2003 11:58:22 -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	5 Oct 2003 11:58:24 -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	5 Oct 2003 11:58:25 -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	5 Oct 2003 11:58:26 -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	5 Oct 2003 11:58:28 -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/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	5 Oct 2003 11:58:29 -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	5 Oct 2003 11:58:29 -0000
@@ -24,11 +24,11 @@
   <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" />
@@ -66,11 +66,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	5 Oct 2003 11:58:29 -0000
@@ -2,7 +2,7 @@
 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@
@@ -11,7 +11,7 @@
 OpenIDE-Module-Module-Dependencies: org.openide.util/1
 X-Comment-3: XXX WRONG!
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+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	5 Oct 2003 11:58:29 -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	5 Oct 2003 11:58:29 -0000
@@ -24,12 +24,13 @@
   <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" />
@@ -88,10 +89,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	5 Oct 2003 11:58:29 -0000
@@ -3,6 +3,6 @@
 OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.awt/1 > 1.0
 X-COMMENT: XXX WRONG!
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+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	5 Oct 2003 11:58:29 -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	5 Oct 2003 11:58:29 -0000
@@ -24,10 +24,11 @@
   <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" />
@@ -65,11 +66,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	5 Oct 2003 11:58:29 -0000
@@ -3,6 +3,6 @@
 OpenIDE-Module-Module-Dependencies: org.openide.util/1
 X-COMMENT: XXX WRONG!
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+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/cvsyabycD 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/cvszabycD 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/cvsAabycD 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/cvsBabycD 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/cvsCabycD 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/cvsDabycD 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/cvsEabycD 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/cvsFabycD 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/cvsGabycD 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/cvsHabycD 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/cvsIabycD 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/cvsJabycD 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/cvsKabycD and /dev/null differ
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/cvsLabycD 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/cvsMabycD 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/cvsNabycD and /dev/null differ
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	5 Oct 2003 11:58:31 -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	5 Oct 2003 11:58:31 -0000
@@ -24,16 +24,16 @@
   <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" />
@@ -108,12 +108,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	5 Oct 2003 11:58:31 -0000
@@ -3,6 +3,6 @@
 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
 X-COMMENT: XXX WRONG!
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+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	5 Oct 2003 11:58:31 -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	5 Oct 2003 11:58:31 -0000
@@ -24,10 +24,11 @@
   <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" />
@@ -83,6 +84,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 +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/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	5 Oct 2003 11:58:31 -0000
@@ -2,6 +2,6 @@
 OpenIDE-Module: org.openide.util/1
 X-COMMENT: XXX WRONG!
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+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	5 Oct 2003 11:58:31 -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	5 Oct 2003 11:58:31 -0000
@@ -24,13 +24,14 @@
   <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" />
@@ -104,11 +105,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	5 Oct 2003 11:58:32 -0000
@@ -3,7 +3,7 @@
 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@
+OpenIDE-Module-Specification-Version: 4.20
 OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 OpenIDE-Module-Public-Packages: org.openide.**