Mercurial Hosting > luan

comparison src/org/eclipse/jetty/http/MimeTypes.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 6be43ef1eb96
comparison
equal deleted inserted replaced
819:17bd0b170ed6 820:8e9db0bbf4f9
27 27
28 import org.eclipse.jetty.io.Buffer; 28 import org.eclipse.jetty.io.Buffer;
29 import org.eclipse.jetty.io.BufferCache; 29 import org.eclipse.jetty.io.BufferCache;
30 import org.eclipse.jetty.io.BufferCache.CachedBuffer; 30 import org.eclipse.jetty.io.BufferCache.CachedBuffer;
31 import org.eclipse.jetty.util.StringUtil; 31 import org.eclipse.jetty.util.StringUtil;
32 import org.eclipse.jetty.util.log.Log; 32 import org.slf4j.Logger;
33 import org.eclipse.jetty.util.log.Logger; 33 import org.slf4j.LoggerFactory;
34 34
35 35
36 /* ------------------------------------------------------------ */ 36 /* ------------------------------------------------------------ */
37 /** 37 /**
38 * 38 *
39 */ 39 */
40 public class MimeTypes 40 public class MimeTypes
41 { 41 {
42 private static final Logger LOG = Log.getLogger(MimeTypes.class); 42 private static final Logger LOG = LoggerFactory.getLogger(MimeTypes.class);
43 43
44 public final static String 44 public final static String
45 FORM_ENCODED="application/x-www-form-urlencoded", 45 FORM_ENCODED="application/x-www-form-urlencoded",
46 MESSAGE_HTTP="message/http", 46 MESSAGE_HTTP="message/http",
47 MULTIPART_BYTERANGES="multipart/byteranges", 47 MULTIPART_BYTERANGES="multipart/byteranges",
139 } 139 }
140 } 140 }
141 catch(MissingResourceException e) 141 catch(MissingResourceException e)
142 { 142 {
143 LOG.warn(e.toString()); 143 LOG.warn(e.toString());
144 LOG.debug(e); 144 LOG.debug("",e);
145 } 145 }
146 146
147 try 147 try
148 { 148 {
149 ResourceBundle encoding = ResourceBundle.getBundle("org/eclipse/jetty/http/encoding"); 149 ResourceBundle encoding = ResourceBundle.getBundle("org/eclipse/jetty/http/encoding");
155 } 155 }
156 } 156 }
157 catch(MissingResourceException e) 157 catch(MissingResourceException e)
158 { 158 {
159 LOG.warn(e.toString()); 159 LOG.warn(e.toString());
160 LOG.debug(e); 160 LOG.debug("",e);
161 } 161 }
162 162
163 163
164 TEXT_HTML_BUFFER.setAssociate("ISO-8859-1",TEXT_HTML_8859_1_BUFFER); 164 TEXT_HTML_BUFFER.setAssociate("ISO-8859-1",TEXT_HTML_8859_1_BUFFER);
165 TEXT_HTML_BUFFER.setAssociate("ISO_8859_1",TEXT_HTML_8859_1_BUFFER); 165 TEXT_HTML_BUFFER.setAssociate("ISO_8859_1",TEXT_HTML_8859_1_BUFFER);