cvs commit: jakarta-tomcat-4.0/tester/web/WEB-INF/cgi test-cgi.pl

2002-05-30 Thread craigmcc 

craigmcc02/05/30 09:36:40

  Modified:tester/web/WEB-INF/cgi Tag: tomcat_40_branch test-cgi.pl
  Log:
  Replace the Sun license that was mistakenly left on the original commit.
  This file has been contributed to the Apache Software Foundation.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.1.2.2   +56 -16jakarta-tomcat-4.0/tester/web/WEB-INF/cgi/test-cgi.pl
  
  Index: test-cgi.pl
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/cgi/test-cgi.pl,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- test-cgi.pl   26 Mar 2002 14:18:43 -  1.1.2.1
  +++ test-cgi.pl   30 May 2002 16:36:40 -  1.1.2.2
  @@ -1,21 +1,61 @@
   #!/usr/local/bin/perl
   #
  -# @(#)test-cgi.pl1.2 98/05/28
  -#
  -# Copyright (c) 1996-1998 Sun Microsystems, Inc. All Rights Reserved.
  -#
  -# Permission to use, copy, modify, and distribute this software
  -# and its documentation for NON-COMMERCIAL purposes and without
  -# fee is hereby granted provided that this copyright notice
  -# appears in all copies. Please refer to the file "copyright.html"
  -# for further important copyright and licensing information.
  -#
  -# SUN MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF
  -# THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
  -# TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
  -# PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SUN SHALL NOT BE LIABLE FOR
  -# ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
  -# DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
  +# = *
  +#   *
  +# The Apache Software License,  Version 1.1 *
  +#   *
  +# Copyright (c) 1999, 2000, 2001  The Apache Software Foundation.   *
  +#   All rights reserved.*
  +#   *
  +# = *
  +#   *
  +# Redistribution and use in source and binary forms,  with or without modi- *
  +# fication, are permitted provided that the following conditions are met:   *
  +#   *
  +# 1. Redistributions of source code  must retain the above copyright notice *
  +#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 ."  *
  +#   *
  +#Alternately, this acknowlegement may appear in the software itself, if *
  +#and wherever such third-party acknowlegements normally appear. *
  +#   *
  +# 4. The names  "The  Jakarta  Project",  "Tomcat",  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 <[EMAIL PROTECTED]>.*
  +#   *
  +# 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 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

cvs commit: jakarta-tomcat-4.0/tester/web/WEB-INF/cgi test-cgi.pl

2002-05-30 Thread craigmcc 

craigmcc02/05/30 09:35:15

  Modified:tester/web/WEB-INF/cgi test-cgi.pl
  Log:
  Remove Sun license that was mistakenly left on the initial commit.
  This file has been contributed to the Apache Software Foundation.
  
  Revision  ChangesPath
  1.2   +57 -17jakarta-tomcat-4.0/tester/web/WEB-INF/cgi/test-cgi.pl
  
  Index: test-cgi.pl
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/cgi/test-cgi.pl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- test-cgi.pl   1 Jun 2001 00:24:21 -   1.1
  +++ test-cgi.pl   30 May 2002 16:35:15 -  1.2
  @@ -1,21 +1,61 @@
   #!/usr/local/bin/perl
   #
  -# @(#)test-cgi.pl1.2 98/05/28
  -#
  -# Copyright (c) 1996-1998 Sun Microsystems, Inc. All Rights Reserved.
  -#
  -# Permission to use, copy, modify, and distribute this software
  -# and its documentation for NON-COMMERCIAL purposes and without
  -# fee is hereby granted provided that this copyright notice
  -# appears in all copies. Please refer to the file "copyright.html"
  -# for further important copyright and licensing information.
  -#
  -# SUN MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF
  -# THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
  -# TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
  -# PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SUN SHALL NOT BE LIABLE FOR
  -# ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
  -# DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
  +# = *
  +#   *
  +# The Apache Software License,  Version 1.1 *
  +#   *
  +# Copyright (c) 1999, 2000, 2001  The Apache Software Foundation.   *
  +#   All rights reserved.*
  +#   *
  +# = *
  +#   *
  +# Redistribution and use in source and binary forms,  with or without modi- *
  +# fication, are permitted provided that the following conditions are met:   *
  +#   *
  +# 1. Redistributions of source code  must retain the above copyright notice *
  +#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 ."  *
  +#   *
  +#Alternately, this acknowlegement may appear in the software itself, if *
  +#and wherever such third-party acknowlegements normally appear. *
  +#   *
  +# 4. The names  "The  Jakarta  Project",  "Tomcat",  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 <[EMAIL PROTECTED]>.*
  +#   *
  +# 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 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