Return-Path: 
 <dev-return-61888-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 8464 invoked from network); 1 Dec 2004 11:42:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 1 Dec 2004 11:42:48 -0000
Received: (qmail 82045 invoked by uid 500); 1 Dec 2004 11:42:46 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 81997 invoked by uid 500); 1 Dec 2004 11:42:45 -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 81974 invoked by uid 500); 1 Dec 2004 11:42:45 -0000
Received: (qmail 81964 invoked by uid 99); 1 Dec 2004 11:42:45 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 01 Dec 2004 03:42:44 -0800
Received: (qmail 8416 invoked by uid 1539); 1 Dec 2004 11:42:43 -0000
Date: 1 Dec 2004 11:42:43 -0000
Message-ID: <20041201114243.8415.qmail@minotaur.apache.org>
From: peterreilly@apache.org
To: ant-cvs@apache.org
Subject: cvs commit: ant/src/etc/testcases/taskdefs signjar.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

peterreilly    2004/12/01 03:42:43

  Modified:    src/etc/testcases/taskdefs signjar.xml
  Log:
  use isfileselected in test instead of the pathconvert hack
  
  Revision  Changes    Path
  1.5       +4 -13     ant/src/etc/testcases/taskdefs/signjar.xml
  
  Index: signjar.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/signjar.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- signjar.xml	26 Nov 2004 09:52:06 -0000	1.4
  +++ signjar.xml	1 Dec 2004 11:42:43 -0000	1.5
  @@ -37,22 +37,13 @@
       <touch file="signtest.jar" datetime="06/28/2000 2:02 pm"/>
       <signjar jar="signtest.jar" alias="testonly" keystore="testkeystore" storepass="apacheant" 
       	preservelastmodified="true"/>
  -    <!-- Currently there is no condition for testing the date of file - so
  -         use a selector -->
  -    <pathconvert property="signtest.jar.prop" targetos="unix">
  -      <path>
  -        <fileset dir="." includes="signtest.jar">
  -          <date datetime="06/28/2000 2:02 pm" when="equal"/>
  -        </fileset>
  -      </path>
  -      <mapper>
  -        <flattenmapper/>
  -      </mapper>
  -    </pathconvert>
  +
       <fail message="preserveLastModified did not preserve the last modified time">
         <condition>
           <not>
  -          <equals arg1="signtest.jar" arg2="signtest.jar"/>
  +          <isfileselected file="signtest.jar">
  +            <date datetime="06/28/2000 2:02 pm" when="equal"/>
  +          </isfileselected>
           </not>
         </condition>
       </fail>
  
  
  

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