You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2003/09/18 18:10:46 UTC

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net ServerSocketFactory.java

hgomez      2003/09/18 09:10:46

  Modified:    util/java/org/apache/tomcat/util/net/puretls
                        PureTLSSocketFactory.java
                        PureTLSImplementation.java PureTLSSupport.java
                        PureTLSSocket.java
               util/java/org/apache/tomcat/util/net
                        ServerSocketFactory.java
  Log:
  More import cleaned
  
  Revision  Changes    Path
  1.5       +11 -6     jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/PureTLSSocketFactory.java
  
  Index: PureTLSSocketFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/PureTLSSocketFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PureTLSSocketFactory.java	11 Jul 2003 04:09:43 -0000	1.4
  +++ PureTLSSocketFactory.java	18 Sep 2003 16:10:45 -0000	1.5
  @@ -59,13 +59,18 @@
   
   package org.apache.tomcat.util.net.puretls;
   
  -import java.io.*;
  -import java.net.*;
  -import java.util.*;
  +import java.io.IOException;
  +import java.net.InetAddress;
  +import java.net.ServerSocket;
  +import java.net.Socket;
  +import java.net.SocketException;
  +import java.util.Vector;
   
  -import COM.claymoresystems.ptls.*;
  -import COM.claymoresystems.cert.*;
  -import COM.claymoresystems.sslg.*;
  +import COM.claymoresystems.ptls.SSLContext;
  +import COM.claymoresystems.ptls.SSLException;
  +import COM.claymoresystems.ptls.SSLServerSocket;
  +import COM.claymoresystems.ptls.SSLSocket;
  +import COM.claymoresystems.sslg.SSLPolicyInt;
   
   /**
    * SSL server socket factory--wraps PureTLS
  
  
  
  1.2       +3 -5      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/PureTLSImplementation.java
  
  Index: PureTLSImplementation.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/PureTLSImplementation.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PureTLSImplementation.java	4 Oct 2002 20:03:10 -0000	1.1
  +++ PureTLSImplementation.java	18 Sep 2003 16:10:45 -0000	1.2
  @@ -59,15 +59,13 @@
   
   package org.apache.tomcat.util.net.puretls;
   
  +import java.net.Socket;
  +
   import org.apache.tomcat.util.net.SSLImplementation;
   import org.apache.tomcat.util.net.SSLSupport;
   import org.apache.tomcat.util.net.ServerSocketFactory;
  -import java.io.*;
  -import java.net.*;
   
  -import COM.claymoresystems.sslg.*;
  -import COM.claymoresystems.ptls.*;
  -import COM.claymoresystems.cert.*;
  +import COM.claymoresystems.ptls.SSLSocket;
   
   /* PureTLSImplementation:
   
  
  
  
  1.3       +8 -7      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/PureTLSSupport.java
  
  Index: PureTLSSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/PureTLSSupport.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PureTLSSupport.java	16 Jun 2003 02:45:56 -0000	1.2
  +++ PureTLSSupport.java	18 Sep 2003 16:10:45 -0000	1.3
  @@ -59,17 +59,18 @@
   
   package org.apache.tomcat.util.net.puretls;
   
  -import org.apache.tomcat.util.net.SSLSupport;
  -import java.io.*;
  -import java.net.*;
  -import java.util.Vector;
  +import java.io.ByteArrayInputStream;
  +import java.io.IOException;
   import java.security.cert.CertificateFactory;
   import java.security.cert.X509Certificate;
  +import java.util.Vector;
  +
   import org.apache.tomcat.util.buf.HexUtils;
  +import org.apache.tomcat.util.net.SSLSupport;
   
  -import COM.claymoresystems.sslg.*;
  -import COM.claymoresystems.ptls.*;
  -import COM.claymoresystems.cert.*;
  +import COM.claymoresystems.cert.X509Cert;
  +import COM.claymoresystems.ptls.SSLSocket;
  +import COM.claymoresystems.sslg.SSLPolicyInt;
   
   
   /* PureTLSSupport
  
  
  
  1.2       +1 -6      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/PureTLSSocket.java
  
  Index: PureTLSSocket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/PureTLSSocket.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PureTLSSocket.java	4 Oct 2002 20:03:10 -0000	1.1
  +++ PureTLSSocket.java	18 Sep 2003 16:10:45 -0000	1.2
  @@ -59,12 +59,7 @@
   
   package org.apache.tomcat.util.net.puretls;
   
  -import java.io.*;
  -import java.net.*;
  -
  -import COM.claymoresystems.ptls.*;
  -import COM.claymoresystems.cert.*;
  -import COM.claymoresystems.sslg.*;
  +import java.io.IOException;
   
   /*
    * PureTLSSocket.java
  
  
  
  1.2       +4 -2      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/ServerSocketFactory.java
  
  Index: ServerSocketFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/ServerSocketFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServerSocketFactory.java	5 Apr 2002 17:43:33 -0000	1.1
  +++ ServerSocketFactory.java	18 Sep 2003 16:10:45 -0000	1.2
  @@ -59,8 +59,10 @@
   
   package org.apache.tomcat.util.net;
   
  -import java.io.*;
  -import java.net.*;
  +import java.io.IOException;
  +import java.net.InetAddress;
  +import java.net.ServerSocket;
  +import java.net.Socket;
   import java.util.Hashtable;
   
   /**