Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 92032 invoked from network); 29 Jul 2009 10:23:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Jul 2009 10:23:22 -0000 Received: (qmail 6090 invoked by uid 500); 29 Jul 2009 10:23:22 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 6029 invoked by uid 500); 29 Jul 2009 10:23:22 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 6020 invoked by uid 99); 29 Jul 2009 10:23:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jul 2009 10:23:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jul 2009 10:23:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3D2E523888CF; Wed, 29 Jul 2009 10:23:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r798838 - in /ant/core/trunk/src: main/org/apache/tools/ant/AntClassLoader.java tests/junit/org/apache/tools/ant/AntClassLoaderTest.java tests/junit/org/apache/tools/ant/BuildFileTest.java Date: Wed, 29 Jul 2009 10:22:59 -0000 To: notifications@ant.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090729102300.3D2E523888CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bodewig Date: Wed Jul 29 10:22:58 2009 New Revision: 798838 URL: http://svn.apache.org/viewvc?rev=798838&view=rev Log: report name of corrupt ZIP to System.err, PR 47593 Modified: ant/core/trunk/src/main/org/apache/tools/ant/AntClassLoader.java ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/AntClassLoader.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/AntClassLoader.java?rev=798838&r1=798837&r2=798838&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/AntClassLoader.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/AntClassLoader.java Wed Jul 29 10:22:58 2009 @@ -1027,7 +1027,9 @@ } } } catch (Exception e) { - log("Unable to obtain resource from " + file + ": " + e, Project.MSG_WARN); + String msg = "Unable to obtain resource from " + file + ": "; + log(msg + e, Project.MSG_WARN); + System.err.println(msg); e.printStackTrace(); } return null; Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java?rev=798838&r1=798837&r2=798838&view=diff ============================================================================== --- ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java (original) +++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/AntClassLoaderTest.java Wed Jul 29 10:22:58 2009 @@ -19,7 +19,7 @@ package org.apache.tools.ant; import java.io.File; -import java.io.IOException; +import java.io.PrintStream; import org.apache.tools.ant.types.Path; /** @@ -160,12 +160,24 @@ myPath.setLocation(jar); getProject().setUserProperty("build.sysclasspath","ignore"); loader = getProject().createClassLoader(myPath); - loader.getResource("foo.txt"); - String log = getLog(); - int startMessage = log.indexOf("Unable to obtain resource from "); - assertTrue(startMessage >= 0); - assertTrue(log.indexOf("foo.jar", startMessage) > 0); - + PrintStream sysErr = System.err; + try { + StringBuffer errBuffer = new StringBuffer(); + PrintStream err = + new PrintStream(new BuildFileTest.AntOutputStream(errBuffer)); + System.setErr(err); + loader.getResource("foo.txt"); + String log = getLog(); + int startMessage = log.indexOf("Unable to obtain resource from "); + assertTrue(startMessage >= 0); + assertTrue(log.indexOf("foo.jar", startMessage) > 0); + log = errBuffer.toString(); + startMessage = log.indexOf("Unable to obtain resource from "); + assertTrue(startMessage >= 0); + assertTrue(log.indexOf("foo.jar", startMessage) > 0); + } finally { + System.setErr(sysErr); + } } private static class GetPackageWrapper extends ClassLoader { Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java?rev=798838&r1=798837&r2=798838&view=diff ============================================================================== --- ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java (original) +++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/BuildFileTest.java Wed Jul 29 10:22:58 2009 @@ -477,7 +477,7 @@ /** * an output stream which saves stuff to our buffer. */ - private static class AntOutputStream extends java.io.OutputStream { + protected static class AntOutputStream extends java.io.OutputStream { private StringBuffer buffer; public AntOutputStream( StringBuffer buffer ) {