From ant-dev-return-37512-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org Tue Sep 03 17:23:13 2002
Return-Path:
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 7461 invoked from network); 3 Sep 2002 17:23:02 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
by daedalus.apache.org with SMTP; 3 Sep 2002 17:23:02 -0000
Received: (qmail 23707 invoked by uid 97); 3 Sep 2002 17:22:51 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 23598 invoked by uid 97); 3 Sep 2002 17:22:50 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe:
List-Subscribe:
List-Help:
List-Post:
List-Id: "Ant Developers List"
Reply-To: "Ant Developers List"
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 23586 invoked by uid 98); 3 Sep 2002 17:22:49 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Message-ID: <527A6B0B0383D511803900A0C9E56BB2022C763E@wpdslajolla.wpds.com>
From: "Shatzer, Larry"
To: "'Ant Developers List'"
Subject: RE: [PATCH] various doc patches
Date: Tue, 3 Sep 2002 10:21:55 -0700
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2653.19)
Content-Type: multipart/mixed;
boundary="----_=_NextPart_000_01C2536E.67076100"
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
------_=_NextPart_000_01C2536E.67076100
Content-Type: text/plain;
charset="iso-8859-1"
yearcheck.sh is in src/etc ;)
The attached patch fixes the few mistakes I found, such as >, and does the
fixes, and to make it more consistent, build.xml was updated to
reflect the change.
I took out the copyright year updates on files I did not modify myself,
although, if you look at docs/CoreTasks/waitfor.html, the copyright says
2001, but the last cvs check in is Sun Feb 3 22:00:42 2002 UTC, and it was
an actual modification of content.
-- Larry
> -----Original Message-----
> From: Stefan Bodewig [mailto:bodewig@apache.org]
> Sent: Tuesday, September 03, 2002 8:09 AM
> To: ant-dev@jakarta.apache.org
> Subject: Re: [PATCH] various doc patches
>
>
> On Tue, 3 Sep 2002, Larry Shatzer wrote:
>
> > I'll also do the check to make sure the documents have been touched
> > in 2002 to update the copyright (check it against CVS to see when
> > the last commit was done).
>
> I'm pretty sure we have correct copyright lines (take a look at the
> src&scrip/yearcheck.sh, this is how I do cvs update to catch all files
> that slip through).
>
> > I have a patch in bug database
> > http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12195
>
> I'll look into and commit it (as well as the other one), thanks. I
> haven't looked into bugzilla the last few weeks, sorry.
>
> > I can submit to you both of these patches as one in an email,
>
> Not necessary.
>
> > and then submit the patch that fixes the rest, like the >, and a
> > few others,
>
> fine
>
> > and if you want the to be ,
>
> No strong feelings here.
>
> Stefan
>
> --
> To unsubscribe, e-mail:
>
> For additional commands, e-mail:
>
>
------_=_NextPart_000_01C2536E.67076100
Content-Type: text/plain;
name="docs.patch.txt"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="docs.patch.txt"
Index: build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvspublic/jakarta-ant/build.xml,v
retrieving revision 1.317
diff -u -r1.317 build.xml
--- build.xml 2 Sep 2002 12:22:34 -0000 1.317
+++ build.xml 3 Sep 2002 17:09:19 -0000
@@ -13,9 +13,9 @@
=20
-
-
-
+
+
+
=20
=20
@@ -23,12 +23,12 @@
=20
-
-
-
-
-
-
+
+
+
+
+
+
=20
@@ -75,19 +75,19 @@
=20
-
+
=20
-
-
+
+
-
+
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.3+"/>
+ unless=3D"jdk1.3+"/>
+ unless=3D"jdk1.4+"/>
=20
+ unless=3D"sun.tools.present"/>
+ unless=3D"sun.tools.present"/>
+ unless=3D"sunuue.present"/>
+ unless=3D"base64.present"/>
+ unless=3D"base64.present"/>
=20
+ unless=3D"trax.present"/>
+ unless=3D"xalan.present"/>
+ unless=3D"xalan.present"/>
+ unless=3D"xalan2.present"/>
+ unless=3D"xslp.present"/>
-
+
+ unless=3D"jakarta.regexp.present"/>
+ unless=3D"jakarta.oro.present"/>
+ unless=3D"jakarta.oro.present"/>
+ unless=3D"bcel.present"/>
+ unless=3D"bcel.present"/>
+ unless=3D"bcel.present"/>
+ unless=3D"log4j.present"/>
+ unless=3D"commons.logging.present"/>
+ unless=3D"bsf.present"/>
+ unless=3D"stylebook.present"/>
+ unless=3D"javamail.complete"/>
+ unless=3D"icontract.present"/>
+ unless=3D"netrexx.present"/>
+ unless=3D"ejb.ejbc.present"/>
+ unless=3D"ejb.DDCreator.present"/>
+ unless=3D"ejb.wls.present"/>
+ unless=3D"ejb.wls.present"/>
+ unless=3D"netcomp.present"/>
+ unless=3D"netcomp.present"/>
+ unless=3D"starteam.present"/>
+ unless=3D"starteam.present"/>
+ unless=3D"vaj.present"/>
-
+
+ unless=3D"servlet.present"/>
-
+
-
+
-
+
-
+
@@ -323,11 +323,11 @@
=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-->
-
-
-
-
-
+
+
+
+
+
=20
-
-
-
-
+
+
+
+
+ classpathref=3D"classpath"/>
@@ -352,44 +352,44 @@
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
@@ -404,7 +404,7 @@
classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
@@ -429,10 +429,10 @@
classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
+ classpathref=3D"classpath"/>
=20
+ classpathref=3D"classpath"/>
@@ -450,7 +450,7 @@
+ classpathref=3D"classpath"/>
=20
@@ -463,53 +463,53 @@
=20
-
-
-
+
+
+
=20
-
-
+
+
=20
-
-
+
+
=20
-
+
=20
-
+
+ substring=3D"${build.tests}"/>
+ substring=3D"${build.tests.resolved}"/>
=20
-
-
+
+
=20
-
+
-
+
-
-
-
+
+
+
wsdl.found=3D${wsdl.found}
-
-
-
+
+
+
csc.found=3D${csc.found}
@@ -550,13 +550,13 @@
-->
-
+
-
-
-
+
+
+
@@ -579,64 +579,64 @@
deprecation=3D"${deprecation}"
target=3D"${javac.target}"
optimize=3D"${optimize}" >
-
+
=20
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
=20
-
-
+
+
=20
-
-
+
+
=20
-
-
+
+
=20
@@ -653,86 +653,86 @@
=20
-
-
-
-
+
+
+
+
-
+
=20
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
=20
+ value=3D"org.apache.tools.ant"/>
+ value=3D"Apache Ant"/>
+ value=3D"${manifest-version}"/>
+ value=3D"Apache Software Foundation"/>
+ value=3D"org.apache.tools.ant"/>
+ value=3D"${manifest-version}"/>
+ value=3D"Apache Software Foundation"/>
=20
-
+
=20
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
=20
+ =
value=3D"org.apache.tools.ant.taskdefs.optional"/>
+ value=3D"Apache Ant Optional Tasks"/>
+ value=3D"${manifest-version}"/>
+ value=3D"Apache Software Foundation"/>
+ =
value=3D"org.apache.tools.ant.taskdefs.optional"/>
+ value=3D"${manifest-version}"/>
+ value=3D"Apache Software Foundation"/>
@@ -746,7 +746,7 @@
=20
-
+
=20
@@ -768,26 +768,26 @@
=20
-
+
=20
-
+
-
-
-
+
+
+
=20
+ failonerror=3D"${chmod.fail}"/>
+ failonerror=3D"${chmod.fail}"/>
-
-
-
-
+
+
+
+
=20
@@ -800,7 +800,7 @@
-->
creates a complete =
distribution">
-
+
=20
@@ -818,8 +818,8 @@
=20
-
-
+
+
=20
@@ -849,15 +849,15 @@
=20
+ failonerror=3D"${chmod.fail}"/>
+ failonerror=3D"${chmod.fail}"/>
-
-
-
-
+
+
+
+
=20
@@ -888,7 +888,7 @@
-->
creates a bootstrap =
build">
-
+
=20
@@ -901,12 +901,12 @@
creates a source distribution">
=20
-
+
=20
-
-
+
+
@@ -940,27 +940,27 @@
=20
-
+
-
-
-
-
+
+
+
+
-
+
=20
-
+ failonerror=3D"${chmod.fail}"/>
+
-
-
-
-
-
+
+
+
+
+
=20
@@ -973,13 +973,13 @@
-->
creates the zip and tar distributions">
-
+
=20
-
+
-
+
-
-
-
+
+
+
=20
-
+
-
+
-
-
-
+
+
+
@@ -1059,9 +1059,9 @@
-->
cleans up build and dist directories">
-
-
-
+
+
+
@@ -1075,10 +1075,10 @@
cleans up everything">
-
-
-
-
+
+
+
+
=20
-
+
=20
-
+
=20
@@ -1111,7 +1111,7 @@
-
+
@@ -1128,17 +1128,17 @@
windowtitle=3D"${Name} API"
doctitle=3D"${Name}">
=20
-
+
=20
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
=20
Copyright © 2000-${year} Apache Software =
Foundation. All Rights Reserved.
@@ -1157,7 +1157,7 @@
doctitle=3D"${Name}">
=20
-
+
=20
Copyright © 2000-${year} Apache Software =
Foundation. All Rights Reserved.
@@ -1177,38 +1177,38 @@
debug=3D"${debug}"
target=3D"${javac.target}"
deprecation=3D"${deprecation}" >
-
+
=20
-
+
=20
-
-
-
+
+
+
=20
-
-
+
+
=20
-
-
-
-
+
+
+
+
=20
-
+
=20
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
=20
@@ -1250,48 +1250,48 @@
fork=3D"${junit.fork}">
-
+
=20
-
+
+ value=3D"${tests-classpath.value}"/>
=20
-
+
=20
-
+
=20
-
-
-
-
-
-
-
+
+
+
+
+
+
+
=20
-
-
+
+
=20
-
+
=20
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -1300,14 +1300,14 @@
=20
-
+
=20
+ unless=3D"some.regexp.support"/>
+ unless=3D"some.regexp.support"/>
=20
=20
-
+
=20
+ unless=3D"bsf.present"/>
=20
+ unless=3D"jdk1.2+"/>
+ unless=3D"jdk1.2+"/>
=20
-
+
+ unless=3D"dotnetapps.found"/>
=20
+ unless=3D"tests.and.ant.share.classloader"/>
+ unless=3D"tests.and.ant.share.classloader"/>
+ unless=3D"tests.and.ant.share.classloader"/>
+ unless=3D"tests.and.ant.share.classloader"/>
=20
+ unless=3D"have.cvs"/>
=20
+ if=3D"jasper.present"/>
=20
@@ -1378,14 +1378,14 @@
fork=3D"${junit.fork}"
filtertrace=3D"${junit.filtertrace}">
-
+
-
+ value=3D"${tests-classpath.value}"/>
+
-
-
+
+
=20
@@ -1394,7 +1394,7 @@
if=3D"jdk1.3+">
+ fork=3D"true"/>
=20
creates a minimum distribution in ./dist"
- depends=3D"dist-lite" />
+ depends=3D"dist-lite"/>
=20
Index: docs/manual/CoreTasks/ant.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvspublic/jakarta-ant/docs/manual/CoreTasks/ant.html,v
retrieving revision 1.15
diff -u -r1.15 ant.html
--- docs/manual/CoreTasks/ant.html 1 Jun 2002 12:26:33 -0000 1.15
+++ docs/manual/CoreTasks/ant.html 3 Sep 2002 17:09:20 -0000
@@ -172,10 +172,10 @@
<path id=3D"path1">
...
- </>
+ </path>
<path id=3D"path2">
...
- </>
+ </path>
=20
and the called build file (subbuild.xml) also defines
@@ -183,7 +183,7 @@
path2 is not defined:
=20
- <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"true" />
+ <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"true"/>
=20
will not override subbuild's definition of
@@ -191,21 +191,21 @@
path2 available in the subbuild.
=20
- <ant antfile=3D"subbuild.xml" />
+ <ant antfile=3D"subbuild.xml"/>
=20
as well as
=20
- <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"false" />
+ <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"false"/>
=20
will neither override path1 nor copy
path2.
=20
- <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"false" >
- <reference refid=3D"path1" />
+ <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"false">
+ <reference refid=3D"path1"/>
</ant>
=20
@@ -213,8 +213,8 @@
path1.
=20
- <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"false" >
- <reference refid=3D"path1" =
torefid=3D"path2" />
+ <ant antfile=3D"subbuild.xml" =
inheritrefs=3D"false">
+ <reference refid=3D"path1" =
torefid=3D"path2"/>
</ant>
=20
Index: docs/manual/CoreTasks/antcall.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/jakarta-ant/docs/manual/CoreTasks/antcall.html,v
retrieving revision 1.12
diff -u -r1.12 antcall.html
--- docs/manual/CoreTasks/antcall.html 1 Jun 2002 12:26:33 -0000 1.12
+++ docs/manual/CoreTasks/antcall.html 3 Sep 2002 17:09:20 -0000
@@ -105,7 +105,7 @@
=20
<antcall ... >
- <reference refid=3D"path1" =
torefid=3D"path2" />
+ <reference refid=3D"path1" =
torefid=3D"path2"/>
</antcall>
=20
Index: docs/manual/CoreTasks/apply.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/jakarta-ant/docs/manual/CoreTasks/apply.html,v
retrieving revision 1.16
diff -u -r1.16 apply.html
--- docs/manual/CoreTasks/apply.html 22 Jun 2002 23:38:27 -0000 1.16
+++ docs/manual/CoreTasks/apply.html 3 Sep 2002 17:09:20 -0000
@@ -157,7 +157,7 @@
description in the section about exec
Examples
-<apply executable=3D"ls" >
+<apply executable=3D"ls">
<arg value=3D"-l"/>
<fileset dir=3D"/tmp">
<patternset>
@@ -172,7 +172,7 @@
files of the FileSet with id other.files to
the command line.
-<apply executable=3D"somecommand" =
parallel=3D"false" >
+<apply executable=3D"somecommand" =
parallel=3D"false">
<arg value=3D"arg1"/>
<srcfile/>
<arg value=3D"arg2"/>
Index: docs/manual/CoreTasks/concat.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/jakarta-ant/docs/manual/CoreTasks/concat.html,v
retrieving revision 1.5
diff -u -r1.5 concat.html
--- docs/manual/CoreTasks/concat.html 9 Jul 2002 21:05:51 -0000 1.5
+++ docs/manual/CoreTasks/concat.html 3 Sep 2002 17:09:20 -0000
@@ -103,7 +103,7 @@
=20
<concat>
- <fileset dir=3D"messages" =
includes=3D"*important*" />
+ <fileset dir=3D"messages" =
includes=3D"*important*"/>
</concat>
=20
@@ -111,7 +111,7 @@
=20
<concat destfile=3D"NOTES" =
append=3D"true">
- <filelist dir=3D"notes" files=3D"note.txt" =
/>
+ <filelist dir=3D"notes" =
files=3D"note.txt"/>
</concat>
=20
@@ -121,10 +121,10 @@
<concat =
destfile=3D"${docbook.dir}/all-sections.xml">
<filelist dir=3D"${docbook.dir}/sections"=20
- files=3D"introduction.xml,overview.xml" />
+ files=3D"introduction.xml,overview.xml"/>
<fileset dir=3D"${docbook.dir}"=20
includes=3D"sections/*.xml"=20
- excludes=3D"introduction.xml,overview.xml" />
+ excludes=3D"introduction.xml,overview.xml"/>
</concat>
=20
Index: docs/manual/CoreTasks/condition.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: =
/home/cvspublic/jakarta-ant/docs/manual/CoreTasks/condition.html,v
retrieving revision 1.12
diff -u -r1.12 condition.html
--- docs/manual/CoreTasks/condition.html 3 Sep 2002 15:24:08 -0000 1.12
+++ docs/manual/CoreTasks/condition.html 3 Sep 2002 17:09:20 -0000
@@ -45,8 +45,8 @@
<condition property=3D"javamail.complete">
<and>
- <available =
classname=3D"javax.activation.DataHandler" />
- <available classname=3D"javax.mail.Transport" />
+ <available =
classname=3D"javax.activation.DataHandler"/>
+ <available classname=3D"javax.mail.Transport"/>
</and>
</condition>
@@ -57,9 +57,11 @@
<condition property=3D"isMacOsButNotMacOsX">
<and>
- <os family=3D"mac" />
+ <os family=3D"mac"/>
+
<not>
- <os family=3D"unix" />
+ <os family=3D"unix"/>
+
</not>
</and>
</condition>
@@ -70,7 +72,8 @@
=20
<condition property=3D"isSunOSonSparc">
- <os name=3D"SunOS" arch=3D"sparc" />
+ <os name=3D"SunOS" arch=3D"sparc"/>
+
</condition>
sets the property isSunOSonSparc if the current
@@ -82,4 +85,3 @@
=20