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

(-)ant/build.xml (-5 / +5 lines)
Lines 100-106 Link Here
100
        <text>For the Ant module itself:</text>
100
        <text>For the Ant module itself:</text>
101
        <file location="${license.file}"/>
101
        <file location="${license.file}"/>
102
	<text>For the Ant runtime:</text>
102
	<text>For the Ant runtime:</text>
103
	<file location="../nbbuild/external/apache-license.txt"/>
103
	<file location="../nbbuild/external/apache-license-2.0.txt"/>
104
      </license>
104
      </license>
105
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
105
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
106
    </makenbm>
106
    </makenbm>
Lines 192-198 Link Here
192
    </zip>
192
    </zip>
193
    <property name="here" location="."/>
193
    <property name="here" location="."/>
194
    <property name="ParserDB" location="docs/release/system/ParserDB"/>
194
    <property name="ParserDB" location="docs/release/system/ParserDB"/>
195
    <property name="features.xml" location="www/plans/features.xml"/>
196
    <property name="ant-libs.zip" location="external/ant-libs-${release.version}.zip.master"/>
195
    <property name="ant-libs.zip" location="external/ant-libs-${release.version}.zip.master"/>
197
    <echo>4.  Creating ${ant-libs.zip}...</echo>
196
    <echo>4.  Creating ${ant-libs.zip}...</echo>
198
    <zip zipfile="${ant-libs.zip}" compress="true">
197
    <zip zipfile="${ant-libs.zip}" compress="true">
Lines 209-225 Link Here
209
    - docs/javahelp/org/apache/tools/ant/module/docs/TOC.toc
208
    - docs/javahelp/org/apache/tools/ant/module/docs/TOC.toc
210
    - docs/javahelp/org/apache/tools/ant/module/docs/Map.jhm
209
    - docs/javahelp/org/apache/tools/ant/module/docs/Map.jhm
211
    and run
210
    and run
212
    ant -f ${here}/ant/docs/build.xml check-javahelp
211
    ant -f ${here}/docs/build.xml check-javahelp
212
    (after step 7 so external/build.xml is updated...)
213
7.  Mention that the Ant version is ${release.version} in these files in ${here}:
213
7.  Mention that the Ant version is ${release.version} in these files in ${here}:
214
    - docs/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs
214
    - docs/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs
215
    - docs/javahelp/org/apache/tools/ant/module/docs/TOC.toc
215
    - docs/javahelp/org/apache/tools/ant/module/docs/TOC.toc
216
    - docs/src/org/apache/tools/ant/module/docs/Bundle.properties
216
    - docs/src/org/apache/tools/ant/module/docs/Bundle.properties
217
    - ../usersguide/javahelp/org/netbeans/modules/usersguide/ant/*.html
217
    - ../usersguide/javahelp/org/netbeans/modules/usersguide/ant/*.html
218
    - build.xml
219
    - external/build.xml
218
    - external/build.xml
220
    - external/.cvsignore
219
    - external/.cvsignore
221
    - ant/docs/build.xml
220
    - ant/docs/build.xml
222
8.  Update ${features.xml}
221
    and cvs rm -f the old .scrambled files and ant scramble to make new ones and cvs add -kb them
222
    also in docs/release/system/ParserDB
223
9.  Increase spec versions in manifest.mf and docs/manifest.mf.
223
9.  Increase spec versions in manifest.mf and docs/manifest.mf.
224
10. Test everything.
224
10. Test everything.
225
11. Submit a patch for cvs://cvs.apache.org/ant/xdocs/external.xml
225
11. Submit a patch for cvs://cvs.apache.org/ant/xdocs/external.xml
(-)ant/manifest.mf (-1 / +1 lines)
Lines 1-7 Link Here
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.apache.tools.ant.module/3
2
OpenIDE-Module: org.apache.tools.ant.module/3
3
OpenIDE-Module-Localizing-Bundle: org/apache/tools/ant/module/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/apache/tools/ant/module/Bundle.properties
4
OpenIDE-Module-Specification-Version: 3.6
4
OpenIDE-Module-Specification-Version: 3.7
5
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
5
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
6
OpenIDE-Module-Public-Packages: org.apache.tools.ant.module.api.*, org.apache.tools.ant.module.spi.*
6
OpenIDE-Module-Public-Packages: org.apache.tools.ant.module.api.*, org.apache.tools.ant.module.spi.*
7
OpenIDE-Module-Install: org/apache/tools/ant/module/AntModule.class
7
OpenIDE-Module-Install: org/apache/tools/ant/module/AntModule.class
(-)ant/docs/build.xml (-2 / +2 lines)
Lines 49-55 Link Here
49
49
50
    <target name="javahelp" depends="init">
50
    <target name="javahelp" depends="init">
51
        <mkdir dir="javahelp/org/apache/tools/ant/module/docs/ant-docs"/>
51
        <mkdir dir="javahelp/org/apache/tools/ant/module/docs/ant-docs"/>
52
        <unzip src="../external/ant-docs-1.6.0.zip" dest="javahelp/org/apache/tools/ant/module/docs/ant-docs"/>
52
        <unzip src="../external/ant-docs-1.6.1.zip" dest="javahelp/org/apache/tools/ant/module/docs/ant-docs"/>
53
        <mkdir dir="javahelp/org/apache/tools/ant/module/docs/JavaHelpSearch"/>
53
        <mkdir dir="javahelp/org/apache/tools/ant/module/docs/JavaHelpSearch"/>
54
        <jhindexer basedir="javahelp/org/apache/tools/ant/module/docs"
54
        <jhindexer basedir="javahelp/org/apache/tools/ant/module/docs"
55
                   db="javahelp/org/apache/tools/ant/module/docs/JavaHelpSearch">
55
                   db="javahelp/org/apache/tools/ant/module/docs/JavaHelpSearch">
Lines 101-107 Link Here
101
                <text>For the Ant documentation module itself:</text>
101
                <text>For the Ant documentation module itself:</text>
102
                <file location="${license.file}"/>
102
                <file location="${license.file}"/>
103
                <text>For the Ant manual:</text>
103
                <text>For the Ant manual:</text>
104
                <file location="../../nbbuild/external/apache-license.txt"/>
104
                <file location="../../nbbuild/external/apache-license-2.0.txt"/>
105
            </license>
105
            </license>
106
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
106
            <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
107
        </makenbm>
107
        </makenbm>
(-)ant/docs/manifest.mf (-1 / +1 lines)
Lines 1-7 Link Here
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.apache.tools.ant.module.docs
2
OpenIDE-Module: org.apache.tools.ant.module.docs
3
OpenIDE-Module-Localizing-Bundle: org/apache/tools/ant/module/docs/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/apache/tools/ant/module/docs/Bundle.properties
4
OpenIDE-Module-Specification-Version: 2.15
4
OpenIDE-Module-Specification-Version: 2.16
5
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
5
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
6
OpenIDE-Module-Layer: org/apache/tools/ant/module/docs/layer.xml
6
OpenIDE-Module-Layer: org/apache/tools/ant/module/docs/layer.xml
7
OpenIDE-Module-Module-Dependencies: org.apache.tools.ant.module/2-3
7
OpenIDE-Module-Module-Dependencies: org.apache.tools.ant.module/2-3
(-)ant/docs/javahelp/org/apache/tools/ant/module/docs/HelpSet.hs (-2 / +2 lines)
Lines 8-19 Link Here
8
http://www.sun.com/
8
http://www.sun.com/
9
9
10
The Original Code is NetBeans. The Initial Developer of the Original
10
The Original Code is NetBeans. The Initial Developer of the Original
11
Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
11
Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
12
Microsystems, Inc. All Rights Reserved.
12
Microsystems, Inc. All Rights Reserved.
13
-->
13
-->
14
<!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN" "http://java.sun.com/products/javahelp/helpset_2_0.dtd">
14
<!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN" "http://java.sun.com/products/javahelp/helpset_2_0.dtd">
15
<helpset version="2.0">
15
<helpset version="2.0">
16
    <title>Ant 1.6.0 Manual</title>
16
    <title>Ant 1.6.1 Manual</title>
17
    <maps>
17
    <maps>
18
        <homeID>org.apache.tools.ant.module.ant-docs</homeID>
18
        <homeID>org.apache.tools.ant.module.ant-docs</homeID>
19
        <mapref location="Map.jhm"/>
19
        <mapref location="Map.jhm"/>
(-)ant/docs/javahelp/org/apache/tools/ant/module/docs/Map.jhm (-2 / +12 lines)
Lines 75-80 Link Here
75
    <mapID target="org.apache.tools.ant.module.tasks.cvschangelog" url="ant-docs/CoreTasks/changelog.html"/>
75
    <mapID target="org.apache.tools.ant.module.tasks.cvschangelog" url="ant-docs/CoreTasks/changelog.html"/>
76
    <mapID target="org.apache.tools.ant.module.tasks.cvspass" url="ant-docs/CoreTasks/cvspass.html"/>
76
    <mapID target="org.apache.tools.ant.module.tasks.cvspass" url="ant-docs/CoreTasks/cvspass.html"/>
77
    <mapID target="org.apache.tools.ant.module.tasks.cvstagdiff" url="ant-docs/CoreTasks/cvstagdiff.html"/>
77
    <mapID target="org.apache.tools.ant.module.tasks.cvstagdiff" url="ant-docs/CoreTasks/cvstagdiff.html"/>
78
    <mapID target="org.apache.tools.ant.module.tasks.cvsversion" url="ant-docs/CoreTasks/cvsversion.html"/>
78
    <mapID target="org.apache.tools.ant.module.tasks.defaultexcludes" url="ant-docs/CoreTasks/defaultexcludes.html"/>
79
    <mapID target="org.apache.tools.ant.module.tasks.defaultexcludes" url="ant-docs/CoreTasks/defaultexcludes.html"/>
79
    <mapID target="org.apache.tools.ant.module.tasks.delete" url="ant-docs/CoreTasks/delete.html"/>
80
    <mapID target="org.apache.tools.ant.module.tasks.delete" url="ant-docs/CoreTasks/delete.html"/>
80
    <mapID target="org.apache.tools.ant.module.tasks.deltree" url="ant-docs/CoreTasks/deltree.html"/>
81
    <mapID target="org.apache.tools.ant.module.tasks.deltree" url="ant-docs/CoreTasks/deltree.html"/>
Lines 151-159 Link Here
151
    <mapID target="org.apache.tools.ant.module.tasks.cccheckout" url="ant-docs/OptionalTasks/clearcase.html#cccheckout"/>
152
    <mapID target="org.apache.tools.ant.module.tasks.cccheckout" url="ant-docs/OptionalTasks/clearcase.html#cccheckout"/>
152
    <mapID target="org.apache.tools.ant.module.tasks.ccuncheckout" url="ant-docs/OptionalTasks/clearcase.html#ccuncheckout"/>
153
    <mapID target="org.apache.tools.ant.module.tasks.ccuncheckout" url="ant-docs/OptionalTasks/clearcase.html#ccuncheckout"/>
153
    <mapID target="org.apache.tools.ant.module.tasks.ccupdate" url="ant-docs/OptionalTasks/clearcase.html#ccupdate"/>
154
    <mapID target="org.apache.tools.ant.module.tasks.ccupdate" url="ant-docs/OptionalTasks/clearcase.html#ccupdate"/>
155
    <mapID target="org.apache.tools.ant.module.tasks.ccmklbtype" url="ant-docs/OptionalTasks/clearcase.html#ccmklbtype"/>
156
    <mapID target="org.apache.tools.ant.module.tasks.ccmklabel" url="ant-docs/OptionalTasks/clearcase.html#ccmklabel"/>
157
    <mapID target="org.apache.tools.ant.module.tasks.ccrmtype" url="ant-docs/OptionalTasks/clearcase.html#ccrmtype"/>
158
    <mapID target="org.apache.tools.ant.module.tasks.cclock" url="ant-docs/OptionalTasks/clearcase.html#cclock"/>
159
    <mapID target="org.apache.tools.ant.module.tasks.ccunlock" url="ant-docs/OptionalTasks/clearcase.html#ccunlock"/>
160
    <mapID target="org.apache.tools.ant.module.tasks.ccmkbl" url="ant-docs/OptionalTasks/clearcase.html#ccmkbl"/>
161
    <mapID target="org.apache.tools.ant.module.tasks.ccmkattr" url="ant-docs/OptionalTasks/clearcase.html#ccmkattr"/>
162
    <mapID target="org.apache.tools.ant.module.tasks.ccmkdir" url="ant-docs/OptionalTasks/clearcase.html#ccmkdir"/>
163
    <mapID target="org.apache.tools.ant.module.tasks.ccmkelem" url="ant-docs/OptionalTasks/clearcase.html#ccmkelem"/>
154
    <mapID target="org.apache.tools.ant.module.tasks.ccm*" url="ant-docs/OptionalTasks/ccm.html"/>
164
    <mapID target="org.apache.tools.ant.module.tasks.ccm*" url="ant-docs/OptionalTasks/ccm.html"/>
155
    <mapID target="org.apache.tools.ant.module.tasks.ccmcheckin" url="ant-docs/OptionalTasks/ccm.html#cccheckin"/>
165
    <mapID target="org.apache.tools.ant.module.tasks.ccmcheckin" url="ant-docs/OptionalTasks/ccm.html#ccmcheckin"/>
156
    <mapID target="org.apache.tools.ant.module.tasks.ccmcheckout" url="ant-docs/OptionalTasks/ccm.html#cccheckout"/>
166
    <mapID target="org.apache.tools.ant.module.tasks.ccmcheckout" url="ant-docs/OptionalTasks/ccm.html#ccmcheckout"/>
157
    <mapID target="org.apache.tools.ant.module.tasks.ccmcheckintask" url="ant-docs/OptionalTasks/ccm.html#ccmcheckintask"/>
167
    <mapID target="org.apache.tools.ant.module.tasks.ccmcheckintask" url="ant-docs/OptionalTasks/ccm.html#ccmcheckintask"/>
158
    <mapID target="org.apache.tools.ant.module.tasks.ccmreconfigure" url="ant-docs/OptionalTasks/ccm.html#ccmreconfigure"/>
168
    <mapID target="org.apache.tools.ant.module.tasks.ccmreconfigure" url="ant-docs/OptionalTasks/ccm.html#ccmreconfigure"/>
159
    <mapID target="org.apache.tools.ant.module.tasks.ccmcreatetask" url="ant-docs/OptionalTasks/ccm.html#ccmcreatetask"/>
169
    <mapID target="org.apache.tools.ant.module.tasks.ccmcreatetask" url="ant-docs/OptionalTasks/ccm.html#ccmcreatetask"/>
(-)ant/docs/javahelp/org/apache/tools/ant/module/docs/TOC.toc (-3 / +4 lines)
Lines 8-19 Link Here
8
http://www.sun.com/
8
http://www.sun.com/
9
9
10
The Original Code is NetBeans. The Initial Developer of the Original
10
The Original Code is NetBeans. The Initial Developer of the Original
11
Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
11
Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
12
Microsystems, Inc. All Rights Reserved.
12
Microsystems, Inc. All Rights Reserved.
13
-->
13
-->
14
<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 2.0//EN" "http://java.sun.com/products/javahelp/toc_2_0.dtd">
14
<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 2.0//EN" "http://java.sun.com/products/javahelp/toc_2_0.dtd">
15
<toc version="2.0">
15
<toc version="2.0">
16
    <tocitem target="org.apache.tools.ant.module.ant-docs">Ant 1.6.0 Manual
16
    <tocitem target="org.apache.tools.ant.module.ant-docs">Ant 1.6.1 Manual
17
        <tocitem target="org.apache.tools.ant.module.ant-docs.using">Using Ant</tocitem>
17
        <tocitem target="org.apache.tools.ant.module.ant-docs.using">Using Ant</tocitem>
18
        <tocitem>Ant Tasks
18
        <tocitem>Ant Tasks
19
            <tocitem target="org.apache.tools.ant.module.ant-docs.task-overview">Overview of Core Tasks</tocitem>
19
            <tocitem target="org.apache.tools.ant.module.ant-docs.task-overview">Overview of Core Tasks</tocitem>
Lines 34-41 Link Here
34
                <tocitem target="org.apache.tools.ant.module.tasks.copyfile">Copyfile*</tocitem>
34
                <tocitem target="org.apache.tools.ant.module.tasks.copyfile">Copyfile*</tocitem>
35
                <tocitem target="org.apache.tools.ant.module.tasks.cvs">Cvs</tocitem>
35
                <tocitem target="org.apache.tools.ant.module.tasks.cvs">Cvs</tocitem>
36
                <tocitem target="org.apache.tools.ant.module.tasks.cvschangelog">CvsChangelog</tocitem>
36
                <tocitem target="org.apache.tools.ant.module.tasks.cvschangelog">CvsChangelog</tocitem>
37
                <tocitem target="org.apache.tools.ant.module.tasks.cvspass">CVSPass</tocitem>
37
                <tocitem target="org.apache.tools.ant.module.tasks.cvspass">CvsPass</tocitem>
38
                <tocitem target="org.apache.tools.ant.module.tasks.cvstagdiff">CvsTagDiff</tocitem>
38
                <tocitem target="org.apache.tools.ant.module.tasks.cvstagdiff">CvsTagDiff</tocitem>
39
                <tocitem target="org.apache.tools.ant.module.tasks.cvsversion">CvsVersion</tocitem>
39
                <tocitem target="org.apache.tools.ant.module.tasks.defaultexcludes">DefaultExcludes</tocitem>
40
                <tocitem target="org.apache.tools.ant.module.tasks.defaultexcludes">DefaultExcludes</tocitem>
40
                <tocitem target="org.apache.tools.ant.module.tasks.delete">Delete</tocitem>
41
                <tocitem target="org.apache.tools.ant.module.tasks.delete">Delete</tocitem>
41
                <tocitem target="org.apache.tools.ant.module.tasks.deltree">Deltree*</tocitem>
42
                <tocitem target="org.apache.tools.ant.module.tasks.deltree">Deltree*</tocitem>
(-)ant/docs/src/org/apache/tools/ant/module/docs/Bundle.properties (-2 / +2 lines)
Lines 9-15 Link Here
9
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
9
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
10
# Microsystems, Inc. All Rights Reserved.
10
# Microsystems, Inc. All Rights Reserved.
11
11
12
OpenIDE-Module-Name=Ant 1.6.0 Documentation
12
OpenIDE-Module-Name=Ant 1.6.1 Documentation
13
OpenIDE-Module-Display-Category=Tools
13
OpenIDE-Module-Display-Category=Tools
14
OpenIDE-Module-Short-Description=Documentation for the Ant build tool.
14
OpenIDE-Module-Short-Description=Documentation for the Ant build tool.
15
OpenIDE-Module-Long-Description=\
15
OpenIDE-Module-Long-Description=\
Lines 17-20 Link Here
17
        Javadoc for the Ant runtime, useful for writing tasks; \
17
        Javadoc for the Ant runtime, useful for writing tasks; \
18
        and editor code completion for classes in Ant.
18
        and editor code completion for classes in Ant.
19
19
20
Mount/Javadoc/org-apache-tools-ant-module-javadoc.xml=Ant 1.6.0 API Javadoc
20
Mount/Javadoc/org-apache-tools-ant-module-javadoc.xml=Ant 1.6.1 API Javadoc
(-)ant/external/.cvsignore (-3 / +3 lines)
Lines 1-5 Link Here
1
*.master
1
*.master
2
lib
2
lib
3
ant-api-1.6.0.zip
3
ant-api-1.6.1.zip
4
ant-docs-1.6.0.zip
4
ant-docs-1.6.1.zip
5
ant-libs-1.6.0.zip
5
ant-libs-1.6.1.zip
(-)ant/external/build.xml (-12 / +12 lines)
Lines 8-14 Link Here
8
http://www.sun.com/
8
http://www.sun.com/
9
9
10
The Original Code is NetBeans. The Initial Developer of the Original
10
The Original Code is NetBeans. The Initial Developer of the Original
11
Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun
11
Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
12
Microsystems, Inc. All Rights Reserved.
12
Microsystems, Inc. All Rights Reserved.
13
-->
13
-->
14
<project name="ant/external" default="unscramble" basedir=".">
14
<project name="ant/external" default="unscramble" basedir=".">
Lines 16-41 Link Here
16
    <target name="unscramble">
16
    <target name="unscramble">
17
        <taskdef name="unscramble" classname="org.netbeans.nbbuild.Unscramble" classpath="${extnl}/scrambler.jar"/>
17
        <taskdef name="unscramble" classname="org.netbeans.nbbuild.Unscramble" classpath="${extnl}/scrambler.jar"/>
18
        <unscramble logfile="${extnl}/unscrambling.log">
18
        <unscramble logfile="${extnl}/unscrambling.log">
19
            <!-- LFI #105463 for all: -->
19
            <!-- LFI #2106 for all: -->
20
            <binary clear="ant-api-1.6.0.zip" scrambled="ant-api-1.6.0.zip.scrambled" license="${extnl}/apache-license.txt"/>
20
            <binary clear="ant-api-1.6.1.zip" scrambled="ant-api-1.6.1.zip.scrambled" license="${extnl}/apache-license-2.0.txt"/>
21
            <binary clear="ant-docs-1.6.0.zip" scrambled="ant-docs-1.6.0.zip.scrambled" license="${extnl}/apache-license.txt"/>
21
            <binary clear="ant-docs-1.6.1.zip" scrambled="ant-docs-1.6.1.zip.scrambled" license="${extnl}/apache-license-2.0.txt"/>
22
            <binary clear="ant-libs-1.6.0.zip" scrambled="ant-libs-1.6.0.zip.scrambled" license="${extnl}/apache-license.txt"/>
22
            <binary clear="ant-libs-1.6.1.zip" scrambled="ant-libs-1.6.1.zip.scrambled" license="${extnl}/apache-license-2.0.txt"/>
23
        </unscramble>
23
        </unscramble>
24
        <mkdir dir="lib"/>
24
        <mkdir dir="lib"/>
25
        <unzip src="ant-libs-1.6.0.zip" dest="lib"/>
25
        <unzip src="ant-libs-1.6.1.zip" dest="lib"/>
26
    </target>
26
    </target>
27
    <target name="scramble">
27
    <target name="scramble">
28
        <taskdef name="scramble" classname="org.netbeans.nbbuild.Scramble" classpath="${extnl}/scrambler.jar"/>
28
        <taskdef name="scramble" classname="org.netbeans.nbbuild.Scramble" classpath="${extnl}/scrambler.jar"/>
29
        <scramble>
29
        <scramble>
30
            <binary clear="ant-api-1.6.0.zip.master" scrambled="ant-api-1.6.0.zip.scrambled" license="${extnl}/apache-license.txt"/>
30
            <binary clear="ant-api-1.6.1.zip.master" scrambled="ant-api-1.6.1.zip.scrambled" license="${extnl}/apache-license-2.0.txt"/>
31
            <binary clear="ant-docs-1.6.0.zip.master" scrambled="ant-docs-1.6.0.zip.scrambled" license="${extnl}/apache-license.txt"/>
31
            <binary clear="ant-docs-1.6.1.zip.master" scrambled="ant-docs-1.6.1.zip.scrambled" license="${extnl}/apache-license-2.0.txt"/>
32
            <binary clear="ant-libs-1.6.0.zip.master" scrambled="ant-libs-1.6.0.zip.scrambled" license="${extnl}/apache-license.txt"/>
32
            <binary clear="ant-libs-1.6.1.zip.master" scrambled="ant-libs-1.6.1.zip.scrambled" license="${extnl}/apache-license-2.0.txt"/>
33
        </scramble>
33
        </scramble>
34
    </target>
34
    </target>
35
    <target name="clean">
35
    <target name="clean">
36
        <delete file="ant-api-1.6.0.zip"/>
36
        <delete file="ant-api-1.6.1.zip"/>
37
        <delete file="ant-docs-1.6.0.zip"/>
37
        <delete file="ant-docs-1.6.1.zip"/>
38
        <delete file="ant-libs-1.6.0.zip"/>
38
        <delete file="ant-libs-1.6.1.zip"/>
39
        <delete dir="lib"/>
39
        <delete dir="lib"/>
40
    </target>
40
    </target>
41
</project>
41
</project>
(-)nbbuild/external/apache-license-2.0.txt (+202 lines)
Added Link Here
1
2
                                 Apache License
3
                           Version 2.0, January 2004
4
                        http://www.apache.org/licenses/
5
6
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7
8
   1. Definitions.
9
10
      "License" shall mean the terms and conditions for use, reproduction,
11
      and distribution as defined by Sections 1 through 9 of this document.
12
13
      "Licensor" shall mean the copyright owner or entity authorized by
14
      the copyright owner that is granting the License.
15
16
      "Legal Entity" shall mean the union of the acting entity and all
17
      other entities that control, are controlled by, or are under common
18
      control with that entity. For the purposes of this definition,
19
      "control" means (i) the power, direct or indirect, to cause the
20
      direction or management of such entity, whether by contract or
21
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
22
      outstanding shares, or (iii) beneficial ownership of such entity.
23
24
      "You" (or "Your") shall mean an individual or Legal Entity
25
      exercising permissions granted by this License.
26
27
      "Source" form shall mean the preferred form for making modifications,
28
      including but not limited to software source code, documentation
29
      source, and configuration files.
30
31
      "Object" form shall mean any form resulting from mechanical
32
      transformation or translation of a Source form, including but
33
      not limited to compiled object code, generated documentation,
34
      and conversions to other media types.
35
36
      "Work" shall mean the work of authorship, whether in Source or
37
      Object form, made available under the License, as indicated by a
38
      copyright notice that is included in or attached to the work
39
      (an example is provided in the Appendix below).
40
41
      "Derivative Works" shall mean any work, whether in Source or Object
42
      form, that is based on (or derived from) the Work and for which the
43
      editorial revisions, annotations, elaborations, or other modifications
44
      represent, as a whole, an original work of authorship. For the purposes
45
      of this License, Derivative Works shall not include works that remain
46
      separable from, or merely link (or bind by name) to the interfaces of,
47
      the Work and Derivative Works thereof.
48
49
      "Contribution" shall mean any work of authorship, including
50
      the original version of the Work and any modifications or additions
51
      to that Work or Derivative Works thereof, that is intentionally
52
      submitted to Licensor for inclusion in the Work by the copyright owner
53
      or by an individual or Legal Entity authorized to submit on behalf of
54
      the copyright owner. For the purposes of this definition, "submitted"
55
      means any form of electronic, verbal, or written communication sent
56
      to the Licensor or its representatives, including but not limited to
57
      communication on electronic mailing lists, source code control systems,
58
      and issue tracking systems that are managed by, or on behalf of, the
59
      Licensor for the purpose of discussing and improving the Work, but
60
      excluding communication that is conspicuously marked or otherwise
61
      designated in writing by the copyright owner as "Not a Contribution."
62
63
      "Contributor" shall mean Licensor and any individual or Legal Entity
64
      on behalf of whom a Contribution has been received by Licensor and
65
      subsequently incorporated within the Work.
66
67
   2. Grant of Copyright License. Subject to the terms and conditions of
68
      this License, each Contributor hereby grants to You a perpetual,
69
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70
      copyright license to reproduce, prepare Derivative Works of,
71
      publicly display, publicly perform, sublicense, and distribute the
72
      Work and such Derivative Works in Source or Object form.
73
74
   3. Grant of Patent License. Subject to the terms and conditions of
75
      this License, each Contributor hereby grants to You a perpetual,
76
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77
      (except as stated in this section) patent license to make, have made,
78
      use, offer to sell, sell, import, and otherwise transfer the Work,
79
      where such license applies only to those patent claims licensable
80
      by such Contributor that are necessarily infringed by their
81
      Contribution(s) alone or by combination of their Contribution(s)
82
      with the Work to which such Contribution(s) was submitted. If You
83
      institute patent litigation against any entity (including a
84
      cross-claim or counterclaim in a lawsuit) alleging that the Work
85
      or a Contribution incorporated within the Work constitutes direct
86
      or contributory patent infringement, then any patent licenses
87
      granted to You under this License for that Work shall terminate
88
      as of the date such litigation is filed.
89
90
   4. Redistribution. You may reproduce and distribute copies of the
91
      Work or Derivative Works thereof in any medium, with or without
92
      modifications, and in Source or Object form, provided that You
93
      meet the following conditions:
94
95
      (a) You must give any other recipients of the Work or
96
          Derivative Works a copy of this License; and
97
98
      (b) You must cause any modified files to carry prominent notices
99
          stating that You changed the files; and
100
101
      (c) You must retain, in the Source form of any Derivative Works
102
          that You distribute, all copyright, patent, trademark, and
103
          attribution notices from the Source form of the Work,
104
          excluding those notices that do not pertain to any part of
105
          the Derivative Works; and
106
107
      (d) If the Work includes a "NOTICE" text file as part of its
108
          distribution, then any Derivative Works that You distribute must
109
          include a readable copy of the attribution notices contained
110
          within such NOTICE file, excluding those notices that do not
111
          pertain to any part of the Derivative Works, in at least one
112
          of the following places: within a NOTICE text file distributed
113
          as part of the Derivative Works; within the Source form or
114
          documentation, if provided along with the Derivative Works; or,
115
          within a display generated by the Derivative Works, if and
116
          wherever such third-party notices normally appear. The contents
117
          of the NOTICE file are for informational purposes only and
118
          do not modify the License. You may add Your own attribution
119
          notices within Derivative Works that You distribute, alongside
120
          or as an addendum to the NOTICE text from the Work, provided
121
          that such additional attribution notices cannot be construed
122
          as modifying the License.
123
124
      You may add Your own copyright statement to Your modifications and
125
      may provide additional or different license terms and conditions
126
      for use, reproduction, or distribution of Your modifications, or
127
      for any such Derivative Works as a whole, provided Your use,
128
      reproduction, and distribution of the Work otherwise complies with
129
      the conditions stated in this License.
130
131
   5. Submission of Contributions. Unless You explicitly state otherwise,
132
      any Contribution intentionally submitted for inclusion in the Work
133
      by You to the Licensor shall be under the terms and conditions of
134
      this License, without any additional terms or conditions.
135
      Notwithstanding the above, nothing herein shall supersede or modify
136
      the terms of any separate license agreement you may have executed
137
      with Licensor regarding such Contributions.
138
139
   6. Trademarks. This License does not grant permission to use the trade
140
      names, trademarks, service marks, or product names of the Licensor,
141
      except as required for reasonable and customary use in describing the
142
      origin of the Work and reproducing the content of the NOTICE file.
143
144
   7. Disclaimer of Warranty. Unless required by applicable law or
145
      agreed to in writing, Licensor provides the Work (and each
146
      Contributor provides its Contributions) on an "AS IS" BASIS,
147
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148
      implied, including, without limitation, any warranties or conditions
149
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150
      PARTICULAR PURPOSE. You are solely responsible for determining the
151
      appropriateness of using or redistributing the Work and assume any
152
      risks associated with Your exercise of permissions under this License.
153
154
   8. Limitation of Liability. In no event and under no legal theory,
155
      whether in tort (including negligence), contract, or otherwise,
156
      unless required by applicable law (such as deliberate and grossly
157
      negligent acts) or agreed to in writing, shall any Contributor be
158
      liable to You for damages, including any direct, indirect, special,
159
      incidental, or consequential damages of any character arising as a
160
      result of this License or out of the use or inability to use the
161
      Work (including but not limited to damages for loss of goodwill,
162
      work stoppage, computer failure or malfunction, or any and all
163
      other commercial damages or losses), even if such Contributor
164
      has been advised of the possibility of such damages.
165
166
   9. Accepting Warranty or Additional Liability. While redistributing
167
      the Work or Derivative Works thereof, You may choose to offer,
168
      and charge a fee for, acceptance of support, warranty, indemnity,
169
      or other liability obligations and/or rights consistent with this
170
      License. However, in accepting such obligations, You may act only
171
      on Your own behalf and on Your sole responsibility, not on behalf
172
      of any other Contributor, and only if You agree to indemnify,
173
      defend, and hold each Contributor harmless for any liability
174
      incurred by, or claims asserted against, such Contributor by reason
175
      of your accepting any such warranty or additional liability.
176
177
   END OF TERMS AND CONDITIONS
178
179
   APPENDIX: How to apply the Apache License to your work.
180
181
      To apply the Apache License to your work, attach the following
182
      boilerplate notice, with the fields enclosed by brackets "[]"
183
      replaced with your own identifying information. (Don't include
184
      the brackets!)  The text should be enclosed in the appropriate
185
      comment syntax for the file format. We also recommend that a
186
      file or class name and description of purpose be included on the
187
      same "printed page" as the copyright notice for easier
188
      identification within third-party archives.
189
190
   Copyright [yyyy] [name of copyright owner]
191
192
   Licensed under the Apache License, Version 2.0 (the "License");
193
   you may not use this file except in compliance with the License.
194
   You may obtain a copy of the License at
195
196
       http://www.apache.org/licenses/LICENSE-2.0
197
198
   Unless required by applicable law or agreed to in writing, software
199
   distributed under the License is distributed on an "AS IS" BASIS,
200
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201
   See the License for the specific language governing permissions and
202
   limitations under the License.
(-)usersguide/javahelp/org/netbeans/modules/usersguide/ant/createtask.html (-1 / +1 lines)
Lines 40-46 Link Here
40
        edit them in the Filesystems window just like standard tasks. The same applies to 
40
        edit them in the Filesystems window just like standard tasks. The same applies to 
41
        custom data types. 
41
        custom data types. 
42
      <p> For more information on writing Ant tasks, see Using Ant in the Ant 
42
      <p> For more information on writing Ant tasks, see Using Ant in the Ant 
43
        1.6.0 Manual.</p>
43
        1.6.1 Manual.</p>
44
    </td>
44
    </td>
45
  </tr>
45
  </tr>
46
</table>
46
</table>
(-)usersguide/javahelp/org/netbeans/modules/usersguide/ant/input_handler.html (-1 / +1 lines)
Lines 26-32 Link Here
26
<table>
26
<table>
27
  <tr> 
27
  <tr> 
28
    <td valign=top><img src="../images/tip.gif" alt="tip"></td>
28
    <td valign=top><img src="../images/tip.gif" alt="tip"></td>
29
    <td valign=top align=left> For more information, see the Ant 1.6.0 manual.
29
    <td valign=top align=left> For more information, see the Ant 1.6.1 manual.
30
      If you have the Ant Documentation module installed, you can view help for 
30
      If you have the Ant Documentation module installed, you can view help for 
31
      the <tt>input</tt> task by selecting any <tt>input</tt> task node in the 
31
      the <tt>input</tt> task by selecting any <tt>input</tt> task node in the 
32
      Filesystems window and pressing F1.</td>
32
      Filesystems window and pressing F1.</td>
(-)usersguide/javahelp/org/netbeans/modules/usersguide/ant/version.html (-1 / +1 lines)
Lines 10-16 Link Here
10
<body>
10
<body>
11
<h2>Switching Ant Versions</h2>
11
<h2>Switching Ant Versions</h2>
12
<p> <small><a href="#seealso">See&nbsp;Also</a></small>
12
<p> <small><a href="#seealso">See&nbsp;Also</a></small>
13
<p>The IDE comes bundled with Ant version 1.6.0 and uses this installation to 
13
<p>The IDE comes bundled with Ant version 1.6.1 and uses this installation to 
14
  run Ant scripts. You can change the version of Ant that the IDE uses by switching 
14
  run Ant scripts. You can change the version of Ant that the IDE uses by switching 
15
  the Ant installation directory in Ant Settings. You can only switch between 
15
  the Ant installation directory in Ant Settings. You can only switch between 
16
  versions 1.5.3 and higher of Ant.</p>
16
  versions 1.5.3 and higher of Ant.</p>

Return to bug 40120