diff --git a/WHATSNEW b/WHATSNEW index cf77b3ec9..be89264aa 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -6,6 +6,8 @@ Changes that could break older environments: * copying of support files in has been removed - as well as the filtering attribute. +* the and tasks have been removed. + * the command line switches _not_ starting with - have been removed. * Path and EnumeratedAttribute have been moved from diff --git a/docs/index.html b/docs/index.html index 98c6dd555..52290743f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -25,7 +25,7 @@
  • Dave Walend (dwalend@cs.tufts.edu)
    • -

    Version 1.2 - 2000/08/09

    +

    Version 1.2 - 2000/08/10

    Table of Contents

    @@ -617,7 +617,6 @@ If you do not want these default excludes applied, you may disable them with the
  • Deltree
  • Echo
  • Exec
    • -
  • Expand
  • Filter
  • FixCRLF
  • GenKey
    • @@ -628,7 +627,6 @@ If you do not want these default excludes applied, you may disable them with the
  • Java
  • Javac
  • Javadoc/Javadoc2
    • -
  • KeySubst
  • Mkdir
  • Patch
  • Property
    • @@ -1278,38 +1276,6 @@ system command via nested <env> elements.

    adds ${basedir}/bin to the PATH of the system command.

    -

    Expand/Unzip/Unjar

    -

    Description

    -

    Unzips a zip- or jarfile.

    -

    For JDK 1.1 "last modified time" field is set to current time instead of being -carried from zipfile.

    -

    File permissions will not be restored on extracted files. -

    DEPRECATION: the expand task simply points to the unzip task and it's -there for back compatibility reasons.

    -

    Parameters

    - - - - - - - - - - - - - - - - -
    AttributeDescriptionRequired
    srczipfile to expand.Yes
    destdirectory where to store the expanded files.Yes
    -

    Examples

    -
    -

    <unzip src="${tomcat_src}/tools-src.zip" dest="${tools.home}" - />

    -
    -

    Filter

    Description

    Sets a token filter for this project. Token filters are used by all tasks @@ -2511,48 +2477,6 @@ respectively.

    <link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/> </javadoc> -
    -

    KeySubst

    -

    Description

    -

    Performs keyword substitution in the source file, and writes the result to -the destination file.

    -

    Keys in the source file are of the form ${keyname}. The keys attribute -contains key/value pairs. When a key is found in the keys attribute, then -"${keyname}" is replaced by the corresponding value.

    -

    The keys attribute is of the form -"name1=value1*name2=value2*name3=value3". The '*' is called the -separator, which might we changed with the sep attribute.

    -

    Note: the source file and destination file may not be the same.

    -

    Parameters

    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    AttributeDescriptionRequired
    srcthe source file.Yes
    destthe destination file.Yes
    septhe separator for the name/value pairs.No
    keysname/value pairs for replacement.Yes
    -

    Examples

    -
      <keysubst src="abc.txt" dest="def.txt" keys="VERSION=1.0.3*DATE=2000-01-10" />

    Mkdir

    Description

    @@ -3291,6 +3215,36 @@ class path

    +

    Unjar/Unzip

    +

    Description

    +

    Unzips a zip- or jarfile.

    +

    For JDK 1.1 "last modified time" field is set to current time instead of being +carried from zipfile.

    +

    File permissions will not be restored on extracted files. +

    Parameters

    + + + + + + + + + + + + + + + + +
    AttributeDescriptionRequired
    srczipfile to expand.Yes
    destdirectory where to store the expanded files.Yes
    +

    Examples

    +
    +

    <unzip src="${tomcat_src}/tools-src.zip" dest="${tools.home}" + />

    +
    +

    Untar

    Description

    Untars a tarfile.

    diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties index f838a2d88..30af34255 100644 --- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties +++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties @@ -58,5 +58,3 @@ ftp=org.apache.tools.ant.taskdefs.optional.FTP # 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