Author: scottbw
Date: Fri Feb 10 13:04:03 2012
New Revision: 1242754
URL: http://svn.apache.org/viewvc?rev=1242754&view=rev
Log:
Included NOTICE from both OpenJPA and Derby
Modified:
incubator/wookie/trunk/etc/release/standalone/NOTICE
incubator/wookie/trunk/etc/release/war/NOTICE
Modified: incubator/wookie/trunk/etc/release/standalone/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/release/standalone/NOTICE?rev=1242754&r1=1242753&r2=1242754&view=diff
==============================================================================
--- incubator/wookie/trunk/etc/release/standalone/NOTICE (original)
+++ incubator/wookie/trunk/etc/release/standalone/NOTICE Fri Feb 10 13:04:03
2012
@@ -16,7 +16,50 @@ http://glassfish.java.net/public/CDDLv1.
This software contains unmodified binary redistributions of software (mail)
developed by
Sun Microsystems, Inc. (https://glassfish.dev.java.net/javaee5/mail), which is
licensed under the CDDL 1.0.
An original copy of the license can be found at
https://glassfish.dev.java.net/public/CDDL+GPL.html
-
+
+This software contains unmodified binary redistributions of software (OpenJPA)
developed by
+The Apache Software Foundation (http://www.apache.org/):
+
+==============================================================
+Apache OpenJPA binary assembly
+Copyright 2006-2010 The Apache Software Foundation
+==============================================================
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+The OpenJPA binary assembly and openjpa-all includes software developed by the:
+ Apache Commons Beanutils project
+ Apache Commons Collections project
+ Apache Commons DBCP project
+ Apache Commons Lang project
+ Apache Commons Logging project
+ Apache Commons Pool project
+ Apache Derby project
+ Apache Geronimo project
+ Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
+ Apache Incubtor - Bean Validation project
+ SERP project
+
+
+The following copyright notice(s) were affixed to portions of this code
+with which this file is now or was at one time distributed.
+
+OpenJPA includes software developed by the SERP project
+Copyright (c) 2002-2006, A. Abram White. All rights reserved.
+
+OpenJPA includes the persistence and orm schemas from the JPA specifications.
+Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
+OpenJPA elects to include this software in this distribution under the
+CDDL license. You can obtain a copy of the License at:
+ https://glassfish.dev.java.net/public/CDDL+GPL.html
+The source code is available at:
+ https://glassfish.dev.java.net/source/browse/glassfish/
+
+OpenJPA includes software written by Miroslav Nachev.
+
+OpenJPA uses test code written by Charles Tillman.
+
========
This software contains unmodified binary redistributions of software (Jetty)
developed by Mort Bay
@@ -44,3 +87,36 @@ Sun Microsystems, Inc. and portions Copy
Some portions of the code are Copyright:
2006 Tim Vernum
1999 Jason Gilbert.
+
+
+This software contains unmodified binary redistributions of software (Derby)
developed by
+The Apache Software Foundation (http://www.apache.org/):
+
+==============================================================
+Apache Derby
+Copyright 2004-2008 The Apache Software Foundation
+==============================================================
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+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.
+
+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
+
Modified: incubator/wookie/trunk/etc/release/war/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/release/war/NOTICE?rev=1242754&r1=1242753&r2=1242754&view=diff
==============================================================================
--- incubator/wookie/trunk/etc/release/war/NOTICE (original)
+++ incubator/wookie/trunk/etc/release/war/NOTICE Fri Feb 10 13:04:03 2012
@@ -15,4 +15,47 @@ http://glassfish.java.net/public/CDDLv1.
This software contains unmodified binary redistributions of software (mail)
developed by
Sun Microsystems, Inc. (https://glassfish.dev.java.net/javaee5/mail), which is
licensed under the CDDL 1.0.
-An original copy of the license can be found at
https://glassfish.dev.java.net/public/CDDL+GPL.html
\ No newline at end of file
+An original copy of the license can be found at
https://glassfish.dev.java.net/public/CDDL+GPL.html
+
+This software contains unmodified binary redistributions of software (OpenJPA)
developed by
+The Apache Software Foundation (http://www.apache.org/):
+
+==============================================================
+Apache OpenJPA binary assembly
+Copyright 2006-2010 The Apache Software Foundation
+==============================================================
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+The OpenJPA binary assembly and openjpa-all includes software developed by the:
+ Apache Commons Beanutils project
+ Apache Commons Collections project
+ Apache Commons DBCP project
+ Apache Commons Lang project
+ Apache Commons Logging project
+ Apache Commons Pool project
+ Apache Derby project
+ Apache Geronimo project
+ Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
+ Apache Incubtor - Bean Validation project
+ SERP project
+
+
+The following copyright notice(s) were affixed to portions of this code
+with which this file is now or was at one time distributed.
+
+OpenJPA includes software developed by the SERP project
+Copyright (c) 2002-2006, A. Abram White. All rights reserved.
+
+OpenJPA includes the persistence and orm schemas from the JPA specifications.
+Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
+OpenJPA elects to include this software in this distribution under the
+CDDL license. You can obtain a copy of the License at:
+ https://glassfish.dev.java.net/public/CDDL+GPL.html
+The source code is available at:
+ https://glassfish.dev.java.net/source/browse/glassfish/
+
+OpenJPA includes software written by Miroslav Nachev.
+
+OpenJPA uses test code written by Charles Tillman.
