diff src/org/eclipse/jetty/util/resource/JarFileResource.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
line wrap: on
line diff
--- a/src/org/eclipse/jetty/util/resource/JarFileResource.java	Fri Sep 09 17:10:47 2016 -0600
+++ b/src/org/eclipse/jetty/util/resource/JarFileResource.java	Tue Sep 13 23:13:06 2016 -0600
@@ -29,13 +29,13 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /* ------------------------------------------------------------ */
 class JarFileResource extends JarResource
 {
-    private static final Logger LOG = Log.getLogger(JarFileResource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JarFileResource.class);
     private JarFile _jarFile;
     private File _file;
     private String[] _list;
@@ -78,7 +78,7 @@
                 }
                 catch ( IOException ioe )
                 {
-                    LOG.ignore(ioe);
+                    LOG.trace("",ioe);
                 }
             }
         }
@@ -145,7 +145,7 @@
             
             String file_url=_urlString.substring(4,_urlString.length()-2);
             try{return newResource(file_url).exists();}
-            catch(Exception e) {LOG.ignore(e); return false;}
+            catch(Exception e) {LOG.trace("",e); return false;}
         }
         
         boolean check=checkConnection();
@@ -175,7 +175,7 @@
                 }
                 catch(Exception e)
                 {
-                       LOG.ignore(e);
+                       LOG.trace("",e);
                 }
             }
 
@@ -221,7 +221,7 @@
                     }
                     catch(MalformedURLException ex)
                     {
-                        LOG.warn(ex);
+                        LOG.warn("",ex);
                     }
                 }
             }
@@ -280,7 +280,7 @@
                 //by other code.
                 //So, do one retry to drop a connection and get a fresh JarFile
                 LOG.warn("Retrying list:"+e);
-                LOG.debug(e);
+                LOG.debug("",e);
                 release();
                 list = listEntries();
             }
@@ -314,7 +314,7 @@
             {
 
                 e.printStackTrace();
-                 LOG.ignore(e);
+                 LOG.trace("",e);
             }
         }