Skip to content

Commit

Permalink
Merge pull request dropwizard#59 from nicktelford/fixes/logback-docs
Browse files Browse the repository at this point in the history
Updated README and documentation to reflect switch to Logback
  • Loading branch information
codahale committed Mar 21, 2012
2 parents 14bef06 + fdb46bd commit 329cbed
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -9,7 +9,7 @@ historically not sucked:
* [Jetty](http://www.eclipse.org/jetty/) for HTTP servin'.
* [Jersey](http://jersey.java.net/) for REST modelin'.
* [Jackson](http://jackson.codehaus.org) for JSON parsin' and generatin'.
* [Log4j](http://logging.apache.org/log4j/1.2/) for loggin'.
* [Logback](http://logback.qos.ch/) for loggin'.
* [Hibernate Validator](http://www.hibernate.org/subprojects/validator.html) for validatin'.
* [Metrics](https://github.com/codahale/metrics) for figurin' out what your service is doing in
production.
Expand Down
4 changes: 2 additions & 2 deletions docs/source/getting-started.rst
Expand Up @@ -82,7 +82,7 @@ we've come to rely on:

* Guava_, which, in addition to highly optimized immutable data structures, provides a growing
number of classes to speed up development in Java.
* Log4j_ and slf4j_ for performant logging.
* Logback_ and slf4j_ for performant logging.
* `Hibernate Validator`_, the `JSR-303`_ reference implementation, provides an easy, declarative
framework for validating user input and generating helpful, internationalizable error messages.
* The `Apache HttpClient`_ and Jersey_ client libraries allow for both low- and high-level
Expand All @@ -91,7 +91,7 @@ we've come to rely on:
* Freemarker_ is a simple template system for more user-facing services.

.. _Guava: http://code.google.com/p/guava-libraries/
.. _Log4j: http://logging.apache.org/log4j/1.2/
.. _Logback: http://logback.qos.ch/
.. _slf4j: http://www.slf4j.org/
.. _Hibernate Validator: http://www.hibernate.org/subprojects/validator.html
.. _JSR-303: http://jcp.org/en/jsr/detail?id=303
Expand Down
8 changes: 4 additions & 4 deletions docs/source/manual/core.rst
Expand Up @@ -16,7 +16,7 @@ It includes:
* Jackson, the best JSON library for the JVM.
* Metrics, `Yammer's`__ own library for application metrics.
* Guava, Google's excellent utility library.
* Log4j, Java's most widely-used logging framework.
* Logback, the successor to Log4j, Java's most widely-used logging framework.
* Hibernate Validator, the reference implementation of the Java Bean Validation standard.

.. __: https://www.yammer.com
Expand Down Expand Up @@ -324,10 +324,10 @@ port. For example::
Logging
=======

Dropwizard uses Log4j_ for its logging backend. It provides an slf4j_ implementation, and even
routes all ``java.util.logging`` usage through log4j.
Dropwizard uses Logback_ for its logging backend. It provides an slf4j_ implementation, and even
routes all ``java.util.logging`` usage through Logback.

.. _Log4j: http://logging.apache.org/log4j/1.2/
.. _Logback: http://logback.qos.ch/
.. _slf4j: http://www.slf4j.org/

.. _man-core-logging-class:
Expand Down

0 comments on commit 329cbed

Please sign in to comment.