cvs commit: jakarta-tomcat-jasper LICENSE
markt 2004/08/25 14:16:08 Modified:.Tag: tomcat_4_branch LICENSE Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath No revision No revision 1.1.1.1.2.2 +205 -51 jakarta-tomcat-jasper/LICENSE Index: LICENSE === RCS file: /home/cvs/jakarta-tomcat-jasper/LICENSE,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- LICENSE 24 Dec 2003 19:53:05 - 1.1.1.1.2.1 +++ LICENSE 25 Aug 2004 21:16:08 - 1.1.1.1.2.2 @@ -1,53 +1,207 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + control means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + You (or Your) shall mean an individual or Legal Entity + exercising permissions granted by this License. + + Source form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + Object form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + Work shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + Derivative Works shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + Contribution shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, submitted + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as Not a Contribution. + + Contributor shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free,
cvs commit: jakarta-tomcat-jasper LICENSE
markt 2004/08/25 14:46:22 Modified:.Tag: tomcat_4_branch LICENSE Log: Align license on TC4 branch with one on HEAD Revision ChangesPath No revision No revision 1.1.1.1.2.3 +0 -13 jakarta-tomcat-jasper/LICENSE Index: LICENSE === RCS file: /home/cvs/jakarta-tomcat-jasper/LICENSE,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- LICENSE 25 Aug 2004 21:16:08 - 1.1.1.1.2.2 +++ LICENSE 25 Aug 2004 21:46:21 - 1.1.1.1.2.3 @@ -200,16 +200,3 @@ 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. - -/* = * - * * - * This software consists of voluntary contributions made by many indivi- * - * duals on behalf of the Apache Software Foundation. For more information * - * on the Apache Software Foundation, please see http://www.apache.org/. * - * * - * = */ - -/* CVS information: $Revision$ $Date$ - * $Source$ - * $Author$ - */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper LICENSE
luehe 2004/03/17 11:30:40 Modified:.LICENSE Log: Upgrade to Apache License 2.0 Revision ChangesPath 1.2 +202 -61 jakarta-tomcat-jasper/LICENSE Index: LICENSE === RCS file: /home/cvs/jakarta-tomcat-jasper/LICENSE,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LICENSE 8 May 2001 02:09:16 - 1.1 +++ LICENSE 17 Mar 2004 19:30:40 - 1.2 @@ -1,61 +1,202 @@ -/* = * - * * - * 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 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, 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 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 indivi- * - * duals on behalf of the Apache Software Foundation. For more information * - * on the Apache Software Foundation, please see http://www.apache.org/. * - *
cvs commit: jakarta-tomcat-jasper LICENSE
markt 2003/12/24 11:53:05 Modified:.Tag: tomcat_4_branch LICENSE Log: - Fix bug10286. - The word 'notice' is incorrectly repeated in condition 1. It appears once at the end of the first line and is immediately repeated at the start of the second. This patch removes the repeated word. - Reported by Kevin HaleBoyes. - Reviewed by Rodney Waldhoff. Revision ChangesPath No revision No revision 1.1.1.1.2.1 +5 -5 jakarta-tomcat-jasper/LICENSE Index: LICENSE === RCS file: /home/cvs/jakarta-tomcat-jasper/LICENSE,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- LICENSE 8 May 2001 02:09:16 - 1.1.1.1 +++ LICENSE 24 Dec 2003 19:53:05 - 1.1.1.1.2.1 @@ -10,8 +10,8 @@ * 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. * + * 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 * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
