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 2011/12/19 17:53:10 UTC
svn commit: r1220842 - in
/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers: ./
log4j2-core/src/main/java/org/apache/logging/log4j/core/
log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/
log4j2-core/src/main/java/org/apache/logging...
Author: rgoers
Date: Mon Dec 19 16:53:09 2011
New Revision: 1220842
URL: http://svn.apache.org/viewvc?rev=1220842&view=rev
Log:
Make Appender and Layout Plugins have private or protected constructors and add javadoc. Add download and changelog pages to site.
Added:
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/apt/
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/apt/download.apt
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/build.xml
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/changelog.xml
Modified:
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Appender.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderBase.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/LayoutBase.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/pom.xml
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/resources/images/ls-logo.jpg
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/manual/appenders.xml
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Appender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Appender.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Appender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Appender.java Mon Dec 19 16:53:09 2011
@@ -47,25 +47,6 @@ public interface Appender extends Lifecy
Layout getLayout();
/**
- * Configurators call this method to determine if the appender
- * requires a layout. If this method returns <code>true</code>,
- * meaning that layout is required, then the configurator will
- * configure an layout using the configuration information at its
- * disposal. If this method returns <code>false</code>, meaning that
- * a layout is not required, then layout configuration will be
- * skipped even if there is available layout configuration
- * information at the disposal of the configurator..
- * <p/>
- * <p>In the rather exceptional case, where the appender
- * implementation admits a layout but can also work without it, then
- * the appender should return <code>true</code>.
- *
- * @return True if a Layout is required, false otherwise.
- * @issue LOG4J2-36 Refactor into Channel
- */
- boolean requiresLayout();
-
- /**
* If set to true any exceptions thrown by the Appender will be logged but not thrown.
* @return true if Exceptions should be suppressed, false otherwise.
*/
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderBase.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderBase.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderBase.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderBase.java Mon Dec 19 16:53:09 2011
@@ -94,14 +94,6 @@ public abstract class AppenderBase exten
}
/**
- * Appenders may override this method to indicate that a Layout is required.
- * @return false if no Layout is required.
- */
- public boolean requiresLayout() {
- return false;
- }
-
- /**
* Some appenders need to propogate exceptions back to the application. When suppressException is false the
* AppenderControl will allow the exception to percolate.
*/
@@ -110,10 +102,6 @@ public abstract class AppenderBase exten
}
public void start() {
- if (layout == null && requiresLayout()) {
- logger.error("A layout is required and none was provided");
- return;
- }
startFilter();
this.started = true;
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java Mon Dec 19 16:53:09 2011
@@ -22,6 +22,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginAttr;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.layout.PatternLayout;
import java.io.OutputStream;
@@ -38,29 +39,33 @@ import java.io.OutputStream;
@Plugin(name="Console",type="Core",elementType="appender",printObject=true)
public class ConsoleAppender extends OutputStreamAppender {
- public static final String LAYOUT = "layout";
- public static final String TARGET = "target";
- public static final String NAME = "name";
-
private static ManagerFactory factory = new ConsoleManagerFactory();
+ /**
+ * Enumeration of console destinations.
+ */
public enum Target {
- SYSTEM_OUT, SYSTEM_ERR
- }
-
- public ConsoleAppender(String name, Layout layout) {
- this(name, layout, null, getManager(Target.SYSTEM_OUT), true);
+ /** Standard output */
+ SYSTEM_OUT,
+ /** Standard error output */
+ SYSTEM_ERR
}
- public ConsoleAppender(String name, Layout layout, boolean handleExceptions) {
- this(name, layout, null, getManager(Target.SYSTEM_OUT), handleExceptions);
- }
-
- public ConsoleAppender(String name, Layout layout, Filter filter, OutputStreamManager manager,
+ private ConsoleAppender(String name, Layout layout, Filter filter, OutputStreamManager manager,
boolean handleExceptions) {
super(name, layout, filter, handleExceptions, true, manager);
}
+ /**
+ * Create a Console Appender.
+ * @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 name The name of the Appender (required).
+ * @param suppress "true" if exceptions should be hidden from the application, "false" otherwise.
+ * The default is "true".
+ * @return The ConsoleAppender.
+ */
@PluginFactory
public static ConsoleAppender createAppender(@PluginElement("layout") Layout layout,
@PluginElement("filters") Filter filter,
@@ -71,6 +76,9 @@ public class ConsoleAppender extends Out
logger.error("No name provided for ConsoleAppender");
return null;
}
+ if (layout == null) {
+ layout = PatternLayout.createLayout(null, null, null, null);
+ }
boolean handleExceptions = suppress == null ? true : Boolean.valueOf(suppress);
Target target = t == null ? Target.SYSTEM_OUT : Target.valueOf(t);
return new ConsoleAppender(name, layout, filter, getManager(target), handleExceptions);
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java Mon Dec 19 16:53:09 2011
@@ -51,7 +51,7 @@ public class FailoverAppender extends Ap
private List<AppenderControl> failoverAppenders = new ArrayList<AppenderControl>();
- public FailoverAppender(String name, Filter filter, String primary, String[] failovers,
+ private FailoverAppender(String name, Filter filter, String primary, String[] failovers,
Configuration config, boolean handleExceptions) {
super(name, filter, null, handleExceptions);
this.primaryRef = primary;
@@ -91,6 +91,10 @@ public class FailoverAppender extends Ap
super.stop();
}
+ /**
+ * Handle the Log event.
+ * @param event The LogEvent.
+ */
public void append(LogEvent event) {
RuntimeException re = null;
if (!isStarted()) {
@@ -133,6 +137,17 @@ public class FailoverAppender extends Ap
return sb.toString();
}
+ /**
+ * Create a Failover Appender
+ * @param name The name of the Appender (required).
+ * @param primary The name of the primary Appender (required).
+ * @param failovers The name of one or more Appenders to fail over to (at least one is required).
+ * @param config The current Configuration (passed by the Configuration when the appender is created).
+ * @param filter A Filter (optional).
+ * @param suppress "true" if exceptions should be hidden from the application, "false" otherwise.
+ * The default is "true".
+ * @return The FailoverAppender that was created.
+ */
@PluginFactory
public static FailoverAppender createAppender(@PluginAttr("name") String name,
@PluginAttr("primary") String primary,
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java Mon Dec 19 16:53:09 2011
@@ -22,21 +22,47 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginAttr;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.layout.PatternLayout;
/**
- *
+ * File Appender
*/
@Plugin(name="File",type="Core",elementType="appender",printObject=true)
public class FileAppender extends OutputStreamAppender {
- public final String fileName;
+ private final String fileName;
- public FileAppender(String name, Layout layout, Filter filter, FileManager manager, String filename,
+ private FileAppender(String name, Layout layout, Filter filter, FileManager manager, String filename,
boolean handleException, boolean immediateFlush) {
super(name, layout, filter, handleException, immediateFlush, manager);
this.fileName = filename;
}
+ /**
+ * Return the file name this appender is associated with
+ * @return The File name.
+ */
+ public String getFileName() {
+ return this.fileName;
+ }
+
+ /**
+ * Create a File Appender
+ * @param fileName The name and path of the file.
+ * @param append "True" if the file should be appended to, "false" if it should be overwritten.
+ * The default is "true".
+ * @param locking "True" if the file should be locked. The default is "false".
+ * @param name The name of the Appender.
+ * @param immediateFlush "true" if the contents should be flushed on every write, "false" otherwise. The default
+ * is "true".
+ * @param suppress "true" if exceptions should be hidden from the application, "false" otherwise.
+ * The default is "true".
+ * @param bufferedIO "true" if I/O should be buffered, "false" otherwise. The default is "true".
+ * @param layout The layout to use to format the event. If no layout is provided the default PatternLayout
+ * will be used.
+ * @param filter The filter, if any, to use.
+ * @return The FileAppender.
+ */
@PluginFactory
public static FileAppender createAppender(@PluginAttr("fileName") String fileName,
@PluginAttr("append") String append,
@@ -74,6 +100,9 @@ public class FileAppender extends Output
if (manager == null) {
return null;
}
+ if (layout == null) {
+ layout = PatternLayout.createLayout(null, null, null, null);
+ }
return new FileAppender(name, layout, filter, manager, fileName, handleExceptions, isFlush);
}
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java Mon Dec 19 16:53:09 2011
@@ -34,7 +34,7 @@ public class JMSQueueAppender extends Ap
private final JMSQueueManager manager;
- public JMSQueueAppender(String name, Filter filter, Layout layout, JMSQueueManager manager,
+ private JMSQueueAppender(String name, Filter filter, Layout layout, JMSQueueManager manager,
boolean handleExceptions) {
super(name, filter, layout, handleExceptions);
this.manager = manager;
@@ -53,6 +53,23 @@ public class JMSQueueAppender extends Ap
}
}
+ /**
+ * Create a JMSQueueAppender.
+ * @param factoryName
+ * @param providerURL
+ * @param urlPkgPrefixes
+ * @param securityPrincipalName
+ * @param securityCredentials
+ * @param factoryBindingName
+ * @param queueBindingName
+ * @param userName
+ * @param password
+ * @param layout The layout to use (defaults to SerlializedLayout).
+ * @param filter The Filter or null.
+ * @param suppress "true" if exceptions should be hidden from the application, "false" otherwise.
+ * The default is "true".
+ * @return The JMSQueueAppender.
+ */
@PluginFactory
public static JMSQueueAppender createAppender(@PluginAttr("factoryName") String factoryName,
@PluginAttr("providerURL") String providerURL,
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java Mon Dec 19 16:53:09 2011
@@ -34,7 +34,7 @@ public class JMSTopicAppender extends Ap
private final JMSTopicManager manager;
- public JMSTopicAppender(String name, Filter filter, Layout layout, JMSTopicManager manager,
+ private JMSTopicAppender(String name, Filter filter, Layout layout, JMSTopicManager manager,
boolean handleExceptions) {
super(name, filter, layout, handleExceptions);
this.manager = manager;
@@ -53,6 +53,23 @@ public class JMSTopicAppender extends Ap
}
}
+ /**
+ * Create a JMSTopicAppender.
+ * @param factoryName
+ * @param providerURL
+ * @param urlPkgPrefixes
+ * @param securityPrincipalName
+ * @param securityCredentials
+ * @param factoryBindingName
+ * @param topicBindingName
+ * @param userName
+ * @param password
+ * @param layout The layout to use (defaults to SerlializedLayout).
+ * @param filter The Filter or null.
+ * @param suppress "true" if exceptions should be hidden from the application, "false" otherwise.
+ * The default is "true".
+ * @return The JMSTopicAppender.
+ */
@PluginFactory
public static JMSTopicAppender createAppender(@PluginAttr("factoryName") String factoryName,
@PluginAttr("providerURL") String providerURL,
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java Mon Dec 19 16:53:09 2011
@@ -57,7 +57,7 @@ public abstract class OutputStreamAppend
* @param layout The layout to format the message.
* @param manager The OutputStreamManager.
*/
- public OutputStreamAppender(String name, Layout layout, Filter filter, boolean handleException,
+ protected OutputStreamAppender(String name, Layout layout, Filter filter, boolean handleException,
boolean immediateFlush, OutputStreamManager manager) {
super(name, filter, layout, handleException);
if (layout != null) {
@@ -123,12 +123,4 @@ public abstract class OutputStreamAppend
readLock.unlock();
}
}
-
- /**
- * The WriterAppender requires a layout. Hence, this method returns
- * <code>true</code>.
- */
- public boolean requiresLayout() {
- return true;
- }
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java Mon Dec 19 16:53:09 2011
@@ -27,9 +27,10 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginAttr;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.layout.PatternLayout;
/**
- *
+ * An appender that writes to files andd can roll over at intervals.
*/
@Plugin(name="RollingFile",type="Core",elementType="appender",printObject=true)
public class RollingFileAppender extends OutputStreamAppender {
@@ -38,17 +39,15 @@ public class RollingFileAppender extends
public final String filePattern;
private final TriggeringPolicy policy;
private final RolloverStrategy strategy;
- private final boolean bufferedIO;
- public RollingFileAppender(String name, Layout layout, TriggeringPolicy policy, RolloverStrategy strategy,
+ private RollingFileAppender(String name, Layout layout, TriggeringPolicy policy, RolloverStrategy strategy,
Filter filter, RollingFileManager manager, String fileName, String filePattern,
- boolean handleException, boolean immediateFlush, boolean isBuffered) {
+ boolean handleException, boolean immediateFlush) {
super(name, layout, filter, handleException, immediateFlush, manager);
this.fileName = fileName;
this.filePattern = filePattern;
this.policy = policy;
this.strategy = strategy;
- this.bufferedIO = isBuffered;
policy.initialize(manager);
}
@@ -63,6 +62,23 @@ public class RollingFileAppender extends
super.append(event);
}
+ /**
+ * Create a RollingFileAppender.
+ * @param fileName The name of the file that is actively written to. (required).
+ * @param filePattern The pattern of the file name to use on rollover. (required).
+ * @param append If true, events are appended to the file. If false, the file
+ * is overwritten when opened. Defaults to "true"
+ * @param name The name of the Appender (required).
+ * @param bufferedIO When true, I/O will be buffered. Defaults to "true".
+ * @param immediateFlush When true, events are immediately flushed. Defaults to "true".
+ * @param policy The triggering policy. (required).
+ * @param strategy The rollover strategy. Defaults to DefaultRolloverStrategy.
+ * @param layout The layout to use (defaults to the default PatternLayout).
+ * @param filter The Filter or null.
+ * @param suppress "true" if exceptions should be hidden from the application, "false" otherwise.
+ * The default is "true".
+ * @return
+ */
@PluginFactory
public static RollingFileAppender createAppender(@PluginAttr("fileName") String fileName,
@PluginAttr("filePattern") String filePattern,
@@ -110,7 +126,11 @@ public class RollingFileAppender extends
return null;
}
+ if (layout == null) {
+ layout = PatternLayout.createLayout(null, null, null, null);
+ }
+
return new RollingFileAppender(name, layout, policy, strategy, filter, manager, fileName, filePattern,
- handleExceptions, isFlush, isBuffered);
+ handleExceptions, isFlush);
}
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java Mon Dec 19 16:53:09 2011
@@ -29,18 +29,32 @@ import org.apache.logging.log4j.core.net
import org.apache.logging.log4j.core.net.TCPSocketManager;
/**
- *
+ * An Appender that delivers events over socket connections. Supports both TCP and UDP.
*/
@Plugin(name="Socket",type="Core",elementType="appender",printObject=true)
public class SocketAppender extends OutputStreamAppender {
- public SocketAppender(String name, Layout layout, Filter filter, AbstractSocketManager manager,
+ protected SocketAppender(String name, Layout layout, Filter filter, AbstractSocketManager manager,
boolean handleException, boolean immediateFlush) {
super(name, layout, filter, handleException, immediateFlush, manager);
}
+ /**
+ *
+ * @param host
+ * @param portNum
+ * @param protocol
+ * @param delay
+ * @param name
+ * @param immediateFlush
+ * @param suppress "true" if exceptions should be hidden from the application, "false" otherwise.
+ * The default is "true".
+ * @param layout The layout to use (defaults to SerlializedLayout).
+ * @param filter The Filter or null.
+ * @return
+ */
@PluginFactory
public static SocketAppender createAppender(@PluginAttr("host") String host,
@PluginAttr("port") String portNum,
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java Mon Dec 19 16:53:09 2011
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.core.net
import java.nio.charset.Charset;
/**
- *
+ * The Syslog Appender.
*/
@Plugin(name="Syslog",type="Core",elementType="appender",printObject=true)
public class SyslogAppender extends SocketAppender {
@@ -40,13 +40,38 @@ public class SyslogAppender extends Sock
public static final String RFC5424 = "RFC5424";
- public SyslogAppender(String name, Layout layout, Filter filter,
+ protected SyslogAppender(String name, Layout layout, Filter filter,
boolean handleException, boolean immediateFlush, AbstractSocketManager manager) {
super(name, layout, filter, manager, handleException, immediateFlush);
}
-
+ /**
+ * Create a SyslogAppender.
+ * @param host
+ * @param portNum
+ * @param protocol
+ * @param delay
+ * @param name
+ * @param immediateFlush
+ * @param suppress
+ * @param facility
+ * @param id
+ * @param ein
+ * @param includeMDC
+ * @param mdcId
+ * @param includeNL
+ * @param appName
+ * @param msgId
+ * @param excludes
+ * @param includes
+ * @param required
+ * @param format
+ * @param filter
+ * @param config
+ * @param charset
+ * @return A SyslogAppender.
+ */
@PluginFactory
public static SyslogAppender createAppender(@PluginAttr("host") String host,
@PluginAttr("port") String portNum,
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java Mon Dec 19 16:53:09 2011
@@ -50,7 +50,7 @@ public class DefaultConfiguration extend
setName(DEFAULT_NAME);
Layout layout = PatternLayout.createLayout("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n",
null, null, null);
- Appender appender = new ConsoleAppender("Console", layout);
+ Appender appender = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "true");
addAppender(appender);
LoggerConfig root = getRootLogger();
root.addAppender(appender);
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java Mon Dec 19 16:53:09 2011
@@ -22,7 +22,7 @@ import java.io.UnsupportedEncodingExcept
import java.nio.charset.Charset;
/**
- *
+ * Base class for Layouts that result in a String.
*/
public abstract class AbstractStringLayout extends LayoutBase<String> {
@@ -48,6 +48,11 @@ public abstract class AbstractStringLayo
encoder = useClass ? new ClassEncoder() : new NameEncoder();
}
+ /**
+ * Format the Log Event.
+ * @param event The Log Event.
+ * @return The formatted event as a byte array.
+ */
public byte[] format(LogEvent event) {
return encoder.getBytes(formatAs(event));
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java Mon Dec 19 16:53:09 2011
@@ -62,13 +62,18 @@ public class HTMLLayout extends Abstract
private final long jvmStartTime = ManagementFactory.getRuntimeMXBean().getStartTime();
- public HTMLLayout(boolean locationInfo, String title, String contentType, Charset charset) {
+ private HTMLLayout(boolean locationInfo, String title, String contentType, Charset charset) {
super(charset);
this.locationInfo = locationInfo;
this.title = title;
this.contentType = contentType;
}
+ /**
+ * Format as a String.
+ * @param event The Logging Event.
+ * @return A String containging the LogEvent as HTML.
+ */
public String formatAs(LogEvent event) {
StringBuilder sbuf = new StringBuilder(BUF_SIZE);
@@ -101,7 +106,7 @@ public class HTMLLayout extends Abstract
if (escapedLogger.length() == 0) {
escapedLogger = "root";
}
- sbuf.append("<td title=\"").append(escapedLogger).append(" category\">");
+ sbuf.append("<td title=\"").append(escapedLogger).append(" logger\">");
sbuf.append(escapedLogger);
sbuf.append("</td>").append(LINE_SEP);
@@ -229,6 +234,14 @@ public class HTMLLayout extends Abstract
return sbuf.toString().getBytes(getCharset());
}
+ /**
+ * Create an HTML Layout.
+ * @param locationInfo If "true", location information will be included. The default is false.
+ * @param title The title to include in the file header. If none is specified the default title will be used.
+ * @param contentType The content type. Defaults to "text/html".
+ * @param charset The character set to use. If not specified, the default will be used.
+ * @return An HTML Layout.
+ */
@PluginFactory
public static HTMLLayout createLayout(@PluginAttr("locationInfo") String locationInfo,
@PluginAttr("title") String title,
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/LayoutBase.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/LayoutBase.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/LayoutBase.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/LayoutBase.java Mon Dec 19 16:53:09 2011
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.status.S
import java.io.Serializable;
/**
- *
+ * Base class for Layouts.
*/
public abstract class LayoutBase<T extends Serializable> implements Layout<T> {
@@ -32,18 +32,34 @@ public abstract class LayoutBase<T exten
protected static final Logger logger = StatusLogger.getLogger();
+ /**
+ * Return the header, if one is available.
+ * @return A byte array containing the header.
+ */
public byte[] getHeader() {
return header;
}
+ /**
+ * Set the header.
+ * @param header The header.
+ */
public void setHeader(byte[] header) {
this.header = header;
}
+ /**
+ * Returns the footer, if one is available.
+ * @return A byte array containing the footer.
+ */
public byte[] getFooter() {
return footer;
}
+ /**
+ * Set the footer.
+ * @param footer The footer.
+ */
public void setFooter(byte[] footer) {
this.footer = footer;
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java Mon Dec 19 16:53:09 2011
@@ -94,38 +94,14 @@ public class PatternLayout extends Abstr
private final RegexReplacement replace;
/**
- * Constructs a EnhancedPatternLayout using the DEFAULT_LAYOUT_PATTERN.
- * <p/>
- * The default pattern just produces the application supplied message.
- */
- public PatternLayout() {
- this(null, null, DEFAULT_CONVERSION_PATTERN, Charset.defaultCharset());
- }
-
- /**
- * Constructs a EnhancedPatternLayout using the DEFAULT_LAYOUT_PATTERN.
- * <p/>
- * The default pattern just produces the application supplied message.
- */
- public PatternLayout(final String pattern) {
- this(null, null, pattern, Charset.defaultCharset());
- }
-
- /**
- * Constructs a EnhancedPatternLayout using the DEFAULT_LAYOUT_PATTERN.
- * <p/>
- * The default pattern just produces the application supplied message.
- */
- public PatternLayout(Configuration config, final String pattern) {
- this(config, null, pattern, Charset.defaultCharset());
- }
-
- /**
* Constructs a EnhancedPatternLayout using the supplied conversion pattern.
*
+ * @param config The Configuration.
+ * @param replace The regular expression to match.
* @param pattern conversion pattern.
+ * @param charset The character set.
*/
- public PatternLayout(Configuration config, final RegexReplacement replace, final String pattern,
+ private PatternLayout(Configuration config, final RegexReplacement replace, final String pattern,
final Charset charset) {
super(charset);
this.replace = replace;
@@ -184,10 +160,19 @@ public class PatternLayout extends Abstr
return parser;
}
+ @Override
public String toString() {
return conversionPattern;
}
+ /**
+ * Create a pattern layout.
+ * @param pattern The pattern. If not specified, defaults to DEFAULT_CONVERSION_PATTERN.
+ * @param config The Configuration. Some Converters require access to the Interpolator.
+ * @param replace A Regex replacement String.
+ * @param charset The character set.
+ * @return
+ */
@PluginFactory
public static PatternLayout createLayout(@PluginAttr("pattern") String pattern,
@PluginConfiguration Configuration config,
@@ -201,10 +186,6 @@ public class PatternLayout extends Abstr
logger.error("Charset " + charset + " is not supported for layout, using " + c.displayName());
}
}
- if (pattern != null) {
- return new PatternLayout(config, replace, pattern, c);
- }
- logger.error("No pattern specified for PatternLayout");
- return null;
+ return new PatternLayout(config, replace, pattern == null ? DEFAULT_CONVERSION_PATTERN : pattern, c);
}
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java Mon Dec 19 16:53:09 2011
@@ -45,7 +45,7 @@ import java.util.TreeMap;
/**
- *
+ * Formats a log event in accordance with RFC 5424.
*/
@Plugin(name="RFC5424Layout",type="Core",elementType="layout",printObject=true)
public class RFC5424Layout extends AbstractStringLayout {
@@ -228,11 +228,11 @@ public class RFC5424Layout extends Abstr
}
}
- public List<String> getMdcExcludes() {
+ protected List<String> getMdcExcludes() {
return mdcExcludes;
}
- public List<String> getMdcIncludes() {
+ protected List<String> getMdcIncludes() {
return mdcIncludes;
}
@@ -368,12 +368,13 @@ public class RFC5424Layout extends Abstr
}
}
- public class NoopChecker implements ListChecker {
+ private class NoopChecker implements ListChecker {
public boolean check(String key) {
return true;
}
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("facility=").append(facility.name());
@@ -386,6 +387,23 @@ public class RFC5424Layout extends Abstr
return sb.toString();
}
+ /**
+ * Create the RFC 5424 Layout.
+ * @param facility
+ * @param id
+ * @param ein
+ * @param includeMDC
+ * @param mdcId
+ * @param includeNL
+ * @param appName
+ * @param msgId
+ * @param excludes
+ * @param includes
+ * @param required
+ * @param charset The character set.
+ * @param config The Configuration. Some Converters require access to the Interpolator.
+ * @return An RFC5424Layout.
+ */
@PluginFactory
public static RFC5424Layout createLayout(@PluginAttr("facility") String facility,
@PluginAttr("id") String id,
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/SerializedLayout.java Mon Dec 19 16:53:09 2011
@@ -43,7 +43,6 @@ import java.util.Map;
*/
@Plugin(name="SerializedLayout",type="Core",elementType="layout",printObject=true)
public class SerializedLayout extends LayoutBase<LogEvent> {
- private static int count = 0;
private static byte[] header;
@@ -58,7 +57,7 @@ public class SerializedLayout extends La
}
}
- public SerializedLayout() {
+ private SerializedLayout() {
}
/**
@@ -75,16 +74,26 @@ public class SerializedLayout extends La
return baos.toByteArray();
}
+ /**
+ * Returns the LogEvent.
+ * @param event The Logging Event.
+ * @return The LogEvent.
+ */
public LogEvent formatAs(final LogEvent event) {
return event;
}
+ /**
+ * Create a SerializedLayout.
+ * @return A SerializedLayout.
+ */
@PluginFactory
public static SerializedLayout createLayout() {
return new SerializedLayout();
}
+ @Override
public byte[] getHeader() {
return header;
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java Mon Dec 19 16:53:09 2011
@@ -32,7 +32,7 @@ import java.util.Locale;
/**
- *
+ * Formats a log event as a BSD Log record.
*/
@Plugin(name="SyslogLayout",type="Core",elementType="layout",printObject=true)
public class SyslogLayout extends AbstractStringLayout {
@@ -50,7 +50,7 @@ public class SyslogLayout extends Abstra
private final String localHostname = getLocalHostname();
- public SyslogLayout(Facility facility, boolean includeNL, Charset c) {
+ protected SyslogLayout(Facility facility, boolean includeNL, Charset c) {
super(c);
this.facility = facility;
this.includeNewLine = includeNL;
@@ -102,7 +102,13 @@ public class SyslogLayout extends Abstra
}
}
-
+ /**
+ * Create a SyslogLayout.
+ * @param facility
+ * @param includeNL
+ * @param charset
+ * @return A SyslogLayout.
+ */
@PluginFactory
public static SyslogLayout createLayout(@PluginAttr("facility") String facility,
@PluginAttr("newLine") String includeNL,
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java Mon Dec 19 16:53:09 2011
@@ -77,7 +77,7 @@ public class XMLLayout extends AbstractS
protected static final int DEFAULT_SIZE = 256;
- public XMLLayout(boolean locationInfo, boolean properties, boolean complete, Charset charset) {
+ protected XMLLayout(boolean locationInfo, boolean properties, boolean complete, Charset charset) {
super(charset);
this.locationInfo = locationInfo;
this.properties = properties;
@@ -212,6 +212,14 @@ public class XMLLayout extends AbstractS
return lines;
}
+ /**
+ * Create an XML Layout.
+ * @param locationInfo
+ * @param properties
+ * @param complete
+ * @param charset
+ * @return An XML Layout.
+ */
@PluginFactory
public static XMLLayout createLayout(@PluginAttr("locationInfo") String locationInfo,
@PluginAttr("properties") String properties,
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java Mon Dec 19 16:53:09 2011
@@ -140,9 +140,9 @@ public class FileAppenderTest {
}
private static void writer(boolean lock, int count, String name) throws Exception {
- Layout layout = new PatternLayout(PatternLayout.SIMPLE_CONVERSION_PATTERN);
- FileManager manager = FileManager.getFileManager(FILENAME, true, lock, false);
- FileAppender app = new FileAppender("test", layout, null, manager, FILENAME, false, false);
+ Layout layout = PatternLayout.createLayout(PatternLayout.SIMPLE_CONVERSION_PATTERN, null, null, null);
+ FileAppender app = FileAppender.createAppender(FILENAME, "true", Boolean.toString(lock), "test", "false",
+ "false", "false", layout, null);
Thread t = Thread.currentThread();
app.start();
assertTrue("Appender did not start", app.isStarted());
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java Mon Dec 19 16:53:09 2011
@@ -38,7 +38,7 @@ public class OutputStreamAppenderTest {
@Test
public void testAppender() {
- Layout layout = new PatternLayout();
+ Layout layout = PatternLayout.createLayout(null, null, null, null);
InMemoryAppender app = new InMemoryAppender("test", layout, null, false);
LogEvent event = new Log4jLogEvent("TestLogger", null, OutputStreamAppenderTest.class.getName(), Level.INFO,
new SimpleMessage("Test"), null);
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java Mon Dec 19 16:53:09 2011
@@ -77,10 +77,10 @@ public class PatternLayoutTest {
String mdcMsgPattern5 = "%m : %X{key1},%X{key2},%X{key3}%n";
// set up appender
- PatternLayout layout = new PatternLayout(ctx.getConfiguration(), msgPattern);
+ PatternLayout layout = PatternLayout.createLayout(msgPattern, ctx.getConfiguration(), null, null);
//FileOutputStream fos = new FileOutputStream(OUTPUT_FILE + "_mdc");
- FileManager manager = FileManager.getFileManager(OUTPUT_FILE + "_mdc", false, false, false);
- FileAppender appender = new FileAppender("File", layout, null, manager, OUTPUT_FILE + "_mdc", true, false);
+ FileAppender appender = FileAppender.createAppender(OUTPUT_FILE + "_mdc", "false", "false", "File", "false",
+ "true", "false", layout, null);
appender.start();
// set appender on root and set level to debug
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java Mon Dec 19 16:53:09 2011
@@ -102,7 +102,7 @@ public class JMSQueueTest {
CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter});
ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false);
listApp.start();
- PatternLayout layout = new PatternLayout("%m %ex%n");
+ PatternLayout layout = PatternLayout.createLayout("%m %ex%n", null, null, null);
ConsoleAppender console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "true");
console.start();
Logger serverLogger = ctx.getLogger(JMSTopicReceiver.class.getName());
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java Mon Dec 19 16:53:09 2011
@@ -102,7 +102,7 @@ public class JMSTopicTest {
CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter});
ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false);
listApp.start();
- PatternLayout layout = new PatternLayout("%m %ex%n");
+ PatternLayout layout = PatternLayout.createLayout("%m %ex%n", null, null, null);
ConsoleAppender console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "true");
console.start();
Logger serverLogger = ctx.getLogger(JMSTopicReceiver.class.getName());
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/net/SocketServerTest.java Mon Dec 19 16:53:09 2011
@@ -99,7 +99,7 @@ public class SocketServerTest {
CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter});
ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false);
appender.start();
- PatternLayout layout = new PatternLayout("%m %ex%n");
+ PatternLayout layout = PatternLayout.createLayout("%m %ex%n", null, null, null);
ConsoleAppender console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "true");
Logger serverLogger = ctx.getLogger(SocketServer.class.getName());
serverLogger.addAppender(console);
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/pom.xml?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/pom.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/pom.xml Mon Dec 19 16:53:09 2011
@@ -232,6 +232,42 @@
</plugin> -->
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <!-- Changes report -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.6</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <statusIds>Resolved, Closed</statusIds>
+ <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix Version</columnNames>
+ </configuration>
+ </plugin>
+
+ <!-- Surefire report -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.11</version>
+ </plugin>
+
+ <!-- RAT report -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.8</version>
+ </plugin>
+ </plugins>
+ </reporting>
<repositories>
<repository>
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/apt/download.apt?rev=1220842&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/apt/download.apt (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/apt/download.apt Mon Dec 19 16:53:09 2011
@@ -0,0 +1,60 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one or more
+~~ 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 "License"); you may not use this file except in compliance with
+~~ the License. You may obtain a copy of the License at
+~~
+~~ 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.
+ ------
+Download Apache log4j 2.0
+ ------
+ ------
+ ------
+
+Download Apache log4j 2.0
+
+ Apache log4j 2.0 is distributed under the {{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 2.0}}.
+
+ The link in the Mirrors column should display a list of available mirrors with a
+ default selection based on your inferred location. If you do not see that page,
+ try a different browser. The checksum and signature are links to
+ the originals on the main distribution server.
+
+*-------------------------+---------+----------+-----------+
+| | Mirrors | Checksum | Signature |
+*-------------------------+---------+----------+-----------+
+| Apache log4j 2.0 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/2.0/apache-log4j-2.0.tar.gz} apache-log4j-2.0.tar.gz}} | {{{http://www.apache.org/dist/logging/log4j/2.0/apache-log4j-2.0.tar.gz.md5} apache-log4j-2.0.tar.gz.md5}} | {{{http://www.apache.org/dist/logging/log4j/2.0/apache-log4j-2.0.tar.gz.asc} apache-log4j-2.0.tar.gz.asc}} |
+*-------------------------+---------+----------+-----------+
+| Apache log4j 2.0 (zip) | {{{http://www.apache.org/dyn/closer.cgi/logging/log4j/2.0/apache-log4j-2.0.zip} apache-log4j-2.0.zip}} | {{{http://www.apache.org/dist/logging/log4j/2.0/apache-log4j-2.0.zip.md5} apache-log4j-2.0.zip.md5}} | {{{http://www.apache.org/dist/logging/log4j/2.0/apache-log4j-2.0.zip.asc} apache-log4j-2.0.zip.asc}} |
+*-------------------------+---------+----------+-----------+
+
+ It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures.
+ Please read {{{http://httpd.apache.org/dev/verification.html}Verifying Apache HTTP Server Releases}} for more
+ information on why you should verify our releases.
+
+ The PGP signatures can be verified using PGP or GPG. First download the {{{http://www.apache.org/dist/logging/KEYS}KEYS}}
+ as well as the asc signature file for the relevant distribution. Make sure you get these files from the
+ {{{http://www.apache.org/dist/logging/}main distribution directory}}, rather than from a mirror. Then verify the signatures using
+
+---
+% gpg --import KEYS
+% gpg --verify log4j-2.0.tar.gz.asc
+---
+
+ Apache log4j 2.0 is signed by Ralph Goers B3D8E1BA
+
+ Alternatively, you can verify the MD5 signature on the files. A unix program called md5 or md5sum is included
+ in many unix distributions.
+
+
+
+* Previous Releases
+
+ All previous releases of Apache log4j can be found in the {{{http://archive.apache.org/dist/logging/log4j}archive repository}}.
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/resources/images/ls-logo.jpg
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/resources/images/ls-logo.jpg?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
Binary files - no diff available.
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/site.xml Mon Dec 19 16:53:09 2011
@@ -29,7 +29,7 @@
</fluidoSkin>
</custom>
<bannerLeft>
- <name>Logging Services</name>
+ <name>Logging Servicesâ¢</name>
<src>images/ls-logo.jpg</src>
<href>http://logging.apache.org/</href>
</bannerLeft>
@@ -37,8 +37,12 @@
<src>images/logo.jpg</src>
</bannerRight>
<body>
- <menu name="Log4j2 API" inherit="top">
+ <menu name="Apache Log4j⢠2" inherit="top">
+ <item name="About" href="/index.html"/>
<item name="Log4j2 API" href="log4j2-api/api.html"/>
+ <item name="Download" href="/download.html"/>
+ <item name="Build and Install" href="/build.html"/>
+ <item name="Changelog" href="/changelog.html"/>
</menu>
<menu name="Manual" inherit="top">
<item name="Introduction" href="/manual/index.html"/>
@@ -119,9 +123,6 @@
<item name="Commons Logging" href="log4j2-jcl/api.html"/>
<item name="SLF4J" href="slf4j-impl/api.html"/>
</menu>
- <menu name="Download and Build" inherit="top">
- <item name="Download and Build" href="/download.html"/>
- </menu>
<menu name="Components" inherit="top">
<item name="API" href="log4j2-api/index.html"/>
<item name="Impl" href="log4j2-core/index.html"/>
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/build.xml?rev=1220842&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/build.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/build.xml Mon Dec 19 16:53:09 2011
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ 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 "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ 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.
+-->
+<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+
+ <properties>
+ <title>Build and Install</title>
+ </properties>
+
+ <body>
+ <section name="Releases">
+
+
+ </section>
+ </body>
+</document>
\ No newline at end of file
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/changelog.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/changelog.xml?rev=1220842&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/changelog.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/changelog.xml Mon Dec 19 16:53:09 2011
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ 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 "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ 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.
+-->
+<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+
+ <properties>
+ <title>Releases</title>
+ </properties>
+
+ <body>
+ <section name="Releases">
+
+ <macro name="toc">
+ <param name="fromDepth" value="2"/>
+ </macro>
+
+ <subsection name="Apache Log4j v2.0" id="Apache_Log4j_v2.0">
+
+ <p>Release date: TBA</p>
+ <p><a href="changes-report.html#a2.0">JIRA change log</a></p>
+
+ <p>Apache Log4j 2.0 is not compatible with the previous versions. Please have the following in mind
+ when upgrading to Log4j 2.0 in your project:</p>
+
+ <ul>
+ <li>Java 5 is required</li>
+ <li>The XML configuration has been simplified and is not compatible with Log4j 1.x</li>
+ <li>Configuration via property files is not supported.</li>
+ <li>Configuration via JSON is supported.</li>
+ <li>Although Log4j 2 is not directly compatible with Log4j 1.x and compatibility bridge
+ has been provided to reduce the need to make coding changes.</li>
+ </ul>
+ </subsection>
+
+ </section>
+ </body>
+</document>
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/manual/appenders.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/manual/appenders.xml?rev=1220842&r1=1220841&r2=1220842&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/manual/appenders.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/src/site/xdoc/manual/appenders.xml Mon Dec 19 16:53:09 2011
@@ -26,11 +26,11 @@
<section name="Appenders">
<p>
Appenders are the component responsible for delivering LogEvents to their destination. Every Appender must
- implement the <a href="../log4j/log4j2-core/apidocs/org/apache/logging/log4j/core/Appender.html">Appender</a>
+ implement the <a href="../log4j2-core/apidocs/org/apache/logging/log4j/core/Appender.html">Appender</a>
interface. Most Appenders will extend
- <a href="../log4j/log4j2-core/apidocs/org/apache/logging/log4j/core/appender/AppenderBase.html">AppenderBase</a>
- which adds <a href="../log4j/log4j2-core/apidocs/org/apache/logging/log4j/core/Lifecycle.html">Lifecycle</a>
- and <a href="../log4j/log4j2-core/apidocs/org/apache/logging/log4j/core/filter/Filterable">Filterable</a>
+ <a href="../log4j2-core/apidocs/org/apache/logging/log4j/core/appender/AppenderBase.html">AppenderBase</a>
+ which adds <a href="../log4j2-core/apidocs/org/apache/logging/log4j/core/Lifecycle.html">Lifecycle</a>
+ and <a href="../log4j2-core/apidocs/org/apache/logging/log4j/core/filter/Filterable">Filterable</a>
support. Lifecycle allows components to finish initialization after configuration has completed and to
perform cleanup during shutdown. Filterable allows the component to have Filters attached to it which are
evaluated during event processing.
@@ -65,7 +65,8 @@
<tr>
<td>layout</td>
<td>Layout</td>
- <td>The Layout to use to format the LogEvent</td>
+ <td>The Layout to use to format the LogEvent. If no layout is supplied the default pattern layout
+ of "%m%n" will be used.</td>
</tr>
<tr>
<td>name</td>