Author: mattsicker
Date: Mon May 26 19:24:49 2014
New Revision: 1597630
URL: http://svn.apache.org/r1597630
Log:
Rename ConfigurablePluginBuilder to Builder in the util package.
- This is pretty generic and can be re-used for whatever.
Added:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Builder.java
- copied, changed from r1597488,
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ConfigurablePluginBuilder.java
Removed:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ConfigurablePluginBuilder.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
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=1597630&r1=1597629&r2=1597630&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 19:24:49 2014
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import
org.apache.logging.log4j.core.config.plugins.util.ConfigurablePluginBuilder;
import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
import org.apache.logging.log4j.core.pattern.PatternFormatter;
import org.apache.logging.log4j.core.pattern.PatternParser;
@@ -303,7 +302,7 @@ public final class PatternLayout extends
/**
* Custom PatternLayout builder. Use the {@link PatternLayout#custom()
builder factory method} to create this.
*/
- public static class Builder implements
ConfigurablePluginBuilder<PatternLayout> {
+ public static class Builder implements
org.apache.logging.log4j.core.util.Builder<PatternLayout> {
@PluginAttribute("pattern")
private String pattern = PatternLayout.DEFAULT_CONVERSION_PATTERN;
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Builder.java
(from r1597488,
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ConfigurablePluginBuilder.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Builder.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Builder.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ConfigurablePluginBuilder.java&r1=1597488&r2=1597630&rev=1597630&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ConfigurablePluginBuilder.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Builder.java
Mon May 26 19:24:49 2014
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.logging.log4j.core.config.plugins.util;
+package org.apache.logging.log4j.core.util;
/**
* A type of Plugin builder that can be used to configure and create a plugin
instance using a Java DSL instead of
@@ -31,7 +31,7 @@ package org.apache.logging.log4j.core.co
*
* @param <T> the Plugin class this is a builder for.
*/
-public interface ConfigurablePluginBuilder<T> {
+public interface Builder<T> {
/**
* Builds the plugin object after all configuration has been set. This
will use default values for any
