harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r451284 - in /incubator/harmony/enhanced/classlib/trunk: NOTICE THIRD_PARTY_NOTICES.txt
Date Fri, 29 Sep 2006 13:29:19 GMT
Author: tellison
Date: Fri Sep 29 06:29:17 2006
New Revision: 451284

URL: http://svn.apache.org/viewvc?view=rev&rev=451284
Log:
Normalize our notice file, and keep IETF notice with other third-party notices.

Modified:
    incubator/harmony/enhanced/classlib/trunk/NOTICE
    incubator/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt

Modified: incubator/harmony/enhanced/classlib/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/NOTICE?view=diff&rev=451284&r1=451283&r2=451284
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/NOTICE (original)
+++ incubator/harmony/enhanced/classlib/trunk/NOTICE Fri Sep 29 06:29:17 2006
@@ -4,43 +4,13 @@
    ==  in this case for the Apache Harmony distribution.                  ==
    =========================================================================
 
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
+Apache Harmony
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
 
 Portions of Harmony were originally developed by
 Intel Corporation and are licensed to the Apache Software
 Foundation under the "Software Grant and Corporate Contribution
 License Agreement", informally known as the "Intel Harmony CLA".
-
-Portions of Apache Harmony Classlib reference RFC 3280 - "Internet X.509 Public
-Key Infrastructure, Certificate and Certificate Revocation List (CRL) Profile".
-Portions of RFC 3280 are included in Harmony Javadoc for reference, and in
-accordance with the licenssing terms for RFC3280, the license is included here :
-
-   Copyright (C) The Internet Society (2002).  All Rights Reserved.
-
-   This document and translations of it may be copied and furnished to
-   others, and derivative works that comment on or otherwise explain it
-   or assist in its implementation may be prepared, copied, published
-   and distributed, in whole or in part, without restriction of any
-   kind, provided that the above copyright notice and this paragraph are
-   included on all such copies and derivative works.  However, this
-   document itself may not be modified in any way, such as by removing
-   the copyright notice or references to the Internet Society or other
-   Internet organizations, except as needed for the purpose of
-   developing Internet standards in which case the procedures for
-   copyrights defined in the Internet Standards process must be
-   followed, or as required to translate it into languages other than
-   English.
-
-   The limited permissions granted above are perpetual and will not be
-   revoked by the Internet Society or its successors or assigns.
-
-   This document and the information contained herein is provided on an
-   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
-   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
-   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
-   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
-   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-

Modified: incubator/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt?view=diff&rev=451284&r1=451283&r2=451284
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt (original)
+++ incubator/harmony/enhanced/classlib/trunk/THIRD_PARTY_NOTICES.txt Fri Sep 29 06:29:17
2006
@@ -459,3 +459,41 @@
 ===============================================================================
 ===============================================================================
 
+
+Notice for IETF RFC
+===================
+
+Portions of Apache Harmony reference RFC 3280 - "Internet X.509 Public
+Key Infrastructure, Certificate and Certificate Revocation List (CRL) Profile".
+Portions of RFC 3280 are included in Harmony Javadoc for reference, and in
+accordance with the licensing terms for RFC3280, the license is included here :
+
+   Copyright (C) The Internet Society (2002).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+===============================================================================
+===============================================================================



Mime
View raw message