RE: Proposed roadmap
-Original Message- From: Peter Reilly [mailto:[EMAIL PROTECTED] Sent: Wednesday, January 03, 2007 7:45 AM To: Ant Developers List Subject: Re: Proposed roadmap docbook looks a good bit verbose. I would rather something that makes it easy to write manual pages with specific tags for attributes/nested elements and examples. DD had a xslt stylesheet (cannot find the bugzilla request at the moment) which may be the way to go (however I have always found it difficult to write/understand xslt). The xdocs project took the java source and generated html pages, but it was difficult to maintain, need to understand velocity, and the generated pages were hideous (in terms of html tags). Have you considered DocBook Lite? http://svn.red-bean.com/svnbook/trunk/src/tools/readme-dblite.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Output of CVS update command...
While running a CVS Update command on a checked out copy where there are
conflicts and modified files, I was expecting to see the familiar lines:
C path/to/conflicted.file
M path/to/modifed.file
They are not shown. I've tried setting/unsetting the quiet attribute, and
setting output/error attributes, and checking the files. They appear to be
swallowed up.
cvs
command=update -d
dest=${basedir}/${working.dir}
/
Is there something I'm missing, or is this a bug/been fixed for 1.7?
-- Larry
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: ant/src/main/org/apache/tools/ant/util JavaEnvUti ls.java
-Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, April 12, 2005 1:59 PM To: [EMAIL PROTECTED] Subject: cvs commit: ant/src/main/org/apache/tools/ant/util JavaEnvUtils.java stevel 2005/04/12 13:59:06 Modified:src/main/org/apache/tools/ant/util JavaEnvUtils.java Log: Java1.5 has different classes in the parent. i've blocked off the xml parser stuff; i worry if that is the right thing to do, but it adheres to the spec. This may be something to go into 1.6.3 Revision ChangesPath 1.28 +16 -8 ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java [snip] Your change added leading tabs. Was this on purpose? -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [patch] ant in anger
Even in XML you do not need to quote it, unless it is in an attribute, and as Peter pointed out, it makes examples harder to understand. I'm for only having quot; show up where it is needed, in attributes, if necessary. -Original Message- From: Kev Jackson [mailto:[EMAIL PROTECTED] Sent: Wednesday, March 16, 2005 7:55 PM To: Ant Developers List Subject: Re: [patch] ant in anger Shatzer, Larry wrote: why to quot;? '' is perfectly valid in HTML, and no need to escape it. Sorry, I'm assuming that the docs will be transformed into xml at some point, at that time quot; may be better than . Kev - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] some entity escaping
Ooops, I forgot that *.patch files are stripped.
Here it is named *.txt
-Original Message-
From: Stefan Bodewig [mailto:[EMAIL PROTECTED]
Sent: Wednesday, March 16, 2005 11:07 PM
To: [EMAIL PROTECTED]
Subject: Re: [PATCH] some entity escaping
On Wed, 16 Mar 2005, Larry Shatzer
[EMAIL PROTECTED] wrote:
Escaping to amp; and to gt;
Attachment has been stripped.
Stefan
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Index: docs/ant_in_anger.html
===
RCS file: /home/cvspublic/ant/docs/ant_in_anger.html,v
retrieving revision 1.18
diff -u -r1.18 ant_in_anger.html
--- docs/ant_in_anger.html 16 Mar 2005 06:03:52 - 1.18
+++ docs/ant_in_anger.html 16 Mar 2005 19:45:15 -
@@ -878,7 +878,7 @@
lifetch - get the latest source from the cvs tree
lidocs/javadocs - do the documentation
liall - clean, fetch, build, test, docs, deploy
-limain - the default build process (usually build or build test)
+limain - the default build process (usually build or build amp; test)
/ul
Sub projects quot;webquot;, quot;bean-1quot;, quot;bean-2quot; can be
given their own build
files - ttweb.xml/tt, ttbean-1.xml/tt, ttbean-2.xml/tt - with the
same entry points.
Index: docs/manual/developlist.html
===
RCS file: /home/cvspublic/ant/docs/manual/developlist.html,v
retrieving revision 1.8
diff -u -r1.8 developlist.html
--- docs/manual/developlist.html11 Mar 2005 17:18:47 - 1.8
+++ docs/manual/developlist.html16 Mar 2005 19:45:23 -
@@ -23,7 +23,7 @@
a href=antexternal.htmlUsing Ant Tasks Outside of Ant/abr
br
a href=tutorial-writing-tasks.htmlTutorial: Writing Tasks/abr
-a href=tutorial-tasks-filesets-properties.htmlTutorial: Tasks using
Properties, Filesets Paths/abr
+a href=tutorial-tasks-filesets-properties.htmlTutorial: Tasks using
Properties, Filesets amp; Paths/abr
/body
/html
Index: docs/manual/tutorial-tasks-filesets-properties.html
===
RCS file:
/home/cvspublic/ant/docs/manual/tutorial-tasks-filesets-properties.html,v
retrieving revision 1.8
diff -u -r1.8 tutorial-tasks-filesets-properties.html
--- docs/manual/tutorial-tasks-filesets-properties.html 7 Mar 2005 18:33:59
- 1.8
+++ docs/manual/tutorial-tasks-filesets-properties.html 16 Mar 2005 19:46:10
-
@@ -1,7 +1,7 @@
html
head
link rel=stylesheet type=text/css href=stylesheets/style.css/
-titleTutorial: Tasks using Properties, Filesets Paths/title
+titleTutorial: Tasks using Properties, Filesets amp; Paths/title
meta name=author content=Jan Mategrave;rne
style type=text/css
!--
@@ -11,7 +11,7 @@
/style
/head
body
-h1Tutorial: Tasks using Properties, Filesets Paths/h1
+h1Tutorial: Tasks using Properties, Filesets amp; Paths/h1
pAfter reading the tutorial about a
href=tutorial-writing-tasks.htmlwriting
tasks [1]/a this tutorial explains how to get and set properties and how to
use
@@ -280,7 +280,7 @@
for(int i=0; ilt;includedFiles.length; i++) {
String filename = includedFiles[i].replace('\\','/');
// 4
filename = filename.substring(filename.lastIndexOf(/)+1);
-if (foundLocation==null file.equals(filename)) {
+if (foundLocation==null amp;amp; file.equals(filename)) {
File base = ds.getBasedir();
// 5
File found = new File(base, includedFiles[i]);
foundLocation = found.getAbsolutePath();
@@ -392,7 +392,7 @@
for(int i=0; ilt;includedFiles.length; i++) {
String filename = includedFiles[i].replace('\\','/');
filename = filename.substring(filename.lastIndexOf(/)+1);
-if (foundLocation==null file.equals(filename)) {
+if (foundLocation==null amp;amp; file.equals(filename)) {
bfoundLocation = includedFiles[i];/b
// 3
}
}
@@ -502,7 +502,7 @@
for(int i=0; ilt;includedFiles.length; i++) {
String filename = includedFiles[i].replace('\\','/');
filename = filename.substring(filename.lastIndexOf(/)+1);
-if (file.equals(filename)
b!foundFiles.contains(includedFiles[i]/b)) { // 1
+if (file.equals(filename) amp;amp;
b!foundFiles.contains(includedFiles[i]/b)) { // 1
foundFiles.add(includedFiles[i]);
}
}
Index: docs/manual/CoreTasks/clone.html
===
RCS file: /home/cvspublic/ant/docs/manual/CoreTasks/clone.html,v
retrieving revision 1.2
diff -u
RE: [patch] ant in anger
why to quot;? '' is perfectly valid in HTML, and no need to escape it. http://marc.theaimsgroup.com/?l=ant-devm=110693846331376w=2 http://marc.theaimsgroup.com/?l=ant-devm=106431742007031w=2 http://marc.theaimsgroup.com/?l=ant-devm=106431872408214w=2 We've had this debate in the past. I am fine with either choice, but we should be consistent across the board. -- Larry -Original Message- From: Kev Jackson [mailto:[EMAIL PROTECTED] Sent: Tuesday, March 15, 2005 8:26 PM To: Ant Developers List Subject: [patch] ant in anger - fixed broken links - fixed spelling - A - a - - quot; c Kev - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [patch] ant in anger
-Original Message- From: Peter Reilly [mailto:[EMAIL PROTECTED] Sent: Wednesday, March 16, 2005 9:21 AM To: Ant Developers List Subject: Re: [patch] ant in anger Shatzer, Larry wrote: why to quot;? '' is perfectly valid in HTML, and no need to escape it. +1 quot; makes the html very difficult to read - especially the examples. I have a patch to change all quot; to in the html. It is quite large, around 500k,... Should I submit sections of this? -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[PATCH] some entity escaping
Escaping to amp; and to gt; -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [VOTE] Start a subproject for Ant libraries
-Original Message- From: Alexey N. Solofnenko [mailto:[EMAIL PROTECTED] Sent: Wednesday, March 09, 2005 9:10 AM To: Ant Developers List Subject: Re: [VOTE] Start a subproject for Ant libraries There are several newer revision control systems (for example, DARCS and TLA) that provide an ability for everybody enjoy versioned environment even if the root repository is read only. They both allow local modification and up-branch patch submission. DARCS treats every sandbox as a local repository simplifying not only distributed, but also off-line development. There is svk, which is build on Subversion (http://svk.elixus.org/) which could be used to mirror a remote repository to a local one, even a remote cvs, perforce, arch and others... -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[PATCH] fix typo in script documentation
It is supposed to be importClass(Packages.org...) not importClass(Package.org...). Also fix spot to use ' and not ´ -- Larry Index: docs/manual/OptionalTasks/script.html === RCS file: /home/cvspublic/ant/docs/manual/OptionalTasks/script.html,v retrieving revision 1.21 diff -u -r1.21 script.html --- docs/manual/OptionalTasks/script.html 19 Nov 2004 09:07:11 - 1.21 +++ docs/manual/OptionalTasks/script.html 1 Mar 2005 23:00:01 - @@ -237,13 +237,13 @@ lt;/targetgt; lt;/projectgt; /pre/blockquote -pWe want to use the Java API. Because we don´t want always typing the package signature +pWe want to use the Java API. Because we don't want always typing the package signature we do an import. Rhino knows two different methods for import statements: one for packages and one for a single class. By default only the ijava/i packages are available, so ijava.lang.System/i can be directly imported with codeimportClass/importPackage/code. -For other packages you have to prefix the full classified name with iPackage/i. +For other packages you have to prefix the full classified name with iPackages/i. For example ant´s iFileUtil/i class can be imported with -codeimportClass(bPackage/b.org.apache.tools.ant.util.FileUtils)/code +codeimportClass(bPackages/b.org.apache.tools.ant.util.FileUtils)/code br The codelt;scriptgt;/code task populates the Project instance under the name iproject/i, so we can use that reference. Another way is to use its given name - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[PATCH] Formatting changes
Put code around a ton of places where it was just lt;taggt;. And a few other minor format changes as well. (such as removing the space from tags like lt;tagname /gt;), and correcting #169; to copy;, and adding All Rights Reserved to copyright statements. Attached as a gzip file, since it's over the 100k mailing list size. -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Spelling fixes for OptionalTasks and OptionalTypes
Thanks. Yeah, it has been a while. $JOB always takes priority over @HOBBIES.
:)
Attached is a new patch to fix places where was used instead of gt;, for
consistency.
-- Larry
-Original Message-
From: Stefan Bodewig [mailto:[EMAIL PROTECTED]
Sent: Friday, November 12, 2004 2:40 AM
To: [EMAIL PROTECTED]
Subject: Re: [PATCH] Spelling fixes for OptionalTasks and
OptionalTypes
Hi Larry,
long time no see.
patch committed, thanks
Stefan
Index: docs/manual/running.html
===
RCS file: /home/cvspublic/ant/docs/manual/running.html,v
retrieving revision 1.27
diff -r1.27 running.html
220c220
grep -r -n getPropert * ..\grep.txt
---
grep -r -n getPropert * gt; ..\grep.txt
Index: docs/manual/tutorial-tasks-filesets-properties.html
===
RCS file:
/home/cvspublic/ant/docs/manual/tutorial-tasks-filesets-properties.html,v
retrieving revision 1.4
diff -r1.4 tutorial-tasks-filesets-properties.html
44,45c44,45
lt;?xml version=1.0 encoding=ISO-8859-1?
lt;project name=bFindTask/b basedir=. default=test
---
lt;?xml version=1.0 encoding=ISO-8859-1?gt;
lt;project name=bFindTask/b basedir=. default=testgt;
47,49c47,49
lt;target name=use.init description=Taskdef´ the bFind/b-Task
depends=jar
lt;taskdef name=bfind/b classname=bFind/b
classpath=${ant.project.name}.jar/
lt;/target
---
lt;target name=use.init description=Taskdef´ the bFind/b-Task
depends=jargt;
lt;taskdef name=bfind/b classname=bFind/b
classpath=${ant.project.name}.jar/gt;
lt;/targetgt;
53c53
lt;/project
---
lt;/projectgt;
66,67c66,67
lt;find property=test value=test-value/
lt;find print=test/
---
lt;find property=test value=test-value/gt;
lt;find print=test/gt;
71,72c71,72
lt;property name=test value=test-value/
lt;echo message=${test}/
---
lt;property name=test value=test-value/gt;
lt;echo message=${test}/gt;
120c120
an lt;antcall creates a new space for property names. All properties from
the caller
---
an lt;antcallgt; creates a new space for property names. All properties
from the caller
161,163c161,163
lt;find file=ant.jar location=location.ant-jar
lt;fileset dir=${ant.home} includes=**/*.jar/
lt;/find
---
lt;find file=ant.jar location=location.ant-jargt;
lt;fileset dir=${ant.home} includes=**/*.jar/gt;
lt;/findgt;
318,329c318,329
lt;target name=junit description=Runs the unit tests depends=jar
lt;delete dir=${junit.out.dir.xml} /
lt;mkdir dir=${junit.out.dir.xml} /
lt;junit printsummary=yes haltonfailure=no
lt;classpath refid=classpath.test/
blt;sysproperty key=ant.home value=${ant.home}//b
lt;formatter type=xml/
lt;batchtest fork=yes todir=${junit.out.dir.xml}
lt;fileset dir=${src.dir} includes=**/*Test.java/
lt;/batchtest
lt;/junit
lt;/target
---
lt;target name=junit description=Runs the unit tests
depends=jargt;
lt;delete dir=${junit.out.dir.xml}/gt;
lt;mkdir dir=${junit.out.dir.xml}/gt;
lt;junit printsummary=yes haltonfailure=nogt;
lt;classpath refid=classpath.test/gt;
blt;sysproperty key=ant.home value=${ant.home}/gt;/b
lt;formatter type=xml/gt;
lt;batchtest fork=yes todir=${junit.out.dir.xml}gt;
lt;fileset dir=${src.dir} includes=**/*Test.java/gt;
lt;/batchtestgt;
lt;/junitgt;
lt;/targetgt;
336c336
possibility of bundling files: the lt;path. Fileset are easy if the files
are all under
---
possibility of bundling files: the lt;pathgt;. Fileset are easy if the
files are all under
339c339
lt;filelist instead? lt;paths combines these datatypes in that way that a
path contains
---
lt;filelistgt; instead? lt;pathgt;s combines these datatypes in that way
that a path contains
341c341
Ant-Contribs [4]/a lt;foreach task is modified to support paths instead
of filesets. So we want that,
---
Ant-Contribs [4]/a lt;foreachgt; task is modified to support paths
instead of filesets. So we want that,
357,359c357,359
lt;find file=ant.jar location=location.ant-jar
lt;fileset dir=${ant.home} includes=**/*.jar/
lt;/find
---
lt;find file=ant.jar location=location.ant-jargt;
lt;fileset dir=${ant.home} includes=**/*.jar/gt;
lt;/findgt;
361,365c361,365
lt;find file=ant.jar location=location.ant-jar
blt;path/b*3
lt;fileset dir=${ant.home} includes=**/*.jar/
lt;/path
lt;/find
---
lt;find file=ant.jar location=location.ant-jargt;
blt;pathgt;/b*3
lt;fileset dir=${ant.home} includes=**/*.jar/gt;
lt;/pathgt;
[PATCH] Spelling fixes for OptionalTasks and OptionalTypes
Attached is a patch file to correct quite a few spelling mistakes in
docs/manual/OptionalTasks and OptionalTypes
-- Larry
Index: docs/manual/OptionalTasks/BorlandGenerateClient.html
===
RCS file:
/home/cvspublic/ant/docs/manual/OptionalTasks/BorlandGenerateClient.html,v
retrieving revision 1.9
diff -r1.9 BorlandGenerateClient.html
65c65
lt;pathelement locacation=quot;mymodule.jarquot;/gt;
---
lt;pathelement location=quot;mymodule.jarquot;/gt;
Index: docs/manual/OptionalTasks/antlr.html
===
RCS file: /home/cvspublic/ant/docs/manual/OptionalTasks/antlr.html,v
retrieving revision 1.12
diff -r1.12 antlr.html
94c94
Generates a text file with debugging infomation based on the target
grammar.
---
Generates a text file with debugging information based on the target
grammar.
Index: docs/manual/OptionalTasks/ccm.html
===
RCS file: /home/cvspublic/ant/docs/manual/OptionalTasks/ccm.html,v
retrieving revision 1.12
diff -r1.12 ccm.html
20c20
agains versions 5.1/6.2 on Windows 2000, but should work on other platforms
with ccm installed./p
---
against versions 5.1/6.2 on Windows 2000, but should work on other
platforms with ccm installed./p
81c81
tdfilset containing the file to be checked out/td
---
tdfileset containing the file to be checked out/td
Index: docs/manual/OptionalTasks/chgrp.html
===
RCS file: /home/cvspublic/ant/docs/manual/OptionalTasks/chgrp.html,v
retrieving revision 1.6
diff -r1.6 chgrp.html
124c124
group webdev. Directories begining with codetest_/code also will belong
---
group webdev. Directories beginning with codetest_/code also will belong
Index: docs/manual/OptionalTasks/chown.html
===
RCS file: /home/cvspublic/ant/docs/manual/OptionalTasks/chown.html,v
retrieving revision 1.4
diff -r1.4 chown.html
16c16
atribute is equivalent to the coresponding argument for the chown
---
attribute is equivalent to the corresponding argument for the chown
124,125c124,125
directories begining with codeprivate_/code belong to the user named
webadmin. A directory ending in code.old/code or a file begining with
---
directories beginning with codeprivate_/code belong to the user named
webadmin. A directory ending in code.old/code or a file beginning with
Index: docs/manual/OptionalTasks/clearcase.html
===
RCS file: /home/cvspublic/ant/docs/manual/OptionalTasks/clearcase.html,v
retrieving revision 1.10
diff -r1.10 clearcase.html
42c42
ClearCase commands using the Cleartool program. The current tasks avaliable
for Ant correspond to only
---
ClearCase commands using the Cleartool program. The current tasks available
for Ant correspond to only
Index: docs/manual/OptionalTasks/csc.html
===
RCS file: /home/cvspublic/ant/docs/manual/OptionalTasks/csc.html,v
retrieving revision 1.2
diff -r1.2 csc.html
49c49
Compiles C# source into executables or modules. csc.exe on Windows or
mcs on any other platform must be on the execute path, unless another
executable or the full path to that executable is specified in the
ttexecutable/tt parameter p All parameters are optional: lt;csc/gt;
should suffice to produce a debug build of all *.cs files. However, naming an
ttdestFile/ttstops the csc compiler from choosing an output name from
random, and allows the dependency checker to determine if the file is out of
date. p The task is a directory based task, so attributes like
bincludes=*.cs /b and bexcludes=broken.cs/b can be used to control
the files pulled in. By default, all *.cs files from the project folder down
are included in the command. When this happens the output file -if not
specified- is taken as the first file in the list, which may be somewhat hard
to control. Specifying the output file with ttdestFile/tt seems prudent.
p p For more complex source trees, nested ttsrc/tt elemements can be
supplied. When such an element is present, the implicit fileset is ignored.
This makes sense, when you think about it :) p References to external files
can be made through the references attribute, or (since Ant1.6), via nested
lt;referencegt; filesets. With the latter, the timestamps of the references
are also used in the dependency checking algorithm. p Example prelt;csc
optimize=quot;truequot; debug=quot;falsequot;
docFile=quot;documentation.xmlquot; warnLevel=quot;4quot;
unsafe=quot;falsequot; targetType=quot;exequot;
incremental=quot;falsequot; mainClass = quot;MainAppquot;
destFile=quot;NetApp.exequot; gt; lt;src dir=src includes=*.cs /gt;
lt;reference file=${testCSC.dll} /gt; lt;define
[PATCH] ant_in_anger.html
Typos, misspellings, double words... -- Larry Index: docs/ant_in_anger.html === RCS file: /home/cvspublic/ant/docs/ant_in_anger.html,v retrieving revision 1.16 diff -u -r1.16 ant_in_anger.html --- docs/ant_in_anger.html 9 Jul 2003 16:24:35 - 1.16 +++ docs/ant_in_anger.html 4 Mar 2004 20:10:18 - @@ -218,7 +218,7 @@ ul li -a hef=http://checkstyle.sourceforge.net/;Checkstyle/abr +a href=http://checkstyle.sourceforge.net/;Checkstyle/abr This tool audits your code and generates HTML reports of wherever any style rule gets broken. Nobody can hide from the code police now! tip: start using this early, so the corrections are less. @@ -238,7 +238,7 @@ descriptors, taglib descriptors, EJB interfaces, JMX interface classes, Castor XML/SQL bindings, and many more. The key here is that all those fiddly little XML files you need to create, and those interfaces EJB and -JMX requires to to implement, all can be autogenerated from your Java +JMX requires to implement, all can be autogenerated from your Java code with a few helper attributes. This reduces errors and means you can change your code and have the rest of the app take its cue from the source. Never do EJB, JMX or webapps without it! @@ -316,7 +316,7 @@ into a localised shell script or batch file. p Note that DOS descended file systems are case insensitive (apart from -the obscure aberration of the WinNT posix subsystem run against NTFS), +the obscure aberration of the WinNT POSIX subsystem run against NTFS), and that Windows pretends that all file extensions with four or more letters are also three letter extensions (try DELETE *.jav in your java directories to see a disastrous example of this). @@ -351,7 +351,7 @@ ActiveState/a. A Perl file with .pl extension, with the usual Unix path to perl on the line 1 comment and marked as executable can be run on Windows, OS/2 and Unix and hence called from Ant without issues. The -perl code can be left to resolve its own platform issues. Dont forget to +perl code can be left to resolve its own platform issues. Don't forget to set the line endings of the file to the appropriate platform when you redistribute Perl code; a href=manual/CoreTasks/fixcrlf.htmllt;fixCRLFgt;/a @@ -493,7 +493,7 @@ tr tdbsrc/b /td -tdsource goes in under this tree iin a heirarchy which matches +tdsource goes in under this tree iin a hierarchy which matches the package namesi. The dependency rules of lt;javacgt; requires this. /td /tr @@ -504,11 +504,11 @@ distribution jars -inf files, images, etc. These can go under source too, with a ttmetadata/tt directory for web.xml and similar manifests, and a ttweb/tt folder for web content -JSP, html, images -and so on. Keeping the content in this folder (or sub heirarchy) +and so on. Keeping the content in this folder (or sub hierarchy) together makes it easier to test links before deployment. The actual production of a deployment image -such as a war file- can be left to the appropriate Ant task: there is no need to completely model your source tree -upon the deployment heirarchy. +upon the deployment hierarchy. p Javadoc output can be @@ -555,7 +555,7 @@ Tightly coupled projects have all the source in the same tree; different projects own different subdirectories. Build files can be moved down to -those subdirectores (say src/com/iseran/core and src/com/iseran/extras), +those subdirectories (say src/com/iseran/core and src/com/iseran/extras), or kept at the top -with independent build files named core.xml and extras.xml @@ -597,7 +597,7 @@ The most aggressive strategy is to get a weekly or daily snapshot of the ant source, build it up and use it. This forces you to tweak the -build.xml files more regulary, as new tasks and attributes can take +build.xml files more regularly, as new tasks and attributes can take while to stabilise. You really have to want the new features, enjoy gratuitous extra work or take pleasure in upsetting your colleagues to take this approach. @@ -606,7 +606,7 @@ Once you start extending Ant with new tasks, it suddenly becomes much more tempting to pull down regular builds. The most recent Ant builds -are invariably the the best platform for writing your extensions, as you +are invariably the best platform for writing your extensions, as you can take advantage of the regular enhancements to the foundational classes. It also prevents you from wasting time working on something which has already been done. A newly submitted task to do something @@ -727,7 +727,7 @@ Use external property files to keep per-user settings out the build files -especially passwords. Property files can also be used to dynamically set a number of properties based on the value of a single -property, simply by dyamically generating the property filename from the +property, simply by dynamically generating the property
[PATCH] cvs docs
A newer version of CVS has been released, updated links in document. Also a bit of tidying up. -- Larry Index: docs/manual/CoreTasks/cvs.html === RCS file: /home/cvspublic/ant/docs/manual/CoreTasks/cvs.html,v retrieving revision 1.22 diff -u -r1.22 cvs.html --- docs/manual/CoreTasks/cvs.html 17 Feb 2004 08:31:39 - 1.22 +++ docs/manual/CoreTasks/cvs.html 2 Mar 2004 22:56:18 - @@ -54,7 +54,7 @@ tr td valign=topdest/td td valign=topthe directory where the checked out files should -be placed. Note that this is different from CVS's -d command line +be placed. Note that this is different from CVS's code-d/code command line switch as Ant will never shorten pathnames to avoid empty directories./td td align=center valign=topNo, default is project's basedir./td @@ -93,12 +93,12 @@ tr td valign=topoutput/td td valign=topthe file to direct standard output from the command./td -td align=center valign=topNo, default output to ANT Log as MSG_INFO./td +td align=center valign=topNo, default output to ANT Log as codeMSG_INFO/code./td /tr tr td valign=toperror/td td valign=topthe file to direct standard error from the command./td -td align=center valign=topNo, default error to ANT Log as MSG_WARN./td +td align=center valign=topNo, default error to ANT Log as codeMSG_WARN/code./td /tr tr td valign=topappend/td @@ -108,17 +108,17 @@ tr td valign=topport/td td valign=topPort used by CVS to communicate with the server./td -td align=center valign=topNo, default port 2401./td +td align=center valign=topNo, default port code2401/code./td /tr tr td valign=toppassfile/td td valign=topPassword file to read passwords from./td -td align=center valign=topNo, default file ~/.cvspass./td +td align=center valign=topNo, default file code~/.cvspass/code./td /tr tr td valign=topfailonerror/td td valign=topStop the build process if the command exits with a - return code other than code0/code. Defaults to false/td + return code other than code0/code. Defaults to quot;falsequot;/td td align=center valign=topNo/td /tr /table @@ -157,7 +157,7 @@ lt;/cvsgt; /pre p -You may include as many lt;commandlinegt; elements as you like. +You may include as many codelt;commandlinegt;/code elements as you like. Each will inherit the codefailonerror/code, codecompression/code, and other quot;globalquot; parameters from the codelt;cvsgt;/code element. /p @@ -167,10 +167,10 @@ pUpdates from the head of repository ignoring sticky bits (code-A/code) and creating any new directories as necessary (code-d/code)./p pNote: the text of the command is passed to cvs quot;as-isquot; so any cvs options should appear before the command, and any command options should appear after the command as in the diff example -above. See a href=http://www.cvshome.org/docs/manual/cvs-1.11.7/cvs.html; target=_topthe cvs manual/a for details, -specifically the a href=http://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_16.html; target=_topGuide to CVS commands/a/p +above. See a href=http://www.cvshome.org/docs/manual/cvs-1.11.13/cvs.html; target=_topthe cvs manual/a for details, +specifically the a href=http://www.cvshome.org/docs/manual/cvs-1.11.13/cvs_16.html; target=_topGuide to CVS commands/a/p hr -p align=centerCopyright copy; 2000-2003 Apache Software +p align=centerCopyright copy; 2000-2004 Apache Software Foundation. All rights Reserved./p /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Ant 1.6.1 released
-Original Message- From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED] Sent: Thursday, February 12, 2004 6:13 AM To: Ant Developers List; Ant Users List Subject: Ant 1.6.1 released Apache Ant 1.6.1 is now available for download http://ant.apache.org/bindownload.cgi from http://ant.apache.org/bindownload.cgi Still shows 1.6.0 for me... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [VOTE] macrodef - do attributes as properties or substitution s
-Original Message-
From: Stefan Bodewig [mailto:[EMAIL PROTECTED]
Sent: Tuesday, November 18, 2003 2:08 AM
To: [EMAIL PROTECTED]
Subject: Re: [VOTE] macrodef - do attributes as properties or
substitutions
[ ] as $(x)
[ ] as @{x}
either one works for me - as well as [EMAIL PROTECTED]
What about {$x}? Or is it too close to a typo for a regular property?
-- Larry
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[PATCH] to whatsnew for 1.6
I noticed that a change that I submitted (and then was accepted) was never added into the WHATSNEW file. (the addition of reallyquiet attribute to cvs). Attached is the patch to add that. -- Larry Index: WHATSNEW === RCS file: /home/cvspublic/ant/WHATSNEW,v retrieving revision 1.503.2.11 diff -u -r1.503.2.11 WHATSNEW --- WHATSNEW6 Nov 2003 21:26:19 - 1.503.2.11 +++ WHATSNEW11 Nov 2003 16:46:28 - @@ -212,6 +212,9 @@ are resolved at a later stage. This causes some differences especially for user defined task containers. +* The cvs task now accepts the attribute 'reallyquiet', which is synonymous + with -Q on the command line. + Fixed bugs: --- * Filter readers were not handling line endings properly. Bugzilla - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Native Java CVS implementation
I noticed in the source code for the CVS task, this comment: // XXX: we should use JCVS (www.ice.com/JCVS) instead of // command line execution so that we don't rely on having // native CVS stuff around (SM) // We can't do it ourselves as jCVS is GPLed, a third party task // outside of jakarta repositories would be possible though (SB). Which makes perfect sense. Even LGPL would have problems being linked too with java's import statement. (http://issues.apache.org/wiki/apachewiki.cgi?Licensing) Recently the idea of having a native java interface to cvs instead of shelling out to CVS came up on the Maven development list (http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED] by=threadfrom=518930) The NetBeans project was brought up, and javacvs in particular. http://javacvs.netbeans.org/library/index.html Since this is licensed under the Sun Public License (http://www.netbeans.org/about/legal/license.html) which someone said is compatible with the Apache License. Now I know we can't just up and replace the current cvs task for backwards compatibility (since we are never going to fully implement every possible command combination). Maybe we can make a new optional task (javacvs), since we have to link to something under the Sun Public License, and can't re-distribute the jar file. I don't know enough Java to tackle this myself, but thought I would start a discussion and see who else is interested in a native java cvs task. (I've seen it come up a few times on here, at least once that I can remember for sure). -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Vote: local for 1.6
Since I am not a commiter, my vote won't count, but I am +1 for this. It solves my original problem perfectly. -- Larry -Original Message- From: peter reilly [mailto:[EMAIL PROTECTED] Sent: Tuesday, October 21, 2003 8:36 AM To: [EMAIL PROTECTED] Subject: Vote: local for 1.6 Hi all, I would like to put the local property patch into ant 1.6. Normally I would wait for 1.7 for this, but it has a big and (I think) beneficial impact on macrodef/. The changes to macrodef are not Backward Compatible with the current implementation. The local task declares properties that only exist for the current scope, where scope is a target, or a sequential (any taskcontainer) or a macro instance. The patch is in http://issues.apache.org/bugzilla/show_bug.cgi?id=23942 Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[patch] Telnet task
If we have timed out, before we throw a BuildException, lets log to
MSG_DEBUG the rest of the content of the StringBuffer. This way people
trying to debug why their read did not work, have something to go on.
This kind of addresses bug# 11620.
-- Larry
Index: src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java,v
retrieving revision 1.20
diff -u -r1.20 TelnetTask.java
--- src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java 13 May
2003 14:37:04 - 1.20
+++ src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java 22 Oct
2003 21:35:15 -
@@ -342,6 +342,7 @@
Thread.sleep(250);
}
if (is.available() == 0) {
+log(sb.toString(), Project.MSG_DEBUG);
throw new BuildException(
Response timed-out waiting for \ + s + '\',
getLocation());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: Macrodef and parallel in a recursive situation
I like that idea. I think since you are already in local-property the
locally scoped property should be used. At least to me, that makes the most
sense. If you needed the non-local property, why even have it locally scoped
when you call ant or antcall?
-- Larry
-Original Message-
From: Jose Alberto Fernandez [mailto:[EMAIL PROTECTED]
Sent: Friday, October 17, 2003 4:42 AM
To: Ant Developers List
Subject: RE: Macrodef and parallel in a recursive situation
For a long time I have thought on adding local contet to ANT.
In principle it would be something like:
target
property name=x value=w/
echo message=${x}/
...
local-property name=x
!-- here ${x} has no value assigned to it
echo message=${x}/
property name=x value=y/
echo message=${x}/
/local-property
echo message=${x}/
...
/target
The output of the above target would be something like:
[echo] w
[echo] ${x}
[echo] y
[echo] w
You could also assign a value in the local-property, but using it as
above
allows setting the property using other tasks that set properties.
The above is simple, and probably not too controversial, the
question is
what happens
if I do an ant or antcall within the local-property/ which value
of ${x} should
be inherited in the call at that point of the execution?
Such a task, would be not too dificult to do, but it really
needs access
to the
internals of ANT, it needs to be part of core, for sure.
Jose Alberto
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: Macrodef and parallel in a recursive situation
Maybe allow attribute have another attribute that allows it to be undeclared with default or passed in, so we can set it inside the macrodef, such as newcurrent. Example: macrodef name=recursive attribute name=until/ attribute name=current/ attribute name=method/ attribute name=newcurrent staticscope=true/ ... /macrodef Then when you call recursive such as this: recursive until=10 current=0 method=blah/ it won't die that you did not pass newcurrent. the staticscope attribute name could be something else, or scope=static and a list of others that could be used. -- Larry -Original Message- From: peter reilly [mailto:[EMAIL PROTECTED] Sent: Friday, October 17, 2003 12:43 AM To: Ant Developers List Subject: Re: Macrodef and parallel in a recursive situation The parellel would cause grief. The problem is not the attribute, I think but the newcurrent global variable. On using macrodef, I have noticed that it would be really cool to have a static scopped variable. Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Macrodef and parallel in a recursive situation
I have run into a possible bug when working with macrodef and parallel in a
recursive situation.
The following build file snip example exhibits this: (This requires the if
ant-contrib task, and math from Antelope, soon to be ant-contrib).
macrodef name=recurse
attribute name=until/
attribute name=current/
attribute name=method/
sequential
if
equals arg1=${until} arg2=${current}/
then
echo message=Method: ${method} done/
/then
else
math
datatype = int
operand1 = ${current}
operand2 = 1
operation = +
result= newcurrent
/
echo
message = 1: M: ${method}, C: ${current}, U: ${until}
/
sleep seconds=1/
echo
message = 2: M: ${method}, C: ${current}, U: ${until}
/
recurse
current = ${newcurrent}
method = ${method}
until = ${until}
/
/else
/if
/sequential
/macrodef
target name=test
parallel
recurse current=0 method=0 until=5/
recurse current=0 method=1 until=10/
recurse current=0 method=2 until=15/
recurse current=0 method=3 until=20/
/parallel
/target
Depending on the situation, this could result in an endless loop.
I use something similar to this method when checking out/updating a list of
cvs projects in parallel, and ran across the methoddef's steeping on each
others toes. I was converting from using antcall to macrodef.
I don't know how to handle this, since macrodef should be able to set and
read properties in a global context, but sometimes you want local variables.
Maybe add a flag to attribute of global/local?
-- Larry
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
antcall with macrodef
If your ant file contains antcall and you have macrodef's, and those
macrodefs have default attributes in the attribute element, it throws off
this warning:
Trying to override old definition of task taskname here
See attached ant file as an example:
project basedir=. name=test default=test
macrodef name=test1
attribute default=default value name=test/
sequential
echo message=${test}/
/sequential
/macrodef
macrodef name=test2
attribute name=test/
sequential
echo message=${test}/
/sequential
/macrodef
target name=test
test1 test=this/
test1/
test2 test=that/
!-- Can't call test2/ due to no default for macrodef test2 --
!--test2/--
/target
target name=antcall-test
antcall target=test/
/target
/project
run ant by itself, no errors or warnings, since antcall is never executed,
but if you run ant with antcall-test, you will see the warning.
Of course, macrodef gets rid of the need for antcall is almost all cases, I
still however have a few antcalls I need to keep, until I figure a way to
convert them to using macrodef, and this warning has been bugging me that
there was something else deeply wrong with 1.6, but as you can see, the
execution happens as expected.
-- Larry
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[PATCH] faq.xml
put a space between andchanges to make it and changes -- Larry Index: xdocs/faq.xml === RCS file: /home/cvspublic/ant/xdocs/faq.xml,v retrieving revision 1.42 diff -u -r1.42 faq.xml --- xdocs/faq.xml 13 Oct 2003 13:44:56 - 1.42 +++ xdocs/faq.xml 13 Oct 2003 15:21:16 - @@ -700,7 +700,7 @@ pYou may have seen these lower-case directory names in WinZIP, but WinZIP is trying to be helpful (and fails). If WinZIP encounters a filename that is all upper-case, it -assumes it has come from an old DOS box andchanges the case to +assumes it has come from an old DOS box and changes the case to all lower-case for you./p pIf you extract (or just check) the archive with jar, you - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: script with 1.6beta
-Original Message- From: Stefan Bodewig [mailto:[EMAIL PROTECTED] Sent: Friday, October 10, 2003 12:12 AM To: [EMAIL PROTECTED] Subject: Re: script with 1.6beta On Thu, 9 Oct 2003, Larry Shatzer [EMAIL PROTECTED] wrote: I tried 1.5R3 with no success. 1.5R2 does work however. Really? We should change the docs then (although I'm sure that I've tried 1.5R3). Feel free to try it again incase I have something weird going on. -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs over SSH
Also might want to read this: http://www.tortoisecvs.org/faq.html#sshkeys for a non-cygwin solution, which I use. -- Larry -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 30, 2003 3:45 AM To: [EMAIL PROTECTED] Subject: RE: cvs over SSH I will look and try, thanks so far. Jan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[PATCH] update cvs.html
v1.11.7 of CVS was released. Updated cvs.html to link to the latest stable version of CVS's documents. -- Larry Index: docs/manual/CoreTasks/cvs.html === RCS file: /home/cvspublic/ant/docs/manual/CoreTasks/cvs.html,v retrieving revision 1.19 diff -u -r1.19 cvs.html --- docs/manual/CoreTasks/cvs.html 22 Sep 2003 15:41:44 - 1.19 +++ docs/manual/CoreTasks/cvs.html 30 Sep 2003 15:14:52 - @@ -168,8 +168,8 @@ pUpdates from the head of repository ignoring sticky bits (code-A/code) and creating any new directories as necessary (code-d/code)./p pNote: the text of the command is passed to cvs quot;as-isquot; so any cvs options should appear before the command, and any command options should appear after the command as in the diff example -above. See a href=http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs.html; target=_topthe cvs manual/a for details, -specifically the a href=http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs_16.html; target=_topGuide to CVS commands/a/p +above. See a href=http://www.cvshome.org/docs/manual/cvs-1.11.7/cvs.html; target=_topthe cvs manual/a for details, +specifically the a href=http://www.cvshome.org/docs/manual/cvs-1.11.7/cvs_16.html; target=_topGuide to CVS commands/a/p hr p align=centerCopyright copy; 2000-2003 Apache Software Foundation. All rights Reserved./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Task getTaskType() and setTaskType()
-Original Message-
From: Stefan Bodewig [mailto:[EMAIL PROTECTED]
Sent: Friday, September 26, 2003 12:46 AM
To: [EMAIL PROTECTED]
Subject: Re: Task getTaskType() and setTaskType()
Given that there is no RuntimeConfigurable2 anymore, I'm not sure
whether it really still needs to be public at all. If it remains
public, the getter should become public as well, I agree.
Attached is a patch that makes getTaskType() public. I'm not sure if
setTaskType() should be public, private or protected.
-- Larry
Index: src/main/org/apache/tools/ant/Task.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/Task.java,v
retrieving revision 1.50
diff -u -r1.50 Task.java
--- src/main/org/apache/tools/ant/Task.java 12 Sep 2003 20:56:45 -
1.50
+++ src/main/org/apache/tools/ant/Task.java 26 Sep 2003 17:55:08 -
@@ -493,7 +493,7 @@
*
* @return the type of task
*/
-protected String getTaskType() {
+public String getTaskType() {
return taskType;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: AW: [PATCH] and problem with patch.xml
My only reason for doing it was to make it consistent, since we had a bit of both. I figured since we were going to move these html documents to XML at some point, make the migration easier. Either way works for me. -- Larry -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 23, 2003 5:05 AM To: [EMAIL PROTECTED] Subject: RE: AW: [PATCH] and problem with patch.xml HTML is not XML. And while writing example is much easier to work with than with quot;. Maybe that´s a default setting in the html checker :-) Jan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[PATCH] Typos...
More typos...
-- Larry
Index: src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java,v
retrieving revision 1.45
diff -u -r1.45 EjbJar.java
--- src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java 19 Jul
2003 11:20:16 - 1.45
+++ src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java 22 Sep
2003 14:52:13 -
@@ -170,7 +170,7 @@
public static class NamingScheme extends EnumeratedAttribute {
/**
* Naming scheme where generated jar is determined from the ejb-name in
- * the deployment descripor
+ * the deployment descriptor
*/
public static final String EJB_NAME = ejb-name;
@@ -228,7 +228,7 @@
* Stores a handle to the directory to put the Jar files in. This is
* only used by the generic deployment descriptor tool which is created
* if no other deployment descriptor tools are provided. Normally each
- * deployment tool will specify the desitination dir itself.
+ * deployment tool will specify the destination dir itself.
*/
private File destDir;
@@ -537,7 +537,7 @@
/**
* Set the suffix for the generated jar file. When generic jars are
- * generated, they have a suffix which is appended to the the bean name
+ * generated, they have a suffix which is appended to the bean name
* to create the name of the jar file. Note that this suffix includes
* the extension fo te jar file and should therefore end with an
* appropriate extension such as .jar or .ear
Index: src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java,v
retrieving revision 1.25
diff -u -r1.25 Ejbc.java
--- src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java 19 Jul
2003 11:20:16 - 1.25
+++ src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java 22 Sep
2003 14:52:13 -
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000,2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -70,7 +70,7 @@
*/
public class Ejbc extends MatchingTask {
/**
- * The root directory of the tree containing the serialised deployment
desciptors. The actual
+ * The root directory of the tree containing the serialised deployment
descriptors. The actual
* deployment descriptor files are selected using include and exclude
constructs
* on the ejbc task provided by the MatchingTask superclass.
*/
@@ -109,7 +109,7 @@
* interfaces to be available in the classpath, this also avoids having to
* start ant with the class path of the project it is building.
*
- * @exception BuildException if someting goes wrong with the build
+ * @exception BuildException if something goes wrong with the build
*/
public void execute() throws BuildException {
if (descriptorDirectory == null
@@ -198,7 +198,7 @@
* Set the name of the generated manifest file.
*
* For each EJB that is processed an entry is created in this file. This
can then be used
- * to create a jar file for dploying the beans.
+ * to create a jar file for deploying the beans.
*
* @param manifestFilename the name of the manifest file to be generated.
*/
@@ -217,7 +217,7 @@
* Set the directory containing the source code for the home interface,
remote interface
* and public key class definitions.
*
- * @param dirName the directory containg the source tree for the EJB's
interface classes.
+ * @param dirName the directory containing the source tree for the EJB's
interface classes.
*/
public void setSrc(String dirName) {
sourceDirectory = new File(dirName);
Index: src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java,v
retrieving revision 1.21
diff -u -r1.21 EjbcHelper.java
--- src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java 19 Jul
2003 11:20:17 - 1.21
+++ src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java 22 Sep
2003 14:52:13 -
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and
[PATCH] and problem with patch.xml
While making changes to custom-programing.html, I found an invalid property
in the documentation.
${mydomain.classes which should be ${mydomain.classes}.
When running patch.xml, it has a problem:
Caught exception (org.apache.tools.ant.BuildException) while expanding
no.copyright.set: Syntax error in property:
classpath=${mydomain.classes/gt;
Since patch.txt.tmp has both properties showing (invalid and valid), it
tries to expand them both, and fails.
I'm not quite sure how to fix this in patch.xml for future problems with
this. In the short term I've attached a patch to fix custom-programing.html
(along with a few other changes like use of to quot; to be more
consistent, and spelling).
-- Larry
Index: docs/manual/CoreTypes/custom-programming.html
===
RCS file: /home/cvspublic/ant/docs/manual/CoreTypes/custom-programming.html,v
retrieving revision 1.2
diff -u -r1.2 custom-programming.html
--- docs/manual/CoreTypes/custom-programming.html 13 Aug 2003 09:05:22
- 1.2
+++ docs/manual/CoreTypes/custom-programming.html 22 Sep 2003 21:59:54
-
@@ -66,7 +66,7 @@
// This method evaluates the condition
public boolean eval() {
if (value == null) {
-throw new BuildException(value attribute is not set);
+throw new BuildException(quot;value attribute is not setquot;);
}
return value.toUpperCase().equals(value);
}
@@ -80,9 +80,9 @@
blockquote
pre
lt;typedef
-name=alluppercase
-classname=com.mydomain.AllUpperCaseCondition
-classpath=${mydomain.classes/gt;
+name=quot;alluppercasequot;
+classname=quot;com.mydomain.AllUpperCaseConditionquot;
+classpath=quot;${mydomain.classes}quot;/gt;
/pre
/blockquote
p
@@ -91,8 +91,8 @@
/p
blockquote
pre
-lt;condition property=alluppergt;
- lt;alluppercase value=THIS IS ALL UPPER CASE/gt;
+lt;condition property=quot;allupperquot;gt;
+ lt;alluppercase value=quot;THIS IS ALL UPPER CASEquot;/gt;
lt;/conditiongt;
/pre
/blockquote
@@ -110,7 +110,7 @@
/p
p
An example of a custom selection that selects filenames ending
- in .java would be:
+ in quot;.javaquot; would be:
/p
blockquote
pre
@@ -119,7 +119,7 @@
import org.apache.tools.ant.types.selectors.FileSelector;
public class JavaSelector implements FileSelector {
public boolean isSelected(File b, String filename, File f) {
- return filename.toLowerCase().endsWith(.java);
+ return filename.toLowerCase().endsWith(quot;.javaquot;);
}
}
/pre
@@ -130,9 +130,9 @@
blockquote
pre
lt;typedef
-name=javaselector
-classname=com.mydomain.JavaSelector
-classpath=${mydomain.classes/gt;
+name=quot;javaselectorquot;
+classname=quot;com.mydomain.JavaSelectorquot;
+classpath=quot;${mydomain.classes}quot;/gt;
/pre
/blockquote
p
@@ -141,8 +141,8 @@
/p
blockquote
pre
-lt;copy todir=togt;
- lt;fileset dir=srcgt;
+lt;copy todir=quot;toquot;gt;
+ lt;fileset dir=quot;srcquot;gt;
lt;javaselector/gt;
lt;/filesetgt;
lt;/copygt;
@@ -190,7 +190,7 @@
}
public void verifySettings() {
if (number lt; 0) {
- throw new BuildException(Number attribute should be set);
+ throw new BuildException(quot;Number attribute should be
setquot;);
}
}
public boolean isSelected(File baseDir, String filename, File file) {
@@ -212,13 +212,13 @@
/p
blockquote
pre
-lt;typedef name=numberselected
- classname=com.mydomain.MatchNumberSelectors/gt;
+lt;typedef name=quot;numberselectedquot;
+ classname=quot;com.mydomain.MatchNumberSelectorsquot;/gt;
...
-lt;fileset dir=${src.path}gt;
- lt;numberselected number=2gt;
- lt;contains text=script casesensitive=no/gt;
- lt;size value=4 units=Ki when=more/gt;
+lt;fileset dir=quot;${src.path}quot;gt;
+ lt;numberselected number=quot;2quot;gt;
+ lt;contains text=quot;scriptquot; casesensitive=quot;noquot;/gt;
+ lt;size value=quot;4quot; units=quot;Kiquot;
when=quot;morequot;/gt;
lt;javaselector/gt;
lt;/numberselectedgt;
lt;/filesetgt;
@@ -229,7 +229,7 @@
/p
p
The custom selector was the pre ant 1.6 way of defining custom selectors.
- This method is still supported for backward compatiblity.
+ This method is still supported for backward compatibility.
/p
pYou can write your own selectors and use them within the selector
containers by specifying them within the lt;customgt; tag./p
@@ -386,7 +386,7 @@
private void lineNumber = 0;
public String filter(String string) {
lineNumber++;
- return + lineNumber + \t + string;
+ return quot;quot; + lineNumber + quot;\tquot; + string;
}
}
/pre
[PATCH] style patches
Fixes stuff like if( to if (, spaces between = and other corrections.
-- Larry
Index:
src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java,v
retrieving revision 1.8
diff -u -r1.8 AbstractHotDeploymentTool.java
---
src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java
19 Jul 2003 08:11:04 - 1.8
+++
src/main/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.java
19 Sep 2003 21:15:52 -
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -101,9 +101,9 @@
* @return A Path object representing the classpath to be used.
*/
public Path createClasspath() {
-if (classpath == null)
+if (classpath == null) {
classpath = new Path(task.getProject());
-
+}
return classpath.createPath();
}
@@ -126,14 +126,17 @@
* @exception org.apache.tools.ant.BuildException if the attributes are
invalid or incomplete.
*/
public void validateAttributes() throws BuildException {
-if (task.getAction() == null)
+if (task.getAction() == null) {
throw new BuildException(The \action\ attribute must be set);
+}
-if (!isActionValid())
+if (!isActionValid()) {
throw new BuildException(Invalid action \ + task.getAction() +
\ passed);
+}
-if (classpath == null)
+if (classpath == null) {
throw new BuildException(The classpath attribute must be set);
+}
}
/**
Index:
src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java,v
retrieving revision 1.5
diff -u -r1.5 AntResolver.java
---
src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java
19 Jul 2003 08:11:04 - 1.5
+++
src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java
19 Sep 2003 21:22:05 -
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -99,8 +99,7 @@
final File dir =
m_antfile.getParentFile().getCanonicalFile();
ant.setDir(dir);
-}
-catch (final IOException ioe) {
+} catch (final IOException ioe) {
throw new BuildException(ioe.getMessage(), ioe);
}
Index: src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java,v
retrieving revision 1.11
diff -u -r1.11 ApacheCatalogResolver.java
--- src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
19 Jul 2003 11:20:22 - 1.11
+++ src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
19 Sep 2003 21:23:52 -
@@ -145,11 +145,9 @@
try {
catalog.parseCatalog(file);
-}
-catch (MalformedURLException ex) {
+} catch (MalformedURLException ex) {
throw new BuildException(ex);
-}
-catch (IOException ex) {
+} catch (IOException ex) {
throw new BuildException(ex);
}
}
Index: src/main/org/apache/tools/ant/types/Assertions.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/types/Assertions.java,v
retrieving revision 1.5
diff -u -r1.5 Assertions.java
--- src/main/org/apache/tools/ant/types/Assertions.java 1 Aug 2003 06:44:35
- 1.5
+++ src/main/org/apache/tools/ant/types/Assertions.java 19 Sep 2003 21:33:31
-
@@ -187,7 +187,7 @@
* @return
*/
private int getFinalSize() {
-return assertionList.size()+ (enableSystemAssertions!=null?1:0);
+return assertionList.size() + (enableSystemAssertions != null ? 1 : 0);
}
/**
@@ -254,16 +254,16 @@
* @throws CloneNotSupportedException
*/
protected Object clone() throws CloneNotSupportedException {
-Assertions that=(Assertions) super.clone();
-
RE: [patch] more typos!
Actually, I ran a spell check. ;) I should just submit the big patch, but it's like 8,000 lines long, and this way, people can over look my changes, and make sure I don't delete a double at when it should be there (or reworded), or misspell xerces as xerxes. I have a few other areas I'm working on that I need to submit too. Mostly all with either the javadoc or regular docs. People always complain about the lack of, or the sub par documentation open source products have. I like to try to fix that where I can. -- Larry -Original Message- From: Steve Loughran To: Ant Developers List Sent: 9/18/2003 9:15 PM Subject: Re: [patch] more typos! Shatzer, Larry wrote: Next round of typos... -- Larry Larry, I am most impressed. Are you really reading *all* the javadocs and correcting their typos. Wow - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: AW: Probably a FAQ: how to contribute a task
-Original Message- From: Miguel Griffa [mailto:[EMAIL PROTECTED] Sent: Thursday, September 18, 2003 10:02 AM To: Ant Developers List Subject: Re: AW: Probably a FAQ: how to contribute a task The task would do a very simple still needed (in my company context, at least) function: replace a file or fileset with properties defined in the current run of ant. Have you looked at replace, filter or filtersets? http://ant.apache.org/manual/CoreTasks/filter.html http://ant.apache.org/manual/CoreTypes/filterset.html http://ant.apache.org/manual/CoreTasks/replace.html -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[patch] more typos!
Next round of typos...
-- Larry
Index:
src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java,v
retrieving revision 1.10
diff -u -r1.10 DirectoryIterator.java
---
src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
19 Jul 2003 08:11:03 - 1.10
+++
src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
18 Sep 2003 20:42:53 -
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -154,7 +154,7 @@
* stack and a new iterator is created for the subdirectory. If the
* entry is a file, it is returned as the next element and the iterator
* remains valid. If there are no more entries in the current directory,
- * the topmost iterator on the statck is popped off to become the
+ * the topmost iterator on the stack is popped off to become the
* current iterator.
*
* @return the next ClassFile in the iteration.
Index:
src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java,v
retrieving revision 1.10
diff -u -r1.10 JarFileIterator.java
--- src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
22 Apr 2003 07:35:15 - 1.10
+++ src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
18 Sep 2003 20:42:53 -
@@ -69,10 +69,10 @@
private ZipInputStream jarStream;
/**
- * Construct a iterartor over a jar stream
+ * Construct a iterator over a jar stream
*
- * @param stream the basic input stream from which the Jar is recived
- * @exception IOException if the jar stream connot be created
+ * @param stream the basic input stream from which the Jar is received
+ * @exception IOException if the jar stream cannot be created
*/
public JarFileIterator(InputStream stream) throws IOException {
super();
Index:
src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java,v
retrieving revision 1.9
diff -u -r1.9 ConstantPool.java
---
src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
19 Jul 2003 08:11:03 - 1.9
+++
src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
18 Sep 2003 20:42:53 -
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -250,7 +250,7 @@
* @param methodClassName the name of the class which contains the
* method being referenced.
* @param methodName the name of the method being referenced.
- * @param methodType the type descriptor of the metho dbeing referenced.
+ * @param methodType the type descriptor of the method being referenced.
* @return the index at which the given method ref entry occurs in the
* constant pool or -1 if the value does not occur.
*/
@@ -282,7 +282,7 @@
* @param interfaceMethodClassName the name of the interface which
* contains the method being referenced.
* @param interfaceMethodName the name of the method being referenced.
- * @param interfaceMethodType the type descriptor of the metho dbeing
+ * @param interfaceMethodType the type descriptor of the method being
* referenced.
* @return the index at which the given method ref entry occurs in the
* constant pool or -1 if the value does not occur.
Index:
src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java,v
retrieving revision 1.9
diff -u -r1.9 ConstantPoolEntry.java
---
src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
5 Jul 2003 14:34:12 - 1.9
+++
src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
RE: [NOT PATCH] Possible new optional task for file modification
Unfortunately your attachment was stripped. -- Larry -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 16, 2003 5:42 AM To: [EMAIL PROTECTED] Subject: [NOT PATCH] Possible new optional task for file modification (Sorry if this doesn't follow the standard patch way of doing things. I'm new to this Open Source experience!) Please find attached a submission for consideration as an additional optional Ant (1.5.x+) task. The Javadoc describes what it does, but as a summary: The task allows a (common) file to be updated with (multiple) content fragments where the fragments should be inserted at one or more tagged locations within the file. This is handy, for example, when adding sub-system specific configuration information into an application-wide configuration file formatted (for example) as an XML or properties file. I can supply my example Ant/test files if you'd like. In addition, I can supply a JUnit test case if you think it's worth having as a new optional task. - Email provided by http://www.ntlhome.com/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Next round of typo fixes
Thanks, here is the next set.
src/main/org/apache/tools/ant/util/UnPackageNameMapper.java still has messed
up line endings.
-- Larry
-Original Message-
From: peter reilly [mailto:[EMAIL PROTECTED]
Sent: Tuesday, September 16, 2003 2:11 AM
To: Ant Developers List
Subject: Re: [PATCH] Next round of typo fixes
Committed,
Peter.
Index: src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java,v
retrieving revision 1.11
diff -u -r1.11 FilesMatch.java
--- src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java6 Jul
2003 09:03:17 - 1.11
+++ src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java16 Sep
2003 18:03:25 -
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
/**
* Compares two files for bitwise equality based on size and
- * content. Timestamps are not looked at at all.
+ * content. Timestamps are not looked at all.
*
* @author Steve Loughran
* @version $Revision: 1.11 $
@@ -99,7 +99,7 @@
}
/**
- * comparision method of the interface
+ * comparison method of the interface
*
* @return true if the files are equal
* @exception BuildException if it all went pear-shaped
Index: src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java,v
retrieving revision 1.21
diff -u -r1.21 ChangeLogParser.java
--- src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java 14 Aug
2003 07:04:40 - 1.21
+++ src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java 16 Sep
2003 18:03:25 -
@@ -97,9 +97,9 @@
private final Hashtable m_entries = new Hashtable();
/**
- * Get a list of rcs entrys as an array.
+ * Get a list of rcs entries as an array.
*
- * @return a list of rcs entrys as an array
+ * @return a list of rcs entries as an array
*/
CVSEntry[] getEntrySetAsArray() {
final CVSEntry[] array = new CVSEntry[ m_entries.size() ];
Index: src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java,v
retrieving revision 1.24
diff -u -r1.24 ChangeLogTask.java
--- src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java25 Jul
2003 12:14:42 - 1.24
+++ src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java16 Sep
2003 18:03:25 -
@@ -117,14 +117,14 @@
/** Output file */
private File m_destfile;
-/** The earliest date at which to start processing entrys. */
+/** The earliest date at which to start processing entries. */
private Date m_start;
-/** The latest date at which to stop processing entrys. */
+/** The latest date at which to stop processing entries. */
private Date m_stop;
/**
- * Filesets containting list of files against which the cvs log will be
+ * Filesets containing list of files against which the cvs log will be
* performed. If empty then all files will in the working directory will
* be checked.
*/
@@ -359,7 +359,7 @@
}
/**
- * Filter the specified entrys accoridn to an appropriate rule.
+ * Filter the specified entries according to an appropriate rule.
*
* @param entrySet the entry set to filter
* @return the filtered entry set
@@ -406,7 +406,7 @@
* Print changelog to file specified in task.
*
* @param entrySet the entry set to write.
- * @throws BuildException if theres an error writing changelog.
+ * @throws BuildException if there is an error writing changelog.
*/
private void writeChangeLog(final CVSEntry[] entrySet)
throws BuildException {
Index: src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java,v
retrieving revision 1.9
diff -u -r1.9 ChangeLogWriter.java
--- src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java 19 Jul
2003 08:11:02 - 1.9
+++ src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java 16 Sep
2003 18:03:25 -
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software
RE: [PATCH] Next round of typo fixes
Ooops. Thanks. I usually read the sentence for double words twice to make
sure it made sense, this must have slipped past me.
I think the sentence might be changed to: Timestamps are not at all looked
at. to avoid the double word.
New patch to supercede previous patch with this change to correct.
-- Larry
-Original Message-
From: Martijn Kruithof [mailto:[EMAIL PROTECTED]
Sent: Tuesday, September 16, 2003 1:23 PM
To: Ant Developers List
Subject: Re: [PATCH] Next round of typo fixes
Hi,
nice work, though this set seems to contain a wrong
correction (prefixed
with )
Kind Regards, Martijn
Index: src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java,v
retrieving revision 1.11
diff -u -r1.11 FilesMatch.java
--- src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java6 Jul
2003 09:03:17 - 1.11
+++ src/main/org/apache/tools/ant/taskdefs/condition/FilesMatch.java16 Sep
2003 20:43:17 -
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
/**
* Compares two files for bitwise equality based on size and
- * content. Timestamps are not looked at at all.
+ * content. Timestamps are not at all looked at.
*
* @author Steve Loughran
* @version $Revision: 1.11 $
@@ -99,7 +99,7 @@
}
/**
- * comparision method of the interface
+ * comparison method of the interface
*
* @return true if the files are equal
* @exception BuildException if it all went pear-shaped
Index: src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java,v
retrieving revision 1.21
diff -u -r1.21 ChangeLogParser.java
--- src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java 14 Aug
2003 07:04:40 - 1.21
+++ src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java 16 Sep
2003 18:03:25 -
@@ -97,9 +97,9 @@
private final Hashtable m_entries = new Hashtable();
/**
- * Get a list of rcs entrys as an array.
+ * Get a list of rcs entries as an array.
*
- * @return a list of rcs entrys as an array
+ * @return a list of rcs entries as an array
*/
CVSEntry[] getEntrySetAsArray() {
final CVSEntry[] array = new CVSEntry[ m_entries.size() ];
Index: src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java,v
retrieving revision 1.24
diff -u -r1.24 ChangeLogTask.java
--- src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java25 Jul
2003 12:14:42 - 1.24
+++ src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java16 Sep
2003 18:03:25 -
@@ -117,14 +117,14 @@
/** Output file */
private File m_destfile;
-/** The earliest date at which to start processing entrys. */
+/** The earliest date at which to start processing entries. */
private Date m_start;
-/** The latest date at which to stop processing entrys. */
+/** The latest date at which to stop processing entries. */
private Date m_stop;
/**
- * Filesets containting list of files against which the cvs log will be
+ * Filesets containing list of files against which the cvs log will be
* performed. If empty then all files will in the working directory will
* be checked.
*/
@@ -359,7 +359,7 @@
}
/**
- * Filter the specified entrys accoridn to an appropriate rule.
+ * Filter the specified entries according to an appropriate rule.
*
* @param entrySet the entry set to filter
* @return the filtered entry set
@@ -406,7 +406,7 @@
* Print changelog to file specified in task.
*
* @param entrySet the entry set to write.
- * @throws BuildException if theres an error writing changelog.
+ * @throws BuildException if there is an error writing changelog.
*/
private void writeChangeLog(final CVSEntry[] entrySet)
throws BuildException {
Index: src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java,v
retrieving revision 1.9
diff -u -r1.9 ChangeLogWriter.java
---
RE: [PATCH] More typos
-Original Message-
From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED]
Sent: Saturday, September 13, 2003 5:58 AM
To: Ant Developers List
Subject: AW: [PATCH] More typos
Patches committed, thanks.
Antoine
Found another line ending one:
src/main/org/apache/tools/ant/util/UnPackageNameMapper.java
Also attached, my next set of typo corrections.
-- Larry
Index: src/main/org/apache/tools/ant/DirectoryScanner.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.63
diff -u -r1.63 DirectoryScanner.java
--- src/main/org/apache/tools/ant/DirectoryScanner.java 21 Aug 2003 16:56:12
- 1.63
+++ src/main/org/apache/tools/ant/DirectoryScanner.java 12 Sep 2003 21:32:19
-
@@ -877,7 +877,7 @@
}
} catch (IOException ioe) {
String msg = IOException caught while checking
-+ for links, couldn't get cannonical path!;
++ for links, couldn't get canonical path!;
// will be caught and redirected to Ant's logging system
System.err.println(msg);
noLinks.addElement(newfiles[i]);
@@ -1108,7 +1108,7 @@
* performing a slow scan if one has not already been completed.
*
* @return the names of the files which matched at least one of the
- * include patterns and at at least one of the exclude patterns.
+ * include patterns and at least one of the exclude patterns.
*
* @see #slowScan
*/
@@ -1385,7 +1385,7 @@
}
} catch (IOException ioe) {
String msg = IOException caught while checking
-+ for links, couldn't get cannonical path!;
++ for links, couldn't get canonical path!;
// will be caught and redirected to Ant's logging system
System.err.println(msg);
return false;
@@ -1402,8 +1402,8 @@
private Set scannedDirs = new HashSet();
/**
- * Has the directorty with the given path relative to the base
- * directory allready been scanned?
+ * Has the directory with the given path relative to the base
+ * directory already been scanned?
*
* pRegisters the given directory as scanned as a side effect./p
*
Index: src/main/org/apache/tools/ant/FileScanner.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/FileScanner.java,v
retrieving revision 1.12
diff -u -r1.12 FileScanner.java
--- src/main/org/apache/tools/ant/FileScanner.java 6 Jul 2003 09:57:34
- 1.12
+++ src/main/org/apache/tools/ant/FileScanner.java 12 Sep 2003 21:32:19
-
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -91,7 +91,7 @@
* The names are relative to the base directory.
*
* @return the names of the files which matched at least one of the
- * include patterns and at at least one of the exclude patterns.
+ * include patterns and at least one of the exclude patterns.
*
*/
String[] getExcludedFiles();
Index: src/main/org/apache/tools/ant/IntrospectionHelper.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.64
diff -u -r1.64 IntrospectionHelper.java
--- src/main/org/apache/tools/ant/IntrospectionHelper.java 24 Jul 2003
14:20:31 - 1.64
+++ src/main/org/apache/tools/ant/IntrospectionHelper.java 12 Sep 2003
21:32:20 -
@@ -146,7 +146,7 @@
// distinction between addConfigured and add. It's obvious what the
// code *here* does (addConfigured sets both a creator method which
// calls a no-arg constructor and a storer method which calls the
-// method we're looking at, whlie add just sets a creator method
+// method we're looking at, while add just sets a creator method
// which calls the method we're looking at) but it's not at all
// obvious what the difference in actual *effect* will be later
// on. I can't see any mention of addConfiguredXXX in Developing
@@ -1071,7 +1071,7 @@
if (polyType != null) {
if (!nestedCreator.isPolyMorphic()) {
throw new BuildException(
-Not allowed to use the polymorhic form
+Not allowed to use the polymorphic form
+ for this element);
}
RE: [PATCH] More typos
My bad, the patch was my last one... here is the new one.
-- Larry
-Original Message-
From: Shatzer, Larry [mailto:[EMAIL PROTECTED]
Sent: Monday, September 15, 2003 8:37 AM
To: 'Ant Developers List'
Subject: RE: [PATCH] More typos
Also attached, my next set of typo corrections.
Index: src/main/org/apache/tools/ant/taskdefs/MacroDef.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
retrieving revision 1.5
diff -u -r1.5 MacroDef.java
--- src/main/org/apache/tools/ant/taskdefs/MacroDef.java22 Aug 2003
15:25:44 - 1.5
+++ src/main/org/apache/tools/ant/taskdefs/MacroDef.java15 Sep 2003
15:28:09 -
@@ -126,7 +126,7 @@
}
/**
- * emExpermential/em
+ * emExperimental/em
* I am uncertain at the moment how to encode attributes
* using ant style ${attribute} or xpath style @attribute.
* The first may get mixed up with ant properties and
@@ -140,7 +140,7 @@
}
/**
- * emExpermential/em
+ * emExperimental/em
* @return the attribute style
*/
public int getAttributeStyle() {
@@ -511,7 +511,7 @@
}
/**
- * Similiar method for this definition
+ * Similar method for this definition
*
* @param other another definition
* @param project the current project
Index: src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java,v
retrieving revision 1.4
diff -u -r1.4 MacroInstance.java
--- src/main/org/apache/tools/ant/taskdefs/MacroInstance.java 15 Aug 2003
15:04:29 - 1.4
+++ src/main/org/apache/tools/ant/taskdefs/MacroInstance.java 15 Sep 2003
15:28:09 -
@@ -75,7 +75,7 @@
* The class to be placed in the ant type definition.
* It is given a pointer to the template definition,
* and makes a copy of the unknown element, substituting
- * the the parameter values in attributes and text.
+ * the parameter values in attributes and text.
* @author Peter Reilly
* @since Ant 1.6
*/
Index: src/main/org/apache/tools/ant/taskdefs/Manifest.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
retrieving revision 1.47
diff -u -r1.47 Manifest.java
--- src/main/org/apache/tools/ant/taskdefs/Manifest.java4 Sep 2003
11:58:02 - 1.47
+++ src/main/org/apache/tools/ant/taskdefs/Manifest.java15 Sep 2003
15:28:09 -
@@ -321,7 +321,7 @@
*
* @param writer the Writer to which the attribute is written
*
- * @throws IOException if the attribte value cannot be written
+ * @throws IOException if the attribute value cannot be written
*/
public void write(PrintWriter writer) throws IOException {
for (Enumeration e = getValues(); e.hasMoreElements();) {
@@ -335,7 +335,7 @@
* @param writer the Writer to which the attribute is written
* @param value the attribute value
*
- * @throws IOException if the attribte value cannot be written
+ * @throws IOException if the attribute value cannot be written
*/
private void writeValue(PrintWriter writer, String value)
throws IOException {
@@ -857,7 +857,7 @@
* @param other the Manifest to be merged with this one.
*
* @throws ManifestException if there is a problem merging the
- * manfest according to the Manifest spec.
+ * manifest according to the Manifest spec.
*/
public void merge(Manifest other) throws ManifestException {
merge(other, false);
@@ -871,7 +871,7 @@
*of the current manifest
*
* @throws ManifestException if there is a problem merging the
- * manfest according to the Manifest spec.
+ * manifest according to the Manifest spec.
*/
public void merge(Manifest other, boolean overwriteMain)
throws ManifestException {
Index: src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
retrieving revision 1.41
diff -u -r1.41 MatchingTask.java
--- src/main/org/apache/tools/ant/taskdefs/MatchingTask.java13 Sep 2003
16:35:52 - 1.41
+++ src/main/org/apache/tools/ant/taskdefs/MatchingTask.java15 Sep 2003
15:28:09 -
@@ -474,7 +474,7 @@
}
/**
- * Accessor for the implict fileset.
+ * Accessor for the implicit fileset.
*
* @since Ant 1.5.2
*/
Index: src/main/org/apache/tools/ant/taskdefs/Move.java
[PATCH] Next round of typo fixes
More typos and misspellings...
-- Larry
Index: src/main/org/apache/tools/ant/taskdefs/Copy.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
retrieving revision 1.65
diff -u -r1.65 Copy.java
--- src/main/org/apache/tools/ant/taskdefs/Copy.java13 Sep 2003 12:58:33
- 1.65
+++ src/main/org/apache/tools/ant/taskdefs/Copy.java15 Sep 2003 17:07:28
-
@@ -193,7 +193,7 @@
/**
* Give the copied files the same last modified time as the original files.
- * @param preserve if true preserve the modified time, default is false
+ * @param preserve if true perverse the modified time, default is false
*/
public void setPreserveLastModified(boolean preserve) {
preserveLastModified = preserve;
Index: src/main/org/apache/tools/ant/taskdefs/Filter.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Filter.java,v
retrieving revision 1.22
diff -u -r1.22 Filter.java
--- src/main/org/apache/tools/ant/taskdefs/Filter.java 10 Feb 2003 14:13:34
- 1.22
+++ src/main/org/apache/tools/ant/taskdefs/Filter.java 15 Sep 2003 17:07:28
-
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@
/**
* Sets a token filter that is used by the file copy tasks
- * to do token substitution. Sets mutiple tokens by
+ * to do token substitution. Sets multiple tokens by
* reading these from a file.
*
* @author Stefano Mazzocchi
Index: src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
retrieving revision 1.53
diff -u -r1.53 FixCRLF.java
--- src/main/org/apache/tools/ant/taskdefs/FixCRLF.java 22 Aug 2003 15:25:44
- 1.53
+++ src/main/org/apache/tools/ant/taskdefs/FixCRLF.java 15 Sep 2003 17:07:30
-
@@ -672,7 +672,7 @@
/**
- * Process a BufferLine string which is not part of of a string constant.
+ * Process a BufferLine string which is not part of a string constant.
* The start position of the string is given by the 'next' field.
* Sets the 'next' and 'column' fields in the BufferLine.
*
Index: src/main/org/apache/tools/ant/taskdefs/Get.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
retrieving revision 1.37
diff -u -r1.37 Get.java
--- src/main/org/apache/tools/ant/taskdefs/Get.java 24 Jul 2003 13:48:15
- 1.37
+++ src/main/org/apache/tools/ant/taskdefs/Get.java 15 Sep 2003 17:07:30
-
@@ -171,7 +171,7 @@
//not modified so no file download. just return
//instead and trace out something so the user
//doesn't think that the download happened when it
-//didnt
+//didn't
log(Not modified - so not downloaded);
return;
}
@@ -192,7 +192,7 @@
//REVISIT: at this point even non HTTP connections may
//support the if-modified-since behaviour -we just check
//the date of the content and skip the write if it is not
-//newer. Some protocols (FTP) dont include dates, of
+//newer. Some protocols (FTP) don't include dates, of
//course.
InputStream is = null;
Index: src/main/org/apache/tools/ant/taskdefs/Input.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Input.java,v
retrieving revision 1.22
diff -u -r1.22 Input.java
--- src/main/org/apache/tools/ant/taskdefs/Input.java 3 Sep 2003 16:47:17
- 1.22
+++ src/main/org/apache/tools/ant/taskdefs/Input.java 15 Sep 2003 17:07:31
-
@@ -92,7 +92,7 @@
/**
* Defines the name of a property to be created from input. Behaviour is
* according to property task which means that existing properties
- * cannot be overriden.
+ * cannot be overridden.
*
* @param addproperty Name for the property to be created from input
*/
Index: src/main/org/apache/tools/ant/taskdefs/Jar.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.80
diff -u -r1.80 Jar.java
--- src/main/org/apache/tools/ant/taskdefs/Jar.java 13 Aug 2003 14:46:15
- 1.80
+++
[PATCH] More typos
Even more typos/misspellings...
-- Larry
Index: src/main/org/apache/tools/ant/BuildException.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/BuildException.java,v
retrieving revision 1.18
diff -u -r1.18 BuildException.java
--- src/main/org/apache/tools/ant/BuildException.java 10 Feb 2003 14:13:29
- 1.18
+++ src/main/org/apache/tools/ant/BuildException.java 12 Sep 2003 15:08:05
-
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@
/** Exception that might have caused this one. */
private Throwable cause;
-/** Location in the build file where the exception occured */
+/** Location in the build file where the exception occurred */
private Location location = Location.UNKNOWN_LOCATION;
/**
Index: src/main/org/apache/tools/ant/ExitException.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/ExitException.java,v
retrieving revision 1.9
diff -u -r1.9 ExitException.java
--- src/main/org/apache/tools/ant/ExitException.java27 Aug 2003 14:23:16
- 1.9
+++ src/main/org/apache/tools/ant/ExitException.java12 Sep 2003 15:08:06
-
@@ -78,7 +78,7 @@
/**
* Constructs an exit exception.
- * @param msg the messge to be displayed.
+ * @param msg the message to be displayed.
* @param status the status code returned via System.exit()
*/
public ExitException(String msg, int status) {
Index: src/main/org/apache/tools/ant/Main.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/Main.java,v
retrieving revision 1.94
diff -u -r1.94 Main.java
--- src/main/org/apache/tools/ant/Main.java 12 Sep 2003 14:01:39 -
1.94
+++ src/main/org/apache/tools/ant/Main.java 12 Sep 2003 15:08:06 -
@@ -71,7 +71,7 @@
/**
* Command line entry point into Ant. This class is entered via the
- * cannonical `public static void main` entry point and reads the
+ * canonical `public static void main` entry point and reads the
* command line arguments. It then assembles and executes an Ant
* project.
* p
@@ -462,7 +462,7 @@
}
// make sure it's not a directory (this falls into the ultra
-// paranoid lets check everything catagory
+// paranoid lets check everything category
if (buildFile.isDirectory()) {
System.out.println(What? Buildfile: + buildFile + is a dir!);
@@ -540,7 +540,7 @@
* Search parent directories for the build file.
* p
* Takes the given target as a suffix to append to each
- * parent directory in seach of a build file. Once the
+ * parent directory in search of a build file. Once the
* root of the file-system has been reached an exception
* is thrown.
*
@@ -618,7 +618,7 @@
oldsm = System.getSecurityManager();
//SecurityManager can not be installed here for backwards
-//compatability reasons (PD). Needs to be loaded prior to
+//compatibility reasons (PD). Needs to be loaded prior to
//ant class if we are going to implement it.
//System.setSecurityManager(new NoExitSecurityManager());
}
Index: src/main/org/apache/tools/ant/Project.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.153
diff -u -r1.153 Project.java
--- src/main/org/apache/tools/ant/Project.java 4 Sep 2003 11:46:03 -
1.153
+++ src/main/org/apache/tools/ant/Project.java 12 Sep 2003 15:08:07 -
@@ -228,11 +228,11 @@
/**
* Set the default System input stream. Normally this stream is set to
- * System.in. This inputStream is used when no task inptu redirection is
+ * System.in. This inputStream is used when no task input redirection is
* being performed.
*
* @param defaultInputStream the default input stream to use when input
- *is reuested.
+ *is requested.
* @since Ant 1.6
*/
public void setDefaultInputStream(InputStream defaultInputStream) {
@@ -242,7 +242,7 @@
/**
* Get this project's input stream
*
- * @return the InputStream instance in use by this Porject instance to
+ * @return the InputStream instance in use by this Project instance to
* read input
*/
public InputStream getDefaultInputStream() {
@@ -332,7 +332,7 @@
* Factory method to create a class loader
RE: [PATCH] More typos
-Original Message- From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED] Sent: Friday, September 12, 2003 1:57 PM To: Ant Developers List Subject: AW: [PATCH] More typos Patches submitted, thanks Just one thing did I cut out : the library for parsing xml is called xerces, not Xerxes like the Persian emperor. (for these interested in history more than computing, have a look at http://www.herodotuswebsite.co.uk/xerxes.htm) Cheers, Antoine Ooops! My bad. I hit the wrong button. Also, it's spirent.com not servent.com (your commit message) ;) -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] More typos
That's no biggie, but you can apply my next patch of typo fixes. :)
I figure I'll break up my big patch piece by piece to make it easier for you
to double check my work, and catch silly mistakes like xerces vs xerxes. ;)
Unless you would rather have it all, I can provide it. (Without this 481
line patch, it would be 8683 lines, of course some of those lines address my
next question, about line endings)
Another side note, nothing was said about my comment about line endings
being broken for some files on windows: (showing up as unix for ascii files)
src/testcases/org/apache/tools/ant/util/UnPackageNameMapperTest.java
src/main/org/apache/tools/ant/util/TimeoutObserver.java
src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
docs/manual/CoreTypes/zipfileset.html
docs/manual/OptionalTasks/jjdoc.html
docs/manual/OptionalTasks/rexec.html
-- Larry
-Original Message-
From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED]
Sent: Friday, September 12, 2003 2:11 PM
To: Ant Developers List
Subject: AW: [PATCH] More typos
Sorry for the error in the commit message. I am afraid I
cannot fix it.
Antoine
Index: src/main/org/apache/tools/ant/DirectoryScanner.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.63
diff -u -r1.63 DirectoryScanner.java
--- src/main/org/apache/tools/ant/DirectoryScanner.java 21 Aug 2003 16:56:12
- 1.63
+++ src/main/org/apache/tools/ant/DirectoryScanner.java 12 Sep 2003 21:32:19
-
@@ -877,7 +877,7 @@
}
} catch (IOException ioe) {
String msg = IOException caught while checking
-+ for links, couldn't get cannonical path!;
++ for links, couldn't get canonical path!;
// will be caught and redirected to Ant's logging system
System.err.println(msg);
noLinks.addElement(newfiles[i]);
@@ -1108,7 +1108,7 @@
* performing a slow scan if one has not already been completed.
*
* @return the names of the files which matched at least one of the
- * include patterns and at at least one of the exclude patterns.
+ * include patterns and at least one of the exclude patterns.
*
* @see #slowScan
*/
@@ -1385,7 +1385,7 @@
}
} catch (IOException ioe) {
String msg = IOException caught while checking
-+ for links, couldn't get cannonical path!;
++ for links, couldn't get canonical path!;
// will be caught and redirected to Ant's logging system
System.err.println(msg);
return false;
@@ -1402,8 +1402,8 @@
private Set scannedDirs = new HashSet();
/**
- * Has the directorty with the given path relative to the base
- * directory allready been scanned?
+ * Has the directory with the given path relative to the base
+ * directory already been scanned?
*
* pRegisters the given directory as scanned as a side effect./p
*
Index: src/main/org/apache/tools/ant/FileScanner.java
===
RCS file: /home/cvspublic/ant/src/main/org/apache/tools/ant/FileScanner.java,v
retrieving revision 1.12
diff -u -r1.12 FileScanner.java
--- src/main/org/apache/tools/ant/FileScanner.java 6 Jul 2003 09:57:34
- 1.12
+++ src/main/org/apache/tools/ant/FileScanner.java 12 Sep 2003 21:32:19
-
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -91,7 +91,7 @@
* The names are relative to the base directory.
*
* @return the names of the files which matched at least one of the
- * include patterns and at at least one of the exclude patterns.
+ * include patterns and at least one of the exclude patterns.
*
*/
String[] getExcludedFiles();
Index: src/main/org/apache/tools/ant/IntrospectionHelper.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.64
diff -u -r1.64 IntrospectionHelper.java
--- src/main/org/apache/tools/ant/IntrospectionHelper.java 24 Jul 2003
14:20:31 - 1.64
+++ src/main/org/apache/tools/ant/IntrospectionHelper.java 12 Sep 2003
21:32:20 -
@@ -146,7 +146,7 @@
// distinction between addConfigured and add. It's obvious what the
// code *here* does
[patch] it's ant-antidote, not jakarta-ant-antidote
This patch fixes the WHAT-IS-THIS-P file that tells where ant-antidote is located at. Index: src/antidote/WHAT-IS-THIS-P === RCS file: /home/cvspublic/ant/src/antidote/WHAT-IS-THIS-P,v retrieving revision 1.1 diff -u -r1.1 WHAT-IS-THIS-P --- src/antidote/WHAT-IS-THIS-P 17 Apr 2001 00:31:46 - 1.1 +++ src/antidote/WHAT-IS-THIS-P 11 Sep 2003 20:09:53 - @@ -1,5 +1,5 @@ This /used/ to be the home of Antidote, the GUI for Ant. It has moved -(or rather, graduate) to the cvs module jakarta-ant-antidote, and must +(or rather, graduate) to the cvs module ant-antidote, and must be retrieved separately from Ant, but can be found in the same place you found source version of Ant. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[PATCH] More typos
Correction for more typos/misspellings.
-- Larry
Index: src/main/org/apache/tools/ant/AntClassLoader.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.75
diff -u -r1.75 AntClassLoader.java
--- src/main/org/apache/tools/ant/AntClassLoader.java 12 Aug 2003 15:15:06
- 1.75
+++ src/main/org/apache/tools/ant/AntClassLoader.java 8 Sep 2003 23:44:56
-
@@ -73,7 +73,7 @@
import org.apache.tools.ant.util.LoaderUtils;
/**
- * Used to load classes within ant with a different claspath from
+ * Used to load classes within ant with a different classpath from
* that used to start ant. Note that it is possible to force a class
* into this loader even when that class is on the system classpath by
* using the forceLoadClass method. Any subsequent classes loaded by that
@@ -372,7 +372,7 @@
* Set the classpath to search for classes to load. This should not be
* changed once the classloader starts to server classes
*
- * @param classpath the serahc classpath consisting of directories and
+ * @param classpath the search classpath consisting of directories and
*jar/zip files.
*/
public void setClassPath(Path classpath) {
@@ -637,7 +637,7 @@
* loader.
*
* This ensures that instances of the returned class will be compatible
- * with instances which which have already been loaded on the parent
+ * with instances which have already been loaded on the parent
* loader.
*
* @param classname The name of the class to be loaded.
@@ -1200,7 +1200,7 @@
* Finds a system class (which should be loaded from the same classloader
* as the Ant core).
*
- * For JDK 1.1 compatability, this uses the findSystemClass method if
+ * For JDK 1.1 compatibility, this uses the findSystemClass method if
* no parent classloader has been specified.
*
* @param name The name of the class to be loaded.
Index: src/main/org/apache/tools/ant/AntTypeDefinition.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/AntTypeDefinition.java,v
retrieving revision 1.6
diff -u -r1.6 AntTypeDefinition.java
--- src/main/org/apache/tools/ant/AntTypeDefinition.java15 Aug 2003
15:04:29 - 1.6
+++ src/main/org/apache/tools/ant/AntTypeDefinition.java8 Sep 2003
23:44:56 -
@@ -83,7 +83,7 @@
/**
* return the definition's name
- * @return the name of the defintion
+ * @return the name of the definition
*/
public String getName() {
return name;
@@ -162,7 +162,7 @@
/**
* get the exposed class for this
* definition. This will be a proxy class
- * (adapted class) if there is an adpater
+ * (adapted class) if there is an adapter
* class and the definition class is not
* assignable from the assignable class.
* @param project the current project
@@ -289,7 +289,7 @@
}
/**
- * get the constructor of the defintion
+ * get the constructor of the definition
* and invoke it.
*/
private Object createAndSet(Project project, Class c) {
Index: src/main/org/apache/tools/ant/ComponentHelper.java
===
RCS file:
/home/cvspublic/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.26
diff -u -r1.26 ComponentHelper.java
--- src/main/org/apache/tools/ant/ComponentHelper.java 1 Sep 2003 14:15:30
- 1.26
+++ src/main/org/apache/tools/ant/ComponentHelper.java 8 Sep 2003 23:44:57
-
@@ -80,9 +80,9 @@
* for backward compatibly.
* Project will just delegate its calls to this class.
*
- * A very simple hook mechnism is provided that allows users to plug
+ * A very simple hook mechanism is provided that allows users to plug
* in custom code. It is also possible to replace the default behavior
- * ( for example in an app embeding ant )
+ * ( for example in an app embedding ant )
*
* @author Costin Manolache
* @author Peter Reilly
@@ -90,7 +90,7 @@
* @since Ant1.6
*/
public class ComponentHelper {
-/** Map from compoennt name to anttypedefinition */
+/** Map from component name to anttypedefinition */
private AntTypeTable antTypeTable;
/** Map of tasks generated from antTypeTable */
@@ -180,7 +180,7 @@
/**
* Used with creating child projects. Each child
- * project inherites the component definitions
+ * project inherits the component definitions
* from its parent.
* @param helper the component helper of the parent project
*/
@@ -204,7 +204,7 @@
* @param componentType The component type,
* Also available as ue.getComponentName()
* @return the created component
- * @throws
RE: [PATCH] More typos
Also: src/testcases/org/apache/tools/ant/util/UnPackageNameMapperTest.java src/main/org/apache/tools/ant/util/TimeoutObserver.java src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java docs/manual/CoreTypes/zipfileset.html docs/manual/OptionalTasks/jjdoc.html docs/manual/OptionalTasks/rexec.html have messed up line endings, at least on windows. -- Larry -Original Message- From: peter reilly [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 09, 2003 10:01 AM To: Ant Developers List Subject: Re: [PATCH] More typos Applied - Thanks, Peter On Tuesday 09 September 2003 17:33, Shatzer, Larry wrote: Correction for more typos/misspellings. -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[PATCH] use of apos; vs. '
apos; shows up as apos; in IE (and many other browsers). Since apos; is not a valid entity for HTML. (It is for XML though). -- Larry Index: docs/manual/OptionalTasks/junit.html === RCS file: /home/cvspublic/ant/docs/manual/OptionalTasks/junit.html,v retrieving revision 1.29 diff -u -r1.29 junit.html --- docs/manual/OptionalTasks/junit.html27 Aug 2003 14:23:16 - 1.29 +++ docs/manual/OptionalTasks/junit.html9 Sep 2003 19:04:13 - @@ -97,7 +97,7 @@ /tr tr td valign=toptimeout/td -td valign=topCancel the individual tests if they donapos;t finish +td valign=topCancel the individual tests if they don't finish in the given time (measured in milliseconds). Ignored if codefork/code is disabled./td td align=center valign=topNo/td - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[SUBMIT] optional task propertyformatter
Optional Task Proposal propertyformatter
Bug#22889 (http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22889) got me
thinking about this. At first I knocked up a quick change to allow uppercase
and lowercase with a format attribute for property. Then I was thinking, a
better place for this is in it's own task. So I decided to write it as it's
own task. I used the Jakarta Commons Lang project for the StringUtils and
WordUtils, since it offered a few methods that I wanted. Such as swapcase,
without re-inventing the wheel.
I figure this is best left as a optional task, since it has the requirement
on Jakarta Commons Lang. I have not yet created any tests for this, yet, but
plan on it. I also plan on fleshing out the documentation more, to include
more examples. There are quite a few other methods that StringUtils and
WordUtils offer that I would like to include, but will take a bit more time
thinking out how I should implement them.
Currently this tasks implements the following formats: trim, strip,
deletewhitespace, chomp, chop, uppercase, lowercase, swapcase,
capitalize, uncapitalize, reverse, catitalizewords,
capipalizewordsfully, uncapitalizewords.
For a more detailed explanation for what each of these formats do, see the
documentation, and the Jakarta Commons Lang project for StringUtils and
WordUtils.
Just a note, I am not a Java programmer normally, so any hints to my code
will be appreciated. Since this all wrappers Jakarta Commons Lang stuff, all
the heavy lifted is done there. Also, I hope I got the dependency checking
right in build.xml.
All constructive criticism welcome.
-- Larry
? docs/manual/OptionalTasks/propertyformatter.html
? src/main/org/apache/tools/ant/taskdefs/optional/PropertyFormatter.java
Index: build.xml
===
RCS file: /home/cvspublic/ant/build.xml,v
retrieving revision 1.392
diff -u -r1.392 build.xml
--- build.xml 3 Sep 2003 10:01:29 - 1.392
+++ build.xml 5 Sep 2003 01:53:17 -
@@ -277,6 +277,10 @@
filename name=${optional.package}/net/TelnetTask*/
/or
/selector
+
+ selector id=needs.commons.lang
+filename name=${optional.package}/PropertyFormatter*/
+ /selector
selector id=needs.starteam
or
@@ -410,6 +414,9 @@
available property=commons.net.present
classname=org.apache.commons.net.ftp.FTPClient
classpathref=classpath/
+available property=commons.lang.present
+ classname=org.apache.commons.lang.StringUtils
+ classpathref=classpath/
available property=starteam.present
classname=com.starbase.util.Platform
classpathref=classpath/
@@ -630,6 +637,7 @@
unless=ejb.DDCreator.present/
selector refid=needs.weblogic.server unless=ejb.wls.present/
selector refid=needs.commons.net unless=commons.net.present/
+selector refid=needs.commons.lang
unless=commons.lang.present/
selector refid=needs.starteam unless=starteam.present/
selector refid=needs.vaj unless=vaj.present/
selector refid=needs.antlr unless=antlr.present/
@@ -805,6 +813,7 @@
selector refid=needs.weblogic.ddcreator/
selector refid=needs.weblogic.server/
selector refid=needs.commons.net/
+selector refid=needs.commons.lang/
selector refid=needs.starteam/
selector refid=needs.vaj/
selector refid=needs.antlr/
@@ -917,6 +926,12 @@
basedir=${build.classes}
manifest=${manifest.tmp}
selector refid=needs.commons.net/
+/jar
+
+jar destfile=${build.lib}/${optional.jars.prefix}-commons-lang.jar
+ basedir=${build.classes}
+ manifest=${manifest.tmp}
+ selector refid=needs.commons.lang/
/jar
jar destfile=${build.lib}/${optional.jars.prefix}-starteam.jar
Index: docs/manual/install.html
===
RCS file: /home/cvspublic/ant/docs/manual/install.html,v
retrieving revision 1.59
diff -u -r1.59 install.html
--- docs/manual/install.html3 Sep 2003 07:58:04 - 1.59
+++ docs/manual/install.html5 Sep 2003 01:53:18 -
@@ -399,6 +399,12 @@
target=_tophttp://jakarta.apache.org/commons/net/index.html/a/td
/tr
tr
+tdcommons-lang.jar/td
+tdpropertyformatter/td
+tda href=http://jakarta.apache.org/commons/lang.html;
+ target=_tophttp://jakarta.apache.org/commons/lang.html/a/td
+ /tr
+ tr
tdbcel.jar/td
tdclassfileset data type,
JavaClassHelper used by the ClassConstants filter reader and
Index: docs/manual/optionaltasklist.html
===
RCS file: /home/cvspublic/ant/docs/manual/optionaltasklist.html,v
retrieving revision 1.39
diff -u -r1.39 optionaltasklist.html
---
RE: [SUBMIT] optional task propertyformatter
Apparently the patch.tar.gz was stripped off... I'll attach them tommrow somehow when I am back at work. -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: antcall and build.xml being modified.
-Original Message- From: Stefan Bodewig [mailto:[EMAIL PROTECTED] Sent: Thursday, September 04, 2003 12:32 AM To: [EMAIL PROTECTED] Subject: Re: antcall and build.xml being modified. On Wed, 3 Sep 2003, Larry Shatzer [EMAIL PROTECTED] wrote: When it is run the output is as follows: As long as you are not using an OS like Windows that locks your build file while Ant is running. This was on windows. Is Ant supposed to lock the build file at runtime on windows? -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: antcall and build.xml being modified.
-Original Message- From: Conor MacNeill [mailto:[EMAIL PROTECTED] Sent: Thursday, September 04, 2003 2:45 AM To: Ant Developers List Subject: Re: antcall and build.xml being modified. Self-modifying builds are not a practice I would recommend. Let me clarify, the build script I posted was just to make it easier to show what was happening. I had a build running in the background, while working on a new change to allow something else, and saved the file, then the antcall happened, and the change I had made was invalid XML, so it made Ant die. But also, I agree, self modifying build files would be bad. -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: antcall and build.xml being modified.
-Original Message- From: Dominique Devienne [mailto:[EMAIL PROTECTED] Sent: Thursday, September 04, 2003 6:54 AM To: 'Ant Developers List' Subject: RE: antcall and build.xml being modified. I do agree about not locking Ant into forcing reparsing if the build file is changed, although it's simple enough to find out if the build file has really changed, and use the cache if not... I was thinking of having an attribute for antcall that would allow you to choose if you wanted to reparse or not. I'm planning on exploring the static on-the-fly self-modifying build file avenue myself... --DD Be sure to take a hardhat. :) -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
antcall and build.xml being modified.
Consider the following build file: ?xml version=1.0 encoding=UTF-8? project name=test default=test target name=test antcall target=echotarget/ replace file = build.xml token = amp;lt;TEST MESSAGEamp;gt; value = amp;lt;test messageamp;gt; / antcall target=echotarget/ replace file = build.xml token = amp;lt;test messageamp;gt; value = amp;lt;TEST MESSAGEamp;gt; / antcall target=echotarget/ /target target name=echotarget echo message=lt;TEST MESSAGEgt;/ /target /project When it is run the output is as follows: Buildfile: build.xml test: echotarget: [echo] TEST MESSAGE echotarget: [echo] test message echotarget: [echo] TEST MESSAGE BUILD SUCCESSFUL Total time: 3 seconds I figured the output would have been this: echotarget: [echo] TEST MESSAGE echotarget: [echo] TEST MESSAGE echotarget: [echo] TEST MESSAGE Now granted, the condition of the build file be updated while the build is running would be rare. I can see some benefits of it doing this, like a call to a CVS update target, where the build file is updated, and then the targets contents could be executed with the new changes. If anything, I think this should be documented, since it is a gotcha. It got me while working on a build file, and saved it with a broken task while the build ran in the background and it failed. -- Larry - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
