You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@locus.apache.org on 2000/07/12 15:30:51 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Expand.java defaults.properties
bodewig 00/07/12 06:30:51
Modified: docs index.html
src/main/org/apache/tools/ant/taskdefs Expand.java
defaults.properties
Log:
Added unzip and unjar as aliases of expand and deprecated expand,
making unzip the preferred name.
Revision Changes Path
1.45 +8 -4 jakarta-ant/docs/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/index.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- index.html 2000/07/12 12:40:28 1.44
+++ index.html 2000/07/12 13:30:47 1.45
@@ -521,7 +521,7 @@
<li><a href="#deltree">Deltree</a></li>
<li><a href="#echo">Echo</a></li>
<li><a href="#exec">Exec</a></li>
- <li><a href="#expand">Expand</a></li>
+ <li><a href="#unzip">Expand</a></li>
<li><a href="#filter">Filter</a></li>
<li><a href="#fixcrlf">FixCRLF</a></li>
<li><a href="#get">Get</a></li>
@@ -544,7 +544,9 @@
<li><a href="#touch">Touch</a></li>
<li><a href="#tstamp">Tstamp</a></li>
<li><a href="#style">Style</a></li>
+ <li><a href="#unzip">Unjar</a></li>
<li><a href="#untar">Untar</a></li>
+ <li><a href="#unzip">Unzip</a></li>
<li><a href="#zip">Zip</a></li>
</ul>
<hr>
@@ -1101,11 +1103,13 @@
output="dir.txt" /></code></p>
</blockquote>
<hr>
-<h2><a name="expand">Expand</a></h2>
+<h2><a name="unzip">Expand/Unzip/Unjar</a></h2>
<h3>Description</h3>
-<p>Unzips a zipfile.</p>
+<p>Unzips a zip- or jarfile.</p>
<p>For JDK 1.1 "last modified time" field is set to current time instead of being
carried from zipfile.</p>
+<p>DEPRECATION: the expand task simply points to the unzip task and it's
+there for back compatibility reasons.</p>
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
<tr>
@@ -1126,7 +1130,7 @@
</table>
<h3>Examples</h3>
<blockquote>
- <p><code><expand src="${tomcat_src}/tools-src.zip" dest="${tools.home}"
+ <p><code><unzip src="${tomcat_src}/tools-src.zip" dest="${tools.home}"
/></code></p>
</blockquote>
<hr>
1.8 +5 -0 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Expand.java 2000/07/10 11:04:21 1.7
+++ Expand.java 2000/07/12 13:30:48 1.8
@@ -74,6 +74,11 @@
*/
// XXX move it to util or tools
public void execute() throws BuildException {
+ if ("expand".equals(taskType)) {
+ log("!! expand is deprecated. Use unzip instead. !!");
+ }
+
+
Touch touch = (Touch) project.createTask("touch");
touch.setOwningTarget(target);
1.19 +3 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Index: defaults.properties
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- defaults.properties 2000/07/08 12:33:26 1.18
+++ defaults.properties 2000/07/12 13:30:49 1.19
@@ -10,7 +10,8 @@
rmic=org.apache.tools.ant.taskdefs.Rmic
cvs=org.apache.tools.ant.taskdefs.Cvs
get=org.apache.tools.ant.taskdefs.Get
-expand=org.apache.tools.ant.taskdefs.Expand
+unzip=org.apache.tools.ant.taskdefs.Expand
+unjar=org.apache.tools.ant.taskdefs.Expand
echo=org.apache.tools.ant.taskdefs.Echo
javadoc=org.apache.tools.ant.taskdefs.Javadoc
zip=org.apache.tools.ant.taskdefs.Zip
@@ -47,3 +48,4 @@
# deprecated ant tasks (kept for back compatibility)
javadoc2=org.apache.tools.ant.taskdefs.Javadoc
keysubst=org.apache.tools.ant.taskdefs.KeySubst
+expand=org.apache.tools.ant.taskdefs.Expand