From 8f2c9066b3357c0d899705839789157352f64ff1 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Wed, 13 Dec 2000 09:48:33 +0000 Subject: [PATCH] Reverse changes and reinstate fileset + prefixedfileset git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268348 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Jar.java | 8 -------- src/main/org/apache/tools/ant/taskdefs/Zip.java | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index 6dc3e6a31..fb49c229b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java @@ -80,14 +80,6 @@ public class Jar extends Zip { super.setZipfile(jarFile); } - /** - * Adds a set of files (nested fileset attribute). - */ - public void addPrefixedfileset(PrefixedFileSet set) { - log("Warning: Prefixfileset is a deprecated feature. The fileset subelement can be used in it's place", Project.MSG_WARN); - addFileset(set); - } - public void setManifest(File manifestFile) { manifest = manifestFile; if (!manifest.exists()) diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index c4902f4ad..4fde85e65 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -113,6 +113,13 @@ public class Zip extends MatchingTask { filesets.addElement(set); } + /** + * Adds a set of files (nested fileset attribute). + */ + public void addPrefixedfileset(PrefixedFileSet set) { + addFileset(set); + } + /** * FileSet with an additional prefix attribute to specify the * location we want to move the files to (inside the archive).