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 2016/09/02 14:34:48 UTC
[1/4] logging-log4j2 git commit: Fix XML configuration line endings
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1558 53e7bbc0f -> 8f5ac5307
Fix XML configuration line endings
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0752fed1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0752fed1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0752fed1
Branch: refs/heads/LOG4J2-1558
Commit: 0752fed1f6448ea04bbc0400b5c74b3d837376d4
Parents: e18fcb7
Author: Mikael St�ldal <mi...@magine.com>
Authored: Fri Sep 2 15:25:59 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Fri Sep 2 15:25:59 2016 +0200
----------------------------------------------------------------------
.../builder/impl/DefaultConfigurationBuilder.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0752fed1/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 62fd716..5e702ab 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
@@ -22,6 +22,9 @@ import java.io.StringWriter;
import java.lang.reflect.Constructor;
import java.util.List;
import java.util.Map;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Filter;
@@ -44,10 +47,6 @@ import org.apache.logging.log4j.core.config.builder.api.ScriptComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ScriptFileComponentBuilder;
import org.apache.logging.log4j.core.util.Throwables;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
/**
* @param <T> The BuiltConfiguration type.
* @since 2.4
@@ -226,7 +225,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
private void writeXmlConfiguration(XMLStreamWriter xmlWriter) throws XMLStreamException {
xmlWriter.writeStartDocument();
- xmlWriter.writeCharacters(System.lineSeparator());
+ xmlWriter.writeCharacters("\n");
xmlWriter.writeStartElement("Configuration");
if (name != null) {
@@ -254,7 +253,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
xmlWriter.writeAttribute("monitorInterval", String.valueOf(monitorInterval));
}
- xmlWriter.writeCharacters(System.lineSeparator());
+ xmlWriter.writeCharacters("\n");
writeXmlSection(xmlWriter, properties);
writeXmlSection(xmlWriter, scripts);
@@ -268,7 +267,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
writeXmlSection(xmlWriter, loggers);
xmlWriter.writeEndElement(); // "Configuration"
- xmlWriter.writeCharacters(System.lineSeparator());
+ xmlWriter.writeCharacters("\n");
xmlWriter.writeEndDocument();
}
@@ -285,7 +284,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
xmlWriter.writeStartElement(component.getPluginType());
writeXmlAttributes(xmlWriter, component);
if (!component.getComponents().isEmpty()) {
- xmlWriter.writeCharacters(System.lineSeparator());
+ xmlWriter.writeCharacters("\n");
}
for (Component subComponent : component.getComponents()) {
writeXmlComponent(xmlWriter, subComponent, nesting + 1);
@@ -302,7 +301,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
xmlWriter.writeEmptyElement(component.getPluginType());
writeXmlAttributes(xmlWriter, component);
}
- xmlWriter.writeCharacters(System.lineSeparator());
+ xmlWriter.writeCharacters("\n");
}
private void writeXmlIndent(XMLStreamWriter xmlWriter, int nesting) throws XMLStreamException {
[2/4] logging-log4j2 git commit: Use constants, not magic strings.
Posted by gg...@apache.org.
Use constants, not magic strings.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f44785b9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f44785b9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f44785b9
Branch: refs/heads/LOG4J2-1558
Commit: f44785b9332afeab10cef3ac3a9618569c85918a
Parents: 0752fed
Author: ggregory <gg...@apache.org>
Authored: Fri Sep 2 07:25:04 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Fri Sep 2 07:25:04 2016 -0700
----------------------------------------------------------------------
.../builder/impl/DefaultConfigurationBuilder.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f44785b9/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 5e702ab..acec63c 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
@@ -53,6 +53,9 @@ import org.apache.logging.log4j.core.util.Throwables;
*/
public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implements ConfigurationBuilder<T> {
+ private static final String INDENT = "\t";
+ private static final String EOL = "\n";
+
private final Component root = new Component();
private Component loggers;
private Component appenders;
@@ -225,7 +228,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
private void writeXmlConfiguration(XMLStreamWriter xmlWriter) throws XMLStreamException {
xmlWriter.writeStartDocument();
- xmlWriter.writeCharacters("\n");
+ xmlWriter.writeCharacters(EOL);
xmlWriter.writeStartElement("Configuration");
if (name != null) {
@@ -253,7 +256,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
xmlWriter.writeAttribute("monitorInterval", String.valueOf(monitorInterval));
}
- xmlWriter.writeCharacters("\n");
+ xmlWriter.writeCharacters(EOL);
writeXmlSection(xmlWriter, properties);
writeXmlSection(xmlWriter, scripts);
@@ -267,7 +270,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
writeXmlSection(xmlWriter, loggers);
xmlWriter.writeEndElement(); // "Configuration"
- xmlWriter.writeCharacters("\n");
+ xmlWriter.writeCharacters(EOL);
xmlWriter.writeEndDocument();
}
@@ -284,7 +287,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
xmlWriter.writeStartElement(component.getPluginType());
writeXmlAttributes(xmlWriter, component);
if (!component.getComponents().isEmpty()) {
- xmlWriter.writeCharacters("\n");
+ xmlWriter.writeCharacters(EOL);
}
for (Component subComponent : component.getComponents()) {
writeXmlComponent(xmlWriter, subComponent, nesting + 1);
@@ -301,12 +304,12 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
xmlWriter.writeEmptyElement(component.getPluginType());
writeXmlAttributes(xmlWriter, component);
}
- xmlWriter.writeCharacters("\n");
+ xmlWriter.writeCharacters(EOL);
}
private void writeXmlIndent(XMLStreamWriter xmlWriter, int nesting) throws XMLStreamException {
for (int i = 0; i < nesting; i++) {
- xmlWriter.writeCharacters("\t");
+ xmlWriter.writeCharacters(INDENT);
}
}
[4/4] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into LOG4J2-1558
Posted by gg...@apache.org.
Merge remote-tracking branch 'origin/master' into LOG4J2-1558
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8f5ac530
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8f5ac530
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8f5ac530
Branch: refs/heads/LOG4J2-1558
Commit: 8f5ac5307d5917549f9ac4f900b154604af18eeb
Parents: 53e7bbc f8794cd
Author: ggregory <gg...@apache.org>
Authored: Fri Sep 2 07:34:35 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Fri Sep 2 07:34:35 2016 -0700
----------------------------------------------------------------------
.../impl/DefaultConfigurationBuilder.java | 22 +++++++++++---------
.../builder/ConfigurationBuilderTest.java | 2 +-
2 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[3/4] logging-log4j2 git commit: Hack the test for cross-platform
usage.
Posted by gg...@apache.org.
Hack the test for cross-platform usage.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f8794cd4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f8794cd4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f8794cd4
Branch: refs/heads/LOG4J2-1558
Commit: f8794cd4f6866c4ddb79b3679a34f51b3c1229c7
Parents: f44785b
Author: ggregory <gg...@apache.org>
Authored: Fri Sep 2 07:32:20 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Fri Sep 2 07:32:20 2016 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/ConfigurationBuilderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8794cd4/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
index 17f3737..12356c6 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
public class ConfigurationBuilderTest {
- private static final String EOL = System.lineSeparator();
+ private static final String EOL = "\n"; // HACK! System.lineSeparator();
private void addTestFixtures(final String name, final ConfigurationBuilder<BuiltConfiguration> builder) {
builder.setConfigurationName(name);