From 4407a047e3c8ae8d15997b27f52c989b6894335f Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 19 Feb 2003 09:23:20 +0000 Subject: [PATCH] Merge manual changes from 1.5 branch git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274142 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/CoreTasks/changelog.html | 4 +- docs/manual/CoreTasks/cvs.html | 6 +-- docs/manual/CoreTasks/cvstagdiff.html | 22 ++++---- docs/manual/CoreTypes/selectors.html | 2 +- docs/manual/Integration/Antidote.html | 12 ++--- docs/manual/Integration/VAJAntTool.html | 2 +- docs/manual/api/packages.html | 2 +- docs/manual/install.html | 70 ++++++++++++------------- docs/manual/platform.html | 22 ++++---- xdocs/antnews.xml | 1 - 10 files changed, 71 insertions(+), 72 deletions(-) diff --git a/docs/manual/CoreTasks/changelog.html b/docs/manual/CoreTasks/changelog.html index 9406e262c..bcc4c8b70 100644 --- a/docs/manual/CoreTasks/changelog.html +++ b/docs/manual/CoreTasks/changelog.html @@ -145,7 +145,7 @@ how to generate a HTML report from the XML report.

out="changelog.html" style="${ant.home}/etc/changelog.xsl"> <param name="title" expression="Ant ChangeLog"/> - <param name="module" expression="jakarta-ant"/> + <param name="module" expression="ant"/> <param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/> </style> @@ -169,7 +169,7 @@ This allows temp[lates to be stored inside jar]]></msg> </changelog> -

Copyright © 2002 Apache Software Foundation. All rights +

Copyright © 2002-2003 Apache Software Foundation. All rights Reserved.

diff --git a/docs/manual/CoreTasks/cvs.html b/docs/manual/CoreTasks/cvs.html index 289377da4..4a06be338 100644 --- a/docs/manual/CoreTasks/cvs.html +++ b/docs/manual/CoreTasks/cvs.html @@ -113,10 +113,10 @@ preferred over the checkout command, because of speed.

Examples

  <cvs cvsRoot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
-       package="jakarta-ant"
+       package="ant"
        dest="${ws.dir}"
   />
-

checks out the package/module "jakarta-ant" from the CVS +

checks out the package/module "ant" from the CVS repository pointed to by the cvsRoot attribute, and stores the files in "${ws.dir}".

  <cvs dest="${ws.dir}" command="update"/>

updates the package/module that has previously been checked out into @@ -159,7 +159,7 @@ before the command, and any command options should appear after the command as i above. See the cvs manual for details, specifically the Guide to CVS commands

-

Copyright © 2000-2002 Apache Software +

Copyright © 2000-2003 Apache Software Foundation. All rights Reserved.

diff --git a/docs/manual/CoreTasks/cvstagdiff.html b/docs/manual/CoreTasks/cvstagdiff.html index 17e4ef897..032b3c6d8 100644 --- a/docs/manual/CoreTasks/cvstagdiff.html +++ b/docs/manual/CoreTasks/cvstagdiff.html @@ -102,40 +102,40 @@

Examples

  <cvstagdiff cvsRoot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
                 destfile="tagdiff.xml"
-                package="jakarta-ant"
+                package="ant"
                 startTag="ANT_14"
                 endTag="ANT_141"
   />

Generates a tagdiff report for all the changes that have been made -in the jakarta-ant module between the tags ANT_14 and ANT_141. +in the ant module between the tags ANT_14 and ANT_141. It writes these changes into the file tagdiff.xml.

  <cvstagdiff
                 destfile="tagdiff.xml"
-                package="jakarta-ant"
+                package="ant"
                 startDate="2002-01-01"
                 endDate="2002-31-01"
   />

Generates a tagdiff report for all the changes that have been made -in the jakarta-ant module in january 2002. In this example cvsRoot +in the ant module in january 2002. In this example cvsRoot has not been set. The current cvsRoot will be used (assuming the build is started from a folder stored in cvs. It writes these changes into the file tagdiff.xml.

  <cvstagdiff
                 destfile="tagdiff.xml"
-                package="jakarta-ant"
-                rootdir="jakarta/ant"
+                package="ant"
+                rootdir="apache/ant"
                 startDate="2002-01-01"
                 endDate="2002-31-01"
   />

Generates a tagdiff report for all the changes that have been made -in the jakarta-ant module in january 2002, with rootdir indicating that -the actual location of the jakarta-ant module in cvs is jakarta/ant -rather than jakarta-ant. In this example cvsRoot +in the ant module in january 2002, with rootdir indicating that +the actual location of the ant module in cvs is apache/ant +rather than ant. In this example cvsRoot has not been set. The current cvsRoot will be used (assuming the build is started from a folder stored in cvs. It writes these changes into the file tagdiff.xml.

@@ -150,7 +150,7 @@ how to generate a HTML report from the XML report.

out="tagdiff.html" style="${ant.home}/etc/tagdiff.xsl"> <param name="title" expression="Ant Diff"/> - <param name="module" expression="jakarta-ant"/> + <param name="module" expression="ant"/> <param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/> </style> @@ -169,7 +169,7 @@ how to generate a HTML report from the XML report.

</tagdiff> -

Copyright © 2002 Apache Software Foundation. All rights +

Copyright © 2002-2003 Apache Software Foundation. All rights Reserved.

diff --git a/docs/manual/CoreTypes/selectors.html b/docs/manual/CoreTypes/selectors.html index 3d9ad922f..605ce0377 100755 --- a/docs/manual/CoreTypes/selectors.html +++ b/docs/manual/CoreTypes/selectors.html @@ -748,7 +748,7 @@

Here is an example of how to use the Selector Reference:

-<project default="all" basedir="./jakarta-ant">
+<project default="all" basedir="./ant">
 
     <selector id="completed">
         <none>
diff --git a/docs/manual/Integration/Antidote.html b/docs/manual/Integration/Antidote.html
index 8abb2c536..e03b7a63e 100644
--- a/docs/manual/Integration/Antidote.html
+++ b/docs/manual/Integration/Antidote.html
@@ -58,15 +58,15 @@
     
Getting Involved

 
     
The source code for Antidote is located in a separate Module 
-    (jakarta-ant-antidote) in CVS.
+    (ant-antidote) in CVS.
     All the existing documentation can
     be found there where new contributors should read:

     
 
     
Online discussions about Antidote occur on the copy default.ini (in 
-      jakarta-ant\src\...\taskdefs\optional\ide)     to 
+      ant\src\...\taskdefs\optional\ide)     to 
       C:\IBMVJava\ide\tools\org-apache-tools-ant\default.ini.
 
   
  • if you want to access this help from the Workbench, create the
diff --git a/docs/manual/api/packages.html b/docs/manual/api/packages.html
index e78fd88c2..c57230db7 100644
--- a/docs/manual/api/packages.html
+++ b/docs/manual/api/packages.html
@@ -14,7 +14,7 @@ builds.
    
 
    If you want to see the API docs for the latest code, they are
 generated by Apache Gump
 and linked from http://nagoya.apache.org/gump/javadoc/jakarta-ant/build/javadocs/index.html.
    
+href="http://nagoya.apache.org/gump/javadoc/ant/build/javadocs/index.html">http://nagoya.apache.org/gump/javadoc/ant/build/javadocs/index.html.
    
 
 
 
diff --git a/docs/manual/install.html b/docs/manual/install.html
index f2a6c9deb..5582fdbeb 100644
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -13,7 +13,7 @@
 href="http://ant.apache.org/">http://ant.apache.org/.
 
 If you like living on the edge, you can download the latest version from http://cvs.apache.org/builds/jakarta-ant/nightly/.
    
+href="http://cvs.apache.org/builds/ant/nightly/">http://cvs.apache.org/builds/ant/nightly/.
    
 
    Source Edition
    
 
 
    If you prefer the source edition, you can download the source for the latest Ant release from http://ant.apache.org/srcdownload.cgi.
@@ -21,39 +21,39 @@ href="http://cvs.apache.org/builds/jakarta-ant/nightly/">http://cvs.apache.org/b
 Again, if you prefer the edge, you can access 
 the code as it is being developed via CVS. The Jakarta website has details on 
 accessing CVS. Please checkout the 
-jakarta-ant module. 
+ant module.
 
 See the section Building Ant on how to
 build Ant from the source code.
-You can also access the 
-
+You can also access the
+
 Ant CVS repository on-line. 
    
 
 
    
 
    System Requirements
    
 Ant has been used successfully on many platforms, including Linux,
 commercial flavours of Unix such as Solaris and HP-UX,
-Windows 9x and NT, Novell Netware 6 and MacOS X. 
+Windows 9x and NT, Novell Netware 6 and MacOS X.
 
    
-To build and use Ant, you must have a JAXP-compliant XML parser installed and 
+To build and use Ant, you must have a JAXP-compliant XML parser installed and
 available on your classpath.
    
 
    
 The binary distribution of Ant includes the latest version of the
-Apache Xerces2 XML parser. 
-Please see 
-http://java.sun.com/xml/ 
-for more information about JAXP. 
+Apache Xerces2 XML parser.
+Please see
+http://java.sun.com/xml/
+for more information about JAXP.
 If you wish to use a different JAXP-compliant parser, you should remove
 xercesImpl.jar and xml-apis.jar
 from Ant's lib directory.
 
-You can then either put the jars from your preferred parser into Ant's 
+You can then either put the jars from your preferred parser into Ant's
 lib directory or put the jars on the system classpath.
    
 
 
    
 For the current version of Ant, you will also need a JDK installed on
 your system, version 1.1 or later. Some tasks work better on post-1.1 systems;
-some tasks only work on Java 1.2 and successors. 
+some tasks only work on Java 1.2 and successors.
 A future version of Ant -Ant 2.0- will require JDK 1.2 or later, though
 Ant 1.x strives to retain 1.1 compatibility.
 
    
@@ -62,7 +62,7 @@ compiler is supported.
 
    
 
    
 Note #2: If a JDK is not present, only the JRE runtime, then many tasks will not work.
-
      
+
    
 
    
 
    Installing Ant
    
 
    The binary distribution of Ant consists of the following directory layout:
@@ -85,11 +85,11 @@ compiler is supported.
             //   - ... and more ;-)
    • -Only the bin and lib directories are -required to run Ant. +Only the bin and lib directories are +required to run Ant. To install Ant, choose a directory and copy the distribution -file there. This directory will be known as ANT_HOME. +file there. This directory will be known as ANT_HOME.

    @@ -124,7 +124,7 @@ installed in a short, 8.3 path, such as C:\Ant.

    Setup

    -Before you can run ant there is some additional set up you +Before you can run ant there is some additional set up you will need to do:

    Note: Do not install Ant's ant.jar file into the lib/ext -directory of the JDK/JRE. Ant is an application, whilst the extension -directory is intended for JDK extensions. In particular there are security +directory of the JDK/JRE. Ant is an application, whilst the extension +directory is intended for JDK extensions. In particular there are security restrictions on the classes which may be loaded by an extension.

    Optional Tasks

    Ant supports a number of optional tasks. An optional task is a task which -typically requires an external library to function. The optional tasks are +typically requires an external library to function. The optional tasks are packaged together with the core Ant tasks.

    The external libraries required by each of the optional tasks is detailed in the Library Dependencies section. These external libraries may either be placed in Ant's lib directory, where they will be picked up -automatically, or made available on the system CLASSPATH environment variable. +automatically, or made available on the system CLASSPATH environment variable.

    Windows

    @@ -177,19 +177,19 @@ set path=( $path $ANT_HOME/bin )

    There are lots of variants that can be used to run Ant. What you need is at least the following:

    @@ -384,7 +384,7 @@ Installing Ant / Optional Tasks section above.

    - diff --git a/docs/manual/platform.html b/docs/manual/platform.html index a51840cc8..ff75b54e8 100644 --- a/docs/manual/platform.html +++ b/docs/manual/platform.html @@ -54,20 +54,20 @@ it is treated like any other Unix.
  • ANT_OPTS - On NetWare, ANT_OPTS needs to include a parameter of the form, "-envCWD=ANT_HOME", with ANT_HOME being the fully expanded location of Ant, not an environment variable. This is due to the fact that the NetWare System Console has no notion of a current working directory.

    • It is suggested that you create up an ant.ncf that sets up these parameters, and calls perl ANT_HOME/dist/bin/runant.pl

    -

    The following is an example of such an NCF file(assuming ant is installed in 'sys:/jakarta-ant/'):

    +

    The following is an example of such an NCF file(assuming ant is installed in 'sys:/apache-ant/'):

    -    envset CLASSPATH=SYS:/jakarta-ant/bootstrap/lib/ant.jar
    -    envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/xercesImpl.jar
    -    envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/xml-apis.jar
    -    envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/lib/optional/junit.jar
    -    envset CLASSPATH=$CLASSPATH;SYS:/jakarta-ant/bootstrap/lib/optional.jar
    +    envset CLASSPATH=SYS:/apache-ant/bootstrap/lib/ant.jar
    +    envset CLASSPATH=$CLASSPATH;SYS:/apache-ant/lib/xercesImpl.jar
    +    envset CLASSPATH=$CLASSPATH;SYS:/apache-ant/lib/xml-apis.jar
    +    envset CLASSPATH=$CLASSPATH;SYS:/apache-ant/lib/optional/junit.jar
    +    envset CLASSPATH=$CLASSPATH;SYS:/apache-ant/bootstrap/lib/optional.jar

    -    setenv ANT_OPTS=-envCWD=sys:/jakarta-ant
    -    envset ANT_OPTS=-envCWD=sys:/jakarta-ant
    -    setenv ANT_HOME=sys:/jakarta-ant/dist/lib
    -    envset ANT_HOME=sys:/jakarta-ant/dist/lib
    +    setenv ANT_OPTS=-envCWD=sys:/apache-ant
    +    envset ANT_OPTS=-envCWD=sys:/apache-ant
    +    setenv ANT_HOME=sys:/apache-ant/dist/lib
    +    envset ANT_HOME=sys:/apache-ant/dist/lib

    -    perl sys:/jakarta-ant/dist/bin/runant.pl
    +    perl sys:/apache-ant/dist/bin/runant.pl

    Ant works on JVM version 1.3 or higher. You may have some luck running it on JVM 1.2, but serious problems have been found running Ant on JVM 1.1.7B. These problems are caused by JVM bugs that will not be fixed.

    diff --git a/xdocs/antnews.xml b/xdocs/antnews.xml index 79d4556f9..8eadb2a6f 100644 --- a/xdocs/antnews.xml +++ b/xdocs/antnews.xml @@ -26,7 +26,6 @@

    The final version of Ant 1.5.1 is now available for download. If you have any feedback on this release, feel free to join the - discussion on the ant-dev and ant-user mailing lists.

    An XSL transformer like Xalan or XSL:P style task http://xml.apache.org/xalan-j/index.html for Xalan.
    + target="_top">http://xml.apache.org/xalan-j/index.html for Xalan.
    XSL:P used to live at http://www.clc-marketing.com/xslp/, but the link doesn't work any longer and we are not aware of a replacement site.
    bcel.jarclassfileset data type, + classfileset data type, JavaClassHelper used by the ClassConstants filter reader and optionally used by ejbjar for dependency determination