OF-481: Moved from connector-based configuration to factory-based...

OF-481: Moved from connector-based configuration to factory-based configuration (as is preferred in later versions of Jetty).

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@12945 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java

@@ -24,16 +24,7 @@ import java.security.KeyStore;
 import java.security.cert.X509Certificate;
 import java.util.List;
 
-import javax.net.ssl.SSLContext;
-
-import org.jivesoftware.openfire.XMPPServer;
-import org.jivesoftware.openfire.net.SSLConfig;
-import org.jivesoftware.util.CertificateEventListener;
-import org.jivesoftware.util.CertificateManager;
-import org.jivesoftware.util.JiveGlobals;
-import org.jivesoftware.util.LocaleUtils;
-import org.jivesoftware.util.StringUtils;
-
+import org.eclipse.jetty.http.ssl.SslContextFactory;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
@@ -45,7 +36,13 @@ import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.webapp.WebAppContext;
-
+import org.jivesoftware.openfire.XMPPServer;
+import org.jivesoftware.openfire.net.SSLConfig;
+import org.jivesoftware.util.CertificateEventListener;
+import org.jivesoftware.util.CertificateManager;
+import org.jivesoftware.util.JiveGlobals;
+import org.jivesoftware.util.LocaleUtils;
+import org.jivesoftware.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -124,21 +121,21 @@ public class AdminConsolePlugin implements Plugin {
                         XMPPServer.getInstance().getServerInfo().getXMPPDomain())) {
                     Log.warn("Admin console: Using RSA certificates but they are not valid for the hosted domain");
                 }
-                         
-                SslSelectChannelConnector httpsConnector = new SslSelectChannelConnector();
+             
+                final SslContextFactory sslContextFactory = new SslContextFactory(SSLConfig.getKeystoreLocation());
+                sslContextFactory.setTrustStorePassword(SSLConfig.gets2sTrustPassword());
+                sslContextFactory.setTrustStoreType(SSLConfig.getStoreType());
+                sslContextFactory.setTrustStore(SSLConfig.gets2sTruststoreLocation());
+                sslContextFactory.setNeedClientAuth(false);
+                sslContextFactory.setWantClientAuth(false);
+                sslContextFactory.setKeyStorePassword(SSLConfig.getKeyPassword());
+                sslContextFactory.setKeyStoreType(SSLConfig.getStoreType());
+                
+                final SslSelectChannelConnector httpsConnector = new SslSelectChannelConnector(sslContextFactory);
                 String bindInterface = getBindInterface();
                 httpsConnector.setHost(bindInterface);
                 httpsConnector.setPort(adminSecurePort);
 
-                httpsConnector.setTrustPassword(SSLConfig.gets2sTrustPassword());
-                httpsConnector.setTruststoreType(SSLConfig.getStoreType());
-                httpsConnector.setTruststore(SSLConfig.gets2sTruststoreLocation());
-                httpsConnector.setNeedClientAuth(false);
-                httpsConnector.setWantClientAuth(false);
-
-                httpsConnector.setKeyPassword(SSLConfig.getKeyPassword());
-                httpsConnector.setKeystoreType(SSLConfig.getStoreType());
-                httpsConnector.setKeystore(SSLConfig.getKeystoreLocation());
                 adminServer.addConnector(httpsConnector);
 
                 sslEnabled = true;

src/java/org/jivesoftware/openfire/http/HttpBindManager.java

@@ -26,8 +26,7 @@ import java.security.cert.X509Certificate;
 import java.util.List;
 import java.util.Map;
 
-import javax.net.ssl.SSLContext;
-
+import org.eclipse.jetty.http.ssl.SslContextFactory;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
@@ -160,30 +159,30 @@ public final class HttpBindManager {
                             "the hosted domain");
                 }
 
-                SslSelectChannelConnector sslConnector = new SslSelectChannelConnector();
-                sslConnector.setHost(getBindInterface());
-                sslConnector.setPort(securePort);
-
-                sslConnector.setTrustPassword(SSLConfig.getc2sTrustPassword());
-                sslConnector.setTruststoreType(SSLConfig.getStoreType());
-                sslConnector.setTruststore(SSLConfig.getc2sTruststoreLocation());
+                final SslContextFactory sslContextFactory = new SslContextFactory(SSLConfig.getKeystoreLocation());
+                sslContextFactory.setTrustStorePassword(SSLConfig.getc2sTrustPassword());
+                sslContextFactory.setTrustStoreType(SSLConfig.getStoreType());
+                sslContextFactory.setTrustStore(SSLConfig.getc2sTruststoreLocation());
+                sslContextFactory.setKeyStorePassword(SSLConfig.getKeyPassword());
+                sslContextFactory.setKeyStoreType(SSLConfig.getStoreType());
 
                 // Set policy for checking client certificates
                 String certPol = JiveGlobals.getProperty("xmpp.client.cert.policy", "disabled");
                 if(certPol.equals("needed")) {                    
-                    sslConnector.setNeedClientAuth(true);
-                    sslConnector.setWantClientAuth(true);
+                	sslContextFactory.setNeedClientAuth(true);
+                	sslContextFactory.setWantClientAuth(true);
                 } else if(certPol.equals("wanted")) {
-                    sslConnector.setNeedClientAuth(false);
-                    sslConnector.setWantClientAuth(true);
+                	sslContextFactory.setNeedClientAuth(false);
+                	sslContextFactory.setWantClientAuth(true);
                 } else {
-                    sslConnector.setNeedClientAuth(false);
-                    sslConnector.setWantClientAuth(false);
+                	sslContextFactory.setNeedClientAuth(false);
+                	sslContextFactory.setWantClientAuth(false);
                 }
                 
-                sslConnector.setKeyPassword(SSLConfig.getKeyPassword());
-                sslConnector.setKeystoreType(SSLConfig.getStoreType());
-                sslConnector.setKeystore(SSLConfig.getKeystoreLocation());
+                final SslSelectChannelConnector sslConnector = new SslSelectChannelConnector();
+                sslConnector.setHost(getBindInterface());
+                sslConnector.setPort(securePort);
+                
                 httpsConnector = sslConnector;
             }
         }