Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 13735 invoked from network); 20 Apr 2004 12:52:26 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 20 Apr 2004 12:52:26 -0000 Received: (qmail 67400 invoked by uid 500); 20 Apr 2004 12:52:20 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 67270 invoked by uid 500); 20 Apr 2004 12:52:19 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 67250 invoked by uid 500); 20 Apr 2004 12:52:19 -0000 Received: (qmail 67214 invoked from network); 20 Apr 2004 12:52:19 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 20 Apr 2004 12:52:18 -0000 Received: (qmail 13643 invoked by uid 1146); 20 Apr 2004 12:52:21 -0000 Date: 20 Apr 2004 12:52:21 -0000 Message-ID: <20040420125221.13642.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/etc tagdiff.xsl X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bodewig 2004/04/20 05:52:21 Modified: docs/manual Tag: ANT_16_BRANCH dirtasks.html docs/manual/CoreTasks Tag: ANT_16_BRANCH concat.html java.html docs/manual/CoreTypes Tag: ANT_16_BRANCH xmlcatalog.html docs/manual/OptionalTasks Tag: ANT_16_BRANCH ccm.html dotnet.html src/etc Tag: ANT_16_BRANCH tagdiff.xsl Log: merge Revision Changes Path No revision No revision 1.20.2.3 +1 -1 ant/docs/manual/dirtasks.html Index: dirtasks.html =================================================================== RCS file: /home/cvs/ant/docs/manual/dirtasks.html,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -u -r1.20.2.2 -r1.20.2.3 --- dirtasks.html 9 Feb 2004 22:12:06 -0000 1.20.2.2 +++ dirtasks.html 20 Apr 2004 12:52:20 -0000 1.20.2.3 @@ -189,7 +189,7 @@

No revision No revision 1.9.2.3 +1 -1 ant/docs/manual/CoreTasks/concat.html Index: concat.html =================================================================== RCS file: /home/cvs/ant/docs/manual/CoreTasks/concat.html,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -u -r1.9.2.2 -r1.9.2.3 --- concat.html 9 Feb 2004 22:12:07 -0000 1.9.2.2 +++ concat.html 20 Apr 2004 12:52:20 -0000 1.9.2.3 @@ -19,7 +19,7 @@

- Paths and/or + Paths and/or FileSets and/or FileLists are used to select which files are to be concatenated. There is no 1.24.2.6 +5 -5 ant/docs/manual/CoreTasks/java.html Index: java.html =================================================================== RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v retrieving revision 1.24.2.5 retrieving revision 1.24.2.6 diff -u -r1.24.2.5 -r1.24.2.6 --- java.html 9 Feb 2004 22:12:07 -0000 1.24.2.5 +++ java.html 20 Apr 2004 12:52:20 -0000 1.24.2.6 @@ -95,7 +95,7 @@ failonerror Stop the buildprocess if the command exits with a - returncode other than 0. Default is "false" (see note) + returncode other than 0. Default is "false" (see note) No @@ -227,10 +227,10 @@

When the permission RuntimePermission exitVM has not been granted (or has been revoked) the System.exit() call will be intercepted and treated like indicated in failonerror.

-If you specify failonerror="true" and you do not specify permissions, -a set of default permissions will be added to your java invocation making sure that -a non zero return code will lead to a BuildException. +

Note: +if you specify failonerror="true" and you do not specify permissions, +a set of default permissions will be added to your Java invocation to make sure that +a non-zero return code will lead to a BuildException.

Settings will be ignored if fork is enabled.

No revision No revision 1.7.2.3 +1 -1 ant/docs/manual/CoreTypes/xmlcatalog.html Index: xmlcatalog.html =================================================================== RCS file: /home/cvs/ant/docs/manual/CoreTypes/xmlcatalog.html,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -u -r1.7.2.2 -r1.7.2.3 --- xmlcatalog.html 9 Feb 2004 22:12:10 -0000 1.7.2.2 +++ xmlcatalog.html 20 Apr 2004 12:52:20 -0000 1.7.2.3 @@ -212,7 +212,7 @@

catalogpath

The nested catalogpath element is a path-like structure listing catalog files to +href="../using.html#path">path-like structure listing catalog files to search. All files in this path are assumed to be OASIS catalog files, in either No revision No revision 1.9.2.3 +1 -1 ant/docs/manual/OptionalTasks/ccm.html Index: ccm.html =================================================================== RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ccm.html,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -u -r1.9.2.2 -r1.9.2.3 --- ccm.html 9 Feb 2004 22:12:11 -0000 1.9.2.2 +++ ccm.html 20 Apr 2004 12:52:20 -0000 1.9.2.3 @@ -62,7 +62,7 @@ Comment attribute mycomment is added as a task comment. The task used is the one set as the default.

CCMCheckout

Description

Task to perform a Checkout command to Continuus

Parameters

1.10.2.11 +1 -1 ant/docs/manual/OptionalTasks/dotnet.html Index: dotnet.html =================================================================== RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v retrieving revision 1.10.2.10 retrieving revision 1.10.2.11 diff -u -r1.10.2.10 -r1.10.2.11 --- dotnet.html 9 Feb 2004 22:12:11 -0000 1.10.2.10 +++ dotnet.html 20 Apr 2004 12:52:20 -0000 1.10.2.11 @@ -97,7 +97,7 @@ - ImportTypelib + ImportTypelib Imports a COM type library into .NET No revision No revision 1.2.2.4 +1 -1 ant/src/etc/tagdiff.xsl Index: tagdiff.xsl =================================================================== RCS file: /home/cvs/ant/src/etc/tagdiff.xsl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -u -r1.2.2.3 -r1.2.2.4 --- tagdiff.xsl 3 Mar 2004 17:18:48 -0000 1.2.2.3 +++ tagdiff.xsl 20 Apr 2004 12:52:21 -0000 1.2.2.4 @@ -64,7 +64,7 @@ Tagdiff between

and

Designed for use with Ant.

--------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org