You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/02/21 15:17:35 UTC
svn commit: r912355 - in /harmony/enhanced/branches/java6: ./ LICENSE
debian/patches/
Author: hindessm
Date: Sun Feb 21 14:17:34 2010
New Revision: 912355
URL: http://svn.apache.org/viewvc?rev=912355&view=rev
Log:
Merge federated build to pull in LICENSE additions.
Modified:
harmony/enhanced/branches/java6/ (props changed)
harmony/enhanced/branches/java6/LICENSE
harmony/enhanced/branches/java6/debian/patches/ (props changed)
Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 21 14:17:34 2010
@@ -1 +1 @@
-/harmony/enhanced/trunk:810871-891586
+/harmony/enhanced/trunk:810871-912354
Modified: harmony/enhanced/branches/java6/LICENSE
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/LICENSE?rev=912355&r1=912354&r2=912355&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/LICENSE (original)
+++ harmony/enhanced/branches/java6/LICENSE Sun Feb 21 14:17:34 2010
@@ -372,7 +372,7 @@
-License Notice for Bouncy Castle version 1.44
+License Notice for Bouncy Castle version 1.45
=============================================
Copyright (c) 2000 - 2009 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
@@ -690,6 +690,17 @@
included in source code comments for reference, and in accordance with
the licensing terms, the licenses are reproduced here:
+RFC 1779 - A String Representation of Distinguished Names
+
+RFC 2045 - Multipurpose Internet Mail Extensions (MIME) Part One: Format of
+ Internet Message Bodies
+
+RFC 2251 - Lightweight Directory Access Protocol (v3)
+ Copyright (C) The Internet Society (1997). All Rights Reserved.
+
+RFC 2253 - Lightweight Directory Access Protocol (v3): UTF-8 String
+ Representation of Distinguished Names
+ Copyright (C) The Internet Society (1997). All Rights Reserved.
RFC 2313 - PKCS #1: RSA Encryption
Copyright (C) The Internet Society (1998). All Rights Reserved.
@@ -697,6 +708,12 @@
RFC 2315 - PKCS #7: Cryptographic Message Syntax
Copyright (C) The Internet Society (1998). All Rights Reserved.
+RFC 2459 - Internet X.509 Public Key Infrastructure Certificate and CRL Profile
+ Copyright (C) The Internet Society (1999). All Rights Reserved.
+
+RFC 2616 - Hypertext Transfer Protocol -- HTTP/1.1
+ Copyright (C) The Internet Society (1999). All Rights Reserved.
+
RFC 2781 - UTF-16, an encoding of ISO 10646
Copyright (C) The Internet Society (2000). All Rights Reserved.
@@ -713,6 +730,9 @@
Certificate Revocation List (CRL) Profile
Copyright (C) The Internet Society (2002). All Rights Reserved.
+INTERNET-DRAFT - Persistent Search: A Simple LDAP Change Notification Mechanism
+ <draft-ietf-ldapext-psearch-03.txt>
+ Copyright (C) The Internet Society (1997-2000). All Rights Reserved.
The following statement applies to each RFC:
Propchange: harmony/enhanced/branches/java6/debian/patches/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 21 14:17:34 2010
@@ -0,0 +1 @@
+/harmony/enhanced/trunk/debian/patches:810904-912354