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

[ju...@apache.org]

Author: jukka
Date: Tue Jun 10 11:34:36 2008
New Revision: 666263

URL: http://svn.apache.org/viewvc?rev=666263&view=rev
Log:
JCR-1630: Missing third party notices and license info
    - webapp bundles the CyberNeko HTML parser

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=666263&r1=666262&r2=666263&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt Tue Jun 10 11:34:36 2008
@@ -344,3 +344,52 @@
     LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+CyberNeko HTML Parser library (nekohtml-0.9.4.jar)
+
+    The CyberNeko Software License, Version 1.0
+
+    (C) Copyright 2002-2005, Andy Clark.  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 Andy Clark."
+       Alternately, this acknowledgment may appear in the software itself,
+       if and wherever such third-party acknowledgments normally appear.
+
+    4. The names "CyberNeko" and "NekoHTML" must not be used to endorse
+       or promote products derived from this software without prior
+       written permission. For written permission, please contact
+       andyc@cyberneko.net.
+
+    5. Products derived from this software may not be called "CyberNeko",
+       nor may "CyberNeko" appear in their name, without prior written
+       permission of the author.
+
+    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 AUTHOR OR OTHER 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 license is based on the Apache Software License, version 1.1.
\ No newline at end of file

Modified: jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt?rev=666263&r1=666262&r2=666263&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt Tue Jun 10 11:34:36 2008
@@ -28,3 +28,5 @@
 JempBox projects. Copyright (c) 2003-2005, www.pdfbox.org and www.fontbox.org.
 
 This software contains SLF4J libraries. Copyright (c) 2004-2008 QOS.ch
+
+CyberNeko HTML Parser (C) Copyright 2002-2005, Andy Clark.