Author: bodewig
Date: Tue Aug 18 15:44:32 2009
New Revision: 805463
URL: http://svn.apache.org/viewvc?rev=805463&view=rev
Log:
the update attribute of the modified selector was ignored. PR 32597
Added:
ant/core/trunk/src/tests/antunit/types/selectors/modified-test.xml (with
props)
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=805463&r1=805462&r2=805463&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Aug 18 15:44:32 2009
@@ -436,6 +436,9 @@
separator other than "/".
Bugzilla Report 35649.
+ * The update attribute of the modified selector was ignored.
+ Bugzilla Report 32597.
+
Other changes:
--------------
* The get task now also follows redirects from http to https
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java?rev=805463&r1=805462&r2=805463&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.java
Tue Aug 18 15:44:32 2009
@@ -298,8 +298,6 @@
Cache defaultCache = new PropertiesfileCache(cachefile);
Algorithm defaultAlgorithm = new DigestAlgorithm();
Comparator defaultComparator = new EqualComparator();
- update = true;
- selectDirectories = true;
//
// ----- Set the main attributes, pattern '*' -----
Added: ant/core/trunk/src/tests/antunit/types/selectors/modified-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/types/selectors/modified-test.xml?rev=805463&view=auto
==============================================================================
--- ant/core/trunk/src/tests/antunit/types/selectors/modified-test.xml (added)
+++ ant/core/trunk/src/tests/antunit/types/selectors/modified-test.xml Tue Aug
18 15:44:32 2009
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+
+ <import file="../../antunit-base.xml" />
+
+ <target name="tearDown" depends="antunit-base.tearDown">
+ <delete file="cache.properties" quiet="true"/>
+ </target>
+
+ <target name="testUpdate"
+
description="https://issues.apache.org/bugzilla/show_bug.cgi?id=32597";>
+ <mkdir dir="${input}"/>
+ <touch file="${input}/A"/>
+ <mkdir dir="${output}"/>
+ <pathconvert>
+ <fileset dir="${input}">
+ <modified/>
+ </fileset>
+ </pathconvert>
+ <au:assertFileExists file="cache.properties"/>
+ <copy todir="${output}" file="cache.properties"/>
+ <echo file="${input}/A">Hello</echo>
+ <pathconvert>
+ <fileset dir="${input}">
+ <modified update="false"/>
+ </fileset>
+ </pathconvert>
+ <au:assertFilesMatch
+ expected="${output}/cache.properties"
+ actual="cache.properties"/>
+ <pathconvert>
+ <fileset dir="${input}">
+ <modified>
+ <param name="update" value="false"/>
+ </modified>
+ </fileset>
+ </pathconvert>
+ <au:assertFilesMatch
+ expected="${output}/cache.properties"
+ actual="cache.properties"/>
+ <pathconvert>
+ <fileset dir="${input}">
+ <modified update="true"/>
+ </fileset>
+ </pathconvert>
+ <au:assertFilesDiffer
+ expected="${output}/cache.properties"
+ actual="cache.properties"/>
+ <copy todir="${output}" file="cache.properties"/>
+ <echo file="${input}/A">world</echo>
+ <pathconvert>
+ <fileset dir="${input}">
+ <modified update="true"/>
+ </fileset>
+ </pathconvert>
+ <au:assertFilesDiffer
+ expected="${output}/cache.properties"
+ actual="cache.properties"/>
+ </target>
+</project>
Propchange: ant/core/trunk/src/tests/antunit/types/selectors/modified-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
