You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2011/11/02 17:23:32 UTC
svn commit: r1196670 - in /commons/proper/vfs/trunk:
core/src/main/java/org/apache/commons/vfs2/impl/
core/src/main/java/org/apache/commons/vfs2/provider/bzip2/ src/changes/
Author: ggregory
Date: Wed Nov 2 16:23:32 2011
New Revision: 1196670
URL: http://svn.apache.org/viewvc?rev=1196670&view=rev
Log:
[VFS-379] Replace custom BZIP2 code with Apache Commons Compress 1.3.
Removed:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/BZip2Constants.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CBZip2InputStream.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CBZip2OutputStream.java
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/CRC.java
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
commons/proper/vfs/trunk/src/changes/changes.xml
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml?rev=1196670&r1=1196669&r2=1196670&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/providers.xml Wed Nov 2 16:23:32 2011
@@ -30,7 +30,7 @@
<provider class-name="org.apache.commons.vfs2.provider.bzip2.Bzip2FileProvider">
<scheme name="bz2"/>
- <if-available class-name="org.apache.commons.vfs2.provider.bzip2.CBZip2InputStream"/>
+ <if-available class-name="org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream"/>
</provider>
<provider class-name="org.apache.commons.vfs2.provider.gzip.GzipFileProvider">
<scheme name="gz"/>
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java?rev=1196670&r1=1196669&r2=1196670&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/bzip2/Bzip2FileObject.java Wed Nov 2 16:23:32 2011
@@ -16,13 +16,12 @@
*/
package org.apache.commons.vfs2.provider.bzip2;
-//TODO: Revert to [compress]
-//import org.apache.commons.compress.bzip2.CBZip2InputStream;
-//import org.apache.commons.compress.bzip2.CBZip2OutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.provider.AbstractFileName;
@@ -51,22 +50,13 @@ public class Bzip2FileObject extends Com
public static InputStream wrapInputStream(final String name, final InputStream is) throws IOException
{
- final int b1 = is.read();
- final int b2 = is.read();
- if (b1 != 'B' || b2 != 'Z')
- {
- throw new FileSystemException("vfs.provider.compressedFile/not-a-compressedFile-file.error", name);
- }
- return new CBZip2InputStream(is);
+ return new BZip2CompressorInputStream(is);
}
@Override
protected OutputStream doGetOutputStream(boolean bAppend) throws Exception
{
OutputStream os = getContainer().getContent().getOutputStream(false);
- os.write('B');
- os.write('Z');
-
- return new CBZip2OutputStream(os);
+ return new BZip2CompressorOutputStream(os);
}
}
Modified: commons/proper/vfs/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1196670&r1=1196669&r2=1196670&view=diff
==============================================================================
--- commons/proper/vfs/trunk/src/changes/changes.xml (original)
+++ commons/proper/vfs/trunk/src/changes/changes.xml Wed Nov 2 16:23:32 2011
@@ -23,6 +23,9 @@
<body>
<release version="2.1" date="TBD" description="">
+ <action issue="VFS-379" dev="ggregory" type="update">
+ Replace custom BZIP2 code with Apache Commons Compress 1.3.
+ </action>
<action issue="VFS-378" dev="ggregory" type="update">
Tar error message are missing from resource file.
</action>