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 2014/08/03 16:46:42 UTC
svn commit: r1615406 - in /logging/log4j/log4j2/trunk:
log4j-api/src/main/java/org/apache/logging/log4j/message/
log4j-api/src/main/java/org/apache/logging/log4j/status/
log4j-core/src/main/java/org/apache/logging/log4j/core/
log4j-core/src/main/java/o...
Author: rpopma
Date: Sun Aug 3 14:46:41 2014
New Revision: 1615406
URL: http://svn.apache.org/r1615406
Log:
LOG4J2-759 minor site/documentation issues; mostly changing mentions of "Log4j 2.0" to "Log4j 2" to prepare for upcoming 2.1, 2.2 etc releases; also update for custom log levels
Added:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/package-info.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/package-info.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/package-info.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java (with props)
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/package-info.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/package-info.java
logging/log4j/log4j2/trunk/src/site/xdoc/faq.xml
logging/log4j/log4j2/trunk/src/site/xdoc/index.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm
logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml
logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/message/package-info.java Sun Aug 3 14:46:41 2014
@@ -16,6 +16,6 @@
*/
/**
- * Public Message Types used for Log4j 2.0. User's may implement their own Messages.
+ * Public Message Types used for Log4j 2. Users may implement their own Messages.
*/
package org.apache.logging.log4j.message;
Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/status/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,7 +15,7 @@
* limitations under the license.
*/
-/** Status API for Log4j 2.0. Should not be used by typical applications performing logging but may be
+/** Status API for Log4j 2. Should not be used by typical applications performing logging but may be
* used by applications reporting on the status of the logging system
*/
package org.apache.logging.log4j.status;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 Appenders.
+ * Log4j 2 Appenders.
*/
package org.apache.logging.log4j.core.appender;
Added: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/package-info.java?rev=1615406&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/package-info.java (added)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/package-info.java Sun Aug 3 14:46:41 2014
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+/**
+ * Classes and interfaces supporting configuration of Log4j 2 with JSON.
+ */
+package org.apache.logging.log4j.core.config.json;
Propchange: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Configuration of Log4j 2.0.
+ * Configuration of Log4j 2.
*/
package org.apache.logging.log4j.core.config;
Added: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/package-info.java?rev=1615406&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/package-info.java (added)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/package-info.java Sun Aug 3 14:46:41 2014
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+/**
+ * Classes and interfaces supporting configuration of Log4j 2 with XML.
+ */
+package org.apache.logging.log4j.core.config.xml;
Propchange: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/package-info.java?rev=1615406&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/package-info.java (added)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/package-info.java Sun Aug 3 14:46:41 2014
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+/**
+ * Classes and interfaces supporting configuration of Log4j 2 with YAML.
+ */
+package org.apache.logging.log4j.core.config.yaml;
Propchange: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 Filter support.
+ * Log4j 2 Filter support.
*/
package org.apache.logging.log4j.core.filter;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 private implementation classes.
+ * Log4j 2 private implementation classes.
*/
package org.apache.logging.log4j.core.impl;
Added: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java?rev=1615406&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java (added)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java Sun Aug 3 14:46:41 2014
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+/**
+ * Classes and interfaces for serializing and deserializing Log4j 2 log events to XML and JSON using the Jackson
+ * library.
+ */
+package org.apache.logging.log4j.core.jackson;
Propchange: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 JMX support.
+ * Log4j 2 JMX support.
*/
package org.apache.logging.log4j.core.jmx;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 Layout support.
+ * Log4j 2 Layout support.
*/
package org.apache.logging.log4j.core.layout;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 Lookups.
+ * Log4j 2 Lookups.
*/
package org.apache.logging.log4j.core.lookup;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,7 +15,7 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 network support. This package (and subpackages) include support for:
+ * Log4j 2 network support. This package (and subpackages) include support for:
* <ul>
* <li>Java Message System appenders (both queue-based and topic-based)</li>
* <li>Zeroconf support for finding logging systems</li>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 SSL support
+ * Log4j 2 SSL support
*/
package org.apache.logging.log4j.core.net.ssl;
\ No newline at end of file
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Implementation of Log4j 2.0.
+ * Implementation of Log4j 2.
*/
package org.apache.logging.log4j.core;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 Context Selectors.
+ * Log4j 2 Context Selectors.
*/
package org.apache.logging.log4j.core.selector;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 command line tools.
+ * Log4j 2 command line tools.
*/
package org.apache.logging.log4j.core.tools;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/package-info.java?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/package-info.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/package-info.java Sun Aug 3 14:46:41 2014
@@ -15,6 +15,6 @@
* limitations under the license.
*/
/**
- * Log4j 2.0 helper classes.
+ * Log4j 2 helper classes.
*/
package org.apache.logging.log4j.core.util;
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/faq.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/faq.xml?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/faq.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/faq.xml Sun Aug 3 14:46:41 2014
@@ -40,9 +40,9 @@
<h4>Which JAR files do I need?</h4>
<p>You need at least the log4j-api-2.0 and the log4j-core-2.0 jar files.</p>
<p>The other jars are necessary if your application calls the API
- of another logging framework and you want to route logging calls to the Log4j 2.0 implementation.</p>
+ of another logging framework and you want to route logging calls to the Log4j 2 implementation.</p>
<p><img src="images/whichjar.png" alt="Diagram showing which JARs correspond to which systems" /></p>
- <p>You can use the log4j-to-slf4j adapter jar when your application calls the Log4j 2.0 API and you
+ <p>You can use the log4j-to-slf4j adapter jar when your application calls the Log4j 2 API and you
want to route logging calls to a SLF4J implementation.</p>
<p><img src="images/whichjar-slf4j.png" alt="Diagram showing the dependency flow to use Log4j 2 API with SLF4J" /></p>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/index.xml?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/index.xml Sun Aug 3 14:46:41 2014
@@ -48,7 +48,7 @@
<dd>
Log4j 2 contains next-generation Asynchronous Loggers based
on the LMAX Disruptor library. In multi-threaded scenarios
- Asynchronous Loggers have 10 times higher throughput and
+ Asynchronous Loggers have 18 times higher throughput and
orders of magnitude lower latency than Log4j 1.x and Logback.
See <a href="manual/async.html#Performance">Asynchronous Logging Performance</a>
for details.
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/architecture.xml Sun Aug 3 14:46:41 2014
@@ -173,11 +173,11 @@ Logger y = LogManager.getLogger("wombat"
</p>
<h5>Log Levels</h5>
<p>LoggerConfigs will be assigned a Log
- <a href="../log4j-api/apidocs/org/apache/logging/log4j/Level.html">Level</a>. The set of possible
- levels includes TRACE, DEBUG, INFO, WARN, ERROR, and FATAL. Note that in Log4j 2, the Level is
- an Enum and cannot be sub-classed. Users who desire more granularity are encouraged to use
- <a href="../log4j-api/api.html#Markers">Markers</a>
- instead.
+ <a href="../log4j-api/apidocs/org/apache/logging/log4j/Level.html">Level</a>. The set of built-in
+ levels includes TRACE, DEBUG, INFO, WARN, ERROR, and FATAL. Log4j 2 also supports
+ <a href="customloglevels.html">custom log levels</a>.
+ Another mechanism for getting more granularity is to use
+ <a href="../log4j-api/api.html#Markers">Markers</a> instead.
</p>
<p>
<a href="http://logging.apache.org/log4j/1.2/manual.html">Log4j 1.x</a>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/configuration.xml.vm Sun Aug 3 14:46:41 2014
@@ -1147,7 +1147,7 @@ StatusConsoleListener listener = new Sta
Below follows a number of system properties that can be used to control Log4j 2 behaviour.
</p>
<table>
- <caption align="top">Log4J-2.0 System Properties</caption>
+ <caption align="top">Log4j 2 System Properties</caption>
<tr>
<th>System Property</th>
<th>Default Value</th>
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/extending.xml Sun Aug 3 14:46:41 2014
@@ -71,7 +71,7 @@
ContextSelector to be used.
</p>
<p>
- Log4j provides three ContextSelectors:
+ Log4j provides four ContextSelectors:
</p>
<dl>
<dt>BasicContextSelector</dt>
@@ -80,6 +80,8 @@
<dd>Associates LoggerContexts with the ClassLoader that created the caller of the getLogger call.</dd>
<dt>JndiContextSelector</dt>
<dd>Locates the LoggerContext by querying JNDI.</dd>
+ <dt>AsyncLoggerContextSelector</dt>
+ <dd>Creates a LoggerContext that ensures that all loggers are AsyncLoggers.</dd>
</dl>
</subsection>
<subsection name="ConfigurationFactory">
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/index.xml Sun Aug 3 14:46:41 2014
@@ -38,7 +38,7 @@
href="http://www.opensource.org">open source</a> initiative. The
latest log4j version, including full-source code, class files and
documentation can be found at <a
- href="http://logging.apache.org/log4j/2.0/index.html"><b>http://logging.apache.org/log4j/2.0/index.html</b></a>.
+ href="http://logging.apache.org/log4j/2.x/index.html"><b>http://logging.apache.org/log4j/2.x/index.html</b></a>.
</p>
<p>Inserting log statements into code is a low-tech method for
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml?rev=1615406&r1=1615405&r2=1615406&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/migration.xml Sun Aug 3 14:46:41 2014
@@ -43,12 +43,12 @@
</ol>
</subsection>
<subsection name="Converting to the Log4j 2 API">
- <p>For the most part, converting from the Log4j 1.x API to Log4j 2.0 should be fairly simple. Many
+ <p>For the most part, converting from the Log4j 1.x API to Log4j 2 should be fairly simple. Many
of the log statements will require no modification. However, where necessary the following changes must be
made.</p>
<ol>
<li>
- The main package in version 1 is <code>org.apache.log4j</code>, in version 2.0 it is
+ The main package in version 1 is <code>org.apache.log4j</code>, in version 2 it is
<code>org.apache.logging.log4j</code>
</li>
<li>