Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 08:55:44 +01:00
Code Issues Packages Projects Releases Activity

use slf4j instead of java.util.logging

Browse Source
This commit is contained in:
Sebastian Sdorra
2010-10-16 11:03:54 +02:00
parent fd86fd5d76
commit 30f94d48ae
17 changed files with 185 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-core/src/main/java/sonia/scm/io/SimpleCommand.java
View File

@@ -9,6 +9,9 @@ package sonia.scm.io;
//~--- non-JDK imports --------------------------------------------------------
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.util.IOUtil;
//~--- JDK imports ------------------------------------------------------------
@@ -19,9 +22,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
*
* @author Sebastian Sdorra
@@ -31,7 +31,7 @@ public class SimpleCommand implements Command
/** Field description */
private static final Logger logger =
Logger.getLogger(SimpleCommand.class.getName());
LoggerFactory.getLogger(SimpleCommand.class);
//~--- constructors ---------------------------------------------------------
@@ -144,7 +144,7 @@ public class SimpleCommand implements Command
}
catch (InterruptedException ex)
{
logger.log(Level.SEVERE, null, ex);
logger.error(ex.getMessage(), ex);
throw new IOException(ex.getMessage());
}

9
scm-core/src/main/java/sonia/scm/plugin/SCMPluginManager.java
View File

@@ -9,6 +9,9 @@ package sonia.scm.plugin;
//~--- non-JDK imports --------------------------------------------------------
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.repository.RepositoryHandler;
import sonia.scm.util.Util;
@@ -22,8 +25,6 @@ import java.util.Collection;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXB;
@@ -39,7 +40,7 @@ public class SCMPluginManager
/** Field description */
private static final Logger logger =
Logger.getLogger(SCMPluginManager.class.getName());
LoggerFactory.getLogger(SCMPluginManager.class);
//~--- constructors ---------------------------------------------------------
@@ -131,7 +132,7 @@ public class SCMPluginManager
}
catch (Exception ex)
{
logger.log(Level.SEVERE, null, ex);
logger.error(ex.getMessage(), ex);
}
}

17
scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
View File

@@ -9,6 +9,9 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.ConfigurationException;
import sonia.scm.SCMContextProvider;
import sonia.scm.io.CommandResult;
@@ -25,8 +28,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXB;
@@ -34,7 +35,8 @@ import javax.xml.bind.JAXB;
*
* @author Sebastian Sdorra
*
* @param <T>
*
* @param <C>
*/
public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepositoryConfig>
extends AbstractRepositoryHandler<C>
@@ -42,7 +44,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
/** Field description */
private static final Logger logger =
Logger.getLogger(AbstractSimpleRepositoryHandler.class.getName());
LoggerFactory.getLogger(AbstractSimpleRepositoryHandler.class);
//~--- methods --------------------------------------------------------------
@@ -238,7 +240,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
}
catch (Exception ex)
{
logger.log(Level.SEVERE, null, ex);
logger.error(ex.getMessage(), ex);
}
}
@@ -333,10 +335,9 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
if (!directory.exists())
{
if (logger.isLoggable(Level.WARNING))
if (logger.isWarnEnabled())
{
logger.warning(
"could not find repository ".concat(repository.getName()));
logger.warn("could not find repository ".concat(repository.getName()));
}
repository = null;

43
scm-core/src/main/java/sonia/scm/repository/BasicRepositoryManager.java
View File

@@ -12,6 +12,9 @@ package sonia.scm.repository;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.ConfigurationException;
import sonia.scm.SCMContext;
import sonia.scm.SCMContextProvider;
@@ -38,6 +41,12 @@ import java.util.Set;
public class BasicRepositoryManager extends AbstractRepositoryManager
{
/** Field description */
private static final Logger logger =
LoggerFactory.getLogger(BasicRepositoryManager.class);
//~--- constructors ---------------------------------------------------------
/**
* Constructs ...
*
@@ -79,6 +88,12 @@ public class BasicRepositoryManager extends AbstractRepositoryManager
type.getName().concat("allready registered"));
}
if (logger.isInfoEnabled())
{
logger.info("added RepositoryHandler {} for type {}", handler.getClass(),
type);
}
handlerMap.put(type.getName(), handler);
handler.init(SCMContext.getContext());
types.add(type);
@@ -112,6 +127,12 @@ public class BasicRepositoryManager extends AbstractRepositoryManager
public void create(Repository repository)
throws RepositoryException, IOException
{
if (logger.isInfoEnabled())
{
logger.info("create repository {} of type {}", repository.getName(),
repository.getType());
}
getHandler(repository).create(repository);
fireEvent(repository, RepositoryEvent.CREATE);
}
@@ -129,6 +150,12 @@ public class BasicRepositoryManager extends AbstractRepositoryManager
public void delete(Repository repository)
throws RepositoryException, IOException
{
if (logger.isInfoEnabled())
{
logger.info("delete repository {} of type {}", repository.getName(),
repository.getType());
}
getHandler(repository).delete(repository);
fireEvent(repository, RepositoryEvent.DELETE);
}
@@ -155,6 +182,12 @@ public class BasicRepositoryManager extends AbstractRepositoryManager
public void modify(Repository repository)
throws RepositoryException, IOException
{
if (logger.isInfoEnabled())
{
logger.info("modify repository {} of type {}", repository.getName(),
repository.getType());
}
getHandler(repository).modify(repository);
fireEvent(repository, RepositoryEvent.MODIFY);
}
@@ -216,6 +249,11 @@ public class BasicRepositoryManager extends AbstractRepositoryManager
@Override
public Collection<Repository> getAll()
{
if (logger.isDebugEnabled())
{
logger.debug("fetch all repositories");
}
Set<Repository> repositories = new HashSet<Repository>();
for (RepositoryHandler handler : handlerMap.values())
@@ -231,6 +269,11 @@ public class BasicRepositoryManager extends AbstractRepositoryManager
}
}
if (logger.isDebugEnabled())
{
logger.debug("fetched {} repositories", repositories.size());
}
return repositories;
}

15
scm-core/src/main/java/sonia/scm/util/IOUtil.java
View File

@@ -7,6 +7,11 @@
package sonia.scm.util;
//~--- non-JDK imports --------------------------------------------------------
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
//~--- JDK imports ------------------------------------------------------------
import java.io.Closeable;
@@ -17,9 +22,6 @@ import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
*
* @author Sebastian Sdorra
@@ -28,7 +30,8 @@ public class IOUtil
{
/** Field description */
private static final Logger logger = Logger.getLogger(IOUtil.class.getName());
private static final Logger logger =
LoggerFactory.getLogger(IOUtil.class.getName());
//~--- methods --------------------------------------------------------------
@@ -48,7 +51,7 @@ public class IOUtil
}
catch (IOException ex)
{
logger.log(Level.SEVERE, null, ex);
logger.error(ex.getMessage(), ex);
}
}
}
@@ -172,7 +175,7 @@ public class IOUtil
}
catch (IOException ex)
{
logger.log(Level.SEVERE, null, ex);
logger.error(ex.getMessage(), ex);
}
finally
{

24
scm-core/src/main/java/sonia/scm/util/ServiceUtil.java
View File

@@ -3,14 +3,21 @@
* and open the template in the editor.
*/
package sonia.scm.util;
//~--- non-JDK imports --------------------------------------------------------
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
//~--- JDK imports ------------------------------------------------------------
import java.util.ArrayList;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.ServiceLoader;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
*
@@ -21,7 +28,7 @@ public class ServiceUtil
/** Field description */
private static final Logger logger =
Logger.getLogger(ServiceUtil.class.getName());
LoggerFactory.getLogger(ServiceUtil.class);
//~--- get methods ----------------------------------------------------------
@@ -71,10 +78,7 @@ public class ServiceUtil
}
catch (NoSuchElementException ex)
{
if (logger.isLoggable(Level.FINEST))
{
logger.log(Level.FINEST, null, ex);
}
logger.debug(ex.getMessage(), ex);
}
return result;
@@ -107,13 +111,9 @@ public class ServiceUtil
}
catch (NoSuchElementException ex)
{
if (logger.isLoggable(Level.FINEST))
{
logger.log(Level.FINEST, null, ex);
}
logger.debug(ex.getMessage(), ex);
}
return result;
}
}

13
scm-core/src/main/java/sonia/scm/util/Util.java
View File

@@ -9,22 +9,12 @@ package sonia.scm.util;
//~--- JDK imports ------------------------------------------------------------
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.TimeZone;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
*
@@ -36,9 +26,6 @@ public class Util
/** Field description */
public static final String DATE_PATTERN = "yyyy-MM-dd HH-mm-ss";
/** Field description */
private static final Logger logger = Logger.getLogger(Util.class.getName());
//~--- methods --------------------------------------------------------------
/**