[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small import cleanups
Kaffe CVS
cvs-commits at kaffe.org
Sat Oct 23 15:13:55 PDT 2004
PatchSet 5346
Date: 2004/10/23 22:09:46
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: small import cleanups
2004-10-23 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/java/net/NetworkInterface.java,
libraries/javalib/javax/security/auth/x500/X500PrivateCredential.java,
libraries/javalib/javax/security/cert/X509CertBridge.java,
libraries/javalib/javax/sql/XAConnection.java:
Resynced with GNU Classpath.
2004-10-21 Michael Koch <konqueror at gmx.de>
* java/net/NetworkInterface.java,
javax/security/auth/x500/X500PrivateCredential.java,
javax/security/cert/X509CertBridge.java,
javax/sql/XAConnection.java:
Import cleanup.
Members:
ChangeLog:1.2898->1.2899
libraries/javalib/java/net/NetworkInterface.java:1.9->1.10
libraries/javalib/javax/security/auth/x500/X500PrivateCredential.java:1.1->1.2
libraries/javalib/javax/security/cert/X509CertBridge.java:1.4->1.5
libraries/javalib/javax/sql/XAConnection.java:1.4->1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2898 kaffe/ChangeLog:1.2899
--- kaffe/ChangeLog:1.2898 Sat Oct 23 21:38:57 2004
+++ kaffe/ChangeLog Sat Oct 23 22:09:46 2004
@@ -1,5 +1,21 @@
2004-10-23 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/java/net/NetworkInterface.java,
+ libraries/javalib/javax/security/auth/x500/X500PrivateCredential.java,
+ libraries/javalib/javax/security/cert/X509CertBridge.java,
+ libraries/javalib/javax/sql/XAConnection.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-21 Michael Koch <konqueror at gmx.de>
+
+ * java/net/NetworkInterface.java,
+ javax/security/auth/x500/X500PrivateCredential.java,
+ javax/security/cert/X509CertBridge.java,
+ javax/sql/XAConnection.java:
+ Import cleanup.
+
+2004-10-23 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java,
libraries/javalib/javax/net/ssl/KeyManagerFactory.java,
libraries/javalib/javax/net/ssl/SSLContext.java,
Index: kaffe/libraries/javalib/java/net/NetworkInterface.java
diff -u kaffe/libraries/javalib/java/net/NetworkInterface.java:1.9 kaffe/libraries/javalib/java/net/NetworkInterface.java:1.10
--- kaffe/libraries/javalib/java/net/NetworkInterface.java:1.9 Sat Oct 16 13:31:00 2004
+++ kaffe/libraries/javalib/java/net/NetworkInterface.java Sat Oct 23 22:09:49 2004
@@ -35,12 +35,13 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.net;
import gnu.classpath.Configuration;
+
import java.util.Enumeration;
import java.util.Vector;
-import java.util.*;
/**
* This class models a network interface on the host computer. A network
Index: kaffe/libraries/javalib/javax/security/auth/x500/X500PrivateCredential.java
diff -u kaffe/libraries/javalib/javax/security/auth/x500/X500PrivateCredential.java:1.1 kaffe/libraries/javalib/javax/security/auth/x500/X500PrivateCredential.java:1.2
--- kaffe/libraries/javalib/javax/security/auth/x500/X500PrivateCredential.java:1.1 Wed Jul 21 02:12:47 2004
+++ kaffe/libraries/javalib/javax/security/auth/x500/X500PrivateCredential.java Sat Oct 23 22:09:49 2004
@@ -1,20 +1,20 @@
/* X500PrivateCredential.java -- certificate and private key pair.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-This file is part of GNU Crypto.
+This file is part of GNU Classpath.
-GNU Crypto is free software; you can redistribute it and/or modify
+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 Crypto is distributed in the hope that it will be useful, but
+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 GNU Crypto; see the file COPYING. If not, write to the
+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.
@@ -40,6 +40,7 @@
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
+
import javax.security.auth.Destroyable;
/**
Index: kaffe/libraries/javalib/javax/security/cert/X509CertBridge.java
diff -u kaffe/libraries/javalib/javax/security/cert/X509CertBridge.java:1.4 kaffe/libraries/javalib/javax/security/cert/X509CertBridge.java:1.5
--- kaffe/libraries/javalib/javax/security/cert/X509CertBridge.java:1.4 Thu Jun 3 19:42:20 2004
+++ kaffe/libraries/javalib/javax/security/cert/X509CertBridge.java Sat Oct 23 22:09:50 2004
@@ -1,23 +1,22 @@
/* X509CertBridge.java -- bridge between JDK and JSSE cert APIs.
- 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
@@ -27,27 +26,25 @@
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.security.cert;
import java.math.BigInteger;
-
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
-import java.security.PublicKey;
import java.security.Principal;
+import java.security.PublicKey;
import java.security.SignatureException;
-
import java.util.Date;
/**
Index: kaffe/libraries/javalib/javax/sql/XAConnection.java
diff -u kaffe/libraries/javalib/javax/sql/XAConnection.java:1.4 kaffe/libraries/javalib/javax/sql/XAConnection.java:1.5
--- kaffe/libraries/javalib/javax/sql/XAConnection.java:1.4 Mon Apr 19 08:33:40 2004
+++ kaffe/libraries/javalib/javax/sql/XAConnection.java Sat Oct 23 22:09:50 2004
@@ -1,5 +1,5 @@
-/* XAConnection.java
- Copyright (C) 2002 Free Software Foundation, Inc.
+/* XAConnection.java --
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,6 +39,7 @@
package javax.sql;
import java.sql.SQLException;
+
import javax.transaction.xa.XAResource;
/**
More information about the kaffe
mailing list