You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2013/01/20 20:59:57 UTC
svn commit: r1435937 [1/3] - in
/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core:
./ appender/ appender/rewrite/ appender/rolling/ config/ config/plugins/
filter/ helpers/ impl/ layout/ lookup/ net/ pattern/ selector/
Author: rgoers
Date: Sun Jan 20 19:59:55 2013
New Revision: 1435937
URL: http://svn.apache.org/viewvc?rev=1435937&view=rev
Log:
Fix some of the checkstyle errors that have recently been introduced.
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/Filter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.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/appender/AbstractManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsynchAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.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/BaseConfiguration.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.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/config/plugins/AppendersPlugin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginType.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.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/BurstFilter.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/DynamicThresholdFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Charsets.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CyclicBuffer.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/FileUtils.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NameUtil.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/NetUtils.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/UUIDUtil.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractJMSManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/Facility.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSQueueReceiver.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/JMSTopicReceiver.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/SocketServer.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractStyleNameConverter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/AnsiEscape.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/CachedDateFormat.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ClassNamePatternConverter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/HighlightConverter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/LogEventPatternConverter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/SequenceNumberPatternConverter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.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=1435937&r1=1435936&r2=1435937&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 Sun Jan 20 19:59:55 2013
@@ -20,10 +20,8 @@ import java.io.Serializable;
/**
* Appends log events.
- *
+ *
* @param <T> The {@link Layout}'s {@link Serializable} type.
- *
- * @issue LOG4J2-36: Appender interface should be refactored
*/
public interface Appender<T extends Serializable> extends LifeCycle {
@@ -48,7 +46,6 @@ public interface Appender<T extends Seri
* Returns this appender's layout.
*
* @return the Layout for the Appender or null if none is configured.
- * @issue LOG4J2-36 Refactor into Channel
*/
Layout<T> getLayout();
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Filter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Filter.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Filter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Filter.java Sun Jan 20 19:59:55 2013
@@ -48,10 +48,10 @@ public interface Filter {
* The event should not be processed.
*/
DENY;
-
+
/**
* Returns the Result for the given string.
- *
+ *
* @param name The Result enum name, case-insensitive. If null, returns, null
* @return a Result enum value or null if name is null
*/
@@ -61,7 +61,7 @@ public interface Filter {
/**
* Returns the Result for the given string.
- *
+ *
* @param name The Result enum name, case-insensitive. If null, returns, defaultResult
* @param defaultResult the Result to return if name is null
* @return a Result enum value or null if name is null
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/Layout.java Sun Jan 20 19:59:55 2013
@@ -36,9 +36,10 @@ import java.io.Serializable;
* @param <T>
* The {@link Serializable} type returned by {@link #toSerializable(LogEvent)}
*
- * @doubt There is still a need for a character-based layout for character based event sinks (databases, etc). Would introduce an
- * EventEncoder, EventRenderer or something similar for the logging event to byte encoding. (RG) A layout can be configured with a
- * Charset and then Strings can be converted to byte arrays. OTOH, it isn't possible to write byte arrays as character streams.
+ * @doubt There is still a need for a character-based layout for character based event sinks (databases, etc). Would
+ * introduce an EventEncoder, EventRenderer or something similar for the logging event to byte encoding. (RG) A layout
+ * can be configured with a Charset and then Strings can be converted to byte arrays. OTOH, it isn't possible to write
+ * byte arrays as character streams.
*/
public interface Layout<T extends Serializable> {
/**
@@ -78,7 +79,7 @@ public interface Layout<T extends Serial
/**
* Returns the content type output by this layout. The base class returns "text/plain".
- *
+ *
* @return the content type.
*/
String getContentType();
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=1435937&r1=1435936&r2=1435937&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 Sun Jan 20 19:59:55 2013
@@ -43,7 +43,7 @@ import org.apache.logging.log4j.status.S
*/
public class LoggerContext implements org.apache.logging.log4j.spi.LoggerContext, ConfigurationListener, LifeCycle {
- private static final StatusLogger logger = StatusLogger.getLogger();
+ private static final StatusLogger LOGGER = StatusLogger.getLogger();
private final ConcurrentMap<String, Logger> loggers = new ConcurrentHashMap<String, Logger>();
@@ -203,7 +203,8 @@ public class LoggerContext implements or
/**
* Obtain a Logger from the Context.
* @param name The name of the Logger to return.
- * @param messageFactory The message factory is used only when creating a logger, subsequent use does not change the logger but will log a warning if mismatched.
+ * @param messageFactory The message factory is used only when creating a logger, subsequent use does not change
+ * the logger but will log a warning if mismatched.
* @return The Logger.
*/
public Logger getLogger(final String name, final MessageFactory messageFactory) {
@@ -281,7 +282,7 @@ public class LoggerContext implements or
* Reconfigure the context.
*/
public synchronized void reconfigure() {
- logger.debug("Reconfiguration started for context " + name);
+ LOGGER.debug("Reconfiguration started for context " + name);
final Configuration instance = ConfigurationFactory.getInstance().getConfiguration(name, configLocation);
setConfiguration(instance);
/*instance.start();
@@ -290,7 +291,7 @@ public class LoggerContext implements or
if (old != null) {
old.stop();
} */
- logger.debug("Reconfiguration completed");
+ LOGGER.debug("Reconfiguration completed");
}
/**
@@ -315,13 +316,13 @@ public class LoggerContext implements or
* @param reconfigurable The Configuration that can be reconfigured.
*/
public synchronized void onChange(final Reconfigurable reconfigurable) {
- logger.debug("Reconfiguration started for context " + name);
+ LOGGER.debug("Reconfiguration started for context " + name);
final Configuration config = reconfigurable.reconfigure();
if (config != null) {
setConfiguration(config);
- logger.debug("Reconfiguration completed");
+ LOGGER.debug("Reconfiguration completed");
} else {
- logger.debug("Reconfiguration failed");
+ LOGGER.debug("Reconfiguration failed");
}
}
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=1435937&r1=1435936&r2=1435937&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 Sun Jan 20 19:59:55 2013
@@ -31,10 +31,11 @@ import org.apache.logging.log4j.Logger;
/**
* Abstract base class for Appenders. Although Appenders do not have to extend this class, doing so
* will simplify their implementation.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
+ *
+ * @param <T> The {@link Layout}'s {@link Serializable} type.
*/
-public abstract class AbstractAppender<T extends Serializable> extends AbstractFilterable implements Appender<T>, LifeCycle {
+public abstract class AbstractAppender<T extends Serializable> extends AbstractFilterable
+ implements Appender<T>, LifeCycle {
/**
* Allow subclasses access to the status logger without creating another instance.
*/
@@ -71,7 +72,8 @@ public abstract class AbstractAppender<T
* @param handleException If true, exceptions will be logged and suppressed. If false errors will be
* logged and then passed to the application.
*/
- protected AbstractAppender(final String name, final Filter filter, final Layout<T> layout, final boolean handleException) {
+ protected AbstractAppender(final String name, final Filter filter, final Layout<T> layout,
+ final boolean handleException) {
super(filter);
this.name = name;
this.layout = layout;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java Sun Jan 20 19:59:55 2013
@@ -36,9 +36,9 @@ public abstract class AbstractManager {
// Need to lock that map instead of using a ConcurrentMap due to stop removing the
// manager from the map and closing the stream, requiring the whole stop method to be locked.
- private static final Map<String, AbstractManager> map = new HashMap<String, AbstractManager>();
+ private static final Map<String, AbstractManager> MAP = new HashMap<String, AbstractManager>();
- private static final Lock lock = new ReentrantLock();
+ private static final Lock LOCK = new ReentrantLock();
/**
* Number of Appenders using this manager.
@@ -58,23 +58,25 @@ public abstract class AbstractManager {
* @param factory The Factory to use to create the Manager.
* @param data An Object that should be passed to the factory when creating the Manager.
* @param <M> The Type of the Manager to be created.
+ * @param <T> The type of the Factory data.
* @return A Manager with the specified name and type.
*/
- public static <M extends AbstractManager, T> M getManager(final String name, final ManagerFactory<M, T> factory, final T data) {
- lock.lock();
+ public static <M extends AbstractManager, T> M getManager(final String name, final ManagerFactory<M, T> factory,
+ final T data) {
+ LOCK.lock();
try {
- M manager = (M) map.get(name);
+ M manager = (M) MAP.get(name);
if (manager == null) {
manager = factory.createManager(name, data);
if (manager == null) {
throw new IllegalStateException("Unable to create a manager");
}
- map.put(name, manager);
+ MAP.put(name, manager);
}
manager.count++;
return manager;
} finally {
- lock.unlock();
+ LOCK.unlock();
}
}
@@ -84,11 +86,11 @@ public abstract class AbstractManager {
* @return True if the Manager exists, false otherwise.
*/
public static boolean hasManager(final String name) {
- lock.lock();
+ LOCK.lock();
try {
- return map.containsKey(name);
+ return MAP.containsKey(name);
} finally {
- lock.unlock();
+ LOCK.unlock();
}
}
@@ -107,16 +109,16 @@ public abstract class AbstractManager {
* Called to signify that this Manager is no longer required by an Appender.
*/
public void release() {
- lock.lock();
+ LOCK.lock();
try {
--count;
if (count <= 0) {
- map.remove(name);
+ MAP.remove(name);
LOGGER.debug("Shutting down {} {}", this.getClass().getSimpleName(), getName());
releaseSub();
}
} finally {
- lock.unlock();
+ LOCK.unlock();
}
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java Sun Jan 20 19:59:55 2013
@@ -54,8 +54,9 @@ public abstract class AbstractOutputStre
* @param layout The layout to format the message.
* @param manager The OutputStreamManager.
*/
- protected AbstractOutputStreamAppender(final String name, final Layout layout, final Filter filter, final boolean handleException,
- final boolean immediateFlush, final OutputStreamManager manager) {
+ protected AbstractOutputStreamAppender(final String name, final Layout layout, final Filter filter,
+ final boolean handleException, final boolean immediateFlush,
+ final OutputStreamManager manager) {
super(name, filter, layout, handleException);
if (layout != null) {
manager.setHeader(layout.getHeader());
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsynchAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsynchAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsynchAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/AsynchAppender.java Sun Jan 20 19:59:55 2013
@@ -42,8 +42,8 @@ import java.util.concurrent.BlockingQueu
* Appends to one or more Appenders asynchronously. You can configure an AsynchAppender with one
* or more Appenders and an Appender to append to if the queue is full. The AsynchAppender does not allow
* a filter to be specified on the Appender references.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
+ *
+ * @param <T> The {@link Layout}'s {@link Serializable} type.
*/
@Plugin(name = "Asynch", type = "Core", elementType = "appender", printObject = true)
public final class AsynchAppender<T extends Serializable> extends AbstractAppender<T> {
@@ -59,8 +59,8 @@ public final class AsynchAppender<T exte
private AppenderControl errorAppender;
private AsynchThread thread;
- private AsynchAppender(final String name, final Filter filter, final AppenderRef[] appenderRefs, final String errorRef,
- final int queueSize, final boolean blocking,
+ private AsynchAppender(final String name, final Filter filter, final AppenderRef[] appenderRefs,
+ final String errorRef, final int queueSize, final boolean blocking,
final boolean handleExceptions, final Configuration config) {
super(name, filter, null, handleExceptions);
this.queue = new ArrayBlockingQueue<Serializable>(queueSize);
@@ -147,10 +147,12 @@ public final class AsynchAppender<T exte
* @param config The Configuration.
* @param suppress "true" if exceptions should be hidden from the application, "false" otherwise.
* The default is "true".
+ * @param <S> The actual type of the Serializable.
* @return The AsynchAppender.
*/
@PluginFactory
- public static <S extends Serializable> AsynchAppender<S> createAppender(@PluginElement("appender-ref") final AppenderRef[] appenderRefs,
+ public static <S extends Serializable> AsynchAppender<S> createAppender(
+ @PluginElement("appender-ref") final AppenderRef[] appenderRefs,
@PluginAttr("error-ref") final String errorRef,
@PluginAttr("blocking") final String blocking,
@PluginAttr("bufferSize") final String size,
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java Sun Jan 20 19:59:55 2013
@@ -56,8 +56,9 @@ public final class ConsoleAppender exten
SYSTEM_ERR
}
- private ConsoleAppender(final String name, final Layout layout, final Filter filter, final OutputStreamManager manager,
- final boolean handleExceptions) {
+ private ConsoleAppender(final String name, final Layout layout, final Filter filter,
+ final OutputStreamManager manager,
+ final boolean handleExceptions) {
super(name, layout, filter, handleExceptions, true, manager);
}
@@ -66,6 +67,7 @@ public final class ConsoleAppender exten
* @param layout The layout to use (required).
* @param filter The Filter or null.
* @param t The target ("SYSTEM_OUT" or "SYSTEM_ERR"). The default is "SYSTEM_OUT".
+ * @param follow If true will follow changes to the underlying output stream.
* @param name The name of the Appender (required).
* @param suppress "true" if exceptions should be hidden from the application, "false" otherwise.
* The default is "true".
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java Sun Jan 20 19:59:55 2013
@@ -41,6 +41,8 @@ import java.util.Map;
@Plugin(name = "Failover", type = "Core", elementType = "appender", printObject = true)
public final class FailoverAppender extends AbstractAppender {
+ private static final int DEFAULT_INTERVAL = 60 * Constants.MILLIS_IN_SECONDS;
+
private final String primaryRef;
private final String[] failovers;
@@ -57,8 +59,6 @@ public final class FailoverAppender exte
private volatile boolean failure = false;
- private static final int DEFAULT_INTERVAL = 60 * Constants.MILLIS_IN_SECONDS;
-
private FailoverAppender(final String name, final Filter filter, final String primary, final String[] failovers,
final int interval, final Configuration config, final boolean handleExceptions) {
super(name, filter, null, handleExceptions);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java Sun Jan 20 19:59:55 2013
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.status.S
@Plugin(name = "failovers", type = "Core")
public final class FailoversPlugin {
- private static final Logger logger = StatusLogger.getLogger();
+ private static final Logger LOGGER = StatusLogger.getLogger();
/**
* Prevent instantiation.
@@ -46,7 +46,7 @@ public final class FailoversPlugin {
public static String[] createFailovers(@PluginElement("appender-ref") final AppenderRef... refs) {
if (refs == null) {
- logger.error("failovers must contain an appender-reference");
+ LOGGER.error("failovers must contain an appender-reference");
return null;
}
final String[] arr = new String[refs.length];
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java Sun Jan 20 19:59:55 2013
@@ -32,8 +32,8 @@ public final class FileAppender extends
private final String fileName;
- private FileAppender(final String name, final Layout layout, final Filter filter, final FileManager manager, final String filename,
- final boolean handleException, final boolean immediateFlush) {
+ private FileAppender(final String name, final Layout layout, final Filter filter, final FileManager manager,
+ final String filename, final boolean handleException, final boolean immediateFlush) {
super(name, layout, filter, handleException, immediateFlush, manager);
this.fileName = filename;
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java Sun Jan 20 19:59:55 2013
@@ -31,7 +31,7 @@ import java.nio.channels.FileLock;
*/
public class FileManager extends OutputStreamManager {
- private static final FileManagerFactory factory = new FileManagerFactory();
+ private static final FileManagerFactory FACTORY = new FileManagerFactory();
private final boolean isAppend;
private final boolean isLocking;
@@ -50,12 +50,13 @@ public class FileManager extends OutputS
* @param bufferedIO true if the contents should be buffered as they are written.
* @return A FileManager for the File.
*/
- public static FileManager getFileManager(final String fileName, final boolean append, boolean locking, final boolean bufferedIO) {
+ public static FileManager getFileManager(final String fileName, final boolean append, boolean locking,
+ final boolean bufferedIO) {
if (locking && bufferedIO) {
locking = false;
}
- return (FileManager) getManager(fileName, new FactoryData(append, locking, bufferedIO), factory);
+ return (FileManager) getManager(fileName, new FactoryData(append, locking, bufferedIO), FACTORY);
}
@Override
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java Sun Jan 20 19:59:55 2013
@@ -73,19 +73,20 @@ public final class JMSQueueAppender exte
* @return The JMSQueueAppender.
*/
@PluginFactory
- public static JMSQueueAppender createAppender(@PluginAttr("name") final String name,
- @PluginAttr("factoryName") final String factoryName,
- @PluginAttr("providerURL") final String providerURL,
- @PluginAttr("urlPkgPrefixes") final String urlPkgPrefixes,
- @PluginAttr("securityPrincipalName") final String securityPrincipalName,
- @PluginAttr("securityCredentials") final String securityCredentials,
- @PluginAttr("factoryBindingName") final String factoryBindingName,
- @PluginAttr("queueBindingName") final String queueBindingName,
- @PluginAttr("userName") final String userName,
- @PluginAttr("password") final String password,
- @PluginElement("layout") Layout layout,
- @PluginElement("filter") final Filter filter,
- @PluginAttr("suppressExceptions") final String suppress) {
+ public static JMSQueueAppender createAppender(
+ @PluginAttr("name") final String name,
+ @PluginAttr("factoryName") final String factoryName,
+ @PluginAttr("providerURL") final String providerURL,
+ @PluginAttr("urlPkgPrefixes") final String urlPkgPrefixes,
+ @PluginAttr("securityPrincipalName") final String securityPrincipalName,
+ @PluginAttr("securityCredentials") final String securityCredentials,
+ @PluginAttr("factoryBindingName") final String factoryBindingName,
+ @PluginAttr("queueBindingName") final String queueBindingName,
+ @PluginAttr("userName") final String userName,
+ @PluginAttr("password") final String password,
+ @PluginElement("layout") Layout layout,
+ @PluginElement("filter") final Filter filter,
+ @PluginAttr("suppressExceptions") final String suppress) {
if (name == null) {
LOGGER.error("No name provided for JMSQueueAppender");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java Sun Jan 20 19:59:55 2013
@@ -73,19 +73,20 @@ public final class JMSTopicAppender exte
* @return The JMSTopicAppender.
*/
@PluginFactory
- public static JMSTopicAppender createAppender(@PluginAttr("name") final String name,
- @PluginAttr("factoryName") final String factoryName,
- @PluginAttr("providerURL") final String providerURL,
- @PluginAttr("urlPkgPrefixes") final String urlPkgPrefixes,
- @PluginAttr("securityPrincipalName") final String securityPrincipalName,
- @PluginAttr("securityCredentials") final String securityCredentials,
- @PluginAttr("factoryBindingName") final String factoryBindingName,
- @PluginAttr("topicBindingName") final String topicBindingName,
- @PluginAttr("userName") final String userName,
- @PluginAttr("password") final String password,
- @PluginElement("layout") Layout layout,
- @PluginElement("filters") final Filter filter,
- @PluginAttr("suppressExceptions") final String suppress) {
+ public static JMSTopicAppender createAppender(
+ @PluginAttr("name") final String name,
+ @PluginAttr("factoryName") final String factoryName,
+ @PluginAttr("providerURL") final String providerURL,
+ @PluginAttr("urlPkgPrefixes") final String urlPkgPrefixes,
+ @PluginAttr("securityPrincipalName") final String securityPrincipalName,
+ @PluginAttr("securityCredentials") final String securityCredentials,
+ @PluginAttr("factoryBindingName") final String factoryBindingName,
+ @PluginAttr("topicBindingName") final String topicBindingName,
+ @PluginAttr("userName") final String userName,
+ @PluginAttr("password") final String password,
+ @PluginElement("layout") Layout layout,
+ @PluginElement("filters") final Filter filter,
+ @PluginAttr("suppressExceptions") final String suppress) {
if (name == null) {
LOGGER.error("No name provided for JMSQueueAppender");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java Sun Jan 20 19:59:55 2013
@@ -40,6 +40,7 @@ public class OutputStreamManager extends
* @param name The name of the stream to manage.
* @param data The data to pass to the Manager.
* @param factory The factory to use to create the Manager.
+ * @param <T> The type of the OutputStreamManager.
* @return An OutputStreamManager.
*/
public static <T> OutputStreamManager getManager(final String name, final T data,
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java Sun Jan 20 19:59:55 2013
@@ -41,7 +41,8 @@ public final class RollingFileAppender e
private final String filePattern;
- private RollingFileAppender(final String name, final Layout layout, final Filter filter, final RollingFileManager manager, final String fileName,
+ private RollingFileAppender(final String name, final Layout layout, final Filter filter,
+ final RollingFileManager manager, final String fileName,
final String filePattern, final boolean handleException, final boolean immediateFlush) {
super(name, layout, filter, handleException, immediateFlush, manager);
this.fileName = fileName;
@@ -136,8 +137,8 @@ public final class RollingFileAppender e
strategy = DefaultRolloverStrategy.createStrategy(null, null, "true", config);
}
- final RollingFileManager manager = RollingFileManager.getFileManager(fileName, filePattern, isAppend, isBuffered,
- policy, strategy);
+ final RollingFileManager manager = RollingFileManager.getFileManager(fileName, filePattern, isAppend,
+ isBuffered, policy, strategy);
if (manager == null) {
return null;
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java Sun Jan 20 19:59:55 2013
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.appender;
@@ -47,7 +47,11 @@ import org.apache.logging.log4j.core.Log
* appender.
*/
@Plugin(name = "SMTP", type = "Core", elementType = "appender", printObject = true)
-public class SMTPAppender extends AbstractAppender {
+public final class SMTPAppender extends AbstractAppender {
+
+ private static final int DEFAULT_BUFFER_SIZE = 512;
+
+ /** The SMTP Manager */
protected final SMTPManager manager;
private SMTPAppender(final String name, final Filter filter, final Layout<?> layout, final SMTPManager manager,
@@ -71,9 +75,8 @@ public class SMTPAppender extends Abstra
* The email address of the sender.
* @param replyTo
* The comma-separated list of reply-to email addresses.
- * @param smtpProtocol
- * The SMTP transport protocol (such as "smtps", defaults to
- * "smtp").
+ * @param subject The subject of the email message.
+ * @param smtpProtocol The SMTP transport protocol (such as "smtps", defaults to "smtp").
* @param smtpHost
* The SMTP hostname to send to.
* @param smtpPortNum
@@ -123,7 +126,7 @@ public class SMTPAppender extends Abstra
final boolean isHandleExceptions = suppressExceptions == null ? true : Boolean.valueOf(suppressExceptions);
final int smtpPort = smtpPortNum == null ? 0 : Integer.parseInt(smtpPortNum);
final boolean isSmtpDebug = smtpDebug == null ? false : Boolean.valueOf(smtpDebug);
- final int bufferSize = bufferSizeNum == null ? 512 : Integer.valueOf(bufferSizeNum);
+ final int bufferSize = bufferSizeNum == null ? DEFAULT_BUFFER_SIZE : Integer.valueOf(bufferSizeNum);
if (layout == null) {
layout = HTMLLayout.createLayout(null, null, null, null, null, null);
@@ -142,7 +145,9 @@ public class SMTPAppender extends Abstra
}
/**
- * Capture all events in CyclicBuffer
+ * Capture all events in CyclicBuffer.
+ * @param event The Log event.
+ * @return true if the event should be filtered.
*/
@Override
public boolean isFiltered(final LogEvent event) {
@@ -150,15 +155,16 @@ public class SMTPAppender extends Abstra
if (filtered) {
manager.add(event);
}
- return filtered;
+ return filtered;
}
/**
* Perform SMTPAppender specific appending actions, mainly adding the event
* to a cyclic buffer and checking if the event triggers an e-mail to be
* sent.
+ * @param event The Log event.
*/
public void append(final LogEvent event) {
manager.sendEvents(getLayout(), event);
}
-}
\ No newline at end of file
+}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java Sun Jan 20 19:59:55 2013
@@ -36,8 +36,9 @@ import org.apache.logging.log4j.util.Eng
public class SocketAppender extends AbstractOutputStreamAppender {
- protected SocketAppender(final String name, final Layout layout, final Filter filter, final AbstractSocketManager manager,
- final boolean handleException, final boolean immediateFlush) {
+ protected SocketAppender(final String name, final Layout layout, final Filter filter,
+ final AbstractSocketManager manager, final boolean handleException,
+ final boolean immediateFlush) {
super(name, layout, filter, handleException, immediateFlush, manager);
}
@@ -89,7 +90,8 @@ public class SocketAppender extends Abst
return new SocketAppender(name, layout, filter, manager, handleExceptions, isFlush);
}
- protected static AbstractSocketManager createSocketManager(final String protocol, final String host, final int port, final int delay) {
+ protected static AbstractSocketManager createSocketManager(final String protocol, final String host, final int port,
+ final int delay) {
final Protocol p = EnglishEnums.valueOf(Protocol.class, protocol);
switch (p) {
case TCP:
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java Sun Jan 20 19:59:55 2013
@@ -39,8 +39,8 @@ public class SyslogAppender extends Sock
private static final String RFC5424 = "RFC5424";
- protected SyslogAppender(final String name, final Layout layout, final Filter filter,
- final boolean handleException, final boolean immediateFlush, final AbstractSocketManager manager) {
+ protected SyslogAppender(final String name, final Layout layout, final Filter filter, final boolean handleException,
+ final boolean immediateFlush, final AbstractSocketManager manager) {
super(name, layout, filter, manager, handleException, immediateFlush);
}
@@ -62,6 +62,7 @@ public class SyslogAppender extends Sock
* record. Defaults to "true:.
* @param mdcId The id to use for the MDC Structured Data Element.
* @param includeNL If true, a newline will be appended to the end of the syslog record. The default is false.
+ * @param escapeNL String that should be used to replace newlines within the message text.
* @param appName The value to use as the APP-NAME in the RFC 5424 syslog record.
* @param msgId The default value to be used in the MSGID field of RFC 5424 syslog records.
* @param excludes A comma separated list of mdc keys that should be excluded from the LogEvent.
@@ -72,6 +73,7 @@ public class SyslogAppender extends Sock
* @param filter A Filter to determine if the event should be handled by this Appender.
* @param config The Configuration.
* @param charsetName The character set to use when converting the syslog String to a byte array.
+ * @param exceptionPattern The converter pattern to use for formatting exceptions.
* @return A SyslogAppender.
*/
@PluginFactory
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java Sun Jan 20 19:59:55 2013
@@ -43,8 +43,9 @@ public final class RewriteAppender exten
private final RewritePolicy rewritePolicy;
private final AppenderRef[] appenderRefs;
- private RewriteAppender(final String name, final Filter filter, final boolean handleException, final AppenderRef[] appenderRefs,
- final RewritePolicy rewritePolicy, final Configuration config) {
+ private RewriteAppender(final String name, final Filter filter, final boolean handleException,
+ final AppenderRef[] appenderRefs, final RewritePolicy rewritePolicy,
+ final Configuration config) {
super(name, filter, null, handleException);
this.config = config;
this.rewritePolicy = rewritePolicy;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java Sun Jan 20 19:59:55 2013
@@ -78,7 +78,8 @@ public final class CompositeTriggeringPo
* @return A CompositeTriggeringPolicy.
*/
@PluginFactory
- public static CompositeTriggeringPolicy createPolicy(@PluginElement("policies") final TriggeringPolicy... policies) {
+ public static CompositeTriggeringPolicy createPolicy(
+ @PluginElement("policies") final TriggeringPolicy... policies) {
return new CompositeTriggeringPolicy(policies);
}
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java Sun Jan 20 19:59:55 2013
@@ -354,6 +354,8 @@ public class DefaultRolloverStrategy imp
* Create the DefaultRolloverStrategy.
* @param max The maximum number of files to keep.
* @param min The minimum number of files to keep.
+ * @param fileIndex If set to "max" (the default), files with a higher index will be newer than files with a
+ * smaller index. If set to "min", file renaming and the counter will follow the Fixed Window strategy.
* @param config The Configuration.
* @return A DefaultRolloverStrategy.
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessor.java Sun Jan 20 19:59:55 2013
@@ -77,6 +77,7 @@ public class PatternProcessor {
* Returns the next potential rollover time.
* @param current The current time.
* @param increment The increment to the next time.
+ * @param modulus If true the time will be rounded to occur on a boundary aligned with the increment.
* @return the next potential rollover time and the timestamp for the target file.
*/
public long getNextTime(final long current, final int increment, final boolean modulus) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java Sun Jan 20 19:59:55 2013
@@ -44,8 +44,9 @@ public class RollingFileManager extends
private final TriggeringPolicy policy;
private final RolloverStrategy strategy;
- protected RollingFileManager(final String fileName, final String pattern, final OutputStream os, final boolean append, final long size,
- final long time, final TriggeringPolicy policy, final RolloverStrategy strategy) {
+ protected RollingFileManager(final String fileName, final String pattern, final OutputStream os,
+ final boolean append, final long size, final long time, final TriggeringPolicy policy,
+ final RolloverStrategy strategy) {
super(fileName, os, append, false);
this.size = size;
this.initialTime = time;
@@ -61,6 +62,8 @@ public class RollingFileManager extends
* @param pattern The pattern for rolling file.
* @param append true if the file should be appended to.
* @param bufferedIO true if data should be buffered.
+ * @param policy The TriggeringPolicy.
+ * @param strategy The RolloverStrategy.
* @return A RollingFileManager.
*/
public static RollingFileManager getFileManager(final String fileName, final String pattern, final boolean append,
@@ -232,8 +235,8 @@ public class RollingFileManager extends
* @param append The append flag.
* @param bufferedIO The bufferedIO flag.
*/
- public FactoryData(final String pattern, final boolean append, final boolean bufferedIO, final TriggeringPolicy policy,
- final RolloverStrategy strategy) {
+ public FactoryData(final String pattern, final boolean append, final boolean bufferedIO,
+ final TriggeringPolicy policy, final RolloverStrategy strategy) {
this.pattern = pattern;
this.append = append;
this.bufferedIO = bufferedIO;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java Sun Jan 20 19:59:55 2013
@@ -71,6 +71,8 @@ public final class TimeBasedTriggeringPo
/**
* Create a TimeBasedTriggeringPolicy.
+ * @param interval The interval between rollovers.
+ * @param modulate If true the time will be rounded to occur on a boundary aligned with the increment.
* @return a TimeBasedTriggeringPolicy.
*/
@PluginFactory
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=1435937&r1=1435936&r2=1435937&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 Sun Jan 20 19:59:55 2013
@@ -37,7 +37,7 @@ public class AppenderControl<T extends S
private final Appender<T> appender;
private final Level level;
-
+
private final int intLevel;
/**
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java Sun Jan 20 19:59:55 2013
@@ -314,7 +314,8 @@ public class BaseConfiguration extends A
* @param logger The Logger the Appender will be associated with.
* @param appender The Appender.
*/
- public synchronized void addLoggerAppender(final org.apache.logging.log4j.core.Logger logger, final Appender appender) {
+ public synchronized void addLoggerAppender(final org.apache.logging.log4j.core.Logger logger,
+ final Appender appender) {
final String name = logger.getName();
appenders.putIfAbsent(name, appender);
final LoggerConfig lc = getLoggerConfig(name);
@@ -362,7 +363,8 @@ public class BaseConfiguration extends A
* @param logger The Logger the Appender will be associated with.
* @param additive True if the LoggerConfig should be additive, false otherwise.
*/
- public synchronized void setLoggerAdditive(final org.apache.logging.log4j.core.Logger logger, final boolean additive) {
+ public synchronized void setLoggerAdditive(final org.apache.logging.log4j.core.Logger logger,
+ final boolean additive) {
final String name = logger.getName();
final LoggerConfig lc = getLoggerConfig(name);
if (lc.getName().equals(name)) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java Sun Jan 20 19:59:55 2013
@@ -30,7 +30,8 @@ import java.util.Map;
*/
public interface Configuration extends Filterable {
- public static final String CONTEXT_PROPERTIES = "ContextProperties";
+ /** Key for storing the Context properties. */
+ String CONTEXT_PROPERTIES = "ContextProperties";
/**
* Returns the configuration name.
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java Sun Jan 20 19:59:55 2013
@@ -430,6 +430,9 @@ public abstract class ConfigurationFacto
}
}
+ /**
+ * Represents the source for the logging configuration.
+ */
public static class ConfigurationSource {
private File file;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java Sun Jan 20 19:59:55 2013
@@ -73,7 +73,8 @@ public final class Configurator {
* @param source The InputSource for the configuration.
* @return The LoggerContext.
*/
- public static LoggerContext initialize(final ClassLoader loader, final ConfigurationFactory.ConfigurationSource source) {
+ public static LoggerContext initialize(final ClassLoader loader,
+ final ConfigurationFactory.ConfigurationSource source) {
try {
final LoggerContext ctx = (LoggerContext) LogManager.getContext(loader, false);
@@ -95,5 +96,4 @@ public final class Configurator {
ctx.setConfiguration(new DefaultConfiguration());
}
}
-
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java Sun Jan 20 19:59:55 2013
@@ -24,9 +24,10 @@ import org.apache.logging.log4j.core.lay
import org.apache.logging.log4j.util.PropertiesUtil;
/**
- * The default configuration writes all output to the Console using the default logging level. You configure default logging level by setting the
- * system property "org.apache.logging.log4j.level" to a level name. If you do not specify the property, Log4J uses the ERROR Level. Log
- * Events will be printed using the basic formatting provided by each Message.
+ * The default configuration writes all output to the Console using the default logging level. You configure default
+ * logging level by setting the system property "org.apache.logging.log4j.level" to a level name. If you do not
+ * specify the property, Log4J uses the ERROR Level. Log Events will be printed using the basic formatting provided
+ * by each Message.
*/
public class DefaultConfiguration extends BaseConfiguration {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java Sun Jan 20 19:59:55 2013
@@ -52,7 +52,8 @@ public class FileConfigurationMonitor im
* @param listeners The List of ConfigurationListeners to notify upon a change.
* @param interval The monitor interval in seconds. The minimum interval is 5 seconds.
*/
- public FileConfigurationMonitor(final Reconfigurable reconfigurable, final File file, final List<ConfigurationListener> listeners,
+ public FileConfigurationMonitor(final Reconfigurable reconfigurable, final File file,
+ final List<ConfigurationListener> listeners,
final int interval) {
this.reconfigurable = reconfigurable;
this.file = file;
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=1435937&r1=1435936&r2=1435937&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 Sun Jan 20 19:59:55 2013
@@ -265,7 +265,8 @@ public class LoggerConfig extends Abstra
* @param data The Message.
* @param t A Throwable or null.
*/
- public void log(final String loggerName, final Marker marker, final String fqcn, final Level level, final Message data, final Throwable t) {
+ public void log(final String loggerName, final Marker marker, final String fqcn, final Level level,
+ final Message data, final Throwable t) {
List<Property> props = null;
if (properties != null) {
props = new ArrayList<Property>(properties.size());
@@ -342,11 +343,12 @@ public class LoggerConfig extends Abstra
* @param fqcn The fully qualified class name of the caller.
* @param level The event Level.
* @param data The Message.
+ * @param properties Properties to be added to the log event.
* @param t An optional Throwable.
* @return The LogEvent.
*/
- public LogEvent createEvent(final String loggerName, final Marker marker, final String fqcn, final Level level, final Message data,
- final List<Property> properties, final Throwable t) {
+ public LogEvent createEvent(final String loggerName, final Marker marker, final String fqcn, final Level level,
+ final Message data, final List<Property> properties, final Throwable t) {
return new Log4jLogEvent(loggerName, marker, fqcn, level, data, properties, t);
}
@@ -361,6 +363,8 @@ public class LoggerConfig extends Abstra
* @param levelName The Level to be associated with the Logger.
* @param loggerName The name of the Logger.
* @param refs An array of Appender names.
+ * @param properties Properties to pass to the Logger.
+ * @param config The Configuration.
* @param filter A Filter.
* @return A new LoggerConfig.
*/
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java Sun Jan 20 19:59:55 2013
@@ -37,8 +37,10 @@ public final class AppendersPlugin {
* @return The Appender Map.
*/
@PluginFactory
- public static ConcurrentMap<String, Appender<? extends Serializable>> createAppenders(@PluginElement("appenders") final Appender<?>[] appenders) {
- final ConcurrentMap<String, Appender<? extends Serializable>> map = new ConcurrentHashMap<String, Appender<? extends Serializable>>();
+ public static ConcurrentMap<String, Appender<? extends Serializable>> createAppenders(
+ @PluginElement("appenders") final Appender<?>[] appenders) {
+ final ConcurrentMap<String, Appender<? extends Serializable>> map =
+ new ConcurrentHashMap<String, Appender<? extends Serializable>>();
for (final Appender<?> appender : appenders) {
map.put(appender.getName(), appender);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java Sun Jan 20 19:59:55 2013
@@ -47,7 +47,7 @@ public class PluginManager {
private static ConcurrentMap<String, ConcurrentMap<String, PluginType>> pluginTypeMap =
new ConcurrentHashMap<String, ConcurrentMap<String, PluginType>>();
- private static final CopyOnWriteArrayList<String> packages = new CopyOnWriteArrayList<String>();
+ private static final CopyOnWriteArrayList<String> PACKAGES = new CopyOnWriteArrayList<String>();
private static final String PATH = "org/apache/logging/log4j/core/config/plugins/";
private static final String FILENAME = "Log4j2Plugins.dat";
private static final String LOG4J_PACKAGES = "org.apache.logging.log4j.core";
@@ -98,7 +98,7 @@ public class PluginManager {
* @param p The package name.
*/
public static void addPackage(final String p) {
- packages.addIfAbsent(p);
+ PACKAGES.addIfAbsent(p);
}
/**
@@ -153,16 +153,16 @@ public class PluginManager {
}
if (plugins.size() == 0) {
if (pkgs == null) {
- packages.add(LOG4J_PACKAGES);
+ PACKAGES.add(LOG4J_PACKAGES);
} else {
final String[] names = pkgs.split(",");
for (final String name : names) {
- packages.add(name);
+ PACKAGES.add(name);
}
}
}
final ResolverUtil.Test test = new PluginTest(clazz);
- for (final String pkg : packages) {
+ for (final String pkg : PACKAGES) {
resolver.findInPackage(test, pkg);
}
for (final Class<?> clazz : resolver.getClasses()) {
@@ -173,7 +173,8 @@ public class PluginManager {
}
final Map<String, PluginType> map = pluginTypeMap.get(pluginType);
final String type = plugin.elementType().equals(Plugin.EMPTY) ? plugin.name() : plugin.elementType();
- map.put(plugin.name().toLowerCase(), new PluginType(clazz, type, plugin.printObject(), plugin.deferChildren()));
+ map.put(plugin.name().toLowerCase(), new PluginType(clazz, type, plugin.printObject(),
+ plugin.deferChildren()));
}
long elapsed = System.nanoTime() - start;
plugins = pluginTypeMap.get(type);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginType.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginType.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginType.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginType.java Sun Jan 20 19:59:55 2013
@@ -21,13 +21,13 @@ import java.io.Serializable;
/**
* Plugin Descriptor.
- *
+ *
* @param <T> The plug-in class, which can be any kind of class.
*/
public class PluginType<T> implements Serializable {
private static final long serialVersionUID = 4743255148794846612L;
-
+
private final Class<T> pluginClass;
private final String elementName;
private final boolean printObject;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java Sun Jan 20 19:59:55 2013
@@ -37,6 +37,7 @@ public final class PropertiesPlugin {
/**
* Create the Properties component.
* @param properties An array of Property elements.
+ * @param config The Configuration.
* @return An Interpolator that includes the configuration properties.
*/
@PluginFactory
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java Sun Jan 20 19:59:55 2013
@@ -276,8 +276,10 @@ public class ResolverUtil {
private void loadImplementationsInBundle(final Test test, final String packageName) {
//Do not remove the cast on the next line as removing it will cause a compile error on Java 7.
- final BundleWiring wiring = (BundleWiring)FrameworkUtil.getBundle(ResolverUtil.class).adapt(BundleWiring.class);
- final Collection<String> list = wiring.listResources(packageName, "*.class", BundleWiring.LISTRESOURCES_RECURSE);
+ final BundleWiring wiring =
+ (BundleWiring) FrameworkUtil.getBundle(ResolverUtil.class).adapt(BundleWiring.class);
+ final Collection<String> list = wiring.listResources(packageName, "*.class",
+ BundleWiring.LISTRESOURCES_RECURSE);
for (final String name : list) {
addIfMatching(test, name);
}
@@ -349,7 +351,8 @@ public class ResolverUtil {
* @param parent the parent package under which classes must be in order to be considered
* @param stream The jar InputStream
*/
- private void loadImplementationsInJar(final Test test, final String parent, final String path, final JarInputStream stream) {
+ private void loadImplementationsInJar(final Test test, final String parent, final String path,
+ final JarInputStream stream) {
try {
JarEntry entry;
@@ -423,7 +426,7 @@ public class ResolverUtil {
boolean matches(URI resource);
boolean doesMatchClass();
-
+
boolean doesMatchResource();
}
@@ -438,7 +441,7 @@ public class ResolverUtil {
public boolean doesMatchClass() {
return true;
}
-
+
public boolean doesMatchResource() {
return false;
}
@@ -455,7 +458,7 @@ public class ResolverUtil {
public boolean doesMatchClass() {
return false;
}
-
+
public boolean doesMatchResource() {
return true;
}
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=1435937&r1=1435936&r2=1435937&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 Sun Jan 20 19:59:55 2013
@@ -118,7 +118,8 @@ public abstract class AbstractFilter imp
* @param params An array of parameters or null.
* @return The Result of filtering.
*/
- public Result filter(final Logger logger, final Level level, final Marker marker, final String msg, final Object... params) {
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object... params) {
return Result.NEUTRAL;
}
@@ -131,7 +132,8 @@ public abstract class AbstractFilter imp
* @param t A throwable or null.
* @return The Result of filtering.
*/
- public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg, final Throwable t) {
+ public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg,
+ final Throwable t) {
return Result.NEUTRAL;
}
@@ -144,7 +146,8 @@ public abstract class AbstractFilter imp
* @param t A throwable or null.
* @return The Result of filtering.
*/
- public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg, final Throwable t) {
+ public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg,
+ final Throwable t) {
return Result.NEUTRAL;
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java?rev=1435937&r1=1435936&r2=1435937&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java Sun Jan 20 19:59:55 2013
@@ -77,7 +77,8 @@ public final class BurstFilter extends A
private final Queue<LogDelay> available = new ConcurrentLinkedQueue<LogDelay>();
- private BurstFilter(final Level level, final float rate, final long maxBurst, final Result onMatch, final Result onMismatch) {
+ private BurstFilter(final Level level, final float rate, final long maxBurst, final Result onMatch,
+ final Result onMismatch) {
super(onMatch, onMismatch);
this.level = level;
this.burstInterval = (long) (NANOS_IN_SECONDS * (maxBurst / rate));
@@ -87,17 +88,20 @@ public final class BurstFilter extends A
}
@Override
- public Result filter(final Logger logger, final Level level, final Marker marker, final String msg, final Object... params) {
+ public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
+ final Object... params) {
return filter(level);
}
@Override
- public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg, final Throwable t) {
+ public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg,
+ final Throwable t) {
return filter(level);
}
@Override
- public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg, final Throwable t) {
+ public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg,
+ final Throwable t) {
return filter(level);
}