[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small cleanups in javax.net.ssl
Kaffe CVS
cvs-commits at kaffe.org
Sat Oct 23 14:45:38 PDT 2004
PatchSet 5345
Date: 2004/10/23 21:38:57
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: small cleanups in javax.net.ssl
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,
libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java,
libraries/javalib/javax/net/ssl/SSLSession.java,
libraries/javalib/javax/net/ssl/TrustManagerFactory.java:
Resynced with GNU Classpath.
2004-10-21 Michael Koch <konqueror at gmx.de>
* javax/net/ssl/HandshakeCompletedEvent.java,
javax/net/ssl/KeyManagerFactory.java,
javax/net/ssl/SSLContext.java,
javax/net/ssl/SSLServerSocketFactory.java,
javax/net/ssl/SSLSession.java,
javax/net/ssl/SSLSocketFactory.java,
javax/net/ssl/TrustManagerFactory.java:
Import cleanup.
Members:
ChangeLog:1.2897->1.2898
libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.5->1.6
libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.6->1.7
libraries/javalib/javax/net/ssl/SSLContext.java:1.5->1.6
libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.6->1.7
libraries/javalib/javax/net/ssl/SSLSession.java:1.5->1.6
libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2897 kaffe/ChangeLog:1.2898
--- kaffe/ChangeLog:1.2897 Sat Oct 23 21:23:11 2004
+++ kaffe/ChangeLog Sat Oct 23 21:38:57 2004
@@ -1,5 +1,26 @@
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,
+ libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java,
+ libraries/javalib/javax/net/ssl/SSLSession.java,
+ libraries/javalib/javax/net/ssl/TrustManagerFactory.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-21 Michael Koch <konqueror at gmx.de>
+
+ * javax/net/ssl/HandshakeCompletedEvent.java,
+ javax/net/ssl/KeyManagerFactory.java,
+ javax/net/ssl/SSLContext.java,
+ javax/net/ssl/SSLServerSocketFactory.java,
+ javax/net/ssl/SSLSession.java,
+ javax/net/ssl/SSLSocketFactory.java,
+ javax/net/ssl/TrustManagerFactory.java:
+ Import cleanup.
+
+2004-10-23 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/javax/naming/directory/BasicAttribute.java,
libraries/javalib/javax/naming/directory/BasicAttributes.java,
libraries/javalib/javax/naming/directory/InitialDirContext.java,
Index: kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java
diff -u kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.5 kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.6
--- kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java:1.5 Tue Sep 21 13:08:16 2004
+++ kaffe/libraries/javalib/javax/net/ssl/HandshakeCompletedEvent.java Sat Oct 23 21:39:01 2004
@@ -39,6 +39,7 @@
package javax.net.ssl;
import java.security.cert.Certificate;
+
import javax.security.cert.X509Certificate;
/**
@@ -51,7 +52,6 @@
*/
public class HandshakeCompletedEvent extends java.util.EventObject
{
-
// Fields.
// -------------------------------------------------------------------
@@ -59,7 +59,7 @@
private static final long serialVersionUID = 7914963744257769778L;
/** The session. */
- private transient final SSLSession session;
+ private final transient SSLSession session;
// Constructor.
// -------------------------------------------------------------------
Index: kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.6 kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.7
--- kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java:1.6 Tue Sep 21 13:08:17 2004
+++ kaffe/libraries/javalib/javax/net/ssl/KeyManagerFactory.java Sat Oct 23 21:39:01 2004
@@ -38,8 +38,9 @@
package javax.net.ssl;
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
+import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyStore;
@@ -50,8 +51,6 @@
import java.security.Provider;
import java.security.Security;
import java.security.UnrecoverableKeyException;
-
-import gnu.java.security.Engine;
/**
* A class that creates key manager implementations based on a
Index: kaffe/libraries/javalib/javax/net/ssl/SSLContext.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLContext.java:1.5 kaffe/libraries/javalib/javax/net/ssl/SSLContext.java:1.6
--- kaffe/libraries/javalib/javax/net/ssl/SSLContext.java:1.5 Tue Sep 21 13:08:17 2004
+++ kaffe/libraries/javalib/javax/net/ssl/SSLContext.java Sat Oct 23 21:39:01 2004
@@ -38,8 +38,9 @@
package javax.net.ssl;
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
+import java.lang.reflect.InvocationTargetException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
@@ -47,8 +48,6 @@
import java.security.SecureRandom;
import java.security.Security;
-import gnu.java.security.Engine;
-
/**
* A "meta-factory" for protocol-specific socket and server socket
* factories. This class serves as a clearinghouse for socket
@@ -59,7 +58,6 @@
*/
public class SSLContext
{
-
// Constants and fields.
// ------------------------------------------------------------------
Index: kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.6 kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.7
--- kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java:1.6 Tue Sep 21 13:08:17 2004
+++ kaffe/libraries/javalib/javax/net/ssl/SSLServerSocketFactory.java Sat Oct 23 21:39:01 2004
@@ -40,6 +40,7 @@
import java.security.KeyStore;
import java.security.Security;
+
import javax.net.ServerSocketFactory;
/**
@@ -48,7 +49,6 @@
*/
public abstract class SSLServerSocketFactory extends ServerSocketFactory
{
-
// Field.
// -------------------------------------------------------------------------
Index: kaffe/libraries/javalib/javax/net/ssl/SSLSession.java
diff -u kaffe/libraries/javalib/javax/net/ssl/SSLSession.java:1.5 kaffe/libraries/javalib/javax/net/ssl/SSLSession.java:1.6
--- kaffe/libraries/javalib/javax/net/ssl/SSLSession.java:1.5 Tue Sep 21 13:08:17 2004
+++ kaffe/libraries/javalib/javax/net/ssl/SSLSession.java Sat Oct 23 21:39:01 2004
@@ -39,6 +39,7 @@
package javax.net.ssl;
import java.security.cert.Certificate;
+
import javax.security.cert.X509Certificate;
/**
@@ -47,7 +48,6 @@
*/
public interface SSLSession
{
-
/**
* Returns this session's cihper suite.
*
Index: kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java
diff -u kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.6 kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.7
--- kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java:1.6 Tue Sep 21 13:08:17 2004
+++ kaffe/libraries/javalib/javax/net/ssl/TrustManagerFactory.java Sat Oct 23 21:39:01 2004
@@ -38,8 +38,9 @@
package javax.net.ssl;
-import java.lang.reflect.InvocationTargetException;
+import gnu.java.security.Engine;
+import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyStore;
@@ -49,8 +50,6 @@
import java.security.PrivilegedAction;
import java.security.Provider;
import java.security.Security;
-
-import gnu.java.security.Engine;
/**
* A factory for creating trust manager objects.
More information about the kaffe
mailing list