Removed custom logger

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>

libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtService.java

@@ -25,13 +25,14 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.LastFmCoverArt;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.service.LastFmService;
 import org.libresonic.player.service.MediaFileService;
 import org.libresonic.player.service.SecurityService;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -48,7 +49,7 @@ import java.util.List;
  */
 public class CoverArtService {
 
-    private static final Logger LOG = Logger.getLogger(CoverArtService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CoverArtService.class);
 
     private SecurityService securityService;
     private MediaFileService mediaFileService;

libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsService.java

@@ -30,8 +30,9 @@ import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;
 import org.jdom.input.SAXBuilder;
-import org.libresonic.player.Logger;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -48,7 +49,7 @@ import java.net.SocketException;
  */
 public class LyricsService {
 
-    private static final Logger LOG = Logger.getLogger(LyricsService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LyricsService.class);
 
     /**
      * Returns lyrics for the given song and artist.

libresonic-main/src/main/java/org/libresonic/player/ajax/MultiService.java

@@ -20,12 +20,16 @@
 package org.libresonic.player.ajax;
 
 import org.directwebremoting.WebContextFactory;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.ArtistBio;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.domain.MusicFolder;
 import org.libresonic.player.domain.UserSettings;
-import org.libresonic.player.service.*;
+import org.libresonic.player.service.LastFmService;
+import org.libresonic.player.service.MediaFileService;
+import org.libresonic.player.service.SecurityService;
+import org.libresonic.player.service.SettingsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -43,7 +47,7 @@ import java.util.List;
  */
 public class MultiService {
 
-    private static final Logger LOG = Logger.getLogger(MultiService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MultiService.class);
 
     private MediaFileService mediaFileService;
     private LastFmService lastFmService;

libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingService.java

@@ -22,10 +22,11 @@ package org.libresonic.player.ajax;
 import org.apache.commons.lang.StringUtils;
 import org.directwebremoting.WebContext;
 import org.directwebremoting.WebContextFactory;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.service.*;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -41,7 +42,7 @@ import java.util.List;
  */
 public class NowPlayingService {
 
-    private static final Logger LOG = Logger.getLogger(NowPlayingService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NowPlayingService.class);
 
     private PlayerService playerService;
     private StatusService statusService;

libresonic-main/src/main/java/org/libresonic/player/ajax/StarService.java

@@ -21,10 +21,11 @@ package org.libresonic.player.ajax;
 
 import org.directwebremoting.WebContext;
 import org.directwebremoting.WebContextFactory;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.MediaFileDao;
 import org.libresonic.player.domain.User;
 import org.libresonic.player.service.SecurityService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides AJAX-enabled services for starring.
@@ -35,7 +36,7 @@ import org.libresonic.player.service.SecurityService;
  */
 public class StarService {
 
-    private static final Logger LOG = Logger.getLogger(StarService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StarService.class);
 
     private SecurityService securityService;
     private MediaFileDao mediaFileDao;

libresonic-main/src/main/java/org/libresonic/player/ajax/TagService.java

@@ -22,12 +22,13 @@ package org.libresonic.player.ajax;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.service.MediaFileService;
 import org.libresonic.player.service.metadata.MetaData;
 import org.libresonic.player.service.metadata.MetaDataParser;
 import org.libresonic.player.service.metadata.MetaDataParserFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides AJAX-enabled services for editing tags in music files.
@@ -37,7 +38,7 @@ import org.libresonic.player.service.metadata.MetaDataParserFactory;
  */
 public class TagService {
 
-    private static final Logger LOG = Logger.getLogger(TagService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TagService.class);
 
     private MetaDataParserFactory metaDataParserFactory;
     private MediaFileService mediaFileService;

libresonic-main/src/main/java/org/libresonic/player/boot/Application.java

@@ -2,9 +2,10 @@ package org.libresonic.player.boot;
 
 import net.sf.ehcache.constructs.web.ShutdownListener;
 import org.directwebremoting.servlet.DwrServlet;
-import org.libresonic.player.Logger;
 import org.libresonic.player.filter.*;
 import org.libresonic.player.spring.LibresonicPropertySourceConfigurer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
@@ -42,7 +43,7 @@ import java.lang.reflect.Method;
         "classpath:/libresonic-servlet.xml"})
 public class Application extends SpringBootServletInitializer implements EmbeddedServletContainerCustomizer {
 
-    private static final Logger LOG = Logger.getLogger(Application.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Application.class);
 
     /**
      * Registers the DWR servlet.

libresonic-main/src/main/java/org/libresonic/player/cache/CacheFactory.java

@@ -23,8 +23,9 @@ import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Ehcache;
 import net.sf.ehcache.config.Configuration;
 import net.sf.ehcache.config.ConfigurationFactory;
-import org.libresonic.player.Logger;
 import org.libresonic.player.service.SettingsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 
 import java.io.File;
@@ -37,7 +38,7 @@ import java.io.File;
  */
 public class CacheFactory implements InitializingBean {
 
-    private static final Logger LOG = Logger.getLogger(CacheFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CacheFactory.class);
     private CacheManager cacheManager;
 
     public void afterPropertiesSet() throws Exception {

libresonic-main/src/main/java/org/libresonic/player/controller/AccessDeniedController.java

@@ -1,6 +1,7 @@
 package org.libresonic.player.controller;
 
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,7 +18,7 @@ import javax.servlet.http.HttpServletResponse;
 public class AccessDeniedController {
 
 
-    private static final Logger LOG = Logger.getLogger(AccessDeniedController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccessDeniedController.class);
 
     @RequestMapping(method = {RequestMethod.GET})
     public ModelAndView accessDenied(HttpServletRequest request, HttpServletResponse response) {

libresonic-main/src/main/java/org/libresonic/player/controller/AvatarUploadController.java

@@ -25,11 +25,12 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.Avatar;
 import org.libresonic.player.service.SecurityService;
 import org.libresonic.player.service.SettingsService;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -57,7 +58,7 @@ import java.util.Map;
 @RequestMapping("/avatarUpload")
 public class AvatarUploadController  {
 
-    private static final Logger LOG = Logger.getLogger(AvatarUploadController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AvatarUploadController.class);
     private static final int MAX_AVATAR_SIZE = 64;
 
     @Autowired

libresonic-main/src/main/java/org/libresonic/player/controller/CoverArtController.java

@@ -22,13 +22,14 @@ package org.libresonic.player.controller;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.AlbumDao;
 import org.libresonic.player.dao.ArtistDao;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.service.*;
 import org.libresonic.player.service.metadata.JaudiotaggerParser;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.ServletRequestUtils;
@@ -65,7 +66,7 @@ public class CoverArtController implements LastModified {
     public static final String PLAYLIST_COVERART_PREFIX = "pl-";
     public static final String PODCAST_COVERART_PREFIX = "pod-";
 
-    private static final Logger LOG = Logger.getLogger(CoverArtController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CoverArtController.class);
 
     @Autowired
     private MediaFileService mediaFileService;

libresonic-main/src/main/java/org/libresonic/player/controller/DownloadController.java

@@ -21,13 +21,14 @@ package org.libresonic.player.controller;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.io.RangeOutputStream;
 import org.libresonic.player.service.*;
 import org.libresonic.player.util.FileUtil;
 import org.libresonic.player.util.HttpRange;
 import org.libresonic.player.util.Util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.ServletRequestBindingException;
@@ -60,7 +61,7 @@ import java.util.zip.ZipOutputStream;
 @RequestMapping("/download")
 public class DownloadController implements LastModified {
 
-    private static final Logger LOG = Logger.getLogger(DownloadController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DownloadController.class);
 
     @Autowired
     private PlayerService playerService;

libresonic-main/src/main/java/org/libresonic/player/controller/ExportPlayListController.java

@@ -1,10 +1,11 @@
 package org.libresonic.player.controller;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.Playlist;
 import org.libresonic.player.service.PlaylistService;
 import org.libresonic.player.service.SecurityService;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.ServletRequestUtils;
@@ -23,7 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 public class ExportPlayListController {
 
 
-    private static final Logger LOG = Logger.getLogger(ExportPlayListController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ExportPlayListController.class);
 
     @Autowired
     private PlaylistService playlistService;

libresonic-main/src/main/java/org/libresonic/player/controller/HelpController.java

@@ -20,10 +20,11 @@
 package org.libresonic.player.controller;
 
 import org.apache.commons.io.input.ReversedLinesFileReader;
-import org.libresonic.player.Logger;
 import org.libresonic.player.service.SecurityService;
 import org.libresonic.player.service.SettingsService;
 import org.libresonic.player.service.VersionService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -49,7 +50,7 @@ import java.util.Map;
 @RequestMapping("/help")
 public class HelpController {
 
-    private static final Logger logger = Logger.getLogger(HelpController.class);
+    private static final Logger logger = LoggerFactory.getLogger(HelpController.class);
 
     private static final int LOG_LINES_TO_SHOW = 50;
 

libresonic-main/src/main/java/org/libresonic/player/controller/IndexController.java

@@ -1,9 +1,10 @@
 package org.libresonic.player.controller;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.UserSettings;
 import org.libresonic.player.service.SecurityService;
 import org.libresonic.player.service.SettingsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,7 +21,7 @@ import java.util.Map;
 public class IndexController {
 
 
-    private static final Logger LOG = Logger.getLogger(IndexController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(IndexController.class);
 
     @Autowired
     private SecurityService securityService;

libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java

@@ -25,12 +25,13 @@ import org.eclipse.persistence.jaxb.MarshallerProperties;
 import org.jdom.Attribute;
 import org.jdom.Document;
 import org.jdom.input.SAXBuilder;
-import org.libresonic.player.Logger;
 import org.libresonic.player.util.StringUtil;
 import org.libresonic.restapi.Error;
 import org.libresonic.restapi.ObjectFactory;
 import org.libresonic.restapi.Response;
 import org.libresonic.restapi.ResponseStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -52,7 +53,7 @@ import static org.springframework.web.bind.ServletRequestUtils.getStringParamete
  */
 public class JAXBWriter {
 
-    private static final Logger LOG = Logger.getLogger(JAXBWriter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JAXBWriter.class);
 
     private final javax.xml.bind.JAXBContext jaxbContext;
     private final DatatypeFactory datatypeFactory;

libresonic-main/src/main/java/org/libresonic/player/controller/LoginController.java

@@ -1,10 +1,11 @@
 package org.libresonic.player.controller;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.User;
 import org.libresonic.player.service.SecurityService;
 import org.libresonic.player.service.SettingsService;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.stereotype.Controller;
@@ -26,7 +27,7 @@ import java.util.Map;
 public class LoginController {
 
 
-    private static final Logger LOG = Logger.getLogger(LoginController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoginController.class);
 
     @Autowired
     private SecurityService securityService;

libresonic-main/src/main/java/org/libresonic/player/controller/NotFoundController.java

@@ -1,6 +1,7 @@
 package org.libresonic.player.controller;
 
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,7 +18,7 @@ import javax.servlet.http.HttpServletResponse;
 public class NotFoundController {
 
 
-    private static final Logger LOG = Logger.getLogger(NotFoundController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NotFoundController.class);
 
     @RequestMapping(method = {RequestMethod.GET})
     public ModelAndView notFound(HttpServletRequest request, HttpServletResponse response) {

libresonic-main/src/main/java/org/libresonic/player/controller/RESTController.java

@@ -20,7 +20,6 @@
 package org.libresonic.player.controller;
 
 import org.apache.commons.lang.StringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.ajax.LyricsInfo;
 import org.libresonic.player.ajax.LyricsService;
 import org.libresonic.player.ajax.PlayQueueService;
@@ -45,6 +44,8 @@ import org.libresonic.player.util.Util;
 import org.libresonic.restapi.*;
 import org.libresonic.restapi.Genres;
 import org.libresonic.restapi.PodcastStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.ServletRequestUtils;
@@ -75,7 +76,7 @@ import static org.springframework.web.bind.ServletRequestUtils.*;
 @Controller
 public class RESTController {
 
-    private static final Logger LOG = Logger.getLogger(RESTController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RESTController.class);
 
     @Autowired
     private SettingsService settingsService;

libresonic-main/src/main/java/org/libresonic/player/controller/RecoverController.java

@@ -5,10 +5,11 @@ import net.tanesha.recaptcha.ReCaptchaFactory;
 import net.tanesha.recaptcha.ReCaptchaResponse;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.User;
 import org.libresonic.player.service.SecurityService;
 import org.libresonic.player.service.SettingsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,7 +37,7 @@ import java.util.Properties;
 public class RecoverController {
 
 
-    private static final Logger LOG = Logger.getLogger(RecoverController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RecoverController.class);
 
     @Autowired
     private SettingsService settingsService;

libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java

@@ -20,7 +20,6 @@
 package org.libresonic.player.controller;
 
 import org.apache.commons.io.IOUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.io.PlayQueueInputStream;
 import org.libresonic.player.io.RangeOutputStream;
@@ -31,6 +30,8 @@ import org.libresonic.player.service.sonos.SonosHelper;
 import org.libresonic.player.util.HttpRange;
 import org.libresonic.player.util.StringUtil;
 import org.libresonic.player.util.Util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -61,7 +62,7 @@ import java.util.regex.Pattern;
 @RequestMapping(value = {"/stream/**", "/ext/stream/**"})
 public class StreamController  {
 
-    private static final Logger LOG = Logger.getLogger(StreamController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StreamController.class);
 
     @Autowired
     private StatusService statusService;

libresonic-main/src/main/java/org/libresonic/player/controller/TestController.java

@@ -1,6 +1,7 @@
 package org.libresonic.player.controller;
 
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,7 +18,7 @@ import javax.servlet.http.HttpServletResponse;
 public class TestController {
 
 
-    private static final Logger LOG = Logger.getLogger(TestController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TestController.class);
 
     @RequestMapping(method = {RequestMethod.GET})
     public ModelAndView test(HttpServletRequest request, HttpServletResponse response) {

libresonic-main/src/main/java/org/libresonic/player/controller/UploadController.java

@@ -25,7 +25,6 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.IOUtils;
 import org.apache.tools.zip.ZipEntry;
 import org.apache.tools.zip.ZipFile;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.TransferStatus;
 import org.libresonic.player.domain.User;
 import org.libresonic.player.service.PlayerService;
@@ -35,6 +34,8 @@ import org.libresonic.player.service.StatusService;
 import org.libresonic.player.upload.MonitoredDiskFileItemFactory;
 import org.libresonic.player.upload.UploadListener;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -58,7 +59,7 @@ import java.util.*;
 @RequestMapping("/upload")
 public class UploadController {
 
-    private static final Logger LOG = Logger.getLogger(UploadController.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UploadController.class);
 
     @Autowired
     private SecurityService securityService;

libresonic-main/src/main/java/org/libresonic/player/dao/ArtistDao.java

@@ -19,9 +19,10 @@
  */
 package org.libresonic.player.dao;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.Artist;
 import org.libresonic.player.domain.MusicFolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -36,7 +37,7 @@ import java.util.*;
  */
 public class ArtistDao extends AbstractDao {
 
-    private static final Logger LOG = Logger.getLogger(ArtistDao.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ArtistDao.class);
     private static final String INSERT_COLUMNS = "name, cover_art_path, album_count, last_scanned, present, folder_id";
     private static final String QUERY_COLUMNS = "id, " + INSERT_COLUMNS;
 

libresonic-main/src/main/java/org/libresonic/player/dao/InternetRadioDao.java

@@ -19,8 +19,9 @@
  */
 package org.libresonic.player.dao;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.InternetRadio;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;
@@ -34,7 +35,7 @@ import java.util.List;
  */
 public class InternetRadioDao extends AbstractDao {
 
-    private static final Logger LOG = Logger.getLogger(InternetRadioDao.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InternetRadioDao.class);
     private static final String INSERT_COLUMNS = "name, stream_url, homepage_url, enabled, changed";
     private static final String QUERY_COLUMNS = "id, " + INSERT_COLUMNS;
     private final InternetRadioRowMapper rowMapper = new InternetRadioRowMapper();

libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java

@@ -19,8 +19,9 @@
  */
 package org.libresonic.player.dao;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.MusicFolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.io.File;
@@ -35,7 +36,7 @@ import java.util.List;
  */
 public class MusicFolderDao extends AbstractDao {
 
-    private static final Logger LOG = Logger.getLogger(MusicFolderDao.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MusicFolderDao.class);
     private static final String INSERT_COLUMNS = "path, name, enabled, changed";
     private static final String QUERY_COLUMNS = "id, " + INSERT_COLUMNS;
     private final MusicFolderRowMapper rowMapper = new MusicFolderRowMapper();

libresonic-main/src/main/java/org/libresonic/player/dao/PlayerDao.java

@@ -19,8 +19,9 @@
  */
 package org.libresonic.player.dao;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,7 +36,7 @@ import java.util.*;
  */
 public class PlayerDao extends AbstractDao {
 
-    private static final Logger LOG = Logger.getLogger(PlayerDao.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PlayerDao.class);
     private static final String INSERT_COLUMNS = "name, type, username, ip_address, auto_control_enabled, m3u_bom_enabled, " +
                                                  "last_seen, cover_art_scheme, transcode_scheme, dynamic_ip, technology, client_id";
     private static final String QUERY_COLUMNS = "id, " + INSERT_COLUMNS;

libresonic-main/src/main/java/org/libresonic/player/dao/PlaylistDao.java

@@ -19,9 +19,10 @@
  */
 package org.libresonic.player.dao;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.domain.Playlist;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -36,7 +37,7 @@ import java.util.*;
  */
 public class PlaylistDao extends AbstractDao {
 
-    private static final Logger LOG = Logger.getLogger(PlaylistDao.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PlaylistDao.class);
     private static final String INSERT_COLUMNS = "username, is_public, name, comment, file_count, duration_seconds, " +
                                                 "created, changed, imported_from";
     private static final String QUERY_COLUMNS = "id, " + INSERT_COLUMNS;

libresonic-main/src/main/java/org/libresonic/player/dao/TranscodingDao.java

@@ -19,8 +19,9 @@
  */
 package org.libresonic.player.dao;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.Transcoding;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,7 +36,7 @@ import java.util.List;
  */
 public class TranscodingDao extends AbstractDao {
 
-    private static final Logger LOG = Logger.getLogger(TranscodingDao.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TranscodingDao.class);
     private static final String INSERT_COLUMNS = "name, source_formats, target_format, step1, step2, step3, default_active";
     private static final String QUERY_COLUMNS = "id, " + INSERT_COLUMNS;
     private TranscodingRowMapper rowMapper = new TranscodingRowMapper();

libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java

@@ -19,9 +19,10 @@
  */
 package org.libresonic.player.dao;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -37,7 +38,7 @@ import java.util.List;
 @Transactional
 public class UserDao extends AbstractDao {
 
-    private static final Logger LOG = Logger.getLogger(UserDao.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UserDao.class);
     private static final String USER_COLUMNS = "username, password, email, ldap_authenticated, bytes_streamed, bytes_downloaded, bytes_uploaded";
     private static final String USER_SETTINGS_COLUMNS = "username, locale, theme_id, final_version_notification, beta_version_notification, " +
             "song_notification, main_track_number, main_artist, main_album, main_genre, " +

libresonic-main/src/main/java/org/libresonic/player/domain/MediaLibraryStatistics.java

@@ -19,8 +19,9 @@
  */
 package org.libresonic.player.domain;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Contains media libaray statistics, including the number of artists, albums and songs.
@@ -30,7 +31,7 @@ import org.libresonic.player.util.StringUtil;
  */
 public class MediaLibraryStatistics {
 
-    private static final Logger LOG = Logger.getLogger(MediaLibraryStatistics.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MediaLibraryStatistics.class);
 
     private int artistCount;
     private int albumCount;

libresonic-main/src/main/java/org/libresonic/player/filter/BootstrapVerificationFilter.java

@@ -19,8 +19,9 @@
  */
 package org.libresonic.player.filter;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.service.SettingsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +43,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public class BootstrapVerificationFilter implements Filter {
 
-    private static final Logger LOG = Logger.getLogger(BootstrapVerificationFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BootstrapVerificationFilter.class);
     private boolean libresonicHomeVerified = false;
     private final AtomicBoolean serverInfoLogged = new AtomicBoolean();
 

libresonic-main/src/main/java/org/libresonic/player/filter/ParameterDecodingFilter.java

@@ -19,8 +19,9 @@
  */
 package org.libresonic.player.filter;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -44,7 +45,7 @@ import java.util.Vector;
 public class ParameterDecodingFilter implements Filter {
 
     public static final String PARAM_SUFFIX = "Utf8Hex";
-    private static final Logger LOG = Logger.getLogger(ParameterDecodingFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ParameterDecodingFilter.class);
 
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
             throws IOException, ServletException {

libresonic-main/src/main/java/org/libresonic/player/filter/RESTFilter.java

@@ -19,9 +19,10 @@
  */
 package org.libresonic.player.filter;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.controller.JAXBWriter;
 import org.libresonic.player.controller.RESTController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.ServletRequestBindingException;
 import org.springframework.web.util.NestedServletException;
 
@@ -44,7 +45,7 @@ import static org.libresonic.player.controller.RESTController.ErrorCode.MISSING_
  */
 public class RESTFilter implements Filter {
 
-    private static final Logger LOG = Logger.getLogger(RESTFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RESTFilter.class);
 
     private final JAXBWriter jaxbWriter = new JAXBWriter();
 

libresonic-main/src/main/java/org/libresonic/player/io/InputStreamReaderThread.java

@@ -20,7 +20,8 @@
 package org.libresonic.player.io;
 
 import org.apache.commons.io.IOUtils;
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -35,7 +36,7 @@ import java.io.InputStreamReader;
  */
 public class InputStreamReaderThread extends Thread {
 
-    private static final Logger LOG = Logger.getLogger(InputStreamReaderThread.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InputStreamReaderThread.class);
 
     private InputStream input;
     private String name;

libresonic-main/src/main/java/org/libresonic/player/io/PlayQueueInputStream.java

@@ -19,7 +19,6 @@
  */
 package org.libresonic.player.io;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.service.AudioScrobblerService;
 import org.libresonic.player.service.MediaFileService;
@@ -27,6 +26,8 @@ import org.libresonic.player.service.SearchService;
 import org.libresonic.player.service.TranscodingService;
 import org.libresonic.player.service.sonos.SonosHelper;
 import org.libresonic.player.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,7 +40,7 @@ import java.util.List;
  */
 public class PlayQueueInputStream extends InputStream {
 
-    private static final Logger LOG = Logger.getLogger(PlayQueueInputStream.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PlayQueueInputStream.class);
 
     private final Player player;
     private final TransferStatus status;

libresonic-main/src/main/java/org/libresonic/player/io/ShoutCastOutputStream.java

@@ -20,10 +20,11 @@
 package org.libresonic.player.io;
 
 import org.apache.commons.lang.StringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.domain.PlayQueue;
 import org.libresonic.player.service.SettingsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -39,7 +40,7 @@ import java.io.UnsupportedEncodingException;
  */
 public class ShoutCastOutputStream extends OutputStream {
 
-    private static final Logger LOG = Logger.getLogger(ShoutCastOutputStream.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ShoutCastOutputStream.class);
 
     /**
      * Number of bytes between each SHOUTcast metadata block.

libresonic-main/src/main/java/org/libresonic/player/io/TranscodeInputStream.java

@@ -20,7 +20,8 @@
 package org.libresonic.player.io;
 
 import org.apache.commons.io.IOUtils;
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,7 +37,7 @@ import java.io.OutputStream;
  */
 public class TranscodeInputStream extends InputStream {
 
-    private static final Logger LOG = Logger.getLogger(TranscodeInputStream.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TranscodeInputStream.class);
 
     private InputStream processInputStream;
     private OutputStream processOutputStream;

libresonic-main/src/main/java/org/libresonic/player/security/LibresonicUserDetailsContextMapper.java

@@ -16,10 +16,11 @@
 
 package org.libresonic.player.security;
 
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.User;
 import org.libresonic.player.service.SecurityService;
 import org.libresonic.player.service.SettingsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DirContextOperations;
@@ -39,7 +40,7 @@ public class LibresonicUserDetailsContextMapper implements UserDetailsContextMap
     // ~ Instance fields
     // ================================================================================================
 
-    private final Logger logger = Logger.getLogger(LibresonicUserDetailsContextMapper.class);
+    private final Logger logger = LoggerFactory.getLogger(LibresonicUserDetailsContextMapper.class);
     private String passwordAttributeName = "userPassword";
 
     @Autowired

libresonic-main/src/main/java/org/libresonic/player/security/RESTRequestParameterProcessingFilter.java

@@ -21,13 +21,14 @@ package org.libresonic.player.security;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.controller.JAXBWriter;
 import org.libresonic.player.controller.RESTController;
 import org.libresonic.player.domain.User;
 import org.libresonic.player.domain.Version;
 import org.libresonic.player.service.SecurityService;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.authentication.AuthenticationDetailsSource;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -59,7 +60,7 @@ import java.io.IOException;
  */
 public class RESTRequestParameterProcessingFilter implements Filter {
 
-    private static final Logger LOG = Logger.getLogger(RESTRequestParameterProcessingFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RESTRequestParameterProcessingFilter.class);
 
     private final JAXBWriter jaxbWriter = new JAXBWriter();
     private AuthenticationManager authenticationManager;

libresonic-main/src/main/java/org/libresonic/player/service/ApacheCommonsConfigurationService.java

@@ -6,7 +6,8 @@ import org.apache.commons.configuration2.builder.fluent.Parameters;
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.configuration2.sync.ReadWriteSynchronizer;
 import org.apache.commons.io.FileUtils;
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,7 +15,7 @@ import java.util.HashMap;
 
 public class ApacheCommonsConfigurationService {
 
-    private static final Logger LOG = Logger.getLogger(ApacheCommonsConfigurationService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ApacheCommonsConfigurationService.class);
 
     private final FileBasedConfigurationBuilder<FileBasedConfiguration> builder;
 

libresonic-main/src/main/java/org/libresonic/player/service/AudioScrobblerService.java

@@ -31,10 +31,11 @@ import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.domain.UserSettings;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.*;
@@ -50,7 +51,7 @@ import java.util.concurrent.LinkedBlockingQueue;
  */
 public class AudioScrobblerService {
 
-    private static final Logger LOG = Logger.getLogger(AudioScrobblerService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AudioScrobblerService.class);
     private static final int MAX_PENDING_REGISTRATION = 2000;
 
     private RegistrationThread thread;

libresonic-main/src/main/java/org/libresonic/player/service/JukeboxService.java

@@ -20,10 +20,11 @@
 package org.libresonic.player.service;
 
 import org.apache.commons.io.IOUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.service.jukebox.AudioPlayer;
 import org.libresonic.player.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.InputStream;
 
@@ -36,7 +37,7 @@ import static org.libresonic.player.service.jukebox.AudioPlayer.State.EOM;
  */
 public class JukeboxService implements AudioPlayer.Listener {
 
-    private static final Logger LOG = Logger.getLogger(JukeboxService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JukeboxService.class);
 
     private AudioPlayer audioPlayer;
     private TranscodingService transcodingService;

libresonic-main/src/main/java/org/libresonic/player/service/LastFmService.java

@@ -23,16 +23,15 @@ import com.google.common.base.Function;
 import com.google.common.base.Predicates;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Lists;
+import de.umass.lastfm.*;
 import de.umass.lastfm.Album;
 import de.umass.lastfm.Artist;
-import de.umass.lastfm.Caller;
-import de.umass.lastfm.ImageSize;
-import de.umass.lastfm.Track;
 import org.apache.commons.lang.StringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.ArtistDao;
 import org.libresonic.player.dao.MediaFileDao;
 import org.libresonic.player.domain.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -50,7 +49,7 @@ public class LastFmService {
 
     private static final String LAST_FM_KEY = "ece4499898a9440896dfdce5dab26bbf";
     private static final long CACHE_TIME_TO_LIVE_MILLIS = 6 * 30 * 24 * 3600 * 1000L; // 6 months
-    private static final Logger LOG = Logger.getLogger(LastFmService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LastFmService.class);
 
     private MediaFileDao mediaFileDao;
     private MediaFileService mediaFileService;

libresonic-main/src/main/java/org/libresonic/player/service/MediaFileService.java

@@ -23,7 +23,6 @@ import net.sf.ehcache.Ehcache;
 import net.sf.ehcache.Element;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.StringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.AlbumDao;
 import org.libresonic.player.dao.MediaFileDao;
 import org.libresonic.player.domain.*;
@@ -32,6 +31,8 @@ import org.libresonic.player.service.metadata.MetaData;
 import org.libresonic.player.service.metadata.MetaDataParser;
 import org.libresonic.player.service.metadata.MetaDataParserFactory;
 import org.libresonic.player.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -46,7 +47,7 @@ import static org.libresonic.player.domain.MediaFile.MediaType.*;
  */
 public class MediaFileService {
 
-    private static final Logger LOG = Logger.getLogger(MediaFileService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MediaFileService.class);
 
     private Ehcache mediaFileMemoryCache;
     private SecurityService securityService;

libresonic-main/src/main/java/org/libresonic/player/service/MediaScannerService.java

@@ -21,12 +21,13 @@ package org.libresonic.player.service;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.time.DateUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.AlbumDao;
 import org.libresonic.player.dao.ArtistDao;
 import org.libresonic.player.dao.MediaFileDao;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.*;
@@ -39,7 +40,7 @@ import java.util.*;
 public class MediaScannerService {
 
     private static final int INDEX_VERSION = 15;
-    private static final Logger LOG = Logger.getLogger(MediaScannerService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MediaScannerService.class);
 
     private MediaLibraryStatistics statistics;
 

libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java

@@ -20,7 +20,8 @@
 package org.libresonic.player.service;
 
 import org.apache.commons.lang3.StringUtils;
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.util.UrlPathHelper;
 
 import javax.servlet.http.HttpServletRequest;
@@ -38,7 +39,7 @@ public class NetworkService {
     private static final String X_FORWARDED_PROTO = "X-Forwarded-Proto";
     private static final String X_FORWARDED_HOST = "X-Forwarded-Host";
 
-    private final static Logger LOG = Logger.getLogger(NetworkService.class);
+    private final static Logger LOG = LoggerFactory.getLogger(NetworkService.class);
 
     public static String getBaseUrl(HttpServletRequest request) {
         try {

libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java

@@ -27,7 +27,6 @@ import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.jdom.Namespace;
 import org.jdom.input.SAXBuilder;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.MediaFileDao;
 import org.libresonic.player.dao.PlaylistDao;
 import org.libresonic.player.domain.MediaFile;
@@ -37,6 +36,8 @@ import org.libresonic.player.domain.User;
 import org.libresonic.player.util.Pair;
 import org.libresonic.player.util.StringUtil;
 import org.libresonic.player.util.Util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.nio.charset.Charset;
@@ -52,7 +53,7 @@ import java.util.regex.Pattern;
  */
 public class PlaylistService {
 
-    private static final Logger LOG = Logger.getLogger(PlaylistService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PlaylistService.class);
     private MediaFileService mediaFileService;
     private MediaFileDao mediaFileDao;
     private PlaylistDao playlistDao;

libresonic-main/src/main/java/org/libresonic/player/service/PodcastService.java

@@ -37,7 +37,6 @@ import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;
 import org.jdom.input.SAXBuilder;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.PodcastDao;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.domain.PodcastChannel;
@@ -47,6 +46,8 @@ import org.libresonic.player.service.metadata.MetaData;
 import org.libresonic.player.service.metadata.MetaDataParser;
 import org.libresonic.player.service.metadata.MetaDataParserFactory;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -64,7 +65,7 @@ import java.util.concurrent.*;
  */
 public class PodcastService {
 
-    private static final Logger LOG = Logger.getLogger(PodcastService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PodcastService.class);
     private static final DateFormat[] RSS_DATE_FORMATS = {new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.US),
             new SimpleDateFormat("dd MMM yyyy HH:mm:ss Z", Locale.US)};
 

libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java

@@ -40,11 +40,12 @@ import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.NumericUtils;
 import org.apache.lucene.util.Version;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.AlbumDao;
 import org.libresonic.player.dao.ArtistDao;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -63,7 +64,7 @@ import static org.libresonic.player.service.SearchService.IndexType.*;
  */
 public class SearchService {
 
-    private static final Logger LOG = Logger.getLogger(SearchService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SearchService.class);
 
     private static final String FIELD_ID = "id";
     private static final String FIELD_TITLE = "title";

libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java

@@ -20,12 +20,13 @@
 package org.libresonic.player.service;
 
 import net.sf.ehcache.Ehcache;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.UserDao;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.domain.MusicFolder;
 import org.libresonic.player.domain.User;
 import org.libresonic.player.util.FileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -47,7 +48,7 @@ import java.util.List;
  */
 public class SecurityService implements UserDetailsService {
 
-    private static final Logger LOG = Logger.getLogger(SecurityService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SecurityService.class);
 
     private UserDao userDao;
     private SettingsService settingsService;

libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java

@@ -20,7 +20,6 @@
 package org.libresonic.player.service;
 
 import org.apache.commons.lang.StringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.AvatarDao;
 import org.libresonic.player.dao.InternetRadioDao;
 import org.libresonic.player.dao.MusicFolderDao;
@@ -30,6 +29,8 @@ import org.libresonic.player.spring.DataSourceConfigType;
 import org.libresonic.player.util.FileUtil;
 import org.libresonic.player.util.StringUtil;
 import org.libresonic.player.util.Util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -205,7 +206,7 @@ public class SettingsService {
     private static final String LOCALES_FILE = "/org/libresonic/player/i18n/locales.txt";
     private static final String THEMES_FILE = "/org/libresonic/player/theme/themes.txt";
 
-    private static final Logger LOG = Logger.getLogger(SettingsService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SettingsService.class);
 
     private List<Theme> themes;
     private List<Locale> locales;

libresonic-main/src/main/java/org/libresonic/player/service/ShareService.java

@@ -21,14 +21,21 @@ package org.libresonic.player.service;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.RandomStringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.dao.ShareDao;
-import org.libresonic.player.domain.*;
+import org.libresonic.player.domain.MediaFile;
+import org.libresonic.player.domain.MusicFolder;
+import org.libresonic.player.domain.Share;
+import org.libresonic.player.domain.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import javax.servlet.http.HttpServletRequest;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 /**
  * Provides services for sharing media.
@@ -38,7 +45,7 @@ import java.util.*;
  */
 public class ShareService {
 
-    private static final Logger LOG = Logger.getLogger(ShareService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ShareService.class);
 
     private ShareDao shareDao;
     private SecurityService securityService;

libresonic-main/src/main/java/org/libresonic/player/service/SonosService.java

@@ -28,7 +28,6 @@ import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxb.JAXBDataBinding;
 import org.apache.cxf.jaxws.context.WrappedMessageContext;
 import org.apache.cxf.message.Message;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.AlbumListType;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.domain.Playlist;
@@ -36,6 +35,8 @@ import org.libresonic.player.domain.User;
 import org.libresonic.player.service.sonos.SonosHelper;
 import org.libresonic.player.service.sonos.SonosServiceRegistration;
 import org.libresonic.player.service.sonos.SonosSoapFault;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 
 import javax.annotation.Resource;
@@ -61,7 +62,7 @@ import java.util.concurrent.ConcurrentSkipListMap;
  */
 public class SonosService implements SonosSoap {
 
-    private static final Logger LOG = Logger.getLogger(SonosService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SonosService.class);
 
     public static final String ID_ROOT = "root";
     public static final String ID_SHUFFLE = "shuffle";

libresonic-main/src/main/java/org/libresonic/player/service/TranscodingService.java

@@ -23,13 +23,14 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.filefilter.PrefixFileFilter;
 import org.apache.commons.lang.StringUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.controller.VideoPlayerController;
 import org.libresonic.player.dao.TranscodingDao;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.io.TranscodeInputStream;
 import org.libresonic.player.util.StringUtil;
 import org.libresonic.player.util.Util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -49,7 +50,7 @@ import java.util.List;
  */
 public class TranscodingService {
 
-    private static final Logger LOG = Logger.getLogger(TranscodingService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TranscodingService.class);
     public static final String FORMAT_RAW = "raw";
 
     private TranscodingDao transcodingDao;

libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java

@@ -32,10 +32,11 @@ import org.fourthline.cling.support.connectionmanager.ConnectionManagerService;
 import org.fourthline.cling.support.model.ProtocolInfos;
 import org.fourthline.cling.support.model.dlna.DLNAProfiles;
 import org.fourthline.cling.support.model.dlna.DLNAProtocolInfo;
-import org.libresonic.player.Logger;
 import org.libresonic.player.service.upnp.ApacheUpnpServiceConfiguration;
 import org.libresonic.player.service.upnp.FolderBasedContentDirectory;
 import org.libresonic.player.service.upnp.MSMediaReceiverRegistrarService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -47,7 +48,7 @@ import java.util.List;
  */
 public class UPnPService {
 
-    private static final Logger LOG = Logger.getLogger(UPnPService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UPnPService.class);
 
     private SettingsService settingsService;
     private UpnpService upnpService;

libresonic-main/src/main/java/org/libresonic/player/service/VersionService.java

@@ -26,8 +26,9 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.Version;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.text.DateFormat;
@@ -45,7 +46,7 @@ import java.util.regex.Pattern;
 public class VersionService {
 
     private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
-    private static final Logger LOG = Logger.getLogger(VersionService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(VersionService.class);
 
     private Version localVersion;
     private Version latestFinalVersion;

libresonic-main/src/main/java/org/libresonic/player/service/jukebox/AudioPlayer.java

@@ -20,8 +20,9 @@
 package org.libresonic.player.service.jukebox;
 
 import org.apache.commons.io.IOUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.service.JukeboxService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioSystem;
@@ -45,7 +46,7 @@ import static org.libresonic.player.service.jukebox.AudioPlayer.State.*;
 public class AudioPlayer {
 
     public static final float DEFAULT_GAIN = 0.75f;
-    private static final Logger LOG = Logger.getLogger(JukeboxService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JukeboxService.class);
 
     private final InputStream in;
     private final Listener listener;

libresonic-main/src/main/java/org/libresonic/player/service/metadata/FFmpegParser.java

@@ -20,12 +20,13 @@
 package org.libresonic.player.service.metadata;
 
 import org.apache.commons.io.FilenameUtils;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.MediaFile;
 import org.libresonic.player.io.InputStreamReaderThread;
 import org.libresonic.player.service.ServiceLocator;
 import org.libresonic.player.service.TranscodingService;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.InputStream;
@@ -41,7 +42,7 @@ import java.util.regex.Pattern;
  */
 public class FFmpegParser extends MetaDataParser {
 
-    private static final Logger LOG = Logger.getLogger(FFmpegParser.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FFmpegParser.class);
     private static final Pattern DURATION_PATTERN = Pattern.compile("Duration: (\\d+):(\\d+):(\\d+).(\\d+)");
     private static final Pattern BITRATE_PATTERN = Pattern.compile("bitrate: (\\d+) kb/s");
     private static final Pattern DIMENSION_PATTERN = Pattern.compile("Video.*?, (\\d+)x(\\d+)");

libresonic-main/src/main/java/org/libresonic/player/service/metadata/JaudiotaggerParser.java

@@ -28,8 +28,9 @@ import org.jaudiotagger.tag.FieldKey;
 import org.jaudiotagger.tag.Tag;
 import org.jaudiotagger.tag.images.Artwork;
 import org.jaudiotagger.tag.reference.GenreTypes;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.MediaFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.SortedSet;
@@ -46,7 +47,7 @@ import java.util.regex.Pattern;
  */
 public class JaudiotaggerParser extends MetaDataParser {
 
-    private static final Logger LOG = Logger.getLogger(JaudiotaggerParser.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JaudiotaggerParser.class);
     private static final Pattern GENRE_PATTERN = Pattern.compile("\\((\\d+)\\).*");
     private static final Pattern TRACK_NUMBER_PATTERN = Pattern.compile("(\\d+)/\\d+");
     private static final Pattern YEAR_NUMBER_PATTERN = Pattern.compile("(\\d{4}).*");

libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosFaultInterceptor.java

@@ -24,7 +24,8 @@ import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
 import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.phase.Phase;
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -38,7 +39,7 @@ import javax.xml.namespace.QName;
  */
 public class SonosFaultInterceptor extends AbstractSoapInterceptor {
 
-    private static final Logger LOG = Logger.getLogger(SonosFaultInterceptor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SonosFaultInterceptor.class);
 
     /**
      * Constructor, setting the phase to Marshal.  This happens before the default Fault Interceptor

libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosServiceRegistration.java

@@ -29,9 +29,10 @@ import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
-import org.libresonic.player.Logger;
 import org.libresonic.player.util.Pair;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -43,7 +44,7 @@ import java.util.List;
  */
 public class SonosServiceRegistration {
 
-    private static final Logger LOG = Logger.getLogger(SonosServiceRegistration.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SonosServiceRegistration.class);
 
     public void setEnabled(String libresonicBaseUrl, String sonosControllerIp, boolean enabled, String sonosServiceName, int sonosServiceId) throws IOException {
         String localUrl = libresonicBaseUrl + "ws/Sonos";

libresonic-main/src/main/java/org/libresonic/player/service/upnp/FolderBasedContentDirectory.java

@@ -28,11 +28,12 @@ import org.fourthline.cling.support.model.container.PlaylistContainer;
 import org.fourthline.cling.support.model.container.StorageFolder;
 import org.fourthline.cling.support.model.item.Item;
 import org.fourthline.cling.support.model.item.MusicTrack;
-import org.libresonic.player.Logger;
 import org.libresonic.player.domain.*;
 import org.libresonic.player.service.MediaFileService;
 import org.libresonic.player.service.PlaylistService;
 import org.libresonic.player.util.Util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.net.URI;
@@ -46,7 +47,7 @@ import java.util.List;
  */
 public class FolderBasedContentDirectory extends LibresonicContentDirectory {
 
-    private static final Logger LOG = Logger.getLogger(FolderBasedContentDirectory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FolderBasedContentDirectory.class);
     private static final String CONTAINER_ID_PLAYLIST_ROOT = "playlists";
     private static final String CONTAINER_ID_PLAYLIST_PREFIX = "playlist-";
     private static final String CONTAINER_ID_FOLDER_PREFIX = "folder-";

libresonic-main/src/main/java/org/libresonic/player/spring/LoggingExceptionResolver.java

@@ -1,6 +1,7 @@
 package org.libresonic.player.spring;
 
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.Ordered;
 import org.springframework.web.servlet.HandlerExceptionResolver;
 import org.springframework.web.servlet.ModelAndView;
@@ -10,7 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 
 public class LoggingExceptionResolver implements HandlerExceptionResolver, Ordered {
 
-    private static final Logger logger = Logger.getLogger(LoggingExceptionResolver.class);
+    private static final Logger logger = LoggerFactory.getLogger(LoggingExceptionResolver.class);
 
     @Override
     public ModelAndView resolveException(

libresonic-main/src/main/java/org/libresonic/player/spring/SpringLiquibase.java

@@ -9,14 +9,15 @@ import liquibase.exception.DatabaseException;
 import liquibase.exception.LiquibaseException;
 import liquibase.resource.ResourceAccessor;
 import liquibase.util.StringUtils;
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
 import java.util.Iterator;
 import java.util.List;
 
 public class SpringLiquibase extends liquibase.integration.spring.SpringLiquibase {
-    private static final Logger logger = Logger.getLogger(SpringLiquibase.class);
+    private static final Logger logger = LoggerFactory.getLogger(SpringLiquibase.class);
 
     @Override
     public void afterPropertiesSet() throws LiquibaseException {

libresonic-main/src/main/java/org/libresonic/player/taglib/UrlTag.java

@@ -21,9 +21,10 @@ package org.libresonic.player.taglib;
 
 import org.apache.commons.lang.CharUtils;
 import org.apache.taglibs.standard.tag.common.core.UrlSupport;
-import org.libresonic.player.Logger;
 import org.libresonic.player.filter.ParameterDecodingFilter;
 import org.libresonic.player.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspTagException;
@@ -54,7 +55,7 @@ import java.util.List;
 public class UrlTag extends BodyTagSupport {
 
     private String DEFAULT_ENCODING = "Utf8Hex";
-    private static final Logger LOG = Logger.getLogger(UrlTag.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UrlTag.class);
 
     private String var;
     private String value;

libresonic-main/src/main/java/org/libresonic/player/util/FileUtil.java

@@ -19,7 +19,8 @@
  */
 package org.libresonic.player.util;
 
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Closeable;
 import java.io.File;
@@ -34,7 +35,7 @@ import java.util.Arrays;
  */
 public final class FileUtil {
 
-    private static final Logger LOG = Logger.getLogger(FileUtil.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FileUtil.class);
 
     /**
      * Disallow external instantiation.

libresonic-main/src/main/java/org/libresonic/player/util/Util.java

@@ -21,7 +21,8 @@ package org.libresonic.player.util;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.libresonic.player.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletResponse;
@@ -37,7 +38,7 @@ import java.util.List;
  */
 public final class Util {
 
-    private static final Logger LOG = Logger.getLogger(Util.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Util.class);
 
     /**
      * Disallow external instantiation.
@@ -116,4 +117,4 @@ public final class Util {
             return "";
         }
     }
-}
+}