DO NOT REPLY [Bug 45902] Up-to-date checks for JARs broken due to comparison of dir timestamps

2009-01-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45902


Ivan Todoroski  changed:

   What|Removed |Added

 CC||gr...@gmx.net




-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.


svn commit: r739228 - /ant/ivy/updatesite/trunk/build.xml

2009-01-30 Thread hibou
Author: hibou
Date: Fri Jan 30 10:29:21 2009
New Revision: 739228

URL: http://svn.apache.org/viewvc?rev=739228&view=rev
Log:
IVYDE-156: make the publishing of the release into the updatesite more 
automatic, so there won't be mess around version numbers

Modified:
ant/ivy/updatesite/trunk/build.xml

Modified: ant/ivy/updatesite/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?rev=739228&r1=739227&r2=739228&view=diff
==
--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Fri Jan 30 10:29:21 2009
@@ -72,11 +72,47 @@
 
 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -95,6 +131,41 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

svn commit: r739230 - /ant/ivy/core/trunk/doc/dev/updatesite.html

2009-01-30 Thread hibou
Author: hibou
Date: Fri Jan 30 10:36:59 2009
New Revision: 739230

URL: http://svn.apache.org/viewvc?rev=739230&view=rev
Log:
IVYDE-156: update the release doc so it references the new ant targets

Modified:
ant/ivy/core/trunk/doc/dev/updatesite.html

Modified: ant/ivy/core/trunk/doc/dev/updatesite.html
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/dev/updatesite.html?rev=739230&r1=739229&r2=739230&view=diff
==
--- ant/ivy/core/trunk/doc/dev/updatesite.html (original)
+++ ant/ivy/core/trunk/doc/dev/updatesite.html Fri Jan 30 10:36:59 2009
@@ -38,27 +38,16 @@
 The update site svn location is there: 
https://svn.apache.org/repos/asf/ant/ivy/updatesite/trunk . You will update it 
so it will contain the new artifacts.
 
 For an Ivy release:
-The new ivy bundle have to be placed in the plugins directory of the 
updatesite. So you should do something like:
-cp /ivy.jar dist/plugins/org.apache.ivy_$VERSION.jar
-
-Then Eclipse needs a feature, which will be generated at the right place with 
an ant target:
-
-ant generate-ivy-feature -Divy.version=$VERSION
-
+As you have a build jar for Ivy, just do:
+ant install-ivy -Divy.jar=./path/to/ivy.jar
+
 For an IvyDE release:
 The zip distribution needs to be unpacked into the updatesite directory:
-
-cd dist
-unzip /org.apache.ivyde.feature-$VERSION.zip
-
+ant install-ivyde 
-Divyde.zip=./path/to/org.apache.ivyde.feature-${VERSION}.zip
 
 
 
-Then the deprecated versions of the plugins and the features should be removed.
-
-Update the site.xml
-
-The site.xml file in the dist directory should be edited so 
it will reference the new artifacts. You should just change the version number 
accordingly to the release.
+Those previous tasks should have deleted some files, but not using the svn 
command: you should see some ! in your svn status log. Then do some svn 
rm on those files.
 
 Prepare the update site
 




[jira] Created: (IVYDE-160) Unable to create intial ivy configuration unless all configurations are selected

2009-01-30 Thread Robert Munteanu (JIRA)
Unable to create intial ivy configuration unless all configurations are selected


 Key: IVYDE-160
 URL: https://issues.apache.org/jira/browse/IVYDE-160
 Project: IvyDE
  Issue Type: Bug
Affects Versions: 2.0.0.beta1
Reporter: Robert Munteanu


Steps:

1. Create Ivy file with multiple confs and dependencies attached to those confs
2. Add to the Eclipse project an Ivy Classpath Container with only one of the 
confs enabled.

After clicking 'Finish' I get an error:

java.lang.RuntimeException: problem during retrieve of GROUP#ARTIFACT: 
java.lang.IllegalStateException: Report file 
'/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
at org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:196)
at org.apache.ivy.Ivy.retrieve(Ivy.java:540)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.maybeRetrieve(IvyResolveJob.java:456)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.access$6(IvyResolveJob.java:446)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob$1.run(IvyResolveJob.java:292)
Caused by: java.lang.IllegalStateException: Report file 
'/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
at org.apache.ivy.plugins.report.XmlReportParser.parse(XmlReportParser.java:291)
at 
org.apache.ivy.core.retrieve.RetrieveEngine.determineArtifactsToCopy(RetrieveEngine.java:278)
at org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:102)
... 4 more

Where production is one of the confs which is not enabled. A snippet of the ivy 
xml ( may be relevant ):

{code}




{/code}

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.



[jira] Updated: (IVYDE-160) Unable to create intial ivy configuration unless all configurations are selected

2009-01-30 Thread Robert Munteanu (JIRA)

 [ 
https://issues.apache.org/jira/browse/IVYDE-160?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Robert Munteanu updated IVYDE-160:
--

Description: 
Steps:

1. Create Ivy file with multiple confs and dependencies attached to those confs
2. Add to the Eclipse project an Ivy Classpath Container with only one of the 
confs enabled.

After clicking 'Finish' I get an error:

{code}
java.lang.RuntimeException: problem during retrieve of GROUP#ARTIFACT: 
java.lang.IllegalStateException: Report file 
'/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
at org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:196)
at org.apache.ivy.Ivy.retrieve(Ivy.java:540)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.maybeRetrieve(IvyResolveJob.java:456)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.access$6(IvyResolveJob.java:446)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob$1.run(IvyResolveJob.java:292)
Caused by: java.lang.IllegalStateException: Report file 
'/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
at org.apache.ivy.plugins.report.XmlReportParser.parse(XmlReportParser.java:291)
at 
org.apache.ivy.core.retrieve.RetrieveEngine.determineArtifactsToCopy(RetrieveEngine.java:278)
at org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:102)
... 4 more
{code}

Where production is one of the confs which is not enabled. A snippet of the ivy 
xml ( may be relevant ):

{code}




{code}

  was:
Steps:

1. Create Ivy file with multiple confs and dependencies attached to those confs
2. Add to the Eclipse project an Ivy Classpath Container with only one of the 
confs enabled.

After clicking 'Finish' I get an error:

java.lang.RuntimeException: problem during retrieve of GROUP#ARTIFACT: 
java.lang.IllegalStateException: Report file 
'/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
at org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:196)
at org.apache.ivy.Ivy.retrieve(Ivy.java:540)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.maybeRetrieve(IvyResolveJob.java:456)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.access$6(IvyResolveJob.java:446)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob$1.run(IvyResolveJob.java:292)
Caused by: java.lang.IllegalStateException: Report file 
'/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
at org.apache.ivy.plugins.report.XmlReportParser.parse(XmlReportParser.java:291)
at 
org.apache.ivy.core.retrieve.RetrieveEngine.determineArtifactsToCopy(RetrieveEngine.java:278)
at org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:102)
... 4 more

Where production is one of the confs which is not enabled. A snippet of the ivy 
xml ( may be relevant ):

{code}




{code}


> Unable to create intial ivy configuration unless all configurations are 
> selected
> 
>
> Key: IVYDE-160
> URL: https://issues.apache.org/jira/browse/IVYDE-160
> Project: IvyDE
>  Issue Type: Bug
>Affects Versions: 2.0.0.beta1
>Reporter: Robert Munteanu
>   Original Estimate: 0h
>  Remaining Estimate: 0h
>
> Steps:
> 1. Create Ivy file with multiple confs and dependencies attached to those 
> confs
> 2. Add to the Eclipse project an Ivy Classpath Container with only one of the 
> confs enabled.
> After clicking 'Finish' I get an error:
> {code}
> java.lang.RuntimeException: problem during retrieve of GROUP#ARTIFACT: 
> java.lang.IllegalStateException: Report file 
> '/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
> at 
> org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:196)
> at org.apache.ivy.Ivy.retrieve(Ivy.java:540)
> at 
> org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.maybeRetrieve(IvyResolveJob.java:456)
> at 
> org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.access$6(IvyResolveJob.java:446)
> at 
> org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob$1.run(IvyResolveJob.java:292)
> Caused by: java.lang.IllegalStateException: Report file 
> '/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
> at 
> org.apache.ivy.plugins.report.XmlReportParser.parse(XmlReportParser.java:291)
> at 
> org.apache.ivy.core.retrieve.RetrieveEngine.determineArtifactsToCopy(RetrieveEngine.java:278)
> at 
> org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:102)
> ... 4 more
> {code}
> Where production is one of the confs which is not enabled. A snippet of the 
> ivy xml ( may be relevant ):
> {code}
> 
>   
>   
>name="google-collections" rev="0.8" conf="production->default"/>
> {co

[jira] Updated: (IVYDE-160) Unable to create intial ivy configuration unless all configurations are selected

2009-01-30 Thread Robert Munteanu (JIRA)

 [ 
https://issues.apache.org/jira/browse/IVYDE-160?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Robert Munteanu updated IVYDE-160:
--

Description: 
Steps:

1. Create Ivy file with multiple confs and dependencies attached to those confs
2. Add to the Eclipse project an Ivy Classpath Container with only one of the 
confs enabled.

After clicking 'Finish' I get an error:

java.lang.RuntimeException: problem during retrieve of GROUP#ARTIFACT: 
java.lang.IllegalStateException: Report file 
'/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
at org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:196)
at org.apache.ivy.Ivy.retrieve(Ivy.java:540)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.maybeRetrieve(IvyResolveJob.java:456)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.access$6(IvyResolveJob.java:446)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob$1.run(IvyResolveJob.java:292)
Caused by: java.lang.IllegalStateException: Report file 
'/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
at org.apache.ivy.plugins.report.XmlReportParser.parse(XmlReportParser.java:291)
at 
org.apache.ivy.core.retrieve.RetrieveEngine.determineArtifactsToCopy(RetrieveEngine.java:278)
at org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:102)
... 4 more

Where production is one of the confs which is not enabled. A snippet of the ivy 
xml ( may be relevant ):

{code}




{code}

  was:
Steps:

1. Create Ivy file with multiple confs and dependencies attached to those confs
2. Add to the Eclipse project an Ivy Classpath Container with only one of the 
confs enabled.

After clicking 'Finish' I get an error:

java.lang.RuntimeException: problem during retrieve of GROUP#ARTIFACT: 
java.lang.IllegalStateException: Report file 
'/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
at org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:196)
at org.apache.ivy.Ivy.retrieve(Ivy.java:540)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.maybeRetrieve(IvyResolveJob.java:456)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.access$6(IvyResolveJob.java:446)
at 
org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob$1.run(IvyResolveJob.java:292)
Caused by: java.lang.IllegalStateException: Report file 
'/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
at org.apache.ivy.plugins.report.XmlReportParser.parse(XmlReportParser.java:291)
at 
org.apache.ivy.core.retrieve.RetrieveEngine.determineArtifactsToCopy(RetrieveEngine.java:278)
at org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:102)
... 4 more

Where production is one of the confs which is not enabled. A snippet of the ivy 
xml ( may be relevant ):

{code}




{/code}


> Unable to create intial ivy configuration unless all configurations are 
> selected
> 
>
> Key: IVYDE-160
> URL: https://issues.apache.org/jira/browse/IVYDE-160
> Project: IvyDE
>  Issue Type: Bug
>Affects Versions: 2.0.0.beta1
>Reporter: Robert Munteanu
>   Original Estimate: 0h
>  Remaining Estimate: 0h
>
> Steps:
> 1. Create Ivy file with multiple confs and dependencies attached to those 
> confs
> 2. Add to the Eclipse project an Ivy Classpath Container with only one of the 
> confs enabled.
> After clicking 'Finish' I get an error:
> java.lang.RuntimeException: problem during retrieve of GROUP#ARTIFACT: 
> java.lang.IllegalStateException: Report file 
> '/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
> at 
> org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:196)
> at org.apache.ivy.Ivy.retrieve(Ivy.java:540)
> at 
> org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.maybeRetrieve(IvyResolveJob.java:456)
> at 
> org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob.access$6(IvyResolveJob.java:446)
> at 
> org.apache.ivyde.eclipse.cpcontainer.IvyResolveJob$1.run(IvyResolveJob.java:292)
> Caused by: java.lang.IllegalStateException: Report file 
> '/home/robert/.ivy2/cache/GROUP-ARTIFACT-production.xml' does not exist.
> at 
> org.apache.ivy.plugins.report.XmlReportParser.parse(XmlReportParser.java:291)
> at 
> org.apache.ivy.core.retrieve.RetrieveEngine.determineArtifactsToCopy(RetrieveEngine.java:278)
> at 
> org.apache.ivy.core.retrieve.RetrieveEngine.retrieve(RetrieveEngine.java:102)
> ... 4 more
> Where production is one of the confs which is not enabled. A snippet of the 
> ivy xml ( may be relevant ):
> {code}
> 
>   
>   
>name="google-collections" rev="0.8" conf="production->default"/>
> {code}

-- 
This message is automa

DO NOT REPLY [Bug 45902] Up-to-date checks for JARs broken due to comparison of dir timestamps

2009-01-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45902


Emmanuel Bourg  changed:

   What|Removed |Added

 CC||ebo...@apache.org




-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.


DO NOT REPLY [Bug 46633] Setter never called on subclass of FileSet

2009-01-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46633


Stefan Bodewig  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Comment #3 from Stefan Bodewig   2009-01-30 04:12:27 
PST ---
FileSet's has two setDir method accepts a File argument, not a String.

setters using String arguments are always of lower precedence than more
advanced ones for Ant - see the paragraph below the bullted list in
http://ant.apache.org/manual/develop.html#set-magic

You want to override the File-arg version instead of adding your own setter and
it will work.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.


DO NOT REPLY [Bug 46506] Unexpected results from globmapper

2009-01-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46506


Stefan Bodewig  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #5 from Stefan Bodewig   2009-01-30 04:16:47 
PST ---
marked the change as backwards incompatible change and live with.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.


svn commit: r739255 - /ant/core/trunk/WHATSNEW

2009-01-30 Thread bodewig
Author: bodewig
Date: Fri Jan 30 12:16:39 2009
New Revision: 739255

URL: http://svn.apache.org/viewvc?rev=739255&view=rev
Log:
the fix for 46506 is not backwards compatible

Modified:
ant/core/trunk/WHATSNEW

Modified: ant/core/trunk/WHATSNEW
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=739255&r1=739254&r2=739255&view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jan 30 12:16:39 2009
@@ -129,6 +129,12 @@
versions of Ant.
Bugzilla Report 36748.
 
+ * globmapper didn't work properly if the "to" pattern didn't contain
+   a "*".  In particular it implicitly added a * to the end of the
+   pattern.  This is no longer the case.  If you relied on this
+   behavior you will now need to explicitly specify the trailing *.
+   Bugzilla Report 46506.
+
 Fixed bugs:
 ---
 
@@ -324,10 +330,6 @@
miss some files and directories in the presence of recursive
exclude patterns.
 
- * globmapper didn't work properly if the "to" pattern didn't contain
-   a *.
-   Bugzilla Report 46506.
-
  *  resource collection kept only one of entries deemed equal by
the chosen Comparator.  Bugzilla report 46527.
 




[g...@vmgump]: Project test-ant (in module ant) failed

2009-01-30 Thread Gump Integration Build
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 gene...@gump.apache.org.

Project test-ant has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 43 runs.
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://vmgump.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- Optional dependency jakarta-tomcat-4.0 prerequisite failed with reason 
build failed
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.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: 20 mins 36 secs
Command Line: /usr/lib/jvm/java-6-sun/bin/java -Djava.awt.headless=true 
-Xbootclasspath/p:/srv/gump/public/workspace/xml-xerces2/build/xercesImpl.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis.jar:/srv/gump/public/workspace/xml-xalan/build/serializer.jar:/srv/gump/public/workspace/xml-xalan/build/xalan-unbundled.jar
 org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbuild.sysclasspath=only -Dtest.haltonfailure=false 
-Dant.home=/srv/gump/public/workspace/ant/dist run-tests 
[Working Directory: /srv/gump/public/workspace/ant]
CLASSPATH: 
/usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/ant/build/testcases:/srv/gump/public/workspace/ant/src/tests/junit:/srv/gump/public/workspace/ant/src/etc/testcases:/srv/gump/public/workspace/ant/src/etc/testcases/taskdefs/optional/out:/srv/gump/public/workspace/ant/build/lib/ant-stylebook.jar:/srv/gump/public/workspace/ant/build/lib/ant-swing.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/build/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-regexp.jar:/srv/gump/public/workspace/ant/build/lib/ant-commons-net.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-log4j.jar:/srv/gump/public/workspace/ant/build/lib/ant-commons-logging.jar:/srv/gump/public/workspace/ant/build/lib/ant-jai.jar:/srv/gump/public/workspace/ant/build/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/build/lib/ant-launcher.jar:/srv/gump/publ
 
ic/workspace/ant/build/lib/ant-jdepend.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-bsf.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-oro.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-bcel.jar:/srv/gump/public/workspace/ant/build/lib/ant-trax.jar:/srv/gump/public/workspace/ant/build/lib/ant-antlr.jar:/srv/gump/public/workspace/ant/build/lib/ant-junit.jar:/srv/gump/public/workspace/ant/build/lib/ant-jsch.jar:/srv/gump/public/workspace/ant/build/lib/ant-javamail.jar:/srv/gump/public/workspace/ant/build/lib/ant.jar:/srv/gump/packages/antlr-2.7.6/antlr.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-30012009.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-30012009.jar:/srv/gump/public/workspace/apache-commons/net/dist/commons-net-30012009.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/public/workspace/jakarta-bcel/target/bcel-5.3-SNAPSHOT.jar:/srv/gump/public/workspace/jakarta
 
-bsf/build/lib/bsf.jar:/srv/gump/public/workspace/logging-log4j-12/dist/lib/log4j-30012009.jar:/srv/gump/public/workspace/jakarta-oro/jakarta-oro-30012009.jar:/srv/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-30012009.jar:/srv/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jdepend-2.6/lib/jdepend.jar:/srv/gump/packages/jsch/jsch-0.1.38.jar:/srv/gump/public/workspace/xml-stylebook/bin/stylebook-1.0-b3_xalan-2.jar:/srv/gump/public/workspace/ant-antlibs/antunit/build/ant-antunit-30012009.jar:/srv/gump/public/workspace/junit/dist/junit-30012009.jar:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis-ext.jar:/srv/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/jasper-compiler.jar:/srv/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/jasper-runtime.jar:/srv/gump/public/workspace/xml-commons/java/build/which.jar:/srv/g
 
ump/public/workspace/rhino/build/rhino_30012009/js.jar:/srv/gump/packages/bsh-2.0b4/bsh-commands-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-classpath-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-core-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-bsf-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-2.0b4.jar:/sr

[g...@vmgump]: Project test-ant-no-xerces (in module ant) failed

2009-01-30 Thread Gump Integration Build
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 gene...@gump.apache.org.

Project test-ant-no-xerces has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 187 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- test-ant-no-xerces :  Java based build tool


Full details are available at:
http://vmgump.apache.org/gump/public/ant/test-ant-no-xerces/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Optional dependency jakarta-tomcat-4.0 prerequisite failed with reason 
build failed
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/ant/test-ant-no-xerces/gump_work/build_ant_test-ant-no-xerces.html
Work Name: build_ant_test-ant-no-xerces (Type: Build)
Work ended in a state of : Failed
Elapsed: 21 mins 21 secs
Command Line: /usr/lib/jvm/java-6-sun/bin/java -Djava.awt.headless=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbuild.sysclasspath=only -Dtest.haltonfailure=false 
-Dant.home=/srv/gump/public/workspace/ant/dist run-tests 
[Working Directory: /srv/gump/public/workspace/ant]
CLASSPATH: 
/usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/ant/build/testcases:/srv/gump/public/workspace/ant/src/tests/junit:/srv/gump/public/workspace/ant/src/etc/testcases:/srv/gump/public/workspace/ant/src/etc/testcases/taskdefs/optional/out:/srv/gump/public/workspace/ant/build/lib/ant-stylebook.jar:/srv/gump/public/workspace/ant/build/lib/ant-swing.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/build/lib/ant-nodeps.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-regexp.jar:/srv/gump/public/workspace/ant/build/lib/ant-commons-net.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-log4j.jar:/srv/gump/public/workspace/ant/build/lib/ant-commons-logging.jar:/srv/gump/public/workspace/ant/build/lib/ant-jai.jar:/srv/gump/public/workspace/ant/build/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/build/lib/ant-launcher.jar:/srv/gump/publ
 
ic/workspace/ant/build/lib/ant-jdepend.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-bsf.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-oro.jar:/srv/gump/public/workspace/ant/build/lib/ant-apache-bcel.jar:/srv/gump/public/workspace/ant/build/lib/ant-trax.jar:/srv/gump/public/workspace/ant/build/lib/ant-antlr.jar:/srv/gump/public/workspace/ant/build/lib/ant-junit.jar:/srv/gump/public/workspace/ant/build/lib/ant-jsch.jar:/srv/gump/public/workspace/ant/build/lib/ant-javamail.jar:/srv/gump/public/workspace/ant/build/lib/ant.jar:/srv/gump/packages/antlr-2.7.6/antlr.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-30012009.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-30012009.jar:/srv/gump/public/workspace/apache-commons/net/dist/commons-net-30012009.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/public/workspace/jakarta-bcel/target/bcel-5.3-SNAPSHOT.jar:/srv/gump/public/workspace/jakarta
 
-bsf/build/lib/bsf.jar:/srv/gump/public/workspace/logging-log4j-12/dist/lib/log4j-30012009.jar:/srv/gump/public/workspace/jakarta-oro/jakarta-oro-30012009.jar:/srv/gump/public/workspace/jakarta-regexp/build/jakarta-regexp-30012009.jar:/srv/gump/public/workspace/jakarta-servletapi-4/lib/servlet.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jdepend-2.6/lib/jdepend.jar:/srv/gump/packages/jsch/jsch-0.1.38.jar:/srv/gump/public/workspace/xml-stylebook/bin/stylebook-1.0-b3_xalan-2.jar:/srv/gump/public/workspace/ant-antlibs/antunit/build/ant-antunit-30012009.jar:/srv/gump/public/workspace/junit/dist/junit-30012009.jar:/srv/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/jasper-compiler.jar:/srv/gump/public/workspace/jakarta-tomcat-4.0/dist/common/lib/jasper-runtime.jar:/srv/gump/public/workspace/xml-commons/java/build/which.jar:/srv/gump/public/workspace/rhino/build/rhino_30012009/js.jar:/srv/gump/packages/bs
 
h-2.0b4/bsh-commands-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-classpath-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-core-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-bsf-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-reflect-2.0b4.jar:/srv/gump/packages/bsh-2.0b4/bsh-util-2.0b4.jar:/srv/gump/public/workspace/apache-commons/codec/dist/commons-codec-30012009.jar
-
[au:antunit] Target: testunion took 0.025 sec
[au:antunit] Target

DO NOT REPLY [Bug 46637] New: Support for ZIP extra fileds is incomplete

2009-01-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46637

   Summary: Support for ZIP extra fileds is incomplete
   Product: Ant
   Version: 1.8Alpha (nightly)
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Core
AssignedTo: bode...@apache.org
ReportedBy: bode...@apache.org
CC: notifications@ant.apache.org


extra fields can have different contents in CFH and LFH, but we currently only
really support the LFH content (because this is what java.util.zip does) - at
least we don't parse the CFH content at all.


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.


svn commit: r739300 - in /ant/core/trunk: ./ src/main/org/apache/tools/zip/ src/tests/antunit/taskdefs/ src/tests/antunit/taskdefs/zip/ src/tests/junit/org/apache/tools/zip/

2009-01-30 Thread bodewig
Author: bodewig
Date: Fri Jan 30 15:00:21 2009
New Revision: 739300

URL: http://svn.apache.org/viewvc?rev=739300&view=rev
Log:
Ignore ZIP extra fields that don't contain the recommended header+length 
structure - this is what unzip does as well.  PR 42940

Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java
ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java
ant/core/trunk/src/main/org/apache/tools/zip/ZipExtraField.java
ant/core/trunk/src/tests/antunit/taskdefs/unzip-test.xml
ant/core/trunk/src/tests/antunit/taskdefs/zip/Bugzilla-46559.zip
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java

Modified: ant/core/trunk/WHATSNEW
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=739300&r1=739299&r2=739300&view=diff
==
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jan 30 15:00:21 2009
@@ -670,6 +670,10 @@
processor.
Bugzilla Issue 46612.
 
+ * the ZIP library will now ignore ZIP extra fields that don't specify
+   a size.
+   Bugzilla Report 42940.
+
 Changes from Ant 1.7.0 TO Ant 1.7.1
 =
 

Modified: ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java?rev=739300&r1=739299&r2=739300&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java Fri Jan 
30 15:00:21 2009
@@ -117,10 +117,6 @@
 }
 start += (length + WORD);
 }
-if (start != data.length) { // array not exhausted
-throw new ZipException("data starting at " + start
-+ " is in unknown format");
-}
 
 ZipExtraField[] result = new ZipExtraField[v.size()];
 return (ZipExtraField[]) v.toArray(result);

Modified: ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java?rev=739300&r1=739299&r2=739300&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java Fri Jan 30 
15:00:21 2009
@@ -252,7 +252,7 @@
 try {
 setExtraFields(ExtraFieldUtils.parse(extra));
 } catch (Exception e) {
-throw new RuntimeException(e.getMessage());
+throw new RuntimeException(e.getMessage(), e);
 }
 }
 

Modified: ant/core/trunk/src/main/org/apache/tools/zip/ZipExtraField.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/zip/ZipExtraField.java?rev=739300&r1=739299&r2=739300&view=diff
==
--- ant/core/trunk/src/main/org/apache/tools/zip/ZipExtraField.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/zip/ZipExtraField.java Fri Jan 30 
15:00:21 2009
@@ -64,7 +64,7 @@
 byte[] getLocalFileDataData();
 
 /**
- * The actual data to put central directory - without Header-ID or
+ * The actual data to put into central directory - without Header-ID or
  * length specifier.
  * @return the data
  * @since 1.1

Modified: ant/core/trunk/src/tests/antunit/taskdefs/unzip-test.xml
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/unzip-test.xml?rev=739300&r1=739299&r2=739300&view=diff
==
--- ant/core/trunk/src/tests/antunit/taskdefs/unzip-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/unzip-test.xml Fri Jan 30 
15:00:21 2009
@@ -44,6 +44,16 @@
 
   
 
+  https://issues.apache.org/bugzilla/show_bug.cgi?id=42940";
+  >
+
+
+
+
+
+  
+
   https://issues.apache.org/bugzilla/show_bug.cgi?id=46559";
   >

Modified: ant/core/trunk/src/tests/antunit/taskdefs/zip/Bugzilla-46559.zip
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/zip/Bugzilla-46559.zip?rev=739300&r1=739299&r2=739300&view=diff
==
Binary files - no diff available.

Modified: 
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java?rev=739300&r1=739299&r2=739300&view=diff
==
--- 
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java 
(original)

DO NOT REPLY [Bug 42940] Zip ExtraField header size is hard coded as 4 bytes

2009-01-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=42940


Stefan Bodewig  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED
   Target Milestone|--- |1.8.0




--- Comment #7 from Stefan Bodewig   2009-01-30 07:00:43 
PST ---
Looking through the source code of InfoZIP's unzip the extra field parsing code
will simply skip any extra fields shorter than four bytes as long as they are
at the end of the extra field.

I've modified Ant's zip package to do the same with svn revision 739300 ( 
https://svn.apache.org/viewcvs.cgi?view=rev&rev=739300 )


-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.


DO NOT REPLY [Bug 46637] Support for ZIP extra fields is incomplete

2009-01-30 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46637


Stefan Bodewig  changed:

   What|Removed |Added

Summary|Support for ZIP extra fileds|Support for ZIP extra fields
   |is incomplete   |is incomplete




-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.


[jira] Commented: (IVY-1024) Minor fixes to ivy-report.xsl

2009-01-30 Thread Carlton Brown (JIRA)

[ 
https://issues.apache.org/jira/browse/IVY-1024?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12668921#action_12668921
 ] 

Carlton Brown commented on IVY-1024:


Maarten,

It looks good on my end, thanks for picking it up.

Carlton



> Minor fixes to ivy-report.xsl
> -
>
> Key: IVY-1024
> URL: https://issues.apache.org/jira/browse/IVY-1024
> Project: Ivy
>  Issue Type: Bug
>  Components: Ant
>Affects Versions: 2.0
>Reporter: Carlton Brown
>Assignee: Maarten Coene
>Priority: Minor
> Fix For: trunk
>
> Attachments: IVY-1024.patch
>
>
> 2 things have been bothering me with the ivy-report.xsl.
> 1)  Broken link for Ivy logo
> 2)  Does not display the revision number of the module being reported on.
> Have simple fixes for both of these.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.



svn commit: r739339 - /ant/ivy/updatesite/trunk/build.xml

2009-01-30 Thread hibou
Author: hibou
Date: Fri Jan 30 17:22:09 2009
New Revision: 739339

URL: http://svn.apache.org/viewvc?rev=739339&view=rev
Log:
First step towards the build of an updatesite by Hudson for both Ivy and IvyDE

Modified:
ant/ivy/updatesite/trunk/build.xml

Modified: ant/ivy/updatesite/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?rev=739339&r1=739338&r2=739339&view=diff
==
--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Fri Jan 30 17:22:09 2009
@@ -279,4 +279,35 @@
 
 
 
+
+
+
+
+
+updatesite.dir=${basedir}/build
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 




[jira] Commented: (IVY-1022) Forced resolver behavior is inappropriate for ivy:install

2009-01-30 Thread Carlton Brown (JIRA)

[ 
https://issues.apache.org/jira/browse/IVY-1022?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12668972#action_12668972
 ] 

Carlton Brown commented on IVY-1022:


I think this should be default behavior.   Can you think of any valid use case 
where install chooses a different revision than the user specified?   To me, 
this seems to break the intended use of install, though I could be wrong.

> Forced resolver behavior is inappropriate for ivy:install
> -
>
> Key: IVY-1022
> URL: https://issues.apache.org/jira/browse/IVY-1022
> Project: Ivy
>  Issue Type: Improvement
>  Components: Ant
>Affects Versions: 2.0
>Reporter: Carlton Brown
>
> I tried to install a certain revision of a module from a chained resolver to 
> an fs resolver, and observed that Ivy installed a revision other than what I 
> specified.   After investigation I noticed that the chain contained a forced 
> fs resolver.   I removed the forced resolver from the chain, replacing it 
> with an equivalent un-forced fs resolver.   The install worked correctly 
> after that.   
> I think that ivy:install should not be doing any dynamic version resolution 
> at all.   It should in every case use the literal module identifiers that are 
> passed to it.   This being the case, install should ignore a force attribute 
> wherever it is encountered.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.



[jira] Commented: (IVY-1006) Support for opensll sha1 and md5 checksum

2009-01-30 Thread Finn Bock (JIRA)

[ 
https://issues.apache.org/jira/browse/IVY-1006?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12668993#action_12668993
 ] 

Finn Bock commented on IVY-1006:


Works fine now. Thank you.

> Support for opensll sha1 and md5 checksum
> -
>
> Key: IVY-1006
> URL: https://issues.apache.org/jira/browse/IVY-1006
> Project: Ivy
>  Issue Type: Bug
>  Components: Maven Compatibility
>Affects Versions: 2.0-RC2, 2.0
>Reporter: Finn Bock
>Assignee: Maarten Coene
> Fix For: trunk
>
>
> Checksum files created by openssl have a different format and some of these 
> files have moved to the maven repo:
> http://repo2.maven.org/maven2/xalan/xalan/2.7.1/xalan-2.7.1.jar.sha1
> I think ivy should match mavens support for these checksum files.

-- 
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.



svn commit: r739404 - /ant/ivy/updatesite/trunk/build.xml

2009-01-30 Thread hibou
Author: hibou
Date: Fri Jan 30 20:30:54 2009
New Revision: 739404

URL: http://svn.apache.org/viewvc?rev=739404&view=rev
Log:
Make the targets used to generate the release site also usefull for hudson

Modified:
ant/ivy/updatesite/trunk/build.xml

Modified: ant/ivy/updatesite/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/ant/ivy/updatesite/trunk/build.xml?rev=739404&r1=739403&r2=739404&view=diff
==
--- ant/ivy/updatesite/trunk/build.xml (original)
+++ ant/ivy/updatesite/trunk/build.xml Fri Jan 30 20:30:54 2009
@@ -16,12 +16,14 @@
specific language governing permissions and limitations
under the License.
 -->
-
+
 
 
 
 
 
+http://ant.apache.org/ivy/ivyde/updatesite/eclipse-update--xml.cgi"; />
+http://www.apache.org/dist/ant/ivyde/updatesite"; />
 
 
 
@@ -101,7 +103,7 @@
 
 
 
-
+
 
 
 
@@ -111,7 +113,11 @@
 
 
 
+
 
+
+
+
 
 
 
@@ -121,6 +127,7 @@
 
 
 
+
 
 
 
@@ -131,16 +138,9 @@
 
 
 
-
-
-
-
-
-
-
 
 
-
+
 
 
 
@@ -148,7 +148,11 @@
 
 
 
+
 
+
+
+
 
 
 
@@ -159,15 +163,41 @@
 
 
 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
+
+
+
+
+
+
 
 
-
 
 
+
+
+
+
+
+
 
 
 updatesite.dir=${basedir}/build
+mirrors.url=
+updatesite.url=http://hudson.zones.apache.org/hudson/view/Ant/job/IvyDE-updatesite/lastSuccessfulBuild/artifact/trunk/build
 
+
 
 
 
@@ -308,6 +341,6 @@
 
 
 
-
+
 
 




svn commit: r739408 - /ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnitScriptRunner.java

2009-01-30 Thread gscokart
Author: gscokart
Date: Fri Jan 30 21:00:28 2009
New Revision: 739408

URL: http://svn.apache.org/viewvc?rev=739408&view=rev
Log:
remove unsightly double catch

Modified:

ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnitScriptRunner.java

Modified: 
ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnitScriptRunner.java
URL: 
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnitScriptRunner.java?rev=739408&r1=739407&r2=739408&view=diff
==
--- 
ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnitScriptRunner.java
 (original)
+++ 
ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnitScriptRunner.java
 Fri Jan 30 21:00:28 2009
@@ -179,7 +179,7 @@
 }
 
 /**
- * Provide the list of test targets of the active antunit script.
+ * Provides the list of test targets of the active antunit script.
  * @pre isActive()
  * @return List List of test target names
  */
@@ -219,10 +219,6 @@
 try {
 Project newProject = getCleanProject();
 newProject.executeTarget(SUITESETUP);
-} catch (AssertionFailedException e) {
-env.fireStartTest(SUITESETUP);
-env.fireFail(SUITESETUP, e);
-return false;
 } catch (BuildException e) {
 env.fireStartTest(SUITESETUP);
 fireFailOrError(SUITESETUP, e);
@@ -253,8 +249,6 @@
 try {
 env.fireStartTest(name);
 newProject.executeTargets(v);
-} catch (AssertionFailedException e) {
-env.fireFail(name, e);
 } catch (BuildException e) {
 fireFailOrError(name, e);
 } finally {
@@ -268,8 +262,6 @@
 if (hasTearDown) {
 try {
 newProject.executeTarget(TEARDOWN);
-} catch (final AssertionFailedException e) {
-env.fireFail(name, e);
 } catch (final BuildException e) {
 fireFailOrError(name, e);
 }
@@ -290,9 +282,6 @@
 try {
 Project newProject = getCleanProject();
 newProject.executeTarget(SUITETEARDOWN);
-} catch (AssertionFailedException e) {
-env.fireStartTest(SUITETEARDOWN);
-env.fireFail(SUITETEARDOWN, e);
 } catch (BuildException e) {
 env.fireStartTest(SUITETEARDOWN);
 fireFailOrError(SUITETEARDOWN, e);
@@ -302,24 +291,25 @@
 isSuiteStarted = false;
 }
 
-/** Report a failure or an exception for the test target name */
-private void fireFailOrError(String name, BuildException e) {
+/**
+ * Try to see whether the BuildException e is an AssertionFailedException
+ * or is caused by an AssertionFailedException. If so, fire a failure for 
+ * given targetName.  Otherwise fire an error.
+ */
+private void fireFailOrError(String targetName, BuildException e) {
 boolean failed = false;
-// try to see whether the BuildException masks
-// an AssertionFailedException. If so, treat
-// it as failure instead of error.
-Throwable t = e.getCause();
+Throwable t = e;
 while (t != null && t instanceof BuildException) {
 if (t instanceof AssertionFailedException) {
 failed = true;
-env.fireFail(name, (AssertionFailedException) t);
+env.fireFail(targetName, (AssertionFailedException) t);
 break;
 }
 t = ((BuildException) t).getCause();
 }
 
 if (!failed) {
-env.fireError(name, e);
+env.fireError(targetName, e);
 }
 }