You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@locus.apache.org on 2000/12/13 10:48:34 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Jar.java Zip.java
donaldp 00/12/13 01:48:33
Modified: src/main/org/apache/tools/ant/taskdefs Jar.java Zip.java
Log:
Reverse changes and reinstate fileset + prefixedfileset
Revision Changes Path
1.11 +0 -8 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
Index: Jar.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Jar.java 2000/12/13 01:32:35 1.10
+++ Jar.java 2000/12/13 09:48:33 1.11
@@ -80,14 +80,6 @@
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())
1.23 +7 -0 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Zip.java 2000/12/13 01:32:35 1.22
+++ Zip.java 2000/12/13 09:48:33 1.23
@@ -114,6 +114,13 @@
}
/**
+ * 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).
* Or, if this FileSet represents only a single file, then the