Attachment #11796 for bug #29458

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 29458
Collapse All | Expand All




# 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/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, \




  </target>

  <!-- How to build the IDE core: -->
  <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"/>

             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"/>

  </target>

  <target name="check-for-build">
    <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"/>

Lines 24-29 Link Here

(-)nbbuild/javadoctools/template.xml (-5 / +56 lines)
24	${javadoc.packages} list of packages to build, e.g. "org.netbeans.api.foo,org.netbeans.spi.foo"	24	${javadoc.packages} list of packages to build, e.g. "org.netbeans.api.foo,org.netbeans.spi.foo"
25	${javadoc.classpath} classpath for source files (probably same as what you use for <javac>)	25	${javadoc.classpath} classpath for source files (probably same as what you use for <javac>)
26	Optional:	26	Optional:
		27	${javadoc.files} selector describing which files to build
27	${javadoc.main.page} link to main page, e.g. org/netbeans/api/foo/doc-files/api.html	28	${javadoc.main.page} link to main page, e.g. org/netbeans/api/foo/doc-files/api.html
28	${javadoc.docfiles} doc-files directory such as ${javadoc.base}/api/doc; default none	29	${javadoc.docfiles} doc-files directory such as ${javadoc.base}/api/doc; default none
29	${javadoc.apichanges} API change list XML file; default no change list	30	${javadoc.apichanges} API change list XML file; default no change list
Lines 95-103 Link Here
95	</target>	96	</target>
96		97
97	<target name="javadoc-check-timestamps" depends="javadoc-init">	98	<target name="javadoc-check-timestamps" depends="javadoc-init">
		99	<selector id="all-java-files" >
		100	<filename name="*/.java" />
		101	</selector>
		102	<property name="javadoc.files" value="all-java-files" />
98	<uptodate targetfile="${javadoc.out.zip}" property="javadoc.up.to.date">	103	<uptodate targetfile="${javadoc.out.zip}" property="javadoc.up.to.date">
99	<srcfiles dir="${javadoc.src}">	104	<srcfiles dir="${javadoc.src}">
100	<include name="*/.java"/>	105	<and>
		106	<selector refid="${javadoc.files}" />
		107	<filename name="*/.java" />
		108	</and>
101	</srcfiles>	109	</srcfiles>
102	<srcfiles dir="${javadoc.docfiles}"/>	110	<srcfiles dir="${javadoc.docfiles}"/>
103	<srcfiles refid="javadoc.css.files"/>	111	<srcfiles refid="javadoc.css.files"/>
Lines 117-123 Link Here
117	<property name="javadoc.hyperlinked.title" value='<a href="@TOP@${javadoc.main.page}">${javadoc.title}</a>'/>	125	<property name="javadoc.hyperlinked.title" value='<a href="@TOP@${javadoc.main.page}">${javadoc.title}</a>'/>
118	</target>	126	</target>
119		127
120	<target name="javadoc-stage-main" depends="javadoc-init,javadoc-check-timestamps,javadoc-make-plain-title,javadoc-make-hyperlinked-title" unless="javadoc.up.to.date">	128	<target name="javadoc-stage-main" depends="javadoc-init,javadoc-check-timestamps,javadoc-exec-files,javadoc-exec-packages" unless="javadoc.up.to.date" >
		129	<copy todir="${javadoc.out.dir}">
		130	<fileset refid="javadoc.css.files"/>
		131	</copy>
		132	</target>
		133
		134	<target name="javadoc-exec-condition" >
		135	<condition property="javadoc.files+javadoc.up.to.date">
		136	<and>
		137	<isset property="javadoc.files"/>
		138	<isset property="javadoc.up.to.date"/>
		139	</and>
		140	</condition>
		141	</target>
		142
		143	<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" >
121	<tstamp/>	144	<tstamp/>
122	<property name="javadoc.footer" value='<span class="footnote">Built on ${TODAY}.&nbsp;&nbsp;\|&nbsp;&nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.</span>'/>	145	<property name="javadoc.footer" value='<span class="footnote">Built on ${TODAY}.&nbsp;&nbsp;\|&nbsp;&nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.</span>'/>
123	<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	<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">
Lines 146-154 Link Here
146	<header>${javadoc.header}</header>	169	<header>${javadoc.header}</header>
147	<bottom>${javadoc.footer}</bottom>	170	<bottom>${javadoc.footer}</bottom>
148	</javadoc>	171	</javadoc>
149	<copy todir="${javadoc.out.dir}">	172	</target>
150	<fileset refid="javadoc.css.files"/>	173
151	</copy>	174	<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" >
		175	<tstamp/>
		176	<property name="javadoc.footer" value='<span class="footnote">Built on ${TODAY}.&nbsp;&nbsp;\|&nbsp;&nbsp;Portions Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved.</span>'/>
		177	<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">
		178	<fileset dir="${javadoc.docfiles}"/>
		179	<fileset dir="${javadoc.src}" >
		180	<and>
		181	<selector refid="${javadoc.files}" />
		182	<filename name="*/.java" />
		183	</and>
		184	</fileset>
		185	<classpath path="${javadoc.classpath}"/>
		186	<!-- XXX note, this does not support more than one group -->
		187	<group packages="${javadoc.packages}">
		188	<title>${javadoc.hyperlinked.title}</title>
		189	</group>
		190	<link href="${javadoc.docs.jdk}" offline="true" packagelistloc="../../openide/api/doc"/>
		191	<link href="${javadoc.docs.openide}" offline="true" packagelistloc="../../openide/javadoc/OpenAPIs"/>
		192	<link href="${javadoc.docs.openide/io}" offline="true" packagelistloc="../../openide/io/javadoc/InputOutputAPI"/>
		193	<link href="${javadoc.docs.openide/execution}" offline="true" packagelistloc="../../openide/execution/javadoc/ExecutionAPI"/>
		194	<link href="${javadoc.docs.openide/compiler}" offline="true" packagelistloc="../../openide/compiler/javadoc/CompilerAPI"/>
		195	<link href="${javadoc.docs.openide/loaders}" offline="true" packagelistloc="../../openide/loaders/javadoc/LoadersAPI"/>
		196	<link href="${javadoc.docs.core/javahelp}" offline="true" packagelistloc="../../core/javahelp/javadoc/JavaHelpAPI"/>
		197	<link href="${javadoc.docs.core/term}" offline="true" packagelistloc="../../core/term/javadoc/TerminalEmulatorAPI"/>
		198	<link href="${javadoc.docs.java/api}" offline="true" packagelistloc="../../java/api/javadoc/JavaSupportAPIs"/>
		199	<doctitle>NetBeans ${javadoc.title}</doctitle>
		200	<header>${javadoc.header}</header>
		201	<bottom>${javadoc.footer}</bottom>
		202	</javadoc>
152	</target>	203	</target>
153		204
154	<target name="javadoc-stage-apichanges" depends="javadoc-init,javadoc-check-timestamps" unless="javadoc.up.to.date">	205	<target name="javadoc-stage-apichanges" depends="javadoc-init,javadoc-check-timestamps" unless="javadoc.up.to.date">

Lines 186-193 Link Here

(-)openide/build.xml (-40 / +101 lines)
186	</copy>	186	</copy>
187	</target>	187	</target>
188		188
189	<target name="netbeans" depends="jars-from-libs,release" description="Build everything needed for inclusion in the IDE.">	189	<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.">
190	<genlist targetname="nbm" outputfiledir="netbeans"/>	190	<!-- <genlist targetname="nbm" outputfiledir="netbeans"/> -->
191	</target>	191	</target>
192		192
193	<target name="nbm" depends="netbeans">	193	<target name="nbm" depends="netbeans">
Lines 205-210 Link Here
205	<selector id="openide.actions" >	205	<selector id="openide.actions" >
206	<or>	206	<or>
207	<filename name="*/openide/actions/" />	207	<filename name="*/openide/actions/" />
		208
		209	<!-- resource -->
		210	<filename name="*/openide/resources/actions/" />
		211	<filename name="**/openide/resources/propertysheet/customize.gif" />
208		212
209	<!-- these might one day get deprecated, but until that	213	<!-- these might one day get deprecated, but until that
210	lets keep them here -->	214	lets keep them here -->
Lines 223-228 Link Here
223	<filename name="*/openide/text/" />	227	<filename name="*/openide/text/" />
224	<filename name="*/openide/cookies/LineCookie" />	228	<filename name="*/openide/cookies/LineCookie" />
225	<filename name="*/openide/cookies/EditorCookie" />	229	<filename name="*/openide/cookies/EditorCookie" />
		230
		231	<!-- resources -->
		232	<filename name="*/openide/resources/editorMode" />
		233	<filename name="*/openide/resources/printSettings" />
226	</or>	234	</or>
227	</selector>	235	</selector>
228	<selector id="openide.nodes" >	236	<selector id="openide.nodes" >
Lines 232-238 Link Here
232	<filename name="*/openide/cookies/" />	240	<filename name="*/openide/cookies/" />
233	<filename name="*/openide/util/actions/NodeAction" />	241	<filename name="*/openide/util/actions/NodeAction" />
234	<filename name="*/openide/util/actions/CookieAction" />	242	<filename name="*/openide/util/actions/CookieAction" />
235	<filename name="*/openide/resources/defaultNode"/>	243
		244	<!-- resources -->
		245	<filename name="*/openide/resources/defaultNode" />
		246	<filename name="*/openide/resources/beans" />
236	</or>	247	</or>
237	<not>	248	<not>
238	<selector refid="openide.text" />	249	<selector refid="openide.text" />
Lines 240-246 Link Here
240	</and>	251	</and>
241	</selector>	252	</selector>
242	<selector id="openide.awt" >	253	<selector id="openide.awt" >
243	<filename name="*/openide/awt/" />	254	<or>
		255	<filename name="*/openide/awt/" />
		256
		257	<!-- resources -->
		258	<filename name="*/openide/resources/html/" />
		259	<!-- already in openide.util -->
		260	<!-- <filename name="**/openide/resources/actions/empty.gif" /> -->
		261	</or>
244	</selector>	262	</selector>
245	<selector id="openide.util" >	263	<selector id="openide.util" >
246	<and>	264	<and>
Lines 254-259 Link Here
254	<filename name="*/openide/util/io/" />	272	<filename name="*/openide/util/io/" />
255	<filename name="*/openide/util/actions/" />	273	<filename name="*/openide/util/actions/" />
256	<filename name="*/openide/xml/" />	274	<filename name="*/openide/xml/" />
		275
		276	<!-- resources -->
		277	<filename name="**/openide/resources/actions/empty.gif" />
257	<filename name="*/openide/resources/progress-cursor"/>	278	<filename name="*/openide/resources/progress-cursor"/>
258	</or>	279	</or>
259		280
Lines 267-272 Link Here
267	<and>	288	<and>
268	<or>	289	<or>
269	<filename name="*/openide/" />	290	<filename name="*/openide/" />
		291	<!-- resources -->
		292	<filename name="**/openide/resources/defaultWizard.gif" />
270	</or>	293	</or>
271	<not>	294	<not>
272	<selector refid="openide.util" />	295	<selector refid="openide.util" />
Lines 287-296 Link Here
287	</selector>	310	</selector>
288	<selector id="openide.explorer" >	311	<selector id="openide.explorer" >
289	<and>	312	<and>
290	<filename name="/openide/explorer/" />	313	<or>
291	<not>	314	<filename name="/openide/explorer/" />
		315
		316	<!-- resources -->
		317	<filename name="**/openide/resources/propertysheet/propertySheetHelp.gif" />
		318	<filename name="**/openide/resources/propertysheet/propertySheetHelp.gif" />
		319	<filename name="**/openide/resources/actions/setDefaultValue.gif" />
		320	<filename name="**/openide/resources/propertysheet/invalid.gif" />
		321	<filename name="**/openide/resources/propertysheet/modified.gif" />
		322	<filename name="**/openide/resources/cursorscopysingle.gif" />
		323	<filename name="**/openide/resources/cursorsnone.gif" />
		324	<filename name="**/openide/resources/cursorsmovesingle.gif" />
		325	<filename name="**/openide/resources/cursorsnone.gif" />
		326	<filename name="**/openide/resources/cursorsunknownsingle.gif" />
		327	<filename name="**/openide/resources/cursorsnone.gif" />
		328	<filename name="**/openide/resources/cursorsnone.gif" />
		329	<filename name="**/openide/resources/cursorscopysingle.gif" />
		330	<filename name="**/openide/resources/defaultNode.gif" />
		331	<filename name="**/openide/resources/columns.gif" />
		332	<filename name="**/openide/resources/columnsSortedAsc.gif" />
		333	<filename name="**/openide/resources/columnsSortedDesc.gif" />
		334	</or>
		335	<none>
292	<selector refid="openide.actions" />	336	<selector refid="openide.actions" />
293	</not>	337	<selector refid="openide.nodes" />
		338	</none>
294	</and>	339	</and>
295	</selector>	340	</selector>
296		341
Lines 322-330 Link Here
322	</fileset>	367	</fileset>
323	</copy>	368	</copy>
324	</target>	369	</target>
325		370
		371	<target name="do-lib-javadoc" >
		372	<ant dir="${nbroot}/nbbuild/javadoctools" antfile="template.xml" target="javadoc" inheritRefs="true" >
		373	<property name="javadoc.base" location="${localdir}/.."/>
		374	<property name="javadoc.src" location="src"/>
		375	<property name="javadoc.classpath" refid="classpath"/>
		376	<property name="javadoc.apichanges" location="api/doc/changes/apichanges.xml"/>
		377	<!-- <property name="javadoc.docfiles" location="api/doc"/>
		378	<property name="javadoc.overview" location="api/doc/overview.html"/> -->
		379
		380	<property name="javadoc.files" value="${selector}" />
		381	</ant>
		382	</target>
326	<!-- Build whole openide.jar from separate libraries -->	383	<!-- Build whole openide.jar from separate libraries -->
327	<target name="jars-from-libs" depends="libs,vers-prep,compile-compat,loaders_32143-compat" description="Create JAR files from copied directories.">	384	<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">
328	<property name="openide.jar" value="netbeans/lib/openide.jar" />	385	<property name="openide.jar" value="netbeans/lib/openide.jar" />
329	<mkdir dir="netbeans/lib"/>	386	<mkdir dir="netbeans/lib"/>
330	<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>	387	<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
Lines 394-399 Link Here
394	<ant dir="text" target="clean" />	451	<ant dir="text" target="clean" />
395	<ant dir="util" target="clean" />	452	<ant dir="util" target="clean" />
396	<ant dir="windows" target="clean" />	453	<ant dir="windows" target="clean" />
		454	<ant dir="compat" target="clean" />
397	</target>	455	</target>
398		456
399		457
Lines 550-557 Link Here
550	</echo>	608	</echo>
551	</target>	609	</target>
552		610
553	<target name="javadoc" depends="javadoc-plain,export-interfaces" if="open-apis-force-rebuild"	611	<target name="javadoc" depends="javadoc-plain,export-interfaces" if="open-apis-force-rebuild" />
554	description="Create Open API documentation." />	612	<target name="export-interfaces" depends="javadoc-plain" if="export.interfaces" >
		613	<!-- is there just because the openide APIs are not separated and do not use javadoctools -->
		614	<taskdef name="arch" classname="org.netbeans.nbbuild.Arch">
		615	<classpath>
		616	<pathelement location="../nbbuild/nbantext.jar"/>
		617	<fileset dir="../libs/external">
		618	<include name="xerces*.jar"/>
		619	</fileset>
		620	</classpath>
		621	</taskdef>
		622
		623	<!-- Warn about incorrect question version, but do not make build fail: -->
		624	<property name="arch.warn" value="true"/>
		625	<property name="arch.xsl" location="../nbbuild/javadoctools/exportInterfaces.xsl" />
		626	<property name="arch.target" value="OpenAPIs/arch" />
		627	<arch answers="../nbbuild/javadoctools/arch-empty.xml" output="${export.interfaces}/OpenAPIs.html" />
		628
		629	</target>
		630
		631	<target name="all-javadoc" description="Create Open API documentation." >
		632	<ant dir="util" target="javadoc" />
		633	<ant dir="awt" target="javadoc" />
		634	<ant dir="dialogs" target="javadoc" />
		635	<ant dir="explorer" target="javadoc" />
		636	<ant dir="fs" target="javadoc" />
		637	<ant dir="nodes" target="javadoc" />
		638	<ant dir="modules" target="javadoc" />
		639	<ant dir="options" target="javadoc" />
		640	<ant dir="text" target="javadoc" />
		641	<ant dir="windows" target="javadoc" />
		642	<ant dir="actions" target="javadoc" />
		643	</target>
		644
555		645
556		646
557	<target name="javadoc-plain" depends="init,open-apis-check-timestamps,open-apis-maybe-skip" if="open-apis-force-rebuild" >	647	<target name="javadoc-plain" depends="init,open-apis-check-timestamps,open-apis-maybe-skip" if="open-apis-force-rebuild" >
Lines 701-735 Link Here
701	<zip zipfile="javadoc/OpenAPIs.zip" basedir="javadoc/OpenAPIs"/>	791	<zip zipfile="javadoc/OpenAPIs.zip" basedir="javadoc/OpenAPIs"/>
702	</target>	792	</target>
703		793
704	<target name="export-interfaces" depends="javadoc-plain" if="export.interfaces" >
705	<!-- is there just because the openide APIs are not separated and do not use javadoctools -->
706	<taskdef name="arch" classname="org.netbeans.nbbuild.Arch">
707	<classpath>
708	<pathelement location="../nbbuild/nbantext.jar"/>
709	<fileset dir="../libs/external">
710	<include name="xerces*.jar"/>
711	</fileset>
712	</classpath>
713	</taskdef>
714
715	<!-- Warn about incorrect question version, but do not make build fail: -->
716	<property name="arch.warn" value="true"/>
717	<property name="arch.xsl" location="../nbbuild/javadoctools/exportInterfaces.xsl" />
718	<property name="arch.target" value="OpenAPIs/arch" />
719	<arch answers="arch/arch-openide-modules.xml" output="${export.interfaces}/openide-modules.html" />
720	<arch answers="arch/arch-openide-dialogs.xml" output="${export.interfaces}/openide-dialogs.html" />
721	<arch answers="arch/arch-openide-lookup.xml" output="${export.interfaces}/openide-lookup.html" />
722	<arch answers="arch/arch-openide-filesystems.xml" output="${export.interfaces}/openide-filesystems.html" />
723	<arch answers="arch/arch-openide-nodes.xml" output="${export.interfaces}/openide-nodes.html" />
724	<arch answers="arch/arch-openide-explorer.xml" output="${export.interfaces}/openide-explorer.html" />
725	<arch answers="arch/arch-openide-actions.xml" output="${export.interfaces}/openide-actions.html" />
726	<arch answers="arch/arch-openide-windowsystem.xml" output="${export.interfaces}/openide-windowsystem.html" />
727	<arch answers="arch/arch-openide-utilities.xml" output="${export.interfaces}/openide-utilities.html" />
728	<arch answers="arch/arch-openide-editor.xml" output="${export.interfaces}/openide-editor.html" />
729	<arch answers="arch/arch-openide-propertysheet.xml" output="${export.interfaces}/openide-propertysheet.html" />
730
731	</target>
732
733	<target name="apis-tidy" description="Run the Tidy HTML checker on API prose documents.">	794	<target name="apis-tidy" description="Run the Tidy HTML checker on API prose documents.">
734	<apply parallel="true" failonerror="true" executable="tidy">	795	<apply parallel="true" failonerror="true" executable="tidy">
735	<fileset dir="api/doc">	796	<fileset dir="api/doc">

Lines 2-8 Link Here

(-)openide/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.openide/1	2	OpenIDE-Module: org.openide/1
3	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
4	X-Comment: change specification version in openide-spec-vers.properties	4	X-Comment: change specification version in openide-spec-vers.properties
5	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	5	OpenIDE-Module-Specification-Version: 4.20
6	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	6	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
7	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	7	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
8	Specification-Title: IDE/1	8	Specification-Title: IDE/1

Lines 4-7 Link Here

(-)openide/openide-spec-vers.properties (-1 / +1 lines)
4	# Must always be numeric (numbers separated by '.', e.g. 4.11).	4	# Must always be numeric (numbers separated by '.', e.g. 4.11).
5	# See http://openide.netbeans.org/versioning-policy.html for more.	5	# See http://openide.netbeans.org/versioning-policy.html for more.
6		6
7	org.openide.specification.version=4.12	7	org.openide.specification.version=4.20

Lines 1-3 Link Here

(-)openide/actions/.cvsignore (+1 lines)
1	netbeans	1	netbeans
2	manifest-subst.mf	2	manifest-subst.mf
3	gensrc	3	gensrc
		4	javadoc




  <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" />

    </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" />

    <delete file="manifest-subst.mf"/>
    <delete file="treefs.nbm"/>
    <delete dir="netbeans"/>
    <delete dir="javadoc"/>
    <delete dir="Info"/>
    <delete dir="reload"/>
    <delete>

Lines 3-8 Link Here

(-)openide/actions/manifest.mf (-1 / +1 lines)
3	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	3	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
4	X-COMMENT: XXX WRONG!	4	X-COMMENT: XXX WRONG!
5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
6	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	6	OpenIDE-Module-Specification-Version: 4.20
7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
8		8

Lines 1-2 Link Here

(-)openide/awt/.cvsignore (+1 lines)
1	manifest-subst.mf	1	manifest-subst.mf
2	netbeans	2	netbeans
		3	javadoc

Lines 24-33 Link Here

(-)openide/awt/build.xml (-3 / +20 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26		26
		27	<path id="classpath" >
		28	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
		29	</path>
		30
27	<target name="compile" >	31	<target name="compile" >
28	<path id="classpath" >
29	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
30	</path>
31	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	32	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
32	<property name="localdir" location="src" />	33	<property name="localdir" location="src" />
33	<property name="selector" value="openide.awt" />	34	<property name="selector" value="openide.awt" />
Lines 65-70 Link Here
65	</makenbm>	66	</makenbm>
66	</target>	67	</target>
67		68
		69	<target name="javadoc">
		70	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		71	<property name="localdir" location="src" />
		72	<property name="selector" value="openide.awt" />
		73
		74	<property name="javadoc.base" location="."/>
		75	<property name="javadoc.name" value="AWTAPI"/>
		76	<property name="javadoc.title" value="AWT Extensions API"/>
		77	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		78	<!-- <property name="javadoc.arch" location="../arch/arch-openide-utilities.xml"/> -->
		79	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		80	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		81	</ant>
		82	</target>
		83
68	<target name="clean">	84	<target name="clean">
69	<delete dir="src/org/openide" />	85	<delete dir="src/org/openide" />
70	<delete >	86	<delete >
Lines 75-80 Link Here
75	<delete file="manifest-subst.mf"/>	91	<delete file="manifest-subst.mf"/>
76	<delete file="openide-awt.nbm"/>	92	<delete file="openide-awt.nbm"/>
77	<delete dir="netbeans"/>	93	<delete dir="netbeans"/>
		94	<delete dir="javadoc"/>
78	<delete dir="Info"/>	95	<delete dir="Info"/>
79	<delete dir="reload"/>	96	<delete dir="reload"/>
80	</target>	97	</target>

Lines 3-8 Link Here

(-)openide/awt/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module-Module-Dependencies: org.openide.util/1	3	OpenIDE-Module-Module-Dependencies: org.openide.util/1
4	X-COMMENT: XXX WRONG!	4	X-COMMENT: XXX WRONG!
5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
6	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	6	OpenIDE-Module-Specification-Version: 4.20
7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
8		8

Line 1 Link Here

(-)openide/compat/.cvsignore (+3 lines)
1	patched	1	patched
		2	javadoc
		3	netbeans
		4	manifest-subst.mf




<?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>




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


Lines 1-3 Link Here

(-)openide/dialogs/.cvsignore (+1 lines)
1	src	1	src
2	netbeans	2	netbeans
3	manifest-subst.mf	3	manifest-subst.mf
		4	javadoc

Lines 24-34 Link Here

(-)openide/dialogs/build.xml (-4 / +21 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26		26
		27	<path id="classpath" >
		28	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
		29	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
		30	</path>
		31
27	<target name="compile" >	32	<target name="compile" >
28	<path id="classpath" >
29	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
30	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
31	</path>
32	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	33	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
33	<property name="localdir" location="src" />	34	<property name="localdir" location="src" />
34	<property name="selector" value="openide.dialogs" />	35	<property name="selector" value="openide.dialogs" />
Lines 68-77 Link Here
68	</makenbm>	69	</makenbm>
69	</target>	70	</target>
70		71
		72	<target name="javadoc">
		73	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		74	<property name="localdir" location="src" />
		75	<property name="selector" value="openide.dialogs" />
		76
		77	<property name="javadoc.base" location="."/>
		78	<property name="javadoc.name" value="DialogsAPI"/>
		79	<property name="javadoc.title" value="Dialogs and Wizards API"/>
		80	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		81	<property name="javadoc.arch" location="../arch/arch-openide-dialogs.xml"/>
		82	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		83	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		84	</ant>
		85	</target>
		86
71	<target name="clean">	87	<target name="clean">
72	<delete dir="src" />	88	<delete dir="src" />
73	<delete file="manifest-subst.mf"/>	89	<delete file="manifest-subst.mf"/>
74	<delete dir="netbeans"/>	90	<delete dir="netbeans"/>
		91	<delete dir="javadoc"/>
75	<delete dir="Info"/>	92	<delete dir="Info"/>
76	<delete dir="reload"/>	93	<delete dir="reload"/>
77	</target>	94	</target>

Lines 3-8 Link Here

(-)openide/dialogs/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.awt/1 > 1.0	3	OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.awt/1 > 1.0
4	X-COMMENT: XXX WRONG!	4	X-COMMENT: XXX WRONG!
5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
6	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	6	OpenIDE-Module-Specification-Version: 4.20
7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
8		8

Lines 1-3 Link Here

(-)openide/explorer/.cvsignore (+1 lines)
1	src	1	src
2	netbeans	2	netbeans
3	manifest-subst.mf	3	manifest-subst.mf
		4	javadoc




  <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" />

    </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>

    <delete file="manifest-subst.mf"/>
    <delete file="treefs.nbm"/>
    <delete dir="netbeans"/>
    <delete dir="javadoc"/>
    <delete dir="Info"/>
    <delete dir="reload"/>
  </target>

Lines 3-8 Link Here

(-)openide/explorer/manifest.mf (-1 / +1 lines)
3	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	3	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
4	X-COMMENT: XXX WRONG!	4	X-COMMENT: XXX WRONG!
5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
6	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	6	OpenIDE-Module-Specification-Version: 4.20
7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
8		8

Lines 1-3 Link Here

(-)openide/fs/.cvsignore (+1 lines)
1	src	1	src
2	netbeans	2	netbeans
3	manifest-subst.mf	3	manifest-subst.mf
		4	javadoc

Lines 23-33 Link Here

(-)openide/fs/build.xml (-3 / +20 lines)
23	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	23	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
		26
		27	<path id="classpath" >
		28	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
		29	</path>
26		30
27	<target name="compile" >	31	<target name="compile" >
28	<path id="classpath" >
29	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
30	</path>
31	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	32	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
32	<property name="localdir" location="src" />	33	<property name="localdir" location="src" />
33	<property name="selector" value="openide.fs" />	34	<property name="selector" value="openide.fs" />
Lines 132-142 Link Here
132	</makenbm>	133	</makenbm>
133	</target>	134	</target>
134		135
		136	<target name="javadoc">
		137	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		138	<property name="localdir" location="src" />
		139	<property name="selector" value="openide.fs" />
		140
		141	<property name="javadoc.base" location="."/>
		142	<property name="javadoc.name" value="FsAPI"/>
		143	<property name="javadoc.title" value="FileSystems API"/>
		144	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		145	<property name="javadoc.arch" location="../arch/arch-openide-filesystems.xml"/>
		146	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		147	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		148	</ant>
		149	</target>
		150
135	<target name="clean">	151	<target name="clean">
136	<delete dir="src" />	152	<delete dir="src" />
137	<delete file="manifest-subst.mf"/>	153	<delete file="manifest-subst.mf"/>
138	<delete file="treefs.nbm"/>	154	<delete file="treefs.nbm"/>
139	<delete dir="netbeans"/>	155	<delete dir="netbeans"/>
		156	<delete dir="javadoc"/>
140	<delete dir="Info"/>	157	<delete dir="Info"/>
141	<delete dir="reload"/>	158	<delete dir="reload"/>
142	</target>	159	</target>

Lines 3-8 Link Here

(-)openide/fs/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module-Module-Dependencies: org.openide.util/1	3	OpenIDE-Module-Module-Dependencies: org.openide.util/1
4	X-COMMENT: XXX WRONG!	4	X-COMMENT: XXX WRONG!
5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
6	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	6	OpenIDE-Module-Specification-Version: 4.20
7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
8		8

Lines 99-105 Link Here

(-)openide/loaders/src/org/openide/actions/CustomizeBeanAction.java (-1 / +1 lines)
99	}	99	}
100		100
101	protected String resourceIcon () {	101	protected String resourceIcon () {
102	return "/org/openide/resources/actions/customize.gif"; // NOI18N	102	return "/org/openide/actions/customize.gif"; // NOI18N
103	}	103	}
104		104
105	/** Customize a Bean.	105	/** Customize a Bean.

Lines 169-175 Link Here

(-)openide/loaders/src/org/openide/actions/NewTemplateAction.java (-1 / +1 lines)
169	}	169	}
170		170
171	protected String iconResource () {	171	protected String iconResource () {
172	return "org/openide/resources/actions/new.gif"; // NOI18N	172	return "org/openide/actions/new.gif"; // NOI18N
173	}	173	}
174		174
175	public JMenuItem getMenuPresenter() {	175	public JMenuItem getMenuPresenter() {

Lines 59-65 Link Here

(-)openide/loaders/src/org/openide/actions/SaveAllAction.java (-1 / +1 lines)
59	}	59	}
60		60
61	protected String iconResource () {	61	protected String iconResource () {
62	return "org/openide/resources/actions/saveAll.gif"; // NOI18N	62	return "org/openide/actions/saveAll.gif"; // NOI18N
63	}	63	}
64		64
65	public void performAction() {	65	public void performAction() {

Lines 213-219 Link Here

(-)openide/loaders/src/org/openide/loaders/BrokenDataShadow.java (-1 / +1 lines)
213	/** the sheet computed for this node or null */	213	/** the sheet computed for this node or null */
214	private Sheet sheet;	214	private Sheet sheet;
215		215
216	private static final String ICON_NAME = "org/openide/resources/brokenShadow"; // NOI18N	216	private static final String ICON_NAME = "org/openide/loaders/brokenShadow"; // NOI18N
217		217
218	/** Create a node.	218	/** Create a node.
219	* @param broken data shadow	219	* @param broken data shadow

Lines 68-74 Link Here

(-)openide/loaders/src/org/openide/loaders/DataFolder.java (-1 / +1 lines)
68		68
69	/** Icon resource string for folder node */	69	/** Icon resource string for folder node */
70	static final String FOLDER_ICON_BASE =	70	static final String FOLDER_ICON_BASE =
71	"org/openide/resources/defaultFolder"; // NOI18N	71	"org/openide/loaders/defaultFolder"; // NOI18N
72		72
73	/** name of a shadow file for a root */	73	/** name of a shadow file for a root */
74	private static final String ROOT_SHADOW_NAME = "Root"; // NOI18N	74	private static final String ROOT_SHADOW_NAME = "Root"; // NOI18N

Lines 468-474 Link Here

(-)openide/loaders/src/org/openide/loaders/InstanceDataObject.java (-1 / +1 lines)
468	public UnrecognizedSettingNode() {	468	public UnrecognizedSettingNode() {
469	super(Children.LEAF);	469	super(Children.LEAF);
470	setName(NbBundle.getMessage(InstanceDataObject.class, "LBL_BrokenSettings")); //NOI18N	470	setName(NbBundle.getMessage(InstanceDataObject.class, "LBL_BrokenSettings")); //NOI18N
471	setIconBase("org/openide/resources/instanceBroken"); //NOI18N	471	setIconBase("org/openide/loaders/instanceBroken"); //NOI18N
472	setShortDescription(InstanceDataObject.this.getPrimaryFile().toString());	472	setShortDescription(InstanceDataObject.this.getPrimaryFile().toString());
473	}	473	}
474		474




    
    /** icon base */
    private static final String INSTANCE_ICON_BASE =
        "org/openide/loaders/instanceObject"; // NOI18N
    
    /** File extension for xml settings. */
    private static final String XML_EXT = "settings"; //NOI18N

        InstanceCookie.Of ic = ic();
        String iconBase = INSTANCE_ICON_BASE;
        if (ic == null) {//XXX && io.instanceOf(XMLSettingsSupport.BrokenSettings.class)) {
            iconBase = "org/openide/loaders/instanceBroken"; // NOI18N
        }
        setIconBase(iconBase);
    }

                if (icon instanceof ImageIcon) {
                    beanInfoIcon = ((ImageIcon)icon).getImage();
                } else {
                    beanInfoIcon = Utilities.loadImage("org/openide/loaders/empty.gif", true); // NOI18N
                }
            }
        } catch (Exception e) {

Lines 1808-1814 Link Here

(-)openide/loaders/src/org/openide/loaders/XMLDataObject.java (-1 / +1 lines)
1808		1808
1809	if (n == null) {	1809	if (n == null) {
1810	DataNode d = new DataNode (XMLDataObject.this, Children.LEAF);	1810	DataNode d = new DataNode (XMLDataObject.this, Children.LEAF);
1811	d.setIconBase ("org/openide/resources/xmlObject"); // NOI18N	1811	d.setIconBase ("org/openide/loaders/xmlObject"); // NOI18N
1812	d.setDefaultAction (SystemAction.get (OpenAction.class));	1812	d.setDefaultAction (SystemAction.get (OpenAction.class));
1813	return d;	1813	return d;
1814	} else {	1814	} else {

Lines 1-3 Link Here

(-)openide/modules/.cvsignore (+1 lines)
1	src	1	src
2	netbeans	2	netbeans
3	manifest-subst.mf	3	manifest-subst.mf
		4	javadoc

Lines 24-34 Link Here

(-)openide/modules/build.xml (-3 / +20 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26		26
		27	<path id="classpath" >
		28	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
		29	</path>
27		30
28	<target name="compile" >	31	<target name="compile" >
29	<path id="classpath" >
30	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
31	</path>
32	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	32	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
33	<property name="localdir" location="src" />	33	<property name="localdir" location="src" />
34	<property name="selector" value="openide.modules" />	34	<property name="selector" value="openide.modules" />
Lines 66-76 Link Here
66	</makenbm>	66	</makenbm>
67	</target>	67	</target>
68		68
		69	<target name="javadoc">
		70	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		71	<property name="localdir" location="src" />
		72	<property name="selector" value="openide.modules" />
		73
		74	<property name="javadoc.base" location="."/>
		75	<property name="javadoc.name" value="ModulesAPI"/>
		76	<property name="javadoc.title" value="Modules API"/>
		77	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		78	<property name="javadoc.arch" location="../arch/arch-openide-modules.xml"/>
		79	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		80	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		81	</ant>
		82	</target>
		83
		84
69	<target name="clean">	85	<target name="clean">
70	<delete dir="src" />	86	<delete dir="src" />
71	<delete file="manifest-subst.mf"/>	87	<delete file="manifest-subst.mf"/>
72	<delete file="modules.nbm"/>	88	<delete file="modules.nbm"/>
73	<delete dir="netbeans"/>	89	<delete dir="netbeans"/>
		90	<delete dir="javadoc"/>
74	<delete dir="Info"/>	91	<delete dir="Info"/>
75	<delete dir="reload"/>	92	<delete dir="reload"/>
76	</target>	93	</target>

Lines 2-8 Link Here

(-)openide/modules/manifest.mf (-2 / +2 lines)
2	X-Comment: CAREFUL; Specification-Title, Specification-Version, and Implementation-Version should not be changed gratuitously (they are used by Modules API!)	2	X-Comment: CAREFUL; Specification-Title, Specification-Version, and Implementation-Version should not be changed gratuitously (they are used by Modules API!)
3	Specification-Title: IDE/1	3	Specification-Title: IDE/1
4	X-Comment-2: change specification version in openide-spec-vers.properties	4	X-Comment-2: change specification version in openide-spec-vers.properties
5	Specification-Version: @SPEC_VERS_SUBST@	5	Specification-Version: 4.20
6	Specification-Vendor: NetBeans	6	Specification-Vendor: NetBeans
7	Implementation-Title: NetBeans Modules API	7	Implementation-Title: NetBeans Modules API
8	Implementation-Version: @BUILD_NUMBER_SUBST@	8	Implementation-Version: @BUILD_NUMBER_SUBST@
Lines 11-17 Link Here
11	OpenIDE-Module-Module-Dependencies: org.openide.util/1	11	OpenIDE-Module-Module-Dependencies: org.openide.util/1
12	X-Comment-3: XXX WRONG!	12	X-Comment-3: XXX WRONG!
13	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	13	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
14	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	14	OpenIDE-Module-Specification-Version: 4.20
15	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	15	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
16		16
17	Name: /org/openide/modules/	17	Name: /org/openide/modules/

Lines 1-3 Link Here

(-)openide/nodes/.cvsignore (+1 lines)
1	src	1	src
2	netbeans	2	netbeans
3	manifest-subst.mf	3	manifest-subst.mf
		4	javadoc

Lines 24-35 Link Here

(-)openide/nodes/build.xml (-5 / +23 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26		26
		27	<path id="classpath" >
		28	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
		29	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
		30	<pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar" />
		31	</path>
		32
27	<target name="compile" >	33	<target name="compile" >
28	<path id="classpath" >
29	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
30	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar" />
31	<pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar" />
32	</path>
33	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	34	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
34	<property name="localdir" location="src" />	35	<property name="localdir" location="src" />
35	<property name="selector" value="openide.nodes" />	36	<property name="selector" value="openide.nodes" />
Lines 88-97 Link Here
88	</makenbm>	89	</makenbm>
89	</target>	90	</target>
90		91
		92	<target name="javadoc">
		93	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		94	<property name="localdir" location="src" />
		95	<property name="selector" value="openide.nodes" />
		96
		97	<property name="javadoc.base" location="."/>
		98	<property name="javadoc.name" value="NodesAPI"/>
		99	<property name="javadoc.title" value="Nodes API"/>
		100	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		101	<property name="javadoc.arch" location="../arch/arch-openide-nodes.xml"/>
		102	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		103	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		104	</ant>
		105	</target>
		106
		107
91	<target name="clean">	108	<target name="clean">
92	<delete dir="src" />	109	<delete dir="src" />
93	<delete file="manifest-subst.mf"/>	110	<delete file="manifest-subst.mf"/>
94	<delete dir="netbeans"/>	111	<delete dir="netbeans"/>
		112	<delete dir="javadoc"/>
95	<delete dir="Info"/>	113	<delete dir="Info"/>
96	<delete dir="reload"/>	114	<delete dir="reload"/>
97	</target>	115	</target>

Lines 3-8 Link Here

(-)openide/nodes/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.awt/1 > 1.0	3	OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.awt/1 > 1.0
4	X-COMMENT: XXX WRONG!	4	X-COMMENT: XXX WRONG!
5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
6	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	6	OpenIDE-Module-Specification-Version: 4.20
7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
8		8

Lines 1-3 Link Here

(-)openide/options/.cvsignore (+1 lines)
1	src	1	src
2	netbeans	2	netbeans
3	manifest-subst.mf	3	manifest-subst.mf
		4	javadoc

Lines 24-33 Link Here

(-)openide/options/build.xml (-3 / +20 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26		26
		27	<path id="classpath" >
		28	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
		29	</path>
		30
27	<target name="compile" >	31	<target name="compile" >
28	<path id="classpath" >
29	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
30	</path>
31	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	32	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
32	<property name="localdir" location="src" />	33	<property name="localdir" location="src" />
33	<property name="selector" value="openide.options" />	34	<property name="selector" value="openide.options" />
Lines 65-75 Link Here
65	</makenbm>	66	</makenbm>
66	</target>	67	</target>
67		68
		69	<target name="javadoc">
		70	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		71	<property name="localdir" location="src" />
		72	<property name="selector" value="openide.options" />
		73
		74	<property name="javadoc.base" location="."/>
		75	<property name="javadoc.name" value="OptionsAPI"/>
		76	<property name="javadoc.title" value="Options API"/>
		77	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		78	<property name="javadoc.arch" location="../arch/arch-openide-settings.xml"/>
		79	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		80	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		81	</ant>
		82	</target>
		83
68	<target name="clean">	84	<target name="clean">
69	<delete dir="src" />	85	<delete dir="src" />
70	<delete file="manifest-subst.mf"/>	86	<delete file="manifest-subst.mf"/>
71	<delete file="treefs.nbm"/>	87	<delete file="treefs.nbm"/>
72	<delete dir="netbeans"/>	88	<delete dir="netbeans"/>
		89	<delete dir="javadoc"/>
73	<delete dir="Info"/>	90	<delete dir="Info"/>
74	<delete dir="reload"/>	91	<delete dir="reload"/>
75	</target>	92	</target>

Lines 3-8 Link Here

(-)openide/options/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module-Module-Dependencies: org.openide.util/1	3	OpenIDE-Module-Module-Dependencies: org.openide.util/1
4	X-COMMENT: XXX WRONG!	4	X-COMMENT: XXX WRONG!
5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
6	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	6	OpenIDE-Module-Specification-Version: 4.20
7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
8		8

Lines 2-4 Link Here

(-)openide/text/.cvsignore (+1 lines)
2	netbeans	2	netbeans
3	manifest-subst.mf	3	manifest-subst.mf
4	gensrc	4	gensrc
		5	javadoc




  <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" />

    </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>

Lines 3-8 Link Here

(-)openide/text/manifest.mf (-1 / +1 lines)
3	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	3	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
4	X-COMMENT: XXX WRONG!	4	X-COMMENT: XXX WRONG!
5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
6	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	6	OpenIDE-Module-Specification-Version: 4.20
7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
8		8

Lines 1-2 Link Here

(-)openide/util/.cvsignore (+1 lines)
1	netbeans	1	netbeans
2	manifest-subst.mf	2	manifest-subst.mf
		3	javadoc




  <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" >
    <path id="classpath" >
      <pathelement location="src" />
  </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" />

      <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" />

    <delete file="manifest-subst.mf"/>
    <delete file="treefs.nbm"/>
    <delete dir="netbeans"/>
    <delete dir="javadoc"/>
    <delete dir="Info"/>
    <delete dir="reload"/>
  </target>

Lines 2-7 Link Here

(-)openide/util/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.openide.util/1	2	OpenIDE-Module: org.openide.util/1
3	X-COMMENT: XXX WRONG!	3	X-COMMENT: XXX WRONG!
4	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
5	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	5	OpenIDE-Module-Specification-Version: 4.20
6	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	6	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
7		7

Lines 1-3 Link Here

(-)openide/windows/.cvsignore (+1 lines)
1	netbeans	1	netbeans
2	manifest-subst.mf	2	manifest-subst.mf
3	gensrc	3	gensrc
		4	javadoc

Lines 24-36 Link Here

(-)openide/windows/build.xml (-6 / +23 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26		26
		27	<path id="classpath" >
		28	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
		29	<pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
		30	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
		31	<pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
		32	</path>
		33
27	<target name="compile" >	34	<target name="compile" >
28	<path id="classpath" >
29	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
30	<pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
31	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
32	<pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
33	</path>
34	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	35	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
35	<property name="include" value="org/openide/awt/HtmlBrowser$$BrowserComponent.java" />	36	<property name="include" value="org/openide/awt/HtmlBrowser$$BrowserComponent.java" />
36	<property name="localdir" location="src" />	37	<property name="localdir" location="src" />
Lines 104-114 Link Here
104	</makenbm>	105	</makenbm>
105	</target>	106	</target>
106		107
		108	<target name="javadoc">
		109	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		110	<property name="localdir" location="src" />
		111	<property name="selector" value="openide.windows" />
		112
		113	<property name="javadoc.base" location="."/>
		114	<property name="javadoc.name" value="WindowsAPI"/>
		115	<property name="javadoc.title" value="Windows API"/>
		116	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		117	<property name="javadoc.arch" location="../arch/arch-openide-windowsystem.xml"/>
		118	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		119	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		120	</ant>
		121	</target>
		122
107	<target name="clean">	123	<target name="clean">
108	<delete dir="gensrc" />	124	<delete dir="gensrc" />
109	<delete dir="src/org/openide/windows/" />	125	<delete dir="src/org/openide/windows/" />
110	<delete file="manifest-subst.mf"/>	126	<delete file="manifest-subst.mf"/>
111	<delete dir="netbeans"/>	127	<delete dir="netbeans"/>
		128	<delete dir="javadoc"/>
112	<delete dir="Info"/>	129	<delete dir="Info"/>
113	<delete dir="reload"/>	130	<delete dir="reload"/>
114	<delete>	131	<delete>

Lines 3-9 Link Here

(-)openide/windows/manifest.mf (-1 / +1 lines)
3	X-COMMENT: XXX WRONG!	3	X-COMMENT: XXX WRONG!
4	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
5	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	5	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
6	OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@	6	OpenIDE-Module-Specification-Version: 4.20
7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	7	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
8	OpenIDE-Module-Public-Packages: org.openide.**	8	OpenIDE-Module-Public-Packages: org.openide.**
9		9

Return to bug 29458

Lines 308-332 Link Here

(-)nbbuild/build.properties (-19 / +29 lines)
308	# take care of dependencies when reordering modules for javadoc	308	# take care of dependencies when reordering modules for javadoc
309	# some javadocs must be built earlier than others for package-list	309	# some javadocs must be built earlier than others for package-list
310	# the javadocs will be built in the exact order specified here	310	# the javadocs will be built in the exact order specified here
311	config.fixedmodules.javadoc=openide, \	311	config.fixedmodules.javadoc=openide/awt,
312	openide/compiler, \	312	openide/actions,
313	openide/execution, \	313	openide/options,
314	openide/io, \	314	openide/text,
315	openide/deprecated, \	315	openide/windows,
316	openide/loaders, \	316	openide/explorer,
317	ant, \	317	openide/nodes,
318	core/javahelp, \	318	openide/modules,
319	core/naming, \	319	openide/fs,
320	core/settings, \	320	openide/dialogs,
321	diff, \	321	openide/util,
322	java/api, \	322	openide,
323	java/srcmodel, \	323	openide/compiler,
324	debuggercore/oldapi, \	324	openide/execution,
325	lexer, \	325	openide/io,
326	mdr, \	326	openide/deprecated,
327	vcscore, \	327	openide/loaders,
328	xml/api, \	328	ant,
329	tasklist/api	329	core/javahelp,
		330	core/naming,
		331	core/settings,
		332	diff,
		333	java/api,
		334	java/srcmodel,
		335	debuggercore/oldapi,
		336	lexer,
		337	vcscore,
		338	xml/api,
		339	tasklist/api
330	config.modules.javadoc=jemmy, \	340	config.modules.javadoc=jemmy, \
331	jellytools, \	341	jellytools, \
332	openide/registry, \	342	openide/registry, \

Lines 149-158 Link Here

(-)nbbuild/build.xml (-2 / +53 lines)
149	</target>	149	</target>
150		150
151	<!-- How to build the IDE core: -->	151	<!-- How to build the IDE core: -->
152	<target name="all-openide" depends="init">	152	<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">
153	<echo message="Building Open APIs..."/>	153	<echo message="Building Open APIs..."/>
154	<ant dir="../openide" target="netbeans"/>	154	<ant dir="../openide" target="netbeans"/>
155	</target>	155	</target>
		156	<!-- needed compatibility stuff -->
		157	<target name="all-openide/compat" depends="init,all-openide/fs,all-openide/nodes,all-openide/util">
		158	<echo message="Building openide/compat"/>
		159	<ant dir="../openide/compat" target="netbeans"/>
		160	</target>
		161	<target name="all-openide/util" depends="init" >
		162	<echo message="Building openide/util"/>
		163	<ant dir="../openide/util" target="netbeans"/>
		164	</target>
		165	<target name="all-openide/fs" depends="init,all-openide/util" >
		166	<echo message="Building openide/fs"/>
		167	<ant dir="../openide/fs" target="netbeans"/>
		168	</target>
		169	<target name="all-openide/modules" depends="init,all-openide/util" >
		170	<echo message="Building openide/modules"/>
		171	<ant dir="../openide/modules" target="netbeans"/>
		172	</target>
		173	<target name="all-openide/awt" depends="init,all-openide/util" >
		174	<echo message="Building openide/awt"/>
		175	<ant dir="../openide/awt" target="netbeans"/>
		176	</target>
		177	<target name="all-openide/options" depends="init,all-openide/util" >
		178	<echo message="Building openide/options"/>
		179	<ant dir="../openide/options" target="netbeans"/>
		180	</target>
		181	<target name="all-openide/dialogs" depends="init,all-openide/util,all-openide/awt" >
		182	<echo message="Building openide/dialogs"/>
		183	<ant dir="../openide/dialogs" target="netbeans"/>
		184	</target>
		185	<target name="all-openide/nodes" depends="init,all-openide/util,all-openide/dialogs" >
		186	<echo message="Building openide/nodes"/>
		187	<ant dir="../openide/nodes" target="netbeans"/>
		188	</target>
		189	<target name="all-openide/explorer" depends="init,all-openide/nodes,all-openide/dialogs,all-openide/options" >
		190	<echo message="Building openide/explorer"/>
		191	<ant dir="../openide/explorer" target="netbeans"/>
		192	</target>
		193	<target name="all-openide/windows" depends="init,all-openide/nodes" >
		194	<echo message="Building openide/windows"/>
		195	<ant dir="../openide/windows" target="netbeans"/>
		196	</target>
		197	<target name="all-openide/text" depends="init,all-openide/windows,all-openide/options" >
		198	<echo message="Building openide/text"/>
		199	<ant dir="../openide/text" target="netbeans"/>
		200	</target>
		201	<target name="all-openide/actions" depends="init,all-openide/windows,all-openide/fs,all-openide/explorer,all-openide/nodes,all-openide/text" >
		202	<echo message="Building openide/actions"/>
		203	<ant dir="../openide/actions" target="netbeans"/>
		204	</target>
156	<target name="all-openide/deprecated" depends="all-openide,all-java/srcmodel,all-debuggercore/oldapi,all-openide/compiler,all-openide/io,all-openide/execution">	205	<target name="all-openide/deprecated" depends="all-openide,all-java/srcmodel,all-debuggercore/oldapi,all-openide/compiler,all-openide/io,all-openide/execution">
157	<echo message="Building openide/deprecated..."/>	206	<echo message="Building openide/deprecated..."/>
158	<ant dir="../openide/deprecated" target="netbeans"/>	207	<ant dir="../openide/deprecated" target="netbeans"/>
Lines 993-998 Link Here
993	mergedependentmodules="${merge.dependent.modules}" >	1042	mergedependentmodules="${merge.dependent.modules}" >
994	<suppress locale="ja" unless="netbeans.japanese"/>	1043	<suppress locale="ja" unless="netbeans.japanese"/>
995	</nbmerge>	1044	</nbmerge>
		1045	<!-- if copied, remove this file as it is not needed much -->
		1046	<delete file="${netbeans.dest}/lib/openide.jar" />
996	<chmod perm="ugo+x">	1047	<chmod perm="ugo+x">
997	<fileset dir="${netbeans.dest}">	1048	<fileset dir="${netbeans.dest}">
998	<include name="bin/*/.sh"/>	1049	<include name="bin/*/.sh"/>
Lines 1035-1041 Link Here
1035	</target>	1086	</target>
1036		1087
1037	<target name="check-for-build">	1088	<target name="check-for-build">
1038	<available property="have-build" file="${netbeans.dest}/lib/openide.jar"/>	1089	<available property="have-build" file="${netbeans.dest}/lib/core.jar"/>
1039	</target>	1090	</target>
1040	<target name="maybe-build-nozip" depends="check-for-build" unless="have-build">	1091	<target name="maybe-build-nozip" depends="check-for-build" unless="have-build">
1041	<ant dir="." target="build-nozip"/>	1092	<ant dir="." target="build-nozip"/>

Lines 24-41 Link Here

(-)openide/actions/build.xml (-11 / +28 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26		26
		27	<path id="classpath" >
		28	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
		29	<pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
		30	<pathelement location="${nbroot}/openide/windows/netbeans/lib/openide-windows.jar"/>
		31	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
		32	<pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
		33	<pathelement location="${nbroot}/openide/text/netbeans/lib/openide-text.jar"/>
		34	<pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
		35	<pathelement location="${nbroot}/openide/explorer/netbeans/lib/openide-explorer.jar"/>
		36	<pathelement location="${nbroot}/openide/fs/netbeans/lib/openide-fs.jar"/>
		37	</path>
		38
27	<target name="compile" >	39	<target name="compile" >
28	<path id="classpath" >
29	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
30	<pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
31	<pathelement location="${nbroot}/openide/windows/netbeans/lib/openide-windows.jar"/>
32	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
33	<pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
34	<pathelement location="${nbroot}/openide/text/netbeans/lib/openide-text.jar"/>
35	<pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
36	<pathelement location="${nbroot}/openide/explorer/netbeans/lib/openide-explorer.jar"/>
37	<pathelement location="${nbroot}/openide/fs/netbeans/lib/openide-fs.jar"/>
38	</path>
39	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	40	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
40	<property name="include" value="org/openide/cookies/InstanceCookie$$Origin.java" />	41	<property name="include" value="org/openide/cookies/InstanceCookie$$Origin.java" />
41	<property name="localdir" location="src" />	42	<property name="localdir" location="src" />
Lines 115-120 Link Here
115	</makenbm>	116	</makenbm>
116	</target>	117	</target>
117		118
		119	<target name="javadoc">
		120	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		121	<property name="localdir" location="src" />
		122	<property name="selector" value="openide.actions" />
		123
		124	<property name="javadoc.base" location="."/>
		125	<property name="javadoc.name" value="ActionsAPI"/>
		126	<property name="javadoc.title" value="Old Actions API"/>
		127	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		128	<property name="javadoc.arch" location="../arch/arch-openide-actions.xml"/>
		129	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		130	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		131	</ant>
		132	</target>
		133
118	<target name="clean">	134	<target name="clean">
119	<delete dir="src/org/openide/actions" />	135	<delete dir="src/org/openide/actions" />
120	<delete dir="src/org/openide/util" />	136	<delete dir="src/org/openide/util" />
Lines 123-128 Link Here
123	<delete file="manifest-subst.mf"/>	139	<delete file="manifest-subst.mf"/>
124	<delete file="treefs.nbm"/>	140	<delete file="treefs.nbm"/>
125	<delete dir="netbeans"/>	141	<delete dir="netbeans"/>
		142	<delete dir="javadoc"/>
126	<delete dir="Info"/>	143	<delete dir="Info"/>
127	<delete dir="reload"/>	144	<delete dir="reload"/>
128	<delete>	145	<delete>

Added Link Here

(-)openide/compat/build.xml (+87 lines)
1	<?xml version='1.0' encoding='ISO-8859-1' ?>
2	<!--
3	Sun Public License Notice
4
5	The contents of this file are subject to the Sun Public License
6	Version 1.0 (the "License"). You may not use this file except in
7	compliance with the License. A copy of the License is available at
8	http://www.sun.com/
9
10	The Original Code is NetBeans. The Initial Developer of the Original
11	Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
12	Microsystems, Inc. All Rights Reserved.
13	-->
14
15	<project name="openide/compat" default="netbeans" basedir=".">
16	<property name="nbroot" location="../.." />
17
18	<property name="nbm_alias" value="nb_ide"/>
19	<property name="homepage.base" value="netbeans.org"/>
20	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
21	<property name="license.file" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
22
23	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26
27	<target name="compile" >
28	<path id="classpath" >
29	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar" />
30	<pathelement location="${nbroot}/openide/fs/netbeans/lib/openide-fs.jar" />
31	<pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar" />
32	</path>
33	<javac sourcepath="" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
34	<src path="src" />
35	<classpath refid="classpath" />
36	</javac>
37	</target>
38
39	<target name="jars" depends="compile">
40	<mkdir dir="netbeans/lib"/>
41	<filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
42	<copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
43	<locjar jarfile="netbeans/lib/openide-compat.jar"
44	manifest="manifest-subst.mf"
45	basedir="src"
46	excludesfile="${nbroot}/nbbuild/standard-jar-excludes.txt"
47	compress="false">
48	<locale name="ja"/>
49	<fileset dir="../src" excludesfile="../../nbbuild/standard-jar-excludes.txt" >
50	<!-- <include name="org/openide/resources/**" /> -->
51	<include name="META-INF/**" />
52	</fileset>
53	</locjar>
54	</target>
55
56	<target name="netbeans" depends="jars">
57	<!-- No! Not yet. Not until it is really a module.
58	<genlist targetname="nbm" outputfiledir="${nbroot}/nbbuild/netbeans"/>
59	-->
60	</target>
61
62	<target name="nbm" depends="netbeans">
63	<makenbm file="openide-compat.nbm"
64	topdir="."
65	module="netbeans/lib/openide-compat.jar"
66	homepage="http://openide.${homepage.base}/"
67	needsrestart="false"
68	distribution="http://${dist.base}/openide-compat.nbm">
69	<license file="${license.file}"/>
70	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
71	</makenbm>
72	</target>
73
74	<target name="clean">
75	<delete >
76	<fileset dir="src" >
77	<include name="*/.class" />
78	</fileset>
79	</delete>
80	<delete file="manifest-subst.mf"/>
81	<delete file="openide-compat.nbm"/>
82	<delete dir="netbeans"/>
83	<delete dir="Info"/>
84	<delete dir="reload"/>
85	</target>
86
87	</project>

Added Link Here

(-)openide/compat/manifest.mf (+17 lines)
1	Manifest-Version: 1.0
2	OpenIDE-Module: org.openide/1
3	OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
4	X-Comment: change specification version in openide-spec-vers.properties
5	OpenIDE-Module-Specification-Version: 4.20
6	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
7	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
8	Specification-Title: IDE/1
9	Specification-Version: @SPEC_VERS_SUBST@
10	Specification-Vendor: NetBeans
11	Implementation-Title: NetBeans Modules API
12	Implementation-Version: @BUILD_NUMBER_SUBST@
13	Implementation-Vendor: NetBeans
14
15	Name: /org/openide/modules/
16	Package-Title: org.openide.modules
17

Lines 24-38 Link Here

(-)openide/explorer/build.xml (-7 / +23 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26		26
		27	<path id="classpath" >
		28	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
		29	<pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
		30	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
		31	<pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
		32	<pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
		33	</path>
27		34
28	<target name="compile" >	35	<target name="compile" >
29	<path id="classpath" >
30	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
31	<pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
32	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
33	<pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
34	<pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
35	</path>
36	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	36	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
37	<property name="localdir" location="src" />	37	<property name="localdir" location="src" />
38	<property name="selector" value="openide.explorer" />	38	<property name="selector" value="openide.explorer" />
Lines 91-96 Link Here
91	</makenbm>	91	</makenbm>
92	</target>	92	</target>
93		93
		94	<target name="javadoc">
		95	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		96	<property name="localdir" location="src" />
		97	<property name="selector" value="openide.explorer" />
		98
		99	<property name="javadoc.base" location="."/>
		100	<property name="javadoc.name" value="ExplorerAPI"/>
		101	<property name="javadoc.title" value="Explorer API"/>
		102	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		103	<property name="javadoc.arch" location="../arch/arch-openide-explorer.xml"/>
		104	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		105	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		106	</ant>
		107	</target>
		108
94	<target name="clean">	109	<target name="clean">
95	<delete dir="src/org/openide" />	110	<delete dir="src/org/openide" />
96	<delete>	111	<delete>
Lines 101-106 Link Here
101	<delete file="manifest-subst.mf"/>	116	<delete file="manifest-subst.mf"/>
102	<delete file="treefs.nbm"/>	117	<delete file="treefs.nbm"/>
103	<delete dir="netbeans"/>	118	<delete dir="netbeans"/>
		119	<delete dir="javadoc"/>
104	<delete dir="Info"/>	120	<delete dir="Info"/>
105	<delete dir="reload"/>	121	<delete dir="reload"/>
106	</target>	122	</target>

Lines 45-51 Link Here

(-)openide/loaders/src/org/openide/loaders/InstanceNode.java (-3 / +3 lines)
45		45
46	/** icon base */	46	/** icon base */
47	private static final String INSTANCE_ICON_BASE =	47	private static final String INSTANCE_ICON_BASE =
48	"org/openide/resources/instanceObject"; // NOI18N	48	"org/openide/loaders/instanceObject"; // NOI18N
49		49
50	/** File extension for xml settings. */	50	/** File extension for xml settings. */
51	private static final String XML_EXT = "settings"; //NOI18N	51	private static final String XML_EXT = "settings"; //NOI18N
Lines 106-112 Link Here
106	InstanceCookie.Of ic = ic();	106	InstanceCookie.Of ic = ic();
107	String iconBase = INSTANCE_ICON_BASE;	107	String iconBase = INSTANCE_ICON_BASE;
108	if (ic == null) {//XXX && io.instanceOf(XMLSettingsSupport.BrokenSettings.class)) {	108	if (ic == null) {//XXX && io.instanceOf(XMLSettingsSupport.BrokenSettings.class)) {
109	iconBase = "org/openide/resources/instanceBroken"; // NOI18N	109	iconBase = "org/openide/loaders/instanceBroken"; // NOI18N
110	}	110	}
111	setIconBase(iconBase);	111	setIconBase(iconBase);
112	}	112	}
Lines 232-238 Link Here
232	if (icon instanceof ImageIcon) {	232	if (icon instanceof ImageIcon) {
233	beanInfoIcon = ((ImageIcon)icon).getImage();	233	beanInfoIcon = ((ImageIcon)icon).getImage();
234	} else {	234	} else {
235	beanInfoIcon = Utilities.loadImage("org/openide/resources/actions/empty.gif", true); // NOI18N	235	beanInfoIcon = Utilities.loadImage("org/openide/loaders/empty.gif", true); // NOI18N
236	}	236	}
237	}	237	}
238	} catch (Exception e) {	238	} catch (Exception e) {

Lines 24-39 Link Here

(-)openide/text/build.xml (-8 / +24 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26		26
		27	<path id="classpath" >
		28	<pathelement location="${nbroot}/openide/windows/netbeans/lib/openide-windows.jar"/>
		29	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
		30	<pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
		31	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
		32	<pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
		33	<pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
		34	</path>
27		35
28	<target name="compile" >	36	<target name="compile" >
29	<path id="classpath" >
30	<pathelement location="${nbroot}/openide/windows/netbeans/lib/openide-windows.jar"/>
31	<pathelement location="${nbroot}/openide/util/netbeans/lib/openide-util.jar"/>
32	<pathelement location="${nbroot}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
33	<pathelement location="${nbroot}/openide/awt/netbeans/lib/openide-awt.jar"/>
34	<pathelement location="${nbroot}/openide/dialogs/netbeans/lib/openide-dialogs.jar"/>
35	<pathelement location="${nbroot}/openide/options/netbeans/lib/openide-options.jar"/>
36	</path>
37	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	37	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
38	<property name="localdir" location="src" />	38	<property name="localdir" location="src" />
39	<property name="selector" value="openide.text" />	39	<property name="selector" value="openide.text" />
Lines 108-119 Link Here
108	</makenbm>	108	</makenbm>
109	</target>	109	</target>
110		110
		111	<target name="javadoc">
		112	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		113	<property name="localdir" location="src" />
		114	<property name="selector" value="openide.text" />
		115
		116	<property name="javadoc.base" location="."/>
		117	<property name="javadoc.name" value="TextAPI"/>
		118	<property name="javadoc.title" value="Text API"/>
		119	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		120	<property name="javadoc.arch" location="../arch/arch-openide-editor.xml"/>
		121	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		122	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		123	</ant>
		124	</target>
		125
111	<target name="clean">	126	<target name="clean">
112	<delete dir="gensrc" />	127	<delete dir="gensrc" />
113	<delete dir="src" />	128	<delete dir="src" />
114	<delete file="manifest-subst.mf"/>	129	<delete file="manifest-subst.mf"/>
115	<delete file="treefs.nbm"/>	130	<delete file="treefs.nbm"/>
116	<delete dir="netbeans"/>	131	<delete dir="netbeans"/>
		132	<delete dir="javadoc"/>
117	<delete dir="Info"/>	133	<delete dir="Info"/>
118	<delete dir="reload"/>	134	<delete dir="reload"/>
119	</target>	135	</target>

Lines 24-33 Link Here

(-)openide/util/build.xml (-3 / +21 lines)
24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>	24	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbroot}/nbbuild/nbantext.jar"/>
25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>	25	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbroot}/nbbuild/nbantext.jar"/>
26		26
27	<target name="compile" >	27	<path id="classpath" >
28	<path id="classpath" >
29	<pathelement location="src" />	28	<pathelement location="src" />
30	</path>	29	</path>
		30
		31	<target name="compile" >
31	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >	32	<ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
32	<property name="localdir" location="src" />	33	<property name="localdir" location="src" />
33	<property name="selector" value="openide.util" />	34	<property name="selector" value="openide.util" />
Lines 83-88 Link Here
83	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>	84	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
84	</makenbm>	85	</makenbm>
85	</target>	86	</target>
		87
		88	<target name="javadoc">
		89	<ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
		90	<property name="localdir" location="src" />
		91	<property name="selector" value="openide.util" />
		92
		93	<property name="javadoc.base" location="."/>
		94	<property name="javadoc.name" value="UtilitiesAPI"/>
		95	<property name="javadoc.title" value="Utilities API"/>
		96	<!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
		97	<property name="javadoc.arch" location="../arch/arch-openide-utilities.xml"/>
		98	<!-- <property name="javadoc.docfiles" location="api/doc"/> -->
		99	<!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
		100	</ant>
		101	</target>
		102
86		103
87	<target name="clean">	104	<target name="clean">
88	<delete dir="src/org/openide" />	105	<delete dir="src/org/openide" />
Lines 94-99 Link Here
94	<delete file="manifest-subst.mf"/>	111	<delete file="manifest-subst.mf"/>
95	<delete file="treefs.nbm"/>	112	<delete file="treefs.nbm"/>
96	<delete dir="netbeans"/>	113	<delete dir="netbeans"/>
		114	<delete dir="javadoc"/>
97	<delete dir="Info"/>	115	<delete dir="Info"/>
98	<delete dir="reload"/>	116	<delete dir="reload"/>
99	</target>	117	</target>