harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r808343 - in /harmony/enhanced: classlib/trunk/LICENSE classlib/trunk/NOTICE trunk/LICENSE trunk/NOTICE
Date Thu, 27 Aug 2009 09:51:51 GMT
Author: hindessm
Date: Thu Aug 27 09:51:51 2009
New Revision: 808343

URL: http://svn.apache.org/viewvc?rev=808343&view=rev
Log:
Moving NOTICE from LICENSE to NOTICE file.

Modified:
    harmony/enhanced/classlib/trunk/LICENSE
    harmony/enhanced/classlib/trunk/NOTICE
    harmony/enhanced/trunk/LICENSE
    harmony/enhanced/trunk/NOTICE

Modified: harmony/enhanced/classlib/trunk/LICENSE
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/LICENSE?rev=808343&r1=808342&r2=808343&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/LICENSE (original)
+++ harmony/enhanced/classlib/trunk/LICENSE Thu Aug 27 09:51:51 2009
@@ -1172,41 +1172,3 @@
 
 ===============================================================================
 ===============================================================================
-
-
-
-This distribution may contain a jar file based on Apache Derby which
-is covered by the Apache License and for which the following notice
-applies:
-
-Apache Derby
-Copyright 2004-2007 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: harmony/enhanced/classlib/trunk/NOTICE
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/NOTICE?rev=808343&r1=808342&r2=808343&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/NOTICE (original)
+++ harmony/enhanced/classlib/trunk/NOTICE Thu Aug 27 09:51:51 2009
@@ -16,3 +16,34 @@
 Portions of Apache Harmony's Class Library TEXT module contain JavaDoc
 derived from the ICU project.
 Copyright (c) 1995-2008 International Business Machines Corporation and others 
+
+
+The Apache Harmony Development Kit (HDK) contains a jar file from the
+Apache Derby Project for which the following notice applies:
+
+Apache Derby
+Copyright 2004-2007 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: harmony/enhanced/trunk/LICENSE
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/LICENSE?rev=808343&r1=808342&r2=808343&view=diff
==============================================================================
--- harmony/enhanced/trunk/LICENSE (original)
+++ harmony/enhanced/trunk/LICENSE Thu Aug 27 09:51:51 2009
@@ -1218,41 +1218,3 @@
 
 ===============================================================================
 ===============================================================================
-
-
-
-This distribution may contain a jar file based on Apache Derby which
-is covered by the Apache License and for which the following notice
-applies:
-
-Apache Derby
-Copyright 2004-2007 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: harmony/enhanced/trunk/NOTICE
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/NOTICE?rev=808343&r1=808342&r2=808343&view=diff
==============================================================================
--- harmony/enhanced/trunk/NOTICE (original)
+++ harmony/enhanced/trunk/NOTICE Thu Aug 27 09:51:51 2009
@@ -16,3 +16,34 @@
 Portions of Apache Harmony's Class Library TEXT module contain JavaDoc
 derived from the ICU project.
 Copyright (c) 1995-2008 International Business Machines Corporation and others 
+
+
+The Apache Harmony Development Kit (HDK) contains a jar file from the
+Apache Derby Project for which the following notice applies:
+
+Apache Derby
+Copyright 2004-2007 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



Mime
View raw message