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 2013/08/16 17:29:03 UTC
svn commit: r1514748 - in /ant/antlibs/compress/trunk: docs/
src/main/org/apache/ant/compress/resources/
src/main/org/apache/ant/compress/taskdefs/
src/main/org/apache/ant/compress/util/ src/tests/antunit/
Author: bodewig
Date: Fri Aug 16 15:29:03 2013
New Revision: 1514748
URL: http://svn.apache.org/r1514748
Log:
CC 1.6 adds encoding support for cpio and dump
Modified:
ant/antlibs/compress/trunk/docs/archive.html
ant/antlibs/compress/trunk/docs/expand.html
ant/antlibs/compress/trunk/docs/fileset.html
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioFileSet.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Cpio.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Uncpio.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Undump.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/CpioStreamFactory.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/DumpStreamFactory.java
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/StreamHelper.java
ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml
Modified: ant/antlibs/compress/trunk/docs/archive.html
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/archive.html?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/archive.html (original)
+++ ant/antlibs/compress/trunk/docs/archive.html Fri Aug 16 15:29:03 2013
@@ -80,7 +80,8 @@
the platform's default character encoding. Defaults to the
platform's default character encoding.<br/>
Currently ignored by all but the tar (<em>since Compress
- Antlib 1.2</em>) and zip tasks.
+ Antlib 1.2</em>), cpio (<em>since Compress
+ Antlib 1.3</em>) and zip tasks.
</td>
<td align="center" valign="top">No</td>
</tr>
Modified: ant/antlibs/compress/trunk/docs/expand.html
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/expand.html?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/expand.html (original)
+++ ant/antlibs/compress/trunk/docs/expand.html Fri Aug 16 15:29:03 2013
@@ -114,12 +114,56 @@ mapper</a>.</p>
<p>An <a href="#expand">unarchiving task</a> for CPIO archives.</p>
+<p>In addition to the parameters above, the uncpio tasks supports the
+ following attributes:</p>
+
+<table border="1" cellpadding="2" cellspacing="0">
+ <tr>
+ <td valign="top"><b>Attribute</b></td>
+ <td valign="top"><b>Description</b></td>
+ <td align="center" valign="top"><b>Required</b></td>
+ </tr>
+ <tr>
+ <td valign="top">encoding</td>
+ <td valign="top">
+ The character encoding that has been used for filenames
+ inside the cpio file. For a list of possible values see <a
+ href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+ Defaults <code>native-encoding</code> which is the magic value for
+ the platform's default character encoding.<br/>
+ <em>since Compress Antlib 1.3</em></td>
+ <td align="center" valign="top">No</td>
+ </tr>
+</table>
+
<h3><a name="undump">UnDump</a></h3>
<p><em>Since Apache Compress Antlib 1.1</em>.</p>
<p>An <a href="#expand">unarchiving task</a> for Unix dump archives.</p>
+<p>In addition to the parameters above, the undump tasks supports the
+ following attributes:</p>
+
+<table border="1" cellpadding="2" cellspacing="0">
+ <tr>
+ <td valign="top"><b>Attribute</b></td>
+ <td valign="top"><b>Description</b></td>
+ <td align="center" valign="top"><b>Required</b></td>
+ </tr>
+ <tr>
+ <td valign="top">encoding</td>
+ <td valign="top">
+ The character encoding that has been used for filenames
+ inside the dump file. For a list of possible values see <a
+ href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+ Defaults <code>native-encoding</code> which is the magic value for
+ the platform's default character encoding.<br/>
+ <em>since Compress Antlib 1.3</em></td>
+ <td align="center" valign="top">No</td>
+ </tr>
+</table>
+
<h3><a name="untar">UnTar</a></h3>
<p>An <a href="#expand">unarchiving task</a> for TAR archives.</p>
Modified: ant/antlibs/compress/trunk/docs/fileset.html
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/docs/fileset.html?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/docs/fileset.html (original)
+++ ant/antlibs/compress/trunk/docs/fileset.html Fri Aug 16 15:29:03 2013
@@ -206,6 +206,17 @@ resource collection</h4>
</td>
<td align="center" valign="top">No</td>
</tr>
+ <tr>
+ <td valign="top">encoding</td>
+ <td valign="top">
+ The character encoding that has been used for filenames
+ inside the cpio file. For a list of possible values see <a
+ href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+ Defaults <code>native-encoding</code> which is the magic value for
+ the platform's default character encoding.<br/>
+ <em>since Compress Antlib 1.3</em></td>
+ <td align="center" valign="top">No</td>
+ </tr>
</tbody>
</table>
@@ -255,6 +266,17 @@ resource collection</h4>
</td>
<td align="center" valign="top">No</td>
</tr>
+ <tr>
+ <td valign="top">encoding</td>
+ <td valign="top">
+ The character encoding that has been used for filenames
+ inside the dump file. For a list of possible values see <a
+ href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br>
+ Defaults <code>native-encoding</code> which is the magic value for
+ the platform's default character encoding.<br/>
+ <em>since Compress Antlib 1.3</em></td>
+ <td align="center" valign="top">No</td>
+ </tr>
</tbody>
</table>
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java Fri Aug 16 15:29:03 2013
@@ -85,7 +85,7 @@ public abstract class CommonsCompressArc
}
/**
- * Set the encoding to use with the zipfile.
+ * Set the encoding to use with the archive.
* @param enc the String encoding.
*/
public void setEncoding(String enc) {
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioFileSet.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioFileSet.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioFileSet.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioFileSet.java Fri Aug 16 15:29:03 2013
@@ -48,6 +48,7 @@ public class CpioFileSet extends Archive
private int gid;
private boolean skipUnreadable = false;
+ private String encoding = null;
/** Constructor for CpioFileSet */
public CpioFileSet() {
@@ -68,6 +69,7 @@ public class CpioFileSet extends Archive
*/
protected CpioFileSet(CpioFileSet fileset) {
super(fileset);
+ encoding = fileset.encoding;
}
/**
@@ -136,17 +138,30 @@ public class CpioFileSet extends Archive
}
/**
+ * Set the encoding used for this CpioFileSet.
+ * @param enc encoding as String.
+ * @since Compress Antlib 1.3
+ */
+ public void setEncoding(String enc) {
+ checkCpioFileSetAttributesAllowed();
+ this.encoding = enc;
+ }
+
+ /**
* Create a new scanner.
* @return the created scanner.
*/
protected ArchiveScanner newArchiveScanner() {
- return new CommonsCompressArchiveScanner(new CpioStreamFactory(),
- new CommonsCompressArchiveScanner.ResourceBuilder() {
+ CommonsCompressArchiveScanner cs =
+ new CommonsCompressArchiveScanner(new CpioStreamFactory(),
+ new CommonsCompressArchiveScanner.ResourceBuilder() {
public Resource buildResource(Resource archive, String encoding,
ArchiveEntry entry) {
- return new CpioResource(archive, (CpioArchiveEntry) entry);
+ return new CpioResource(archive, encoding, (CpioArchiveEntry) entry);
}
}, skipUnreadable, getProject());
+ cs.setEncoding(encoding);
+ return cs;
}
/**
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CpioResource.java Fri Aug 16 15:29:03 2013
@@ -42,7 +42,30 @@ public final class CpioResource extends
* @param e the CpioEntry.
*/
public CpioResource(File a, CpioArchiveEntry e) {
+ this(a, null, e);
+ }
+
+ /**
+ * Construct a CpioResource representing the specified
+ * entry in the specified archive.
+ * @param a the archive as Resource.
+ * @param e the CpioEntry.
+ */
+ public CpioResource(Resource a, CpioArchiveEntry e) {
+ this(a, null, e);
+ }
+
+ /**
+ * Construct a CpioResource representing the specified
+ * entry in the specified archive.
+ * @param a the archive as File.
+ * @param enc the encoding used for filenames.
+ * @param e the CpioEntry.
+ * @since Compress Antlib 1.3
+ */
+ public CpioResource(File a, String enc, CpioArchiveEntry e) {
super(new CpioStreamFactory(), "cpio", a, e);
+ setEncoding(enc);
setEntry(e);
}
@@ -50,10 +73,13 @@ public final class CpioResource extends
* Construct a CpioResource representing the specified
* entry in the specified archive.
* @param a the archive as Resource.
+ * @param enc the encoding used for filenames.
* @param e the CpioEntry.
+ * @since Compress Antlib 1.3
*/
- public CpioResource(Resource a, CpioArchiveEntry e) {
+ public CpioResource(Resource a, String enc, CpioArchiveEntry e) {
super(new CpioStreamFactory(), "cpio", a, e);
+ setEncoding(enc);
setEntry(e);
}
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpFileSet.java Fri Aug 16 15:29:03 2013
@@ -49,6 +49,7 @@ public class DumpFileSet extends Archive
private int gid;
private boolean skipUnreadable = false;
+ private String encoding = null;
/** Constructor for DumpFileSet */
public DumpFileSet() {
@@ -69,6 +70,7 @@ public class DumpFileSet extends Archive
*/
protected DumpFileSet(DumpFileSet fileset) {
super(fileset);
+ encoding = fileset.encoding;
}
/**
@@ -135,17 +137,30 @@ public class DumpFileSet extends Archive
}
/**
+ * Set the encoding used for this CpioFileSet.
+ * @param enc encoding as String.
+ * @since Compress Antlib 1.3
+ */
+ public void setEncoding(String enc) {
+ checkDumpFileSetAttributesAllowed();
+ this.encoding = enc;
+ }
+
+ /**
* Create a new scanner.
* @return the created scanner.
*/
protected ArchiveScanner newArchiveScanner() {
- return new CommonsCompressArchiveScanner(new DumpStreamFactory(),
- new CommonsCompressArchiveScanner.ResourceBuilder() {
+ CommonsCompressArchiveScanner cs =
+ new CommonsCompressArchiveScanner(new DumpStreamFactory(),
+ new CommonsCompressArchiveScanner.ResourceBuilder() {
public Resource buildResource(Resource archive, String encoding,
ArchiveEntry entry) {
- return new DumpResource(archive, (DumpArchiveEntry) entry);
+ return new DumpResource(archive, encoding, (DumpArchiveEntry) entry);
}
}, skipUnreadable, getProject());
+ cs.setEncoding(encoding);
+ return cs;
}
/**
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/DumpResource.java Fri Aug 16 15:29:03 2013
@@ -43,7 +43,30 @@ public final class DumpResource extends
* @param e the DumpEntry.
*/
public DumpResource(File a, DumpArchiveEntry e) {
+ this(a, null, e);
+ }
+
+ /**
+ * Construct a DumpResource representing the specified
+ * entry in the specified archive.
+ * @param a the archive as Resource.
+ * @param e the DumpEntry.
+ */
+ public DumpResource(Resource a, DumpArchiveEntry e) {
+ this(a, null, e);
+ }
+
+ /**
+ * Construct a DumpResource representing the specified
+ * entry in the specified archive.
+ * @param a the archive as File.
+ * @param enc the encoding used for filenames.
+ * @param e the DumpEntry.
+ * @since Compress Antlib 1.3
+ */
+ public DumpResource(File a, String enc, DumpArchiveEntry e) {
super(new DumpStreamFactory(), "dump", a, e);
+ setEncoding(enc);
setEntry(e);
}
@@ -51,10 +74,13 @@ public final class DumpResource extends
* Construct a DumpResource representing the specified
* entry in the specified archive.
* @param a the archive as Resource.
+ * @param enc the encoding used for filenames.
* @param e the DumpEntry.
+ * @since Compress Antlib 1.3
*/
- public DumpResource(Resource a, DumpArchiveEntry e) {
+ public DumpResource(Resource a, String enc, DumpArchiveEntry e) {
super(new DumpStreamFactory(), "dump", a, e);
+ setEncoding(enc);
setEntry(e);
}
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Cpio.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Cpio.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Cpio.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Cpio.java Fri Aug 16 15:29:03 2013
@@ -46,7 +46,8 @@ public class Cpio extends ArchiveBase {
throws IOException {
return new CpioArchiveOutputStream(stream,
format.getFormat(),
- blockSize);
+ blockSize,
+ encoding);
}
});
setEntryBuilder(
@@ -166,4 +167,4 @@ public class Cpio extends ArchiveBase {
&& ((Format) other).getFormat() == getFormat();
}
}
-}
\ No newline at end of file
+}
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Uncpio.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Uncpio.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Uncpio.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Uncpio.java Fri Aug 16 15:29:03 2013
@@ -27,4 +27,14 @@ public class Uncpio extends ExpandBase {
public Uncpio() {
super(new CpioStreamFactory());
}
+
+ /**
+ * Set the file-name encoding for this archive, defaults to native
+ * encoding.
+ * @since Apache Compress Antlib 1.3
+ */
+ public void setEncoding(String encoding) {
+ internalSetEncoding(encoding);
+ }
+
}
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Undump.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Undump.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Undump.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Undump.java Fri Aug 16 15:29:03 2013
@@ -28,4 +28,14 @@ public class Undump extends ExpandBase {
public Undump() {
super(new DumpStreamFactory());
}
+
+ /**
+ * Set the file-name encoding for this archive, defaults to the
+ * native encoding.
+ * @since Apache Compress Antlib 1.3
+ */
+ public void setEncoding(String encoding) {
+ internalSetEncoding(encoding);
+ }
+
}
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java Fri Aug 16 15:29:03 2013
@@ -33,7 +33,7 @@ public interface ArchiveStreamFactory {
/**
* @param stream the stream to read from, should be buffered
* @param encoding the encoding of the entry names, ignored by all
- * formats except tar and zip
+ * formats except cpio, dump, tar and zip
*/
public ArchiveInputStream getArchiveStream(InputStream stream,
String encoding)
@@ -43,10 +43,10 @@ public interface ArchiveStreamFactory {
/**
* @param stream the stream to write to, should be buffered
* @param encoding the encoding of the entry names, ignored by all
- * formats except tar and zip
+ * formats except cpio, tar and zip
*/
public ArchiveOutputStream getArchiveStream(OutputStream stream,
String encoding)
throws IOException;
-}
\ No newline at end of file
+}
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/CpioStreamFactory.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/CpioStreamFactory.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/CpioStreamFactory.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/CpioStreamFactory.java Fri Aug 16 15:29:03 2013
@@ -31,21 +31,21 @@ public class CpioStreamFactory implement
/**
* @param stream the stream to read from, should be buffered
- * @param encoding the encoding of the entry names, ignored
+ * @param encoding the encoding of the entry names
*/
public ArchiveInputStream getArchiveStream(InputStream stream,
String encoding)
throws IOException {
- return new CpioArchiveInputStream(stream);
+ return new CpioArchiveInputStream(stream, encoding);
}
/**
* @param stream the stream to write to, should be buffered
- * @param encoding the encoding of the entry names, ignored
+ * @param encoding the encoding of the entry names
*/
public ArchiveOutputStream getArchiveStream(OutputStream stream,
String encoding)
throws IOException {
- return new CpioArchiveOutputStream(stream);
+ return new CpioArchiveOutputStream(stream, encoding);
}
-}
\ No newline at end of file
+}
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/DumpStreamFactory.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/DumpStreamFactory.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/DumpStreamFactory.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/DumpStreamFactory.java Fri Aug 16 15:29:03 2013
@@ -35,13 +35,13 @@ public class DumpStreamFactory implement
/**
* @param stream the stream to read from, should be buffered
- * @param encoding the encoding of the entry names, ignored
+ * @param encoding the encoding of the entry names
*/
public ArchiveInputStream getArchiveStream(InputStream stream,
String encoding)
throws IOException {
try {
- return new DumpArchiveInputStream(stream);
+ return new DumpArchiveInputStream(stream, encoding);
} catch (ArchiveException ex) {
throw new BuildException(ex);
}
@@ -55,4 +55,4 @@ public class DumpStreamFactory implement
throws IOException {
throw new UnsupportedOperationException();
}
-}
\ No newline at end of file
+}
Modified: ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/StreamHelper.java
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/StreamHelper.java?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/StreamHelper.java (original)
+++ ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/StreamHelper.java Fri Aug 16 15:29:03 2013
@@ -91,7 +91,6 @@ public class StreamHelper {
* one, returns an CompressorInputStream for it, otherwise returns
* null.
* @param r the resource to read from
- * @param encoding the encoding of the entry names
*/
public static
CompressorInputStream getInputStream(CompressorStreamFactory factory,
Modified: ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml Fri Aug 16 15:29:03 2013
@@ -67,4 +67,16 @@
expected="../resources/asf-logo.gif"
/>
</target>
+
+ <target name="test-refid-check-encoding">
+ <cmp:cpiofileset id="test-refid2"
+ encoding="utf-8"
+ dir="${basedir}"/>
+ <au:expectfailure>
+ <cmp:cpiofileset id="ref4"
+ encoding="utf-8"
+ refid="test-refid2"/>
+ </au:expectfailure>
+ </target>
+
</project>
Modified: ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml
URL: http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml?rev=1514748&r1=1514747&r2=1514748&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/dumpfileset-test.xml Fri Aug 16 15:29:03 2013
@@ -67,4 +67,16 @@
expected="../resources/asf-logo.gif"
/>
</target>
+
+ <target name="test-refid-check-encoding">
+ <cmp:dumpfileset id="test-refid2"
+ encoding="utf-8"
+ dir="${basedir}"/>
+ <au:expectfailure>
+ <cmp:dumpfileset id="ref4"
+ encoding="utf-8"
+ refid="test-refid2"/>
+ </au:expectfailure>
+ </target>
+
</project>