Attachment #4889 for bug #20269

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 20269
Collapse All | Expand All

Lines 38-44 Link Here

(-)ant/build.xml (-1 / +1 lines)
38	<include name="ant.jar"/>	38	<include name="ant.jar"/>
39	<include name="ant-1.*.jar"/>	39	<include name="ant-1.*.jar"/>
40	</fileset>	40	</fileset>
41	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	41	<pathelement location="../core/xerces13/netbeans/modules/autoload/ext/xerces-1.3.0.jar"/>
42	<pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>	42	<pathelement location="../core/javahelp/netbeans/modules/autoload/javahelp-api.jar"/>
43	</classpath>	43	</classpath>
44	</javac>	44	</javac>

Lines 5-13 Link Here

(-)ant/manifest.mf (-2 / +2 lines)
5	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	5	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
6	OpenIDE-Module-Install: org/apache/tools/ant/module/AntModule.class	6	OpenIDE-Module-Install: org/apache/tools/ant/module/AntModule.class
7	OpenIDE-Module-Layer: org/apache/tools/ant/module/resources/AntModuleLayer.xml	7	OpenIDE-Module-Layer: org/apache/tools/ant/module/resources/AntModuleLayer.xml
8	OpenIDE-Module-Module-Dependencies: org.netbeans.modules.javahelp/1 > 1.0	8	OpenIDE-Module-Module-Dependencies: org.netbeans.modules.javahelp/1 > 1.0, org.apache.xerces.v13
9	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3	9	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
10	OpenIDE-Module-Package-Dependencies: [org.apache.tools.ant.Location], [org.apache.xerces.parsers.DOMParser], [org.apache.xml.serialize.EncodingInfo]	10	OpenIDE-Module-Package-Dependencies: [org.apache.tools.ant.Location]
11	Class-Path: ext/ant-1.4.1.jar ext/ant-optional-1.4.1.jar	11	Class-Path: ext/ant-1.4.1.jar ext/ant-optional-1.4.1.jar
12		12
13	Name: org/apache/tools/ant/module/loader/AntProjectDataLoader.class	13	Name: org/apache/tools/ant/module/loader/AntProjectDataLoader.class

Lines 37-43 Link Here

(-)apisupport/build.xml (-1 / +1 lines)
37	</fileset>	37	</fileset>
38	<!--<pathelement location="../core/netbeans/lib/core.jar"/>-->	38	<!--<pathelement location="../core/netbeans/lib/core.jar"/>-->
39	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>	39	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
40	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	40	<pathelement location="../core/xerces13/netbeans/modules/autoload/ext/xerces-1.3.0.jar"/>
41	</classpath>	41	</classpath>
42	<exclude name="org/netbeans/modules/apisupport/ant/"/>	42	<exclude name="org/netbeans/modules/apisupport/ant/"/>
43	<exclude name="org/netbeans/modules/apisupport/lite/"/>	43	<exclude name="org/netbeans/modules/apisupport/lite/"/>

Lines 4-12 Link Here

(-)apisupport/manifest.mf (-2 / +1 lines)
4	OpenIDE-Module-Layer: org/netbeans/modules/apisupport/resources/mf-layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/apisupport/resources/mf-layer.xml
5	OpenIDE-Module-Specification-Version: 2.11	5	OpenIDE-Module-Specification-Version: 2.11
6	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	6	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
7	OpenIDE-Module-Module-Dependencies: org.netbeans.modules.apisupport.lite/1 > 0.1, org.netbeans.modules.jarpackager/2 > 1.8, org.netbeans.modules.javahelp/1 > 1.0	7	OpenIDE-Module-Module-Dependencies: org.netbeans.modules.apisupport.lite/1 > 0.1, org.netbeans.modules.jarpackager/2 > 1.8, org.netbeans.modules.javahelp/1 > 1.0, org.apache.xerces.v13
8	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3	8	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
9	OpenIDE-Module-Package-Dependencies: [org.apache.xerces.parsers.DOMParser], [org.apache.xml.serialize.EncodingInfo]
10	Class-Path: docs/apisupport-manual.zip	9	Class-Path: docs/apisupport-manual.zip
11		10
12	Name: org/netbeans/modules/apisupport/ManifestDataLoader.class	11	Name: org/netbeans/modules/apisupport/ManifestDataLoader.class

Lines 739-744 Link Here

(-)core/src/org/netbeans/core/modules/NbInstaller.java (+3 lines)
739	"org/apache/xerces/", // NOI18N	739	"org/apache/xerces/", // NOI18N
740	// xerces.jar - serializer library	740	// xerces.jar - serializer library
741	"org/apache/xml/serialize/", // NOI18N	741	"org/apache/xml/serialize/", // NOI18N
		742	// xerces.jar - misc
		743	"org/apache/html/", // NOI18N
		744	"org/apache/wml/", // NOI18N
742	};	745	};
743		746
744	private Set/<String>/ findKosher(Module m) {	747	private Set/<String>/ findKosher(Module m) {




      <config name="superslim" modules="classfile,clazz,editor,html,image,java,openidex,projects,text,utilities"/>
      <config name="slim" modules="autoupdate,beans,classfile,clazz,debuggercore,debuggerjpda,debuggertools,editor,form,html,httpserver,image,java,openidex,projects,text,utilities"/>
      <!-- [PENDING] A poor name; 'standard' would be more in line with the CVS pseudomodule. -->
      <config name="stable" modules="ant,ant/docs,apisupport/lite,applet,autoupdate,beans,classfile,clazz,core/xerces13,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,form,html,httpserver,httpserver/servletapi,i18n,image,j2eeserver,jarpackager,java,javacvs,javadoc,jndi,openidex,projects,properties,rmi,scripting,text,tomcatint/tomcat32,usersguide,utilities,vcscore,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
      <config name="stable-with-apisupport" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,clazz,core/xerces13,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,form,html,httpserver,httpserver/servletapi,i18n,image,j2eeserver,jarpackager,java,javacvs,javadoc,jndi,openidex,projects,properties,rmi,scripting,text,tomcatint/tomcat32,usersguide,utilities,vcscore,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
      <config name="bloated" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,classclosure,clazz,core/xerces13,cpp,cpplite,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,externaleditor,form,freestylebrowser,html,httpserver,httpserver/servletapi,i18n,icebrowser,image,innertesters,j2eeserver,jarpackager,java,javacvs,javadoc,logger,makefile,multicompile,objectbrowser,openidex,projects,properties,remotefs,rmi,schema2beans,scripting,serialversion,sysprops,text,tomcatint/tomcat32,tomcatint/tomcat40,usersguide,utilities,vcscore,vcscvs,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,web/jspdebug,web/advanced,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css,openidex/looks"/>
      <!-- You are on your own for getting the binaries for some of these: -->
      <config name="bloated-plus-extrabins" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,classclosure,clazz,core/xerces13,cpp,cpplite,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,externaleditor,form,freestylebrowser,html,httpserver,httpserver/servletapi,i18n,icebrowser,image,innertesters,j2eeserver,jarpackager,java,javacvs,javadoc,jini,logger,makefile,multicompile,objectbrowser,openidex,projects,properties,remotefs,rmi,schema2beans,scripting,serialversion,sysprops,text,tomcatint/tomcat32,tomcatint/tomcat40,usersguide,utilities,vcscore,vcscvs,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,web/jspdebug,web/advanced,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
    </configmods>
  </target>


  </target>

  <!-- And the modules: -->
  <target name="all-ant" depends="all-openide,all-core/javahelp,all-core/xerces13">
    <echo message="Building module ant..."/>
    <ant dir="../ant" target="netbeans"/>
  </target>

    <echo message="Building module ant/docs..."/>
    <ant dir="../ant/docs" target="netbeans"/>
  </target>
  <target name="all-apisupport" depends="all-openide,all-core,all-core/javahelp,all-core/xerces13,all-jarpackager,all-apisupport/lite">
    <echo message="Building module apisupport..."/>
    <ant dir="../apisupport" target="netbeans"/>
  </target>

    <echo message="Building module clazz..."/>
    <ant dir="../clazz" target="netbeans"/>
  </target>
  <target name="all-core/xerces13" depends="all-openide">
    <echo message="Building module core/xerces13..."/>
    <ant dir="../core/xerces13" target="netbeans"/>
  </target>
  <target name="all-db" depends="all-openide,all-openidex,all-form">
    <echo message="Building module db..."/>
    <ant dir="../db" target="netbeans"/>

          description="Build Auto Update NBM files and XML descriptions.">
    <!-- Note: partially sorted in dependency order -->
    <!-- (this could also be done with separate targets). -->
    <echo message="Making NBM for module core/xerces13..."/>
    <ant dir="../core/xerces13" target="nbm"/>
    <echo message="Making NBM for module ant..."/>
    <ant dir="../ant" target="nbm"/>
    <echo message="Making NBM for module ant/docs..."/>

Return to bug 20269

Lines 99-109 Link Here

(-)nbbuild/build.xml (-6 / +12 lines)
99	<config name="superslim" modules="classfile,clazz,editor,html,image,java,openidex,projects,text,utilities"/>	99	<config name="superslim" modules="classfile,clazz,editor,html,image,java,openidex,projects,text,utilities"/>
100	<config name="slim" modules="autoupdate,beans,classfile,clazz,debuggercore,debuggerjpda,debuggertools,editor,form,html,httpserver,image,java,openidex,projects,text,utilities"/>	100	<config name="slim" modules="autoupdate,beans,classfile,clazz,debuggercore,debuggerjpda,debuggertools,editor,form,html,httpserver,image,java,openidex,projects,text,utilities"/>
101	<!-- [PENDING] A poor name; 'standard' would be more in line with the CVS pseudomodule. -->	101	<!-- [PENDING] A poor name; 'standard' would be more in line with the CVS pseudomodule. -->
102	<config name="stable" modules="ant,ant/docs,apisupport/lite,applet,autoupdate,beans,classfile,clazz,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,form,html,httpserver,httpserver/servletapi,i18n,image,j2eeserver,jarpackager,java,javacvs,javadoc,jndi,openidex,projects,properties,rmi,scripting,text,tomcatint/tomcat32,usersguide,utilities,vcscore,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>	102	<config name="stable" modules="ant,ant/docs,apisupport/lite,applet,autoupdate,beans,classfile,clazz,core/xerces13,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,form,html,httpserver,httpserver/servletapi,i18n,image,j2eeserver,jarpackager,java,javacvs,javadoc,jndi,openidex,projects,properties,rmi,scripting,text,tomcatint/tomcat32,usersguide,utilities,vcscore,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
103	<config name="stable-with-apisupport" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,clazz,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,form,html,httpserver,httpserver/servletapi,i18n,image,j2eeserver,jarpackager,java,javacvs,javadoc,jndi,openidex,projects,properties,rmi,scripting,text,tomcatint/tomcat32,usersguide,utilities,vcscore,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>	103	<config name="stable-with-apisupport" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,clazz,core/xerces13,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,form,html,httpserver,httpserver/servletapi,i18n,image,j2eeserver,jarpackager,java,javacvs,javadoc,jndi,openidex,projects,properties,rmi,scripting,text,tomcatint/tomcat32,usersguide,utilities,vcscore,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
104	<config name="bloated" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,classclosure,clazz,cpp,cpplite,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,externaleditor,form,freestylebrowser,html,httpserver,httpserver/servletapi,i18n,icebrowser,image,innertesters,j2eeserver,jarpackager,java,javacvs,javadoc,logger,makefile,multicompile,objectbrowser,openidex,projects,properties,remotefs,rmi,schema2beans,scripting,serialversion,sysprops,text,tomcatint/tomcat32,tomcatint/tomcat40,usersguide,utilities,vcscore,vcscvs,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,web/jspdebug,web/advanced,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css,openidex/looks"/>	104	<config name="bloated" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,classclosure,clazz,core/xerces13,cpp,cpplite,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,externaleditor,form,freestylebrowser,html,httpserver,httpserver/servletapi,i18n,icebrowser,image,innertesters,j2eeserver,jarpackager,java,javacvs,javadoc,logger,makefile,multicompile,objectbrowser,openidex,projects,properties,remotefs,rmi,schema2beans,scripting,serialversion,sysprops,text,tomcatint/tomcat32,tomcatint/tomcat40,usersguide,utilities,vcscore,vcscvs,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,web/jspdebug,web/advanced,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css,openidex/looks"/>
105	<!-- You are on your own for getting the binaries for some of these: -->	105	<!-- You are on your own for getting the binaries for some of these: -->
106	<config name="bloated-plus-extrabins" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,classclosure,clazz,cpp,cpplite,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,externaleditor,form,freestylebrowser,html,httpserver,httpserver/servletapi,i18n,icebrowser,image,innertesters,j2eeserver,jarpackager,java,javacvs,javadoc,jini,logger,makefile,multicompile,objectbrowser,openidex,projects,properties,remotefs,rmi,schema2beans,scripting,serialversion,sysprops,text,tomcatint/tomcat32,tomcatint/tomcat40,usersguide,utilities,vcscore,vcscvs,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,web/jspdebug,web/advanced,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>	106	<config name="bloated-plus-extrabins" modules="ant,ant/docs,apisupport,apisupport/lite,apisupport/ant,apisupport/apidocs,applet,autoupdate,beans,classfile,classclosure,clazz,core/xerces13,cpp,cpplite,debuggercore,debuggerjpda,debuggertools,diff,editor,extbrowser,externaleditor,form,freestylebrowser,html,httpserver,httpserver/servletapi,i18n,icebrowser,image,innertesters,j2eeserver,jarpackager,java,javacvs,javadoc,jini,logger,makefile,multicompile,objectbrowser,openidex,projects,properties,remotefs,rmi,schema2beans,scripting,serialversion,sysprops,text,tomcatint/tomcat32,tomcatint/tomcat40,usersguide,utilities,vcscore,vcscvs,vcscvs/compat,vcsgeneric,web/servletapi23,web/core,web/jspparser,web/jspsyntax,web/jspdebug,web/advanced,xml/tax,xml/core,xml/catalog,xml/tools,xml/text-edit,xml/tree-edit,xml/css"/>
107	</configmods>	107	</configmods>
108	</target>	108	</target>
109		109
Lines 146-152 Link Here
146	</target>	146	</target>
147		147
148	<!-- And the modules: -->	148	<!-- And the modules: -->
149	<target name="all-ant" depends="all-openide,all-core/javahelp">	149	<target name="all-ant" depends="all-openide,all-core/javahelp,all-core/xerces13">
150	<echo message="Building module ant..."/>	150	<echo message="Building module ant..."/>
151	<ant dir="../ant" target="netbeans"/>	151	<ant dir="../ant" target="netbeans"/>
152	</target>	152	</target>
Lines 154-160 Link Here
154	<echo message="Building module ant/docs..."/>	154	<echo message="Building module ant/docs..."/>
155	<ant dir="../ant/docs" target="netbeans"/>	155	<ant dir="../ant/docs" target="netbeans"/>
156	</target>	156	</target>
157	<target name="all-apisupport" depends="all-openide,all-core,all-core/javahelp,all-jarpackager,all-apisupport/lite">	157	<target name="all-apisupport" depends="all-openide,all-core,all-core/javahelp,all-core/xerces13,all-jarpackager,all-apisupport/lite">
158	<echo message="Building module apisupport..."/>	158	<echo message="Building module apisupport..."/>
159	<ant dir="../apisupport" target="netbeans"/>	159	<ant dir="../apisupport" target="netbeans"/>
160	</target>	160	</target>
Lines 194-199 Link Here
194	<echo message="Building module clazz..."/>	194	<echo message="Building module clazz..."/>
195	<ant dir="../clazz" target="netbeans"/>	195	<ant dir="../clazz" target="netbeans"/>
196	</target>	196	</target>
		197	<target name="all-core/xerces13" depends="all-openide">
		198	<echo message="Building module core/xerces13..."/>
		199	<ant dir="../core/xerces13" target="netbeans"/>
		200	</target>
197	<target name="all-db" depends="all-openide,all-openidex,all-form">	201	<target name="all-db" depends="all-openide,all-openidex,all-form">
198	<echo message="Building module db..."/>	202	<echo message="Building module db..."/>
199	<ant dir="../db" target="netbeans"/>	203	<ant dir="../db" target="netbeans"/>
Lines 645-650 Link Here
645	description="Build Auto Update NBM files and XML descriptions.">	649	description="Build Auto Update NBM files and XML descriptions.">
646	<!-- Note: partially sorted in dependency order -->	650	<!-- Note: partially sorted in dependency order -->
647	<!-- (this could also be done with separate targets). -->	651	<!-- (this could also be done with separate targets). -->
		652	<echo message="Making NBM for module core/xerces13..."/>
		653	<ant dir="../core/xerces13" target="nbm"/>
648	<echo message="Making NBM for module ant..."/>	654	<echo message="Making NBM for module ant..."/>
649	<ant dir="../ant" target="nbm"/>	655	<ant dir="../ant" target="nbm"/>
650	<echo message="Making NBM for module ant/docs..."/>	656	<echo message="Making NBM for module ant/docs..."/>