ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/etc ant-update.xsl
Date Wed, 04 Feb 2004 22:16:01 GMT
antoine     2004/02/04 14:16:01

  Modified:    src/script Tag: ANT_16_BRANCH ant ant.bat
               src/etc  Tag: ANT_16_BRANCH ant-update.xsl
  Log:
  Merge into ANT_16_BRANCH
  Copyright notice
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.38.2.4  +13 -2     ant/src/script/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/ant/src/script/ant,v
  retrieving revision 1.38.2.3
  retrieving revision 1.38.2.4
  diff -u -r1.38.2.3 -r1.38.2.4
  --- ant	2 Oct 2003 04:58:15 -0000	1.38.2.3
  +++ ant	4 Feb 2004 22:16:01 -0000	1.38.2.4
  @@ -1,7 +1,18 @@
   #! /bin/sh
   
  -#   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  -#   reserved.
  +#   Copyright 2001-2004 Apache Software Foundation
  +#
  +#   Licensed under the Apache License, Version 2.0 (the "License");
  +#   you may not use this file except in compliance with the License.
  +#   You may obtain a copy of the License at
  +#
  +#       http://www.apache.org/licenses/LICENSE-2.0
  +#
  +#   Unless required by applicable law or agreed to in writing, software
  +#   distributed under the License is distributed on an "AS IS" BASIS,
  +#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +#   See the License for the specific language governing permissions and
  +#   limitations under the License.
   
   # load system-wide ant configuration
   if [ -f "/etc/ant.conf" ] ; then
  
  
  
  1.32.2.3  +13 -2     ant/src/script/ant.bat
  
  Index: ant.bat
  ===================================================================
  RCS file: /home/cvs/ant/src/script/ant.bat,v
  retrieving revision 1.32.2.2
  retrieving revision 1.32.2.3
  diff -u -r1.32.2.2 -r1.32.2.3
  --- ant.bat	24 Sep 2003 14:32:10 -0000	1.32.2.2
  +++ ant.bat	4 Feb 2004 22:16:01 -0000	1.32.2.3
  @@ -1,7 +1,18 @@
   @echo off
   
  -REM   Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  -REM   reserved.
  +REM  Copyright 2001,2004 Apache Software Foundation
  +REM
  +REM  Licensed under the Apache License, Version 2.0 (the "License");
  +REM  you may not use this file except in compliance with the License.
  +REM  You may obtain a copy of the License at
  +REM
  +REM      http://www.apache.org/licenses/LICENSE-2.0
  +REM
  +REM  Unless required by applicable law or agreed to in writing, software
  +REM  distributed under the License is distributed on an "AS IS" BASIS,
  +REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +REM  See the License for the specific language governing permissions and
  +REM  limitations under the License.
   
   if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
   
  
  
  
  No                   revision
  No                   revision
  1.6.2.1   +14 -52    ant/src/etc/ant-update.xsl
  
  Index: ant-update.xsl
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/ant-update.xsl,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- ant-update.xsl	10 Feb 2003 14:13:28 -0000	1.6
  +++ ant-update.xsl	4 Feb 2004 22:16:01 -0000	1.6.2.1
  @@ -1,59 +1,21 @@
   <xsl:stylesheet	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:output method="xml" indent="yes"/>
  -<!--
  - The Apache Software License, Version 1.1
  +  <!--
  +     Copyright 2001-2004 Apache Software Foundation
   
  - Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  - reserved.
  +     Licensed under the Apache License, Version 2.0 (the "License");
  +     you may not use this file except in compliance with the License.
  +     You may obtain a copy of the License at
  +
  +         http://www.apache.org/licenses/LICENSE-2.0
  +
  +     Unless required by applicable law or agreed to in writing, software
  +     distributed under the License is distributed on an "AS IS" BASIS,
  +     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +     See the License for the specific language governing permissions and
  +     limitations under the License.
  +   -->
   
  - 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 "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
  - <http://www.apache.org/>.
  - -->
  - 
   <!--
   
     The purpose have this XSL is to provide a fast way to update a buildfile
  
  
  

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


Mime
View raw message