Peter Reilly
0aa2b2528f
some checkstyle changes
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@469717 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
ac78dc1602
Bugzilla 36733, NPE when failure in creating parser
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@469303 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Antoine Levy-Lambert
873b850f39
fix for
<javac> fails with NPE when compiling with eclipse ecj 3.1.x
Bugzilla 40839.
root cause of the problem was in org.eclipse.jdt.core.JDTCompiler
method addExtDirs. A FileSet was created without the Project attribute set,
then added to a Path.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@469050 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Antoine Levy-Lambert
2201b1634b
fix for Bugzilla 40722. Was identified as a directory scanning problem.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@468781 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Antoine Levy-Lambert
26498d6bc5
<delete> doesnt delete when defaultexcludes="false" and no includes is set
fixed. Bugzilla 40313.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@468724 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Steve Loughran
14f760492c
Made web.xml non optional again, as it was hiding too many bugs (e.g war files for tomcat 5), but added an attribute to make it optional.
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
19 years ago
Steve Loughran
4f27ced09d
remove some imports we dont need
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@468556 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Steve Loughran
44f1058c6d
handle security checks on property get gracefully
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@468181 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Steve Loughran
c91cce227b
web.xml is now optional in Java EE. I've tweaked <war> to warn but continue if it is omitted, and not to say anything if there is a duplicate reference to the same web.xml, but to complain a lot if there are two conflicting ones (with diagnostics).
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
19 years ago
Antoine Levy-Lambert
74f550099b
add regex attribute to echoproperties task.
Bugzilla 40019.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@467828 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Antoine Levy-Lambert
92946530f4
remove the @link , causing a warning when building javadoc,
probably because it is a link to a private method in a private class
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@467230 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
9067f554ed
jasper4.1 is not in ant classpath while compiling, fix link in junittaskmirror
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@467136 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
c9e3f56ee6
remove noinspection tag, change @todo : to @todo
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@467135 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
fbe0ff49d9
fix up some of the javadoc whining
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@467129 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
ac1eb71b58
pset svn:eol-style native
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@466880 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
3510e9c820
remove use of sun.misc.uuencoder
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@466879 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Antoine Levy-Lambert
a0cc97f410
modified to call the property version from build.xml project.version
defaultManifest.mf and version.txt are updated using expandproperties rather than tokenfilter
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@466856 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Antoine Levy-Lambert
105b2252ce
Launcher should not depend upon parent package
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@466643 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
d2518a0832
make IH.clearCache() public
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@466300 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
7d8402eb23
Stop making IH a project listener,
instead clean the IH cache explititly on build finished.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@466290 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
e563725d1b
Free the realThing with UE is finished with it
(fixes since last look at this allows this)
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@466283 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
12ae031068
Fix for OOME with <*ant*> and <typedef>
Bugzilla report 28283 and 33061
IH had a map of class->IH objects. The
class is the typedefed class and IH is the
attributes, elements etc of that class.
This works fine, except that the class is kept
until the build ends, this means that the classloader
for the class is also kept, a classloader contains
pointers to all the classes loaded by it - so a lot
of memory can be blocked.
When ant, or antcall is used and the called project
typedef the antcontrib, these will be new classloaders,
hence the memory being used up.
The fix is to use the name of the class, check if the IH
in the map is the same class, and if not replace that IH.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@465073 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
f5c95e9ca4
add fall-back for undefined references that are parsed
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@465065 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Steve Loughran
7c58ba3edd
Having learned about how the java memory model really works, I have had a quick code review of the threading here.
1. stuff that is shared read is always marked volatile, to avoid being compiled out.
2. added more synchronization when appropriate.
I make no claims as to thread safety here, as I was never that good at formal proofs of correctness.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@465013 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jan Materne
ae5166d215
typo
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@464439 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Antoine Levy-Lambert
45b244fd64
use FileUtils.close to close the Reader open for the crash file
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@464359 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
707e6f329b
Reduce to verbose message of overridding properties.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@463868 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Jan Materne
94f6a31817
Factory method for easier instantiation.
Bug 14831
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@463601 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
911c5901fc
opps: restore correct behavour for setting basetest attributes
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@463447 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Matthew Jason Benson
1cddc5e638
fix failures
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@463287 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
79f24fd579
Added outputtoformatters attribute to <junit> to allow suppression
of noisey tests. Bugzilla report 12817.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@463045 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Matthew Jason Benson
157e6f3305
Let Path use Union by composition instead of inheritance so that third-party
code using paths built against Ant 1.7 should still run against Ant 1.6 .
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@462955 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Matthew Jason Benson
66838f3c29
Added <compare> resource selector to select resources based on the
results of their comparison to other resources. Inspired by userlist thread
http://marc.theaimsgroup.com/?t=115998761500004&r=1&w=2 .
Still lacks an example other than testcases. :(
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@454842 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Matthew Jason Benson
4baba959d2
extract DelegatedResourceComparator from Sort collection
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@454829 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Matthew Jason Benson
a4c55d35b9
fix method signature--accidentally and unnecessarily opening up access
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@454827 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Matthew Jason Benson
76a6b5c4c9
extend DataType, equals non-final
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@454824 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
a5360da98a
PathConvert on Windows should process forward and back slashes equivalently.
Bugzilla report 32884.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@454032 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
3822ba4a35
Fix for junit4
in JUnit4 annotations are placed in org.junit,
so this package needs to be made a "systempackage" for fork=no to work.
Bugzilla report 40697
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@454027 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
d7f1401f85
Defer references
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@453770 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Matthew Jason Benson
3b1908017a
ignore null child collection, why not
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@453765 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Matthew Jason Benson
7b8f2409f8
line up with some other exception throwing utility methods e.g. in DataType
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@453763 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
583cfae0e5
Do not set ant.file.{projectname} when the project name
is not set in the <project> tag. (as discussed)
Bugzilla report: 39920
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@453401 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
c524f9ba22
Bugzilla 40682: junit regression
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@453350 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Steve Loughran
8ed820fa86
refactoring of WeakishReference, as discussed.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@453274 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Steve Loughran
329d23fb88
close using FileUtils.close
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@453156 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
33c2653138
Bugzilla 30498: no check on refid for setting some attributes in zipfileset
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@453035 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
b10bf232ba
another go at bugzilla 38747, isolate resources
get the baseloader for resources in isolate mode
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@453032 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
ef789dfa9b
Always handle refid first.
Refid normally cannot be used with other
attributes and some types check for this.
The code is broken in a number of places -
if refid is not set first. To fix this,
runtimeconfigurable will now always process
refid first.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@452635 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
135b0fa373
UnknownElement.maybeconfigure was 'always configure': Bugzilla 40641
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@451479 13f79535-47bb-0310-9956-ffa450edef68
19 years ago
Peter Reilly
a045d5480c
revert making ConditionBase a Task after discussion on dev@apache.org
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@451444 13f79535-47bb-0310-9956-ffa450edef68
19 years ago