Mercurial Hosting > luan

comparison src/org/eclipse/jetty/util/ssl/SslContextFactory.java @ 820:8e9db0bbf4f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove org.eclipse.jetty.util.log and upgrade slf4j
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 13 Sep 2016 23:13:06 -0600
parents 3428c60d7cfc
children 35d04ac3fd0b
comparison
equal deleted inserted replaced
819:17bd0b170ed6 820:8e9db0bbf4f9
54 import javax.net.ssl.X509KeyManager; 54 import javax.net.ssl.X509KeyManager;
55 import javax.net.ssl.X509TrustManager; 55 import javax.net.ssl.X509TrustManager;
56 56
57 import org.eclipse.jetty.util.IO; 57 import org.eclipse.jetty.util.IO;
58 import org.eclipse.jetty.util.component.AbstractLifeCycle; 58 import org.eclipse.jetty.util.component.AbstractLifeCycle;
59 import org.eclipse.jetty.util.log.Log; 59 import org.slf4j.Logger;
60 import org.eclipse.jetty.util.log.Logger; 60 import org.slf4j.LoggerFactory;
61 import org.eclipse.jetty.util.resource.Resource; 61 import org.eclipse.jetty.util.resource.Resource;
62 import org.eclipse.jetty.util.security.CertificateUtils; 62 import org.eclipse.jetty.util.security.CertificateUtils;
63 import org.eclipse.jetty.util.security.CertificateValidator; 63 import org.eclipse.jetty.util.security.CertificateValidator;
64 import org.eclipse.jetty.util.security.Password; 64 import org.eclipse.jetty.util.security.Password;
65 65
87 public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) 87 public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType)
88 { 88 {
89 } 89 }
90 }}; 90 }};
91 91
92 private static final Logger LOG = Log.getLogger(SslContextFactory.class); 92 private static final Logger LOG = LoggerFactory.getLogger(SslContextFactory.class);
93 93
94 public static final String DEFAULT_KEYMANAGERFACTORY_ALGORITHM = 94 public static final String DEFAULT_KEYMANAGERFACTORY_ALGORITHM =
95 (Security.getProperty("ssl.KeyManagerFactory.algorithm") == null ? 95 (Security.getProperty("ssl.KeyManagerFactory.algorithm") == null ?
96 "SunX509" : Security.getProperty("ssl.KeyManagerFactory.algorithm")); 96 "SunX509" : Security.getProperty("ssl.KeyManagerFactory.algorithm"));
97 public static final String DEFAULT_TRUSTMANAGERFACTORY_ALGORITHM = 97 public static final String DEFAULT_TRUSTMANAGERFACTORY_ALGORITHM =