svn commit: r666161 - in /jackrabbit/trunk/jackrabbit-webapp: LICENSE.txt NOTICE.txt

[ju...@apache.org]

Author: jukka
Date: Tue Jun 10 08:36:58 2008
New Revision: 666161

URL: http://svn.apache.org/viewvc?rev=666161&view=rev
Log:
JCR-1630: Missing third party notices and license info
    - webapp bundles jackrabbit-spi-commons with W3C code

Modified:
    jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt
    jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt

Modified: jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt?rev=666161&r1=666160&r2=666161&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt Tue Jun 10 08:36:58 2008
@@ -202,38 +202,62 @@
    limitations under the License.
 
 
-
 APACHE JACKRABBIT SUBCOMPONENTS:
 
 Apache Jackrabbit includes an XPath parser subcomponent with separate
-copyright notices and license terms. Your use of the source code for
-this subcomponent is subject to the terms and conditions of the
-following licenses.
-
-<!--
- * Copyright (c) 2002 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
--->
-
-<!--
-Copyright (c) 2002 W3C(r) (http://www.w3.org/) (MIT (http://www.lcs.mit.edu/), 
-INRIA (http://www.inria.fr/), Keio (http://www.keio.ac.jp/)), 
-All Rights Reserved.
-See http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Copyright.
-W3C liability 
-(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#Legal_Disclaimer), 
-trademark 
-(http://www.w3.org/Consortium/Legal/ipr-notice-20000612#W3C_Trademarks), 
-document use 
-(http://www.w3.org/Consortium/Legal/copyright-documents-19990405), 
-and software licensing rules 
-(http://www.w3.org/Consortium/Legal/copyright-software-19980720) 
-apply.
--->
+copyright notices and license terms. Your use of this subcomponent is
+subject to the terms and conditions of the following licenses.
+
+    XPath 2.0/XQuery 1.0 Parser:
+    http://www.w3.org/2002/11/xquery-xpath-applets/xgrammar.zip
+
+    Copyright (C) 2002 World Wide Web Consortium, (Massachusetts Institute of
+    Technology, European Research Consortium for Informatics and Mathematics,
+    Keio University). All Rights Reserved. This work is distributed under the
+    W3C(R) Software License in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+    or FITNESS FOR A PARTICULAR PURPOSE.
+
+    W3C(R) SOFTWARE NOTICE AND LICENSE
+    http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+    This work (and included software, documentation such as READMEs, or
+    other related items) is being provided by the copyright holders under
+    the following license. By obtaining, using and/or copying this work,
+    you (the licensee) agree that you have read, understood, and will comply
+    with the following terms and conditions.
+
+    Permission to copy, modify, and distribute this software and its
+    documentation, with or without modification, for any purpose and
+    without fee or royalty is hereby granted, provided that you include
+    the following on ALL copies of the software and documentation or
+    portions thereof, including modifications:
+
+       1. The full text of this NOTICE in a location viewable to users
+          of the redistributed or derivative work.
+
+       2. Any pre-existing intellectual property disclaimers, notices,
+          or terms and conditions. If none exist, the W3C Software Short
+          Notice should be included (hypertext is preferred, text is
+          permitted) within the body of any redistributed or derivative code.
+
+       3. Notice of any changes or modifications to the files, including
+          the date changes were made. (We recommend you provide URIs to the
+          location from which the code is derived.)
+
+    THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+    HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+    INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+    FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+    DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+    TRADEMARKS OR OTHER RIGHTS.
+
+    COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
+    OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+    DOCUMENTATION.
+
+    The name and trademarks of copyright holders may NOT be used in
+    advertising or publicity pertaining to the software without specific,
+    written prior permission. Title to copyright in this software and
+    any associated documentation will at all times remain with
+    copyright holders.

Modified: jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt?rev=666161&r1=666160&r2=666161&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt Tue Jun 10 08:36:58 2008
@@ -7,9 +7,7 @@
 Based on source code originally developed by
 Day Software (http://www.day.com/).
 
-This product also includes:
-
-- XPath grammar and parser from the W3C
-  Copyright (c) 2002 World Wide Web Consortium,
-  (Massachusetts Institute of Technology, Institut National de
-  Recherche en Informatique et en Automatique, Keio University).
+This software contains an XPath parser from the World Wide Web Consortium.
+Copyright (c) 2002 World Wide Web Consortium, (Massachusetts Institute of
+Technology, European Research Consortium for Informatics and Mathematics,
+Keio University).