Author: chirino
Date: Tue Aug 8 09:54:48 2006
New Revision: 429731
URL: http://svn.apache.org/viewvc?rev=429731&view=rev
Log:
Adding derby NOTICEs to our notices
Modified:
incubator/activemq/trunk/assembly/src/release/NOTICE.txt
Modified: incubator/activemq/trunk/assembly/src/release/NOTICE.txt
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/NOTICE.txt?rev=429731&r1=429730&r2=429731&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/NOTICE.txt (original)
+++ incubator/activemq/trunk/assembly/src/release/NOTICE.txt Tue Aug 8
09:54:48 2006
@@ -4,8 +4,22 @@
== in this case for the Apache ActiveMQ distribution. ==
=========================================================================
+ Apache ActiveMQ
+ Copyright 2005-2006 The Apache Software Foundation
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
+ Portions of Derby were orginally 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 portion of the functionTests under 'nist' was originally
+ developed by the National Institute of Standards and Technology (NIST),
+ an agency of the United States Department of Commerce, and adapted by
+ International Business Machines Corporation in accordance with the NIST
+ Software Acknowledgment and Redistribution document at
+ http://www.itl.nist.gov/div897/ctg/sql_form.htm
+
