seade       2004/11/25 16:11:13

  Modified:    src/macros Tag: TURBINE_2_3_BRANCH TurbineMacros.vm
  Log:
  ASL 2.0
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.3.2.1   +16 -53    jakarta-turbine-2/src/macros/TurbineMacros.vm
  
  Index: TurbineMacros.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/macros/TurbineMacros.vm,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- TurbineMacros.vm  2 Sep 2003 04:39:30 -0000       1.3
  +++ TurbineMacros.vm  26 Nov 2004 00:11:12 -0000      1.3.2.1
  @@ -1,55 +1,18 @@
  -## ====================================================================
  -##  The Apache Software License, Version 1.1
  -## 
  -##  Copyright (c) 2001-2003 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 acknowledgment:
  -##        "This product includes software developed by the
  -##         Apache Software Foundation (http://www.apache.org/)."
  -##     Alternately, this acknowledgment may appear in the software itself,
  -##     if and wherever such third-party acknowledgments normally appear.
  -## 
  -##  4. The names "Apache" and "Apache Software Foundation" and
  -##     "Apache Turbine" must not be used to endorse or promote products
  -##     derived from this software without prior written permission. For
  -##     written permission, please contact [EMAIL PROTECTED]
  -## 
  -##  5. Products derived from this software may not be called "Apache",
  -##     "Apache Turbine", nor may "Apache" appear in their name, without
  -##     prior written permission of the Apache Software Foundation.
  -## 
  -##  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/>.
  +## -------------------------------------------------------------------
  +## Copyright 2001-2004 The 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.
  +## -------------------------------------------------------------------
   ##
   ## @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
   ## @version $Id$
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to