[maven-release-plugin] copy for tag log4j-2.0-beta6
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/log4j2/tags/log4j-2.0-beta6@1479748 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java b/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
index 9c3f1b8..12a6308 100644
--- a/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
+++ b/api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
@@ -58,7 +58,7 @@
if (name != null) {
if (name.length() > MAX_LENGTH) {
throw new IllegalArgumentException(String.format("Length of id %s exceeds maximum of %d characters",
- MAX_LENGTH, name));
+ name, MAX_LENGTH));
}
index = name.indexOf("@");
}
diff --git a/core/src/main/java/org/apache/logging/log4j/core/helpers/Charsets.java b/core/src/main/java/org/apache/logging/log4j/core/helpers/Charsets.java
index 50b9493..52b02ce 100644
--- a/core/src/main/java/org/apache/logging/log4j/core/helpers/Charsets.java
+++ b/core/src/main/java/org/apache/logging/log4j/core/helpers/Charsets.java
@@ -25,12 +25,13 @@
*/
public final class Charsets {
+ private static final String UTF_8 = "UTF-8";
+
private Charsets() {
}
/**
- * Gets a Charset, starting with the preferred {@code charsetName} if supported, if not, use UTF-8, if not
- * supported, use the platform default.
+ * Gets a Charset, starting with the preferred {@code charsetName} if supported, if not, use UTF-8.
*
* @param charsetName
* the preferred charset name
@@ -44,7 +45,7 @@
}
}
if (charset == null) {
- charset = Charset.isSupported("UTF-8") ? Charset.forName("UTF-8") : Charset.defaultCharset();
+ charset = Charset.forName(UTF_8);
if (charsetName != null) {
StatusLogger.getLogger().error("Charset " + charsetName + " is not supported for layout, using " +
charset.displayName());
diff --git a/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java b/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java
index 57a13e2..79775b2 100644
--- a/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java
+++ b/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.helpers;
/**
- * Interface for classes that can provide the time stamp used in log events.
+ * Provides the time stamp used in log events.
*/
public interface Clock {
/**
diff --git a/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java b/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
index 91a98c3..95ef475 100644
--- a/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
+++ b/core/src/main/java/org/apache/logging/log4j/core/pattern/LevelPatternConverter.java
@@ -65,8 +65,9 @@
final Level level = Level.toLevel(pair[0].trim(), null);
if (level == null) {
LOGGER.error("Invalid Level {}", pair[0].trim());
+ } else {
+ levelMap.put(level, pair[1].trim());
}
- levelMap.put(level, pair[1].trim());
}
if (levelMap.size() == 0) {
return INSTANCE;
diff --git a/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java b/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java
index c1d18ae..0eb1481 100644
--- a/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java
+++ b/core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
package org.apache.logging.log4j.core.config;
import static org.junit.Assert.*;
diff --git a/core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java b/core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
index 778bc1d..a653e52 100644
--- a/core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
+++ b/core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
package org.apache.logging.log4j.core.impl;
import static org.junit.Assert.*;
diff --git a/flume-ng/src/site/xdoc/index.xml b/flume-ng/src/site/xdoc/index.xml
index 8814f8e..6bbbb97 100644
--- a/flume-ng/src/site/xdoc/index.xml
+++ b/flume-ng/src/site/xdoc/index.xml
@@ -80,7 +80,7 @@
<description>App to test log4j appender</description>
<properties>
- <log4j.version>2.0-beta1</log4j.version>
+ <log4j.version>2.0-beta6</log4j.version>
<slf4j.version>1.6.6</slf4j.version>
<jackson.version>1.9.3</jackson.version>
</properties>
diff --git a/src/site/xdoc/manual/configuration.xml.vm b/src/site/xdoc/manual/configuration.xml.vm
index e905a06..36fb658 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -131,15 +131,17 @@
}</pre>
</p>
<p>
- If no configuration files are present log4j will default to the DefaultConfiguration which
- will set up a minimal logging environment consisting of a
- <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/appender/ConsoleAppender.html">ConsoleAppender</a>
- attached to the root logger. The output will be formatted using a
- <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/layout/PatternLayout.html">PatternLayout</a>
- set to the pattern "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n".
+ Log4j will provide a default configuration if it cannot locate a configuration file. The default
+ configuration, provided in the DefaultConfiguration class, will set up:
+ <ul>
+ <li>A <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/appender/ConsoleAppender.html">ConsoleAppender</a>
+ attached to the root logger.</li>
+ <li>A <a href="../log4j-core/apidocs/org/apache/logging/log4j/core/layout/PatternLayout.html">PatternLayout</a>
+ set to the pattern "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" attached to the ConsoleAppender</li>
+ </ul>
</p>
<p>
- Note that by default, the root logger is assigned to <code>Level.ERROR</code>.
+ Note that by default Log4j assigns the root logger to <code>Level.ERROR</code>.
</p>
<p>The output of MyApp would be similar to:
<pre class="prettyprint linenums">
@@ -271,24 +273,24 @@
<a name="AdvertisingAppenderConfigurations"/>
<subsection name="Advertising Appender Configurations">
<p>
- Log4j provides the ability to expose appender configurations to external systems when the 'advertiser'
+ Log4j provides the ability to expose appender configurations to external systems when the 'advertiser'
attribute of the configuration element has been specified. Advertisement is enabled for individual appenders by setting
the 'advertise' attribute of the appender to 'true'.
</p>
<p>
Log4j currently provides one Advertiser implementation: a Multicast DNS advertiser, which can be used to retrieve and parse
- a log file or process events from a socket-based appender. Additional Advetiser implementations could be
- written which leverage other mechanisms for exposing the appender configuration - for example, by exposing the
+ a log file or process events from a socket-based appender. Additional Advetiser implementations could be
+ written which leverage other mechanisms for exposing the appender configuration - for example, by exposing the
configuration via JMX or storing it in a database.
</p>
<p>
- Chainsaw supports discovery of the Multicast DNS-exposed appender configurations for file-based and socket-based appenders. When
- Chainsaw discovers an advertised appender, Chainsaw will display an entry for the appender in the 'ZeroConf' screen, and the user can
+ Chainsaw supports discovery of the Multicast DNS-exposed appender configurations for file-based and socket-based appenders. When
+ Chainsaw discovers an advertised appender, Chainsaw will display an entry for the appender in the 'ZeroConf' screen, and the user can
double-click on the entry in order to begin receiving events generated by that appender, with no further user configuration required.
</p>
<p>
Note that individual appenders may require that additional information provided in the appender configuration. For example,
- a FileAppender must specify an advertiseURI which can be used to retrieve the file contents.
+ a FileAppender must specify an advertiseURI which can be used to retrieve the file contents.
file://, http:// and Apache Commons VFS-supported URIs are all supported by Chainsaw.
</p>
<pre class="prettyprint linenums"><