Clone
 

costin manolache <costin@apache.org> in ant-git

Removing my name

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276232 13f79535-47bb-0310-9956-ffa450edef68

Last part of component helper merge ( including the fix contains -> containsKey for the test case )

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274550 13f79535-47bb-0310-9956-ffa450edef68

ComponentHelper has been checked in for some time - and I don't know any -1 or major complain.

This removes the duplicated code and switches the component creation

to component helper.

I used it in my workspace for a long time without problem - and the gump

seems to work just like before.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274549 13f79535-47bb-0310-9956-ffa450edef68

    • -362
    • +14
    /src/main/org/apache/tools/ant/Project.java
Remove one method - it wasn't used, and it seems it's not powerfull enough for all cases discussed. The method that takes UnknownElement, ns, tag should be able to cover everything ( by having access to UE you get access to parent and all the tree - so any kind of policy can be implemented )

Of course - nothing calls this method yet. Switching UnknwonElement and the

normal component creation is easy - but there are many pieces of code that

call the old method.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274548 13f79535-47bb-0310-9956-ffa450edef68

Plug the namespace uri. One way or another - we'll need it.

Also fix the qname - we need to use the localname.

Originally used qname to avoid breaking build files that used : ( they still

needed to declare a namespace for that previx - otherwise SAX would complain ).

( not sure about the last part - I think some parsers, when validation is off, will

allow : to be used and pass whatever was used as qname ).

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274547 13f79535-47bb-0310-9956-ffa450edef68

The ctor takes Project as param.

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274546 13f79535-47bb-0310-9956-ffa450edef68

Update with the changes in Project.

This makes ComponentHelper the almost exact duplication of the task creation

code in Project.

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274545 13f79535-47bb-0310-9956-ffa450edef68

Patch from Lo��c P��ron <loic.peron@bigfoot.com> to compile against ant153

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274432 13f79535-47bb-0310-9956-ffa450edef68

Few changes: - implement the BuildLogger - so it can be used with -logger

- few hacks/changes to support logging messages to stdout/stderr without

going to infinite loop. The trick is to create the logger with stdout

beeing the "real" one. Just to be sure it also logs with stdout set to

the real one. This could be done more cleanely probably - with some

changes in core.

- less verbosity ( task started/stoped doesn't need info, etc ).

- the log category is based on the real task name, combine with the

target. That means you can arbitrarily enable debug on tasks and

to tasks that are in particular target.

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273772 13f79535-47bb-0310-9956-ffa450edef68

Warn of duplicated project name only if importing.

There are normal cases ( antcall) where the same build file is parsed many times

( this could be avoided now - as an optimization ).

It is a problem only in import, because of the target conflict resolution.

( targets are qualified with the project name )

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273769 13f79535-47bb-0310-9956-ffa450edef68

Cut&paste of all code related to task/types from Project.

This is _not_ an antlib, just a mechansim to make the task/type

management pluggable and simplify Project ( which will just delegate

for backward compat. ).

Please review - and -1 ( or just remove/change ) if you think this

is bad.

The actual details of the plugin mechanisms are not perfect -

we need to settle on them before 1.6 is released ( same for PropertyHelper).

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273745 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +662
    /src/main/org/apache/tools/ant/ComponentHelper.java
Ant is reusing the same helper

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273736 13f79535-47bb-0310-9956-ffa450edef68

Remove the debug statement.

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273735 13f79535-47bb-0310-9956-ffa450edef68

Ant will try to copy all inheritedReferences. Some may not exist. Display a warning.

I don't understand very well the code - but we take the name from

"references" ( which is specified by the user ), and assume that

all of them exist. For some reason that's not allways true.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273734 13f79535-47bb-0310-9956-ffa450edef68

Added back the import property. Added a small message to allow debugging of duplicated project names.

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273733 13f79535-47bb-0310-9956-ffa450edef68

Extra check for null.

Input is calling setNewProperty - but if defaultValue and value are null

we'll get NPE

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273732 13f79535-47bb-0310-9956-ffa450edef68

Weird. UE didn't seem to call setProject on the task. That seems to be the cause of the NPE.

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273731 13f79535-47bb-0310-9956-ffa450edef68

Fix getParent() ( cut&paste from ProjectHelperImpl )

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273729 13f79535-47bb-0310-9956-ffa450edef68

Update with the current name generation schema.

There is no standard for how jsp generates names - and jasper

changes from time to time :-)

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273728 13f79535-47bb-0310-9956-ffa450edef68

Finally fix the jspc test failure.

This is just the first round, it can be improved - not sure what's

the best way to deal with classpath specific issues in path.

The problem is that CLASSPATH ( as given in the system property,

and added in concatSystemPath ) may contain relative paths,

and they are relative to user.dir, not the project basedir.

Since gump is using relative paths, the launched java didn't find

the classes it needed, returning the strange -1 error.

Of course, the test suite could be more informative too :-)

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273727 13f79535-47bb-0310-9956-ffa450edef68

    • -7
    • +25
    /src/main/org/apache/tools/ant/types/Path.java
A small test for xmldom and jxpath.

Seems to work fine for me. Make sure you have commons-jxpath.jar in

ant/lib ( or use <classloader> )

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273726 13f79535-47bb-0310-9956-ffa450edef68

Fix the CRLF failure.

The test relies on the order of attributes ( cr set before eol ). Probably

other tasks are in the same situation.

The original change tried to reduce the dependencies on SAX - we may

use DOM or direct API calls in future, and the code will become very

complex. I just used the same thing that SAX is using ( 2 Vectors to

preserve the order ). We could also pick one ( SAX2 attributes ) and use

it in all cases.

PR:

Obtained from:

Submitted by:

Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273725 13f79535-47bb-0310-9956-ffa450edef68

Changed the build system.

embed-optional will build optiona-dynprop.jar containing the dynamic

properties and XMLDOM.

Main will just display a message - the hooks are not needed with ant1.6,

only for ant1.5. ( the component helper is not yet in 1.6, but

it's easier )

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273724 13f79535-47bb-0310-9956-ffa450edef68

Include optional-* ( probably don't have to include ant.jar any more for ant1.6, but still needed with ant1.5 )

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273723 13f79535-47bb-0310-9956-ffa450edef68

Same attributes names as in ant1.6

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273722 13f79535-47bb-0310-9956-ffa450edef68

Update to the new hook.

It seems to work now :-)

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273721 13f79535-47bb-0310-9956-ffa450edef68

Few small changes. If the core loader is set and no explicit classpath is present, use it.

I think this can be further cleaned up to use the right parent loader

etc. But probably the best would be to just use the loaderRef.

Or just deprecate Definer completely - when we have a good antlib solution

Also added getters ( it's nice to have access to info - especially with

dynamic properties :-)

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273720 13f79535-47bb-0310-9956-ffa450edef68

Few fixes, AntClassLoader uses parentFirst, Classloader was using reverse. Make them consistent PR: Obtained from: Submitted by: Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273719 13f79535-47bb-0310-9956-ffa450edef68

Add setting support

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273718 13f79535-47bb-0310-9956-ffa450edef68

Remove the old helper

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273717 13f79535-47bb-0310-9956-ffa450edef68