comparison src/org/eclipse/jetty/server/ssl/SslCertificates.java @ 820:8e9db0bbf4f9

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 1c0b6841cd32
comparison
equal deleted inserted replaced
819:17bd0b170ed6 820:8e9db0bbf4f9
29 import org.eclipse.jetty.http.HttpSchemes; 29 import org.eclipse.jetty.http.HttpSchemes;
30 import org.eclipse.jetty.io.EndPoint; 30 import org.eclipse.jetty.io.EndPoint;
31 import org.eclipse.jetty.io.bio.SocketEndPoint; 31 import org.eclipse.jetty.io.bio.SocketEndPoint;
32 import org.eclipse.jetty.server.Request; 32 import org.eclipse.jetty.server.Request;
33 import org.eclipse.jetty.util.TypeUtil; 33 import org.eclipse.jetty.util.TypeUtil;
34 import org.eclipse.jetty.util.log.Log; 34 import org.slf4j.Logger;
35 import org.eclipse.jetty.util.log.Logger; 35 import org.slf4j.LoggerFactory;
36 36
37 public class SslCertificates 37 public class SslCertificates
38 { 38 {
39 private static final Logger LOG = Log.getLogger(SslCertificates.class); 39 private static final Logger LOG = LoggerFactory.getLogger(SslCertificates.class);
40 40
41 /** 41 /**
42 * The name of the SSLSession attribute that will contain any cached information. 42 * The name of the SSLSession attribute that will contain any cached information.
43 */ 43 */
44 static final String CACHED_INFO_ATTR = CachedInfo.class.getName(); 44 static final String CACHED_INFO_ATTR = CachedInfo.class.getName();
68 { 68 {
69 return null; 69 return null;
70 } 70 }
71 catch (Exception e) 71 catch (Exception e)
72 { 72 {
73 LOG.warn(Log.EXCEPTION,e); 73 LOG.warn("EXCEPTION",e);
74 return null; 74 return null;
75 } 75 }
76 } 76 }
77 77
78 78
137 request.setAttribute("javax.servlet.request.key_size",keySize); 137 request.setAttribute("javax.servlet.request.key_size",keySize);
138 request.setAttribute("javax.servlet.request.ssl_session_id", idStr); 138 request.setAttribute("javax.servlet.request.ssl_session_id", idStr);
139 } 139 }
140 catch (Exception e) 140 catch (Exception e)
141 { 141 {
142 LOG.warn(Log.EXCEPTION,e); 142 LOG.warn("EXCEPTION",e);
143 } 143 }
144 } 144 }
145 145
146 /* ------------------------------------------------------------ */ 146 /* ------------------------------------------------------------ */
147 /* ------------------------------------------------------------ */ 147 /* ------------------------------------------------------------ */