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: r666162 - /jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt
Date: Tue, 10 Jun 2008 15:38:48 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
Message-Id: <20080610153848.392A223889C1@eris.apache.org>

Author: jukka
Date: Tue Jun 10 08:38:47 2008
New Revision: 666162

URL: http://svn.apache.org/viewvc?rev=666162&view=rev
Log:
JCR-1630: Missing third party notices and license info
    - webapp bundles Derby with IBM code
      (note that the "nist" notice is not needed as the
       bundled derby jar does not contain unit tests)

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

Modified: jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt?rev=666162&r1=666161&r2=666162&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/NOTICE.txt Tue Jun 10 08:38:47 2008
@@ -11,3 +11,15 @@
 Copyright (c) 2002 World Wide Web Consortium, (Massachusetts Institute of
 Technology, European Research Consortium for Informatics and Mathematics,
 Keio University).
+
+Portions of Derby were originally developed by International Business
+Machines Corporation and are licensed to the Apache Software Foundation
+under the "Software Grant and Corporate Contribution License Agreement",
+informally known as the "Derby CLA". The following copyright notice(s) were
+affixed to portions of the code with which this file is now or was at one
+time distributed and are placed here unaltered.
+
+    (C) Copyright 1997,2004 International Business Machines Corporation.
+    All rights reserved.
+
+    (C) Copyright IBM Corp. 2003.