Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@jackrabbit.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r666294 - in /jackrabbit/trunk/jackrabbit-webapp:
 LICENSE.txt
 NOTICE.txt
Date: Tue, 10 Jun 2008 19:39:38 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
Message-Id: <20080610193938.3B0D1238896D@eris.apache.org>

Author: jukka
Date: Tue Jun 10 12:39:37 2008
New Revision: 666294

URL: http://svn.apache.org/viewvc?rev=666294&view=rev
Log:
JCR-1630: Missing third party notices and license info
    - webapp bundles concurrent-1.3.4.jar

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=666294&r1=666293&r2=666294&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/LICENSE.txt Tue Jun 10 12:39:37 2008
@@ -475,3 +475,61 @@
 
     David Megginson, david@megginson.com
     2000-05-05
+
+Concurrent library (concurrent-1.3.4.jar)
+
+    http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
+
+    All classes are released to the public domain and may be used for any
+    purpose whatsoever without permission or acknowledgment. Portions of
+    the CopyOnWriteArrayList and ConcurrentReaderHashMap classes are adapted
+    from Sun JDK source code. These are copyright of Sun Microsystems, Inc,
+    and are used with their kind permission, as described in this license:
+
+    TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. TO DOUG LEA
+
+    Whereas Doug Lea desires to utlized certain Java Software technologies
+    in the util.concurrent technology; and Whereas Sun Microsystems, Inc.
+    ("Sun") desires that Doug Lea utilize certain Java Software technologies
+    in the util.concurrent technology;
+
+    Therefore the parties agree as follows, effective May 31, 2002:
+
+    "Java Software technologies" means
+
+        classes/java/util/ArrayList.java, and
+        classes/java/util/HashMap.java.
+
+    The Java Software technologies are Copyright (c) 1994-2000 Sun
+    Microsystems, Inc. All rights reserved.
+
+    Sun hereby grants Doug Lea a non-exclusive, worldwide, non-transferrable
+    license to use, reproduce, create derivate works of, and distribute the
+    Java Software and derivative works thereof in source and binary forms
+    as part of a larger work, and to sublicense the right to use, reproduce
+    and distribute the Java Software and Doug Lea's derivative works as the
+    part of larger works through multiple tiers of sublicensees provided that
+    the following conditions are met:
+
+    -Neither the name of or trademarks of Sun may be used to endorse or
+    promote products including or derived from the Java Software technology
+    without specific prior written permission; and
+    -Redistributions of source or binary code must contain the above
+    copyright notice, this notice and and the following disclaimers:
+
+    This software is provided "AS IS," without a warranty of any kind.
+    ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+    INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+    PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES
+    SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR DISTRIBUTING
+    THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC.
+    OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+    DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
+    HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
+    THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
+    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+    You acknowledge that Software is not designed,licensed or intended for
+    use in the design, construction, operation or maintenance of any nuclear
+    facility.

Modified: jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt?rev=666294&r1=666293&r2=666294&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt Tue Jun 10 12:39:37 2008
@@ -38,3 +38,4 @@
   - voluntary contributions made by Paul Eng on behalf of the 
     Apache Software Foundation that were originally developed at iClick, Inc.,
     software copyright (c) 1999.
+  - software copyright (c) 1994-2000 Sun Microsystems, Inc.