Author: mattsicker
Date: Mon May 26 22:11:03 2014
New Revision: 1597654
URL: http://svn.apache.org/r1597654
Log:
Rename PatternLayout.custom() to PatternLayout.newBuilder().
Modified:
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
Modified:
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
Mon May 26 22:11:03 2014
@@ -161,7 +161,7 @@ public class CategoryTest {
@Test
public void testClassName() {
final Category category = Category.getInstance("TestCategory");
- final Layout<String> layout = PatternLayout.custom().withPattern("%d
%p %C{1.} [%t] %m%n").build();
+ final Layout<String> layout =
PatternLayout.newBuilder().withPattern("%d %p %C{1.} [%t] %m%n").build();
final ListAppender appender = new ListAppender("List2", null, layout,
false, false);
appender.start();
category.setAdditivity(false);
Modified:
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java
Mon May 26 22:11:03 2014
@@ -456,7 +456,7 @@ public class LoggerTest {
@Test
@SuppressWarnings("deprecation")
public void testLog() {
- final PatternLayout layout = PatternLayout.custom().withPattern("%d %C
%L %m").build();
+ final PatternLayout layout =
PatternLayout.newBuilder().withPattern("%d %C %L %m").build();
final ListAppender appender = new ListAppender("List", null, layout,
false, false);
appender.start();
final Logger root = Logger.getRootLogger();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
Mon May 26 22:11:03 2014
@@ -130,7 +130,7 @@ public final class ColumnConfig {
}
if (isPattern) {
final PatternLayout layout =
- PatternLayout.custom()
+ PatternLayout.newBuilder()
.withPattern(pattern)
.withConfiguration(config)
.withAlwaysWriteExceptions(false)
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
Mon May 26 22:11:03 2014
@@ -377,7 +377,7 @@ public abstract class AbstractConfigurat
private void setToDefault() {
// TODO: reduce duplication between this method and
DefaultConfiguration constructor
setName(DefaultConfiguration.DEFAULT_NAME);
- final Layout<? extends Serializable> layout = PatternLayout.custom()
+ final Layout<? extends Serializable> layout =
PatternLayout.newBuilder()
.withPattern(DefaultConfiguration.DEFAULT_PATTERN)
.withConfiguration(this)
.build();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
Mon May 26 22:11:03 2014
@@ -52,7 +52,7 @@ public class DefaultConfiguration extend
public DefaultConfiguration() {
setName(DEFAULT_NAME);
- final Layout<? extends Serializable> layout = PatternLayout.custom()
+ final Layout<? extends Serializable> layout =
PatternLayout.newBuilder()
.withPattern(DEFAULT_PATTERN)
.withConfiguration(this)
.build();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
Mon May 26 22:11:03 2014
@@ -287,7 +287,7 @@ public final class PatternLayout extends
* @see #DEFAULT_CONVERSION_PATTERN Default conversion pattern
*/
public static PatternLayout createDefaultLayout() {
- return custom().build();
+ return newBuilder().build();
}
/**
@@ -295,12 +295,12 @@ public final class PatternLayout extends
* @return a PatternLayout builder.
*/
@PluginBuilderFactory
- public static Builder custom() {
+ public static Builder newBuilder() {
return new Builder();
}
/**
- * Custom PatternLayout builder. Use the {@link PatternLayout#custom()
builder factory method} to create this.
+ * Custom PatternLayout builder. Use the {@link PatternLayout#newBuilder()
builder factory method} to create this.
*/
public static class Builder implements
org.apache.logging.log4j.core.util.Builder<PatternLayout> {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
Mon May 26 22:11:03 2014
@@ -66,7 +66,7 @@ public class FileAppenderTest {
@Test
public void testSmallestBufferSize() throws Exception {
- final Layout<String> layout =
PatternLayout.custom().withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN).build();
+ final Layout<String> layout =
PatternLayout.newBuilder().withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN).build();
final String bufferSizeStr = "1";
final FileAppender appender = FileAppender.createAppender(FILENAME,
"true", "false", "test", "false", "false",
"false", bufferSizeStr, layout, null, "false", null, null);
@@ -160,7 +160,7 @@ public class FileAppenderTest {
}
private static void writer(final boolean lock, final int count, final
String name) throws Exception {
- final Layout<String> layout =
PatternLayout.custom().withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN).build();
+ final Layout<String> layout =
PatternLayout.newBuilder().withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN).build();
final FileAppender app = FileAppender.createAppender(FILENAME, "true",
Boolean.toString(lock), "test", "false",
"false", "false", null, layout, null, "false", null, null);
app.start();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java
Mon May 26 22:11:03 2014
@@ -72,7 +72,7 @@ public class CustomConfigurationTest {
break;
}
}
- final Layout<? extends Serializable> layout = PatternLayout.custom()
+ final Layout<? extends Serializable> layout =
PatternLayout.newBuilder()
.withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN)
.withConfiguration(config)
.build();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
Mon May 26 22:11:03 2014
@@ -84,7 +84,7 @@ public class PatternLayoutTest {
}
// set up appender
- final PatternLayout layout = PatternLayout.custom()
+ final PatternLayout layout = PatternLayout.newBuilder()
.withPattern(msgPattern)
.withConfiguration(ctx.getConfiguration())
.build();
@@ -153,7 +153,7 @@ public class PatternLayoutTest {
@Test
public void testRegex() throws Exception {
final LoggerContext ctx = (LoggerContext) LogManager.getContext();
- final PatternLayout layout = PatternLayout.custom()
+ final PatternLayout layout = PatternLayout.newBuilder()
.withPattern(regexPattern)
.withConfiguration(ctx.getConfiguration())
.build();
@@ -165,7 +165,7 @@ public class PatternLayoutTest {
private void testUnixTime(String pattern) throws Exception {
final LoggerContext ctx = (LoggerContext) LogManager.getContext();
- final PatternLayout layout = PatternLayout.custom()
+ final PatternLayout layout = PatternLayout.newBuilder()
.withPattern(pattern + " %m")
.withConfiguration(ctx.getConfiguration())
.build();
@@ -184,7 +184,7 @@ public class PatternLayoutTest {
@Test
public void testUnixTime() throws Exception {
final LoggerContext ctx = (LoggerContext) LogManager.getContext();
- final PatternLayout layout = PatternLayout.custom()
+ final PatternLayout layout = PatternLayout.newBuilder()
.withPattern("%d{UNIX} %m")
.withConfiguration(ctx.getConfiguration())
.build();
@@ -203,7 +203,7 @@ public class PatternLayoutTest {
@Test
public void testUnixTimeMillis() throws Exception {
final LoggerContext ctx = (LoggerContext) LogManager.getContext();
- final PatternLayout layout = PatternLayout.custom()
+ final PatternLayout layout = PatternLayout.newBuilder()
.withPattern("%d{UNIX_MILLIS} %m")
.withConfiguration(ctx.getConfiguration())
.build();
@@ -222,7 +222,7 @@ public class PatternLayoutTest {
@Test
public void testHeaderFooter() throws Exception {
final LoggerContext ctx = (LoggerContext) LogManager.getContext();
- final PatternLayout layout = PatternLayout.custom()
+ final PatternLayout layout = PatternLayout.newBuilder()
.withPattern("%d{UNIX} %m")
.withConfiguration(ctx.getConfiguration())
.withHeader("${ctx:header}")
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java
Mon May 26 22:11:03 2014
@@ -100,7 +100,7 @@ public class JmsQueueTest {
final CompositeFilter serverFilters =
CompositeFilter.createFilters(new Filter[]{serverFilter});
final ListAppender listApp = new ListAppender("Events", serverFilters,
null, false, false);
listApp.start();
- final PatternLayout layout = PatternLayout.custom().withPattern("%m
%ex%n").build();
+ final PatternLayout layout =
PatternLayout.newBuilder().withPattern("%m %ex%n").build();
final ConsoleAppender console = ConsoleAppender.createAppender(layout,
null, "SYSTEM_OUT", "Console", "false", "true");
console.start();
final Logger serverLogger =
ctx.getLogger(JmsTopicReceiver.class.getName());
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java
Mon May 26 22:11:03 2014
@@ -100,7 +100,7 @@ public class JmsTopicTest {
final CompositeFilter serverFilters =
CompositeFilter.createFilters(new Filter[]{serverFilter});
final ListAppender listApp = new ListAppender("Events", serverFilters,
null, false, false);
listApp.start();
- final PatternLayout layout = PatternLayout.custom().withPattern("%m
%ex%n").build();
+ final PatternLayout layout =
PatternLayout.newBuilder().withPattern("%m %ex%n").build();
final ConsoleAppender console =
ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT",
"Console", "false", "true");
console.start();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java?rev=1597654&r1=1597653&r2=1597654&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
Mon May 26 22:11:03 2014
@@ -173,7 +173,7 @@ public abstract class AbstractSocketServ
socketAppender.start();
final ListAppender listAppender = new ListAppender("Events",
serverFilter, null, false, false);
listAppender.start();
- final PatternLayout layout = PatternLayout.custom().withPattern("%m
%ex%n").build();
+ final PatternLayout layout =
PatternLayout.newBuilder().withPattern("%m %ex%n").build();
final ConsoleAppender console = ConsoleAppender.createAppender(layout,
null, "SYSTEM_OUT", "Console", "false",
"true");
final Logger serverLogger = ctx.getLogger(this.getClass().getName());
