[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fixed comment in SSLServerSocket
Kaffe CVS
cvs-commits at kaffe.org
Tue Sep 21 05:31:03 PDT 2004
PatchSet 5196
Date: 2004/09/21 12:27:10
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: fixed comment in SSLServerSocket
2004-09-21 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/javax/net/ssl/SSLServerSocket.java:
Resynced with GNU Classpath.
2004-09-20 Michael Koch <konqueror at gmx.de>
* javax/net/ssl/SSLServerSocket.java:
Removed comment about 'Do not edit this file, it's generated.'.
Members:
ChangeLog:1.2751->1.2752
libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.5->1.6
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2751 kaffe/ChangeLog:1.2752
--- kaffe/ChangeLog:1.2751 Tue Sep 21 12:22:08 2004
+++ kaffe/ChangeLog Tue Sep 21 12:27:10 2004
@@ -1,5 +1,15 @@
2004-09-21 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/javax/net/ssl/SSLServerSocket.java:
+ Resynced with GNU Classpath.
+
+ 2004-09-20 Michael Koch <konqueror at gmx.de>
+
+ * javax/net/ssl/SSLServerSocket.java:
+ Removed comment about "Do not edit this file, it's generated.".
+
+2004-09-21 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/java/lang/StackTraceElement.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.5 kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.6
--- kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java:1.5 Thu Jun 3 19:42:19 2004
+++ kaffe/libraries/javalib/javax/net/ssl/SSLServerSocket.java Tue Sep 21 12:27:11 2004
@@ -1,24 +1,22 @@
-// THIS IS A GENERATED FILE. DO NOT EDIT. -*- buffer-read-only: t -*-
/* SSLServerSocket.java -- a server socket for SSL connections.
- Copyright (C) 2003 Casey Marshall <rsdio at metastatic.org>
+ Copyright (C) 2004 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
+This file is part of GNU Classpath.
-This program is distributed in the hope that it will be useful, but
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the
-
- Free Software Foundation, Inc.,
- 59 Temple Place, Suite 330,
- Boston, MA 02111-1307
- USA
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
@@ -28,14 +26,14 @@
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under terms
-of your choice, provided that you also meet, for each linked independent
-module, the terms and conditions of the license of that module. An
-independent module is a module which is not derived from 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. */
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+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. */
package javax.net.ssl;
More information about the kaffe
mailing list