diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLogger.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLogger.java new file mode 100644 index 0000000000..8d79a2158c --- /dev/null +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLogger.java @@ -0,0 +1,264 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.log; + +//~--- non-JDK imports -------------------------------------------------------- + +import org.slf4j.Logger; + +/** + * + * @author Sebastian Sdorra + */ +public class HgLogger implements com.aragost.javahg.log.Logger +{ + + /** + * Constructs ... + * + * + * @param logger + */ + public HgLogger(Logger logger) + { + this.logger = logger; + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param msg + */ + @Override + public void debug(String msg) + { + logger.debug(msg); + } + + /** + * Method description + * + * + * @param msg + * @param args + */ + @Override + public void debug(String msg, Object... args) + { + logger.debug(msg, args); + } + + /** + * Method description + * + * + * @param msg + * @param thrown + */ + @Override + public void debug(String msg, Throwable thrown) + { + logger.debug(msg, thrown); + } + + /** + * Method description + * + * + * @param msg + */ + @Override + public void error(String msg) + { + logger.error(msg); + } + + /** + * Method description + * + * + * @param msg + * @param args + */ + @Override + public void error(String msg, Object... args) + { + logger.error(msg, args); + } + + /** + * Method description + * + * + * @param msg + * @param thrown + */ + @Override + public void error(String msg, Throwable thrown) + { + logger.error(msg, thrown); + } + + /** + * Method description + * + * + * @param msg + */ + @Override + public void info(String msg) + { + logger.info(msg); + } + + /** + * Method description + * + * + * @param msg + * @param args + */ + @Override + public void info(String msg, Object... args) + { + logger.info(msg, args); + } + + /** + * Method description + * + * + * @param msg + * @param thrown + */ + @Override + public void info(String msg, Throwable thrown) + { + logger.info(msg, thrown); + } + + /** + * Method description + * + * + * @param msg + */ + @Override + public void warn(String msg) + { + logger.warn(msg); + } + + /** + * Method description + * + * + * @param msg + * @param args + */ + @Override + public void warn(String msg, Object... args) + { + logger.warn(msg, args); + } + + /** + * Method description + * + * + * @param msg + * @param thrown + */ + @Override + public void warn(String msg, Throwable thrown) + { + logger.warn(msg, thrown); + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + @Override + public boolean isDebugEnabled() + { + return logger.isDebugEnabled(); + } + + /** + * Method description + * + * + * @return + */ + @Override + public boolean isErrorEnabled() + { + return logger.isErrorEnabled(); + } + + /** + * Method description + * + * + * @return + */ + @Override + public boolean isInfoEnabled() + { + return logger.isInfoEnabled(); + } + + /** + * Method description + * + * + * @return + */ + @Override + public boolean isWarnEnabled() + { + return logger.isWarnEnabled(); + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private Logger logger; +} diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLoggerFactory.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLoggerFactory.java new file mode 100644 index 0000000000..d3f6cf867e --- /dev/null +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/log/HgLoggerFactory.java @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.log; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.aragost.javahg.log.Logger; + +import org.slf4j.LoggerFactory; + +/** + * + * @author Sebastian Sdorra + */ +public class HgLoggerFactory extends com.aragost.javahg.log.LoggerFactory +{ + + /** + * Method description + * + * + * @param cls + * + * @return + */ + @Override + protected Logger getLoggerInstance(Class cls) + { + return new HgLogger(LoggerFactory.getLogger(cls)); + } +} diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/services/com.aragost.javahg.log.LoggerFactory b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/services/com.aragost.javahg.log.LoggerFactory new file mode 100644 index 0000000000..e8a03f2616 --- /dev/null +++ b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/services/com.aragost.javahg.log.LoggerFactory @@ -0,0 +1 @@ +sonia.scm.log.HgLoggerFactory \ No newline at end of file diff --git a/scm-webapp/src/main/resources/logback.default.xml b/scm-webapp/src/main/resources/logback.default.xml index 8ce2dd18e1..8fa2d5cb5a 100644 --- a/scm-webapp/src/main/resources/logback.default.xml +++ b/scm-webapp/src/main/resources/logback.default.xml @@ -64,6 +64,11 @@ --> + + +