ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1293649 - in /ant/core/branches/ANT_18_BRANCH: ./ manual/Tasks/ src/main/org/apache/tools/ant/ src/main/org/apache/tools/ant/taskdefs/ src/main/org/apache/tools/ant/taskdefs/optional/net/ src/main/org/apache/tools/tar/ src/main/org/apache/...
Date Sat, 25 Feb 2012 16:57:17 GMT
Author: bodewig
Date: Sat Feb 25 16:57:16 2012
New Revision: 1293649

URL: http://svn.apache.org/viewvc?rev=1293649&view=rev
Log:
merge fix for regression that re-enables double expansion of properties in macrodef attributes.
 PR 52621

Modified:
    ant/core/branches/ANT_18_BRANCH/   (props changed)
    ant/core/branches/ANT_18_BRANCH/WHATSNEW
    ant/core/branches/ANT_18_BRANCH/manual/Tasks/include.html   (props changed)
    ant/core/branches/ANT_18_BRANCH/manual/Tasks/macrodef.html
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/RuntimeConfigurable.java
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
  (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarBuffer.java   (props
changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarEntry.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarOutputStream.java   (props
changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
  (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ExtraFieldUtils.java   (props
changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/FallbackZipEncoding.java
  (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/NioZipEncoding.java   (props
changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
  (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
  (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodePathExtraField.java
  (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
  (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
  (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncoding.java   (props
changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncodingHelper.java 
 (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEntry.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipFile.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipOutputStream.java   (props
changed)
    ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipUtil.java   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/macrodef-test.xml
    ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/   (props changed)
    ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
  (props changed)
    ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
  (props changed)
    ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
  (props changed)

Propchange: ant/core/branches/ANT_18_BRANCH/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1 +1 @@
-/ant/core/trunk:1240672-1292395,1292976
+/ant/core/trunk:1240672-1292395,1292976,1292985,1293648

Modified: ant/core/branches/ANT_18_BRANCH/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/WHATSNEW?rev=1293649&r1=1293648&r2=1293649&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/WHATSNEW (original)
+++ ant/core/branches/ANT_18_BRANCH/WHATSNEW Sat Feb 25 16:57:16 2012
@@ -124,7 +124,7 @@ Fixed bugs:
    Bugzilla Report 51086.
 
  * the attributes of macrodef tasks had their values run through
-   property expansion twice.
+   property expansion twice. Still true by default, but can be disabled.
    Bugzilla Report 42046.
 
  * jvc doesn't like it if source file names in argument files are

Propchange: ant/core/branches/ANT_18_BRANCH/manual/Tasks/include.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
 /ant/core/trunk/docs/manual/CoreTasks/import.html:713353
-/ant/core/trunk/manual/Tasks/include.html:1240672-1292395,1292976
+/ant/core/trunk/manual/Tasks/include.html:1240672-1292395,1292976,1292985,1293648

Modified: ant/core/branches/ANT_18_BRANCH/manual/Tasks/macrodef.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/manual/Tasks/macrodef.html?rev=1293649&r1=1293648&r2=1293649&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/manual/Tasks/macrodef.html (original)
+++ ant/core/branches/ANT_18_BRANCH/manual/Tasks/macrodef.html Sat Feb 25 16:57:16 2012
@@ -128,6 +128,15 @@
         </td>
         <td valign="top" align="center">No</td>
       </tr>
+      <tr>
+        <td valign="top">doubleexpanding</td>
+        <td valign="top">
+          Controls whether or not property references in the attribute are expanded twice
or just once.
+          See the <a href="http://ant.apache.org/faq.html#macrodef-property-expansion">FAQ</a>
for details.
+          <em>since Ant 1.8.3</em>
+        </td>
+        <td valign="top" align="center">No; default true</td>
+      </tr>
     </table>
     <h4>element</h4>
     <p>

Modified: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/RuntimeConfigurable.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/RuntimeConfigurable.java?rev=1293649&r1=1293648&r2=1293649&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/RuntimeConfigurable.java
(original)
+++ ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/RuntimeConfigurable.java
Sat Feb 25 16:57:16 2012
@@ -29,6 +29,7 @@ import java.util.Map;
 import java.util.Iterator;
 
 import org.apache.tools.ant.util.CollectionUtils;
+import org.apache.tools.ant.taskdefs.MacroDef;
 import org.apache.tools.ant.taskdefs.MacroInstance;
 import org.xml.sax.AttributeList;
 import org.xml.sax.helpers.AttributeListImpl;
@@ -386,11 +387,17 @@ public class RuntimeConfigurable impleme
                 // reflect these into the target, defer for
                 // MacroInstance where properties are expanded for the
                 // nested sequential
-                Object attrValue = null;
+                Object attrValue = PropertyHelper.getPropertyHelper(p).parseProperties(value);
                 if (target instanceof MacroInstance) {
-                    attrValue = value;
-                } else {
-                    attrValue = PropertyHelper.getPropertyHelper(p).parseProperties(value);
+                    for (Iterator attrs = ((MacroInstance) target).getMacroDef().getAttributes().iterator();
attrs.hasNext();) {
+                        MacroDef.Attribute attr = (MacroDef.Attribute) attrs.next();
+                        if (attr.getName().equals(name)) {
+                            if (!attr.isDoubleExpanding()) {
+                                attrValue = value;
+                            }
+                            break;
+                        }
+                    }
                 }
                 try {
                     ih.setAttribute(p, target, name, attrValue);

Modified: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/MacroDef.java?rev=1293649&r1=1293648&r2=1293649&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/MacroDef.java (original)
+++ ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/MacroDef.java Sat
Feb 25 16:57:16 2012
@@ -331,6 +331,7 @@ public class MacroDef extends AntlibDefi
         private String name;
         private String defaultValue;
         private String description;
+        private boolean doubleExpanding = true;
 
         /**
          * The name of the attribute.
@@ -387,6 +388,25 @@ public class MacroDef extends AntlibDefi
         }
 
         /**
+         * See {@link #isDoubleExpanding} for explanation.
+         * @param doubleExpanding true to expand twice, false for just once
+         * @since Ant 1.8.3
+         */
+        public void setDoubleExpanding(boolean doubleExpanding) {
+            this.doubleExpanding = doubleExpanding;
+        }
+
+        /**
+         * Determines whether {@link RuntimeConfigurable#maybeConfigure(Project, boolean)}
will reevaluate this property.
+         * For compatibility reasons (#52621) it will, though for most applications (#42046)
it should not.
+         * @return true if expanding twice (the default), false for just once
+         * @since Ant 1.8.3
+         */
+        public boolean isDoubleExpanding() {
+            return doubleExpanding;
+        }
+
+        /**
          * equality method
          *
          * @param obj an <code>Object</code> value

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
 /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java:945039
-/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java:1240672-1292395,1292976,1292985,1293648

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarBuffer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:1240672-1292395,1292976,1292985,1293648
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarBuffer.java:1027427

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveEntry.java:755227,755472

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java:1240672-1292395,1292976,1292985,1293648
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java:1027427

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip:1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:746933,748133,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089,1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/AbstractUnicodeExtraField.java:746933,748063,748133,748288,749342,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ExtraFieldUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java:1240672-1292395,1292976,1292985,1293648
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java:910483-910521
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java:745528,746933,748133,749524,749603,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/FallbackZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089,1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/FallbackZipEncoding.java:749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/NioZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089,1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/NioZipEncoding.java:749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java:1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Simple8BitZipEncoding.java:749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089,1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java:746933,748063,748133,749342,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnicodePathExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089,1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java:746933,748063,748133,749342,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1292395,1292976,1292985,1293648

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnrecognizedExtraField.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/UnrecognizedExtraField.java:1240672-1292395,1292976,1292985,1293648
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java:910483-910521
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnrecognizedExtraField.java:746933,748133,749603,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncoding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089,1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncoding.java:749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEncodingHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089,1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089,1240672-1292395,1292976,1292985,1293648
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:909456
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEncodingHelper.java:746933,747841,748133,749342-749344,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,4 +1,4 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:1240672-1292395,1292976,1292985,1293648
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:910483-910521
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java:747850,749603
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java:746933,748133,749524,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:1240672-1292395,1292976,1292985,1293648
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:911740,1146027,1153735
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java:745920,746933,748133,748556,749342-749344,749524,749603,749855,749859

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipOutputStream.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java:1240672-1292395,1292976,1292985,1293648
 /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:911740
 /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java:745920,747810,747841,748063,749342,749906-749907,750055,750310

Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/ZipUtil.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1292395,1292976
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1292395,1292976,1292985,1293648

Modified: ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/macrodef-test.xml
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/macrodef-test.xml?rev=1293649&r1=1293648&r2=1293649&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/macrodef-test.xml (original)
+++ ant/core/branches/ANT_18_BRANCH/src/tests/antunit/taskdefs/macrodef-test.xml Sat Feb 25
16:57:16 2012
@@ -33,10 +33,10 @@
     <au:assertLogContains text="THIS IS NOT DEFAULT LOG"/>
   </target>
 
-  <target name="testDoubleExpandedProperties"
+  <target name="testDisableDoubleExpandedProperties"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=42046">
     <macrodef name="indirect">
-      <attribute name="value"/>
+      <attribute name="value" doubleexpanding="false"/>
       <sequential>
         <echo message="@{value}"/>
       </sequential>
@@ -45,4 +45,16 @@
     <au:assertLogContains text="{basedir}"/>
   </target>
 
+  <target name="testEnableDoubleExpandedProperties"
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=52621">
+    <macrodef name="indirect">
+      <attribute name="value"/>
+      <sequential>
+        <echo message="@{value}"/>
+      </sequential>
+    </macrodef>
+    <indirect value="$${basedir}"/>
+    <au:assertLogDoesntContain text="{basedir}"/>
+  </target>
+
 </project>

Propchange: ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip:1240672-1292395,1292976
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip:1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip:749906-749907

Propchange: ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:1240672-1292395,1292976
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:1240672-1292395,1292976,1292985,1293648
 /commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java:910483-910521
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java:749906-749907

Propchange: ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:1240672-1292395,1292976
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:1240672-1292395,1292976,1292985,1293648
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java:749342-749344,749906-749907

Propchange: ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 16:57:16 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:1240672-1292395,1292976
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:1240672-1292395,1292976,1292985,1293648
 /commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:896818
 /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java:749603



Mime
View raw message