You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/10/19 19:48:31 UTC
[04/11] logging-log4j2 git commit: LOG4J2-2076 CouchDB and MongoDB
appenders in own modules, remove log4j-nosql module
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ebec215e/log4j-nosql/src/test/resources/log4j2-mongodb.xml
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/test/resources/log4j2-mongodb.xml b/log4j-nosql/src/test/resources/log4j2-mongodb.xml
deleted file mode 100644
index c759054..0000000
--- a/log4j-nosql/src/test/resources/log4j2-mongodb.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
--->
-<Configuration status="error">
- <Appenders>
- <NoSql name="MongoDbAppender">
- <MongoDb databaseName="test" collectionName="applog" server="localhost" />
- </NoSql>
- </Appenders>
- <Loggers>
- <Root level="ALL">
- <AppenderRef ref="MongoDbAppender" />
- </Root>
- </Loggers>
-</Configuration>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ebec215e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 739c090..3b96fdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1290,7 +1290,8 @@
<module>log4j-samples</module>
<module>log4j-osgi</module>
<module>log4j-bom</module>
- <module>log4j-nosql</module>
+ <module>log4j-couchdb</module>
+ <module>log4j-mongodb</module>
<module>log4j-cassandra</module>
<module>log4j-web</module>
<module>log4j-perf</module>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ebec215e/src/site/markdown/javadoc.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/javadoc.md b/src/site/markdown/javadoc.md
index b2e435f..00cd556 100644
--- a/src/site/markdown/javadoc.md
+++ b/src/site/markdown/javadoc.md
@@ -44,4 +44,6 @@ Component | Description
[Apache Flume Appender](log4j-flume-ng/apidocs/index.html) | An Appender that allows applications to send logging events to Apache Flume Agents.
[Log4j JMX GUI](log4j-jmx-gui/apidocs/index.html) | A Java Swing-based client for remotely viewing the status logger and editing the Log4j configuration.
[Log4j Web Application Support](log4j-web/apidocs/index.html) | Additional classes that enable multiple configurations within a Servlet Container.
-[Log4j NoSQL Support](log4j-nosql/apidocs/index.html) | Additional Appenders for NoSQL databases such as MongoDB and CouchDB.
+[Log4j CouchDB Support](log4j-couchdb/apidocs/index.html) | Additional Appender for CouchDB.
+[Log4j MongoDB Support](log4j-mongodb/apidocs/index.html) | Additional Appender for MongoDB.
+[Log4j Cassandra Support](log4j-cassandra/apidocs/index.html) | Additional Appender for Cassandra.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ebec215e/src/site/markdown/maven-artifacts.md.vm
----------------------------------------------------------------------
diff --git a/src/site/markdown/maven-artifacts.md.vm b/src/site/markdown/maven-artifacts.md.vm
index 272cf2e..175fb2f 100644
--- a/src/site/markdown/maven-artifacts.md.vm
+++ b/src/site/markdown/maven-artifacts.md.vm
@@ -224,11 +224,23 @@ to SLF4J. The SLF4J Bridge must NOT be on the class path when this is in use.
#dependencies(['log4j-to-slf4j'])
-$h3 NoSQL Appenders
+$h3 CouchDB
-If your configuration uses one of the NoSQL Appenders, then add the following.
+If your configuration uses the NoSQL CouchDB appender, then add the following.
-#dependencies(['log4j-nosql'])
+#dependencies(['log4j-couchdb'])
+
+$h3 MongoDB
+
+If your configuration uses the NoSQL MongoDB appender, then add the following.
+
+#dependencies(['log4j-mongodb'])
+
+$h3 Cassandra
+
+If your configuration uses the Cassandra appender, then add the following.
+
+#dependencies(['log4j-cassandra'])
$h3 IO Streams
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ebec215e/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 6de65be..d323cd2 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -272,7 +272,9 @@
<item name="Log4j JMX GUI" href="log4j-jmx-gui/index.html"/>
<item name="Log4j Web Application Support" href="log4j-web/index.html"/>
<item name="Log4j Application Server Integration" href="log4j-appserver/index.html"/>
- <item name="Log4j NoSQL support" href="log4j-nosql/index.html"/>
+ <item name="Log4j CouchDB appender" href="log4j-couchdb/index.html"/>
+ <item name="Log4j MongoDB appender" href="log4j-mongodb/index.html"/>
+ <item name="Log4j Cassandra appender" href="log4j-cassandra/index.html"/>
<item name="Log4j IO Streams" href="log4j-iostreams/index.html"/>
<item name="Log4j Liquibase Binding" href="log4j-liquibase/index.html"/>
</menu>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ebec215e/src/site/xdoc/runtime-dependencies.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/runtime-dependencies.xml b/src/site/xdoc/runtime-dependencies.xml
index e319c34..1f66725 100644
--- a/src/site/xdoc/runtime-dependencies.xml
+++ b/src/site/xdoc/runtime-dependencies.xml
@@ -121,8 +121,13 @@
<td>Automatic Module</td>
</tr>
<tr>
- <td>log4j-nosql</td>
- <td>org.apache.logging.log4j.nosql</td>
+ <td>log4j-couchdb</td>
+ <td>org.apache.logging.log4j.couchdb</td>
+ <td>Automatic Module</td>
+ </tr>
+ <tr>
+ <td>log4j-mongodb</td>
+ <td>org.apache.logging.log4j.mongodb</td>
<td>Automatic Module</td>
</tr>
<tr>
@@ -255,11 +260,11 @@
</tr>
<tr>
<td>NoSQL Appender with MongoDB provider</td>
- <td>MongoDB Java Client driver and Log4j NoSQL library</td>
+ <td>MongoDB Java Client driver and Log4j MongoDB library</td>
</tr>
<tr>
<td>NoSQL Appender with Apache CouchDB provider</td>
- <td>LightCouch CouchDB client library and Log4j NoSQL library</td>
+ <td>LightCouch CouchDB client library and Log4j CouchDB library</td>
</tr>
<tr>
<td>Cassandra Appender</td>
@@ -368,34 +373,24 @@
Note that this works with the Servlet 2.5 API as well as the Servlet 3.x API.
</p>
- <a name="log4j-nosql" />
- <h4>log4j-nosql</h4>
+ <a name="log4j-couchdb" />
+ <h4>log4j-couchdb</h4>
<p>
- The Log4J <a href="log4j-nosql/index.html">NoSQL Appenders</a> module has several optional
- <a href="log4j-nosql/dependencies.html">dependencies</a>.
- See the <a href="log4j-nosql/dependencies.html#Dependency_Tree">Dependency Tree</a> for the
- exact list of JAR files needed for these features.
+ The Log4J <a href="log4j-couchdb/index.html">CouchDB</a> module depends on
+ the <a href="http://www.lightcouch.org/">LightCouch</a> CouchDB client library.
+ </p>
+
+ <a name="log4j-mongodb" />
+ <h4>log4j-mongodb</h4>
+ <p>
+ The Log4J <a href="log4j-mongodb/index.html">MongoDB</a> module depends on
+ the <a href="http://docs.mongodb.org/ecosystem/drivers/java/">MongoDB Java Client driver</a>.
</p>
- <table>
- <caption align="top">Optional Dependencies per Feature in Log4J NoSQL Appenders</caption>
- <tr>
- <td>NoSQL Appender with <a href="http://www.mongodb.org/">MongoDB</a> provider</td>
- <td>the <a href="http://docs.mongodb.org/ecosystem/drivers/java/">MongoDB Java Client driver</a></td>
- </tr>
- <tr>
- <td>NoSQL Appender with <a href="https://couchdb.apache.org/">Apache CouchDB</a> provider</td>
- <td>the <a href="http://www.lightcouch.org/">LightCouch</a> CouchDB client library</td>
- </tr>
- <tr>
- <td>Cassandra Appender</td>
- <td>the <a href="http://docs.datastax.com/en/developer/driver-matrix/doc/javaDrivers.html">Datastax Cassandra driver</a></td>
- </tr>
- </table>
<a name="log4j-cassandra" />
<h4>log4j-cassandra</h4>
<p>
- The Log4J <a href="log4j-cassandra/index.html">Cassandra</a> module has depends on
+ The Log4J <a href="log4j-cassandra/index.html">Cassandra</a> module depends on
the <a href="http://docs.datastax.com/en/developer/driver-matrix/doc/javaDrivers.html">Datastax Cassandra driver</a>.
</p>