Remove JSSEFactory. Now we no longer need to support older JSSE versions, this layer...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1079354 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java
deleted file mode 100644 (file)
index dcb0354..0000000
--- a/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.tomcat.util.net.jsse;
-
-import java.net.Socket;
-
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-
-import org.apache.tomcat.util.net.AbstractEndpoint;
-import org.apache.tomcat.util.net.SSLSupport;
-import org.apache.tomcat.util.net.ServerSocketFactory;
-
-/** 
- * Factory interface to construct components based on the JSSE version
- * in use.
- *
- * @author Bill Barker
- * @author Filip Hanik
- */
-
-public class JSSEFactory {
-
-    /**
-     * Returns the ServerSocketFactory to use.
-     */
-    public ServerSocketFactory getSocketFactory(AbstractEndpoint endpoint) {
-        return new JSSESocketFactory(endpoint);
-    }
-
-    /**
-     * returns the SSLSupport attached to this socket.
-     */
-    public SSLSupport getSSLSupport(Socket socket) {
-        return new JSSESupport((SSLSocket)socket);
-    }
-    
-    public SSLSupport getSSLSupport(SSLSession session) {
-        return new JSSESupport(session);
-    }
-
-}

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java b/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
index 671423d..a3cebb7 100644 (file)
--- a/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
@@ -20,6 +20,7 @@ package org.apache.tomcat.util.net.jsse;
 import java.net.Socket;
 
 import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
 
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.SSLImplementation;
@@ -35,13 +36,6 @@ import org.apache.tomcat.util.net.ServerSocketFactory;
         
 public class JSSEImplementation extends SSLImplementation {
 
-    private JSSEFactory factory = null;
-
-    public JSSEImplementation() {
-        factory = new JSSEFactory();
-    }
-
-
     @Override
     public String getImplementationName(){
         return "JSSE";
@@ -49,20 +43,17 @@ public class JSSEImplementation extends SSLImplementation {
       
     @Override
     public ServerSocketFactory getServerSocketFactory(AbstractEndpoint endpoint)  {
-        ServerSocketFactory ssf = factory.getSocketFactory(endpoint);
-        return ssf;
+        return new JSSESocketFactory(endpoint);
     } 
 
     @Override
     public SSLSupport getSSLSupport(Socket s) {
-        SSLSupport ssls = factory.getSSLSupport(s);
-        return ssls;
+        return new JSSESupport((SSLSocket) s);
     }
 
     @Override
     public SSLSupport getSSLSupport(SSLSession session) {
-        SSLSupport ssls = factory.getSSLSupport(session);
-        return ssls;
+        return new JSSESupport(session);
     }
 
 }