DO NOT REPLY [Bug 32975] - Make XmlFormatter for junittask (optinally) lighter
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=32975.
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=32975
--- Additional Comments From [EMAIL PROTECTED] 2005-02-18 05:22 ---
Created an attachment (id=14310)
-- (http://issues.apache.org/bugzilla/attachment.cgi?id=14310action=view)
prevents XMLJUnitFormatter from outputting properties unless the verbose flag
is set
eg:
junit printsummary=yes fork=yes haltonfailure=no
classpath
pathelement location=${build.dir} /
pathelement location=${lib.dir}/junit/junit.jar /
/classpath
formatter type=xml usefFile=true verbose=false/
/junit
tested on WindowsXP with JDK1.5.0, using HEAD. tested with fork=yes and
forkno. Under test, brought the file size of the XML generated down by 75%
(from 8Kb - 2Kb). Sorry no JUnit tests for this (ironically I suppose)
--
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/xdocs faq.xml
bodewig 2005/02/18 00:11:51 Modified:docs external.html faq.html xdocsfaq.xml Log: Uninstall the ant RPMs hint by Robert Koberg Revision ChangesPath 1.195 +1 -1 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- external.html 2 Feb 2005 10:20:10 - 1.194 +++ external.html 18 Feb 2005 08:11:50 - 1.195 @@ -3755,7 +3755,7 @@ /th td colspan=1 rowspan=1 valign=top align=left - a href=http://www.nurflugel.com/webstart/AntScriptVisualizer;http://www.nurflugel.com/webstart/AntScriptVisualizer/a + a href=http://www.nurflugel.com/webstart/AntScriptVisualizer/;http://www.nurflugel.com/webstart/AntScriptVisualizer//a /td /tr tr 1.116 +25 -0 ant/docs/faq.html Index: faq.html === RCS file: /home/cvs/ant/docs/faq.html,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- faq.html 27 Jan 2005 12:40:49 - 1.115 +++ faq.html 18 Feb 2005 08:11:50 - 1.116 @@ -204,6 +204,10 @@ I get checksum errors when I try to extract the codetar.gz/code distribution file. Why? /a/li +lia href=#RedHat_ES_3 + How do you get ant-1.6.x (or any version later than + 1.5.2) to work on on RedHat ES 3? + /a/li /ul h4 class=tocHow do I .../h4 ul @@ -632,6 +636,27 @@ found a href=http://www.gnu.org/software/tar/tar.html;here/a, or use the zip archive instead (you can extract it using codejar xf/code)./p +p class=faq + a name=RedHat_ES_3/a + How do you get ant-1.6.x (or any version later than + 1.5.2) to work on on RedHat ES 3? +/p + pRedhat ES 3.0 comes installed with ant 1.5.2. Even if you +have your PATH and ANT_HOME variables set correctly to a later +version of ant, you will always be forced to use the +preinstalled version./p +pTo use a later version of ant on this OS you could do the +following:/p +pre class=code +$ ant -version +Apache Ant version 1.5.2-23 compiled on November 12 2003 +$ su - +# rpm -e ant ant-libs +# exit +$ hash -r +$ ant -version +Apache Ant version 1.6.2 compiled on July 16 2004 +/pre p class=faq a name=implement-os-specific-configuration/a How do I realize os--specific configurations? 1.68 +24 -0 ant/xdocs/faq.xml Index: faq.xml === RCS file: /home/cvs/ant/xdocs/faq.xml,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- faq.xml 10 Jan 2005 08:37:07 - 1.67 +++ faq.xml 18 Feb 2005 08:11:51 - 1.68 @@ -225,6 +225,30 @@ codejar xf/code)./p /answer /faq + +faq id=RedHat_ES_3 + questionHow do you get ant-1.6.x (or any version later than + 1.5.2) to work on on RedHat ES 3?/question + answer +pRedhat ES 3.0 comes installed with ant 1.5.2. Even if you +have your PATH and ANT_HOME variables set correctly to a later +version of ant, you will always be forced to use the +preinstalled version./p + +pTo use a later version of ant on this OS you could do the +following:/p + +source![CDATA[ +$ ant -version +Apache Ant version 1.5.2-23 compiled on November 12 2003 +$ su - +# rpm -e ant ant-libs +# exit +$ hash -r +$ ant -version +Apache Ant version 1.6.2 compiled on July 16 2004 +]]/source/answer +/faq /faqsection faqsection title=How do I ... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/xdocs external.xml
bodewig 2005/02/18 00:36:09 Modified:docs external.html xdocsexternal.xml Log: Update Ant Pretty Build information Revision ChangesPath 1.196 +11 -9 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- external.html 18 Feb 2005 08:11:50 - 1.195 +++ external.html 18 Feb 2005 08:36:09 - 1.196 @@ -593,13 +593,15 @@ a name=Ant Pretty Build/a Ant Pretty Build /h4 -pAnt Pretty Build is a tool to show and run Ant buildfiles -directly from within a browser window. It consists of a -single XSL file that will generate, on the fly, from -buildfile, a pretty interface showing project name, -description, properties and targets, etc. allowing to run the -whole project, or run selected targets in a specific -order./p +pAnt Pretty Build is a tool to easily show and run Ant +buildfiles directly from within a browser window. It consists +of a single XSL file that will generate, on the fly, in the +browser, from the .xml buildfile, a pretty interface showing +project name, description, properties and targets, etc. sorted +or unsorted, allowing to modify/add properties, run the whole +project, or run selected set of targets in a specific order, +with the ability to modify logger/logfile, mode and add more +libs or command line arguments./p table class=externals cellspacing=1 cellpadding=4 tr th colspan=1 rowspan=1 @@ -628,7 +630,7 @@ /th td colspan=1 rowspan=1 valign=top align=left - a href=mailto:[EMAIL PROTECTED]Charbel BITAR/a + a href=http://antprettybuild.free.fr/;Charbel BITAR (Project's Contact Page)/a /td /tr tr @@ -638,7 +640,7 @@ /th td colspan=1 rowspan=1 valign=top align=left - GNU General Public License (GPL) + Apache Software License 2.0 /td /tr /table 1.154 +11 -9 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- external.xml 2 Feb 2005 10:20:11 - 1.153 +++ external.xml 18 Feb 2005 08:36:09 - 1.154 @@ -261,13 +261,15 @@ subsection name=Ant Pretty Build -pAnt Pretty Build is a tool to show and run Ant buildfiles -directly from within a browser window. It consists of a -single XSL file that will generate, on the fly, from -buildfile, a pretty interface showing project name, -description, properties and targets, etc. allowing to run the -whole project, or run selected targets in a specific -order./p +pAnt Pretty Build is a tool to easily show and run Ant +buildfiles directly from within a browser window. It consists +of a single XSL file that will generate, on the fly, in the +browser, from the .xml buildfile, a pretty interface showing +project name, description, properties and targets, etc. sorted +or unsorted, allowing to modify/add properties, run the whole +project, or run selected set of targets in a specific order, +with the ability to modify logger/logfile, mode and add more +libs or command line arguments./p table class=externals tr @@ -280,11 +282,11 @@ /tr tr thContact:/th -tda href=mailto:[EMAIL PROTECTED]Charbel BITAR/a/td +tda href=http://antprettybuild.free.fr/;Charbel BITAR (Projectapos;s Contact Page)/a/td /tr tr thLicense:/th -tdGNU General Public License (GPL)/td +tdApache Software License 2.0/td /tr /table /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [GUMP@brutus]: Project test-ant (in module ant) failed
On Thu, 17 Feb 2005, Matt Benson [EMAIL PROTECTED] wrote: What kind of setups are people able to make this fail on? Nothing special. Ant's CVS HEAD, junit 3.8.1 and JDK 1.3.1 - on the Mac 1.4.2. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [GUMP@brutus]: Project test-ant (in module ant) failed
Stefan Bodewig wrote: On Thu, 17 Feb 2005, Matt Benson [EMAIL PROTECTED] wrote: What kind of setups are people able to make this fail on? Nothing special. Ant's CVS HEAD, junit 3.8.1 and JDK 1.3.1 - on the Mac 1.4.2. For me, it is Ant's CVS HEAD, junit 3.8.1, jdk 1.4.2_03 and jdk 1.6.0-ea on Fedora Core 2. I will look at the issue over the week-end. Peter 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]
DO NOT REPLY [Bug 32975] - Make XmlFormatter for junittask (optinally) lighter
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=32975. 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=32975 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 10:30 --- On a quick look at the patch, I noticed one problem. The interface JUnitResultFormatter has been extended with one new method (setVerbose). As JUnitResultFormatter is a public interface, and is the way for 3'th party formatters to be added to ant, the change is not backward compatible. -- 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 32975] - Make XmlFormatter for junittask (optinally) lighter
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=32975. 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=32975 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 10:42 --- Damn! Sorry about that. Can you suggest a way to refactor the code, I'd be willing to do the work, but I can't see how to make this change right now (brain freeze). -- 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 32649] - ant-produced jar files don't match those produced by java.util.jar.JarOutputStream
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=32649. 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=32649 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 11:16 --- I've found a document that mentions the magic number. See the last paragraph in http://java.sun.com/j2se/1.4.2/docs/guide/jar/jarGuide.html. Now we only need to find a public file that says what the value of magic number is and where it has to go. GNU file 4.13 doesn't recognize it. Hmm, Solaris 10 sources? -- 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 33618] - telnet fails with java.lang.NullPointerException
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=33618. 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=33618 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 11:47 --- For some reason you don't seem to set host_address on your second invocation. Also, it is quite possible that this is a big in common-net. Which version are you using? Can you give us a --debug output for the task? -- 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/types AbstractFileSet.java
peterreilly2005/02/18 02:49:27
Modified:.build.xml
src/main/org/apache/tools/ant/types AbstractFileSet.java
Log:
clear the cached directory scanner when cloning an abstractfileset
Revision ChangesPath
1.455 +0 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- build.xml 16 Feb 2005 17:40:07 - 1.454
+++ build.xml 18 Feb 2005 10:49:27 - 1.455
@@ -333,7 +333,6 @@
exclude unless=run.failing.tests
name=${optional.package}/jdepend/JDependTest.java/
exclude unless=run.failing.tests
name=${optional.package}/DotnetTest.java/
exclude unless=run.failing.tests
name=${optional.package}/WsdlToDotnetTest.java/
-exclude unless=run.failing.tests
name=${ant.package}/taskdefs/CloneTest.java/
/patternset
!--
1.45 +1 -0
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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- AbstractFileSet.java 11 Feb 2005 18:05:07 - 1.44
+++ AbstractFileSet.java 18 Feb 2005 10:49:27 - 1.45
@@ -784,6 +784,7 @@
.addElement(((PatternSet) e.nextElement()).clone());
}
fs.selectors = (Vector) fs.selectors.clone();
+fs.directoryScanner = null; // Clear the cached directory
scanner
return fs;
} catch (CloneNotSupportedException e) {
throw new BuildException(e);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [GUMP@brutus]: Project test-ant (in module ant) failed
I found the problem, My ant installation was not what I thought, and was sligtly out of sync with the cvs head. With this the test worked, but after syncing it did not. So there must have been a change that caused the failure, I remembered that changes had been made to cache a directory scanner and on checking saw that this was in abstractfileset ;- this was the cause of the problem, on cloning the cached scanner needed to be cleared. Peter Matt Benson wrote: --- Stefan Bodewig [EMAIL PROTECTED] wrote: CloneTest fails on my Linux machine outside of Gump as well. What kind of setups are people able to make this fail on? I have gotten access to a Linux box but the tests pass for me. :( -Matt Cheers Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Mail - Easier than ever with enhanced search. Learn more. http://info.mail.yahoo.com/mail_250 - 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]
DO NOT REPLY [Bug 33618] - telnet fails with java.lang.NullPointerException
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=33618. 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=33618 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.6.3 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 12:00 --- OK, I think I see the problem. We call disconnect even when connect fails and disconnect in commons-net tries to close a stream that hasn't been opened unless connect succeeded. This should be fixed in CVS now, could you please try a nightly build of 2005-02-19 or later to verify it? -- 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/optional/net RExecTask.java TelnetTask.java
bodewig 2005/02/18 03:00:58
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/net
RExecTask.java TelnetTask.java
Log:
Don't close SocketClients if connect has failed, PR 33618
Revision ChangesPath
1.748 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.747
retrieving revision 1.748
diff -u -r1.747 -r1.748
--- WHATSNEW 14 Feb 2005 14:39:37 - 1.747
+++ WHATSNEW 18 Feb 2005 11:00:57 - 1.748
@@ -318,6 +318,10 @@
exec, apply, or java tasks was always logged to System.out
instead of to the managing Task.
+* telnet and rexec would try to disconnect from servers they never
+ connetced to, potentially leading to exceptions in commons-net.
+ Bugzilla Report 33618.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===
1.10 +10 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
Index: RExecTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RExecTask.java22 Nov 2004 09:23:34 - 1.9
+++ RExecTask.java18 Feb 2005 11:00:58 - 1.10
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -342,15 +342,15 @@
/** Keep reading input stream until end of it or time-out */
rexec.waitForEOF(defaultTimeout);
} finally {
- if (rexec != null) {
- try {
- rexec.disconnect();
- } catch (IOException e) {
- throw new BuildException(Error disconnecting from
-+ server);
- }
- }
- }
+if (rexec != null rexec.isConnected()) {
+try {
+rexec.disconnect();
+} catch (IOException e) {
+throw new BuildException(Error disconnecting from
+ + server);
+}
+}
+}
}
/**
* Process a 'typical' login. If it differs, use the read
1.30 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
Index: TelnetTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TelnetTask.java 22 Nov 2004 09:23:34 - 1.29
+++ TelnetTask.java 18 Feb 2005 11:00:58 - 1.30
@@ -1,5 +1,5 @@
/*
- * Copyright 2000,2002-2004 The Apache Software Foundation
+ * Copyright 2000,2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@
task.execute(telnet);
}
} finally {
- if (telnet != null) {
+ if (telnet != null telnet.isConnected()) {
try {
telnet.disconnect();
} catch (IOException e) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net RExecTask.java TelnetTask.java
bodewig 2005/02/18 03:04:28
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/net Tag:
ANT_16_BRANCH RExecTask.java TelnetTask.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.177 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.176
retrieving revision 1.503.2.177
diff -u -r1.503.2.176 -r1.503.2.177
--- WHATSNEW 14 Feb 2005 22:05:31 - 1.503.2.176
+++ WHATSNEW 18 Feb 2005 11:04:28 - 1.503.2.177
@@ -200,6 +200,10 @@
exec, apply, or java tasks was always logged to System.out
instead of to the managing Task.
+* telnet and rexec would try to disconnect from servers they never
+ connetced to, potentially leading to exceptions in commons-net.
+ Bugzilla Report 33618.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===
No revision
No revision
1.4.2.5 +10 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java
Index: RExecTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/RExecTask.java,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- RExecTask.java23 Jun 2004 12:32:03 - 1.4.2.4
+++ RExecTask.java18 Feb 2005 11:04:28 - 1.4.2.5
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -342,15 +342,15 @@
/** Keep reading input stream until end of it or time-out */
rexec.waitForEOF(defaultTimeout);
} finally {
- if (rexec != null) {
- try {
- rexec.disconnect();
- } catch (IOException e) {
- throw new BuildException(Error disconnecting from
-+ server);
- }
- }
- }
+if (rexec != null rexec.isConnected()) {
+try {
+rexec.disconnect();
+} catch (IOException e) {
+throw new BuildException(Error disconnecting from
+ + server);
+}
+}
+}
}
/**
* Process a 'typical' login. If it differs, use the read
1.20.2.7 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
Index: TelnetTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java,v
retrieving revision 1.20.2.6
retrieving revision 1.20.2.7
diff -u -r1.20.2.6 -r1.20.2.7
--- TelnetTask.java 23 Jun 2004 12:26:35 - 1.20.2.6
+++ TelnetTask.java 18 Feb 2005 11:04:28 - 1.20.2.7
@@ -1,5 +1,5 @@
/*
- * Copyright 2000,2002-2004 The Apache Software Foundation
+ * Copyright 2000,2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@
task.execute(telnet);
}
} finally {
- if (telnet != null) {
+ if (telnet != null telnet.isConnected()) {
try {
telnet.disconnect();
} catch (IOException e) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33585] - ClassNotFoundException For junit
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=33585.
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=33585
--- Additional Comments From [EMAIL PROTECTED] 2005-02-18 12:25 ---
In the set-classpath target you add your class files to the classpath, which is
not what you want. The definiion should read
path id=project.class.path
fileset dir=${source.lib}
patternset
include name=**/*.jar/
/patternset
/fileset
pathelement location=${build.classes}/
/path
instead.
--
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 33583] - javac task ZipException - linux - java 1.5
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=33583. 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=33583 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 12:27 --- It looks as if the jar file containing ../actions/EventAction.class was corrupt. What does jar tf that-jar-file say? -- 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 33482] - include ecj build.compiler option
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=33482. 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=33482 [EMAIL PROTECTED] changed: What|Removed |Added Severity|normal |enhancement -- 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 33482] - include ecj build.compiler option
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=33482. 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=33482 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 12:30 --- What if the eclipse team decides to move the class? -- 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 33412] - jar archive update excluding 'defaultexcludes' fails
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=33412. 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=33412 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] Target Milestone|--- |1.6.3 -- 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 33583] - javac task ZipException - linux - java 1.5
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=33583. 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=33583 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 13:06 --- The fileS that raise the error are ALL the class files that ant will not compile because nothing changed. These files are not corrupt since the web application works fine. jar -tf one-of-the-class-files exits with non messages. -- 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/testcases/org/apache/tools/ant/taskdefs ZipTest.java
bodewig 2005/02/18 04:19:37
Modified:src/etc/testcases/taskdefs zip.xml
src/testcases/org/apache/tools/ant/taskdefs ZipTest.java
Log:
Test for PR 33412
Revision ChangesPath
1.18 +11 -0 ant/src/etc/testcases/taskdefs/zip.xml
Index: zip.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/zip.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- zip.xml 2 Feb 2005 23:55:51 - 1.17
+++ zip.xml 18 Feb 2005 12:19:37 - 1.18
@@ -156,6 +156,17 @@
/fail
/target
+ !-- Bugzilla Report 33412 --
+ target name=testDefaultExcludesAndUpdate
+mkdir dir=ziptest/
+touch file=ziptest/ziptest~/
+zip destfile=test3.zip basedir=ziptest defaultexcludes=false/
+touch file=ziptest/ziptest2/
+zip destfile=test3.zip basedir=ziptest
+ defaultexcludes=false
+ update=true/
+ /target
+
target name=cleanup
delete file=test3.zip/
delete file=test4.zip/
1.26 +20 -3
ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
Index: ZipTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ZipTest.java 4 Feb 2005 08:02:59 - 1.25
+++ ZipTest.java 18 Feb 2005 12:19:37 - 1.26
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.IOException;
import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
import java.util.zip.ZipFile;
import java.util.Enumeration;
@@ -49,9 +50,9 @@
expectBuildException(test3, zip cannot include itself);
}
-//public void test4() {
-//expectBuildException(test4, zip cannot include itself);
-//}
+//public void test4() {
+//expectBuildException(test4, zip cannot include itself);
+//}
public void tearDown() {
try {
@@ -148,4 +149,20 @@
public void testCompressionLevel() {
executeTarget(testCompressionLevel);
}
+
+// Bugzilla Report 33412
+public void testDefaultExcludesAndUpdate()
+throws ZipException, IOException {
+executeTarget(testDefaultExcludesAndUpdate);
+ZipFile f = null;
+try {
+f = new ZipFile(getProject().resolveFile(test3.zip));
+assertNotNull(ziptest~ should be included,
+ f.getEntry(ziptest~));
+} finally {
+if (f != null) {
+f.close();
+}
+}
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33412] - jar archive update excluding 'defaultexcludes' fails
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=33412. 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=33412 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 13:24 --- please verify the problem has been fixed with a nightly build of 2005-02-19 or later. -- 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 Zip.java
bodewig 2005/02/18 04:24:16
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs Zip.java
Log:
zip update ignored defaultexcludes, PR 33412
Revision ChangesPath
1.749 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.748
retrieving revision 1.749
diff -u -r1.748 -r1.749
--- WHATSNEW 18 Feb 2005 11:00:57 - 1.748
+++ WHATSNEW 18 Feb 2005 12:24:15 - 1.749
@@ -322,6 +322,9 @@
connetced to, potentially leading to exceptions in commons-net.
Bugzilla Report 33618.
+* zip's defaultexcludes attribute was ignored when an archive was
+ updated. Bugzilla Report 33412.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===
1.136 +2 -0 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- Zip.java 2 Feb 2005 23:55:50 - 1.135
+++ Zip.java 18 Feb 2005 12:24:16 - 1.136
@@ -524,6 +524,8 @@
ZipFileSet oldFiles = new ZipFileSet();
oldFiles.setProject(getProject());
oldFiles.setSrc(renamedFile);
+oldFiles.setDefaultexcludes(getImplicitFileSet()
+.getDefaultexcludes());
for (int i = 0; i addedFiles.size(); i++) {
PatternSet.NameEntry ne = oldFiles.createExclude();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33583] - javac task ZipException - linux - java 1.5
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=33583. 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=33583 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 13:28 --- One of the JARs on your CLASSPATH or the classpath of the javac task contains the class - and this one seems to be corrupt. The other reason I could imagine why a ZoException gets raised is that you have the classes themselves, not your target directory on the classpath. What does your javac task look like? -- 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/types AbstractFileSet.java
bodewig 2005/02/18 04:29:51
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Zip.java
src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
AbstractFileSet.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.178 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.177
retrieving revision 1.503.2.178
diff -u -r1.503.2.177 -r1.503.2.178
--- WHATSNEW 18 Feb 2005 11:04:28 - 1.503.2.177
+++ WHATSNEW 18 Feb 2005 12:29:50 - 1.503.2.178
@@ -204,6 +204,9 @@
connetced to, potentially leading to exceptions in commons-net.
Bugzilla Report 33618.
+* zip's defaultexcludes attribute was ignored when an archive was
+ updated. Bugzilla Report 33412.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===
No revision
No revision
1.116.2.13 +2 -0 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.116.2.12
retrieving revision 1.116.2.13
diff -u -r1.116.2.12 -r1.116.2.13
--- Zip.java 18 Jan 2005 12:40:01 - 1.116.2.12
+++ Zip.java 18 Feb 2005 12:29:51 - 1.116.2.13
@@ -482,6 +482,8 @@
ZipFileSet oldFiles = new ZipFileSet();
oldFiles.setProject(getProject());
oldFiles.setSrc(renamedFile);
+oldFiles.setDefaultexcludes(getImplicitFileSet()
+.getDefaultexcludes());
for (int i = 0; i addedFiles.size(); i++) {
PatternSet.NameEntry ne = oldFiles.createExclude();
No revision
No revision
1.29.2.6 +9 -0
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.29.2.5
retrieving revision 1.29.2.6
diff -u -r1.29.2.5 -r1.29.2.6
--- AbstractFileSet.java 10 Dec 2004 21:52:32 - 1.29.2.5
+++ AbstractFileSet.java 18 Feb 2005 12:29:51 - 1.29.2.6
@@ -267,6 +267,15 @@
}
/**
+ * Whether default exclusions should be used or not.
+ * @since Ant 1.6.3
+ */
+public boolean getDefaultexcludes() {
+return (isReference())
+? getRef(getProject()).getDefaultexcludes() : useDefaultExcludes;
+}
+
+/**
* Sets case sensitivity of the file system.
*
* @param isCaseSensitive codeboolean/code.
-
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
bodewig 2005/02/18 04:30:31
Modified:src/main/org/apache/tools/ant/types AbstractFileSet.java
Log:
Needed getDefaulexcludes in 1.6.3 for PR 33412
Revision ChangesPath
1.46 +1 -1
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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- AbstractFileSet.java 18 Feb 2005 10:49:27 - 1.45
+++ AbstractFileSet.java 18 Feb 2005 12:30:31 - 1.46
@@ -329,7 +329,7 @@
/**
* Whether default exclusions should be used or not.
- * @since Ant 1.7
+ * @since Ant 1.6.3
*/
public synchronized boolean getDefaultexcludes() {
return (isReference())
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33310] - Zip task can't zip files larger than 2GB (2^31 bytes int limit reached) : invalid entry size
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=33310. 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=33310 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 13:37 --- The field inside of a ZIP local or central file header is four bytes long, so the ZIP format can't store files larger than 4GB itself. -- 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 33583] - javac task ZipException - linux - java 1.5
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=33583.
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=33583
--- Additional Comments From [EMAIL PROTECTED] 2005-02-18 13:43 ---
...
path id=sms-all-classes
fileset dir=${bin}
include name=**/*.class/
/fileset
fileset dir=${jakarta.home}\common
include name=**/*.class/
/fileset
fileset dir=${jakarta.home}\server
include name=**/*.class/
/fileset
fileset dir=${jakarta.home}\shared
include name=**/*.class/
/fileset
/path
path id=sms-all-jars
fileset dir=${lib}
include name=**/*.jar/
/fileset
fileset dir=${jakarta.home}\common
include name=**/*.jar/
/fileset
fileset dir=${jakarta.home}\server
include name=**/*.jar/
/fileset
fileset dir=${jakarta.home}\shared
include name=**/*.jar/
/fileset
/path
path id=sms-all
path refid=sms-all-jars/
path refid=sms-all-classes/
/path
target name=init
tstamp/
/target
target name=compile depends=init
javac
classpathref=sms-all
srcdir=${src}
destdir=${bin}
listfiles=yes
/
...
--
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 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 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 13:44 --- I would love if this sandbox could use a sort of facade pattern that would allow support for different SVN engines to plug inside. You are providing an svn.exe kind of engine. But we may be able to convince others to provide pure java engines or JNI engines so people can plug the one best for their environments. What do people think -- 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 33583] - javac task ZipException - linux - java 1.5
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=33583.
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=33583
[EMAIL PROTECTED] changed:
What|Removed |Added
Status|NEW |RESOLVED
Resolution||INVALID
--- Additional Comments From [EMAIL PROTECTED] 2005-02-18 14:06 ---
You are getting the exception because you are placing class files in
the classpath - for example at the command line:
javac -cp classes/peter/Hello.class -d x -sourcepath src src/peter/Hello.java
error: error reading classes/peter/Hello.class; java.util.zip.ZipException:
error in opening zip file
You need to change the sms-all-classes to something like:
path id=sms-all-classes
pathelement location=${bin}/
pathelement location=${jakarta.home}/common/
.. etc
/path
--
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/testcases/org/apache/tools/zip ZipOutputStreamTest.java
bodewig 2005/02/18 05:15:28
Modified:.WHATSNEW
src/main/org/apache/tools/zip ZipOutputStream.java
src/testcases/org/apache/tools/zip ZipOutputStreamTest.java
Log:
Allo zip to store files with size between 2GB and 4GB
Revision ChangesPath
1.750 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.749
retrieving revision 1.750
diff -u -r1.749 -r1.750
--- WHATSNEW 18 Feb 2005 12:24:15 - 1.749
+++ WHATSNEW 18 Feb 2005 13:15:28 - 1.750
@@ -325,6 +325,9 @@
* zip's defaultexcludes attribute was ignored when an archive was
updated. Bugzilla Report 33412.
+* zip couldn't store files with size between 2GB and 4GB (the
+ upper limit set by the ZIP format itself). Bugzilla Report 33310.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===
1.34 +18 -3 ant/src/main/org/apache/tools/zip/ZipOutputStream.java
Index: ZipOutputStream.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipOutputStream.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ZipOutputStream.java 2 Feb 2005 23:55:51 - 1.33
+++ ZipOutputStream.java 18 Feb 2005 13:15:28 - 1.34
@@ -336,8 +336,8 @@
deflate();
}
-entry.setSize(def.getTotalIn());
-entry.setComprSize(def.getTotalOut());
+entry.setSize(adjustToLong(def.getTotalIn()));
+entry.setComprSize(adjustToLong(def.getTotalOut()));
entry.setCrc(realCrc);
def.reset();
@@ -877,4 +877,19 @@
out.write(data, offset, length);
}
}
+
+/**
+ * Assumes a negative integer really is a positive integer that
+ * has wrapped around and re-creates the original value.
+ *
+ * @since 1.34
+ */
+protected static long adjustToLong(int i) {
+if (i 0) {
+return 2 * ((long) Integer.MAX_VALUE) + 2 + i;
+} else {
+return i;
+}
+}
+
}
1.3 +10 -1
ant/src/testcases/org/apache/tools/zip/ZipOutputStreamTest.java
Index: ZipOutputStreamTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/zip/ZipOutputStreamTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ZipOutputStreamTest.java 12 Nov 2004 12:15:13 - 1.2
+++ ZipOutputStreamTest.java 18 Feb 2005 13:15:28 - 1.3
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 The Apache Software Foundation
+ * Copyright 2004-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -66,4 +66,13 @@
assertEquals(test.getValue(), zl.getValue());
}
+public void testAdjustToLong() {
+assertEquals((long) Integer.MAX_VALUE,
+ ZipOutputStream.adjustToLong(Integer.MAX_VALUE));
+assertEquals(((long) Integer.MAX_VALUE) + 1,
+ ZipOutputStream.adjustToLong(Integer.MAX_VALUE + 1));
+assertEquals(2 * ((long) Integer.MAX_VALUE),
+ ZipOutputStream.adjustToLong(2 * Integer.MAX_VALUE));
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/zip ZipOutputStream.java
bodewig 2005/02/18 05:16:48
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/zip Tag: ANT_16_BRANCH
ZipOutputStream.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.179 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.178
retrieving revision 1.503.2.179
diff -u -r1.503.2.178 -r1.503.2.179
--- WHATSNEW 18 Feb 2005 12:29:50 - 1.503.2.178
+++ WHATSNEW 18 Feb 2005 13:16:47 - 1.503.2.179
@@ -207,6 +207,9 @@
* zip's defaultexcludes attribute was ignored when an archive was
updated. Bugzilla Report 33412.
+* zip couldn't store files with size between 2GB and 4GB (the
+ upper limit set by the ZIP format itself). Bugzilla Report 33310.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===
No revision
No revision
1.17.2.8 +19 -4 ant/src/main/org/apache/tools/zip/ZipOutputStream.java
Index: ZipOutputStream.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipOutputStream.java,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -u -r1.17.2.7 -r1.17.2.8
--- ZipOutputStream.java 18 May 2004 08:15:08 - 1.17.2.7
+++ ZipOutputStream.java 18 Feb 2005 13:16:48 - 1.17.2.8
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -326,8 +326,8 @@
deflate();
}
-entry.setSize(def.getTotalIn());
-entry.setComprSize(def.getTotalOut());
+entry.setSize(adjustToLong(def.getTotalIn()));
+entry.setComprSize(adjustToLong(def.getTotalOut()));
entry.setCrc(realCrc);
def.reset();
@@ -829,4 +829,19 @@
out.write(data, offset, length);
}
}
+
+/**
+ * Assumes a negative integer really is a positive integer that
+ * has wrapped around and re-creates the original value.
+ *
+ * @since 1.17.2.8
+ */
+protected static long adjustToLong(int i) {
+if (i 0) {
+return 2 * ((long) Integer.MAX_VALUE) + 2 + i;
+} else {
+return i;
+}
+}
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33310] - Zip task can't zip files larger than 2GB (2^31 bytes int limit reached) : invalid entry size
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=33310. 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=33310 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.6.3 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 14:16 --- Should be fixed now, please verify with a nightly build of 2005-02-19 or later. Kev, your patch would miss files with a compressed size 2GB. -- 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 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 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 14:19 --- Jose Alberto, you are more than welcome to contribute to it ;-) Actually, it wouldn't be too hard to turn AbstractSvnTask into such a facade, although the parsers for the changelog and tag/revisiondiff tasks also rely on the format of the output generated by the command line - this would be harder to hide. -- 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/docs/manual/CoreTasks import.html
bodewig 2005/02/18 05:32:19 Modified:docs/manual/CoreTasks import.html Log: Clarify docs, PR 33282 Revision ChangesPath 1.18 +3 -3 ant/docs/manual/CoreTasks/import.html Index: import.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/import.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- import.html 19 Nov 2004 09:07:09 - 1.17 +++ import.html 18 Feb 2005 13:32:19 - 1.18 @@ -34,14 +34,14 @@ h4Target overriding/h4 pIf a target in the main file is also present in at least one of the -imported files, it takes precedence./p +imported files, the one from the main file takes precedence./p pSo if I import for example a idocsbuild.xml/i file named bbuilddocs/b, that contains a quot;bdocs/bquot; target, I can redefine it in my main buildfile and that is the one that will be called. This makes it easy to keep the same target name, so that the overriding target is still called by any other targets--in either the main or imported buildfile(s)--for which -it is a dependency, with a different implementation. The original target is +it is a dependency, with a different implementation. The target from idocsbuild.xml/i is made available by the name quot;bbuilddocs/bb.docs/bquot;. This enables the new implementation to call the old target, thus ienhancing/i it with tasks called before or after it./p @@ -148,7 +148,7 @@ pImports the project defined by the property deploy-platform/p hr -p align=centerCopyright copy; 2003-2004 The Apache Software +p align=centerCopyright copy; 2003-2005 The Apache Software Foundation. All rights Reserved./p /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks import.html
bodewig 2005/02/18 05:32:38 Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH import.html Log: merge Revision ChangesPath No revision No revision 1.6.2.12 +3 -3 ant/docs/manual/CoreTasks/import.html Index: import.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/import.html,v retrieving revision 1.6.2.11 retrieving revision 1.6.2.12 diff -u -r1.6.2.11 -r1.6.2.12 --- import.html 19 Nov 2004 09:10:00 - 1.6.2.11 +++ import.html 18 Feb 2005 13:32:38 - 1.6.2.12 @@ -34,14 +34,14 @@ h4Target overriding/h4 pIf a target in the main file is also present in at least one of the -imported files, it takes precedence./p +imported files, the one from the main file takes precedence./p pSo if I import for example a idocsbuild.xml/i file named bbuilddocs/b, that contains a quot;bdocs/bquot; target, I can redefine it in my main buildfile and that is the one that will be called. This makes it easy to keep the same target name, so that the overriding target is still called by any other targets--in either the main or imported buildfile(s)--for which -it is a dependency, with a different implementation. The original target is +it is a dependency, with a different implementation. The target from idocsbuild.xml/i is made available by the name quot;bbuilddocs/bb.docs/bquot;. This enables the new implementation to call the old target, thus ienhancing/i it with tasks called before or after it./p @@ -148,7 +148,7 @@ pImports the project defined by the property deploy-platform/p hr -p align=centerCopyright copy; 2003-2004 The Apache Software +p align=centerCopyright copy; 2003-2005 The Apache Software Foundation. All rights Reserved./p /body - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33282] - Import task documentation is unclear
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=33282. 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=33282 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 14:33 --- Docs have been clarified in CVS. Actaully the add-on here is the main build file. Think of the imported file as a generic template that gets refined by the main build file. -- 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 33282] - Import task documentation is unclear
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=33282. 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=33282 [EMAIL PROTECTED] changed: What|Removed |Added Target Milestone|--- |1.6.3 -- 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 INSTALL build.xml
bodewig 2005/02/18 05:38:46
Modified:.build.xml
Added: .INSTALL
Log:
Some people expect an INSTALL file, PR 33273
Revision ChangesPath
1.456 +2 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -r1.455 -r1.456
--- build.xml 18 Feb 2005 10:49:27 - 1.455
+++ build.xml 18 Feb 2005 13:38:46 - 1.456
@@ -1011,6 +1011,7 @@
copy todir=${dist.dir}
fileset dir=.
include name=README/
+include name=INSTALL/
include name=LICENSE/
include name=LICENSE.xerces/
include name=LICENSE.dom/
@@ -1104,6 +1105,7 @@
copy todir=${src.dist.dir}
fileset dir=.
include name=README/
+include name=INSTALL/
include name=LICENSE/
include name=LICENSE.xerces/
include name=LICENSE.dom/
1.1 ant/INSTALL
Index: INSTALL
===
For installation instructions see the manual in the docs subdirectory
or online at http://ant.apache.org/manual/index.html.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant INSTALL
bodewig 2005/02/18 05:38:58 Added: .Tag: ANT_16_BRANCH INSTALL Log: merge Revision ChangesPath No revision No revision 1.1.2.1 +0 -0 ant/INSTALL - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33273] - INSTALL file is missing
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=33273. 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=33273 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Target Milestone|--- |1.6.3 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 14:39 --- Added a pointer to the manual. -- 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 33192] - java task doesn't pass debug options properly.
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=33192. 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=33192 [EMAIL PROTECTED] changed: What|Removed |Added Component|Core tasks |Documentation -- 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 33162] - OutOfMemoryException when compiling a large project
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=33162. 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=33162 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 14:43 --- Does it help if your fork the compiler? Maybe Ant is taking the tiny bit of additional memory that pushes your compilation over the edge. -- 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 build.xml
bodewig 2005/02/18 05:46:03
Modified:.Tag: ANT_16_BRANCH build.xml
Log:
merge
Revision ChangesPath
No revision
No revision
1.392.2.38 +2 -0 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.37
retrieving revision 1.392.2.38
diff -u -r1.392.2.37 -r1.392.2.38
--- build.xml 4 Feb 2005 08:13:45 - 1.392.2.37
+++ build.xml 18 Feb 2005 13:46:03 - 1.392.2.38
@@ -979,6 +979,7 @@
copy todir=${dist.dir}
fileset dir=.
include name=README/
+include name=INSTALL/
include name=LICENSE/
include name=LICENSE.xerces/
include name=LICENSE.dom/
@@ -1072,6 +1073,7 @@
copy todir=${src.dist.dir}
fileset dir=.
include name=README/
+include name=INSTALL/
include name=LICENSE/
include name=LICENSE.xerces/
include name=LICENSE.dom/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33118] - Filescanner toasts on directory without read permissions
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=33118.
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=33118
--- Additional Comments From [EMAIL PROTECTED] 2005-02-18 14:50 ---
because of these lines in accountForIncludedDirectory
if (fast (included || couldHoldIncluded(name))) {
scandir(file, name + File.separator, fast);
}
included is true, so we scan.
I think it should be
if (fast couldHoldIncluded(name + '/')) {
scandir(file, name + File.separator, fast);
}
but need some more time to look through all the side effects if such a change.
--
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 33111] - copy with fileset corrupts binary files
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=33111. 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=33111 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 14:54 --- Ant has copied binary files since Ant 1.1 and even earlier, Peter 8-) If you say it only fails on AIX, then we'll need some more help from you, Jaggu. I don't think anybody of us committers has access to AIX right now. Could you please give Ant 1.6.2 or even better a recent nightly build a try so that we have a point to start from that's not too far back in the past? -- 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 33061] - OutOfMemoryError with custom Task in sub-build
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=33061. 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=33061 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 15:11 --- Hmm, we had a memory leak which was fixed before Ant 1.6.2 http://cvs.apache.org/viewcvs.cgi/ant/src/main/org/apache/tools/ant/AntClassLoader.java?r1=1.76.2.6r2=1.76.2.7 Testing with CVS HEAD I can see the memory usage grow as you describe. -- 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]
Re: [GUMP@brutus]: Project test-ant (in module ant) failed
--- Peter Reilly [EMAIL PROTECTED] wrote: For me, it is Ant's CVS HEAD, junit 3.8.1, jdk 1.4.2_03 and jdk 1.6.0-ea on Fedora Core 2. I will look at the issue over the week-end. I'd appreciate it. I am NOT seeing the test fail w/ Ant CVS HEAD (or my version of it), junit 3.8.1, jdk 1.4.2_05 on Fedora Core 2 . Maybe I should try a pure HEAD Ant build. Thanks, Matt Peter __ Do you Yahoo!? The all-new My Yahoo! - What will yours do? http://my.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33162] - OutOfMemoryException when compiling a large project
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=33162. 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=33162 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 17:23 --- Is fork an option to the compilation process? Otherwise, how do I do that? -- 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 33118] - Filescanner toasts on directory without read permissions
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=33118. 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=33118 --- Additional Comments From [EMAIL PROTECTED] 2005-02-18 17:23 --- I thought the same thing, except I forgot to add the trailing '/' when I tested it. IIRC this broke one of the copy testcases, but your version may not. -- 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 33626] - Uptodate condition is not workinge
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=33626.
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=33626
--- Additional Comments From [EMAIL PROTECTED] 2005-02-18 17:39 ---
(In reply to comment #0)
Executing the following:
uptodate property=jar.uptodate targetfile=D:\test.html
srcfile=D:\test.html/
echo message=jar.uptodate=${jar.uptodate}/
The message: jar.uptodate=true will be printed even though I am pointing to
the
exact same file. Following is the documentation taken from the 1.6.2 manual
for
Uptodate:
By default, the value of the property is set to true if the timestamp of the
target file(s) is more recent than the timestamp of the corresponding source
file(s). You can set the value to something other than the default by
specifying the value attribute.
Based on the documentation, the property should not have been set at all.
This was found when I upgraded from Ant 1.5.1 to 1.6.2.
It is working as expected in 1.5.1
Thanks for the reply.
I was able to change my logic to make this work.
It would be helpful if the documentation is updated, especially because the way
the logic is setup now, it's pretty confusing and almost does not match with
the condition name anymore. I'm not suggesting that the condition name be
changed, but it does seem that the condition would now be better named: updated
instead of uptodate. Updating the documentation would be a great help in the
future.
Thanks.
--
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: [GUMP@brutus]: Project test-ant (in module ant) failed
--- Peter Reilly [EMAIL PROTECTED] wrote: I found the problem, My ant installation was not what I thought, and was sligtly out of sync with the cvs head. With this the test worked, but after syncing it did not. So there must have been a change that caused the failure, I remembered that changes had been made to cache a directory scanner and on checking saw that this was in abstractfileset ;- this was the cause of the problem, on cloning the cached scanner needed to be cleared. Hmmm, I thought of this, but I dismissed it. My reasoning was that the cloned fileset would be the same as the original and could share a reference to the same ds object. When the additional selector was added to the cloned fileset, the stored directoryscanner reference should then have been nulled. The last test script I sent verified that different directoryscanner instances were returned. The shallow copy performed by Object.clone() should have copied the reference over, so a different scanner should not have been returned unless the addition of the selector had modified the cloned fileset. Can anyone point out a loophole in this logic to explain why nulling the reference solves the problem? Thanks, Matt Peter Matt Benson wrote: --- Stefan Bodewig [EMAIL PROTECTED] wrote: CloneTest fails on my Linux machine outside of Gump as well. What kind of setups are people able to make this fail on? I have gotten access to a Linux box but the tests pass for me. :( -Matt Cheers Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Mail - Easier than ever with enhanced search. Learn more. http://info.mail.yahoo.com/mail_250 - 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] __ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33626] - Uptodate documentation is unclear regarding the comparisons made on files
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=33626. 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=33626 [EMAIL PROTECTED] changed: What|Removed |Added Component|Core tasks |Documentation Summary|Uptodate condition is not |Uptodate documentation is |workinge|unclear regarding the ||comparisons made on files Target Milestone|--- |1.6.3 -- 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 33638] New: - CvsTagDiff does not support module-names containing spaces
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=33638. 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=33638 Summary: CvsTagDiff does not support module-names containing spaces Product: Ant Version: 1.6.2 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Core tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] There is no way I can supply module-names containing spaces to the package- attribute. I recon this is due to the fact that 'space' is used as the module- seperator, but this i quite unfortunate since cvsnt supports modulenames containing spaces. I've identified the CvsTagDiff-task-class and it appears that it make use of the StringTokenizer for parsing the list of modules in the package-attribute. I suggest using another delimeter than the default, eg. semicolon. I have succesfully tried this modification of Ant 1.6.2. Unfortunately this change would break with existing ant-scripts, and thus another solution could be to introduce a nested element, call it eg. package or module, allowing a user to specify multiple cvs-modules to be included in the task. Hereby we both preserve backward compatibility and introduce support for exotic csv-module-names. -- 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/types AbstractFileSet.java
peterreilly2005/02/18 08:57:23
Modified:src/main/org/apache/tools/ant/types AbstractFileSet.java
Log:
adding a selector to abstractfileset did not null the cached directory scanner
now there is no need to null the directory scanner when cloning
Revision ChangesPath
1.47 +1 -1
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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- AbstractFileSet.java 18 Feb 2005 12:30:31 - 1.46
+++ AbstractFileSet.java 18 Feb 2005 16:57:23 - 1.47
@@ -586,6 +586,7 @@
throw noChildrenAllowed();
}
selectors.addElement(selector);
+directoryScanner = null;
}
/* Methods below all add specific selectors */
@@ -784,7 +785,6 @@
.addElement(((PatternSet) e.nextElement()).clone());
}
fs.selectors = (Vector) fs.selectors.clone();
-fs.directoryScanner = null; // Clear the cached directory
scanner
return fs;
} catch (CloneNotSupportedException e) {
throw new BuildException(e);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [GUMP@brutus]: Project test-ant (in module ant) failed
Matt Benson wrote: --- Peter Reilly [EMAIL PROTECTED] wrote: I found the problem, My ant installation was not what I thought, and was sligtly out of sync with the cvs head. With this the test worked, but after syncing it did not. So there must have been a change that caused the failure, I remembered that changes had been made to cache a directory scanner and on checking saw that this was in abstractfileset ;- this was the cause of the problem, on cloning the cached scanner needed to be cleared. Hmmm, I thought of this, but I dismissed it. My reasoning was that the cloned fileset would be the same as the original and could share a reference to the same ds object. When the additional selector was added to the cloned fileset, the stored directoryscanner reference should then have been nulled. AbstractFileSet#appendSelector() does not null the directoryscanner reference. I have fixed this now and removed the nulling when cloning. Peter The last test script I sent verified that different directoryscanner instances were returned. The shallow copy performed by Object.clone() should have copied the reference over, so a different scanner should not have been returned unless the addition of the selector had modified the cloned fileset. Can anyone point out a loophole in this logic to explain why nulling the reference solves the problem? Thanks, Matt Peter Matt Benson wrote: --- Stefan Bodewig [EMAIL PROTECTED] wrote: CloneTest fails on my Linux machine outside of Gump as well. What kind of setups are people able to make this fail on? I have gotten access to a Linux box but the tests pass for me. :( -Matt Cheers Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Mail - Easier than ever with enhanced search. Learn more. http://info.mail.yahoo.com/mail_250 - 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] __ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail - 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: [GUMP@brutus]: Project test-ant (in module ant) failed
--- Peter Reilly [EMAIL PROTECTED] wrote: AbstractFileSet#appendSelector() does not null the directoryscanner reference. I have fixed this now and removed the nulling when cloning. Yup, just saw that. Now I feel good and dumb, haha. :) Thanks, Matt Peter The last test script I sent verified that different directoryscanner instances were returned. The shallow copy performed by Object.clone() should have copied the reference over, so a different scanner should not have been returned unless the addition of the selector had modified the cloned fileset. Can anyone point out a loophole in this logic to explain why nulling the reference solves the problem? Thanks, Matt Peter Matt Benson wrote: --- Stefan Bodewig [EMAIL PROTECTED] wrote: CloneTest fails on my Linux machine outside of Gump as well. What kind of setups are people able to make this fail on? I have gotten access to a Linux box but the tests pass for me. :( -Matt Cheers Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Mail - Easier than ever with enhanced search. Learn more. http://info.mail.yahoo.com/mail_250 - 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] __ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] === message truncated === __ Do you Yahoo!? Yahoo! Mail - Find what you need with new enhanced search. http://info.mail.yahoo.com/mail_250 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32975] - Make XmlFormatter for junittask (optinally) lighter
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=32975.
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=32975
--- Additional Comments From [EMAIL PROTECTED] 2005-02-18 19:08 ---
I can think of using ant-types
formatter usefile=yes
junit.xmlformatter verbose=yes/
/formatter
Change to Formatter.java:
private JUnitResultFormatter byReflection;
public void add(JUnitResultFormatter byReflection) {
this.byReflection = byReflection;
}
/**
* @since Ant 1.6
*/
JUnitResultFormatter createFormatter(ClassLoader loader)
throws BuildException {
JUnitResultFormatter r = byReflection;
if (byReflection == null) {
}
}
if (useFile outFile != null) {
try {
out = new FileOutputStream(outFile);
} catch (java.io.IOException e) {
throw new BuildException(e);
}
}
r.setOutput(out);
return r;
}
* not tested completly *
--
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 32727] - Version 1.6.2 doesn't include becl package??
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=32727.
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=32727
[EMAIL PROTECTED] changed:
What|Removed |Added
Status|RESOLVED|VERIFIED
--- Additional Comments From [EMAIL PROTECTED] 2005-02-18 19:55 ---
Hi Folks,
I have experienced the same Issue.
Ant 1.6.2 integrated in Eclipse 3.0.1.
Ive even tried downloading the bcel libs,
but still no resolution...
--Swapnish
(In reply to comment #0)
Hi,
I am using Ant 1.6.2 library to build ejbjar, I have the folwoing target
target name=ejbJAR
ejbjar
basejarname=ejbjarForWS
srcdir=${builddir}/tcmgEar
destdir=${builddir}
descriptordir=${builddir}/tcmgEar/TcmgEJB
classpath=${builddir}/tcmgEar/APP-INF/classes
/ejbjar
/target
while performing giving the following error:
Unable to load dependency analyzer:
org.apache.tools.ant.util.depend.bcel.AncestorAnalyzer - dependent class not
found: org/apache/bcel/classfile/ClassParser
Please suggest.
Thanks,
Suman
--
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]
macro/for fun
Anyone from ant-contrib want to add a caveat to the documentation of the for task? Being based on macrodefs, for is the only place I know of where this comes into play: since the @ character is escaped with another (@@) in macrodefs/for, nested for loops must double-escape the @ character (). This applies to for loops appearing in macros as well. Looks like the rule is an additional two '@'s per nesting level. So no nesting = @@, one level deep = , and two levels deep = @@ . -Matt __ Do you Yahoo!? Yahoo! Mail - now with 250MB free storage. Learn more. http://info.mail.yahoo.com/mail_250 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant Task.java
stevel 2005/02/18 14:07:36
Modified:src/main/org/apache/tools/ant Task.java
Log:
Move the logic to bind a created task to an existing one into Task.
Revision ChangesPath
1.63 +14 -0 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Task.java 28 Jan 2005 17:27:09 - 1.62
+++ Task.java 18 Feb 2005 22:07:36 - 1.63
@@ -475,4 +475,18 @@
protected RuntimeConfigurable getWrapper() {
return wrapper;
}
+
+/**
+ * Bind a task to another; use this when configuring a newly created
+ * task to do work on behalf of another.
+ * Project, OwningTarget, TaskName, Location and Description are all
copied
+ * @param owner owning target
+ */
+public final void bindToOwner(Task owner) {
+setProject(owner.getProject());
+setOwningTarget(owner.getOwningTarget());
+setTaskName(owner.getTaskName());
+setDescription(owner.getDescription());
+setLocation(owner.getLocation());
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ExecTask.java Java.java
stevel 2005/02/18 14:09:44
Modified:src/main/org/apache/tools/ant/taskdefs ExecTask.java
Java.java
Log:
these two get new constructors that do the config, as they get created so
often.
Revision ChangesPath
1.78 +19 -0 ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ExecTask.java 26 Jan 2005 22:58:12 - 1.77
+++ ExecTask.java 18 Feb 2005 22:09:44 - 1.78
@@ -24,6 +24,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+import org.apache.tools.ant.ProjectComponent;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Environment;
import org.apache.tools.ant.types.Path;
@@ -72,6 +73,24 @@
*/
private boolean vmLauncher = true;
+
+/**
+ * Create an instance.
+ * Needs to be configured by binding to a project.
+ */
+public ExecTask() {
+}
+
+/**
+ * create an instance that is helping another task.
+ * Project, OwningTarget, TaskName and description are all
+ * pulled out
+ * @param owner task that we belong to
+ */
+public ExecTask(Task owner) {
+bindToOwner(owner);
+}
+
/**
* Set whether or not you want the process to be spawned.
* Default is false.
1.101 +14 -0 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- Java.java 4 Feb 2005 15:38:19 - 1.100
+++ Java.java 18 Feb 2005 22:09:44 - 1.101
@@ -74,6 +74,20 @@
private boolean incompatibleWithSpawn = false;
/**
+ * Normal constructor
+ */
+public Java() {
+}
+
+/**
+ * create a bound task
+ * @param owner owner
+ */
+public Java(Task owner) {
+bindToOwner(owner);
+}
+
+/**
* Do the execution.
* @throws BuildException if failOnError is set to true and the
application
* returns a nonzero result code.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
stevel 2005/02/18 15:28:00
Modified:
src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers
AntResolver.java URLResolver.java
src/main/org/apache/tools/ant/taskdefs GenerateKey.java
SubAnt.java Ant.java CallTarget.java SignJar.java
LoadProperties.java
src/main/org/apache/tools/ant/taskdefs/optional/j2ee
WebLogicHotDeploymentTool.java
GenericHotDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/clearcase
ClearCase.java
src/main/org/apache/tools/ant/taskdefs/optional
IContract.java Cab.java RenameExtensions.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb
WLRun.java BorlandGenerateClient.java
DDCreator.java WLStop.java
WeblogicDeploymentTool.java
BorlandDeploymentTool.java JonasDeploymentTool.java
Ejbc.java WebsphereDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp
WLJspc.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
JasperC.java
src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
Log:
This commit eliminates all (but one) use of Project.createTask(some name)
from the codebase. It also sets up all created tasks using the new
Task.bindToOwner call.
I'm tempted to retrofit Task.bindToOwner back to the 1.6.x codebase, for the
benefit of third party tasks; same for the extra constructors for exec and
java. Thoughts?
Revision ChangesPath
1.12 +4 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java
Index: AntResolver.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AntResolver.java 10 Dec 2004 10:58:19 - 1.11
+++ AntResolver.java 18 Feb 2005 23:27:58 - 1.12
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 The Apache Software Foundation
+ * Copyright 2002-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -69,7 +69,8 @@
final Project project) throws BuildException {
validate();
-final Ant ant = (Ant) project.createTask(ant);
+final Ant ant = new Ant();
+ant.setProject(project);
ant.setInheritAll(false);
ant.setAntfile(antfile.getName());
1.12 +4 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java
Index: URLResolver.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- URLResolver.java 10 Dec 2004 10:58:19 - 1.11
+++ URLResolver.java 18 Feb 2005 23:27:59 - 1.12
@@ -1,5 +1,5 @@
/*
- * Copyright 2002,2004 The Apache Software Foundation
+ * Copyright 2002,2004-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -71,7 +71,8 @@
final File file = getDest();
-final Get get = (Get) project.createTask(get);
+final Get get = new Get();
+get.setProject(project);
get.setDest(file);
get.setSrc(url);
get.execute();
1.29 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
Index: GenerateKey.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- GenerateKey.java 4 Jun 2004 07:44:54 - 1.28
+++ GenerateKey.java 18 Feb 2005 23:27:59 - 1.29
@@ -1,5 +1,5 @@
/*
- * Copyright 2000,2002,2004 The Apache Software Foundation
+ * Copyright 2000,2002,2004-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -354,7 +354,7 @@
}
log(Generating Key for + alias);
-final ExecTask cmd =
