AW: Validation of instance variables
Nice idea, but I think that´s a little overkill for just checking against
null.
Just checking the javadoc [1]: inherited fields are not catched by that
method. Without
having checked that, I could think that the AbstractCvsTask (I think there
is one...)
could contain some must-not-null-fields. Same could be for the Continuus
tasks.
But if we introduce that, I wouldnt name that validate because it just
checks against
null. So something like
assertNotNull(Class c)
assertNotNull(Class c, Collection optionalFields)
would be more meaningful.
That check doesnt seem to need any project relevant data - just the class
itself which is
provided as argument. We could provide that as a util class
oata.util.ClassUtils (Singleton
as FileUtils et al).
Jan
[1]
http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Class.html#getDeclaredFiel
ds()
-Ursprüngliche Nachricht-
Von: Kev Jackson [mailto:[EMAIL PROTECTED]
Gesendet am: Freitag, 25. März 2005 10:01
An: Ant Developers List
Betreff: Validation of instance variables
We usually have to check to ensure that various values aren't null
before calling execute() in the tasks.
I've been thinking about this, and it seems that at the moment every
task handles it differently. Some check the values as part of
theexecute method, some have a seperate private method that
gets called
before execute. I'd like to unify this checking, just out of
cleanliness, so how about something like...
public void validate(Class c) throws BuildException {
Field[] fields = c.getDeclaredFields();
for (int i=0; ifields.length; i++) {
if (fields[i] == null) {
throw new BuildException(+fields[i].getName()+
attribute required);
}
}
}
would work fine, if all attributes were required, but some are only
optional, so
public void validate(Class c, Collection optional) throws
BuildException {
Field[] fields = c.getDeclaredFields();
for (int i=0; ifields.length; i++) {
if (fields[i] == null
!optional.contains(fields[i].getName())) {
throw new BuildException(+fields[i].getName()+
attribute required);
}
}
}
may be more appropriate. Then you could have this as a method in the
Task and simply call
super.validate(this, new ArrayList());
if all fields are required, or
super.validate(this, new ArrayList(optionalProp1, optionalProp2));
if all fields except optionalProp1 and optionalProp2 are required
This would move the vaildation up into the Task (where I
think not-null
checking makes more sense) and it makes it simple for tasks
to override
if more complex (this one can only be null if this one is
set) kind of
checks are required.
I've attached the patched Task and a (trivial) example.
Thoughts? Comments?
Kev
[RESULT] Retire Antidote - has PASSED
Hi, one week after starting the vote we have the following +1s Stefan Bodewig Peter Reilly Martijn Kruithof Antoine Levy-Lambert Matt Benson Erik Hatcher Jose Alberto Fernandez Jan Materne Conor MacNeill Steve Loughran Bruce Atherton Jesse Glick and a +0 by Dominique Devienne. 13 of the 18 people currently listed as non-emeritus PMC members or committers have voted and 12 of them voted in favor of the proposal so we narrowly matched the 2/3 requirement. We may want to allow some extra time because of the Easter weekend. Unless anybody objects I'll ask infrastructure to take the antidote module offline and perform all the other steps mentioned in the original vote email myself by the end of this week. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18945] - subversion
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=18945. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=18945 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [RESULT] Retire Antidote - has PASSED
Sorry about the delay, you may add my +1 as well for that vote. Stefan Bodewig wrote: Hi, one week after starting the vote we have the following +1s Stefan Bodewig Peter Reilly Martijn Kruithof Antoine Levy-Lambert Matt Benson Erik Hatcher Jose Alberto Fernandez Jan Materne Conor MacNeill Steve Loughran Bruce Atherton Jesse Glick and a +0 by Dominique Devienne. 13 of the 18 people currently listed as non-emeritus PMC members or committers have voted and 12 of them voted in favor of the proposal so we narrowly matched the 2/3 requirement. We may want to allow some extra time because of the Easter weekend. Unless anybody objects I'll ask infrastructure to take the antidote module offline and perform all the other steps mentioned in the original vote email myself by the end of this week. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18945] - subversion
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=18945. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=18945 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[EMAIL PROTECTED]: Project test-ant (in module ant) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project test-ant has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 6 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - test-ant : Java based build tool Full details are available at: http://brutus.apache.org/gump/public/ant/test-ant/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Optional dependency rhino prerequisite failed with reason synchronize failed -INFO- Optional dependency bsh prerequisite failed with reason synchronize failed -INFO- Optional dependency jakarta-tomcat-4.0 prerequisite failed with reason synchronize failed -INFO- Optional dependency xalan prerequisite failed with reason synchronize failed -INFO- Failed with reason build failed The following work was performed: http://brutus.apache.org/gump/public/ant/test-ant/gump_work/build_ant_test-ant.html Work Name: build_ant_test-ant (Type: Build) Work ended in a state of : Failed Elapsed: 6 mins 35 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar:/usr/local/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:serializer-gump-23032005.jar:xalan-gump-23032005.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dtest.haltonfailure=false -Dant.home=/usr/local/gump/public/workspace/ant/dist run-tests [Working Directory: /usr/local/gump/public/workspace/ant] CLASSPATH:
DO NOT REPLY [Bug 31555] - typedef / taskdef documentation should mention classpathref attribute
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=31555. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=31555 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 14:09 --- couldn't the documentation be updated between releases? -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22170] - taskdef classpaths does not work.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=22170. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=22170 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 14:10 --- perhaps a cleanly defined classpathref as per Bug 31555 helps here -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25832] - Do not define wsdltodotnet twice
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=25832. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=25832 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 16:54 --- style is still listed in coretasklist.html in italics (i.e. deprecated name), so I don't *think* it should be hard to find... -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30606] - [PATCH] Ability to specify actual executable for javadoc
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30606. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30606 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] Target Milestone|--- |1.7 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 16:57 --- Working on a patch for this for 1.7. Any opinions on whether this would be appropriate to merge to 1.6.3 or not? Patch effects: - adds 'executable' attribute, default is still Ant's JDK's javadoc - cleans up code by dropping JDK 1.1 support completely (except for old=true) - since we dropped JDK 1.1 support for Ant 1.6, this was a no-op anyway - disables JDK version checks in case 'executable' is specified, i.e. old=true will pass -1.1 unconditionally, and 1.4-specific parameters will be passed unconditionally if specified -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30606] - [PATCH] Ability to specify actual executable for javadoc
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30606. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30606 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |ASSIGNED -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22244] - Javadoc Task.. Don't use the JAVADOC exceutable from running VM
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=22244. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=22244 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 16:58 --- Please see comments in bug #30606. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30542] - Javac working directory
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30542. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30542 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 17:30 --- when executing an external process using exec we can set the working directory using dir - so why not be able to set the working directory when forking javac? - because there is no *reason* to set the working directory on a correctly functioning compiler if all paths passed to on the commandline are absolute; it has no effect (if it does, it may be a bug in the compiler). It is only known to have an effect on the J9 compiler, I guess, so this detail of interfacing with that compiler is best handled in that compiler adapter only. In fact I'm not really sure what the purpose of the line exe.setWorkingDirectory(project.getBaseDir()); in DefaultCompilerAdapter actually is; IMHO it could be removed. It was added by Stefan in 2000, to Javac.java 1.31, for no reason mentioned in the commit message - and only to executeJikesCompile; also appears in Jikes.java 1.5. I propose that this issue be WONTFIX, but no strong opinion. Of course the custom compiler adapter for J9 could be a useful patch independently of this. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25832] - Do not define wsdltodotnet twice
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=25832. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=25832 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 17:41 --- Right. Sorry. I guess it just feels weird that all of a sudden I have a bunch of builds using an obsoleted task, because you decided so in the 'Do not define wsdltodotnet twice' PR. I guess I'm a creature of habits and now I have to change my habit of using style. --DD -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Re: Prototype work on XML+XSL based Ant doc
From: Matt Benson [mailto:[EMAIL PROTECTED] Beyond that, while I have DL'd these bug attachment(s), I haven't yet looked at them simply because my lack of expertise in this area means that whenever I get into this I will have to refer to XSLT references before I know what I'm looking at. :) At this point we're simply discussing whether the XML is acceptable to author, i.e. it's not too much of a burden compared to the HTML we're authoring right now. So far Peter said it was too verbose, Stefan said it was OK, and Jim argued for more alignment on XML technologies (which tend to make the XML even more verbose). And also compare the existing HTML to the generated one. By all means look at the XSL, but it's not necessary. --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Re: Prototype work on XML+XSL based Ant doc
--- Dominique Devienne [EMAIL PROTECTED] wrote: From: Matt Benson [mailto:[EMAIL PROTECTED] Beyond that, while I have DL'd these bug attachment(s), I haven't yet looked at them simply because my lack of expertise in this area means that whenever I get into this I will have to refer to XSLT references before I know what I'm looking at. :) At this point we're simply discussing whether the XML is acceptable to author, i.e. it's not too much of a burden compared to the HTML we're authoring right now. So far Peter said it was too verbose, Stefan said it was OK, and Jim argued for more alignment on XML technologies (which tend to make the XML even more verbose). Hmm... looks okay to me in this regard. And also compare the existing HTML to the generated one. Looks good here too. I very much like the since attribute: version number only, meaning we have an easy way to standardize the rendering of such tags including capitalization. ;) The bugreport says you started w/ Introspection to get here... I wonder if there is some way we can combine this doc initiative with Kev Jackson's suggestions on validation to set up some kind of element/attribute matrix evaluation to define compatibility between attributes/elements. Better yet, get this information into a single XML format used in documentation and referenced at runtime for validation and error reporting... Does that sound un-doable? -Matt By all means look at the XSL, but it's not necessary. --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Re: Prototype work on XML+XSL based Ant doc
From: Matt Benson [mailto:[EMAIL PROTECTED] The bugreport says you started w/ Introspection to get here... I wonder if there is some way we can combine this doc initiative with Kev Jackson's suggestions on validation to set up some kind of element/attribute matrix evaluation to define compatibility between attributes/elements. Better yet, get this information into a single XML format used in documentation and referenced at runtime for validation and error reporting... Does that sound un-doable? From my POV, I have more than enough on my plate trying to sort the doc out ;-) I'll leave you explore this. Until now I've done fine doing my own validation, with little utility methods like assertNotNull, assertNotSet, etc... --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: Re: Prototype work on XML+XSL based Ant doc
--- Dominique Devienne [EMAIL PROTECTED] wrote: From: Matt Benson [mailto:[EMAIL PROTECTED] The bugreport says you started w/ Introspection to get here... I wonder if there is some way we can combine this doc initiative with Kev Jackson's suggestions on validation to set up some kind of element/attribute matrix evaluation to define compatibility between attributes/elements. Better yet, get this information into a single XML format used in documentation and referenced at runtime for validation and error reporting... Does that sound un-doable? From my POV, I have more than enough on my plate trying to sort the doc out ;-) I'll leave you explore this. Until now I've done fine doing my own validation, with little utility methods like assertNotNull, assertNotSet, etc... --DD Yeah, I didn't necessarily mean YOU should do it... :) I think we all need bigger plates. But that aside, I do find the idea interesting (though since it was at least partly mine I guess I would). Again the biggest win here would be--in theory--a single-shot at validating and documenting task configuration options. -Matt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25832] - Do not define wsdltodotnet twice
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=25832. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=25832 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 19:47 --- Well the deprecation of style can certainly be reverted if people object to it; it's intended to simplify things for the future, but of course it causes some annoyance in the short term. I had mentioned it in this report without any response but that was a while back. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Javadoc.java
jglick 2005/03/29 10:23:47 Modified:.WHATSNEW docs/manual/CoreTasks javadoc.html src/main/org/apache/tools/ant/taskdefs Javadoc.java Log: #30606: add 'executable' attr to javadoc. Revision ChangesPath 1.797 +2 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.796 retrieving revision 1.797 diff -u -r1.796 -r1.797 --- WHATSNEW 28 Mar 2005 23:22:10 - 1.796 +++ WHATSNEW 29 Mar 2005 18:23:46 - 1.797 @@ -79,6 +79,8 @@ Other changes: -- +* javadoc can now take an attribute 'executable'. Bugzilla report 30606. + * WsdlToDotnet and style are now deprecated in favor of wsdltodotnet and xslt, respectively. Bugzilla report 25832. 1.33 +46 -36ant/docs/manual/CoreTasks/javadoc.html Index: javadoc.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/javadoc.html,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- javadoc.html 17 Mar 2005 09:34:01 - 1.32 +++ javadoc.html 29 Mar 2005 18:23:47 - 1.33 @@ -19,16 +19,16 @@ quot;changedquot; files, unlike the a href=javac.htmljavac/a task. This means all packages will be processed each time this task is run. In general, however, this task is used much less frequently./p -pThis task works seamlessly between different javadoc versions (1.1, -1.2 and 1.4), with the obvious restriction that the 1.2 attributes -will be ignored if run in a 1.1 VM./p +pThis task works seamlessly between different javadoc versions (1.2 and 1.4), +with the obvious restriction that the 1.4 attributes +will be ignored if run in a 1.2 VM./p pNOTE: since javadoc calls System.exit(), javadoc cannot be run inside the -same VM as ant without breaking functionality. For this reason, this task +same VM as Ant without breaking functionality. For this reason, this task always forks the VM. This overhead is not significant since javadoc is normally a heavy application and will be called infrequently./p pNOTE: the packagelist attribute allows you to specify the list of packages to document outside of the Ant file. It's a much better practice to include everything -inside the build.xml file. This option was added in order to make it easier to +inside the codebuild.xml/code file. This option was added in order to make it easier to migrate from regular makefiles, where you would use this option of javadoc. The packages listed in packagelist are not checked, so the task performs even if some packages are missing or broken. Use this option if you wish to convert from @@ -40,9 +40,11 @@ versions, you are strongly encouraged to use a href=javadoc.htmljavadoc/a instead./i/p -pIn the table below, 1.1 means available if your current Java VM is -a 1.1 VM, 1.2 for either 1.2 or 1.3 and 1.4+ for any VM of at least version 1.4. 1.2+ -means any VM of at least version 1.2./p +pIn the table below, 1.2 means available if your current Java VM is +a 1.2 VM (but not 1.3 or later), 1.4+ for any VM of at least version 1.4, otherwise +any VM of at least version 1.2 is acceptable. JDK 1.1 is no longer supported. +If you specify the codeexecutable/code attribute it is up to you +to ensure that this command supports the attributes you wish to use./p h3Parameters/h3 table border=1 cellpadding=2 cellspacing=0 @@ -94,7 +96,7 @@ tr td valign=toppackageList/td td valign=topThe name of a file containing the packages to process/td -td align=center valign=top1.2+/td +td align=center valign=topall/td td align=center valign=topNo/td /tr tr @@ -107,7 +109,7 @@ td valign=topBootclasspath/td td valign=topOverride location of class files loaded by the bootstrap class loader/td -td align=center valign=top1.2+/td +td align=center valign=topall/td td align=center valign=topNo/td /tr tr @@ -122,19 +124,19 @@ td valign=topOverride location of class files loaded by the bootstrap class loader by a href=../using.html#referencesreference/a to a PATH defined elsewhere./td -td align=center valign=top1.2+/td +td align=center valign=topall/td td align=center valign=topNo/td /tr tr td valign=topExtdirs/td td valign=topOverride location of installed extensions/td -td align=center valign=top1.2+/td +td align=center valign=topall/td td align=center valign=topNo/td /tr tr td valign=topOverview/td td valign=topRead overview documentation from HTML file/td -td align=center valign=top1.2+/td +td align=center valign=topall/td
DO NOT REPLY [Bug 30606] - [PATCH] Ability to specify actual executable for javadoc
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30606. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30606 [EMAIL PROTECTED] changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 20:24 --- Checking in WHATSNEW; /home/cvs/ant/WHATSNEW,v -- WHATSNEW new revision: 1.797; previous revision: 1.796 done More commits to come... Checking in docs/manual/CoreTasks/javadoc.html; /home/cvs/ant/docs/manual/CoreTasks/javadoc.html,v -- javadoc.html new revision: 1.33; previous revision: 1.32 done More commits to come... Checking in src/main/org/apache/tools/ant/taskdefs/Javadoc.java; /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v -- Javadoc.java new revision: 1.140; previous revision: 1.139 done -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs/optional/unix .cvsignore
jglick 2005/03/29 10:27:37 Added: src/etc/testcases/taskdefs/optional/unix .cvsignore Log: Ignore stray dir that can be left behind after an interrupted test. Revision ChangesPath 1.1 ant/src/etc/testcases/taskdefs/optional/unix/.cvsignore Index: .cvsignore === test-working - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs input.xml
jglick 2005/03/29 10:35:46
Modified:src/testcases/org/apache/tools/ant/util
JavaEnvUtilsTest.java
src/testcases/org/apache/tools/ant/types/selectors
PresentSelectorTest.java DependSelectorTest.java
DateSelectorTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional/net
FTPTest.java
src/testcases/org/apache/tools/ant/taskdefs
ProcessDestroyerTest.java JavacTest.java
InputTest.java ExecuteWatchdogTest.java
ExecuteJavaTest.java CopyTest.java
src/testcases/org/apache/tools/ant ProjectTest.java
src/main/org/apache/tools/ant/util JavaEnvUtils.java
src/main/org/apache/tools/ant/types Path.java
src/main/org/apache/tools/ant/taskdefs/optional/sitraka
Coverage.java
src/main/org/apache/tools/ant/taskdefs/optional/javah
SunJavah.java
src/main/org/apache/tools/ant/taskdefs/compilers
DefaultCompilerAdapter.java
CompilerAdapterFactory.java
src/etc/testcases/taskdefs input.xml
Log:
Removing old code testing for JDK 1.0 and 1.1.
Revision ChangesPath
1.11 +3 -12
ant/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java
Index: JavaEnvUtilsTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JavaEnvUtilsTest.java 6 Jan 2005 12:05:07 - 1.10
+++ JavaEnvUtilsTest.java 29 Mar 2005 18:35:45 - 1.11
@@ -69,15 +69,8 @@
FILE_UTILS.normalize(javaHome+/..).getAbsolutePath();
assertTrue(j+ is normalized and in the JDK dir,
j.startsWith(javaHomeParent));
-
-if (JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_0 ||
-JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_1) {
-assertTrue(j+ is normalized and in the JRE dir,
- j.startsWith(javaHome));
-} else {
-assertTrue(j+ is normalized and not in the JRE dir,
- !j.startsWith(javaHome));
-}
+assertTrue(j+ is normalized and not in the JRE dir,
+ !j.startsWith(javaHome));
} catch (AssertionFailedError e) {
// java.home is bogus
@@ -117,9 +110,7 @@
assertTrue(j+ is normalized and in the JDK dir,
j.startsWith(javaHomeParent));
-if (JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_0 ||
-JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_1 ||
-Os.isFamily(mac)) {
+if (Os.isFamily(mac)) {
assertTrue(j+ is normalized and in the JRE dir,
j.startsWith(javaHome));
} else {
1.10 +1 -12
ant/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java
Index: PresentSelectorTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/selectors/PresentSelectorTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PresentSelectorTest.java 7 Dec 2004 09:10:38 - 1.9
+++ PresentSelectorTest.java 29 Mar 2005 18:35:45 - 1.10
@@ -19,17 +19,10 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.BuildFileTest;
import org.apache.tools.ant.types.Mapper;
-import org.apache.tools.ant.util.FileNameMapper;
-import org.apache.tools.ant.util.IdentityMapper;
-import org.apache.tools.ant.util.GlobPatternMapper;
import java.io.File;
-import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
/**
* Tests Present Selectors
@@ -113,11 +106,7 @@
m = s.createMapper();
m.setType(flatten);
results = selectionString(s);
-if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) {
-assertEquals(TFFF, results);
-} else {
-assertEquals(TTTF, results);
-}
+assertEquals(TTTF, results);
s = (PresentSelector)getInstance();
s.setTargetdir(beddir);
1.9 +24 -33
diff -b (was: Re: cvs commit: ant/src/etc/testcases/taskdefs input.xml)
By the way, this kind of diff:
[EMAIL PROTECTED] wrote:
Removing old code testing for JDK 1.0 and 1.1.
Index: SunJavah.java
===
-// JDK1.1 is rather simpler than JDK1.2
-if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) {
-if (javah.getVerbose()) {
-cmd.createArgument().setValue(-v);
-}
-} else {
-if (javah.getVerbose()) {
-cmd.createArgument().setValue(-verbose);
-}
-if (javah.getOld()) {
-cmd.createArgument().setValue(-old);
-}
-if (javah.getForce()) {
-cmd.createArgument().setValue(-force);
-}
-if (javah.getStubs() !javah.getOld()) {
-throw new BuildException(stubs only available in old mode.,
- javah.getLocation());
-}
+if (javah.getVerbose()) {
+cmd.createArgument().setValue(-verbose);
+}
+if (javah.getOld()) {
+cmd.createArgument().setValue(-old);
+}
+if (javah.getForce()) {
+cmd.createArgument().setValue(-force);
+}
+if (javah.getStubs() !javah.getOld()) {
+throw new BuildException(stubs only available in old mode.,
+ javah.getLocation());
}
...is rather easier to read if you pass -b to cvs diff. In principle a
semantically important change could be skipped over, but this seems to
be rare in practice. Do we have any influence over the CVS commit mailer
script?
-J.
--
[EMAIL PROTECTED] x22801 netbeans.org ant.apache.org
if I had known it was harmless I would have killed it myself
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 31885] - [PATCH] Log JUnit TestListener events and unit test count
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=31885. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=31885 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] Summary|PATCH: Log JUnit|[PATCH] Log JUnit |TestListener events and unit|TestListener events and unit |test count |test count Target Milestone|--- |1.7 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 21:12 --- I will apply it for Ant 1.7 at least. It could, I think, be merged to 1.6.3 if - no public API changes were made to support it in ANT_16_BRANCH (e.g. use package-private access) - the diff were reworked to support that branch: I had to make a couple fixes to make it apply against trunk, but there are even more rejected hunks in the branch -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit JUnitTestListenerTest.java
jglick 2005/03/29 11:19:04
Modified:src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java JUnitTestRunner.java
Added: src/testcases/org/apache/tools/ant/taskdefs/optional/junit
JUnitTestListenerTest.java
Log:
#31885: junit logs more detailed events for individual tests it is running.
Revision ChangesPath
1.116 +47 -9
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- JUnitTask.java24 Mar 2005 08:35:49 - 1.115
+++ JUnitTask.java29 Mar 2005 19:19:04 - 1.116
@@ -34,6 +34,9 @@
import java.util.Map;
import java.util.Properties;
import java.util.Vector;
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestResult;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -41,7 +44,6 @@
import org.apache.tools.ant.taskdefs.Execute;
import org.apache.tools.ant.taskdefs.ExecuteWatchdog;
import org.apache.tools.ant.taskdefs.LogOutputStream;
-import org.apache.tools.ant.taskdefs.LogStreamHandler;
import org.apache.tools.ant.types.Assertions;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
@@ -52,9 +54,7 @@
import org.apache.tools.ant.types.PropertySet;
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.LoaderUtils;
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestResult;
+import org.apache.tools.ant.taskdefs.PumpStreamHandler;
/**
* Runs JUnit tests.
@@ -149,6 +149,11 @@
private ForkMode forkMode = new ForkMode(perTest);
private static final int STRING_BUFFER_SIZE = 128;
+/**
+ * @since Ant 1.7
+ */
+public static final String TESTLISTENER_PREFIX =
+junit.framework.TestListener: ;
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
@@ -829,6 +834,7 @@
cmd.createArgument().setValue(showoutput=
+ String.valueOf(showOutput));
+cmd.createArgument().setValue(logtestlistenerevents=true); //
#31885
StringBuffer formatterArg = new StringBuffer(STRING_BUFFER_SIZE);
final FormatterElement[] feArray = mergeFormatters(test);
@@ -871,9 +877,9 @@
+ file., e, getLocation());
}
-Execute execute = new Execute(new LogStreamHandler(this,
- Project.MSG_INFO,
- Project.MSG_WARN),
+Execute execute = new Execute(new JUnitLogStreamHandler(this,
+
Project.MSG_INFO,
+
Project.MSG_WARN),
watchdog);
execute.setCommandline(cmd.getCommandline());
execute.setAntRun(getProject());
@@ -941,7 +947,9 @@
* @since Ant 1.5
*/
protected void handleOutput(String output) {
-if (runner != null) {
+if (output.startsWith(TESTLISTENER_PREFIX))
+log(output, Project.MSG_VERBOSE);
+else if (runner != null) {
runner.handleOutput(output);
if (showOutput) {
super.handleOutput(output);
@@ -1063,7 +1071,8 @@
}
runner = new JUnitTestRunner(test, test.getHaltonerror(),
test.getFiltertrace(),
- test.getHaltonfailure(),
classLoader);
+ test.getHaltonfailure(), false,
+ true, classLoader);
if (summary) {
log(Running + test.getName(), Project.MSG_INFO);
@@ -1549,4 +1558,33 @@
public boolean timedOut = false;
public boolean crashed = false;
}
+
+/**
+ * @since Ant 1.7
+ */
+protected static class JUnitLogOutputStream extends LogOutputStream {
+private Task task; // local copy since LogOutputStream.task is
private
+
+public JUnitLogOutputStream(Task task, int level) {
+super(task, level);
+this.task = task;
+}
+
+protected void processLine(String line, int
DO NOT REPLY [Bug 31885] - [PATCH] Log JUnit TestListener events and unit test count
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=31885. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=31885 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Version|1.7Alpha (nightly) |1.6.2 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 21:19 --- Checking in src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java; /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v -- JUnitTask.java new revision: 1.116; previous revision: 1.115 done Checking in src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java; /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v -- JUnitTestRunner.java new revision: 1.57; previous revision: 1.56 done RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java,v done Checking in src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java; /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestListenerTest.java,v -- JUnitTestListenerTest.java initial revision: 1.1 done -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27285] - [PATCH] Remove reflection hacks in AntClassLoader to support JDK 1.1
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27285. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=27285 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] Target Milestone|--- |1.7 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 21:39 --- Can also simplify code even more - AntClassLoader2 is unnecessary now, can be deprecated. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 27814] - javadoc task does not encode baskslashes when generating file list by useexternalfile
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27814. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=27814 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 21:41 --- Stefan do you still plan to fix this for 1.6.3? Let me know if you want help. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant CONTRIBUTORS
jglick 2005/03/29 11:43:50 Modified:.CONTRIBUTORS Log: Mentioning Tom Ball, author of #31885. Revision ChangesPath 1.49 +1 -0 ant/CONTRIBUTORS Index: CONTRIBUTORS === RCS file: /home/cvs/ant/CONTRIBUTORS,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- CONTRIBUTORS 21 Mar 2005 13:52:45 - 1.48 +++ CONTRIBUTORS 29 Mar 2005 19:43:50 - 1.49 @@ -213,6 +213,7 @@ Tim Fennell Timothy Gerard Endres Tim Stephenson +Tom Ball Tom Dimock Tom Eugelink Ulrich Schmidt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/loader AntClassLoader2.java
jglick 2005/03/29 11:56:15
Modified:src/main/org/apache/tools/ant AntClassLoader.java
Project.java
src/main/org/apache/tools/ant/loader AntClassLoader2.java
Log:
#27285: simplify AntClassLoader by removing reflection hacks
(and separate ACL2) only needed for JDK 1.1 support.
Revision ChangesPath
1.93 +226 -59 ant/src/main/org/apache/tools/ant/AntClassLoader.java
Index: AntClassLoader.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- AntClassLoader.java 14 Mar 2005 09:19:27 - 1.92
+++ AntClassLoader.java 29 Mar 2005 19:56:15 - 1.93
@@ -14,6 +14,7 @@
* limitations under the License.
*
*/
+
package org.apache.tools.ant;
import java.io.ByteArrayOutputStream;
@@ -21,14 +22,22 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Hashtable;
+import java.util.Map;
+import java.util.StringTokenizer;
import java.util.Vector;
+import java.util.jar.Attributes;
+import java.util.jar.Attributes.Name;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.apache.tools.ant.types.Path;
@@ -192,6 +201,9 @@
*/
private Hashtable zipFiles = new Hashtable();
+/** Static map of jar file/time to manifiest class-path entries */
+private static Map/*String,String*/ pathMap =
Collections.synchronizedMap(new HashMap());
+
/**
* The context loader saved when setting the thread's current
* context loader.
@@ -203,36 +215,6 @@
private boolean isContextLoaderSaved = false;
/**
- * Reflection method reference for getProtectionDomain;
- * used to avoid 1.1-compatibility problems.
- */
-private static Method getProtectionDomain = null;
-
-/**
- * Reflection method reference for defineClassProtectionDomain;
- * used to avoid 1.1-compatibility problems.
- */
-private static Method defineClassProtectionDomain = null;
-
-
-// Set up the reflection-based Java2 methods if possible
-static {
-try {
-getProtectionDomain
-= Class.class.getMethod(getProtectionDomain, new Class[0]);
-Class protectionDomain
-= Class.forName(java.security.ProtectionDomain);
-Class[] args = new Class[] {String.class, byte[].class,
-Integer.TYPE, Integer.TYPE,
protectionDomain};
-defineClassProtectionDomain
-= ClassLoader.class.getDeclaredMethod(defineClass, args);
-} catch (Exception e) {
-// ignore failure to get access to 1.2+ methods
-}
-}
-
-
-/**
* Create an Ant Class Loader
*/
public AntClassLoader() {
@@ -452,7 +434,9 @@
}
/**
- * Add a file to the path
+ * Add a file to the path.
+ * Reads the manifest, if available, and adds any additional class path
jars
+ * specified in the manifest.
*
* @param pathComponent the file which is to be added to the path for
* this class loader
@@ -461,6 +445,66 @@
*/
protected void addPathFile(File pathComponent) throws IOException {
pathComponents.addElement(pathComponent);
+if (pathComponent.isDirectory()) {
+return;
+}
+
+String absPathPlusTimeAndLength =
+pathComponent.getAbsolutePath() + pathComponent.lastModified() +
-
++ pathComponent.length();
+String classpath = (String) pathMap.get(absPathPlusTimeAndLength);
+if (classpath == null) {
+ZipFile jarFile = null;
+InputStream manifestStream = null;
+try {
+jarFile = new ZipFile(pathComponent);
+manifestStream
+= jarFile.getInputStream(new
ZipEntry(META-INF/MANIFEST.MF));
+
+if (manifestStream == null) {
+return;
+}
+Reader manifestReader
+= new InputStreamReader(manifestStream, UTF-8);
+org.apache.tools.ant.taskdefs.Manifest
DO NOT REPLY [Bug 27285] - [PATCH] Remove reflection hacks in AntClassLoader to support JDK 1.1
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=27285. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=27285 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 21:56 --- Checking in src/main/org/apache/tools/ant/AntClassLoader.java; /home/cvs/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v -- AntClassLoader.java new revision: 1.93; previous revision: 1.92 done Checking in src/main/org/apache/tools/ant/Project.java; /home/cvs/ant/src/main/org/apache/tools/ant/Project.java,v -- Project.java new revision: 1.189; previous revision: 1.188 done More commits to come... Checking in src/main/org/apache/tools/ant/loader/AntClassLoader2.java; /home/cvs/ant/src/main/org/apache/tools/ant/loader/AntClassLoader2.java,v -- AntClassLoader2.java new revision: 1.14; previous revision: 1.13 done -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 26632] - rexec hangs
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=26632. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=26632 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 22:06 --- As mentioned by you, I downloaded the nightly build that was uploaded today i.e. commons-net-20050329.zip and tried to use it for rexec via ant. But still Ant just hangs waiting for some thing. Am i doing the wrong thing? or the bug still needs to be fixed ? Thanks Anumeh Andharmule (In reply to comment #4) The main problem with using rexec() is that we provide support for more than one command using nested read/write elements - though I don't have the slightest idea whether this is actually going to work at all. I've changed the code to use the rexec call in the (common, I guess) situation that username, password and command have been specified and no additional read/write elements are there. I've also fixed the docs that (wrongly) stated username, password and command were required. But I've also noted that this probably is the best way to use the task. Reading through the code, I don't understand how the command attribute does anything. Does it actually work for anybody? Anyway, could you please try nightly build 2005-03-15 or later to see whether it works now? This fix still needs to get merged into Ant 1.6.3, which I won't do unless I get confirmation that it actually works (I lack the environment to test it). -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32941] - [PATCH] ExecuteJava should not catch ThreadDeath
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32941. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32941 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |ASSIGNED Target Milestone|--- |1.7 Version|1.7Alpha (nightly) |1.6.2 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 22:07 --- For now, just dealing with the particular case of ExecuteJava.execute(), since this is a place where the active Ant thread is likely to be waiting for a significant amount of time: wait(); and where a ThreadDeath is likely to be sent to if the main thread is halted. There are certainly other places where Throwable is caught where it should not be, but I don't have time to fix all of them now. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ExecuteJava.java
jglick 2005/03/29 12:39:00
Modified:src/main/org/apache/tools/ant/taskdefs ExecuteJava.java
Log:
#32941: do not try to catch ThreadDeath when java fork=false is halted.
Revision ChangesPath
1.50 +4 -0
ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
Index: ExecuteJava.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ExecuteJava.java 11 Mar 2005 14:56:48 - 1.49
+++ ExecuteJava.java 29 Mar 2005 20:39:00 - 1.50
@@ -146,6 +146,7 @@
thread = new Thread(this, ExecuteJava);
Task currentThreadTask
= project.getThreadTask(Thread.currentThread());
+// XXX is the following really necessary? it is in the same
thread group...
project.registerThreadTask(thread, currentThreadTask);
// if we run into a timeout, the run-away thread shall not
// make the VM run forever - if no timeout occurs, Ant's
@@ -180,6 +181,9 @@
+ classpath);
} catch (SecurityException e) {
throw e;
+} catch (ThreadDeath e) {
+// XXX could perhaps also call thread.stop(); not sure if anyone
cares
+throw e;
} catch (Throwable e) {
throw new BuildException(e);
} finally {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ExecuteJava.java
jglick 2005/03/29 12:40:01
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
ExecuteJava.java
Log:
Merge of #32941: do not catch ThreadDeath when java fork=false is halted.
Revision ChangesPath
No revision
No revision
1.38.2.7 +2 -0
ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
Index: ExecuteJava.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
retrieving revision 1.38.2.6
retrieving revision 1.38.2.7
diff -u -r1.38.2.6 -r1.38.2.7
--- ExecuteJava.java 4 Feb 2005 08:13:46 - 1.38.2.6
+++ ExecuteJava.java 29 Mar 2005 20:40:01 - 1.38.2.7
@@ -172,6 +172,8 @@
+ classpath);
} catch (SecurityException e) {
throw e;
+} catch (ThreadDeath e) {
+throw e;
} catch (Throwable e) {
throw new BuildException(e);
} finally {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32941] - [PATCH] ExecuteJava should not catch ThreadDeath
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32941. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32941 [EMAIL PROTECTED] changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||FIXED Target Milestone|1.7 |1.6.3 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 22:40 --- Checking in src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java; /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v -- ExecuteJava.java new revision: 1.50; previous revision: 1.49 done Checking in src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java; /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v -- ExecuteJava.java new revision: 1.38.2.7; previous revision: 1.38.2.6 done -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30162] - [PATCH] Avoid potential memory leaks from IntrospectionHelper.helpers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30162. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30162 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] Target Milestone|--- |1.7 --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 23:31 --- Revising strategy a bit. I am unfortunately not aware of any way to prevent some IH objects from being collected on occasion while the Class still exists, since the IH must retain a reference to the Class (e.g. it holds Method's defined by it) - and Java provides no way to make two objects live or die as a pair. This could be problematic for performance. However the rest of the patch should still at least be an improvement - no one in main Ant code would be calling IH.gH(Class) any more. IH.gH(Project,Class) will still use a cache, but this is cleared when any build finishes (not necessarily the one that asked for the IH, by the way). Interactive environments such as NetBeans do have to call gh(Class), for purposes of code completion, as there is no associated project - so these IH instances will not be cached. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33361] - Java.executeJava should install default Permissions and check ExitException code when failonerror=false for non forked calls
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33361. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=33361 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 23:43 --- This is rather unfortunate as it eliminates one of the only (admittedly poor) workarounds for http://www.netbeans.org/issues/show_bug.cgi?id=47645 and makes the bug be triggered on any java fork=false. The basic problem is that Ant should not be setting a global security manager without consulting an embedding environment first. I will file a separate bug for that when I get a chance. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant Project.java
jglick 2005/03/29 13:46:36 Modified:src/main/org/apache/tools/ant Project.java Log: Avoid hypothetical memory leak by not holding a strong reference to the thread or thread groups used as keys to report task associations. Revision ChangesPath 1.190 +7 -4 ant/src/main/org/apache/tools/ant/Project.java Index: Project.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Project.java,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- Project.java 29 Mar 2005 19:56:15 - 1.189 +++ Project.java 29 Mar 2005 21:46:36 - 1.190 @@ -23,6 +23,7 @@ import java.io.InputStream; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.util.Collections; import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; @@ -31,6 +32,8 @@ import java.util.Vector; import java.util.Set; import java.util.HashSet; +import java.util.Map; +import java.util.WeakHashMap; import org.apache.tools.ant.input.DefaultInputHandler; import org.apache.tools.ant.input.InputHandler; import org.apache.tools.ant.helper.DefaultExecutor; @@ -157,11 +160,11 @@ */ private ClassLoader coreLoader = null; -/** Records the latest task to be executed on a thread (Thread to Task). */ -private Hashtable threadTasks = new Hashtable(); +/** Records the latest task to be executed on a thread. */ +private Map/*Thread,Task*/ threadTasks = Collections.synchronizedMap(new WeakHashMap()); -/** Records the latest task to be executed on a thread Group. */ -private Hashtable threadGroupTasks = new Hashtable(); +/** Records the latest task to be executed on a thread group. */ +private Map/*ThreadGroup,Task*/ threadGroupTasks = Collections.synchronizedMap(new WeakHashMap()); /** * Called to handle any input requests. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs AntStructure.java
jglick 2005/03/29 13:47:59
Modified:src/main/org/apache/tools/ant IntrospectionHelper.java
ProjectHelper.java UnknownElement.java
src/main/org/apache/tools/ant/helper ProjectHelperImpl.java
src/main/org/apache/tools/ant/taskdefs AntStructure.java
Log:
#30162: try to avoid a memory leak in IntrospectionHelper.getHelper().
Revision ChangesPath
1.94 +14 -9
ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
Index: IntrospectionHelper.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- IntrospectionHelper.java 16 Dec 2004 21:11:19 - 1.93
+++ IntrospectionHelper.java 29 Mar 2005 21:47:59 - 1.94
@@ -310,12 +310,7 @@
* @return a helper for the specified class
*/
public static synchronized IntrospectionHelper getHelper(Class c) {
-IntrospectionHelper ih = (IntrospectionHelper) helpers.get(c);
-if (ih == null) {
-ih = new IntrospectionHelper(c);
-helpers.put(c, ih);
-}
-return ih;
+return getHelper(null, c);
}
/**
@@ -332,9 +327,19 @@
* @return a helper for the specified class
*/
public static IntrospectionHelper getHelper(Project p, Class c) {
-IntrospectionHelper ih = getHelper(c);
-// Cleanup at end of project
-p.addBuildListener(ih);
+IntrospectionHelper ih = (IntrospectionHelper) helpers.get(c);
+if (ih == null) {
+ih = new IntrospectionHelper(c);
+if (p != null) {
+// #30162: do *not* cache this if there is no project, as we
+// cannot guarantee that the cache will be cleared.
+helpers.put(c, ih);
+}
+}
+if (p != null) {
+// Cleanup at end of project
+p.addBuildListener(ih);
+}
return ih;
}
1.115 +3 -5 ant/src/main/org/apache/tools/ant/ProjectHelper.java
Index: ProjectHelper.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ProjectHelper.java13 Dec 2004 16:43:51 - 1.114
+++ ProjectHelper.java29 Mar 2005 21:47:59 - 1.115
@@ -304,9 +304,7 @@
}
IntrospectionHelper ih =
-IntrospectionHelper.getHelper(target.getClass());
-
-project.addBuildListener(ih);
+IntrospectionHelper.getHelper(project, target.getClass());
for (int i = 0; i attrs.getLength(); i++) {
// reflect these into the target
@@ -368,7 +366,7 @@
target = ((TypeAdapter) target).getProxy();
}
-IntrospectionHelper.getHelper(target.getClass()).addText(project,
+IntrospectionHelper.getHelper(project,
target.getClass()).addText(project,
target, text);
}
@@ -388,7 +386,7 @@
public static void storeChild(Project project, Object parent,
Object child, String tag) {
IntrospectionHelper ih
-= IntrospectionHelper.getHelper(parent.getClass());
+= IntrospectionHelper.getHelper(project, parent.getClass());
ih.storeElement(project, parent, child, tag);
}
1.88 +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.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- UnknownElement.java 3 Mar 2005 14:02:32 - 1.87
+++ UnknownElement.java 29 Mar 2005 21:47:59 - 1.88
@@ -320,7 +320,7 @@
String parentUri = getNamespace();
Class parentClass = parent.getClass();
-IntrospectionHelper ih = IntrospectionHelper.getHelper(parentClass);
+IntrospectionHelper ih = IntrospectionHelper.getHelper(getProject(),
parentClass);
if (children != null) {
1.30 +1 -1
ant/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java
Index: ProjectHelperImpl.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ProjectHelperImpl.java6 Jan 2005 12:05:09 - 1.29
DO NOT REPLY [Bug 30162] - [PATCH] Avoid potential memory leaks from IntrospectionHelper.helpers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30162. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30162 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-03-29 23:48 --- Checking in src/main/org/apache/tools/ant/IntrospectionHelper.java; /home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v -- IntrospectionHelper.java new revision: 1.94; previous revision: 1.93 done Checking in src/main/org/apache/tools/ant/ProjectHelper.java; /home/cvs/ant/src/main/org/apache/tools/ant/ProjectHelper.java,v -- ProjectHelper.java new revision: 1.115; previous revision: 1.114 done Checking in src/main/org/apache/tools/ant/UnknownElement.java; /home/cvs/ant/src/main/org/apache/tools/ant/UnknownElement.java,v -- UnknownElement.java new revision: 1.88; previous revision: 1.87 done More commits to come... Checking in src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java; /home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java,v -- ProjectHelperImpl.java new revision: 1.30; previous revision: 1.29 done More commits to come... Checking in src/main/org/apache/tools/ant/taskdefs/AntStructure.java; /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AntStructure.java,v -- AntStructure.java new revision: 1.44; previous revision: 1.43 done -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
jglick 2005/03/29 13:48:36 Modified:.WHATSNEW Log: Updated from recent commits. Revision ChangesPath 1.798 +8 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.797 retrieving revision 1.798 diff -u -r1.797 -r1.798 --- WHATSNEW 29 Mar 2005 18:23:46 - 1.797 +++ WHATSNEW 29 Mar 2005 21:48:36 - 1.798 @@ -48,6 +48,9 @@ Fixed bugs: --- +* Memory leak from IntrospectionHelper.getHelper(Class) in embedded + environments. Bugzilla Report 30162. + * Translate task does not remove tokens when a key is not found. It logs a verbose message. Bugzilla Report 13936. @@ -79,6 +82,8 @@ Other changes: -- +* Log fine-grained events at verbose level from JUnit. Bugzilla report 31885. + * javadoc can now take an attribute 'executable'. Bugzilla report 30606. * WsdlToDotnet and style are now deprecated in favor of wsdltodotnet and @@ -322,6 +327,9 @@ Fixed bugs: --- +* Do not pass on ThreadDeath when halting java fork=false. Bugzilla + 32941. + * Killing a thread running java fork=true (e.g. from an IDE) would not stop the forked process. Bugzilla 31928. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
jglick 2005/03/29 13:49:03 Modified:.Tag: ANT_16_BRANCH WHATSNEW Log: Updated from recent commits. Revision ChangesPath No revision No revision 1.503.2.210 +3 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.209 retrieving revision 1.503.2.210 diff -u -r1.503.2.209 -r1.503.2.210 --- WHATSNEW 28 Mar 2005 21:42:13 - 1.503.2.209 +++ WHATSNEW 29 Mar 2005 21:49:02 - 1.503.2.210 @@ -141,6 +141,9 @@ Fixed bugs: --- +* Do not pass on ThreadDeath when halting java fork=false. Bugzilla + 32941. + * Killing a thread running java fork=true (e.g. from an IDE) would not stop the forked process. Bugzilla 31928. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34229] New: - Need ability to intercept calls to System.setSecurityManager() from embedded environment
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34229. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34229 Summary: Need ability to intercept calls to System.setSecurityManager() from embedded environment Product: Ant Version: 1.6.2 Platform: All OS/Version: All Status: NEW Severity: major Priority: P2 Component: Core tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] OtherBugsDependingO 33361 nThis: Any kind of container which runs Ant in-VM, such as the NetBeans IDE, that has its own SecurityManager already will need a way to intercept calls to System.setSecurityManager() made from Ant's Permissions class, since the VM can have only one global SM at a time. Currently attempting to use java fork=false in any mode which uses Permissions (incl. failonerror=true in Ant 1.6.x and always in 1.7) will just break with a SecurityException when run in an embedded environment like this. Could be solved by providing a hook in Ant letting the container manage some of the permissions, e.g. delegating from the VM-wide master SM to a thread/threadgroup-specific SM provided by Ant. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33361] - Java.executeJava should install default Permissions and check ExitException code when failonerror=false for non forked calls
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33361. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=33361 [EMAIL PROTECTED] changed: What|Removed |Added BugsThisDependsOn||34229 -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. You are on the CC list for the bug, or are watching someone who is. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util ConcatFileInputStream.java
mbenson 2005/03/29 15:20:06
Modified:src/main/org/apache/tools/ant/util
ConcatFileInputStream.java
Log:
Fix uppercase CODE tags
Revision ChangesPath
1.7 +12 -12
ant/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java
Index: ConcatFileInputStream.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ConcatFileInputStream.java2 Feb 2005 12:52:50 - 1.6
+++ ConcatFileInputStream.java29 Mar 2005 23:20:06 - 1.7
@@ -28,7 +28,7 @@
import org.apache.tools.ant.Task;
/**
- * Special CODEInputStream/CODE that will
+ * Special codeInputStream/code that will
* concatenate the contents of an array of files.
*/
public class ConcatFileInputStream extends InputStream {
@@ -41,9 +41,9 @@
private ProjectComponent managingPc;
/**
- * Construct a new CODEConcatFileInputStream/CODE
- * with the specified CODEFile[]/CODE.
- * @param file CODEFile[]/CODE.
+ * Construct a new codeConcatFileInputStream/code
+ * with the specified codeFile[]/code.
+ * @param file codeFile[]/code.
* @throws IOException if I/O errors occur.
*/
public ConcatFileInputStream(File[] file) throws IOException {
@@ -67,18 +67,18 @@
}
/**
- * Set a managing CODETask/CODE for
- * this CODEConcatFileInputStream/CODE.
- * @param task the managing CODETask/CODE.
+ * Set a managing codeTask/code for
+ * this codeConcatFileInputStream/code.
+ * @param task the managing codeTask/code.
*/
public void setManagingTask(Task task) {
setManagingComponent(task);
}
/**
- * Set a managing CODETask/CODE for
- * this CODEConcatFileInputStream/CODE.
- * @param task the managing CODETask/CODE.
+ * Set a managing codeTask/code for
+ * this codeConcatFileInputStream/code.
+ * @param task the managing codeTask/code.
*/
public void setManagingComponent(ProjectComponent pc) {
this.managingPc = pc;
@@ -86,8 +86,8 @@
/**
* Log a message with the specified logging level.
- * @param messagethe CODEString/CODE message.
- * @param loglevel the CODEint/CODE logging level.
+ * @param messagethe codeString/code message.
+ * @param loglevel the codeint/code logging level.
*/
public void log(String message, int loglevel) {
if (managingPc != null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util ConcatFileInputStream.java
mbenson 2005/03/29 15:21:34
Modified:src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
ConcatFileInputStream.java
Log:
Sync
Revision ChangesPath
No revision
No revision
1.1.2.4 +12 -12
ant/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java
Index: ConcatFileInputStream.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/ConcatFileInputStream.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ConcatFileInputStream.java4 Feb 2005 08:13:47 - 1.1.2.3
+++ ConcatFileInputStream.java29 Mar 2005 23:21:34 - 1.1.2.4
@@ -28,7 +28,7 @@
import org.apache.tools.ant.Task;
/**
- * Special CODEInputStream/CODE that will
+ * Special codeInputStream/code that will
* concatenate the contents of an array of files.
*/
public class ConcatFileInputStream extends InputStream {
@@ -41,9 +41,9 @@
private ProjectComponent managingPc;
/**
- * Construct a new CODEConcatFileInputStream/CODE
- * with the specified CODEFile[]/CODE.
- * @param file CODEFile[]/CODE.
+ * Construct a new codeConcatFileInputStream/code
+ * with the specified codeFile[]/code.
+ * @param file codeFile[]/code.
* @throws IOException if I/O errors occur.
*/
public ConcatFileInputStream(File[] file) throws IOException {
@@ -67,18 +67,18 @@
}
/**
- * Set a managing CODETask/CODE for
- * this CODEConcatFileInputStream/CODE.
- * @param task the managing CODETask/CODE.
+ * Set a managing codeTask/code for
+ * this codeConcatFileInputStream/code.
+ * @param task the managing codeTask/code.
*/
public void setManagingTask(Task task) {
setManagingComponent(task);
}
/**
- * Set a managing CODETask/CODE for
- * this CODEConcatFileInputStream/CODE.
- * @param task the managing CODETask/CODE.
+ * Set a managing codeTask/code for
+ * this codeConcatFileInputStream/code.
+ * @param task the managing codeTask/code.
*/
public void setManagingComponent(ProjectComponent pc) {
this.managingPc = pc;
@@ -86,8 +86,8 @@
/**
* Log a message with the specified logging level.
- * @param messagethe CODEString/CODE message.
- * @param loglevel the CODEint/CODE logging level.
+ * @param messagethe codeString/code message.
+ * @param loglevel the codeint/code logging level.
*/
public void log(String message, int loglevel) {
if (managingPc != null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
