Author: jukka
Date: Mon Jun 16 04:28:02 2008
New Revision: 668116
URL: http://svn.apache.org/viewvc?rev=668116&view=rev
Log:
SLING-521: Revert to hand written notice files
- Simplified the Derby notices, Derby history is not relevant here
Modified:
incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE
incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE
Modified: incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE?rev=668116&r1=668115&r2=668116&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE
(original)
+++ incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/NOTICE Mon
Jun 16 04:28:02 2008
@@ -78,14 +78,8 @@
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.
-
+This product includes Apache Derby, which is based on source code originally
+developed at the International Business Machines Corporation.
(C) Copyright 1997,2004 International Business Machines Corporation.
All rights reserved.
-
(C) Copyright IBM Corp. 2003.
Modified: incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE?rev=668116&r1=668115&r2=668116&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE
(original)
+++ incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/NOTICE Mon
Jun 16 04:28:02 2008
@@ -47,14 +47,8 @@
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.
-
+This product includes Apache Derby, which is based on source code originally
+developed at the International Business Machines Corporation.
(C) Copyright 1997,2004 International Business Machines Corporation.
All rights reserved.
-
(C) Copyright IBM Corp. 2003.
