bodewig 02/05/21 05:59:06
Modified: . Tag: ANT_15_BRANCH WHATSNEW
src/etc/testcases/taskdefs Tag: ANT_15_BRANCH manifest.xml
src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Expand.java
Log:
Don't extend MatchingTask for no reason.
PR: 9106
Revision Changes Path
No revision
No revision
1.263.2.18 +2 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.263.2.17
retrieving revision 1.263.2.18
diff -u -r1.263.2.17 -r1.263.2.18
--- WHATSNEW 15 May 2002 13:48:49 -0000 1.263.2.17
+++ WHATSNEW 21 May 2002 12:59:06 -0000 1.263.2.18
@@ -8,6 +8,8 @@
that one $ sign will be stripped if your mail message contains the text
$$.
+* org.apache.tools.ant.taskdefs.Expand no longer extends MatchingTask.
+
Fixed bugs:
-----------
No revision
No revision
1.5.2.1 +21 -7 jakarta-ant/src/etc/testcases/taskdefs/manifest.xml
Index: manifest.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/manifest.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- manifest.xml 20 Mar 2002 12:11:57 -0000 1.5
+++ manifest.xml 21 May 2002 12:59:06 -0000 1.5.2.1
@@ -7,14 +7,18 @@
<target name="test1">
<jar file="mftest1.jar" manifest="manifests/test1.mf"/>
<unjar src="mftest1.jar" dest="manifests">
- <include name="META-INF/MANIFEST.MF"/>
+ <patternset>
+ <include name="META-INF/MANIFEST.MF"/>
+ </patternset>
</unjar>
</target>
<target name="test2">
<jar file="mftest2.jar" manifest="manifests/test2.mf"/>
<unjar src="mftest2.jar" dest="manifests">
- <include name="META-INF/MANIFEST.MF"/>
+ <patternset>
+ <include name="META-INF/MANIFEST.MF"/>
+ </patternset>
</unjar>
</target>
@@ -48,7 +52,9 @@
</manifest>
</jar>
<unjar src="mftest8.jar" dest="manifests">
- <include name="META-INF/MANIFEST.MF"/>
+ <patternset>
+ <include name="META-INF/MANIFEST.MF"/>
+ </patternset>
</unjar>
</target>
@@ -108,7 +114,9 @@
</manifest>
</jar>
<unjar src="mftest14.jar" dest="manifests">
- <include name="META-INF/MANIFEST.MF"/>
+ <patternset>
+ <include name="META-INF/MANIFEST.MF"/>
+ </patternset>
</unjar>
</target>
@@ -124,7 +132,9 @@
</manifest>
</jar>
<unjar src="mftestLongLine.jar" dest="manifests">
- <include name="META-INF/MANIFEST.MF"/>
+ <patternset>
+ <include name="META-INF/MANIFEST.MF"/>
+ </patternset>
</unjar>
</target>
@@ -141,7 +151,9 @@
</manifest>
</jar>
<unjar src="mftestOrder1.jar" dest="manifests">
- <include name="META-INF/MANIFEST.MF"/>
+ <patternset>
+ <include name="META-INF/MANIFEST.MF"/>
+ </patternset>
</unjar>
</target>
@@ -158,7 +170,9 @@
</manifest>
</jar>
<unjar src="mftestOrder2.jar" dest="manifests">
- <include name="META-INF/MANIFEST.MF"/>
+ <patternset>
+ <include name="META-INF/MANIFEST.MF"/>
+ </patternset>
</unjar>
</target>
No revision
No revision
1.30.2.1 +3 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
Index: Expand.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -r1.30 -r1.30.2.1
--- Expand.java 15 Apr 2002 13:36:17 -0000 1.30
+++ Expand.java 21 May 2002 12:59:06 -0000 1.30.2.1
@@ -57,6 +57,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.PatternSet;
import org.apache.tools.ant.util.FileUtils;
@@ -85,7 +86,7 @@
* name="unjar"
* name="unwar"
*/
-public class Expand extends MatchingTask {
+public class Expand extends Task {
private File dest; //req
private File source; // req
private boolean overwrite = true;
@@ -298,4 +299,5 @@
public void addFileset(FileSet set) {
filesets.addElement(set);
}
+
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
