Author: bodewig
Date: Thu Aug 27 03:44:38 2009
New Revision: 808274
URL: http://svn.apache.org/viewvc?rev=808274&view=rev
Log:
rename class
Added:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
(contents, props changed)
- copied, changed from r808255,
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/StreamFactory.java
Removed:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/StreamFactory.java
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArStreamFactory.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/CpioStreamFactory.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/TarStreamFactory.java
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ZipStreamFactory.java
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java?rev=808274&r1=808273&r2=808274&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveResource.java
Thu Aug 27 03:44:38 2009
@@ -29,8 +29,8 @@
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.resources.ArchiveResource;
import org.apache.tools.ant.util.FileUtils;
+import org.apache.ant.compress.util.ArchiveStreamFactory;
import org.apache.ant.compress.util.EntryHelper;
-import org.apache.ant.compress.util.StreamFactory;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveInputStream;
@@ -40,7 +40,7 @@
public abstract class CommonsCompressArchiveResource extends ArchiveResource {
private String encoding;
- private final StreamFactory factory;
+ private final ArchiveStreamFactory factory;
private final String archiveType;
// not supported for zip
@@ -49,7 +49,7 @@
/**
* Default constructor.
*/
- protected CommonsCompressArchiveResource(StreamFactory factory,
+ protected CommonsCompressArchiveResource(ArchiveStreamFactory factory,
String archiveType) {
this.factory = factory;
this.archiveType = archiveType;
@@ -61,7 +61,7 @@
* @param a the archive as File.
* @param e the ArchiveEntry.
*/
- protected CommonsCompressArchiveResource(StreamFactory factory,
+ protected CommonsCompressArchiveResource(ArchiveStreamFactory factory,
String archiveType,
File a, ArchiveEntry e) {
super(a, true);
@@ -75,7 +75,7 @@
* @param a the archive as Resource.
* @param e the ArchiveEntry.
*/
- protected CommonsCompressArchiveResource(StreamFactory factory,
+ protected CommonsCompressArchiveResource(ArchiveStreamFactory factory,
String archiveType,
Resource a, ArchiveEntry e) {
super(a, true);
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java?rev=808274&r1=808273&r2=808274&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/resources/CommonsCompressArchiveScanner.java
Thu Aug 27 03:44:38 2009
@@ -22,7 +22,7 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.ant.compress.util.StreamFactory;
+import org.apache.ant.compress.util.ArchiveStreamFactory;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.ArchiveScanner;
import org.apache.tools.ant.types.Resource;
@@ -35,10 +35,10 @@
*/
public class CommonsCompressArchiveScanner extends ArchiveScanner {
- private final StreamFactory factory;
+ private final ArchiveStreamFactory factory;
private final ResourceBuilder builder;
- public CommonsCompressArchiveScanner(StreamFactory factory,
+ public CommonsCompressArchiveScanner(ArchiveStreamFactory factory,
ResourceBuilder builder) {
this.factory = factory;
this.builder = builder;
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java?rev=808274&r1=808273&r2=808274&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ArchiveBase.java
Thu Aug 27 03:44:38 2009
@@ -38,8 +38,8 @@
import org.apache.ant.compress.resources.TarResource;
import org.apache.ant.compress.resources.ZipFileSet;
import org.apache.ant.compress.resources.ZipResource;
+import org.apache.ant.compress.util.ArchiveStreamFactory;
import org.apache.ant.compress.util.EntryHelper;
-import org.apache.ant.compress.util.StreamFactory;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
@@ -65,7 +65,7 @@
* Base implementation of tasks creating archives.
*/
public abstract class ArchiveBase extends Task {
- private StreamFactory factory;
+ private ArchiveStreamFactory factory;
private EntryBuilder builder;
private Resource dest;
@@ -83,7 +83,7 @@
protected ArchiveBase() {}
- protected final void setFactory(StreamFactory factory) {
+ protected final void setFactory(ArchiveStreamFactory factory) {
this.factory = factory;
}
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java?rev=808274&r1=808273&r2=808274&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/ExpandBase.java
Thu Aug 27 03:44:38 2009
@@ -25,8 +25,8 @@
import java.io.InputStream;
import java.util.Date;
+import org.apache.ant.compress.util.ArchiveStreamFactory;
import org.apache.ant.compress.util.EntryHelper;
-import org.apache.ant.compress.util.StreamFactory;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -49,9 +49,9 @@
* <p>File permissions will not be restored on extracted files.</p>
*/
public abstract class ExpandBase extends Expand {
- private final StreamFactory factory;
+ private final ArchiveStreamFactory factory;
- protected ExpandBase(StreamFactory factory) {
+ protected ExpandBase(ArchiveStreamFactory factory) {
this.factory = factory;
}
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArStreamFactory.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArStreamFactory.java?rev=808274&r1=808273&r2=808274&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArStreamFactory.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArStreamFactory.java
Thu Aug 27 03:44:38 2009
@@ -27,7 +27,7 @@
import org.apache.commons.compress.archivers.ar.ArArchiveInputStream;
import org.apache.commons.compress.archivers.ar.ArArchiveOutputStream;
-public class ArStreamFactory implements StreamFactory {
+public class ArStreamFactory implements ArchiveStreamFactory {
/**
* @param stream the stream to read from, should be buffered
Copied:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
(from r808255,
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/StreamFactory.java)
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java?p2=ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java&p1=ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/StreamFactory.java&r1=808255&r2=808274&rev=808274&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/StreamFactory.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
Thu Aug 27 03:44:38 2009
@@ -28,7 +28,7 @@
/**
* Creates streams for the supported archive formats.
*/
-public interface StreamFactory {
+public interface ArchiveStreamFactory {
/**
* @param stream the stream to read from, should be buffered
Propchange:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ArchiveStreamFactory.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/CpioStreamFactory.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/CpioStreamFactory.java?rev=808274&r1=808273&r2=808274&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/CpioStreamFactory.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/CpioStreamFactory.java
Thu Aug 27 03:44:38 2009
@@ -27,7 +27,7 @@
import org.apache.commons.compress.archivers.cpio.CpioArchiveInputStream;
import org.apache.commons.compress.archivers.cpio.CpioArchiveOutputStream;
-public class CpioStreamFactory implements StreamFactory {
+public class CpioStreamFactory implements ArchiveStreamFactory {
/**
* @param stream the stream to read from, should be buffered
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/TarStreamFactory.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/TarStreamFactory.java?rev=808274&r1=808273&r2=808274&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/TarStreamFactory.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/TarStreamFactory.java
Thu Aug 27 03:44:38 2009
@@ -27,7 +27,7 @@
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
-public class TarStreamFactory implements StreamFactory {
+public class TarStreamFactory implements ArchiveStreamFactory {
/**
* @param stream the stream to read from, should be buffered
Modified:
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ZipStreamFactory.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ZipStreamFactory.java?rev=808274&r1=808273&r2=808274&view=diff
==============================================================================
---
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ZipStreamFactory.java
(original)
+++
ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/util/ZipStreamFactory.java
Thu Aug 27 03:44:38 2009
@@ -27,7 +27,7 @@
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
-public class ZipStreamFactory implements StreamFactory {
+public class ZipStreamFactory implements ArchiveStreamFactory {
/**
* @param stream the stream to read from, should be buffered
