You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/09/01 07:42:36 UTC
[1/6] logging-log4j2 git commit: Sort members.
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-952 21f2c1fb1 -> 5874110eb
Sort members.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6f75a924
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6f75a924
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6f75a924
Branch: refs/heads/LOG4J2-952
Commit: 6f75a924a84be10b7e8555758e73bbc907b7b389
Parents: 21f2c1f
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:05:48 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:05:48 2015 -0700
----------------------------------------------------------------------
.../builder/api/ConfigurationBuilder.java | 164 +++++++++----------
1 file changed, 82 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6f75a924/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
index 48db86a..c3921a3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
@@ -28,55 +28,6 @@ import org.apache.logging.log4j.core.util.Builder;
public interface ConfigurationBuilder<T extends Configuration> extends Builder<T> {
/**
- * Sets the name of the configuration.
- * @param name the name of the {@link Configuration}. By default is {@code "Constructed"}.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setConfigurationName(String name);
-
- /**
- * Sets the configuration source, if one exists.
- * @param configurationSource the ConfigurationSource.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource);
-
- /**
- * Sets the level of the StatusLogger.
- * @param level The logging level.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setStatusLevel(Level level);
-
- /**
- * Sets whether the logging should include constructing Plugins.
- * @param verbosity "disable" will hide messages from plugin construction.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setVerbosity(String verbosity);
-
- /**
- * Sets the list of packages to search for plugins.
- * @param packages The comma separated list of packages.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setPackages(String packages);
-
- /**
- * Sets whether the shutdown hook should be disabled.
- * @param flag "disable" will prevent the shutdown hook from being set.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setShutdownHook(String flag);
-
- /**
- * Sets the interval at which the configuration file should be checked for changes.
- * @param intervalSeconds The number of seconds that should pass between checks of the configuration file.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> setMonitorInterval(String intervalSeconds);
-
- /**
* Adds an AppenderComponent.
* @param builder The AppenderComponentBuilder with all of its attributes and sub components set.
* @return this builder instance.
@@ -91,6 +42,13 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
ConfigurationBuilder<T> add(CustomLevelComponentBuilder builder);
/**
+ * Adds a Filter component.
+ * @param builder the FilterComponentBuilder with all of its attributes and sub components set.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> add(FilterComponentBuilder builder);
+
+ /**
* Adds a Logger component.
* @param builder The LoggerComponentBuilder with all of its attributes and sub components set.
* @return this builder instance.
@@ -105,13 +63,6 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
ConfigurationBuilder<T> add(RootLoggerComponentBuilder builder);
/**
- * Adds a Filter component.
- * @param builder the FilterComponentBuilder with all of its attributes and sub components set.
- * @return this builder instance.
- */
- ConfigurationBuilder<T> add(FilterComponentBuilder builder);
-
- /**
* Adds a Property key and value.
* @param key The property key.
* @param value The property value.
@@ -127,7 +78,6 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
*/
AppenderComponentBuilder newAppender(String name, String pluginName);
-
/**
* Returns a builder for creating AppenderRefs.
* @param ref The name of the Appender being referenced.
@@ -136,6 +86,36 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
AppenderRefComponentBuilder newAppenderRef(String ref);
/**
+ * Returns a builder for creating Async Loggers.
+ * @param name The name of the Logger.
+ * @param level The logging Level to be assigned to the Logger.
+ * @return The LoggerComponentBuilder.
+ */
+ LoggerComponentBuilder newAsyncLogger(String name, Level level);
+
+ /**
+ * Returns a builder for creating Async Loggers.
+ * @param name The name of the Logger.
+ * @param level The logging Level to be assigned to the Logger.
+ * @return The LoggerComponentBuilder.
+ */
+ LoggerComponentBuilder newAsyncLogger(String name, String level);
+
+ /**
+ * Returns a builder for creating the async root Logger.
+ * @param level The logging Level to be assigned to the root Logger.
+ * @return The RootLoggerComponentBuilder.
+ */
+ RootLoggerComponentBuilder newAsyncRootLogger(Level level);
+
+ /**
+ * Returns a builder for creating the async root Logger.
+ * @param level The logging Level to be assigned to the root Logger.
+ * @return The RootLoggerComponentBuilder.
+ */
+ RootLoggerComponentBuilder newAsyncRootLogger(String level);
+
+ /**
* Returns a builder for creating generic components.
* @param name The name of the component (may be null).
* @param pluginName The Plugin type of the component.
@@ -152,6 +132,7 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
*/
ComponentBuilder<?> newComponent(String name, String pluginName, String value);
+
/**
* Returns a builder for creating CustomLevels
* @param name The name of the custom level.
@@ -193,7 +174,6 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
*/
LoggerComponentBuilder newLogger(String name, Level level);
-
/**
* Returns a builder for creating Loggers.
* @param name The name of the Logger.
@@ -203,22 +183,6 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
LoggerComponentBuilder newLogger(String name, String level);
/**
- * Returns a builder for creating Async Loggers.
- * @param name The name of the Logger.
- * @param level The logging Level to be assigned to the Logger.
- * @return The LoggerComponentBuilder.
- */
- LoggerComponentBuilder newAsyncLogger(String name, Level level);
-
- /**
- * Returns a builder for creating Async Loggers.
- * @param name The name of the Logger.
- * @param level The logging Level to be assigned to the Logger.
- * @return The LoggerComponentBuilder.
- */
- LoggerComponentBuilder newAsyncLogger(String name, String level);
-
- /**
* Returns a builder for creating the root Logger.
* @param level The logging Level to be assigned to the root Logger.
* @return The RootLoggerComponentBuilder.
@@ -234,17 +198,53 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
/**
- * Returns a builder for creating the async root Logger.
- * @param level The logging Level to be assigned to the root Logger.
- * @return The RootLoggerComponentBuilder.
+ * Sets the name of the configuration.
+ * @param name the name of the {@link Configuration}. By default is {@code "Constructed"}.
+ * @return this builder instance.
*/
- RootLoggerComponentBuilder newAsyncRootLogger(Level level);
+ ConfigurationBuilder<T> setConfigurationName(String name);
+
+ /**
+ * Sets the configuration source, if one exists.
+ * @param configurationSource the ConfigurationSource.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource);
+ /**
+ * Sets the interval at which the configuration file should be checked for changes.
+ * @param intervalSeconds The number of seconds that should pass between checks of the configuration file.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setMonitorInterval(String intervalSeconds);
/**
- * Returns a builder for creating the async root Logger.
- * @param level The logging Level to be assigned to the root Logger.
- * @return The RootLoggerComponentBuilder.
+ * Sets the list of packages to search for plugins.
+ * @param packages The comma separated list of packages.
+ * @return this builder instance.
*/
- RootLoggerComponentBuilder newAsyncRootLogger(String level);
+ ConfigurationBuilder<T> setPackages(String packages);
+
+ /**
+ * Sets whether the shutdown hook should be disabled.
+ * @param flag "disable" will prevent the shutdown hook from being set.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setShutdownHook(String flag);
+
+
+ /**
+ * Sets the level of the StatusLogger.
+ * @param level The logging level.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setStatusLevel(Level level);
+
+
+ /**
+ * Sets whether the logging should include constructing Plugins.
+ * @param verbosity "disable" will hide messages from plugin construction.
+ * @return this builder instance.
+ */
+ ConfigurationBuilder<T> setVerbosity(String verbosity);
}
[2/6] logging-log4j2 git commit: Sort members.
Posted by gg...@apache.org.
Sort members.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e408163d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e408163d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e408163d
Branch: refs/heads/LOG4J2-952
Commit: e408163dd292c4e747d155a4ed9782bea125690f
Parents: 6f75a92
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:07:10 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:07:10 2015 -0700
----------------------------------------------------------------------
.../impl/DefaultConfigurationBuilder.java | 252 +++++++++----------
1 file changed, 126 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e408163d/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index 3af3b90..75b433d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -40,6 +40,14 @@ import java.util.List;
*/
public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implements ConfigurationBuilder<T> {
+ /**
+ * The key with which Apache Log4j loads the selector class.
+ *
+ * @see <a href=
+ * "http://logging.apache.org/log4j/2.0/manual/async.html">
+ * Async Loggers</a>
+ */
+ private static final String LOG4J_ASYNC_LOGGERS = "Log4jContextSelector";
private final Component root = new Component();
private Component loggers;
private Component appenders;
@@ -53,16 +61,8 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
private String verbosity = null;
private String packages = null;
private String shutdownFlag = null;
- private String name = null;
- /**
- * The key with which Apache Log4j loads the selector class.
- *
- * @see <a href=
- * "http://logging.apache.org/log4j/2.0/manual/async.html">
- * Async Loggers</a>
- */
- private static final String LOG4J_ASYNC_LOGGERS = "Log4jContextSelector";
+ private String name = null;
public DefaultConfigurationBuilder() {
this((Class<T>) BuiltConfiguration.class);
@@ -87,77 +87,23 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
components.add(loggers);
}
- /**
- * Set the name of the configuration.
- *
- * @param name the name of the {@link Configuration}. By default is {@code "Assembled"}.
- * @return this builder instance
- */
- @Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setConfigurationName(String name) {
- this.name = name;
- return this;
- }
-
- /**
- * Set the ConfigurationSource.
- *
- * @param configurationSource the {@link ConfigurationSource).}
- * @return this builder instance
- */
- @Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource) {
- source = configurationSource;
- return this;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setMonitorInterval(String intervalSeconds) {
- monitorInterval = Integer.parseInt(intervalSeconds);
- return this;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setStatusLevel(Level level) {
- this.level = level;
- return this;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setVerbosity(String verbosity) {
- this.verbosity = verbosity;
- return this;
- }
-
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setPackages(String packages) {
- this.packages = packages;
+ public ConfigurationBuilder<T> add(AppenderComponentBuilder assembler) {
+ appenders.getComponents().add(assembler.build());
return this;
}
@Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> setShutdownHook(String flag) {
- this.shutdownFlag = flag;
+ public ConfigurationBuilder<T> add(CustomLevelComponentBuilder assembler) {
+ customLevels.getComponents().add(assembler.build());
return this;
}
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(AppenderComponentBuilder assembler) {
- appenders.getComponents().add(assembler.build());
- return this;
- }
-
- @Override
- public ConfigurationBuilder<T> add(CustomLevelComponentBuilder assembler) {
- customLevels.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> add(FilterComponentBuilder assembler) {
+ filters.getComponents().add(assembler.build());
return this;
}
@@ -182,16 +128,43 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(FilterComponentBuilder assembler) {
- filters.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> addProperty(String key, String value) {
+ properties.addComponent(newComponent(key, "Property", value).build());
return this;
}
@Override
- @SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> addProperty(String key, String value) {
- properties.addComponent(newComponent(key, "Property", value).build());
- return this;
+ @SuppressWarnings({"unchecked"})
+ public T build() {
+ T configuration;
+ try {
+ if (source == null) {
+ source = ConfigurationSource.NULL_SOURCE;
+ }
+ Constructor<T> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
+ configuration = constructor.newInstance(source, root);
+ configuration.setMonitorInterval(monitorInterval);
+ if (name != null) {
+ configuration.setName(name);
+ }
+ if (level != null) {
+ configuration.getStatusConfiguration().withStatus(level);
+ }
+ if (verbosity != null) {
+ configuration.getStatusConfiguration().withVerbosity(verbosity);
+ }
+ if (packages != null) {
+ configuration.setPluginPackages(packages);
+ }
+ if (shutdownFlag != null) {
+ configuration.setShutdownHook(shutdownFlag);
+ }
+ } catch (Exception ex) {
+ throw new IllegalArgumentException("Invalid Configuration class specified", ex);
+ }
+ configuration.getStatusConfiguration().initialize();
+ configuration.initialize();
+ return configuration;
}
@Override
@@ -199,24 +172,44 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
return new DefaultAppenderComponentBuilder(this, name, type);
}
-
@Override
public AppenderRefComponentBuilder newAppenderRef(String ref) {
return new DefaultAppenderRefComponentBuilder(this, ref);
}
+ @Override
+ public LoggerComponentBuilder newAsyncLogger(String name, Level level) {
+ return new DefaultLoggerComponentBuilder(this, name, level.toString(), "AsyncLogger");
+ }
+
+ @Override
+ public LoggerComponentBuilder newAsyncLogger(String name, String level) {
+ return new DefaultLoggerComponentBuilder(this, name, level, "AsyncLogger");
+ }
+
+ @Override
+ public RootLoggerComponentBuilder newAsyncRootLogger(Level level) {
+ return new DefaultRootLoggerComponentBuilder(this, level.toString(), "AsyncRoot");
+ }
+
+ @Override
+ public RootLoggerComponentBuilder newAsyncRootLogger(String level) {
+ return new DefaultRootLoggerComponentBuilder(this, level, "AsyncRoot");
+ }
@Override
public ComponentBuilder<?> newComponent(String name, String type) {
return new DefaultComponentBuilder<>(this, name, type);
}
+
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
public ComponentBuilder<?> newComponent(String name, String type, String value) {
return new DefaultComponentBuilder<>(this, name, type, value);
}
+
@Override
public CustomLevelComponentBuilder newCustomLevel(String name, int level) {
return new DefaultCustomLevelComponentBuilder(this, name, level);
@@ -224,15 +217,14 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
@SuppressWarnings("rawtypes")
- public FilterComponentBuilder newFilter(String type, String onMatch, String onMisMatch) {
- return new DefaultFilterComponentBuilder(this, type, onMatch, onMisMatch);
+ public FilterComponentBuilder newFilter(String type, Filter.Result onMatch, Filter.Result onMisMatch) {
+ return new DefaultFilterComponentBuilder(this, type, onMatch.name(), onMisMatch.name());
}
-
@Override
@SuppressWarnings("rawtypes")
- public FilterComponentBuilder newFilter(String type, Filter.Result onMatch, Filter.Result onMisMatch) {
- return new DefaultFilterComponentBuilder(this, type, onMatch.name(), onMisMatch.name());
+ public FilterComponentBuilder newFilter(String type, String onMatch, String onMisMatch) {
+ return new DefaultFilterComponentBuilder(this, type, onMatch, onMisMatch);
}
@Override
@@ -240,10 +232,6 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
return new DefaultLayoutComponentBuilder(this, type);
}
- @Override
- public LoggerComponentBuilder newLogger(String name, String level) {
- return new DefaultLoggerComponentBuilder(this, name, level);
- }
@Override
public LoggerComponentBuilder newLogger(String name, Level level) {
@@ -251,13 +239,13 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public LoggerComponentBuilder newAsyncLogger(String name, String level) {
- return new DefaultLoggerComponentBuilder(this, name, level, "AsyncLogger");
+ public LoggerComponentBuilder newLogger(String name, String level) {
+ return new DefaultLoggerComponentBuilder(this, name, level);
}
@Override
- public LoggerComponentBuilder newAsyncLogger(String name, Level level) {
- return new DefaultLoggerComponentBuilder(this, name, level.toString(), "AsyncLogger");
+ public RootLoggerComponentBuilder newRootLogger(Level level) {
+ return new DefaultRootLoggerComponentBuilder(this, level.toString());
}
@Override
@@ -265,52 +253,64 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
return new DefaultRootLoggerComponentBuilder(this, level);
}
+ /**
+ * Set the name of the configuration.
+ *
+ * @param name the name of the {@link Configuration}. By default is {@code "Assembled"}.
+ * @return this builder instance
+ */
@Override
- public RootLoggerComponentBuilder newRootLogger(Level level) {
- return new DefaultRootLoggerComponentBuilder(this, level.toString());
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setConfigurationName(String name) {
+ this.name = name;
+ return this;
}
+ /**
+ * Set the ConfigurationSource.
+ *
+ * @param configurationSource the {@link ConfigurationSource).}
+ * @return this builder instance
+ */
@Override
- public RootLoggerComponentBuilder newAsyncRootLogger(String level) {
- return new DefaultRootLoggerComponentBuilder(this, level, "AsyncRoot");
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setConfigurationSource(ConfigurationSource configurationSource) {
+ source = configurationSource;
+ return this;
}
@Override
- public RootLoggerComponentBuilder newAsyncRootLogger(Level level) {
- return new DefaultRootLoggerComponentBuilder(this, level.toString(), "AsyncRoot");
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setMonitorInterval(String intervalSeconds) {
+ monitorInterval = Integer.parseInt(intervalSeconds);
+ return this;
}
@Override
- @SuppressWarnings({"unchecked"})
- public T build() {
- T configuration;
- try {
- if (source == null) {
- source = ConfigurationSource.NULL_SOURCE;
- }
- Constructor<T> constructor = clazz.getConstructor(ConfigurationSource.class, Component.class);
- configuration = constructor.newInstance(source, root);
- configuration.setMonitorInterval(monitorInterval);
- if (name != null) {
- configuration.setName(name);
- }
- if (level != null) {
- configuration.getStatusConfiguration().withStatus(level);
- }
- if (verbosity != null) {
- configuration.getStatusConfiguration().withVerbosity(verbosity);
- }
- if (packages != null) {
- configuration.setPluginPackages(packages);
- }
- if (shutdownFlag != null) {
- configuration.setShutdownHook(shutdownFlag);
- }
- } catch (Exception ex) {
- throw new IllegalArgumentException("Invalid Configuration class specified", ex);
- }
- configuration.getStatusConfiguration().initialize();
- configuration.initialize();
- return configuration;
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setPackages(String packages) {
+ this.packages = packages;
+ return this;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setShutdownHook(String flag) {
+ this.shutdownFlag = flag;
+ return this;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setStatusLevel(Level level) {
+ this.level = level;
+ return this;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public ConfigurationBuilder<T> setVerbosity(String verbosity) {
+ this.verbosity = verbosity;
+ return this;
}
}
[6/6] logging-log4j2 git commit: "assembler" -> "builder" vernacular.
Posted by gg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5874110e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5874110e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5874110e
Branch: refs/heads/LOG4J2-952
Commit: 5874110eb17706053e954ba0c0ed75b42f7f094a
Parents: 92947ff
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:19:47 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:19:47 2015 -0700
----------------------------------------------------------------------
.../config/builder/api/AppenderComponentBuilder.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5874110e/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
index ab4ec12..fdeb242 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
@@ -23,17 +23,17 @@ public interface AppenderComponentBuilder extends ComponentBuilder<AppenderCompo
/**
* Adds a Layout to the Appender component.
- * @param assembler The LayoutComponentBuilder with all of its attributes set.
- * @return this Assembler.
+ * @param builder The LayoutComponentBuilder with all of its attributes set.
+ * @return this builder.
*/
- AppenderComponentBuilder add(LayoutComponentBuilder assembler);
+ AppenderComponentBuilder add(LayoutComponentBuilder builder);
/**
* Adds a Filter to the Appender component.
- * @param assembler The FilterComponentBuilder with all of its attributes and sub components set.
- * @return this Assembler.
+ * @param builder The FilterComponentBuilder with all of its attributes and sub components set.
+ * @return this builder.
*/
- AppenderComponentBuilder add(FilterComponentBuilder assembler);
+ AppenderComponentBuilder add(FilterComponentBuilder builder);
/**
* Returns the name of the Appender.
[5/6] logging-log4j2 git commit: Javadoc: Use the active voice.
Posted by gg...@apache.org.
Javadoc: Use the active voice.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/92947ffa
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/92947ffa
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/92947ffa
Branch: refs/heads/LOG4J2-952
Commit: 92947ffa87c8c66bb77766669a391bad56b3e3c6
Parents: 4f09bf0
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:19:21 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:19:21 2015 -0700
----------------------------------------------------------------------
.../core/config/builder/api/AppenderComponentBuilder.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/92947ffa/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
index 47a30d1..ab4ec12 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
@@ -22,21 +22,21 @@ package org.apache.logging.log4j.core.config.builder.api;
public interface AppenderComponentBuilder extends ComponentBuilder<AppenderComponentBuilder> {
/**
- * Add a Layout to the Appender component.
+ * Adds a Layout to the Appender component.
* @param assembler The LayoutComponentBuilder with all of its attributes set.
* @return this Assembler.
*/
AppenderComponentBuilder add(LayoutComponentBuilder assembler);
/**
- * Add a Filter to the Appender component.
+ * Adds a Filter to the Appender component.
* @param assembler The FilterComponentBuilder with all of its attributes and sub components set.
* @return this Assembler.
*/
AppenderComponentBuilder add(FilterComponentBuilder assembler);
/**
- * Return the name of the Appender.
+ * Returns the name of the Appender.
* @return the name of the Appender.
*/
String getName();
[3/6] logging-log4j2 git commit: "assembler" -> "builder" vernacular.
Posted by gg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a6901256
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a6901256
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a6901256
Branch: refs/heads/LOG4J2-952
Commit: a6901256566607b9bd5333fb4aff267e6d4d6215
Parents: e408163
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:07:37 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:07:37 2015 -0700
----------------------------------------------------------------------
.../impl/DefaultConfigurationBuilder.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a6901256/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index 75b433d..3d84b0d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -89,40 +89,40 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(AppenderComponentBuilder assembler) {
- appenders.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> add(AppenderComponentBuilder builder) {
+ appenders.getComponents().add(builder.build());
return this;
}
@Override
- public ConfigurationBuilder<T> add(CustomLevelComponentBuilder assembler) {
- customLevels.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> add(CustomLevelComponentBuilder builder) {
+ customLevels.getComponents().add(builder.build());
return this;
}
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(FilterComponentBuilder assembler) {
- filters.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> add(FilterComponentBuilder builder) {
+ filters.getComponents().add(builder.build());
return this;
}
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(LoggerComponentBuilder assembler) {
- loggers.getComponents().add(assembler.build());
+ public ConfigurationBuilder<T> add(LoggerComponentBuilder builder) {
+ loggers.getComponents().add(builder.build());
return this;
}
@Override
@SuppressWarnings("unchecked")
- public ConfigurationBuilder<T> add(RootLoggerComponentBuilder assembler) {
+ public ConfigurationBuilder<T> add(RootLoggerComponentBuilder builder) {
for (Component c : loggers.getComponents()) {
if (c.getPluginType().equals("root")) {
throw new ConfigurationException("root Logger was previously defined");
}
}
- loggers.getComponents().add(assembler.build());
+ loggers.getComponents().add(builder.build());
return this;
}
[4/6] logging-log4j2 git commit: "assembler" -> "builder" vernacular.
Posted by gg...@apache.org.
"assembler" -> "builder" vernacular.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4f09bf0c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4f09bf0c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4f09bf0c
Branch: refs/heads/LOG4J2-952
Commit: 4f09bf0ccd437ee73caa03467af449e2af36ea83
Parents: a690125
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 31 22:19:02 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 31 22:19:02 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/api/AppenderComponentBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4f09bf0c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
index e433df6..47a30d1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/AppenderComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
/**
- * Assembler for constructing Appenders.
+ * Builder for constructing Appenders.
*/
public interface AppenderComponentBuilder extends ComponentBuilder<AppenderComponentBuilder> {