RE: [PMC-VOTE] Ant 1.5.4
+1 [It is the PMC's responsibility to ensure that our releases are OK, so only PMC member votes are binding, that shouldn't stop anybody else from speking her/his mind.] Conor has created the 1.5.4 distribution, it can be found at http://cvs.apache.org/~bodewig/ant-1.5.4/. In addition I've diffed the source and binary releases of 1.5.3-1 against their corresponding files and the results are in that directory as well (*-dist.diff). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PMC-VOTE] Ant 1.5.4
At 09:09 AM 8/12/2003 +0200, Stefan Bodewig wrote: Please vote for/against these archives as the 1.5.4 release. Here's my +1 for starters. +1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Let's use archive.apache.org
On Tue, 12 Aug 2003 11:40 pm, Stefan Bodewig wrote: If this is accepted, I volunteer to update our ReleaseInstructions. +1 Having archiving of old release happen automatcially would be great. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [VOTE] Let's use archive.apache.org
+1 Jan -Original Message- From: Conor MacNeill [mailto:[EMAIL PROTECTED] Sent: Wednesday, August 13, 2003 1:38 AM To: Ant Developers List Subject: Re: [VOTE] Let's use archive.apache.org On Tue, 12 Aug 2003 11:40 pm, Stefan Bodewig wrote: If this is accepted, I volunteer to update our ReleaseInstructions. +1 Having archiving of old release happen automatcially would be great. Conor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22370] New: - enhance available to test for owner, group and permissions - security feature
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22370. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22370 enhance available to test for owner, group and permissions - security feature Summary: enhance available to test for owner, group and permissions - security feature Product: Ant Version: 1.5.3 Platform: All OS/Version: All Status: NEW Severity: Enhancement Priority: Other Component: Core tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] It would be great if the available tag could also be used to test for example that a .ssh directory is only readable by its owner, a private key in a https server installation is only readable by e.g. user apache or the webapps group including also tomcat and mysql etc., the corresponding certificate only writable by apache, that certain scripts (setuid, etc.) are owned by root, etc. or would you rather create an own task permissions for this? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 14277] - Could the unzip task fix file permissions?
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14277. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=14277 Could the unzip task fix file permissions? --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 05:53 --- see http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7780 and http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22370 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22370] - enhance available to test for owner, group and permissions - security feature
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22370. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22370 enhance available to test for owner, group and permissions - security feature --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 06:00 --- Since most of these properties are operating system specific, it would not be feasible to implement this in Java without some sort of external support. I'd prefer not to do that in available Since this is OS specific, why not do something using an OS specific script? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/xdocs antnews.xml bindownload.xml faq.xml index.xml srcdownload.xml
bodewig 2003/08/12 23:11:58 Modified:.WHATSNEW docs antnews.html bindownload.html faq.html index.html srcdownload.html xdocsantnews.xml bindownload.xml faq.xml index.xml srcdownload.xml Log: Announce 1.5.4 Revision ChangesPath 1.482 +40 -28ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.481 retrieving revision 1.482 diff -u -r1.481 -r1.482 --- WHATSNEW 5 Aug 2003 23:18:25 - 1.481 +++ WHATSNEW 13 Aug 2003 06:11:58 - 1.482 @@ -1,4 +1,4 @@ -Changes from Ant 1.5.3 to current CVS version +Changes from Ant 1.5.4 to current CVS version = Changes that could break older environments: @@ -30,10 +30,6 @@ of the older ORO Netcomponents version. See http://jakarta.apache.org/commons/net/index.html. -* If the Visual Age tasks used to work for you, they may stop doing so - now - and we'd like to know about it. The current set of tasks is - supposed to work with any version of VAJ starting with 3.0. - * input will no longer prompt the user and wait for input if the addproperty attribute is set to a property that has already been defined in the project. If you rely on the task waiting for input, @@ -153,18 +149,6 @@ * Setting filesonly to true in zip and related tasks would cause the archives to be always recreated. Bugzilla Report 19449. -* The Visual Age for Java tasks didn't work (at least for versions 3.0 - and higher). Bugzilla Report 10016. - -* VAJImport task failed with NullPointerException when using DirectoryScanner. - Bugzilla Report 22080. - -* URL-encoding in vaj*port didn't work properly. - -* VAJRemoteUtil called getAbsolutePath instead of getPath - causing problems when using a Windows VAJ server from a UNIX server. - Bugzilla Report 20457. - * file names that include spaces need to be quoted inside the @argfile argument using javadoc and JDK 1.4. Bugzilla Report 16871. @@ -244,8 +228,6 @@ * A new attribute named skip is added to the TailFilter and HeadFilter filter readers. -* Shipped XML parser is now Xerces 2.5.0 - * The filesetmanifest attribute of jar has been reenabled. * The start and end tokens for translate may now be longer than a @@ -390,8 +372,6 @@ * sql is able to display properly several resultsets if you are running a compound sql statement. Bugzilla Report 21594. -* javah will invoke oldjavah on JDK 1.4.2. Bugzilla Report 18667. - * A new containsregexp selector has been added, that selects files if their content matches a certain regular expression. @@ -420,13 +400,6 @@ control the automatic line-end conversion performed on ASCII files. Bugzilla Report 18884. -* The VAJ tasks now support a haltonfailure attribute to conditionally - keep building even if they fail. - -* It is now possible to use the latest (versioned or unversioned) edition - in vajload by using special wildcard characters. Also fixes - Bugzilla Report 2236. - * Users can now modify the list of default excludes using the new defaultexcludes task. Bugzilla Report 12700. @@ -563,6 +536,45 @@ * zip and friends have a new attribute keepcompression that can be used to incrementally build an archive mixing compressed and uncompressed entries. + +Changes from Ant 1.5.3 to Ant 1.5.4 +=== + +Changes that could break older environments: + + +* If the Visual Age tasks used to work for you, they may stop doing so + now - and we'd like to know about it. The current set of tasks is + supposed to work with any version of VAJ starting with 3.0. + +Fixed bugs: +--- + +* The Visual Age for Java tasks didn't work (at least for versions 3.0 + and higher). Bugzilla Report 10016. + +* URL-encoding in vaj*port didn't work properly. + +* VAJRemoteUtil called getAbsolutePath instead of getPath + causing problems when using a Windows VAJ server from a UNIX server. + Bugzilla Report 20457. + +* VAJImport task failed with NullPointerException when using DirectoryScanner. + Bugzilla Report 22080. + +Other changes: +-- + +* Shipped XML parser is now Xerces 2.5.0 + +* javah will invoke oldjavah on JDK 1.4.2. Bugzilla Report 18667. + +* The VAJ tasks now support a haltonfailure attribute to conditionally + keep building even if they fail. + +* It is now possible to use the latest (versioned or unversioned) edition + in vajload by using special wildcard characters. Also fixes + Bugzilla Report 2236. Changes from Ant
[ANN] Apache Ant 1.5.4 has been released
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Apache Ant 1.5.4 is a minor bugfix release that adresses problems in two domains: (1) With JDK 1.4.2 Sun has changed the entry point for javah, therefore Ant 1.5.3's javah task doesn't work on JDK 1.4.2 anymore. (2) The Visual Age for Java tasks had some major flaws. If you don't use Visual Age for Java or javah, there is no reason to upgrade from Ant 1.5.3. Note that Ant 1.5.4 is the last release that supports JDK 1.1 at runtime. The next major release of Ant, Ant 1.6, will require JDK 1.2 or later to run. Compiling for a 1.1 target JVM will still be possible with Ant 1.6. You can download Ant as binary distribution from http://ant.apache.org/bindownload.cgi or as source distribution from http://ant.apache.org/srcdownload.cgi. Thank you for using Ant. The Apache Ant Project http://ant.apache.org/ -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.0 (GNU/Linux) Comment: Processed by Mailcrypt 3.5.8 http://mailcrypt.sourceforge.net/ iD8DBQE/OdjeohFa4V9ri3IRAvN9AJ9peFM1ej1X1qCM1DUQHvSt8EjBYQCgs0Ws l1uCaq16vGio3h7hWIx3IT8= =8y7N -END PGP SIGNATURE- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant ReleaseInstructions
bodewig 2003/08/12 23:47:41 Modified:.ReleaseInstructions Log: Fix list names, two mails bounced for me Revision ChangesPath 1.13 +2 -2 ant/ReleaseInstructions Index: ReleaseInstructions === RCS file: /home/cvs/ant/ReleaseInstructions,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ReleaseInstructions 13 Dec 2002 09:45:03 - 1.12 +++ ReleaseInstructions 13 Aug 2003 06:47:41 - 1.13 @@ -168,8 +168,8 @@ Also identify the webpages to which the announcements must go. ]] Apache mailing lists that should get the announcements: -[EMAIL PROTECTED], [EMAIL PROTECTED], -[EMAIL PROTECTED], ant-dev and ant-user. +announcements@jakarta.apache.org, announcements@xml.apache.org, +[EMAIL PROTECTED], [EMAIL PROTECTED] and [EMAIL PROTECTED] Announce release at freshmeat.net (Stefan Bodewig is the owner of Ant's project entry - bug him ;-). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22370] - enhance available to test for owner, group and permissions - security feature
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22370. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22370 enhance available to test for owner, group and permissions - security feature --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 07:02 --- isn't your argument about scripts not the best reason to do it in ant: Otherwise, everybody all over the world - with or without adequate scripting skills - is forced to piece together a hand-knit kind-of-working script. If it is done here - i) people can remain in the world they are familiar with (Java/Ant), ii) it undergoes due community review, and iii) since Java is aware of the os and arch, delicate intricacies can be caught while one might otherwise copy an inadequate example script from a ill-specified google search? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Let's use archive.apache.org
+1 Cheers, Antoine PS : congrats too for ant 1.5.4 - Original Message - From: Stefan Bodewig [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Tuesday, August 12, 2003 3:40 PM Subject: [VOTE] Let's use archive.apache.org Hi, as some of you may know, there is a new virtual host called archive.apache.org that is supposed to be the source for software archeologists, much as our ant.apache.org/old-releases folder is now. archive.apache.org is setup to rsync from www.apache.org/dist without ever deleting anything, this means all new releases will end up there eventually at one point in time. I've gone ahead and copied over the contents of our old-releases folder to this box and want to propose that we start using it instead of /old-releases from now on. The benefits I see: * It is on cvs.apache.org, every committer has access to it. * You don't need to copy files around after a release, just remove the non-zips. * At a point in time, mirrors may want to pick up archive.apache.org as well - so we'd benefit from mirroring even for our old releases. * we'd remove downloads and not (CVS-)controlled content from our website. If this is accepted, I volunteer to update our ReleaseInstructions. Stefan BTW, I found that the source distribution of Ant 1.2 doesn't have a signature - the binary distribution is signed. Does anybody have an old copy of the ZIP archive and can verify that the file on archive.apache.org (or /old-releases) is the file it claims to be? If so, please sign it (or let me do it). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE : Recursive properties resolution ?
-Message d'origine-
De : Steve Loughran [mailto:[EMAIL PROTECTED]
Envoyé : mardi 12 août 2003 18:37
À : Ant Developers List
Objet : Re: Recursive properties resolution ?
[snip/]
So if i keep multiple file (one per project/env couple), i
have multiple
and cross redundancy. And i have no way to define the env properties,
after the project properties and after project/env properties as they
are mixed and cross defined. (i tried without succes).
In this case I do not see what I can do to solve this
without recursive
properties resolution.
-have multiple properties files...one per deployment target, one per
project, one per local installation.
-use property expansion to decide which properties files to load
e.g. a system would have
system.properties:
deploy.target=chamonix
chamonix:properties
deploy.platform=jboss
deploy.process=ftp
[snip/]
property file=build.properties/
property enviroment=env /
property file=system.properties/
//loads chamonix.properties
property file=${deploy.target}.properties/
//then app server specific stuff
property file=${deploy.platform}.properties/
[snip/]
This gives you: dynamic configuration, and property file control. One
propfile/build file per app server platform, one per system with sys
config details, one per user with user options.
Hi Steve,
Thanks for your response.
I tried your way yesterday evening but now I have 18 properties files
(16 with business and build properties and 2 for the paths to the
properties file). Some of them have 50-60 properties defined, and all
others have only 3 or 4.
Is that better than having recursive resolution ? That's why I asked my
question : what is the limit betwenn several properties to maintain and
the recurive resolution concern ?
In our mind (my boss and me), we won't be able to maintain this lot of
properties files. (Because now we should store them into a SCM and
control the dependancies and the coherence betwenn all properties file
for a build as we could have multiple build in the same hour with
naturely change of properties).
So we will develope a recursive resolution task, it solve the potential
issue on multiple properties files management.
I will contribute this if your are interested.
Emmanuel
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTypes custom-programming.html
peterreilly2003/08/13 01:35:01
Added: docs/manual/CoreTypes custom-programming.html
Log:
initial attempt to describe introspection based components
Revision ChangesPath
1.1 ant/docs/manual/CoreTypes/custom-programming.html
Index: custom-programming.html
===
html
head
meta http-equiv=Content-Language content=en-us/meta
titleCustom Components/title
/head
body
h2Custom Components/h2
h3Overview/h3
p
Custom components are conditions, selectors, filters and other
objects that are defined outside ant core.
/p
p
In Ant 1.6 custom conditions, selectors and filters has
been overhauled.
/p
p
It is now possible to define custom conditions, selectors and filters
that behave like Ant Core components.
This is achieved by allowing datatypes defined in build scripts
to be used as custom components if the class of the datatype
is compatible, or has been adapted by an adapter class.
/p
p
The old methods of defining custom components are still supported.
/p
h3Definition and use/h3
p
A custom component is a normal Java class that implements a particular
interface or extends a particular class, or has been adapted to the
interface or class.
/p
p
It is exactly like writing a
a href=../develop.html#writingowntaskcustom task/a.
One defines attributes and nested elements by writing isetter/i
methods and iadd/i methods.
/p
p
After the class has been written, it is added to the ant system
by using codelt;typedefgt;/code.
/p
h3a name=customconditionsCustom Conditions/a/h3
p
Custom conditions are datatypes that implement
codeorg.apache.tools.ant.taskdefs.condition.Condition/code.
For example a custom condition that returns true if a
string is all upper case could be written as:
/p
blockquote
pre
package com.mydomain;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.condition.Condition;
public class AllUpperCaseCondition extends Condition {
private String value;
// The setter for the quot;valuequot; attribute
public void setValue(String value) {
this.value = value;
}
// This method evaluates the condition
public boolean eval() {
if (value == null) {
throw new BuildException(value attribute is not set);
}
return value.toUpperCase().equals(value);
}
}
/pre
/blockquote
p
Adding the condition to the system is achieved as follows:
/p
blockquote
pre
lt;typedef
name=alluppercase
classname=com.mydomain.AllUpperCaseCondition
classpath=${mydomain.classes/gt;
/pre
/blockquote
p
This condition can now be used wherever a Core Ant condition
is used.
/p
blockquote
pre
lt;condition property=alluppergt;
lt;alluppercase value=THIS IS ALL UPPER CASE/gt;
lt;/conditiongt;
/pre
/blockquote
h3a name=customselectorsCustom Selectors/a/h3
p
Custom selectors are datatypes that implement
codeorg.apache.tools.ant.types.selectors.FileSelector/code.
pThere is only one method required.
codepublic boolean isSelected(File basedir, String filename,
File file)/code.
It returns true
or false depending on whether the given file should be
selected or not.
/p
p
An example of a custom selection that selects filenames ending
in .java would be:
/p
blockquote
pre
package com.mydomain;
import org.apache.tools.ant.types.selectors.FileSelector;
public class JavaSelector {
public boolean isSelected(File b, String filename, File f) {
return filename.toLowerCase().endsWith(.java);
}
}
/pre
/blockquote
p
/p
p
Adding the selector to the system is achieved as follows:
/p
blockquote
pre
lt;typedef
name=javaselector
classname=com.mydomain.JavaSelector
classpath=${mydomain.classes/gt;
/pre
/blockquote
p
This selector can now be used wherever a Core Ant selector
is used.
/p
p
One may use
codeorg.apache.tools.ant.types.selectors.BaseSelector/code,
a convenience class that provides reasonable default
behaviour.
It has some predefined behaviours you can take advantage
of. Any time you encounter a problem when setting attributes or
adding tags, you can call setError(String
cvs commit: ant/docs/manual conceptstypeslist.html
peterreilly2003/08/13 01:35:51 Modified:docs/manual conceptstypeslist.html Log: initial attempt to describe introspection based components Revision ChangesPath 1.11 +6 -0 ant/docs/manual/conceptstypeslist.html Index: conceptstypeslist.html === RCS file: /home/cvs/ant/docs/manual/conceptstypeslist.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- conceptstypeslist.html12 May 2003 15:19:18 - 1.10 +++ conceptstypeslist.html13 Aug 2003 08:35:50 - 1.11 @@ -34,5 +34,11 @@ a href=OptionalTypes/classfileset.htmlClass Fileset/abr a href=OptionalTypes/extension.htmlExtension Package/abr a href=OptionalTypes/extensionset.htmlSet of Extension Packages/abr + +h3Custom Components/h3 +a href=CoreTypes/custom-programming.htmlCustom Components/abr +a href=CoreTypes/custom-programming.html#customconditionsConditions/abr +a href=CoreTypes/custom-programming.html#customselectorsSelectors/abr +a href=CoreTypes/custom-programming.html#filterreadersFilterReaders/abr /body /html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: ant/docs/manual/CoreTypes custom-programming.html
h3a name=customselectorsCustom Selectors/a/h3
p
Custom selectors are datatypes that implement
codeorg.apache.tools.ant.types.selectors.FileSelector/code.
pThere is only one method required.
codepublic boolean isSelected(File basedir,
String filename,
File file)/code.
It returns true
or false depending on whether the given file should be
selected or not.
/p
p
An example of a custom selection that selects filenames ending
in .java would be:
/p
blockquote
pre
package com.mydomain;
import org.apache.tools.ant.types.selectors.FileSelector;
public class JavaSelector {
The class don´t have to implement the interface ???
For writing Selectors I had improved the selectors-program.html.
Mmm - not introduced into CVS yet. So see at
http://nagoya.apache.org/bugzilla/showattachment.cgi?attach_id=7049
Improved for writing implementation and tests for selectors.
Jan
cvs commit: ant/docs/manual/CoreTypes custom-programming.html
peterreilly2003/08/13 02:05:22
Modified:docs/manual/CoreTypes custom-programming.html
Log:
fix selector example
Revision ChangesPath
1.2 +23 -13ant/docs/manual/CoreTypes/custom-programming.html
Index: custom-programming.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/custom-programming.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- custom-programming.html 13 Aug 2003 08:35:01 - 1.1
+++ custom-programming.html 13 Aug 2003 09:05:22 - 1.2
@@ -75,7 +75,7 @@
/blockquote
p
- Adding the condition to the system is achieved as follows:
+Adding the condition to the system is achieved as follows:
/p
blockquote
pre
@@ -100,13 +100,14 @@
p
Custom selectors are datatypes that implement
codeorg.apache.tools.ant.types.selectors.FileSelector/code.
- pThere is only one method required.
-codepublic boolean isSelected(File basedir, String filename,
- File file)/code.
-It returns true
-or false depending on whether the given file should be
-selected or not.
- /p
+/p
+pThere is only one method required.
+ codepublic boolean isSelected(File basedir, String filename,
+File file)/code.
+ It returns true
+ or false depending on whether the given file should be
+ selected or not.
+/p
p
An example of a custom selection that selects filenames ending
in .java would be:
@@ -114,8 +115,9 @@
blockquote
pre
package com.mydomain;
+import java.io.File;
import org.apache.tools.ant.types.selectors.FileSelector;
-public class JavaSelector {
+public class JavaSelector implements FileSelector {
public boolean isSelected(File b, String filename, File f) {
return filename.toLowerCase().endsWith(.java);
}
@@ -123,8 +125,6 @@
/pre
/blockquote
p
-/p
-p
Adding the selector to the system is achieved as follows:
/p
blockquote
@@ -135,10 +135,20 @@
classpath=${mydomain.classes/gt;
/pre
/blockquote
-p
+p
This selector can now be used wherever a Core Ant selector
- is used.
+ is used, for example:
/p
+blockquote
+ pre
+lt;copy todir=togt;
+ lt;fileset dir=srcgt;
+ lt;javaselector/gt;
+ lt;/filesetgt;
+lt;/copygt;
+ /pre
+/blockquote
+
p
One may use
codeorg.apache.tools.ant.types.selectors.BaseSelector/code,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22378] New: - Borland Delphi/Kylix compiler support
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22378. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22378 Borland Delphi/Kylix compiler support Summary: Borland Delphi/Kylix compiler support Product: Ant Version: unspecified Platform: PC OS/Version: Other Status: NEW Severity: Enhancement Priority: Other Component: Optional Tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22326] - remove deprecated / 1.1 issues packages ant and ant.filters - ant.loader
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22326. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22326 remove deprecated / 1.1 issues packages ant and ant.filters - ant.loader --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 12:27 --- Created an attachment (id=7793) Replaces previous 2 patches, comments taken into account, extended with more packages. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22326] - remove deprecated / 1.1 issues all packages except for taskdefs
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22326. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22326 remove deprecated / 1.1 issues all packages except for taskdefs [EMAIL PROTECTED] changed: What|Removed |Added Summary|remove deprecated / 1.1 |remove deprecated / 1.1 |issues packages ant and |issues all packages except |ant.filters - ant.loader|for taskdefs --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 12:40 --- Now also the packages org.apache.tools.ant.types org.apache.tools.ant.types.optional org.apache.tools.ant.types.optional.depend org.apache.tools.ant.types.optional.image org.apache.tools.ant.types.resolver org.apache.tools.ant.types.selectors org.apache.tools.ant.util org.apache.tools.ant.util.depend org.apache.tools.ant.util.deped.bcel org.apache.tools.ant.util.facade org.apache.tools.ant.util.optional org.apache.tools.ant.util.regexp org.apache.tools.bzip2 org.apache.tools.mail org.apache.tools.tar org.apache.tools.zip have been changed where necessary. This is in the patch of 08/13/03 12:27 I have in this patch marked the following methods deprecated: CollectionUtils.equals(Vector, Vector) (use Vector.equals()) CollectionUtils.equals(Dictionary, Dictionary) (use Map.equals()) CollectionUtils.putAll(Dictionary, Dictionary) (use Map.putAll()) FileUtils.getSetLastModified() (use File.setLastModified()) FileUtils.setLastModified() (use File.setLastModified()) FileUtils.getParentFile() (use File.getParentFile()) LoaderUtils.isContextLoaderAvailable() (always returns true) WeakishReference (use WeakReference) WeakishReference12 (use WeakReference) ZipEntry.setComprSize (use ZipEntry.setCompressedSize()) If there are any objections to this please let me know I will in that case update the patch. I will now start on the standard taskdefs. Please let me know if it is unlikely that these patches are accepted, as in that case i will stop working on them. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22345] - In J2SDK 1.5.0 (Tiger) enum is a keyword
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22345. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22345 In J2SDK 1.5.0 (Tiger) enum is a keyword --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 12:41 --- I have written a Check for checkstyle. It seems to work. That check logs an error if a reserved word is used as identifier. I listet the keywords described in http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html, the words true, false, null (described there), assert (JDK 1.4) and enum (JDK 1.5). For running the test, include the JAR in the classpath and add that statement into the src\etc\checkstyle\checkstyle-config (somewhere under the TreeWalker module). module name=com.puppycrawl.tools.checkstyle.api.checks.naming.WrongUseOfReservedWordsC heck/ You can specify a list of alternative reserved words as parameter. E.g. for a quick test I wanted to list all sources which uses handleOutput. module name=com.puppycrawl.tools.checkstyle.api.checks.naming.WrongUseOfReservedWordsC heck property name=reservedWords value=handleOutput/ /module After finishing the doc- and test-stuff I try to contribute that to the checkstyle project. Until then I upload the sources, JAR and the check-result. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22345] - In J2SDK 1.5.0 (Tiger) enum is a keyword
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22345. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22345 In J2SDK 1.5.0 (Tiger) enum is a keyword --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 12:41 --- Created an attachment (id=7794) Sources for the Check - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22345] - In J2SDK 1.5.0 (Tiger) enum is a keyword
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22345. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22345 In J2SDK 1.5.0 (Tiger) enum is a keyword --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 12:41 --- Created an attachment (id=7795) Compiled Check - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22345] - In J2SDK 1.5.0 (Tiger) enum is a keyword
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22345. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22345 In J2SDK 1.5.0 (Tiger) enum is a keyword --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 12:41 --- Created an attachment (id=7796) ZIP containing the checkstyle report in XML and HTML - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks typedef.html
peterreilly2003/08/13 06:22:58 Modified:docs/manual/CoreTasks typedef.html Log: add in attribute uri for typedef Revision ChangesPath 1.9 +9 -0 ant/docs/manual/CoreTasks/typedef.html Index: typedef.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/typedef.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- typedef.html 24 Jul 2003 13:48:45 - 1.8 +++ typedef.html 13 Aug 2003 13:22:58 - 1.9 @@ -134,6 +134,15 @@ /td td valign=top align=centerNo/td /tr + tr +td valign=topuri/td +td valign=top + font color=redExperimental/font + The uri that this definition should live in. + (introduced in ant1.6 font color=redExperimental/font) +/td +td valign=top align=centerNo/td + /tr /table h3Parameters specified as nested elements/h3 h4classpath/h4 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs XmlnsTest.java
peterreilly2003/08/13 06:26:31
Added: src/etc/testcases/taskdefs xmlns.xml
src/testcases/org/apache/tools/ant/taskdefs XmlnsTest.java
Log:
unit tests for namespace support
PR: 19897
Submitted by: Peter Reilly
Revision ChangesPath
1.1 ant/src/etc/testcases/taskdefs/xmlns.xml
Index: xmlns.xml
===
?xml version=1.0?
project name=test
property name=testcases.dir location=../../../../build/testcases/
path id=testclasses
pathelement location=${testcases.dir} /
pathelement path=${java.class.path} /
/path
target name=xmlns xmlns:test=this.is.another.test.uri
typedef classname=org.apache.tools.ant.taskdefs.XmlnsTest$MyTask
classpathref=testclasses
name=mytask
uri=this.is.another.test.uri /
test:mytask/
/target
target name=xmlns.file xmlns:test=this.is.a.test.uri
typedef file=test.antlib.xml
classpathref=testclasses
uri=this.is.a.test.uri /
test:mytask/
/target
target name=core
typedef file=test.antlib.xml
classpathref=testclasses
uri=ant:core /
mytask/
/target
target name=excluded
typedef file=test.antlib.xml
classpathref=testclasses
uri=ant:notallowed /
/target
/project
1.1
ant/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java
Index: XmlnsTest.java
===
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowlegement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowlegement may appear in the software itself,
*if and wherever such third-party acknowlegements normally appear.
*
* 4. The names Ant and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*/
package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
/**
* @author Peter Reilly
*/
public class XmlnsTest extends BuildFileTest {
public XmlnsTest(String name) {
super(name);
}
public void setUp() {
configureProject(src/etc/testcases/taskdefs/xmlns.xml);
}
public void testXmlns() {
expectLog(xmlns, MyTask called);
}
public void testXmlnsFile() {
expectLog(xmlns.file, MyTask called);
}
public void testCore() {
expectLog(core, MyTask called);
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs XmlnsTest.java
peterreilly2003/08/13 06:36:36
Modified:src/main/org/apache/tools/ant/taskdefs DefBase.java
src/testcases/org/apache/tools/ant/taskdefs XmlnsTest.java
Log:
typeo use use - use
Revision ChangesPath
1.2 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/DefBase.java
Index: DefBase.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/DefBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefBase.java 13 Aug 2003 13:18:54 - 1.1
+++ DefBase.java 13 Aug 2003 13:36:36 - 1.2
@@ -94,7 +94,7 @@
uri = ;
}
if (uri.startsWith(ant:) !uri.startsWith(antlib:)) {
-throw new BuildException(Attempt to use use a reserved URI +
uri);
+throw new BuildException(Attempt to use a reserved URI + uri);
}
this.uri = uri;
}
1.2 +1 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java
Index: XmlnsTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XmlnsTest.java13 Aug 2003 13:26:31 - 1.1
+++ XmlnsTest.java13 Aug 2003 13:36:36 - 1.2
@@ -85,7 +85,7 @@
public void testExcluded() {
expectBuildExceptionContaining(
excluded, excluded uri,
-Attempt to use use a reserved URI ant:notallowed);
+Attempt to use a reserved URI ant:notallowed);
}
public static class MyTask extends Task {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs/optional dotnet.xml
bodewig 2003/08/13 06:42:54
Modified:src/etc/testcases/taskdefs/optional dotnet.xml
Log:
More Mono tests
Revision ChangesPath
1.7 +90 -34ant/src/etc/testcases/taskdefs/optional/dotnet.xml
Index: dotnet.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/dotnet.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dotnet.xml8 Aug 2003 07:59:51 - 1.6
+++ dotnet.xml13 Aug 2003 13:42:54 - 1.7
@@ -9,10 +9,6 @@
property name=out.app location=${classes.dir}/out.exe/
property name=out.type value=exe/
- target name=mark-mono-ok
-property name=mono.ok value=true/
- /target
-
target name=probe_for_apps
condition property=ilasm.found
or
@@ -46,24 +42,19 @@
/condition
echo mcs.found=${mcs.found}/echo
-condition property=cs.found
- or
-isset property=csc.found/
-isset property=mcs.found/
- /or
+ !-- Mono's ilasm --
+ condition property=mono.ilasm.found
+ available file=ilasm filepath=${env.PATH} /
/condition
- echo cs.found=${cs.found}/echo
+ echo mono.ilasm.found=${mono.ilasm.found}/echo
condition property=dotnetapps.found
or
and
- isset property=cs.found/
- isset property=mono.ok/
+ isset property=mcs.found/
+ isset property=mono.ilasm.found/
/and
and
- not
-isset property=mono.ok/
- /not
isset property=csc.found/
!-- isset property=vbc.found/ --
isset property=ilasm.found/
@@ -102,7 +93,7 @@
delete file=${testCSC.exe}/
/target
- target name=testCSC-Mono depends=mark-mono-ok,init if=mcs.found
+ target name=testCSC-Mono depends=init if=mcs.found
property name=testCSC.exe
location=${build.dir}/ExampleCsc.exe /
csc
@@ -112,7 +103,6 @@
includedefaultreferences=false
standardlib=true
- reference dir=/usr/lib includes=*.dll/
/csc
available property=app.created file=${testCSC.exe}/
fail unless=app.createdNo app ${testCSC.exe} created/fail
@@ -122,22 +112,47 @@
delete file=${testCSC.exe}/
/target
-target name=testCSCintrinsicFileset depends=init
- property name=testCSC.exe
-location=${build.dir}/ExampleCsc.exe/
- csc
-destFile=${testCSC.exe}
-targetType=exe
-srcDir=.
-
- /csc
- available property=app.created file=${testCSC.exe}/
- fail unless=app.createdNo app ${testCSC.exe} created/fail
- exec executable=${testCSC.exe} failonerror=true/
- delete file=${testCSC.exe}/
-/target
+ target name=testCSCintrinsicFileset
+ depends=testCSCintrinsicFileset-MS,testCSCintrinsicFileset-Mono/
- target name=testCSCdll depends=init
+ target name=testCSCintrinsicFileset-MS depends=init if=csc.found
+property name=testCSC.exe
+ location=${build.dir}/ExampleCsc.exe/
+csc
+ destFile=${testCSC.exe}
+ targetType=exe
+ srcDir=.
+
+/csc
+available property=app.created file=${testCSC.exe}/
+fail unless=app.createdNo app ${testCSC.exe} created/fail
+exec executable=${testCSC.exe} failonerror=true /
+delete file=${testCSC.exe}/
+ /target
+
+ target name=testCSCintrinsicFileset-Mono depends=init if=mcs.found
+property name=testCSC.exe
+ location=${build.dir}/ExampleCsc.exe/
+csc
+ destFile=${testCSC.exe}
+ targetType=exe
+ srcDir=.
+ executable=mcs
+ includedefaultreferences=false
+ standardlib=true
+
+/csc
+available property=app.created file=${testCSC.exe}/
+fail unless=app.createdNo app ${testCSC.exe} created/fail
+exec executable=mono failonerror=true
+ arg value=${testCSC.exe}/
+/exec
+delete file=${testCSC.exe}/
+ /target
+
+ target name=testCSCdll depends=testCSCdll-MS,testCSCdll-Mono/
+
+ target name=testCSCdll-MS depends=init if=csc.found
property name=testCSC.dll
location=${build.dir}/Example2.dll /
csc
@@ -151,7 +166,27 @@
fail unless=dll.createdNo file ${testCSC.dll} created/fail
/target
- target name=testCscReferences depends=init,testCSCdll
+ target name=testCSCdll-Mono depends=init if=mcs.found
+property name=testCSC.dll
+ location=${build.dir}/Example2.dll /
+csc
+ destFile=${testCSC.dll}
+ targetType=library
+ executable=mcs
+ includedefaultreferences=false
+ standardlib=true
+
+ src dir=${src.dir} includes=example2.cs/
+/csc
+available
cvs commit: ant/src/main/org/apache/tools/ant/filters TokenFilter.java
peterreilly2003/08/13 06:44:26
Modified:src/main/org/apache/tools/ant UnknownElement.java
src/main/org/apache/tools/ant/filters TokenFilter.java
Log:
Two of the files in 22326
PR: 22326
Obtained from: Martijn Kruithof
Revision ChangesPath
1.61 +1 -1 ant/src/main/org/apache/tools/ant/UnknownElement.java
Index: UnknownElement.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/UnknownElement.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- UnknownElement.java 13 Aug 2003 13:18:54 - 1.60
+++ UnknownElement.java 13 Aug 2003 13:44:26 - 1.61
@@ -159,7 +159,7 @@
* @return the configuration info.
*/
public RuntimeConfigurable getWrapper() {
-return wrapper;
+return super.getWrapper();
}
/**
1.11 +1 -1
ant/src/main/org/apache/tools/ant/filters/TokenFilter.java
Index: TokenFilter.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/TokenFilter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TokenFilter.java 23 Jul 2003 11:32:12 - 1.10
+++ TokenFilter.java 13 Aug 2003 13:44:26 - 1.11
@@ -654,7 +654,7 @@
}
regularExpression = new RegularExpression();
regularExpression.setPattern(from);
-regexp = regularExpression.getRegexp(project);
+regexp = regularExpression.getRegexp(getProject());
if (to == null) {
to = ;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22326] - remove deprecated / 1.1 issues all packages except for taskdefs
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22326. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22326 remove deprecated / 1.1 issues all packages except for taskdefs --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 13:48 --- I have made the changes to TokenFilter.java and UnknownElement.java (deprecated use of fields). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
On 13 Aug 2003, [EMAIL PROTECTED] wrote: enable assertions for junit the same way as java uses them Which is not much AFAICT. Steve, shouldn't use addAssertions() instead? The only problems I see is that CommandlineJava won't accept multiple Assertions yet and that multiple Assertions could have multiple (and ambiguos) system-assertions settings. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
On 13 Aug 2003, Stefan Bodewig [EMAIL PROTECTED] wrote: Steve, shouldn't use addAssertions() instead? shouldn't *we* use ... Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
.NET tasks and Mono
I've played some more with it (see my last commit). testCSC, testCSCintrinsicFileset and testCSCdll pass. testCSCReferences fails with [csc] error CS2001: Source file '/D:RELEASE;def3;' could not be opened my wild guess is, it's the trailing semicolon here as well. Will try to verify. All ilasm tests fail with [ilasm] compiling 2 files [ilasm] Mono ILasm compiler [ilasm] ilasm [options] source-files [ilasm]--aboutAbout the Mono ILasm compiler [ilasm]--version Print the version number of the Mono ILasm compiler [ilasm]/out:file_name Specifies output file. [ilasm]/exe Compile to executable. [ilasm]/dll Compile to library. [ilasm] Options can be of the form -option or /option which means it probably doesn't like the /nolist (but wouldn't like /listing either) - same for /quiet (which I could get rid of using verbose) and /debug (afain, degug=false would help). Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: .NET tasks and Mono
Stefan- Could you provide the source so we can run the CSharp Compiler and see the errors on our own box? -Martin - Original Message - From: Stefan Bodewig [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Wednesday, August 13, 2003 6:59 AM Subject: .NET tasks and Mono I've played some more with it (see my last commit). testCSC, testCSCintrinsicFileset and testCSCdll pass. testCSCReferences fails with [csc] error CS2001: Source file '/D:RELEASE;def3;' could not be opened my wild guess is, it's the trailing semicolon here as well. Will try to verify. All ilasm tests fail with [ilasm] compiling 2 files [ilasm] Mono ILasm compiler [ilasm] ilasm [options] source-files [ilasm]--aboutAbout the Mono ILasm compiler [ilasm]--version Print the version number of the Mono ILasm compiler [ilasm]/out:file_name Specifies output file. [ilasm]/exe Compile to executable. [ilasm]/dll Compile to library. [ilasm] Options can be of the form -option or /option which means it probably doesn't like the /nolist (but wouldn't like /listing either) - same for /quiet (which I could get rid of using verbose) and /debug (afain, degug=false would help). Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/types AbstractFileSet.java CommandlineJava.java
peterreilly2003/08/13 07:06:20
Modified:src/main/org/apache/tools/ant ComponentHelper.java
src/main/org/apache/tools/ant/helper ProjectHelper2.java
src/main/org/apache/tools/ant/types AbstractFileSet.java
CommandlineJava.java
Log:
remove some deprecated methods and 1.1 holdovers
Bugzilla: 22326
Revision ChangesPath
1.22 +5 -5 ant/src/main/org/apache/tools/ant/ComponentHelper.java
Index: ComponentHelper.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ComponentHelper.java 13 Aug 2003 13:18:54 - 1.21
+++ ComponentHelper.java 13 Aug 2003 14:06:19 - 1.22
@@ -54,8 +54,6 @@
package org.apache.tools.ant;
-import org.apache.tools.ant.util.WeakishReference;
-
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.HashSet;
@@ -67,6 +65,7 @@
import java.util.Vector;
import java.io.InputStream;
import java.io.IOException;
+import java.lang.ref.WeakReference;
import java.lang.reflect.Modifier;
import org.apache.tools.ant.taskdefs.Typedef;
@@ -87,6 +86,7 @@
*
* @author Costin Manolache
* @author Peter Reilly
+ * @author a href=mailto:[EMAIL PROTECTED]Martijn Kruithof/a
* @since Ant1.6
*/
public class ComponentHelper {
@@ -551,7 +551,7 @@
v = new Vector();
createdTasks.put(type, v);
}
-v.addElement(WeakishReference.createReference(task));
+v.addElement(new WeakReference(task));
}
}
@@ -568,8 +568,8 @@
if (v != null) {
Enumeration taskEnum = v.elements();
while (taskEnum.hasMoreElements()) {
-WeakishReference ref =
-(WeakishReference) taskEnum.nextElement();
+WeakReference ref =
+(WeakReference) taskEnum.nextElement();
Task t = (Task) ref.get();
//being a weak ref, it may be null by this point
if (t != null) {
1.30 +3 -3
ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
Index: ProjectHelper2.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ProjectHelper2.java 13 Aug 2003 13:18:54 - 1.29
+++ ProjectHelper2.java 13 Aug 2003 14:06:19 - 1.30
@@ -641,7 +641,7 @@
if (key.equals(default)) {
if (value != null !value.equals()) {
if (!context.isIgnoringProjectTag()) {
-project.setDefaultTarget(value);
+project.setDefault(value);
}
}
} else if (key.equals(name)) {
@@ -707,8 +707,8 @@
if ((new File(baseDir)).isAbsolute()) {
project.setBasedir(baseDir);
} else {
-project.setBaseDir(project.resolveFile(baseDir,
-
context.getBuildFileParent()));
+project.setBaseDir(fu.resolveFile(
+ context.getBuildFileParent(),
baseDir));
}
}
}
1.24 +4 -4
ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java
Index: AbstractFileSet.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AbstractFileSet.java 29 Jul 2003 08:43:49 - 1.23
+++ AbstractFileSet.java 13 Aug 2003 14:06:19 - 1.24
@@ -97,6 +97,7 @@
* @author Stefan Bodewig
* @author Magesh Umasankar
* @author a href=mailto:[EMAIL PROTECTED]Bruce Atherton/a
+ * @author a href=mailto:[EMAIL PROTECTED]Martijn Kruithof/a
*/
public abstract class AbstractFileSet extends DataType implements Cloneable,
SelectorContainer {
@@ -208,7 +209,7 @@
}
/**
- * add a name entry on the include files list
+ * add a name entry on the excludes files list
*/
public PatternSet.NameEntry createExcludesFile() {
if (isReference()) {
@@ -224,8 +225,7 @@
if (isReference()) {
cvs commit: ant/src/etc/testcases/taskdefs/optional dotnet.xml
bodewig 2003/08/13 07:06:38
Modified:src/etc/testcases/taskdefs/optional dotnet.xml
Log:
execute mono instead of .EXE
Revision ChangesPath
1.8 +4 -2 ant/src/etc/testcases/taskdefs/optional/dotnet.xml
Index: dotnet.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/dotnet.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dotnet.xml13 Aug 2003 13:42:54 - 1.7
+++ dotnet.xml13 Aug 2003 14:06:38 - 1.8
@@ -223,7 +223,9 @@
/csc
available property=refapp.created file=${testCscReferences.exe}/
fail unless=refapp.createdNo app ${testCscReferences.exe}
created/fail
-exec executable=${testCscReferences.exe} failonerror=true /
+exec executable=mono failonerror=true
+ arg value=${testCscReferences.exe}/
+/exec
/target
target name=testILASM depends=init
@@ -231,7 +233,7 @@
location=${build.dir}/ExampleIlasm.exe /
ilasm
destFile=${testILASM.exe}
- targetType=exe
+ targetType=exe
src dir=${src.dir} includes=**/*.il/
/ilasm
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: .NET tasks and Mono
On 13 Aug 2003, Stefan Bodewig [EMAIL PROTECTED] wrote: testCSCReferences fails with [csc] error CS2001: Source file '/D:RELEASE;def3;' could not be opened my wild guess is, it's the trailing semicolon here as well. Will try to verify. OK, the trailing semi has not been the reason (at least not the only reason). If I change DotnetCompile to use /d: instead of /D: it works for me. Will it break Microsoft's csc? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: .NET tasks and Mono
On Wed, 13 Aug 2003, Martin Gainty [EMAIL PROTECTED] wrote: Could you provide the source so we can run the CSharp Compiler and see the errors on our own box? I've been running ant on the build file you can find as src/etc/testcases/taskdefs/optional/dotnet.xml using a freshly bootstraped CVS HEAD version of Ant and Mono 0.25 (using Ximian's RPM for RedHat 7.3). Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util CollectionUtils.java
peterreilly2003/08/13 07:22:29
Modified:src/main/org/apache/tools/ant/types XMLCatalog.java
src/main/org/apache/tools/ant/util CollectionUtils.java
Log:
some 1.1 isms
PR: 22326
Obtained from: Martijn Kruithof
Revision ChangesPath
1.31 +1 -4 ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
Index: XMLCatalog.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XMLCatalog.java 6 Aug 2003 14:35:03 - 1.30
+++ XMLCatalog.java 13 Aug 2003 14:22:29 - 1.31
@@ -58,7 +58,6 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -711,8 +710,6 @@
source.setSystemId(sysid);
log(catalog entry matched a readable file: '
+ sysid + ', Project.MSG_DEBUG);
-} catch (FileNotFoundException ex) {
-// ignore
} catch (IOException ex) {
// ignore
}
1.10 +9 -19
ant/src/main/org/apache/tools/ant/util/CollectionUtils.java
Index: CollectionUtils.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/CollectionUtils.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CollectionUtils.java 19 Jul 2003 08:11:08 - 1.9
+++ CollectionUtils.java 13 Aug 2003 14:22:29 - 1.10
@@ -63,15 +63,17 @@
*
* @author Stefan Bodewig
* @author a href=mailto:[EMAIL PROTECTED]Ingmar Stein/a
+ * @author a href=mailto:[EMAIL PROTECTED]Martijn Kruithof/a
*
* @since Ant 1.5
*/
public class CollectionUtils {
/**
- * Vector.equals() doesn't do any good in 1.1
+ * Please use Vector.equals() or List.equals()
*
* @since Ant 1.5
+ * @deprecated
*/
public static boolean equals(Vector v1, Vector v2) {
if (v1 == v2) {
@@ -82,30 +84,17 @@
return false;
}
-if (v1.size() != v2.size()) {
-return false;
-}
-
-Enumeration e1 = v1.elements();
-Enumeration e2 = v2.elements();
-while (e1.hasMoreElements()) {
-if (!e1.nextElement().equals(e2.nextElement())) {
-return false;
-}
-}
-
-// don't need to check e2.hasMoreElements as the Vectors have
-// same size.
-
-return true;
+return v1.equals(v2);
}
/**
- * Hashtable.equals() doesn't do any good in 1.1.
+ * Dictionary does not have an equals.
+ * Please use Map.equals()
*
* pFollows the equals contract of Java 2's Map./p
*
* @since Ant 1.5
+ * @deprecated
*/
public static boolean equals(Dictionary d1, Dictionary d2) {
if (d1 == d2) {
@@ -137,9 +126,10 @@
}
/**
- * JDK 1.1 does not know the putAll method for hash tables.
+ * Dictionary does not know the putAll method. Please use Map.putAll().
*
* @since Ant 1.6
+ * @deprecated
*/
public static void putAll(Dictionary m1, Dictionary m2) {
for (Enumeration it = m2.keys(); it.hasMoreElements();) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22326] - remove deprecated / 1.1 issues all packages except for taskdefs
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22326. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22326 remove deprecated / 1.1 issues all packages except for taskdefs --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 14:29 --- I have now updated: CollectionUtils.java, XMLCatalog.java, CommandlineJava.java, AbstractFileSet.java and ComponentHelper.java There is now nothing that uses WeakishReference, and as Martijn says it was introducted in 1.6 and so can be removed. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Ant.java AntStructure.java Concat.java Copydir.java Expand.java Jar.java Javadoc.java Replace.java UpToDate.java Zip.java
peterreilly2003/08/13 07:46:15
Modified:src/main/org/apache/tools/ant ComponentHelper.java
RuntimeConfigurable.java Task.java
src/main/org/apache/tools/ant/input DefaultInputHandler.java
src/main/org/apache/tools/ant/taskdefs Ant.java
AntStructure.java Concat.java Copydir.java
Expand.java Jar.java Javadoc.java Replace.java
UpToDate.java Zip.java
Log:
removing enum variable
PR: 22345
Revision ChangesPath
1.23 +6 -6 ant/src/main/org/apache/tools/ant/ComponentHelper.java
Index: ComponentHelper.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ComponentHelper.java 13 Aug 2003 14:06:19 - 1.22
+++ ComponentHelper.java 13 Aug 2003 14:46:15 - 1.23
@@ -746,9 +746,9 @@
}
props.load(in);
-Enumeration enum = props.propertyNames();
-while (enum.hasMoreElements()) {
-String name = (String) enum.nextElement();
+Enumeration e = props.propertyNames();
+while (e.hasMoreElements()) {
+String name = (String) e.nextElement();
String className = props.getProperty(name);
AntTypeDefinition def = new AntTypeDefinition();
def.setName(name);
@@ -791,9 +791,9 @@
}
props.load(in);
-Enumeration enum = props.propertyNames();
-while (enum.hasMoreElements()) {
-String name = (String) enum.nextElement();
+Enumeration e = props.propertyNames();
+while (e.hasMoreElements()) {
+String name = (String) e.nextElement();
String className = props.getProperty(name);
AntTypeDefinition def = new AntTypeDefinition();
def.setName(name);
1.44 +3 -3
ant/src/main/org/apache/tools/ant/RuntimeConfigurable.java
Index: RuntimeConfigurable.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/RuntimeConfigurable.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- RuntimeConfigurable.java 13 Aug 2003 13:18:54 - 1.43
+++ RuntimeConfigurable.java 13 Aug 2003 14:46:15 - 1.44
@@ -419,10 +419,10 @@
ProjectHelper.addText(p, wrappedObject, characters.substring(0));
}
-Enumeration enum = getChildren();
-while (enum.hasMoreElements()) {
+Enumeration e = getChildren();
+while (e.hasMoreElements()) {
RuntimeConfigurable child
-= (RuntimeConfigurable) enum.nextElement();
+= (RuntimeConfigurable) e.nextElement();
if (child.wrappedObject instanceof Task) {
Task childTask = (Task) child.wrappedObject;
childTask.setRuntimeConfigurableWrapper(child);
1.48 +3 -3 ant/src/main/org/apache/tools/ant/Task.java
Index: Task.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Task.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Task.java 1 Aug 2003 10:22:30 - 1.47
+++ Task.java 13 Aug 2003 14:46:15 - 1.48
@@ -474,10 +474,10 @@
*/
private void replaceChildren(RuntimeConfigurable wrapper,
UnknownElement parentElement) {
-Enumeration enum = wrapper.getChildren();
-while (enum.hasMoreElements()) {
+Enumeration e = wrapper.getChildren();
+while (e.hasMoreElements()) {
RuntimeConfigurable childWrapper =
-(RuntimeConfigurable) enum.nextElement();
+(RuntimeConfigurable) e.nextElement();
UnknownElement childElement =
new UnknownElement(childWrapper.getElementTag());
parentElement.addChild(childElement);
1.12 +4 -4
ant/src/main/org/apache/tools/ant/input/DefaultInputHandler.java
Index: DefaultInputHandler.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/input/DefaultInputHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultInputHandler.java 25 Jul 2003 18:44:39 - 1.11
+++ DefaultInputHandler.java 13 Aug 2003 14:46:15 - 1.12
@@ -124,14 +124,14 @@
if (request
RE: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Ant.ja va AntStructure.java Concat.java Copydir.java Expand.java Jar.java Javado c.java Replace.java UpToDate.java Zip.java
FWIW, I personally find it better to scope the Iterator or Enumeration by
using a for-loop rather than a while-loop. So instead of:
Enumeration e = props.propertyNames();
while (e.hasMoreElements()) {
String name = (String) e.nextElement();
String className = props.getProperty(name);
...
}
one gets:
for (Enumeration e = props.propertyNames(); e.hasMoreElements();) {
String name = (String) e.nextElement();
String className = props.getProperty(name);
...
}
The Java Programming Language book does it like that. --DD
-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
Sent: Wednesday, August 13, 2003 9:46 AM
To: [EMAIL PROTECTED]
Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Ant.java
AntStructure.java Concat.java Copydir.java Expand.java Jar.java
Javadoc.java Replace.java UpToDate.java Zip.java
peterreilly2003/08/13 07:46:15
Modified:src/main/org/apache/tools/ant ComponentHelper.java
RuntimeConfigurable.java Task.java
src/main/org/apache/tools/ant/input
DefaultInputHandler.java
src/main/org/apache/tools/ant/taskdefs Ant.java
AntStructure.java Concat.java Copydir.java
Expand.java Jar.java Javadoc.java Replace.java
UpToDate.java Zip.java
Log:
removing enum variable
PR: 22345
Revision ChangesPath
1.23 +6 -6
ant/src/main/org/apache/tools/ant/ComponentHelper.java
Index: ComponentHelper.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ComponentHelper.java13 Aug 2003 14:06:19 - 1.22
+++ ComponentHelper.java13 Aug 2003 14:46:15 - 1.23
@@ -746,9 +746,9 @@
}
props.load(in);
-Enumeration enum = props.propertyNames();
-while (enum.hasMoreElements()) {
-String name = (String) enum.nextElement();
+Enumeration e = props.propertyNames();
+while (e.hasMoreElements()) {
+String name = (String) e.nextElement();
String className = props.getProperty(name);
AntTypeDefinition def = new AntTypeDefinition();
def.setName(name);
...
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode ClassPathLoader.java
peterreilly2003/08/13 08:02:29
Modified:src/main/org/apache/tools/ant/taskdefs/condition And.java
Or.java
src/main/org/apache/tools/ant/taskdefs/cvslib
ChangeLogParser.java
src/main/org/apache/tools/ant/taskdefs/optional
EchoProperties.java Javah.java NetRexxC.java
Rpm.java
src/main/org/apache/tools/ant/taskdefs/optional/j2ee
ServerDeploy.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp
JspC.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
DefaultJspCompilerAdapter.java
src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java JUnitTestRunner.java
XMLResultAggregator.java
src/main/org/apache/tools/ant/taskdefs/optional/sitraka
XMLReport.java
src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode
ClassPathLoader.java
Log:
removing enum variabe
PR: 22345
Revision ChangesPath
1.9 +4 -4
ant/src/main/org/apache/tools/ant/taskdefs/condition/And.java
Index: And.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/condition/And.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- And.java 25 Jul 2003 08:28:21 - 1.8
+++ And.java 13 Aug 2003 15:02:28 - 1.9
@@ -74,9 +74,9 @@
* @exception BuildException if an error occurs
*/
public boolean eval() throws BuildException {
-Enumeration enum = getConditions();
-while (enum.hasMoreElements()) {
-Condition c = (Condition) enum.nextElement();
+Enumeration e = getConditions();
+while (e.hasMoreElements()) {
+Condition c = (Condition) e.nextElement();
if (!c.eval()) {
return false;
}
1.9 +4 -4
ant/src/main/org/apache/tools/ant/taskdefs/condition/Or.java
Index: Or.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/condition/Or.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Or.java 25 Jul 2003 08:28:21 - 1.8
+++ Or.java 13 Aug 2003 15:02:28 - 1.9
@@ -74,9 +74,9 @@
* @exception BuildException if an error occurs
*/
public boolean eval() throws BuildException {
-Enumeration enum = getConditions();
-while (enum.hasMoreElements()) {
-Condition c = (Condition) enum.nextElement();
+Enumeration e = getConditions();
+while (e.hasMoreElements()) {
+Condition c = (Condition) e.nextElement();
if (c.eval()) {
return true;
}
1.20 +4 -4
ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
Index: ChangeLogParser.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLogParser.java 17 Jul 2003 15:44:39 - 1.19
+++ ChangeLogParser.java 13 Aug 2003 15:02:28 - 1.20
@@ -103,10 +103,10 @@
*/
CVSEntry[] getEntrySetAsArray() {
final CVSEntry[] array = new CVSEntry[ m_entries.size() ];
-Enumeration enum = m_entries.elements();
+Enumeration e = m_entries.elements();
int i = 0;
-while (enum.hasMoreElements()) {
-array[i++] = (CVSEntry) enum.nextElement();
+while (e.hasMoreElements()) {
+array[i++] = (CVSEntry) e.nextElement();
}
return array;
}
1.21 +7 -7
ant/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java
Index: EchoProperties.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/EchoProperties.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- EchoProperties.java 18 Jul 2003 12:45:57 - 1.20
+++ EchoProperties.java 13 Aug 2003 15:02:28 - 1.21
@@ -302,9 +302,9 @@
}
}
-Enumeration enum = propertySets.elements();
-while (enum.hasMoreElements()) {
-PropertySet ps = (PropertySet) enum.nextElement();
+Enumeration e = propertySets.elements();
+
cvs commit: ant/src/main/org/apache/tools/zip ZipFile.java
peterreilly2003/08/13 08:14:31
Modified:src/main/org/apache/tools/ant/types AbstractFileSet.java
CommandlineJava.java FilterSet.java Path.java
PropertySet.java XMLCatalog.java ZipScanner.java
src/main/org/apache/tools/ant/util Watchdog.java
src/main/org/apache/tools/ant/util/facade
FacadeTaskHelper.java
src/main/org/apache/tools/zip ZipFile.java
Log:
remove enum variable
PR: 22336
Obtained from: Robert Stupp, using Jan Matèrne's checkstyle check
Revision ChangesPath
1.25 +3 -3
ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java
Index: AbstractFileSet.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- AbstractFileSet.java 13 Aug 2003 14:06:19 - 1.24
+++ AbstractFileSet.java 13 Aug 2003 15:14:31 - 1.25
@@ -466,9 +466,9 @@
return true;
}
-Enumeration enum = additionalPatterns.elements();
-while (enum.hasMoreElements()) {
-PatternSet ps = (PatternSet) enum.nextElement();
+Enumeration e = additionalPatterns.elements();
+while (e.hasMoreElements()) {
+PatternSet ps = (PatternSet) e.nextElement();
if (ps.hasPatterns(getProject())) {
return true;
}
1.46 +2 -2
ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- CommandlineJava.java 13 Aug 2003 14:06:20 - 1.45
+++ CommandlineJava.java 13 Aug 2003 15:14:31 - 1.46
@@ -141,8 +141,8 @@
}
}
Properties propertySets = mergePropertySets();
-for (Enumeration enum = propertySets.keys();
enum.hasMoreElements();) {
-String key = (String) enum.nextElement();
+for (Enumeration e = propertySets.keys(); e.hasMoreElements();) {
+String key = (String) e.nextElement();
String value = propertySets.getProperty(key);
listIt.add(-D + key + = + value);
}
1.23 +4 -4 ant/src/main/org/apache/tools/ant/types/FilterSet.java
Index: FilterSet.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/FilterSet.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FilterSet.java17 Jul 2003 14:17:01 - 1.22
+++ FilterSet.java13 Aug 2003 15:14:31 - 1.23
@@ -324,14 +324,14 @@
in = new FileInputStream(filtersFile);
props.load(in);
- Enumeration enum = props.propertyNames();
+ Enumeration e = props.propertyNames();
Vector filters = getFilters();
- while (enum.hasMoreElements()) {
- String strPropName = (String) enum.nextElement();
+ while (e.hasMoreElements()) {
+ String strPropName = (String) e.nextElement();
String strValue = props.getProperty(strPropName);
filters.addElement(new Filter(strPropName, strValue));
}
- } catch (Exception e) {
+ } catch (Exception ex) {
throw new BuildException(Could not read filters from file:
+ filtersFile);
} finally {
1.56 +3 -3 ant/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Path.java 3 Aug 2003 11:27:27 - 1.55
+++ Path.java 13 Aug 2003 15:14:31 - 1.56
@@ -490,9 +490,9 @@
return;
}
-Enumeration enum = elements.elements();
-while (enum.hasMoreElements()) {
-Object o = enum.nextElement();
+Enumeration e = elements.elements();
+while (e.hasMoreElements()) {
+Object o = e.nextElement();
if (o instanceof Reference) {
o = ((Reference) o).getReferencedObject(p);
}
1.8 +6 -6 ant/src/main/org/apache/tools/ant/types/PropertySet.java
Index:
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTest.java
peterreilly2003/08/13 08:19:34
Modified:src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTest.java
Log:
enum change
Revision ChangesPath
1.18 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
Index: JUnitTest.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JUnitTest.java19 Jul 2003 11:20:19 - 1.17
+++ JUnitTest.java13 Aug 2003 15:19:34 - 1.18
@@ -169,8 +169,8 @@
public void setProperties(Hashtable p) {
props = new Properties();
-for (Enumeration enum = p.keys(); enum.hasMoreElements();) {
-Object key = enum.nextElement();
+for (Enumeration e = p.keys(); e.hasMoreElements();) {
+Object key = e.nextElement();
props.put(key, p.get(key));
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22389] New: - Ant task to build VS.Net project file
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22389. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22389 Ant task to build VS.Net project file Summary: Ant task to build VS.Net project file Product: Ant Version: unspecified Platform: All OS/Version: Other Status: NEW Severity: Enhancement Priority: Other Component: Optional Tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] VS.Net project files, like the .csproj file, are XML files describing how to build a .Net project. They are created and maintained by Visual Studio.NET. I would like an Ant task to build using a .csproj file but *without* requiring VS.Net to be installed. With this kind of task you can have the best of both worlds - VS.Net to manage your C# project, and Ant to do the build, test, etc. And anyone can run this *without* having to have VS.Net installed - only the .Net framework would be required. !! I have a rudimentary version of this working if anyone is interested !! I achieved this by creating a Freemarker template to convert a .csproj file into an ant file (build.xml). It's not 100%, but it works great for my own simple projects at least. If anyone is interested I can send on what I have. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22370] - enhance available to test for owner, group and permissions - security feature
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22370. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22370 enhance available to test for owner, group and permissions - security feature --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 19:12 --- Well, how exactly are we going to do this in java? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: RE : Recursive properties resolution ?
Emmanuel FELLER wrote: Hi Steve, Thanks for your response. I tried your way yesterday evening but now I have 18 properties files (16 with business and build properties and 2 for the paths to the properties file). Some of them have 50-60 properties defined, and all others have only 3 or 4. that seems a reasonable number. If you have one per target system and one per app server then you avoid an explosive n*m growth in configs. So you keep scalability manageable. Is that better than having recursive resolution ? That's why I asked my question : what is the limit betwenn several properties to maintain and the recurive resolution concern ? In our mind (my boss and me), we won't be able to maintain this lot of properties files. (Because now we should store them into a SCM and control the dependancies and the coherence betwenn all properties file for a build as we could have multiple build in the same hour with naturely change of properties). Then you need to run ant with a command line that is ant -Dbuild.target=chamonix, or ant -Dbuild.target=zermatt for the different systems. So we will develope a recursive resolution task, it solve the potential issue on multiple properties files management. I will contribute this if your are interested. I am afraid, for the same reason we arent going to put the ant-contrib one in: it is the wrong way to do things. If it were done, then it is better done properly. Recursive expansion is a hack...normal languages use arrays and maps to do this kind of thing. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22345] - In J2SDK 1.5.0 (Tiger) enum is a keyword
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22345. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22345 In J2SDK 1.5.0 (Tiger) enum is a keyword --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 19:19 --- What happens if you use enum in a package name, BTW? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
Stefan Bodewig wrote: On 13 Aug 2003, [EMAIL PROTECTED] wrote: enable assertions for junit the same way as java uses them Which is not much AFAICT. Steve, shouldn't use addAssertions() instead? The only problems I see is that CommandlineJava won't accept multiple Assertions yet and that multiple Assertions could have multiple (and ambiguos) system-assertions settings. Probably. Except that assertions are a recursive data structure, I believe - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: .NET tasks and Mono
Stefan Bodewig wrote: On 13 Aug 2003, Stefan Bodewig [EMAIL PROTECTED] wrote: testCSCReferences fails with [csc] error CS2001: Source file '/D:RELEASE;def3;' could not be opened my wild guess is, it's the trailing semicolon here as well. Will try to verify. OK, the trailing semi has not been the reason (at least not the only reason). If I change DotnetCompile to use /d: instead of /D: it works for me. Will it break Microsoft's csc? Go for it. MSC is case independent, being a windows toy and all, (I think). Change it and I'll let you know if it breaks - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22389] - Ant task to build VS.Net project file
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22389. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22389 Ant task to build VS.Net project file --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 19:23 --- Stick what you have up as an attachment. I suspect that the Nant-vc.net binding stuff is probably further ahead, but It would be interesting to see this, even if nobody wants to add it to ant cvs (itd be a dog to test:) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22389] - Ant task to build VS.Net project file
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22389. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22389 Ant task to build VS.Net project file --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 19:57 --- Created an attachment (id=7807) Freemarker template to convert .csproj file to a build.xml file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22389] - Ant task to build VS.Net project file
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22389. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22389 Ant task to build VS.Net project file --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 20:00 --- Created an attachment (id=7808) Sample build file that uses the Freemarker template - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22389] - Ant task to build VS.Net project file
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22389. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22389 Ant task to build VS.Net project file --- Additional Comments From [EMAIL PROTECTED] 2003-08-13 20:11 --- Yes, it appears the latest versions of Nant now have a solution task that will build an entire VS.Net solution file (which can contain one or more projects). If you wanted to stick with just Ant though, this might be a good option. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
LineTokenizer
Or you could just strike that last question... I get it now. :) __ Do you Yahoo!? Yahoo! SiteBuilder - Free, easy-to-use web site design software http://sitebuilder.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
LineTokenizer
Peter (Reilly): I will direct this question to you. What is the purpose of the LineTokenizer class, and how does it compare to java.io.BufferedReader? Thanks, Matt __ Do you Yahoo!? Yahoo! SiteBuilder - Free, easy-to-use web site design software http://sitebuilder.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
