You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2012/10/11 02:21:28 UTC
svn commit: r1396875 - in
/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core:
./ appender/ config/ filter/
Author: ggregory
Date: Thu Oct 11 00:21:27 2012
New Revision: 1396875
URL: http://svn.apache.org/viewvc?rev=1396875&view=rev
Log:
Rename Lifecycle to LifeCycle.
Added:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java
- copied, changed from r1396863, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Lifecycle.java
Removed:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Lifecycle.java
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Appender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Appender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Appender.java?rev=1396875&r1=1396874&r2=1396875&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Appender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Appender.java Thu Oct 11 00:21:27 2012
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core;
/**
* @issue LOG4J2-36: Appender interface should be refactored
*/
-public interface Appender extends Lifecycle {
+public interface Appender extends LifeCycle {
/**
* Log in <code>Appender</code> specific way. When appropriate,
Copied: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java (from r1396863, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Lifecycle.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Lifecycle.java&r1=1396863&r2=1396875&rev=1396875&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Lifecycle.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LifeCycle.java Thu Oct 11 00:21:27 2012
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.core;
/**
*
*/
-public interface Lifecycle {
+public interface LifeCycle {
void start();
void stop();
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1396875&r1=1396874&r2=1396875&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java Thu Oct 11 00:21:27 2012
@@ -36,7 +36,7 @@ import java.util.concurrent.locks.Reentr
* applications and a reference to the Configuration. The Configuration will contain the configured loggers, appenders,
* filters, etc and will be atomically updated whenever a reconfigure occurs.
*/
-public class LoggerContext implements org.apache.logging.log4j.spi.LoggerContext, ConfigurationListener, Lifecycle {
+public class LoggerContext implements org.apache.logging.log4j.spi.LoggerContext, ConfigurationListener, LifeCycle {
private static final StatusLogger logger = StatusLogger.getLogger();
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java?rev=1396875&r1=1396874&r2=1396875&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java Thu Oct 11 00:21:27 2012
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.ap
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.ErrorHandler;
import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.Lifecycle;
+import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.filter.Filterable;
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.Logger;
* Base class for Appenders. Although Appenders do not have to extend this class, doing so
* will simplify their implementation.
*/
-public abstract class AbstractAppender extends Filterable implements Appender, Lifecycle {
+public abstract class AbstractAppender extends Filterable implements Appender, LifeCycle {
/**
* Allow subclasses access to the status logger without creating another instance.
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java?rev=1396875&r1=1396874&r2=1396875&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java Thu Oct 11 00:21:27 2012
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.co
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.Lifecycle;
+import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AppenderRuntimeException;
import org.apache.logging.log4j.core.filter.Filterable;
@@ -82,7 +82,7 @@ public class AppenderControl extends Fil
try {
recursive.set(this);
- if (appender instanceof Lifecycle && !appender.isStarted()) {
+ if (appender instanceof LifeCycle && !appender.isStarted()) {
appender.getHandler().error("Attempted to append to non-started appender " + appender.getName());
if (!appender.isExceptionSuppressed()) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java?rev=1396875&r1=1396874&r2=1396875&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java Thu Oct 11 00:21:27 2012
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.Lifecycle;
+import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.filter.Filterable;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.core.LogEvent;
@@ -177,8 +177,8 @@ public class LoggerConfig extends Filter
Filter filter = ctl.getFilter();
if (filter != null) {
ctl.removeFilter(filter);
- if (filter instanceof Lifecycle) {
- ((Lifecycle) filter).stop();
+ if (filter instanceof LifeCycle) {
+ ((LifeCycle) filter).stop();
}
}
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java?rev=1396875&r1=1396874&r2=1396875&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java Thu Oct 11 00:21:27 2012
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.fi
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.Lifecycle;
+import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.status.StatusLogger;
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.message.
* which case it will only implement the required method(s). The rest will default to return NEUTRAL.
*
*/
-public abstract class AbstractFilter implements Filter, Lifecycle {
+public abstract class AbstractFilter implements Filter, LifeCycle {
/**
* Allow subclasses access to the status logger without creating another instance.
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java?rev=1396875&r1=1396874&r2=1396875&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java Thu Oct 11 00:21:27 2012
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.fi
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.Lifecycle;
+import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -37,7 +37,7 @@ import java.util.List;
* Composes and invokes one or more filters.
*/
@Plugin(name = "filters", type = "Core", printObject = true)
-public final class CompositeFilter implements Iterable<Filter>, Filter, Lifecycle {
+public final class CompositeFilter implements Iterable<Filter>, Filter, LifeCycle {
private final List<Filter> filters;
private final boolean hasFilters;
@@ -89,8 +89,8 @@ public final class CompositeFilter imple
public void start() {
for (Filter filter : filters) {
- if (filter instanceof Lifecycle) {
- ((Lifecycle) filter).start();
+ if (filter instanceof LifeCycle) {
+ ((LifeCycle) filter).start();
}
}
isStarted = true;
@@ -98,8 +98,8 @@ public final class CompositeFilter imple
public void stop() {
for (Filter filter : filters) {
- if (filter instanceof Lifecycle) {
- ((Lifecycle) filter).stop();
+ if (filter instanceof LifeCycle) {
+ ((LifeCycle) filter).stop();
}
}
isStarted = false;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java?rev=1396875&r1=1396874&r2=1396875&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java Thu Oct 11 00:21:27 2012
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.filter;
import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.Lifecycle;
+import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LogEvent;
import java.util.Iterator;
@@ -92,8 +92,8 @@ public class Filterable implements Filte
* Make the Filter available for use.
*/
public void startFilter() {
- if (filter != null && filter instanceof Lifecycle) {
- ((Lifecycle) filter).start();
+ if (filter != null && filter instanceof LifeCycle) {
+ ((LifeCycle) filter).start();
}
}
@@ -101,8 +101,8 @@ public class Filterable implements Filte
* Cleanup the Filter.
*/
public void stopFilter() {
- if (filter != null && filter instanceof Lifecycle) {
- ((Lifecycle) filter).stop();
+ if (filter != null && filter instanceof LifeCycle) {
+ ((LifeCycle) filter).stop();
}
}