git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272264 13f79535-47bb-0310-9956-ffa450edef68master
@@ -10,7 +10,7 @@ package org.apache.antlib.archive; | |||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.io.InputStream; | import java.io.InputStream; | ||||
import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
import org.apache.avalon.excalibur.bzip2.CBZip2InputStream; | |||||
import org.apache.excalibur.bzip2.CBZip2InputStream; | |||||
/** | /** | ||||
* Expands a file that has been compressed with the BZIP2 algorithm. Normally | * Expands a file that has been compressed with the BZIP2 algorithm. Normally | ||||
@@ -9,7 +9,7 @@ package org.apache.antlib.archive; | |||||
import java.io.IOException; | import java.io.IOException; | ||||
import java.io.OutputStream; | import java.io.OutputStream; | ||||
import org.apache.avalon.excalibur.bzip2.CBZip2OutputStream; | |||||
import org.apache.excalibur.bzip2.CBZip2OutputStream; | |||||
import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
/** | /** | ||||
@@ -9,7 +9,7 @@ package org.apache.tools.todo.taskdefs.archive; | |||||
import java.io.File; | import java.io.File; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
import org.apache.avalon.excalibur.zip.ZipOutputStream; | |||||
import org.apache.excalibur.zip.ZipOutputStream; | |||||
import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
/** | /** | ||||
@@ -24,7 +24,7 @@ import org.apache.tools.todo.taskdefs.manifest.Manifest; | |||||
import org.apache.tools.todo.taskdefs.manifest.ManifestException; | import org.apache.tools.todo.taskdefs.manifest.ManifestException; | ||||
import org.apache.tools.todo.taskdefs.manifest.ManifestUtil; | import org.apache.tools.todo.taskdefs.manifest.ManifestUtil; | ||||
import org.apache.tools.todo.types.FileScanner; | import org.apache.tools.todo.types.FileScanner; | ||||
import org.apache.avalon.excalibur.zip.ZipOutputStream; | |||||
import org.apache.excalibur.zip.ZipOutputStream; | |||||
/** | /** | ||||
* Creates a JAR archive. | * Creates a JAR archive. | ||||
@@ -14,8 +14,8 @@ import java.io.IOException; | |||||
import java.util.ArrayList; | import java.util.ArrayList; | ||||
import java.util.Iterator; | import java.util.Iterator; | ||||
import org.apache.avalon.excalibur.io.IOUtil; | import org.apache.avalon.excalibur.io.IOUtil; | ||||
import org.apache.avalon.excalibur.tar.TarEntry; | |||||
import org.apache.avalon.excalibur.tar.TarOutputStream; | |||||
import org.apache.excalibur.tar.TarEntry; | |||||
import org.apache.excalibur.tar.TarOutputStream; | |||||
import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
import org.apache.tools.todo.taskdefs.MatchingTask; | import org.apache.tools.todo.taskdefs.MatchingTask; | ||||
import org.apache.tools.todo.types.ScannerUtil; | import org.apache.tools.todo.types.ScannerUtil; | ||||
@@ -11,8 +11,8 @@ import java.io.File; | |||||
import java.io.FileInputStream; | import java.io.FileInputStream; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
import org.apache.avalon.excalibur.io.IOUtil; | import org.apache.avalon.excalibur.io.IOUtil; | ||||
import org.apache.avalon.excalibur.tar.TarEntry; | |||||
import org.apache.avalon.excalibur.tar.TarInputStream; | |||||
import org.apache.excalibur.tar.TarEntry; | |||||
import org.apache.excalibur.tar.TarInputStream; | |||||
import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
/** | /** | ||||
@@ -10,7 +10,7 @@ package org.apache.tools.todo.taskdefs.archive; | |||||
import java.io.File; | import java.io.File; | ||||
import java.io.IOException; | import java.io.IOException; | ||||
import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
import org.apache.avalon.excalibur.zip.ZipOutputStream; | |||||
import org.apache.excalibur.zip.ZipOutputStream; | |||||
/** | /** | ||||
* Creates a WAR archive. | * Creates a WAR archive. | ||||
@@ -21,8 +21,8 @@ import java.util.Stack; | |||||
import java.util.zip.CRC32; | import java.util.zip.CRC32; | ||||
import java.util.zip.ZipInputStream; | import java.util.zip.ZipInputStream; | ||||
import org.apache.avalon.excalibur.io.IOUtil; | import org.apache.avalon.excalibur.io.IOUtil; | ||||
import org.apache.avalon.excalibur.zip.ZipEntry; | |||||
import org.apache.avalon.excalibur.zip.ZipOutputStream; | |||||
import org.apache.excalibur.zip.ZipEntry; | |||||
import org.apache.excalibur.zip.ZipOutputStream; | |||||
import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
import org.apache.tools.todo.taskdefs.MatchingTask; | import org.apache.tools.todo.taskdefs.MatchingTask; | ||||
import org.apache.tools.todo.types.DirectoryScanner; | import org.apache.tools.todo.types.DirectoryScanner; | ||||