lenya/src/webapp/lenya/pubs/docs-new/content/xdocs/project license.xml,1.1,1.2
Andreas Hartmann <[email protected]> Wed, 21 May 2003 11:00:06 +0200
| Newsgroups | gmane.comp.cms.wyona.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /repository/lenya/src/webapp/lenya/pubs/docs-new/content/xdocs/project
In directory erbium:/tmp/cvs-serv29197/src/webapp/lenya/pubs/docs-new/content/xdocs/project
Modified Files:
license.xml
Log Message:
changed license to ASL
Index: license.xml
===================================================================
RCS file: /repository/lenya/src/webapp/lenya/pubs/docs-new/content/xdocs/project/license.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** license.xml 5 May 2003 10:34:56 -0000 1.1
--- license.xml 21 May 2003 09:00:04 -0000 1.2
***************
*** 12,56 ****
</header>
<body>
! <section><title>The Apache Software License</title>
! <p>Copyright (c) 2002 lenya. All rights reserved.</p>
! <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided
! that the following conditions are met:</p>
! <ul>
! <li>Redistributions of source code must retain the above copyright notice, this list of conditions and the
! following disclaimer.
! </li>
! <li>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.
! </li>
! <li>All advertising materials mentioning features or use of this software must display the following acknowledgment:
! "This product includes software developed by lenya (<link href="http://www.lenya.org">http://www.lenya.org</link>)"
! </li>
! <li>The name "lenya" must not be used to endorse or promote products derived from this software without prior
! written permission. For written permission, please contact <link href="mailto:[email protected]">[email protected]</link>
! </li>
! <li>Products derived from this software may not be called "lenya" nor may "lenya" appear in their names without
! prior written permission of lenya.
! </li>
! <li>Redistributions of any form whatsoever must retain the following acknowledgment: "This product includes
! software developed by lenya (<link href="http://www.lenya.org">http://www.lenya.org</link>)"
! </li>
! </ul>
! <p>THIS SOFTWARE IS PROVIDED BY lenya "AS IS" WITHOUT ANY
! WARRANTY EXPRESS OR IMPLIED, INCLUDING THE WARRANTY
! OF NON-INFRINGEMENT AND THE IMPLIED WARRANTIES OF
! MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
! lenya WILL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY
! YOU AS A RESULT OF USING THIS SOFTWARE. IN NO EVENT WILL
! lenya BE LIABLE FOR ANY SPECIAL, INDIRECT OR
! CONSEQUENTIAL DAMAGES OR LOST PROFITS EVEN IF lenya
! HAS BEEN ADVISED OF THE POSSIBILITY OF THEIR OCCURRENCE.
! lenya WILL NOT BE LIABLE FOR ANY THIRD PARTY CLAIMS
! AGAINST YOU.
! </p>
! <p>
Lenya includes software developed by the <link href="http://www.apache.org">Apache Software Foundation</link>,
! <link href="http://www.w3c.org">W3C</link>, <link href="http://www.dom4j.org">DOM4J Project</link>,
! <link href="http://www.bitfluxeditor.org">BitfluxEditor</link> and <link href="http://www.xopus.org">Xopus</link>.
! </p>
</section>
</body>
--- 12,97 ----
</header>
<body>
! <section><title>The Apache Software License, Version 1.1</title>
! <p>Copyright © 2000 The Apache Software Foundation. All rights reserved.</p>
!
! <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided
!
! that the following conditions are met:</p>
!
! <ol>
!
! <li><p>Redistributions of source code must retain the above copyright
! notice, this list of conditions and the following disclaimer.
! </p>
! <p/>
! </li>
!
! <li><p>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.
! </p>
! <p/>
! </li>
!
! <li><p>The end-user documentation included with the redistribution,
! if any, must include the following acknowledgment:</p>
! <p>"This product includes software developed by the
! Apache Software Foundation (http://www.apache.org/)."</p>
! <p>
! Alternately, this acknowledgment may appear in the software itself,
! if and wherever such third-party acknowledgments normally appear.
! </p>
! <p/>
! </li>
!
! <li>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 at apache.org.
! <p/>
! </li>
!
! <li>Products derived from this software may not be called "Apache",
! nor may "Apache" appear in their name, without prior written
! permission of the Apache Software Foundation.
! </li>
!
! </ol>
!
! <p>
! 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.
! </p>
!
! <p>
! 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
! <a href="http://www.apache.org">http://www.apache.org</a>.
! </p>
! <p>
! Portions of this software are based upon public domain software
! originally written at the National Center for Supercomputing Applications,
! University of Illinois, Urbana-Champaign.
! </p>
!
! <p>
Lenya includes software developed by the <link href="http://www.apache.org">Apache Software Foundation</link>,
! <link href="http://www.w3c.org">W3C</link>, <link href="http://www.dom4j.org">DOM4J Project</link>,
! <link href="http://www.bitfluxeditor.org">BitfluxEditor</link>, <link href="http://www.xopus.org">Xopus</link>,
! and <link href="http://www-2.cs.cmu.edu/~rcm/websphinx/">WebSPHINX</link>.
! </p>
!
</section>
</body>