[cp-patches] FYI: org.ietf.jgss documentation clarification

[Mark Wielaard]

Hi,

Julian Scheid who is preparing gjdoc for creating the full API
documentation for GNU Classpath noticed that in some we org.ietf.jgss
sources we had two copyright notices. This was discussed with FSF legal
when GNU Crypto was merged in, but we apparently forgot to clearly
document it. This patch adds the complete description to the LICENSE
file and merges the top two comment block into one for easier parsing by
gjdoc.

2004-12-07  Mark Wielaard  <address@hidden>

        * LICENSE: Add text about org.ietf.jgss documentation.
        * org/ietf/jgss/ChannelBinding.java: Merge top two comment blocks.
        * org/ietf/jgss/GSSCredential.java: Likewise.
        * org/ietf/jgss/GSSException.java: Likewise.
        * org/ietf/jgss/GSSManager.java: Likewise.
        * org/ietf/jgss/GSSName.java: Likewise.
        * org/ietf/jgss/MessageProp.java: Likewise.
        * org/ietf/jgss/Oid.java: Likewise.

Committed.

Cheers,

Mark

Index: LICENSE
===================================================================
RCS file: /cvsroot/classpath/classpath/LICENSE,v
retrieving revision 1.3
diff -u -r1.3 LICENSE
--- LICENSE     9 Sep 2004 17:13:17 -0000       1.3
+++ LICENSE     10 Dec 2004 14:41:27 -0000
@@ -80,3 +80,33 @@
 
 The upstream for fdlibm is libgcj (http://gcc.gnu.org/java/), they sync
 again with the 'real' upstream (http://www.netlib.org/fdlibm/readme).
+
+
+The documentation of some of the files in org/ietf/jgss/ is derived from
+the text of RFC 2853: Generic Security Service API Version 2: Java Bindings.
+That document is covered under the following license notice:
+
+Copyright (C) The Internet Society (2000).  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.
Index: org/ietf/jgss/ChannelBinding.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/ietf/jgss/ChannelBinding.java,v
retrieving revision 1.1
diff -u -r1.1 ChannelBinding.java
--- org/ietf/jgss/ChannelBinding.java   14 Aug 2004 18:21:35 -0000      1.1
+++ org/ietf/jgss/ChannelBinding.java   10 Dec 2004 14:41:27 -0000
@@ -33,9 +33,9 @@
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+exception statement from your version.
 
-/* The documentation comments of this class are derived from the text
+   The documentation comments of this class are derived from the text
    of RFC 2853:  Generic Security Service API Version 2: Java Bindings.
    That document is covered under the following license notice:
 
Index: org/ietf/jgss/GSSCredential.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/ietf/jgss/GSSCredential.java,v
retrieving revision 1.1
diff -u -r1.1 GSSCredential.java
--- org/ietf/jgss/GSSCredential.java    14 Aug 2004 18:21:35 -0000      1.1
+++ org/ietf/jgss/GSSCredential.java    10 Dec 2004 14:41:27 -0000
@@ -33,9 +33,9 @@
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+exception statement from your version.
 
-/* The documentation comments of this class are derived from the text
+   The documentation comments of this class are derived from the text
    of RFC 2853:  Generic Security Service API Version 2: Java Bindings.
    That document is covered under the following license notice:
 
Index: org/ietf/jgss/GSSException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/ietf/jgss/GSSException.java,v
retrieving revision 1.2
diff -u -r1.2 GSSException.java
--- org/ietf/jgss/GSSException.java     6 Sep 2004 17:00:08 -0000       1.2
+++ org/ietf/jgss/GSSException.java     10 Dec 2004 14:41:27 -0000
@@ -33,9 +33,9 @@
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+exception statement from your version.
 
-/* The documentation comments of this class are derived from the text
+   The documentation comments of this class are derived from the text
    of RFC 2853:  Generic Security Service API Version 2: Java Bindings.
    That document is covered under the following license notice:
 
Index: org/ietf/jgss/GSSManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/ietf/jgss/GSSManager.java,v
retrieving revision 1.1
diff -u -r1.1 GSSManager.java
--- org/ietf/jgss/GSSManager.java       14 Aug 2004 18:21:35 -0000      1.1
+++ org/ietf/jgss/GSSManager.java       10 Dec 2004 14:41:27 -0000
@@ -33,9 +33,9 @@
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+exception statement from your version.
 
-/* The documentation comments of this class are derived from the text
+   The documentation comments of this class are derived from the text
    of RFC 2853:  Generic Security Service API Version 2: Java Bindings.
    That document is covered under the following license notice:
 
Index: org/ietf/jgss/GSSName.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/ietf/jgss/GSSName.java,v
retrieving revision 1.1
diff -u -r1.1 GSSName.java
--- org/ietf/jgss/GSSName.java  14 Aug 2004 18:21:35 -0000      1.1
+++ org/ietf/jgss/GSSName.java  10 Dec 2004 14:41:27 -0000
@@ -33,9 +33,9 @@
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+exception statement from your version.
 
-/* The documentation comments of this class are derived from the text
+   The documentation comments of this class are derived from the text
    of RFC 2853:  Generic Security Service API Version 2: Java Bindings.
    That document is covered under the following license notice:
 
Index: org/ietf/jgss/MessageProp.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/ietf/jgss/MessageProp.java,v
retrieving revision 1.1
diff -u -r1.1 MessageProp.java
--- org/ietf/jgss/MessageProp.java      14 Aug 2004 18:21:35 -0000      1.1
+++ org/ietf/jgss/MessageProp.java      10 Dec 2004 14:41:27 -0000
@@ -33,9 +33,9 @@
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+exception statement from your version.
 
-/* The documentation comments of this class are derived from the text
+   The documentation comments of this class are derived from the text
    of RFC 2853:  Generic Security Service API Version 2: Java Bindings.
    That document is covered under the following license notice:
 
Index: org/ietf/jgss/Oid.java
===================================================================
RCS file: /cvsroot/classpath/classpath/org/ietf/jgss/Oid.java,v
retrieving revision 1.1
diff -u -r1.1 Oid.java
--- org/ietf/jgss/Oid.java      14 Aug 2004 18:21:35 -0000      1.1
+++ org/ietf/jgss/Oid.java      10 Dec 2004 14:41:27 -0000
@@ -33,9 +33,9 @@
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+exception statement from your version.
 
-/* The documentation comments of this class are derived from the text
+   The documentation comments of this class are derived from the text
    of RFC 2853:  Generic Security Service API Version 2: Java Bindings.
    That document is covered under the following license notice:

signature.asc
Description: This is a digitally signed message part