You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/30 14:45:47 UTC
[03/50] logging-log4j2 git commit: Fix method naming
Fix method naming
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/97f626f0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/97f626f0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/97f626f0
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 97f626f0d3d4dd75b726cabd58f925dc335b1bcd
Parents: 486823a
Author: Mikael St�ldal <mi...@staldal.nu>
Authored: Fri Aug 19 22:27:43 2016 +0200
Committer: Mikael St�ldal <mi...@staldal.nu>
Committed: Fri Aug 19 22:27:43 2016 +0200
----------------------------------------------------------------------
.../log4j/core/config/builder/api/ConfigurationBuilder.java | 8 ++++----
.../config/builder/impl/DefaultConfigurationBuilder.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/97f626f0/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 2e7ef96..fba24fd 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
@@ -410,16 +410,16 @@ public interface ConfigurationBuilder<T extends Configuration> extends Builder<T
T build(boolean initialize);
/**
- * Write an XML configuration file from this builder.
+ * Constructs an XML configuration from this builder.
*
* @param output OutputStream to write to, will not be closed
*/
- void writeXmlConfigurationFile(OutputStream output) throws IOException;
+ void writeXmlConfiguration(OutputStream output) throws IOException;
/**
- * Write an XML configuration from this builder.
+ * Constructs an XML configuration from this builder.
*
* @return XML configuration
*/
- String writeXmlConfiguration();
+ String toXmlConfiguration();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/97f626f0/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 6834956..2fc78f4 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
@@ -196,7 +196,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public void writeXmlConfigurationFile(final OutputStream output) throws IOException {
+ public void writeXmlConfiguration(final OutputStream output) throws IOException {
try {
XMLStreamWriter xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(output);
writeConfigurationXml(xmlWriter);
@@ -211,7 +211,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
@Override
- public String writeXmlConfiguration() {
+ public String toXmlConfiguration() {
StringWriter sw = new StringWriter();
try {
XMLStreamWriter xmlWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(sw);