jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r669296 - in /jackrabbit/trunk: jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt
Date Wed, 18 Jun 2008 21:24:09 GMT
Author: jukka
Date: Wed Jun 18 14:24:08 2008
New Revision: 669296

URL: http://svn.apache.org/viewvc?rev=669296&view=rev
Log:
JCR-1649: Separate NOTICEs and LICENSEs for binary and source packages
    - Better copyright notices for Derby, Xerces, etc.

Modified:
    jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt

Modified: jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt?rev=669296&r1=669295&r2=669296&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt Wed Jun 18 14:24:08 2008
@@ -12,17 +12,11 @@
 Technology, European Research Consortium for Informatics and Mathematics,
 Keio University).
 
-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. 
+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.
 
 This software contains PDF reader functionality from the PDFBox, FontBox, and
 JempBox projects. Copyright (c) 2003-2005, www.pdfbox.org and www.fontbox.org.
@@ -31,11 +25,20 @@
 
 CyberNeko HTML Parser (C) Copyright 2002-2005, Andy Clark.
 
-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.
-  - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
-  - voluntary contributions made by Paul Eng on behalf of the 
-    Apache Software Foundation that were originally developed at iClick, Inc.,
-    software copyright (c) 1999.
-  - software copyright (c) 1994-2000 Sun Microsystems, Inc.
+This product includes Apache Xerces, portions of which 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.
+
+This product includes the DOM Java Language Binding from the World Wide
+Web Consortium.
+Copyright (C) 2000 World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+
+This product includes the Concurrent library, portions of which are
+based on code from Sun Microsystems.
+Copyright (c) 1994-2000 Sun Microsystems, Inc. All rights reserved.

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt?rev=669296&r1=669295&r2=669296&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt Wed Jun 18 14:24:08
2008
@@ -12,17 +12,11 @@
 Technology, European Research Consortium for Informatics and Mathematics,
 Keio University).
 
-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. 
+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.
 
 This software contains PDF reader functionality from the PDFBox, FontBox, and
 JempBox projects. Copyright (c) 2003-2005, www.pdfbox.org and www.fontbox.org.
@@ -31,11 +25,20 @@
 
 CyberNeko HTML Parser (C) Copyright 2002-2005, Andy Clark.
 
-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.
-  - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
-  - voluntary contributions made by Paul Eng on behalf of the 
-    Apache Software Foundation that were originally developed at iClick, Inc.,
-    software copyright (c) 1999.
-  - software copyright (c) 1994-2000 Sun Microsystems, Inc.
+This product includes Apache Xerces, portions of which 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.
+
+This product includes the DOM Java Language Binding from the World Wide
+Web Consortium.
+Copyright (C) 2000 World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+
+This product includes the Concurrent library, portions of which are
+based on code from Sun Microsystems.
+Copyright (c) 1994-2000 Sun Microsystems, Inc. All rights reserved.



Mime
View raw message