Return-Path: 
 <dev-return-60422-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 93269 invoked from network); 20 Sep 2004 08:26:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 20 Sep 2004 08:26:59 -0000
Received: (qmail 13600 invoked by uid 500); 20 Sep 2004 08:26:56 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 13547 invoked by uid 500); 20 Sep 2004 08:26:55 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Subscribe: <mailto:dev-subscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 13517 invoked by uid 99); 20 Sep 2004 08:26:54 -0000
X-ASF-Spam-Status: No, hits=0.0 required=10.0
	tests=
X-Spam-Check-By: apache.org
Received-SPF: pass (hermes.apache.org: local policy)
Received: from [62.96.16.111] (HELO bodewig.bost.de) (62.96.16.111)
  by apache.org (qpsmtpd/0.28) with ESMTP; Mon, 20 Sep 2004 01:26:53 -0700
Received: (from bodewig@localhost)
	by bodewig.bost.de (8.11.6/8.11.6) id i8K8QoL17903;
	Mon, 20 Sep 2004 10:26:50 +0200
X-Authentication-Warning: bodewig.bost.de: bodewig set sender to
 bodewig@bost.de using -f
To: dev@ant.apache.org
Subject: Patch for 22863 (efficent rename of dirs) breaks Gump build
X-Draft-From: ("nnfolder:mail.jakarta-ant" "")
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 20 Sep 2004 10:26:50 +0200
Message-ID: <m3ekkxgxbp.fsf@bodewig.bost.de>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) XEmacs/21.4 (Security Through
 Obscurity, linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Hi,

the fix for 22863 which allows <move>'s file attribute to point to a
directory breaks the tomcat-dbcp build in Gump:
<http://brutus.apache.org/gump/public/jakarta-tomcat-5/jakarta-tomcat-dbcp/gump_work/build_jakarta-tomcat-5_jakarta-tomcat-dbcp.html>

The build does this:

  <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
    <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
  </move>

where ${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp exists prior
to invoking the task.  This assumes that all files and directories
from below ${tomcat-dbcp.home}/src/java/org/apache/commons will get
moved and it works for all older versions of Ant.

Since the fileset matches all files and directories and neither of
them is present in the dbcp directory before the move (in fact it is
empty), ${tomcat-dbcp.home}/src/java/org/apache/commons is added to
completeDirMap and renameFile is tried.

With the fix for 22863 renameFile has been changed to throw a
BuildException if we try to rename a directory to an existing
directory (thus the failure above) while the old code would simply
return false and make Ant take the hard route of copying all files
individually.

It would be easy to revert the changes made to renameFile around line
385 - and I've confirmed that it will make the Tomcat build pass again
- but I'm afraid I'm missing something.  In particular since it will
break testCompleteDirectoryMoveFileToDirWithExistingDir in MoveTest.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org