DO NOT REPLY [Bug 32551] New: - Add path support to import task
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=32551. 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=32551 Summary: Add path support to import task Product: Ant Version: 1.6.2 Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P2 Component: Core AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I'd like to request the addition of filelist support to import. I am trying to build a backstop system where users may or may not pull the complete build library from the CM repository. If the library isn't in the developer's personal workarea (read: home directory) then all import operations go against a list of alternate locations (KGB, integration area, team shared area, etc.) Currently I'm using available to check a list of possible places, but this has the drawback of requiring lots of code to support what amounts to a filelist. I'd like to see import operate like many other tasks and accept a fileset or filelist as a contained element. Then I could write: import filelist.../filelist /import and have import bring in the first file located. (Fileset support would be nice to have but not quite so useful in my case because it's not ordered and I cannot guarantee that only one occurrence of the file exists.) Ideally would be a top-level vpath element, but that seems much harder. -- 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]
[GUMP@brutus]: Project ant-embed-optional (in module ant) success
To whom it may satisfy... 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 ant-embed-optional *no longer* has an issue. The current state of this project is 'Success'. Full details are available at: http://brutus.apache.org/gump/public/ant/ant-embed-optional/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on jakarta-velocity exists, no need to add for property velocity-dep.jar. -DEBUG- Dependency on ant exists, no need to add for property ant.home. -INFO- No license on redistributable project with outputs. The following work was performed: http://brutus.apache.org/gump/public/ant/ant-embed-optional/gump_work/build_ant_ant-embed-optional.html Work Name: build_ant_ant-embed-optional (Type: Build) Work ended in a state of : Success Elapsed: 3 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:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djxpath.jar=/usr/local/gump/public/workspace/jakarta-commons/jxpath/dist/commons-jxpath.jar -Dcommons-discovery.jar=/usr/local/gump/public/workspace/jakarta-commons/discovery/dist/commons-discovery.jar -Dant.home=/usr/local/gump/public/workspace/ant/dist -Dvelocity-dep.jar=/usr/local/gump/public/workspace/jakarta-velocity/bin/velocity-06122004.jar -Dcommons-logging.jar=/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging-api.jar -Djexl.jar=/usr/local/gump/public/workspace/jakarta-commons/jexl/dist/commons-jexl-06122004.jar -Dvelocity.jar=/usr/local/gump/public/workspace/jakarta-velocity/bin/velocity-06122004.jar embed-optional [Working Directory: /usr/local/gump/public/workspace/ant/proposal/embed] CLASSPATH: /opt/jdk1.4/lib/tools.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-stylebook.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar:/usr/local/gump/public/workspace/ant/bootstrap/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/bootstrap/lib/ant.jar:/usr/local/gump/public/workspace/xml-stylebook/bin/stylebook-1.0-b3_xalan-2.jar:/usr/local/gump/public/workspace/dist/junit/junit.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging-api.jar:/usr/local/gump/public/workspace/jakarta-commons/jxpath/dist/commons-jxpath.jar:/usr/local/gump/public/workspace/jdom/build/jdom.jar:/usr/local/gump/public/workspace/jakarta-velocity/bin/velocity-06122004.jar:/usr/local/gump/public/workspace/avalon-trunk/runtime/logkit/target/deliverables/jars/avalon-logkit-06122004.jar:/usr/local/gump/public/workspace/avalon-tools/tools/magic/target/deliverables/jars/avalon-tools-magic-06122004.jar:/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-06122004.jar:/usr/local/gump/public/workspace/jakarta-commons/beanutils/dist/commons-beanutils-core.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging.jar:/usr/local/gump/public/workspace/jakarta-commons/jexl/dist/commons-jexl-06122004.jar:/usr/local/gump/public/workspace/jakarta-commons/discovery/dist/commons-discovery.jar - Buildfile: build.xml init: [mkdir] Created dir: /home/gump/workspaces2/public/workspace/ant/proposal/embed/build/classes embed-optional: [javac] Compiling 6 source files to /home/gump/workspaces2/public/workspace/ant/proposal/embed/build/classes [javac] Note: Some input files use or override a deprecated API. [javac] Note: Recompile with -deprecation for details. [copy] Copying 1 file to /home/gump/workspaces2/public/workspace/ant/proposal/embed/build/classes [jar] Building jar: /home/gump/workspaces2/public/workspace/ant/proposal/embed/build/optional-dynprop.jar BUILD SUCCESSFUL Total time: 3 seconds - To subscribe to this information via syndicated feeds: - RSS: http://brutus.apache.org/gump/public/ant/ant-embed-optional/rss.xml - Atom: http://brutus.apache.org/gump/public/ant/ant-embed-optional/atom.xml == Gump Tracking Only === Produced by Gump version 2.2. Gump Run 16001506122004,
[GUMP@brutus]: Project dist-ant (in module ant) success
To whom it may satisfy... 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 dist-ant *no longer* has an issue. The current state of this project is 'Success'. Full details are available at: http://brutus.apache.org/gump/public/ant/dist-ant/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -WARNING- Bad *Optional* Dependency. Project: jai unknown to *this* workspace -INFO- Optional dependency commons-net failed with reason build failed -INFO- No license on redistributable project with outputs. The following work was performed: http://brutus.apache.org/gump/public/ant/dist-ant/gump_work/build_ant_dist-ant.html Work Name: build_ant_dist-ant (Type: Build) Work ended in a state of : Success Elapsed: 3 mins 50 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:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dchmod.fail=false distribution [Working Directory: /usr/local/gump/public/workspace/ant] CLASSPATH: /opt/jdk1.4/lib/tools.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-stylebook.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar:/usr/local/gump/public/workspace/ant/bootstrap/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/bootstrap/lib/ant.jar:/usr/local/gump/public/workspace/xml-stylebook/bin/stylebook-1.0-b3_xalan-2.jar:/usr/local/gump/public/workspace/dist/junit/junit.jar:/usr/local/gump/packages/antlr-2.7.3/antlr.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging-api.jar:commons-net-gump-29112004.jar:/usr/local/gump/packages/jaf-1.0.1/activation.jar:/usr/local/gump/public/workspace/jakarta-bcel/bin/bcel.jar:/usr/local/gump/public/workspace/jakarta-bsf/build/lib/bsf.jar:/usr/local/gump/public/workspace/logging-log4j/log4j-06122004.jar:/usr/local/gump/public/workspace/logging-log4j/log4j-chainsaw-06122004.jar:/usr/local/gump/public/workspace/jakarta-oro/jakarta-oro-06122004.jar:/usr/local/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-06122004.jar:/usr/local/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar:/usr/local/gump/packages/javamail-1.3.2/mail.jar:/usr/local/gump/packages/javamail-1.3.2/lib/mailapi.jar:/usr/local/gump/packages/jdepend-2.6/lib/jdepend.jar:/usr/local/gump/packages/jsch-0.1.17/dist/lib/jsch-gump.jar:/usr/local/gump/public/workspace/xml-commons/java/build/resolver.jar - [javadoc] /home/gump/workspaces2/public/workspace/ant/src/main/org/apache/tools/ant/taskdefs/repository/RepositoryRef.java:64: warning - Tag @link: can't find connect(GetLibraries) in org.apache.tools.ant.taskdefs.repository.RepositoryRef [javadoc] /home/gump/workspaces2/public/workspace/ant/src/main/org/apache/tools/ant/types/optional/image/ImageOperation.java:26: warning - Tag @see: reference not found: org.apache.tools.ant.tasks.optional.image.Image [javadoc] /home/gump/workspaces2/public/workspace/ant/src/main/org/apache/tools/ant/types/optional/image/TransformOperation.java:24: warning - Tag @see: reference not found: org.apache.tools.ant.tasks.optional.image.Image [javadoc] /home/gump/workspaces2/public/workspace/ant/src/main/org/apache/tools/ant/types/selectors/DateSelector.java:145: warning - @param argument cmp is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant/src/main/org/apache/tools/ant/types/selectors/SizeSelector.java:140: warning - @param argument cmp is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant/src/main/org/apache/tools/ant/util/FileUtils.java:1357: warning - The first sentence is interpreted to be: [javadoc] Generating /home/gump/workspaces2/public/workspace/ant/build/javadocs/org/apache/tools/ant/util/FileUtils.html... [javadoc] compare two timestamps for being up to date, use granularity too., [javadoc] This sentence is different from what would be generated using -breakiterator: [javadoc] compare two timestamps for being up to date, use granularity too [javadoc] Generating
[GUMP@brutus]: 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. 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- 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: 7 mins 44 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:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.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:
Re: cvs commit: ant/src/main/org/apache/tools/ant/helper DefaultExecutor.java KeepGoingExecutor.java SingleCheckExecutor.java
[EMAIL PROTECTED] wrote: Added: src/main/org/apache/tools/ant Executor.java [i.e. in the trunk] Log: Refactored Target invocation into org.apache.tools.ant.Executor implementations. PR: 21421, 29248 Index: WHATSNEW === [from 1.6.x to 1.7] +* Refactored Target invocation into org.apache.tools.ant.Executor + implementations. Bugzilla Reports 21421, 29248. + Changes from Ant 1.6.2 to current Ant 1.6 CVS version = Index: Executor.java === /** * Target executor abstraction. * @since Ant 1.6.3 */ @since Ant 1.6.3 or @since Ant 1.7? (Same question for other added classes/methods.) -J. -- Jesse Glick mailto:[EMAIL PROTECTED] x22801 NetBeans, Open APIs http://www.netbeans.org/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: Project ant-xdocs-proposal (in module ant) success
To whom it may satisfy... 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 ant-xdocs-proposal *no longer* has an issue. The current state of this project is 'Success'. Full details are available at: http://brutus.apache.org/gump/public/ant/ant-xdocs-proposal/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Made directory [/usr/local/gump/public/workspace/ant/proposal/xdocs/build/classes] The following work was performed: http://brutus.apache.org/gump/public/ant/ant-xdocs-proposal/gump_work/build_ant_ant-xdocs-proposal.html Work Name: build_ant_ant-xdocs-proposal (Type: Build) Work ended in a state of : Success Elapsed: 29 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:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar -Xmx512m org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Dant.home=/usr/local/gump/public/workspace/ant/dist docs-from-scratch [Working Directory: /usr/local/gump/public/workspace/ant/proposal/xdocs] CLASSPATH:
DO NOT REPLY [Bug 32487] - updatedate mapper requires OS-specific slashes
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=32487. 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=32487 --- Additional Comments From [EMAIL PROTECTED] 2004-12-07 03:54 --- Peter, I think one needs to differentiate between case-sensitive FSs and case-aware FSs. NTFS is case-aware in that it retains the original case whenever possible (although there is no guarantee that it won't get lost when various tools are used against a file) and certain tools such as java *chooses* to differentiate between test and Test but this is not a matter of java actually saying that the two files differ. The Java specification simply states that the filename casing must map to the class name casing, which is strictly case-sensitive, so they choose to enforce that. Why? Because Java is strictly concerned with portability and Sun wants to ensure that if you transfer these files onto another operating system they will be guaranteed to work out-of-the-box. The question we must then ask is, is there a analogous concern for Ant? ... I guess I will say, yes, there is. Though I wish to point out that I really only meant that drive-letters should be handled in a case-insensitive manner and I don't think anyone here (Steve included) will argue that drive letters are ever case-sensitive under Windows. Can we agree to treat '/'-style slashes as equivilent to '\'-style slashes under win32 as well as case-insensitive drive letters in the path? I think that'll please Samba, NFS and ClearCase as well. -- 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 32557] New: - DependTest.testClosure fails under JDK 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=32557. 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=32557 Summary: DependTest.testClosure fails under JDK 1.5 Product: Ant Version: 1.7Alpha (nightly) Platform: PC OS/Version: Linux Status: NEW Keywords: JDK1.5 Severity: normal Priority: P2 Component: Optional Tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] DependTest.testClosure passes for me if I run using JDK 1.4.2 (Linux) but fails if run under JDK 1.5 (or a 1.6 alpha). The error message is Depend did not leave correct number of files expected:2 but was:1 If however I set source=1.2 on javac in depend.xml#compile, it passes (on 1.4, 1.5, and 1.6). I suspect that there is some difference in javac's bytecode generation when using 1.5 source, though I don't know what exactly. -- 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/helper SingleCheckExecutor.java KeepGoingExecutor.java DefaultExecutor.java
jglick 2004/12/06 22:43:42
Modified:src/main/org/apache/tools/ant/helper
SingleCheckExecutor.java KeepGoingExecutor.java
DefaultExecutor.java
Log:
Improving Javadoc of Executor impls to be more informative. :-) Matt please
check.
Revision ChangesPath
1.2 +2 -0
ant/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java
Index: SingleCheckExecutor.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SingleCheckExecutor.java 31 Aug 2004 22:32:53 - 1.1
+++ SingleCheckExecutor.java 7 Dec 2004 06:43:42 - 1.2
@@ -27,6 +27,8 @@
/**
* Single-check Target executor implementation.
+ * Differs from [EMAIL PROTECTED] DefaultExecutor} in that the dependencies
for all
+ * targets are computed together, so that shared dependencies are run just
once.
* @since Ant 1.6.3
*/
public class SingleCheckExecutor implements Executor {
1.2 +3 -0
ant/src/main/org/apache/tools/ant/helper/KeepGoingExecutor.java
Index: KeepGoingExecutor.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/KeepGoingExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KeepGoingExecutor.java31 Aug 2004 22:32:53 - 1.1
+++ KeepGoingExecutor.java7 Dec 2004 06:43:42 - 1.2
@@ -25,6 +25,9 @@
/**
* Keep-going Target executor implementation.
+ * Differs from [EMAIL PROTECTED] DefaultExecutor} in that a failure in one
target does
+ * not halt execution; all targets are attempted, in order. The last failure,
+ * if any, is reported to the caller.
* @since Ant 1.6.3
*/
public class KeepGoingExecutor implements Executor {
1.2 +2 -0
ant/src/main/org/apache/tools/ant/helper/DefaultExecutor.java
Index: DefaultExecutor.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/DefaultExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultExecutor.java 31 Aug 2004 22:32:53 - 1.1
+++ DefaultExecutor.java 7 Dec 2004 06:43:42 - 1.2
@@ -25,6 +25,8 @@
/**
* Default Target executor implementation.
+ * Runs each target individually (including all of its dependencies),
+ * halting immediately upon error.
* @since Ant 1.6.3
*/
public class DefaultExecutor implements Executor {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Ant.java
jglick 2004/12/06 22:44:34
Modified:src/main/org/apache/tools/ant/taskdefs Ant.java
Log:
Minor stylistic refactoring.
Revision ChangesPath
1.109 +3 -2 ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- Ant.java 22 Nov 2004 09:23:27 - 1.108
+++ Ant.java 7 Dec 2004 06:44:34 - 1.109
@@ -31,6 +31,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildListener;
import org.apache.tools.ant.DefaultLogger;
+import org.apache.tools.ant.Executor;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectComponent;
import org.apache.tools.ant.ProjectHelper;
@@ -64,7 +65,7 @@
public class Ant extends Task {
/** Target Executor */
-private static SingleCheckExecutor executor = new SingleCheckExecutor();
+private static final Executor EXECUTOR = new SingleCheckExecutor();
/** the basedir where is executed the build file */
private File dir = null;
@@ -398,7 +399,7 @@
try {
log(Entering + antFile + ..., Project.MSG_VERBOSE);
newProject.fireSubBuildStarted();
-executor.executeTargets(newProject,
+EXECUTOR.executeTargets(newProject,
(String[]) (locals.toArray(new
String[locals.size()])));
} catch (BuildException ex) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs BuildNumber.java
jglick 2004/12/06 22:45:32
Modified:src/main/org/apache/tools/ant/taskdefs BuildNumber.java
Log:
Minor simplification: task.log(...) ~ task.getProject().log(...).
Revision ChangesPath
1.18 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java
Index: BuildNumber.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/BuildNumber.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- BuildNumber.java 9 Mar 2004 16:48:04 - 1.17
+++ BuildNumber.java 7 Dec 2004 06:45:32 - 1.18
@@ -98,7 +98,7 @@
try {
output.close();
} catch (final IOException ioe) {
-getProject().log(error closing output stream + ioe,
Project.MSG_ERR);
+log(error closing output stream + ioe,
Project.MSG_ERR);
}
}
myFile = savedFile;
@@ -157,7 +157,7 @@
try {
input.close();
} catch (final IOException ioe) {
-getProject().log(error closing input stream + ioe,
Project.MSG_ERR);
+log(error closing input stream + ioe,
Project.MSG_ERR);
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
AW: [GUMP@brutus]: Project test-ant (in module ant) failed
My search scripts meant to find Testcase: testspawn(org.apache.tools.ant.taskdefs.ExecTaskTest): FAILED log file found after spawn junit.framework.AssertionFailedError: log file found after spawn at junit.framework.Assert.fail(Assert.java:47) at junit.framework.Assert.assertTrue(Assert.java:20) at org.apache.tools.ant.taskdefs.ExecTaskTest.testspawn(ExecTaskTest.java:381) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39 ) Jan -Ursprüngliche Nachricht- Von: Gump Integration Build [mailto:[EMAIL PROTECTED] Gesendet am: Dienstag, 7. Dezember 2004 03:39 An: [EMAIL PROTECTED] Betreff: [EMAIL PROTECTED]: Project test-ant (in module ant) failed Full details are available at: http://brutus.apache.org/gump/public/ant/test-ant/index.html BUILD FAILED /home/gump/workspaces2/public/workspace/ant/build.xml:1604: At least one test has failed. Total time: 7 minutes 44 seconds - To subscribe to this information via syndicated feeds: - RSS: http://brutus.apache.org/gump/public/ant/test-ant/rss.xml - Atom: http://brutus.apache.org/gump/public/ant/test-ant/atom.xml
[GUMP@brutus]: Project ant-antidote (in module ant-antidote) success
To whom it may satisfy... 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 ant-antidote *no longer* has an issue. The current state of this project is 'Success'. Full details are available at: http://brutus.apache.org/gump/public/ant-antidote/ant-antidote/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole output [antidote.jar] identifier set to project name The following work was performed: http://brutus.apache.org/gump/public/ant-antidote/ant-antidote/gump_work/build_ant-antidote_ant-antidote.html Work Name: build_ant-antidote_ant-antidote (Type: Build) Work ended in a state of : Success Elapsed: 30 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only internal_dist [Working Directory: /usr/local/gump/public/workspace/ant-antidote] CLASSPATH: /opt/jdk1.4/lib/tools.jar:/usr/local/gump/public/workspace/ant/bootstrap/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/bootstrap/lib/ant.jar - [javadoc] Loading source files for package org.apache.tools.ant.gui.customizer... [javadoc] Loading source files for package org.apache.tools.ant.gui.event... [javadoc] Loading source files for package org.apache.tools.ant.gui.ide... [javadoc] Loading source files for package org.apache.tools.ant.gui.modules... [javadoc] Loading source files for package org.apache.tools.ant.gui.modules.console... [javadoc] Loading source files for package org.apache.tools.ant.gui.modules.edit... [javadoc] Loading source files for package org.apache.tools.ant.gui.util... [javadoc] Loading source files for package org.apache.tools.ant.gui.wizard... [javadoc] Loading source files for package org.apache.tools.ant.gui.wizard.build... [javadoc] Loading source files for package org.apache.tools.ant.gui.xml... [javadoc] Loading source files for package org.apache.tools.ant.gui.xml.dtd... [javadoc] Constructing Javadoc information... [javadoc] Standard Doclet version 1.4.2_05 [javadoc] Building tree for all the packages and classes... [javadoc] Building index for all the packages and classes... [javadoc] Building index for all classes... [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSFactory.java:272: warning - @param argument location is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSIntrospectedElement.java:260: warning - @param argument childType is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSPropertyElement.java:129: warning - @param argument name is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSPropertyElement.java:149: warning - @param argument name is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSTargetElement.java:160: warning - @param argument Source is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/event/NewTaskEvent.java:74: warning - @param argument target is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/event/NullSelectionEvent.java:70: warning - @param argument selected is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/modules/Reopener.java:130: warning - @param argument key is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/modules/Reopener.java:141: warning - @param argument key is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/modules/edit/DragTreeListener.java:95: warning - @param argument parent is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/modules/edit/DependentTargetChooser.java:171: warning - @param argument ACSTargetElement is not a parameter name. [javadoc] /home/gump/workspaces2/public/workspace/ant-antidote/src/java/org/apache/tools/ant/gui/modules/edit/DependentTargetPropertyEditor.java:147: warning - @param argument The is not a parameter name. [javadoc]
Re: New repository task
On Mon, 6 Dec 2004, Matt Benson [EMAIL PROTECTED] wrote: It's a sign of the times... Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs/optional AbstractXSLTLiaisonTest.java
jglick 2004/12/07 01:02:33
Modified:src/testcases/org/apache/tools/ant/taskdefs/optional
AbstractXSLTLiaisonTest.java
Log:
1. Never use new File(url.getFile()); it is not safe with all paths.
2. Using File.deleteOnExit for temp files, just in case the VM croaks.
Revision ChangesPath
1.9 +10 -8
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest.java
Index: AbstractXSLTLiaisonTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractXSLTLiaisonTest.java 9 Feb 2004 21:05:44 - 1.8
+++ AbstractXSLTLiaisonTest.java 7 Dec 2004 09:02:33 - 1.9
@@ -1,5 +1,3 @@
-package org.apache.tools.ant.taskdefs.optional;
-
/*
* Copyright 2001,2004 The Apache Software Foundation
*
@@ -17,15 +15,17 @@
*
*/
-import junit.framework.TestCase;
-import org.apache.tools.ant.taskdefs.XSLTLiaison;
-import org.w3c.dom.Document;
+package org.apache.tools.ant.taskdefs.optional;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import java.io.File;
import java.io.FileNotFoundException;
import java.net.URL;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import junit.framework.TestCase;
+import org.apache.tools.ant.taskdefs.XSLTLiaison;
+import org.apache.tools.ant.util.FileUtils;
+import org.w3c.dom.Document;
/**
* Abtract testcase for XSLTLiaison.
@@ -54,7 +54,7 @@
if (url == null){
throw new FileNotFoundException(Unable to load ' + name + '
from classpath);
}
-return new File(url.getFile());
+return new
File(FileUtils.newFileUtils().fromURI(url.toExternalForm()));
}
/** keep it simple stupid */
@@ -64,6 +64,7 @@
liaison.addParam(param, value);
File in = getFile(/taskdefs/optional/xsltliaison-in.xml);
File out = new File(xsltliaison.tmp);
+out.deleteOnExit(); // just to be sure
try {
liaison.transform(in, out);
} finally {
@@ -76,6 +77,7 @@
liaison.setStylesheet(xsl);
File in = getFile(/taskdefs/optional/xsltliaison-encoding-in.xml);
File out = new File(xsltliaison-encoding.tmp);
+out.deleteOnExit(); // just to be sure
try {
liaison.transform(in, out);
Document doc = parseXML(out);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml
jglick 2004/12/07 01:10:39
Modified:src/testcases/org/apache/tools/ant/util FileUtilsTest.java
src/testcases/org/apache/tools/ant/types/selectors
PresentSelectorTest.java BaseSelectorTest.java
src/testcases/org/apache/tools/ant/types XMLCatalogTest.java
PathTest.java FilterSetTest.java
CommandlineJavaTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional/junit
JUnitReportTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional/i18n
TranslateTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional
ReplaceRegExpTest.java PropertyFileTest.java
JspcTest.java ANTLRTest.java
src/testcases/org/apache/tools/ant/taskdefs
XmlPropertyTest.java TouchTest.java TarTest.java
ManifestTest.java InitializeClassTest.java
ImportTest.java FixCrLfTest.java ExecTaskTest.java
src/testcases/org/apache/tools/ant DirectoryScannerTest.java
BuildFileTest.java
.build.xml
Log:
Trying to make unit tests independent of CWD.
Revision ChangesPath
1.30 +13 -8
ant/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
Index: FileUtilsTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- FileUtilsTest.java8 Aug 2004 21:03:21 - 1.29
+++ FileUtilsTest.java7 Dec 2004 09:10:38 - 1.30
@@ -322,18 +322,18 @@
* Test contentEquals
*/
public void testContentEquals() throws IOException {
-assertTrue(Non existing files, fu.contentEquals(new File(foo),
- new File(bar)));
+assertTrue(Non existing files, fu.contentEquals(new
File(System.getProperty(root), foo),
+ new
File(System.getProperty(root), bar)));
assertTrue(One exists, the other one doesn\'t,
- !fu.contentEquals(new File(foo), new
File(build.xml)));
+ !fu.contentEquals(new File(System.getProperty(root),
foo), new File(System.getProperty(root), build.xml)));
assertTrue(Don\'t compare directories,
- !fu.contentEquals(new File(src), new File(src)));
+ !fu.contentEquals(new File(System.getProperty(root),
src), new File(System.getProperty(root), src)));
assertTrue(File equals itself,
- fu.contentEquals(new File(build.xml),
-new File(build.xml)));
+ fu.contentEquals(new File(System.getProperty(root),
build.xml),
+new File(System.getProperty(root),
build.xml)));
assertTrue(Files are different,
- !fu.contentEquals(new File(build.xml),
- new File(docs.xml)));
+ !fu.contentEquals(new File(System.getProperty(root),
build.xml),
+ new File(System.getProperty(root),
docs.xml)));
}
/**
@@ -409,9 +409,14 @@
assertEquals(file:///SYS:/foo, fu.toURI(sys:\\foo));
}
assertEquals(file:/// + dosRoot + foo, fu.toURI(/foo));
+/* May fail if the directory ${user.dir}/foo/ exists
+ * (and anyway is the tested behavior actually desirable?):
assertEquals(file:./foo, fu.toURI(./foo));
+ */
assertEquals(file:/// + dosRoot + foo, fu.toURI(\\foo));
+/* See above:
assertEquals(file:./foo, fu.toURI(.\\foo));
+ */
assertEquals(file:/// + dosRoot + foo%20bar, fu.toURI(/foo
bar));
assertEquals(file:/// + dosRoot + foo%20bar, fu.toURI(\\foo
bar));
assertEquals(file:/// + dosRoot + foo%23bar,
fu.toURI(/foo#bar));
1.9 +1 -1
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PresentSelectorTest.java 9 Mar 2004 16:49:07 - 1.8
+++ PresentSelectorTest.java 7 Dec 2004 09:10:38 - 1.9
@@ -108,7 +108,7 @@
assertEquals(, results);
s = (PresentSelector)getInstance();
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs ReplaceTest.java
jglick 2004/12/07 01:11:47
Modified:src/testcases/org/apache/tools/ant/taskdefs ReplaceTest.java
Log:
Unused constant.
Revision ChangesPath
1.15 +0 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
Index: ReplaceTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ReplaceTest.java 9 Mar 2004 16:48:57 - 1.14
+++ ReplaceTest.java 7 Dec 2004 09:11:47 - 1.15
@@ -27,7 +27,6 @@
*/
public class ReplaceTest extends BuildFileTest {
-private static final String TEST_PATH =
src/etc/testcases/taskdefs/replace/;
public ReplaceTest(String name) {
super(name);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs/optional XalanLiaisonTest.java
jglick 2004/12/07 01:13:04 Modified:src/testcases/org/apache/tools/ant/taskdefs/optional XalanLiaisonTest.java Log: Just moving license to top of file for consistency. Revision ChangesPath 1.11 +2 -2 ant/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java Index: XalanLiaisonTest.java === RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/XalanLiaisonTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- XalanLiaisonTest.java 9 Mar 2004 16:49:01 - 1.10 +++ XalanLiaisonTest.java 7 Dec 2004 09:13:04 - 1.11 @@ -1,5 +1,3 @@ -package org.apache.tools.ant.taskdefs.optional; - /* * Copyright 2001-2002,2004 The Apache Software Foundation * @@ -16,6 +14,8 @@ * limitations under the License. * */ + +package org.apache.tools.ant.taskdefs.optional; import org.apache.tools.ant.taskdefs.XSLTLiaison; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
peterreilly2004/12/07 02:29:32
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java
Log:
If junittask is loaded by a different classloader than the
project classloader, set the junittask classloader as the
parent of the classloader used to load the tests, otherwise
the tests will not see the classes in ant-junit.jar and the
classes loaded with the tests will use a different junit.jar
than the junit used by junittask and will be not be compatible.
PR: 28474
Revision ChangesPath
1.692 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -r1.691 -r1.692
--- WHATSNEW 1 Dec 2004 13:45:48 - 1.691
+++ WHATSNEW 7 Dec 2004 10:29:32 - 1.692
@@ -171,6 +171,9 @@
* Target location is not set for default target.
Bugzilla report 32267.
+* Incorrect classloader parent in junittask when using with ant-junit.jar
and junit.jar
+ not in the project classloader. Bugzilla report 28474.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===
1.112 +5 -1
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.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- JUnitTask.java22 Nov 2004 09:23:34 - 1.111
+++ JUnitTask.java7 Dec 2004 10:29:32 - 1.112
@@ -1321,6 +1321,10 @@
classpath.append(antRuntimeClasses);
}
classLoader = getProject().createClassLoader(classpath);
+if (getClass().getClassLoader() != null
+ getClass().getClassLoader() !=
Project.class.getClassLoader()) {
+classLoader.setParent(getClass().getClassLoader());
+}
classLoader.setParentFirst(false);
classLoader.addJavaLibraries();
log(Using CLASSPATH + classLoader.getClasspath(),
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
peterreilly2004/12/07 02:30:35
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH JUnitTask.java
Log:
sync
Revision ChangesPath
No revision
No revision
1.503.2.146 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.145
retrieving revision 1.503.2.146
diff -u -r1.503.2.145 -r1.503.2.146
--- WHATSNEW 1 Dec 2004 14:04:36 - 1.503.2.145
+++ WHATSNEW 7 Dec 2004 10:30:35 - 1.503.2.146
@@ -72,6 +72,9 @@
* Target location is not set for default target.
Bugzilla report 32267.
+* Incorrect classloader parent in junittask when using with ant-junit.jar
and junit.jar
+ not in the project classloader. Bugzilla report 28474.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===
No revision
No revision
1.83.2.16 +5 -1
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.83.2.15
retrieving revision 1.83.2.16
diff -u -r1.83.2.15 -r1.83.2.16
--- JUnitTask.java6 Oct 2004 15:48:29 - 1.83.2.15
+++ JUnitTask.java7 Dec 2004 10:30:35 - 1.83.2.16
@@ -1272,6 +1272,10 @@
classpath.append(antRuntimeClasses);
}
classLoader = getProject().createClassLoader(classpath);
+if (getClass().getClassLoader() != null
+ getClass().getClassLoader() !=
Project.class.getClassLoader()) {
+classLoader.setParent(getClass().getClassLoader());
+}
classLoader.setParentFirst(false);
classLoader.addJavaLibraries();
log(Using CLASSPATH + classLoader.getClasspath(),
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 28474] - JUnitResultFormatter throws BuildException due to classloading issues
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=28474. 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=28474 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Summary|JUnitResultFormatter throws |JUnitResultFormatter throws |BuildException due to |BuildException due to |classloading issues |classloading issues Target Milestone|--- |1.6.3 --- Additional Comments From [EMAIL PROTECTED] 2004-12-07 11:31 --- This is now fixed in the current cvs. -- 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]
[GUMP@brutus]: Project test-ant (in module ant) success
To whom it may satisfy... 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 *no longer* has an issue. The current state of this project is 'Success'. 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 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 : Success Elapsed: 7 mins 22 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:/usr/local/gump/public/workspace/xml-xalan/java/build/xalan-unbundled.jar:/usr/local/gump/public/workspace/xml-xalan/java/build/serializer.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 32566] New: - OutOfMemory if filesize are greater than 7 MB
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=32566. 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=32566 Summary: OutOfMemory if filesize are greater than 7 MB Product: Ant Version: 1.6.2 Platform: PC OS/Version: Windows 2000 Status: NEW Severity: normal Priority: P1 Component: Build Process AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Dear community, sorry, I guess I found some trouble on ant 1.6.2. I tried a replace operation (conversion from ASCII coded files to ANSI coded files, i.e. in our case converting only around a dozen symbols in a large amount of small to middle sized files). The replace built failed always, if files became accessed that were bigger than 6.5 MByte. This could be reproduced. An OutOfMemory exception occured. I checked this with certain files to exclude the case that certain symbols or something like that was responsible. It is definitely the filesize that causes the crash. Further on: I process directories file by file. If there is a number of files processed, this crashing exception occurs even in files that are significantly smaller than 6.5 MB (my smallest observation was a crash on a 4 MB file in a directory structure with around 16 000 files that add to around 500 MB). And on: If I combine the replace task with a copy task (first copy, than replace on the backuped structure mentioned above) the built already crashes on the copy task. Again with the java side OutOfMemory exception. I tried this with Java SDK 1.4.1 and SDK 1.4.2, as well as with Xmx2048 option. For that reason I am sure that the problem is not really the available memory. I hope someone is able to reproduce this findings and maybe to correct in some later version. -- 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: New repository task
--- Stefan Bodewig [EMAIL PROTECTED] wrote: On Mon, 6 Dec 2004, Matt Benson [EMAIL PROTECTED] wrote: It's a sign of the times... See: http://marc.theaimsgroup.com/?t=10935231277r=1w=2 (particularly DD's response) and http://marc.theaimsgroup.com/?l=ant-devm=109882328509244w=2 -Matt Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Mail - 250MB free storage. Do more. Manage less. 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/taskdefs/compilers Jikes.java
bodewig 2004/12/07 07:55:31
Modified:src/main/org/apache/tools/ant/taskdefs/compilers Jikes.java
Log:
Jikes doesn't like -source 1.2 either, found by Gump running on Kaffe+Jikes
Revision ChangesPath
1.27 +8 -1
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Jikes.java9 Mar 2004 16:48:13 - 1.26
+++ Jikes.java7 Dec 2004 15:55:31 - 1.27
@@ -186,7 +186,14 @@
if (attributes.getSource() != null) {
cmd.createArgument().setValue(-source);
-cmd.createArgument().setValue(attributes.getSource());
+String source = attributes.getSource();
+if (source.equals(1.1) || source.equals(1.2)) {
+// support for -source 1.1 and -source 1.2 has been
+// added with JDK 1.4.2, Jikes doesn't like it
+cmd.createArgument().setValue(1.3);
+} else {
+cmd.createArgument().setValue(source);
+}
}
addCurrentCompilerArgs(cmd);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: New repository task
On Mon, 06 Dec 2004 22:27:12 +, Steve Loughran [EMAIL PROTECTED] wrote: Also, and this is important, you dont need to use it to download stuff. Instead you can use it to manage libraries that you depend on. (We may want to change behaviour to say if you dont specify a repository, that is exactly what you get) That's great. I just became a little cautious when I saw a bunch of hard-coded references to the Maven style of paths. If this stays confined to the Maven repository, that's fine. One thing I've always liked about Ant is that it doesn't dictate to you any way to store your files (well, besides the ANT_HOME directory). This kind of thing seems to me like forcing the user into the Maven world view. -- -Matt So whatever you do, don't be bored, this is absolutely the most exciting time we could have possibly hoped to be alive. And things are just starting. -- Waking Life - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 8510] - shutdown hook does not fire in forked java task under JDK1.4
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=8510. 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=8510 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED OS/Version||All Resolution|FIXED | --- Additional Comments From [EMAIL PROTECTED] 2004-12-07 17:54 --- I am using ant 1.6.2 and have a working test case on MacOSX that clearly shows that a shutdown hook is never invoked when you ctrl-c an app run from ant's java 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]
Re: cvs commit: ant/src/main/org/apache/tools/ant/helper SingleCheckExecutor.java KeepGoingExecutor.java DefaultExecutor.java
Looks correct to me.
-Matt
--- [EMAIL PROTECTED] wrote:
jglick 2004/12/06 22:43:42
Modified:src/main/org/apache/tools/ant/helper
SingleCheckExecutor.java
KeepGoingExecutor.java
DefaultExecutor.java
Log:
Improving Javadoc of Executor impls to be more
informative. :-) Matt please check.
Revision ChangesPath
1.2 +2 -0
ant/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java
Index: SingleCheckExecutor.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SingleCheckExecutor.java31 Aug 2004 22:32:53
- 1.1
+++ SingleCheckExecutor.java7 Dec 2004 06:43:42
- 1.2
@@ -27,6 +27,8 @@
/**
* Single-check Target executor implementation.
+ * Differs from [EMAIL PROTECTED] DefaultExecutor} in that
the dependencies for all
+ * targets are computed together, so that shared
dependencies are run just once.
* @since Ant 1.6.3
*/
public class SingleCheckExecutor implements
Executor {
1.2 +3 -0
ant/src/main/org/apache/tools/ant/helper/KeepGoingExecutor.java
Index: KeepGoingExecutor.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/KeepGoingExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KeepGoingExecutor.java 31 Aug 2004 22:32:53
- 1.1
+++ KeepGoingExecutor.java 7 Dec 2004 06:43:42
- 1.2
@@ -25,6 +25,9 @@
/**
* Keep-going Target executor implementation.
+ * Differs from [EMAIL PROTECTED] DefaultExecutor} in that a
failure in one target does
+ * not halt execution; all targets are attempted,
in order. The last failure,
+ * if any, is reported to the caller.
* @since Ant 1.6.3
*/
public class KeepGoingExecutor implements
Executor {
1.2 +2 -0
ant/src/main/org/apache/tools/ant/helper/DefaultExecutor.java
Index: DefaultExecutor.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/DefaultExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultExecutor.java31 Aug 2004 22:32:53
- 1.1
+++ DefaultExecutor.java7 Dec 2004 06:43:42 -
1.2
@@ -25,6 +25,8 @@
/**
* Default Target executor implementation.
+ * Runs each target individually (including all
of its dependencies),
+ * halting immediately upon error.
* @since Ant 1.6.3
*/
public class DefaultExecutor implements Executor
{
-
To unsubscribe, e-mail:
[EMAIL PROTECTED]
For additional commands, e-mail:
[EMAIL PROTECTED]
__
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]
Re: cvs commit: ant/src/main/org/apache/tools/ant/helper DefaultExecutor.java KeepGoingExecutor.java SingleCheckExecutor.java
--- Jesse Glick [EMAIL PROTECTED] wrote: [SNIP] @since Ant 1.6.3 or @since Ant 1.7? (Same question for other added classes/methods.) Depends on whether we have a 1.6.3 release. If so I think at that time we'll have to do our best to remove any mentions of 1.7 from the 1.6 branch. I had planned to merge the Executor stuff in the absence of public outcry, hence the 1.6.3 comments. -Matt -J. -- Jesse Glick mailto:[EMAIL PROTECTED] x22801 NetBeans, Open APIs http://www.netbeans.org/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Mail - 250MB free storage. Do more. Manage less. http://info.mail.yahoo.com/mail_250 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 8510] - shutdown hook does not fire in forked java task under JDK1.4
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=8510. 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=8510 --- Additional Comments From [EMAIL PROTECTED] 2004-12-07 18:09 --- Created an attachment (id=13672) -- (http://issues.apache.org/bugzilla/attachment.cgi?id=13672action=view) a small simple test case that shows the bug in action see the readme in the zip 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 8510] - shutdown hook does not fire in forked java task under JDK1.4
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=8510.
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=8510
--- Additional Comments From [EMAIL PROTECTED] 2004-12-07 18:25 ---
I tested your example problem and saw the same thing under linux.
However, I then read Conor's report
Note that the use of output or error streams to determine if the shutdown hook
has fired or not is suspect. The above file based approach is more conclusive.
So, I changed the code to do:
public class Shutter extends Thread {
public void run() {
// log.debug(clean shutdown);
System.err.println(DEMO shutdown hook fired);
try {
java.io.PrintWriter pw
= new java.io.PrintWriter(
new java.io.FileOutputStream(test.txt));
Thread.currentThread().sleep(3000);
pw.println(Test);
pw.close();
} catch (Exception e) {
}
System.err.flush();
System.out.println(clean shutdown...);
}
}
And noted that clean shutdown... was not seen, but the file was created
and written to, and the DEMO shutdown hook fired message was seen.
Can you make the above changes and see if they fix the problem?
--
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: New repository task
On Tue, 7 Dec 2004 10:22:40 -0600, Groboclown [EMAIL PROTECTED] wrote: On Mon, 06 Dec 2004 22:27:12 +, Steve Loughran [EMAIL PROTECTED] wrote: Also, and this is important, you dont need to use it to download stuff. Instead you can use it to manage libraries that you depend on. (We may want to change behaviour to say if you dont specify a repository, that is exactly what you get) That's great. I just became a little cautious when I saw a bunch of hard-coded references to the Maven style of paths. If this stays confined to the Maven repository, that's fine. One thing I've always liked about Ant is that it doesn't dictate to you any way to store your files (well, besides the ANT_HOME directory). This kind of thing seems to me like forcing the user into the Maven world view. No, no maven world view. And the task is very extensible; you can define new repository types to bind to non-maven, even non-http repositories; you can define new handlers (UpdatePolicies) to run before and after the downloads. One thing on my todo list (*) is to add something to ant's build.xml to fetch down the relevant binaries for all the optional tasks to build. We could then do one for end users that pulls in the appropriate binaries into an installation. Thoughts? -steve (*) none of which will get done this calendar year; I am off on holiday with no laptop till january. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: New repository task
I think that for this to be really usefull, one would need to
use the classloader/ task.
See http://issues.apache.org/bugzilla/show_bug.cgi?id=28228
It does have some issues (sub-projects affecting
the main project, and when ant is used in an ide)
but it's benifits outweigh the drawbacks..
For example:
project
?? libraries ?? - junit.jar/
classloader loader=project
classpath=${user.home}/.libraries/junit/junit.jar/
junit .../
/project
Peter
Steve Loughran wrote:
On Tue, 7 Dec 2004 10:22:40 -0600, Groboclown [EMAIL PROTECTED]
wrote:
On Mon, 06 Dec 2004 22:27:12 +, Steve Loughran [EMAIL PROTECTED]
wrote:
Also, and this is important, you dont need to use it to download
stuff.
Instead you can use it to manage libraries that you depend on. (We
may
want to change behaviour to say if you dont specify a repository,
that
is exactly what you get)
That's great. I just became a little cautious when I saw a bunch of
hard-coded references to the Maven style of paths. If this stays
confined to the Maven repository, that's fine.
One thing I've always liked about Ant is that it doesn't dictate to
you any way to store your files (well, besides the ANT_HOME
directory). This kind of thing seems to me like forcing the user into
the Maven world view.
No, no maven world view. And the task is very extensible; you can define
new repository types to bind to non-maven, even non-http repositories;
you can define new handlers (UpdatePolicies) to run before and after the
downloads.
One thing on my todo list (*) is to add something to ant's build.xml to
fetch down the relevant binaries for all the optional tasks to build. We
could then do one for end users that pulls in the appropriate binaries
into an installation. Thoughts?
-steve
(*) none of which will get done this calendar year; I am off on holiday
with no laptop till january.
-
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 32506] - ChecksumTest fails on Windows
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=32506. 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=32506 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-12-07 22:46 --- Implicit consent, fixed in CVS HEAD. -- 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 Path.java
mbenson 2004/12/07 13:49:09
Modified:src/main/org/apache/tools/ant/types Path.java
Log:
Useless temporary variables mostly.
Revision ChangesPath
1.64 +12 -10ant/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Path.java 23 Jun 2004 13:32:57 - 1.63
+++ Path.java 7 Dec 2004 21:49:09 - 1.64
@@ -96,12 +96,18 @@
/**
* Invoked by IntrospectionHelper for codesetXXX(Path p)/code
* attribute setters.
+ * @param project the CODEProject/CODE for this path.
+ * @param path the CODEString/CODE path definition.
*/
public Path(Project p, String path) {
this(p);
createPathElement().setPath(path);
}
+/**
+ * Construct an empty CODEPath/CODE.
+ * @param project the CODEProject/CODE for this path.
+ */
public Path(Project project) {
setProject(project);
elements = new Vector();
@@ -122,7 +128,7 @@
/**
* Parses a path definition and creates single PathElements.
- * @param path the path definition.
+ * @param path the CODEString/CODE path definition.
*/
public void setPath(String path) throws BuildException {
if (isReference()) {
@@ -322,21 +328,17 @@
}
} else if (o instanceof DirSet) {
DirSet dset = (DirSet) o;
-DirectoryScanner ds = dset.getDirectoryScanner(getProject());
-String[] s = ds.getIncludedDirectories();
-File dir = dset.getDir(getProject());
-addUnlessPresent(result, dir, s);
+addUnlessPresent(result, dset.getDir(getProject()),
+
dset.getDirectoryScanner(getProject()).getIncludedDirectories());
} else if (o instanceof FileSet) {
FileSet fs = (FileSet) o;
DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-String[] s = ds.getIncludedFiles();
File dir = fs.getDir(getProject());
-addUnlessPresent(result, dir, s);
+addUnlessPresent(result, dir, ds.getIncludedFiles());
} else if (o instanceof FileList) {
FileList fl = (FileList) o;
-String[] s = fl.getFiles(getProject());
-File dir = fl.getDir(getProject());
-addUnlessPresent(result, dir, s);
+addUnlessPresent(result,
+fl.getDir(getProject()), fl.getFiles(getProject()));
}
}
String[] res = new String[result.size()];
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/types Path.java
mbenson 2004/12/07 14:14:13
Modified:src/main/org/apache/tools/ant/types Path.java
Log:
Missed a couple.
Revision ChangesPath
1.65 +2 -3 ant/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Path.java 7 Dec 2004 21:49:09 - 1.64
+++ Path.java 7 Dec 2004 22:14:13 - 1.65
@@ -332,9 +332,8 @@
dset.getDirectoryScanner(getProject()).getIncludedDirectories());
} else if (o instanceof FileSet) {
FileSet fs = (FileSet) o;
-DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-File dir = fs.getDir(getProject());
-addUnlessPresent(result, dir, ds.getIncludedFiles());
+addUnlessPresent(result, fs.getDir(getProject()),
+fs.getDirectoryScanner(getProject()).getIncludedFiles());
} else if (o instanceof FileList) {
FileList fl = (FileList) o;
addUnlessPresent(result,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/types Path.java
mbenson 2004/12/07 14:15:33
Modified:src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
Path.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.57.2.6 +13 -12ant/src/main/org/apache/tools/ant/types/Path.java
Index: Path.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
retrieving revision 1.57.2.5
retrieving revision 1.57.2.6
diff -u -r1.57.2.5 -r1.57.2.6
--- Path.java 23 Jun 2004 13:33:18 - 1.57.2.5
+++ Path.java 7 Dec 2004 22:15:33 - 1.57.2.6
@@ -96,12 +96,18 @@
/**
* Invoked by IntrospectionHelper for codesetXXX(Path p)/code
* attribute setters.
+ * @param project the CODEProject/CODE for this path.
+ * @param path the CODEString/CODE path definition.
*/
public Path(Project p, String path) {
this(p);
createPathElement().setPath(path);
}
+/**
+ * Construct an empty CODEPath/CODE.
+ * @param project the CODEProject/CODE for this path.
+ */
public Path(Project project) {
setProject(project);
elements = new Vector();
@@ -122,7 +128,7 @@
/**
* Parses a path definition and creates single PathElements.
- * @param path the path definition.
+ * @param path the CODEString/CODE path definition.
*/
public void setPath(String path) throws BuildException {
if (isReference()) {
@@ -322,21 +328,16 @@
}
} else if (o instanceof DirSet) {
DirSet dset = (DirSet) o;
-DirectoryScanner ds = dset.getDirectoryScanner(getProject());
-String[] s = ds.getIncludedDirectories();
-File dir = dset.getDir(getProject());
-addUnlessPresent(result, dir, s);
+addUnlessPresent(result, dset.getDir(getProject()),
+
dset.getDirectoryScanner(getProject()).getIncludedDirectories());
} else if (o instanceof FileSet) {
FileSet fs = (FileSet) o;
-DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-String[] s = ds.getIncludedFiles();
-File dir = fs.getDir(getProject());
-addUnlessPresent(result, dir, s);
+addUnlessPresent(result, fs.getDir(getProject()),
+fs.getDirectoryScanner(getProject()).getIncludedFiles());
} else if (o instanceof FileList) {
FileList fl = (FileList) o;
-String[] s = fl.getFiles(getProject());
-File dir = fl.getDir(getProject());
-addUnlessPresent(result, dir, s);
+addUnlessPresent(result,
+fl.getDir(getProject()), fl.getFiles(getProject()));
}
}
String[] res = new String[result.size()];
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util FileUtils.java
mbenson 2004/12/07 15:32:32
Modified:src/main/org/apache/tools/ant/util FileUtils.java
Log:
Various changes = fewer LOC
Revision ChangesPath
1.75 +9 -32 ant/src/main/org/apache/tools/ant/util/FileUtils.java
Index: FileUtils.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- FileUtils.java3 Dec 2004 16:33:26 - 1.74
+++ FileUtils.java7 Dec 2004 23:32:31 - 1.75
@@ -1030,22 +1030,15 @@
}
/**
- * Emulation of File.getParentFile for JDK 1.1
- *
- *
+ * This was originally an emulation of File.getParentFile for JDK 1.1,
+ * but it is now implemented using that method (Ant1.7 onwards).
* @param f the file whose parent is required.
* @return the given file's parent, or null if the file does not have a
* parent.
* @since 1.10
*/
public File getParentFile(File f) {
-if (f != null) {
-String p = f.getParent();
-if (p != null) {
-return new File(p);
-}
-}
-return null;
+return (f == null) ? null : f.getParentFile();
}
/**
@@ -1079,23 +1072,15 @@
}
final char[] buffer = new char[bufferSize];
int bufferLength = 0;
-String text = null;
StringBuffer textBuffer = null;
while (bufferLength != -1) {
bufferLength = rdr.read(buffer);
-if (bufferLength != -1) {
-if (textBuffer == null) {
-textBuffer = new StringBuffer(
- new String(buffer, 0,
bufferLength));
-} else {
-textBuffer.append(new String(buffer, 0, bufferLength));
-}
+if (bufferLength 0) {
+textBuffer = (textBuffer == null) ? new StringBuffer() :
textBuffer;
+textBuffer.append(new String(buffer, 0, bufferLength));
}
}
-if (textBuffer != null) {
-text = textBuffer.toString();
-}
-return text;
+return (textBuffer == null) ? null : textBuffer.toString();
}
/**
@@ -1158,12 +1143,7 @@
if (!l.endsWith(File.separator)) {
l += File.separator;
}
-
-if (p.startsWith(l)) {
-return p.substring(l.length());
-} else {
-return p;
-}
+return (p.startsWith(l)) ? p.substring(l.length()) : p;
}
/**
@@ -1191,7 +1171,6 @@
if (!path.startsWith(File.separator)) {
sb.append(/);
}
-
} catch (BuildException e) {
// relative path
}
@@ -1280,13 +1259,11 @@
throw new IOException(Failed to delete + to
+ while trying to rename + from);
}
-
File parent = getParentFile(to);
if (parent != null !parent.exists() !parent.mkdirs()) {
throw new IOException(Failed to create directory + parent
+ while trying to rename + from);
}
-
if (!from.renameTo(to)) {
copyFile(from, to);
if (!from.delete()) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/docs/manual/CoreTasks tempfile.html
[EMAIL PROTECTED] wrote: 1. Removing mention of JDK 1.1 which is no longer supported anyway. 2. More readable HTML source formatting - reduce merge conflicts, e.g. Peter Reilly wrote: The tempfile doc is generated via the xdoclet stuff (which frys the formatting). Oh well, at least #1 is fixed in .java source too. -J. -- Jesse Glick mailto:[EMAIL PROTECTED] x22801 NetBeans, Open APIs http://www.netbeans.org/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Delete.java
mbenson 2004/12/07 15:39:38 Modified:src/main/org/apache/tools/ant/taskdefs Delete.java Log: typo Revision ChangesPath 1.56 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Delete.java Index: Delete.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- Delete.java 12 Nov 2004 15:14:59 - 1.55 +++ Delete.java 7 Dec 2004 23:39:38 - 1.56 @@ -49,7 +49,7 @@ * using the include/exclude syntax. The deltree task would delete a * directory tree. This task combines the functionality of these two * originally distinct tasks. - * pCurrently Delete extends MatchingTask. This is intend ionly/i + * pCurrently Delete extends MatchingTask. This is intended ionly/i * to provide backwards compatibility for a release. The future position * is to use nested filesets exclusively./p * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks copy.html
mbenson 2004/12/07 15:42:41 Modified:docs/manual/CoreTasks copy.html Log: Clarify failonerror. Revision ChangesPath 1.28 +1 -1 ant/docs/manual/CoreTasks/copy.html Index: copy.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/copy.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- copy.html 24 Nov 2004 14:06:49 - 1.27 +++ copy.html 7 Dec 2004 23:42:41 - 1.28 @@ -93,7 +93,7 @@ /tr tr td valign=topfailonerror/td - td valign=topLog a warning message, but do not stop the + td valign=topIf false, log a warning message, but do not stop the build, when the file to copy does not exist or one of the nested filesets points to a directory that doesn't exist or an error occurs while copying. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks copy.html
mbenson 2004/12/07 15:43:22 Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH copy.html Log: merge Revision ChangesPath No revision No revision 1.19.2.9 +1 -1 ant/docs/manual/CoreTasks/copy.html Index: copy.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/copy.html,v retrieving revision 1.19.2.8 retrieving revision 1.19.2.9 diff -u -r1.19.2.8 -r1.19.2.9 --- copy.html 24 Nov 2004 14:08:54 - 1.19.2.8 +++ copy.html 7 Dec 2004 23:43:22 - 1.19.2.9 @@ -94,7 +94,7 @@ /tr tr td valign=topfailonerror/td - td valign=topLog a warning message, but do not stop the + td valign=topIf false, log a warning message, but do not stop the build, when the file to copy does not exist or one of the nested filesets points to a directory that doesn't exist or an error occurs while copying. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
