diff --git a/docs/ant15_todo.html b/docs/ant15_todo.html index 4a013b787..d3efc61ea 100644 --- a/docs/ant15_todo.html +++ b/docs/ant15_todo.html @@ -199,7 +199,7 @@ - Its documented, but more hidden than the other types + It's documented, but more hidden than the other types Peter + + + + + + Fully functional on Java 1.4 + + + + + Fix outstanding java1.4 defects, maybe add an + assertions datatype for java and other tasks (junit?) + which lets people turn on asserts. + + + + + + Steve + any other help he can get + diff --git a/docs/manual/CoreTasks/sql.html b/docs/manual/CoreTasks/sql.html index 93d448fc0..1cd2b4c2c 100644 --- a/docs/manual/CoreTasks/sql.html +++ b/docs/manual/CoreTasks/sql.html @@ -276,7 +276,7 @@ truncate table some_other_table;
-

Copyright © 2001 Apache Software Foundation. All rights +

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

diff --git a/docs/manual/CoreTypes/fileset.html b/docs/manual/CoreTypes/fileset.html index cc58b338d..b5b523473 100644 --- a/docs/manual/CoreTypes/fileset.html +++ b/docs/manual/CoreTypes/fileset.html @@ -100,7 +100,7 @@ a PatternSet that can be referenced in other same patterns as the above example.

-

Copyright © 2001,2002 Apache Software Foundation. +

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

diff --git a/docs/manual/OptionalTasks/perforce.html b/docs/manual/OptionalTasks/perforce.html index dc145dae7..4ffac8028 100644 --- a/docs/manual/OptionalTasks/perforce.html +++ b/docs/manual/OptionalTasks/perforce.html @@ -571,7 +571,7 @@ and submit
-

Copyright © 2001 Apache Software Foundation. All rights +

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

diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java index 86eca19b2..edc08717f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java @@ -1,9 +1,55 @@ /* - * Copyright (C) The Apache Software Foundation. All rights reserved. + * The Apache Software License, Version 1.1 * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. + * Copyright (c) 2002 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, if + * any, must include the following acknowlegement: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowlegement may appear in the software itself, + * if and wherever such third-party acknowlegements normally appear. + * + * 4. The names "The Jakarta Project", "Ant", and "Apache Software + * Foundation" must not be used to endorse or promote products derived + * from this software without prior written permission. For written + * permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache" + * nor may "Apache" appear in their names without prior written + * permission of the Apache Group. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . */ package org.apache.tools.ant.taskdefs.cvslib; diff --git a/src/script/ant.bat b/src/script/ant.bat index 6562bbbcc..8c261ad53 100755 --- a/src/script/ant.bat +++ b/src/script/ant.bat @@ -1,6 +1,6 @@ @echo off -REM Copyright (c) 2001 The Apache Software Foundation. All rights +REM Copyright (c) 2001-2002 The Apache Software Foundation. All rights REM reserved. if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"