commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From di...@apache.org
Subject cvs commit: jakarta-commons/docs license.html
Date Mon, 01 Mar 2004 21:24:50 GMT
dirkv       2004/03/01 13:24:50

  Modified:    docs     license.html
  Log:
  Apache License 2.0
  
  Revision  Changes    Path
  1.99      +216 -67   jakarta-commons/docs/license.html
  
  Index: license.html
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/docs/license.html,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- license.html	28 Feb 2004 01:01:13 -0000	1.98
  +++ license.html	1 Mar 2004 21:24:50 -0000	1.99
  @@ -19,7 +19,7 @@
              
                                       
                           
  -            <title>Commons - Apache Software License</title>
  +            <title>Commons - Apache License</title>
           </head>
   
           <body bgcolor="#ffffff" text="#000000" link="#525D76">        
  @@ -94,7 +94,7 @@
                   </ul>
               <p><strong>Components Repository</strong></p>
           <ul>
  -                    <li>    <a href="http://jakarta.apache.org/commons/beanutils/index.html">BeanUtils</a>
  +                    <li>    <a href="http://jakarta.apache.org/commons/beanutils/">BeanUtils</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/betwixt/">Betwixt</a>
   </li>
  @@ -104,15 +104,15 @@
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/collections/">Collections</a>
   </li>
  -                    <li>    <a href="http://jakarta.apache.org/commons/configuration">Configuration</a>
  +                    <li>    <a href="http://jakarta.apache.org/commons/configuration/">Configuration</a>
   </li>
  -                    <li>    <a href="http://jakarta.apache.org/commons/daemon">Daemon</a>
  +                    <li>    <a href="http://jakarta.apache.org/commons/daemon/">Daemon</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/dbcp">DBCP</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/dbutils/">DbUtils</a>
   </li>
  -                    <li>    <a href="http://jakarta.apache.org/commons/digester/index.html">Digester</a>
  +                    <li>    <a href="http://jakarta.apache.org/commons/digester/">Digester</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/discovery/">Discovery</a>
   </li>
  @@ -126,7 +126,7 @@
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/jelly/">Jelly</a>
   </li>
  -                    <li>    <a href="http://jakarta.apache.org/commons/jexl.html">Jexl</a>
  +                    <li>    <a href="http://jakarta.apache.org/commons/jexl/">Jexl</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/jxpath/">JXPath</a>
   </li>
  @@ -136,11 +136,11 @@
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/launcher/">Launcher</a>
   </li>
  -                    <li>    <a href="http://jakarta.apache.org/commons/logging.html">Logging</a>
  +                    <li>    <a href="http://jakarta.apache.org/commons/logging/">Logging</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/math/">Math</a>
   </li>
  -                    <li>    <a href="http://jakarta.apache.org/commons/modeler.html">Modeler</a>
  +                    <li>    <a href="http://jakarta.apache.org/commons/modeler/">Modeler</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/net/">Net</a>
   </li>
  @@ -165,6 +165,8 @@
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/sandbox/convert/">Convert</a>
   </li>
  +                    <li>    <a href="http://jakarta.apache.org/commons/sandbox/email/">Email</a>
  +</li>
                       <li>    <a href="http://jakarta.apache.org/commons/sandbox/events/">Events</a>
   </li>
                       <li>    <a href="http://jakarta.apache.org/commons/sandbox/functor/">Functor</a>
  @@ -222,14 +224,14 @@
                                                                       <table border="0"
cellspacing="0" cellpadding="2" width="100%">
         <tr><td bgcolor="#525D76">
           <font color="#ffffff" face="arial,helvetica,sanserif">
  -          <a name="Apache Software License"><strong>Apache Software License</strong></a>
  +          <a name="Apache License"><strong>Apache License</strong></a>
           </font>
         </td></tr>
         <tr><td>
           <blockquote>
                                       <p>
   All source and documentation of the Commons project is copyrighted by
  -the Apache Software Foundation, and made available under the following license :
  +The Apache Software Foundation, and made available under the following license :
   </p>
                                                       <div align="left">
       <table cellspacing="4" cellpadding="0" border="0">
  @@ -241,62 +243,209 @@
       <tr>
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1"
vspace="0" hspace="0" border="0"/></td>
         <td bgcolor="#ffffff"><pre>
  -/*
  - * ====================================================================
  - * 
  - * 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 acknowledgement:  
  - *       &quot;This product includes software developed by the 
  - *        Apache Software Foundation (http://www.apache.org/).&quot;
  - *    Alternately, this acknowledgement may appear in the software itself,
  - *    if and wherever such third-party acknowledgements normally appear.
  - *
  - * 4. The names &quot;Apache&quot;, &quot;The Jakarta Project&quot;, &quot;Commons&quot;,
and &quot;Apache Software
  - *    Foundation&quot; 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 &quot;Apache&quot;
  - *    nor may &quot;Apache&quot; 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
  - * &lt;http://www.apache.org/&gt;.
  - *
  - */ 
  +
  +                                 Apache License
  +                           Version 2.0, January 2004
  +                        http://www.apache.org/licenses/
  +
  +   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
  +
  +   1. Definitions.
  +
  +      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
  +      and distribution as defined by Sections 1 through 9 of this document.
  +
  +      &quot;Licensor&quot; shall mean the copyright owner or entity authorized
by
  +      the copyright owner that is granting the License.
  +
  +      &quot;Legal Entity&quot; 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,
  +      &quot;control&quot; 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.
  +
  +      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or
Legal Entity
  +      exercising permissions granted by this License.
  +
  +      &quot;Source&quot; form shall mean the preferred form for making modifications,
  +      including but not limited to software source code, documentation
  +      source, and configuration files.
  +
  +      &quot;Object&quot; 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.
  +
  +      &quot;Work&quot; 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).
  +
  +      &quot;Derivative Works&quot; 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.
  +
  +      &quot;Contribution&quot; 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, &quot;submitted&quot;
  +      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 &quot;Not a Contribution.&quot;
  +
  +      &quot;Contributor&quot; 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, irrevocable
  +      (except as stated in this section) patent license to make, have made,
  +      use, offer to sell, sell, import, and otherwise transfer the Work,
  +      where such license applies only to those patent claims licensable
  +      by such Contributor that are necessarily infringed by their
  +      Contribution(s) alone or by combination of their Contribution(s)
  +      with the Work to which such Contribution(s) was submitted. If You
  +      institute patent litigation against any entity (including a
  +      cross-claim or counterclaim in a lawsuit) alleging that the Work
  +      or a Contribution incorporated within the Work constitutes direct
  +      or contributory patent infringement, then any patent licenses
  +      granted to You under this License for that Work shall terminate
  +      as of the date such litigation is filed.
  +
  +   4. Redistribution. You may reproduce and distribute copies of the
  +      Work or Derivative Works thereof in any medium, with or without
  +      modifications, and in Source or Object form, provided that You
  +      meet the following conditions:
  +
  +      (a) You must give any other recipients of the Work or
  +          Derivative Works a copy of this License; and
  +
  +      (b) You must cause any modified files to carry prominent notices
  +          stating that You changed the files; and
  +
  +      (c) You must retain, in the Source form of any Derivative Works
  +          that You distribute, all copyright, patent, trademark, and
  +          attribution notices from the Source form of the Work,
  +          excluding those notices that do not pertain to any part of
  +          the Derivative Works; and
  +
  +      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
  +          distribution, then any Derivative Works that You distribute must
  +          include a readable copy of the attribution notices contained
  +          within such NOTICE file, excluding those notices that do not
  +          pertain to any part of the Derivative Works, in at least one
  +          of the following places: within a NOTICE text file distributed
  +          as part of the Derivative Works; within the Source form or
  +          documentation, if provided along with the Derivative Works; or,
  +          within a display generated by the Derivative Works, if and
  +          wherever such third-party notices normally appear. The contents
  +          of the NOTICE file are for informational purposes only and
  +          do not modify the License. You may add Your own attribution
  +          notices within Derivative Works that You distribute, alongside
  +          or as an addendum to the NOTICE text from the Work, provided
  +          that such additional attribution notices cannot be construed
  +          as modifying the License.
  +
  +      You may add Your own copyright statement to Your modifications and
  +      may provide additional or different license terms and conditions
  +      for use, reproduction, or distribution of Your modifications, or
  +      for any such Derivative Works as a whole, provided Your use,
  +      reproduction, and distribution of the Work otherwise complies with
  +      the conditions stated in this License.
  +
  +   5. Submission of Contributions. Unless You explicitly state otherwise,
  +      any Contribution intentionally submitted for inclusion in the Work
  +      by You to the Licensor shall be under the terms and conditions of
  +      this License, without any additional terms or conditions.
  +      Notwithstanding the above, nothing herein shall supersede or modify
  +      the terms of any separate license agreement you may have executed
  +      with Licensor regarding such Contributions.
  +
  +   6. Trademarks. This License does not grant permission to use the trade
  +      names, trademarks, service marks, or product names of the Licensor,
  +      except as required for reasonable and customary use in describing the
  +      origin of the Work and reproducing the content of the NOTICE file.
  +
  +   7. Disclaimer of Warranty. Unless required by applicable law or
  +      agreed to in writing, Licensor provides the Work (and each
  +      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
  +      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
  +      implied, including, without limitation, any warranties or conditions
  +      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
  +      PARTICULAR PURPOSE. You are solely responsible for determining the
  +      appropriateness of using or redistributing the Work and assume any
  +      risks associated with Your exercise of permissions under this License.
  +
  +   8. Limitation of Liability. In no event and under no legal theory,
  +      whether in tort (including negligence), contract, or otherwise,
  +      unless required by applicable law (such as deliberate and grossly
  +      negligent acts) or agreed to in writing, shall any Contributor be
  +      liable to You for damages, including any direct, indirect, special,
  +      incidental, or consequential damages of any character arising as a
  +      result of this License or out of the use or inability to use the
  +      Work (including but not limited to damages for loss of goodwill,
  +      work stoppage, computer failure or malfunction, or any and all
  +      other commercial damages or losses), even if such Contributor
  +      has been advised of the possibility of such damages.
  +
  +   9. Accepting Warranty or Additional Liability. While redistributing
  +      the Work or Derivative Works thereof, You may choose to offer,
  +      and charge a fee for, acceptance of support, warranty, indemnity,
  +      or other liability obligations and/or rights consistent with this
  +      License. However, in accepting such obligations, You may act only
  +      on Your own behalf and on Your sole responsibility, not on behalf
  +      of any other Contributor, and only if You agree to indemnify,
  +      defend, and hold each Contributor harmless for any liability
  +      incurred by, or claims asserted against, such Contributor by reason
  +      of your accepting any such warranty or additional liability.
  +
  +   END OF TERMS AND CONDITIONS
  +
  +   APPENDIX: How to apply the Apache License to your work.
  +
  +      To apply the Apache License to your work, attach the following
  +      boilerplate notice, with the fields enclosed by brackets &quot;[]&quot;
  +      replaced with your own identifying information. (Don't include
  +      the brackets!)  The text should be enclosed in the appropriate
  +      comment syntax for the file format. We also recommend that a
  +      file or class name and description of purpose be included on the
  +      same &quot;printed page&quot; as the copyright notice for easier
  +      identification within third-party archives.
  +
  +   Copyright [yyyy] [name of copyright owner]
  +
  +   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
  +   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 &quot;AS IS&quot; 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.
  +
    </pre></td>
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1"
vspace="0" hspace="0" border="0"/></td>
       </tr>
  @@ -321,7 +470,7 @@
                   </td></tr>
                   <tr><td colspan="2">
                       <div align="center"><font color="#525D76" size="-1"><em>
  -                    Copyright &#169; 1999-2004, Apache Software Foundation
  +                    Copyright &#169; 1999-2004, The Apache Software Foundation
                       </em></font></div>
                   </td></tr>
               </table>
  
  
  

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


Mime
View raw message