Commit cf860031 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #3512 from izeye/polish-20150716

* pr/3512:
  Polish LoggingSystem
parents 6ace7e53 8d3803b8
......@@ -78,7 +78,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
* Return any self initialization config that has been applied. By default this method
* checks {@link #getStandardConfigLocations()} and assumes that any file that exists
* will have been applied.
* @return the self initialization configor {@code null}
* @return the self initialization config or {@code null}
*/
protected String getSelfInitializationConfig() {
return findConfig(getStandardConfigLocations());
......@@ -113,7 +113,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
/**
* Return the spring config locations for this system. By default this method returns
* a set of locations based on {@link #getStandardConfigLocations()}.
* @return the standard config locations
* @return the spring config locations
* @see #getSpringInitializationConfig()
*/
protected String[] getSpringConfigLocations() {
......
......@@ -54,7 +54,7 @@ public abstract class LoggingSystem {
/**
* Reset the logging system to be limit output. This method may be called before
* {@link #initialize(LoggingInitializationContext, String, LogFile)} to reduce
* logging noise until the system has been fully Initialized.
* logging noise until the system has been fully initialized.
*/
public abstract void beforeInitialize();
......
......@@ -32,7 +32,7 @@ import ch.qos.logback.core.joran.spi.Interpreter;
import ch.qos.logback.core.util.OptionHelper;
/**
* Lockback {@link Action} to support {@code <springProfile>} tags. Allows section of a
* Logback {@link Action} to support {@code <springProfile>} tags. Allows section of a
* logback configuration to only be enabled when a specific profile is active.
*
* @author Phillip Webb
......
......@@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue;
* @author Dave Syer
* @author Phillip Webb
*/
public class JavaLoggerSystemTests extends AbstractLoggingSystemTests {
public class JavaLoggingSystemTests extends AbstractLoggingSystemTests {
private static final FileFilter SPRING_LOG_FILTER = new FileFilter() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment