You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2012/10/19 21:31:51 UTC
svn commit: r1400244 - in /logging/log4j/log4j2/trunk:
flume-ng/src/site/xdoc/index.xml src/changes/changes.xml
Author: rgoers
Date: Fri Oct 19 19:31:51 2012
New Revision: 1400244
URL: http://svn.apache.org/viewvc?rev=1400244&view=rev
Log:
LOG4J2-99 - MapRewritePolicy had an extra call to putAll that caused updates to behave like adds.
Modified:
logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml
logging/log4j/log4j2/trunk/src/changes/changes.xml
Modified: logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml?rev=1400244&r1=1400243&r2=1400244&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/site/xdoc/index.xml Fri Oct 19 19:31:51 2012
@@ -28,6 +28,188 @@
<p>
The Flume NG Appender allows applications to send events to Flume NG Agents.
</p>
+ <subsection name="Remote Agent">
+ <p>
+
+ </p>
+ </subsection>
+
+ <subsection name="Embedded Agent">
+ <p>
+ The following is a sample pom file for Maven that can be used as a template for integrating the
+ Flume Embedded Appender into an application.
+ </p>
+ <source><![CDATA[<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.myapp</groupId>
+ <artifactId>myapp</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>My App</name>
+ <description>App to test log4j appender</description>
+
+ <properties>
+ <log4j.version>2.0-beta1</log4j.version>
+ <slf4j.version>1.6.6</slf4j.version>
+ <jackson.version>1.9.3</jackson.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ <version>${slf4j.version></version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
+ <artifactId>log4j12-api</artifactId>
+ <version>${log4j2_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
+ <artifactId>log4j-flume-ng</artifactId>
+ <version>${log4j2_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <version>${log4j2_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>${log4j2_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
+ <artifactId>log4j-web</artifactId>
+ <version>${log4j2_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!-- Log4j 2 API -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <!-- Log4j 1.x API -->
+ <dependency>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
+ <artifactId>log4j12-api</artifactId>
+ </dependency>
+ <!-- Log4j 2 implementation -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <!-- SLF4J to Log4j 2 binding -->
+ <dependency>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ </dependency>
+ <!-- SLF4J API -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <!-- SLF4J extensions -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ </dependency>
+ <!-- Commson Logging to Log4j 2 binding -->
+ <dependency>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ </dependency>
+ <!-- Log4j 2 Servlet Context Listener -->
+ <dependency>
+ <groupId>org.apache.logging.log4j.adapters</groupId>
+ <artifactId>log4j-web</artifactId>
+ </dependency>
+ <!-- Avro transport protocol - required for Flume -->
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.6.3</version>
+ </dependency>
+ <!-- Hadoop core - required by embedded Flume Agent -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.0.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- Flume File Channel - required by embedded Flume agent -->
+ <dependency>
+ <groupId>org.apache.flume.flume-ng-channels</groupId>
+ <artifactId>flume-file-channel</artifactId>
+ <version>1.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </project>]]></source>
+ </subsection>
</section>
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1400244&r1=1400243&r2=1400244&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Fri Oct 19 19:31:51 2012
@@ -23,6 +23,9 @@
<body>
<release version="2.0-beta3" date="TBD" description= "Bug fixes and enhancements">
+ <action issue="LOG4J2-99" dev="rgoers" type="fix" due-to="Das Archive">
+ MapRewritePolicy had an extra call to putAll that caused updates to behave like adds.
+ </action>
<action dev="rgoers" type="fix">
Avoid NPE when duplicate LoggerContextFactorys are present. Allow factories to specify a weight to allow
real implementations to outrank test implementations. Provide a simple default LoggerContextFactory.