You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by gr...@apache.org on 2004/02/16 20:49:16 UTC
cvs commit: httpd-python/test httpdconf.py test.py
grisha 2004/02/16 11:49:16
Modified: test httpdconf.py test.py
Log:
More of new license
Revision Changes Path
1.10 +14 -53 httpd-python/test/httpdconf.py
Index: httpdconf.py
===================================================================
RCS file: /home/cvs/httpd-python/test/httpdconf.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- httpdconf.py 21 Oct 2003 21:06:50 -0000 1.9
+++ httpdconf.py 16 Feb 2004 19:49:15 -0000 1.10
@@ -1,56 +1,17 @@
- # ====================================================================
- # The Apache Software License, Version 1.1
#
- # Copyright (c) 2000-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 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" 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",
- # "mod_python", or "modpython", nor may these terms 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 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.
#
# $Id$
#
1.41 +14 -53 httpd-python/test/test.py
Index: test.py
===================================================================
RCS file: /home/cvs/httpd-python/test/test.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- test.py 21 Oct 2003 21:06:50 -0000 1.40
+++ test.py 16 Feb 2004 19:49:15 -0000 1.41
@@ -1,56 +1,17 @@
- # ====================================================================
- # The Apache Software License, Version 1.1
#
- # Copyright (c) 2000-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 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" 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",
- # "mod_python", or "modpython", nor may these terms 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 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.
#
# $Id$
#