jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r900767 - in /jackrabbit/trunk: ./ jackrabbit-jca/src/main/rar/META-INF/ jackrabbit-spi-commons/src/main/appended-resources/META-INF/ jackrabbit-standalone/src/main/appended-resources/META-INF/ jackrabbit-webapp/src/main/webapp/META-INF/
Date Tue, 19 Jan 2010 13:19:45 GMT
Author: jukka
Date: Tue Jan 19 13:19:45 2010
New Revision: 900767

URL: http://svn.apache.org/viewvc?rev=900767&view=rev
Log:
JCR-2322: Fix NOTICE files to match consensus from legal team

Added:
    jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/LICENSE
      - copied unchanged from r900718, jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt
    jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE
      - copied, changed from r900718, jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt
Removed:
    jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt
    jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt
Modified:
    jackrabbit/trunk/NOTICE.txt
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/appended-resources/META-INF/NOTICE
    jackrabbit/trunk/jackrabbit-standalone/src/main/appended-resources/META-INF/NOTICE
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE

Modified: jackrabbit/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/NOTICE.txt?rev=900767&r1=900766&r2=900767&view=diff
==============================================================================
--- jackrabbit/trunk/NOTICE.txt (original)
+++ jackrabbit/trunk/NOTICE.txt Tue Jan 19 13:19:45 2010
@@ -6,8 +6,3 @@
 
 Based on source code originally developed by
 Day Software (http://www.day.com/).
-
-This product contains an XPath parser from the World Wide Web Consortium.
-Copyright (c) 2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, European Research Consortium for Informatics and Mathematics,
-Keio University).

Copied: jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE (from r900718, 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?p2=jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE&p1=jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt&r1=900718&r2=900767&rev=900767&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt (original)
+++ jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE Tue Jan 19 13:19:45 2010
@@ -6,37 +6,3 @@
 
 Based on source code originally developed by
 Day Software (http://www.day.com/).
-
-This product contains an XPath parser from the World Wide Web Consortium.
-Copyright (c) 2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, European Research Consortium for Informatics and Mathematics,
-Keio University).
-
-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.
-
-This software contains SLF4J libraries. Copyright (c) 2004-2008 QOS.ch
-
-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-spi-commons/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/appended-resources/META-INF/NOTICE?rev=900767&r1=900766&r2=900767&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/appended-resources/META-INF/NOTICE (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/appended-resources/META-INF/NOTICE Tue
Jan 19 13:19:45 2010
@@ -1,7 +1,2 @@
 Based on source code originally developed by
 Day Software (http://www.day.com/).
-
-This product contains an XPath parser from the World Wide Web Consortium.
-Copyright (c) 2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, European Research Consortium for Informatics and Mathematics,
-Keio University).

Modified: jackrabbit/trunk/jackrabbit-standalone/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone/src/main/appended-resources/META-INF/NOTICE?rev=900767&r1=900766&r2=900767&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone/src/main/appended-resources/META-INF/NOTICE (original)
+++ jackrabbit/trunk/jackrabbit-standalone/src/main/appended-resources/META-INF/NOTICE Tue
Jan 19 13:19:45 2010
@@ -1,57 +1,2 @@
 Based on source code originally developed by
 Day Software (http://www.day.com/).
-
-This product contains an XPath parser from the World Wide Web Consortium.
-Copyright (c) 2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, European Research Consortium for Informatics and Mathematics,
-Keio University).
-
-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.
-
-This software contains SLF4J libraries. Copyright (c) 2004-2008 QOS.ch
-
-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.
-
-This product includes the Jetty Web Container that is Copyright Mort Bay
-Consulting Pty Ltd unless otherwise noted.
-
-The javax.servlet package used by Jetty is copyright  Sun Microsystems, Inc
-and Apache Software Foundation.
-
-The UnixCrypt.java code in Jetty is Copyright 1996 Aki Yoshida, modified
-April 2001  by Iris Van den Broeke, Daniel Deville. Permission to use, copy,
-modify and distribute UnixCrypt  for non-commercial or commercial purposes
-and without fee is granted provided that the copyright notice appears in
-all copies.
-
-The JSP implementation in Jetty is provided by the Glassfish JSP engine from
-project Glassfish http://glassfish.dev.java.net.
-Copyright 2005 Sun Microsystems, Inc. and portions Copyright Apache Software
-Foundation.
-
-Some portions of Jetty are Copyright:
-  2006 Tim Vernum 
-  1999 Jason Gilbert.

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE?rev=900767&r1=900766&r2=900767&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE Tue Jan 19 13:19:45
2010
@@ -6,37 +6,3 @@
 
 Based on source code originally developed by
 Day Software (http://www.day.com/).
-
-This product contains an XPath parser from the World Wide Web Consortium.
-Copyright (c) 2002 World Wide Web Consortium, (Massachusetts Institute of
-Technology, European Research Consortium for Informatics and Mathematics,
-Keio University).
-
-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.
-
-This software contains SLF4J libraries. Copyright (c) 2004-2008 QOS.ch
-
-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