I would have thought isInUpdateMode would handle this, but it does not. Instead we remember tht a web.xml file was set on teh command line, and get away with it. I may also downgrade the error to a warning.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@473393 13f79535-47bb-0310-9956-ffa450edef68
More tests, especially for updates. One test is disabled because it fails. The task fails if you are pulling in a web.xml on an existing web.xml file via a fileset if update=false, because the fileset version checking is hiding the inclusion of the web.xml file from the war task -its being dropped before we notice. This is not a BC problem. Maybe I should always make web.xml mandatory to stop this behavior arising.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@468568 13f79535-47bb-0310-9956-ffa450edef68
We may want to have an attribute to indicate that a web.xml file is needed, or that we dont want to see the warning message. Say nowebxml="fail", "warn" or "skip", with the default being fail for backwards compatibility. Thoughts? Now is the time to add it...
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@468180 13f79535-47bb-0310-9956-ffa450edef68
The patch looks innocent enough for me to merge it into the 1.5 branch
right away, but I cannot really verify it fixes the bug because of my
persistent (and self-imposed) lack of a Windows system.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274248 13f79535-47bb-0310-9956-ffa450edef68
Conor, Costin and I voted +1
Stefan voted +0
However, there is *no* guarantee that all these aliases will stay for Ant2. DestFile is currently the most promising attribute name to be carried over to Ant2.
I have left the @deprecated tags in there and haven't touched javadoc also.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271847 13f79535-47bb-0310-9956-ffa450edef68
Updating the majority of the rest of the tasks with the XDoclet tags. The generated defaults.properties is *almost* the same as the current hand maintained one!
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271678 13f79535-47bb-0310-9956-ffa450edef68
(1) Make sure there is a Copyright notice on all files.
(2) Make sure all years in which a file has been modified are
listed.
(3) Make sure the format is consistent, i.e. separate consecutive
years with a dash, not a comma.
(4) Change some references from Tomcat to Ant.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270658 13f79535-47bb-0310-9956-ffa450edef68
- removed useless/duplicate imports
- added explicit imports rather than *
- changed specifiers order to be conform to JLS.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269827 13f79535-47bb-0310-9956-ffa450edef68
to allow Ant generated zip/jar/war/ear files to be extracted on Unix
boxes without permission problems for directories.
This one uses external file attributes like InfoZip's zip does, this
is a rough cut - the infrastructure to set arbitrary permissions and
add user/group IDs via Zip's external fields is there, but not used
ATM. Directories will always get 755 permissions right now.
The testcases work on my box, and I can extract Ant created archives
without any trouble - can't await tomorrows Gump run.
package documentation for org.apache.tools.zip will follow.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268959 13f79535-47bb-0310-9956-ffa450edef68
---
With these patches, Zip (and derivative tasks such as Jar and War) can
merge the entries of multiple zip files into a single output zip file.
The contents of an input zip file may be selectively extracted based on
include/exclude patterns.
An included zip file is specified using a <fileset> with a "src" attribute,
as in:
<target name="jartest">
<jar jarfile="utils.jar">
<fileset
src="weblogic.jar"
includes="weblogic/utils/"
excludes="weblogic/utils/jars/,**/reflect/"
/>
</jar>
</target>
In this example, a subset of the "weblogic/utils" directory is extracted
from weblogic.jar, into utils.jar.
The fileset may also contain "prefix" and "fullpath" attributes (the
functionality of PrefixedFileSet has been retained in the new class
ZipFileSet). Prefixes apply to directory-based and zip-based filesets.
The fullpath attributes applies only to a single file in a directory-based
fileset.
The War task may extract entries from a zip file for all of its filesets
(including the files in "classes" and "lib").
The motivation for this change is:
1) There is significant overlap between "jlink" and "zip", and it seemed
better to combine them.
2) "jlink" does not support include/exclude patterns which are extremely
useful for writing packaging-type tasks such as Zip/Jar/War. This
was my main motivation.
3) By adding this functionality to the base task, it can also be used in
derivative tasks such as Jar and War.
---
Submitted By: Don Ferguson <don@bea.com>
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268458 13f79535-47bb-0310-9956-ffa450edef68
execute has been run.
<jar> would print a warning in Ant's own bootstrap when it zipped
ant.jar for the second time.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268398 13f79535-47bb-0310-9956-ffa450edef68
It also removes a number of small errors in zip task.
Deprecated <prefixedfileset> element of war in favour of normal <fileset> element in zip
Submitted By: "Rosen, Alex" <arosen@silverstream.com>
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268344 13f79535-47bb-0310-9956-ffa450edef68
Stefan Bodewig
Peter Reilly
Jan Materne
Steve Loughran
Jacobus Martinus Kruithof
Antoine Levy-Lambert
Conor MacNeill
Peter Donald
Magesh Umasankar
Erik Hatcher
Stephane Bailliez