Author: jukka
Date: Thu Jun 12 08:07:51 2008
New Revision: 667125
URL: http://svn.apache.org/viewvc?rev=667125&view=rev
Log:
Added Derby and Xerces information to NOTICEs in launchpad app and webapp.
Modified:
incubator/sling/trunk/launchpad/app/NOTICE
incubator/sling/trunk/launchpad/webapp/NOTICE
Modified: incubator/sling/trunk/launchpad/app/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/NOTICE?rev=667125&r1=667124&r2=667125&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/NOTICE (original)
+++ incubator/sling/trunk/launchpad/app/NOTICE Thu Jun 12 08:07:51 2008
@@ -76,3 +76,21 @@
The jboss integration module contains some LGPL code.
+Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick, Inc.,
+ software copyright (c) 1999.
+
+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.
Modified: incubator/sling/trunk/launchpad/webapp/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/NOTICE?rev=667125&r1=667124&r2=667125&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/NOTICE (original)
+++ incubator/sling/trunk/launchpad/webapp/NOTICE Thu Jun 12 08:07:51 2008
@@ -42,4 +42,23 @@
This product includes software developed at
eclipse.org (http://www.eclipse.org/equinox).
-Licensed under the Eclipse Public License (EPL).
\ No newline at end of file
+Licensed under the Eclipse Public License (EPL).
+
+Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick, Inc.,
+ software copyright (c) 1999.
+
+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.
