Attachment #3022 for bug #16581

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

Lines 35-41 Link Here

(-)ant/build.xml (-1 / +5 lines)
35	<fileset dir="../openide/netbeans/lib">	35	<fileset dir="../openide/netbeans/lib">
36	<include name="openide*.jar" />	36	<include name="openide*.jar" />
37	</fileset>	37	</fileset>
38	<pathelement location="${binroot}/ant/release/modules/ext/ant.jar"/>	38	<fileset dir="${binroot}/ant/release/modules/ext">
		39	<include name="ant.jar"/>
		40	<include name="ant-1.*.jar"/>
		41	</fileset>
39	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	42	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
40	</classpath>	43	</classpath>
41	</javac>	44	</javac>
Lines 178-183 Link Here
178	<include name="org/apache/tools/ant/types/*.java"/>	181	<include name="org/apache/tools/ant/types/*.java"/>
179	<include name="org/apache/tools/ant/util/*.java"/>	182	<include name="org/apache/tools/ant/util/*.java"/>
180	<include name="org/apache/tools/ant/util/regexp/RegexpMatcher.java"/>	183	<include name="org/apache/tools/ant/util/regexp/RegexpMatcher.java"/>
		184	<include name="org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java"/>
181	<!-- Do not forget about the package list for Javadoc below... -->	185	<!-- Do not forget about the package list for Javadoc below... -->
182	</fileset>	186	</fileset>
183	</copy>	187	</copy>

Lines 9-15 Link Here

(-)ant/manifest.mf (-1 / +1 lines)
9	OpenIDE-Module-Package-Dependencies: [org.apache.tools.ant.Location], [org.apache.xerces.parsers.DOMParser]	9	OpenIDE-Module-Package-Dependencies: [org.apache.tools.ant.Location], [org.apache.xerces.parsers.DOMParser]
10	X-Comment-2: Cf. AntActionInstance, new XXX(Action) constructors	10	X-Comment-2: Cf. AntActionInstance, new XXX(Action) constructors
11	OpenIDE-Module-Java-Dependencies: Java > 1.3	11	OpenIDE-Module-Java-Dependencies: Java > 1.3
12	Class-Path: ext/ant.jar ext/ant-optional.jar docs/ant-manual.zip	12	Class-Path: ext/ant-1.4.1.jar ext/ant-optional-1.4.1.jar docs/ant-manual.zip
13		13
14	Name: org/apache/tools/ant/module/loader/AntProjectDataLoader.class	14	Name: org/apache/tools/ant/module/loader/AntProjectDataLoader.class
15	OpenIDE-Module-Class: Loader	15	OpenIDE-Module-Class: Loader

Lines 14-20 Link Here

(-)ant/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs (-1 / +1 lines)
14	<!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 1.0//EN" "http://java.sun.com/products/javahelp/helpset_1_0.dtd">	14	<!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 1.0//EN" "http://java.sun.com/products/javahelp/helpset_1_0.dtd">
15		15
16	<helpset version="1.0">	16	<helpset version="1.0">
17	<title>Ant 1.4 Manual</title>	17	<title>Ant 1.4.1 Manual</title>
18	<maps>	18	<maps>
19	<homeID>org.apache.tools.ant.module.ant-docs</homeID>	19	<homeID>org.apache.tools.ant.module.ant-docs</homeID>
20	<mapref location="Map.jhm"/>	20	<mapref location="Map.jhm"/>

Lines 13-19 Link Here

(-)ant/javahelp/org/apache/tools/ant/module/docs/TOC.toc (-1 / +1 lines)
13	-->	13	-->
14	<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd">	14	<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd">
15	<toc version="1.0">	15	<toc version="1.0">
16	<tocitem target="org.apache.tools.ant.module.ant-docs">Ant 1.4 Manual	16	<tocitem target="org.apache.tools.ant.module.ant-docs">Ant 1.4.1 Manual
17	<tocitem target="org.apache.tools.ant.module.ant-docs.libdeps">Optional Libraries</tocitem>	17	<tocitem target="org.apache.tools.ant.module.ant-docs.libdeps">Optional Libraries</tocitem>
18	<tocitem target="org.apache.tools.ant.module.ant-docs.using">Using</tocitem>	18	<tocitem target="org.apache.tools.ant.module.ant-docs.using">Using</tocitem>
19	<tocitem>Built-in Tasks	19	<tocitem>Built-in Tasks

Lines 18-27 Link Here

(-)ant/src/org/apache/tools/ant/module/resources/Bundle.properties (-3 / +3 lines)
18	Templates/Ant/SampleProject.xml=Sample Ant Project	18	Templates/Ant/SampleProject.xml=Sample Ant Project
19	Templates/Ant/CustomTask.java=Custom Task	19	Templates/Ant/CustomTask.java=Custom Task
20	Templates/Ant/Shortcut.txt=Shortcut to Target	20	Templates/Ant/Shortcut.txt=Shortcut to Target
21	Menu/Help/HelpShortcuts/org-apache-tools-ant-module-mainpage.xml=Ant 1.4 Manual	21	Menu/Help/HelpShortcuts/org-apache-tools-ant-module-mainpage.xml=Ant 1.4.1 Manual
22	Actions/Help/org-apache-tools-ant-module-mainpage.xml=Ant 1.4 Manual	22	Actions/Help/org-apache-tools-ant-module-mainpage.xml=Ant 1.4.1 Manual
23	# #14574:	23	# #14574:
24	Mount/Javadoc/org-apache-tools-ant-module-javadoc.xml=Ant 1.4 API Javadoc	24	Mount/Javadoc/org-apache-tools-ant-module-javadoc.xml=Ant 1.4.1 API Javadoc
25	Services/MIMEResolver/org-apache-tools-ant-module-mime-resolver.xml=Ant <project> XML files	25	Services/MIMEResolver/org-apache-tools-ant-module-mime-resolver.xml=Ant <project> XML files
26	Services/org-apache-tools-ant-module-AntSettings.settings=Ant Settings	26	Services/org-apache-tools-ant-module-AntSettings.settings=Ant Settings
27		27

Lines 8-14 Link Here

(-)ant/src/org/apache/tools/ant/module/resources/SampleProject.xml_ (-1 / +1 lines)
8	<project name="myapp" basedir="." default="all">	8	<project name="myapp" basedir="." default="all">
9		9
10	<!-- Don't worry if you don't know the Ant syntax completely or need help on some tasks! -->	10	<!-- Don't worry if you don't know the Ant syntax completely or need help on some tasks! -->
11	<!-- The standard Ant documentation is bundled. See Help \| Shortcuts \| Ant 1.4 Documentation. -->	11	<!-- The standard Ant documentation is bundled. See Help \| Shortcuts \| Ant 1.4.1 Documentation. -->
12		12
13	<target name="init">	13	<target name="init">
14	<!-- You can set up any variables you want used throughout the script here. -->	14	<!-- You can set up any variables you want used throughout the script here. -->




    </roles>
  </requirement>

  <requirement name="Upgrade to Ant 1.4.1" target="3.3" priority="medium" user-impact="high" duration="1" percentage-complete="100">
    <short-description>
      Upgrade the bundled Ant library to 1.4.1.
    </short-description>
    <long-description>
      <body>
        <p>
          Previously Ant 1.3 was used in the Ant module. For NetBeans 3.3,
          Ant 1.4.1 should be used.
        </p>
      </body>
    </long-description>

Lines 46-53 Link Here

(-)apisupport/build.xml (-2 / +4 lines)
46	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	46	<javac srcdir="src" destdir="src" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
47	<classpath>	47	<classpath>
48	<pathelement location="../ant/netbeans/modules/ant.jar"/>	48	<pathelement location="../ant/netbeans/modules/ant.jar"/>
49	<!-- Currently automatically in classpath, but a future Ant may change that: -->	49	<fileset dir="${binroot}/ant/release/modules/ext">
50	<pathelement location="${binroot}/ant/release/modules/ext/ant.jar"/>	50	<include name="ant.jar"/>
		51	<include name="ant-1.*.jar"/>
		52	</fileset>
51	<fileset dir="../openide/netbeans/lib">	53	<fileset dir="../openide/netbeans/lib">
52	<include name="openide*.jar" />	54	<include name="openide*.jar" />
53	</fileset>	55	</fileset>

Lines 264-271 Link Here

(-)core/test/build.xml (-2 / +3 lines)
264	<property name="xtest.ide.path" refid="xtest.ide.path">	264	<property name="xtest.ide.path" refid="xtest.ide.path">
265	<classpath id="xtest.ide.path">	265	<classpath id="xtest.ide.path">
266	<!-- XXX this is bad, it assumes the Ant module is installed! -->	266	<!-- XXX this is bad, it assumes the Ant module is installed! -->
267	<pathelement location="${netbeans.test.home}/modules/ext/ant.jar" />	267	<fileset dir="${netbeans.test.home}/modules/ext">
268	<pathelement location="${netbeans.test.home}/modules/ext/ant-optional.jar" />	268	<include name="ant*.jar"/>
		269	</fileset>
269	</classpath>	270	</classpath>
270	</property>	271	</property>
271		272

Lines 251-258 Link Here

(-)java/test/build.xml (-2 / +4 lines)
251	<property name="test.target" value="ide_test_helper"/>	251	<property name="test.target" value="ide_test_helper"/>
252	<property name="xtest.ide.path" refid="xtest.ide.path">	252	<property name="xtest.ide.path" refid="xtest.ide.path">
253	<classpath id="xtest.ide.path">	253	<classpath id="xtest.ide.path">
254	<pathelement location="${netbeans.test.home}/modules/ext/ant.jar" />	254	<!-- XXX this is bad, it assumes the Ant module is installed! -->
255	<pathelement location="${netbeans.test.home}/modules/ext/ant-optional.jar" />	255	<fileset dir="${netbeans.test.home}/modules/ext">
		256	<include name="ant*.jar"/>
		257	</fileset>
256	</classpath>	258	</classpath>
257	</property>	259	</property>
258		260

Lines 261-268 Link Here

(-)openide/test/build.xml (-2 / +4 lines)
261	<property name="test.target" value="ide_test_helper"/>	261	<property name="test.target" value="ide_test_helper"/>
262	<property name="xtest.ide.path" refid="xtest.ide.path">	262	<property name="xtest.ide.path" refid="xtest.ide.path">
263	<classpath id="xtest.ide.path">	263	<classpath id="xtest.ide.path">
264	<pathelement location="${netbeans.test.home}/modules/ext/ant.jar" />	264	<!-- XXX this is bad, it assumes the Ant module is installed! -->
265	<pathelement location="${netbeans.test.home}/modules/ext/ant-optional.jar" />	265	<fileset dir="${netbeans.test.home}/modules/ext">
		266	<include name="ant*.jar"/>
		267	</fileset>
266	</classpath>	268	</classpath>
267	</property>	269	</property>
268		270

Lines 265-272 Link Here

(-)openidex/test/build.xml (-2 / +4 lines)
265	<property name="test.target" value="ide_test_helper"/>	265	<property name="test.target" value="ide_test_helper"/>
266	<property name="xtest.ide.path" refid="xtest.ide.path">	266	<property name="xtest.ide.path" refid="xtest.ide.path">
267	<classpath id="xtest.ide.path">	267	<classpath id="xtest.ide.path">
268	<pathelement location="${netbeans.test.home}/modules/ext/ant.jar" />	268	<!-- XXX this is bad, it assumes the Ant module is installed! -->
269	<pathelement location="${netbeans.test.home}/modules/ext/ant-optional.jar" />	269	<fileset dir="${netbeans.test.home}/modules/ext">
		270	<include name="ant*.jar"/>
		271	</fileset>
270	</classpath>	272	</classpath>
271	</property>	273	</property>
272		274

Lines 34-40 Link Here

(-)xtest/xtest.xml (-1 / +5 lines)
34	<include name="openide*.jar" />	34	<include name="openide*.jar" />
35	</fileset>	35	</fileset>
36	<pathelement location="../core/netbeans/lib/core.jar"/>	36	<pathelement location="../core/netbeans/lib/core.jar"/>
37	<pathelement location="../../nbextra/ant/release/modules/ext/ant.jar"/>	37	<!-- XXX stop using this! Not to mention it should use ${binroot}. -->
		38	<fileset dir="../../nbextra/ant/release/modules/ext">
		39	<include name="ant.jar"/>
		40	<include name="ant-1.*.jar"/>
		41	</fileset>
38	<!-- use junit with already compiled extensions -->	42	<!-- use junit with already compiled extensions -->
39	<pathelement location="src"/>	43	<pathelement location="src"/>
40	<pathelement location="lib/junit.jar"/>	44	<pathelement location="lib/junit.jar"/>

Return to bug 16581

Lines 275-289 Link Here

(-)ant/www/plans/features.xml (-3 / +3 lines)
275	</roles>	275	</roles>
276	</requirement>	276	</requirement>
277		277
278	<requirement name="Upgrade to Ant 1.4" target="3.3" priority="medium" user-impact="high" duration="1" percentage-complete="100">	278	<requirement name="Upgrade to Ant 1.4.1" target="3.3" priority="medium" user-impact="high" duration="1" percentage-complete="100">
279	<short-description>	279	<short-description>
280	Upgrade the bundled Ant library to 1.4.	280	Upgrade the bundled Ant library to 1.4.1.
281	</short-description>	281	</short-description>
282	<long-description>	282	<long-description>
283	<body>	283	<body>
284	<p>	284	<p>
285	Previously Ant 1.3 was used in the Ant module. For NetBeans 3.3,	285	Previously Ant 1.3 was used in the Ant module. For NetBeans 3.3,
286	Ant 1.4 should be used.	286	Ant 1.4.1 should be used.
287	</p>	287	</p>
288	</body>	288	</body>
289	</long-description>	289	</long-description>