You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2012/02/22 17:55:24 UTC
svn commit: r1292397 - in /ant/core/branches/ANT_18_BRANCH: ./ manual/
manual/Tasks/ manual/Types/
src/main/org/apache/tools/ant/taskdefs/optional/net/
src/main/org/apache/tools/tar/ src/main/org/apache/tools/zip/
src/tests/junit/org/apache/tools/zip/
Author: bodewig
Date: Wed Feb 22 16:55:22 2012
New Revision: 1292397
URL: http://svn.apache.org/viewvc?rev=1292397&view=rev
Log:
merge changes made to manual in trunk
Modified:
ant/core/branches/ANT_18_BRANCH/ (props changed)
ant/core/branches/ANT_18_BRANCH/manual/Tasks/include.html (props changed)
ant/core/branches/ANT_18_BRANCH/manual/Types/mapper.html
ant/core/branches/ANT_18_BRANCH/manual/listeners.html
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/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 Wed Feb 22 16:55:22 2012
@@ -1 +1 @@
-/ant/core/trunk:1240672-1241496
+/ant/core/trunk:1240672-1292395
Propchange: ant/core/branches/ANT_18_BRANCH/manual/Tasks/include.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
/ant/core/trunk/docs/manual/CoreTasks/import.html:713353
-/ant/core/trunk/manual/Tasks/include.html:1240672-1241496
+/ant/core/trunk/manual/Tasks/include.html:1240672-1292395
Modified: ant/core/branches/ANT_18_BRANCH/manual/Types/mapper.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/manual/Types/mapper.html?rev=1292397&r1=1292396&r2=1292397&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/manual/Types/mapper.html (original)
+++ ant/core/branches/ANT_18_BRANCH/manual/Types/mapper.html Wed Feb 22 16:55:22 2012
@@ -460,7 +460,7 @@ should be used.</li>
</table>
<blockquote><pre>
<mapper type="regexp" from="^(.*)\.(.*)$$" to="\2.\1"/>
-<regexpmapper from="^(.*)\.(.*)$$&" to="\2.\1"/>
+<regexpmapper from="^(.*)\.(.*)$$" to="\2.\1"/>
</pre></blockquote>
<table border="1" cellpadding="2" cellspacing="0">
<tr>
Modified: ant/core/branches/ANT_18_BRANCH/manual/listeners.html
URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_18_BRANCH/manual/listeners.html?rev=1292397&r1=1292396&r2=1292397&view=diff
==============================================================================
--- ant/core/branches/ANT_18_BRANCH/manual/listeners.html (original)
+++ ant/core/branches/ANT_18_BRANCH/manual/listeners.html Wed Feb 22 16:55:22 2012
@@ -116,6 +116,11 @@ listeners and loggers.</p>
<td width="34%">BuildLogger</td>
</tr>
<tr>
+ <td width="33%"><code><a href="#SimpleBigProjectLogger">org.apache.tools.ant.listener.SimpleBigProjectLogger</a></code></td>
+ <td width="33%">Prints the project name for subprojects only, otherwise like NoBannerLogger <em>Since Ant 1.8.1</em></td>
+ <td width="34%">BuildLogger</td>
+ </tr>
+ <tr>
<td width="33%"><code><a href="#ProfileLogger">org.apache.tools.ant.listener.ProfileLogger</a></code></td>
<td width="33%">The default logger, with start times, end times and
durations added for each task and target.</td>
@@ -482,7 +487,35 @@ Exiting project "junit"
<code>ant -logger org.apache.tools.ant.listener.BigProjectLogger</code>
</blockquote>
+<h3><a name="SimpleBigProjectLogger">SimpleBigProjectLogger</a></h3>
+<p>Like <code>BigProjectLogger</code>, project-qualified target names are printed,
+useful for big builds with subprojects.
+Otherwise it is as quiet as <code>NoBannerLogger</code>:</p>
+<pre>
+Buildfile: /sources/myapp/build.xml
+
+myapp-lib.compile:
+Created dir: /sources/myapp/lib/build/classes
+Compiling 1 source file to /sources/myapp/lib/build/classes
+
+myapp-lib.jar:
+Building jar: /sources/myapp/lib/build/lib.jar
+
+myapp.compile:
+Created dir: /sources/myapp/build/classes
+Compiling 2 source files to /sources/myapp/build/classes
+myapp.jar:
+Building jar: /sources/myapp/build/myapp.jar
+
+BUILD SUCCESSFUL
+Total time: 1 second
+</pre>
+<p><b>since Ant 1.8.1</b></p>
+<p>To use this listener, use the command:</p>
+<blockquote>
+<code>ant -logger org.apache.tools.ant.listener.SimpleBigProjectLogger</code>
+</blockquote>
<h3><a name="ProfileLogger">ProfileLogger</a></h3>
<p>This logger stores the time needed for executing a task, target and the whole build and prints
Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 16:55:22 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-1241496
+/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java:1240672-1292395
Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/tar/TarBuffer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/tar/TarBuffer.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/tar/TarEntry.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/tar/TarOutputStream.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089,1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/AbstractUnicodeExtraField.java:738844,739300,741089,1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/ExtraFieldUtils.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089,1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/FallbackZipEncoding.java:738844,739300,741089,1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089,1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/NioZipEncoding.java:738844,739300,741089,1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089,1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodeCommentExtraField.java:738844,739300,741089,1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089,1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/UnicodePathExtraField.java:738844,739300,741089,1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/UnparseableExtraFieldData.java:1240672-1292395
Propchange: ant/core/branches/ANT_18_BRANCH/src/main/org/apache/tools/zip/UnrecognizedExtraField.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 16:55:22 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/UnrecognizedExtraField.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/UnrecognizedExtraField.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089,1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncoding.java:738844,739300,741089,1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089,1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEncodingHelper.java:738844,739300,741089,1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,4 +1,4 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipEntry.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipOutputStream.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1241496
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipUtil.java:1240672-1292395
Propchange: ant/core/branches/ANT_18_BRANCH/src/tests/junit/org/apache/tools/zip/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip:1240672-1241496
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:1240672-1241496
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,2 +1,2 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:1240672-1241496
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java:1240672-1292395
/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 Wed Feb 22 16:55:22 2012
@@ -1,3 +1,3 @@
-/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:1240672-1241496
+/ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java:1240672-1292395
/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