Stefan Bodewig
3341571e8e
Don't merge Class-Path attributes, deal with them like with any other
attribute - except that they may occur several times, that is.
PR: 21170
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274780 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Conor MacNeill
6c0b17e148
Ignore directories in checking for out of date elements in a Zip/Jar task.
Directories can't really be out of date since they have no content.
PR: 21245
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274777 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Conor MacNeill
e580392c2d
More cleanup
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274776 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Conor MacNeill
6ee5317ca3
Fix a few checkstyle errors
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274775 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Conor MacNeill
f463bd2cab
More cleanup
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274774 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Bruce Atherton
f83f5c68c9
First pass at fixing checkstyle issues by using IDEA to reformat code and identify problem spots
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274773 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
28c5ebe193
fix for concurrent access to list exception for rhino testcase
The original script added tasks to the current target.
This is not a good idea, as an the task list of the target is being walked.
A change made recently uses an iterator instead of an enumerator to walk the list.
The iterator picks up the fact that the list has been changed
and causes the concurrent access exception.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274772 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
1819851c5e
changed for checkstyle
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274771 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
01a0be022d
Fix echeckstyle reported issues
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274770 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
c82dc079d4
1) make sure that the -GTC flag on VSSGET only shows up when a timestamp has been set
2) make sure that if you have label="" you are not going to have -VL-L in the command line arguments
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274769 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Conor MacNeill
5b331f6baa
Easy stuff - imports and licence headers
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274768 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Conor MacNeill
4613fe2ba9
Remove double-check pattern.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274767 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Conor MacNeill
12d6c01879
More checkstyle fixes
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274766 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Conor MacNeill
77f91dc2d9
Fix up style errors
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274763 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
ac7274e1bc
Use getProject() instead of the project field
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274762 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
24f13ef077
Remove cloning of AntTypeDefinition when creating a sub-project
PR: 21296
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274761 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
481c5c51f3
Indentation changes
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274760 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
88c9b25347
clean up to pass checkstyle
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274759 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
348ff7bdea
Reduce memory consumption by using lazy initialization.
Speed things up a little by using unsynchronized collections.
PR: 21296
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274758 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
1c3f4b1664
Speed up Path tokeinzation.
PR: 21296
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274757 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
f292daba99
clean up to pass checkstyle
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274756 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
09f141b765
Nested websphere element for ejbjar does not support spaces in file name.
This commit addresses this issue
PR: 21298
Submitted by: Lee Carver (leeca at pnambic dot com)
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274754 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
9d09e6bde0
checkstyle fixes
PR: 21319
Submitted by: Patrick G. Heck (gus dot heck at olin dot edu)
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274753 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
e3cc7de84e
checkstyle fixes
PR: 21316
Submitted by: Gus Heck (Gus dot Heck at Olin dot edu)
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274752 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
8703d66ca0
Base <zip> and <zipfileset> on new ZipFile code.
This happens mainly for two reasons:
* preserve stored permissions unless the user explicitly overrides them
(PR 2130). This is now fixed for stored files, but not for directories.
* deal with filename encoding of existing archives. Supposed to work
properly now.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274751 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
6dea74459d
Improve algorithm that searches for the central directory - don't get fooled by signatures appearing inside payload.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274750 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
6e2090b71a
Need to override isDirectory for situations where setName has been called
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274749 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
d5570e5c65
Calendar.HOUR is different from Calendar.HOUR_OF_DAY
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274748 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Conor MacNeill
602bfa72c7
Checkstyle update
I've updated the checkstyle buildfile (check.xml) to the
latest version of checkstyle. I've also updated
the HTML stylesheet and created two new stylesheets to render
the checkstyle report in plain text and the xdoc format we
use for the other Ant documentation.
I've also moved the checkstyle related stuff into its own area.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274747 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
f2eb856ffd
Add support for filename-encodings other than UTF8 to <untar>.
PR: 10504
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274746 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
ad9c15103d
Finish implementation of ZipFile, use it in Expand (AKA <unzip>).
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274743 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
ec5e77ad32
Initial support for reading of ZIP files - uncomplete as you cannot
get an InputStream to the ZipEntrys yet.
Will be needed to fix PR 10504 as well as to preserve permissions when
updating an archive (no PR yet).
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274742 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
ea0ea86ba2
cancel previous change
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274736 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
ceece4c206
fix translate test
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274735 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
60af10ce5b
Try quick fix to make tests pass
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274733 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
c1288a2b32
The translate task did not translate tokens that are placed too close together.
This change fixes this. Thanks Tom, sorry for the time it took to process your patch.
PR: 17297
Submitted by: Tom Eugelink (tom at tbee dot org)
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274730 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
ebe2b05bb3
Make FileUtilsTest pass under cygwin
I found doing this how to tell whether one is running under cygwin
if the first letter (drive letter) of System.getProperty("user.dir")
is lower case then one is under cygwin
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274728 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
4ffa9e1380
quick fix for Ant.java use of property in Ant#reinit
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274726 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Conor MacNeill
b36b67d9e2
New Launch facility. Separate jar now can be used to launch Ant which
takes over some of the functionality traditionally found in the Ant launch
scripts.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274724 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
9f6981d2a2
Get Project#getTaskDefinitions and Project#getDataTypeDefinitions
to emulate old behaviour
This fixs the <antstructure/> output.
Provide ComponentHelper#getAntTypeTable to provide the full table
Revert changes to ProjectTest
Update Typedef.java (forgot this in previous commit)
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274723 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
c858d88d08
opps - 2: set includedelims to the attribute in the C&P method
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274722 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
6453ac69c1
opps: set includedelims to the attribute
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274721 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
4ae9767592
Make filtersets preserve line endings
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274720 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
0f3d4a58ff
2003
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274719 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Peter Reilly
8701272b24
Second patch from antlib update as described in
http://issues.apache.org/bugzilla/show_bug.cgi?id=19897
This patch
* unifies the type and task definitions into one table
* types and tasks are represented by a AntTypeDefinition object
* taskadapter has been generalized to a typeadapter
* <typedef/> has a number of new attributes:
- adapter
- adaptto
- onerror
* <taskdef/> html page updated to refer to <typedef/> page
PR: 19897
Submitted by: Peter Reilly
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274718 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
26f6bfe2be
Added ANTLR#setGlib(File)
Marked ANTLR#setGlib(String) as deprecated, and make it call
the new setGlib(File)
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274717 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Antoine Levy-Lambert
84d3e4a158
All the tests in ANTLRTest.java involving a super-grammar file were failing on Windows.
This change fixes the problem.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274716 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
a07fa67848
Remove paste error
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274715 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
b498a4535a
Use the new FileUtils#rename method
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274714 13f79535-47bb-0310-9956-ffa450edef68
22 years ago
Stefan Bodewig
da037ebd0f
2003
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274713 13f79535-47bb-0310-9956-ffa450edef68
22 years ago