comparison src/org/eclipse/jetty/util/resource/Resource.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 7fb7c1915788
comparison
equal deleted inserted replaced
819:17bd0b170ed6 820:8e9db0bbf4f9
34 import org.eclipse.jetty.util.B64Code; 34 import org.eclipse.jetty.util.B64Code;
35 import org.eclipse.jetty.util.IO; 35 import org.eclipse.jetty.util.IO;
36 import org.eclipse.jetty.util.Loader; 36 import org.eclipse.jetty.util.Loader;
37 import org.eclipse.jetty.util.StringUtil; 37 import org.eclipse.jetty.util.StringUtil;
38 import org.eclipse.jetty.util.URIUtil; 38 import org.eclipse.jetty.util.URIUtil;
39 import org.eclipse.jetty.util.log.Log; 39 import org.slf4j.Logger;
40 import org.eclipse.jetty.util.log.Logger; 40 import org.slf4j.LoggerFactory;
41 41
42 42
43 /* ------------------------------------------------------------ */ 43 /* ------------------------------------------------------------ */
44 /** 44 /**
45 * Abstract resource class. 45 * Abstract resource class.
46 */ 46 */
47 public abstract class Resource implements ResourceFactory 47 public abstract class Resource implements ResourceFactory
48 { 48 {
49 private static final Logger LOG = Log.getLogger(Resource.class); 49 private static final Logger LOG = LoggerFactory.getLogger(Resource.class);
50 public static boolean __defaultUseCaches = true; 50 public static boolean __defaultUseCaches = true;
51 volatile Object _associate; 51 volatile Object _associate;
52 52
53 /* ------------------------------------------------------------ */ 53 /* ------------------------------------------------------------ */
54 /** 54 /**
111 FileResource fileResource= new FileResource(url); 111 FileResource fileResource= new FileResource(url);
112 return fileResource; 112 return fileResource;
113 } 113 }
114 catch(Exception e) 114 catch(Exception e)
115 { 115 {
116 LOG.debug(Log.EXCEPTION,e); 116 LOG.debug("EXCEPTION",e);
117 return new BadResource(url,e.toString()); 117 return new BadResource(url,e.toString());
118 } 118 }
119 } 119 }
120 else if( url_string.startsWith( "jar:file:")) 120 else if( url_string.startsWith( "jar:file:"))
121 { 121 {
176 connection.setUseCaches(useCaches); 176 connection.setUseCaches(useCaches);
177 return new FileResource(url,connection,file); 177 return new FileResource(url,connection,file);
178 } 178 }
179 catch(Exception e2) 179 catch(Exception e2)
180 { 180 {
181 LOG.debug(Log.EXCEPTION,e2); 181 LOG.debug("EXCEPTION",e2);
182 throw e; 182 throw e;
183 } 183 }
184 } 184 }
185 else 185 else
186 { 186 {
438 { 438 {
439 return addPath(path); 439 return addPath(path);
440 } 440 }
441 catch(Exception e) 441 catch(Exception e)
442 { 442 {
443 LOG.debug(e); 443 LOG.debug("",e);
444 return null; 444 return null;
445 } 445 }
446 } 446 }
447 447
448 /* ------------------------------------------------------------ */ 448 /* ------------------------------------------------------------ */