From commits-return-599-apmail-logging-commits-archive=logging.apache.org@logging.apache.org Mon Apr 16 04:34:07 2012 Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8FD6E963F for ; Mon, 16 Apr 2012 04:34:07 +0000 (UTC) Received: (qmail 25758 invoked by uid 500); 16 Apr 2012 04:34:07 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 25708 invoked by uid 500); 16 Apr 2012 04:34:07 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 25699 invoked by uid 99); 16 Apr 2012 04:34:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Apr 2012 04:34:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Apr 2012 04:34:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 920F023889E1; Mon, 16 Apr 2012 04:33:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1326476 - in /logging/log4j/log4j2/trunk: ./ log4j12-api/ log4j2-api/ log4j2-core/ log4j2-core/src/main/resources/META-INF/ log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/ src/site/ Date: Mon, 16 Apr 2012 04:33:39 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120416043339.920F023889E1@eris.apache.org> Author: rgoers Date: Mon Apr 16 04:33:38 2012 New Revision: 1326476 URL: http://svn.apache.org/viewvc?rev=1326476&view=rev Log: Clean up NOTICE and LICENSE files Removed: logging/log4j/log4j2/trunk/log4j12-api/LICENSE logging/log4j/log4j2/trunk/log4j12-api/NOTICE logging/log4j/log4j2/trunk/log4j2-core/LICENSE logging/log4j/log4j2/trunk/log4j2-core/NOTICE logging/log4j/log4j2/trunk/log4j2-core/src/main/resources/META-INF/LICENSE logging/log4j/log4j2/trunk/log4j2-core/src/main/resources/META-INF/NOTICE Modified: logging/log4j/log4j2/trunk/NOTICE.txt logging/log4j/log4j2/trunk/log4j2-api/pom.xml logging/log4j/log4j2/trunk/log4j2-core/pom.xml logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java logging/log4j/log4j2/trunk/src/site/site.xml Modified: logging/log4j/log4j2/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/NOTICE.txt?rev=1326476&r1=1326475&r2=1326476&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/NOTICE.txt (original) +++ logging/log4j/log4j2/trunk/NOTICE.txt Mon Apr 16 04:33:38 2012 @@ -1,5 +1,5 @@ -Apache log4j Enhanced PatternLayout for log4j 1.2.x -Copyright 2007 The Apache Software Foundation +Apache log4j2 1.0-alpha1 +Copyright 2012 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file Modified: logging/log4j/log4j2/trunk/log4j2-api/pom.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-api/pom.xml?rev=1326476&r1=1326475&r2=1326476&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j2-api/pom.xml (original) +++ logging/log4j/log4j2/trunk/log4j2-api/pom.xml Mon Apr 16 04:33:38 2012 @@ -16,7 +16,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.logging.log4j @@ -45,120 +45,120 @@ test - - - - org.apache.maven.plugins - maven-changes-plugin - 2.6 - - - - changes-report - - - - - %URL%/show_bug.cgi?id=%ISSUE% - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.7 - - - ${log4j.parent.dir}/checkstyle.xml - ${log4j.parent.dir}/checkstyle-suppressions.xml - false - basedir=${basedir} - licensedir=${log4j.parent.dir}/checkstyle-header.txt - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - - false - true - - - issue - a - JIRA issue: - - - doubt - a - Troublesome: - - - compare - a - Compare with: - - - - - - non-aggregate - - javadoc - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.2 - - Normal - Default - ${log4j.parent.dir}/findbugs-exclude-filter.xml - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - non-aggregate - - jxr - - - - aggregate - - aggregate - - - - - - org.apache.maven.plugins - maven-pmd-plugin - - 1.5 - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.2 - - - - - - - - - + + + + org.apache.maven.plugins + maven-changes-plugin + 2.6 + + + + changes-report + + + + + %URL%/show_bug.cgi?id=%ISSUE% + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.7 + + + ${log4j.parent.dir}/checkstyle.xml + ${log4j.parent.dir}/checkstyle-suppressions.xml + false + basedir=${basedir} + licensedir=${log4j.parent.dir}/checkstyle-header.txt + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8 + + + false + true + + + issue + a + JIRA issue: + + + doubt + a + Troublesome: + + + compare + a + Compare with: + + + + + + non-aggregate + + javadoc + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.2 + + Normal + Default + ${log4j.parent.dir}/findbugs-exclude-filter.xml + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + non-aggregate + + jxr + + + + aggregate + + aggregate + + + + + + org.apache.maven.plugins + maven-pmd-plugin + + 1.5 + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.2 + + + + + + + + + Modified: logging/log4j/log4j2/trunk/log4j2-core/pom.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-core/pom.xml?rev=1326476&r1=1326475&r2=1326476&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j2-core/pom.xml (original) +++ logging/log4j/log4j2/trunk/log4j2-core/pom.xml Mon Apr 16 04:33:38 2012 @@ -16,7 +16,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.logging.log4j @@ -41,20 +41,20 @@ jackson-core-asl 1.9.2 true - - + + org.codehaus.jackson jackson-mapper-asl 1.9.2 true - + oro oro 2.0.8 test - + javax.servlet servlet-api 2.4 @@ -71,12 +71,12 @@ slf4j-api test - + org.slf4j slf4j-ext test - + junit junit 4.7 @@ -147,122 +147,122 @@ - - - org.apache.maven.plugins - maven-changes-plugin - 2.6 - - - - changes-report - - - - - %URL%/show_bug.cgi?id=%ISSUE% - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.7 - - - ${log4j.parent.dir}/checkstyle.xml - ${log4j.parent.dir}/checkstyle-suppressions.xml - false - basedir=${basedir} - licensedir=${log4j.parent.dir}/checkstyle-header.txt - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - - false - true - - - issue - a - JIRA issue: - - - doubt - a - Troublesome: - - - compare - a - Compare with: - - - - - - non-aggregate - - javadoc - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.2 - - Normal - Default - findbugs-exclude-filter.xml - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - non-aggregate - - jxr - - - - aggregate - - aggregate - - - - - - org.apache.maven.plugins - maven-pmd-plugin - - 1.5 - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.2 - - - - - - - - - + + + org.apache.maven.plugins + maven-changes-plugin + 2.6 + + + + changes-report + + + + + %URL%/show_bug.cgi?id=%ISSUE% + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.7 + + + ${log4j.parent.dir}/checkstyle.xml + ${log4j.parent.dir}/checkstyle-suppressions.xml + false + basedir=${basedir} + licensedir=${log4j.parent.dir}/checkstyle-header.txt + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8 + + + false + true + + + issue + a + JIRA issue: + + + doubt + a + Troublesome: + + + compare + a + Compare with: + + + + + + non-aggregate + + javadoc + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.2 + + Normal + Default + findbugs-exclude-filter.xml + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + non-aggregate + + jxr + + + + aggregate + + aggregate + + + + + + org.apache.maven.plugins + maven-pmd-plugin + + 1.5 + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.2 + + + + + + + + + - + yourkit @@ -278,7 +278,7 @@ ${yourkit.home}/lib/yjp-controller-api-redist.jar - + org.apache.maven.plugins Modified: logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java?rev=1326476&r1=1326475&r2=1326476&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java (original) +++ logging/log4j/log4j2/trunk/log4j2-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java Mon Apr 16 04:33:38 2012 @@ -51,6 +51,8 @@ public class FlumeEvent extends SimpleEv private static final String GUID = "guId"; + private static final String TIMESTAMP = "timestamp";; + private final LogEvent event; private final Map ctx = new HashMap(); @@ -72,6 +74,7 @@ public class FlumeEvent extends SimpleEv this.event = event; this.compress = compress; Map headers = getHeaders(); + headers.put(TIMESTAMP, Long.toString(event.getMillis())); if (mdcPrefix == null) { mdcPrefix = DEFAULT_MDC_PREFIX; } Modified: logging/log4j/log4j2/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.xml?rev=1326476&r1=1326475&r2=1326476&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/src/site/site.xml (original) +++ logging/log4j/log4j2/trunk/src/site/site.xml Mon Apr 16 04:33:38 2012 @@ -29,7 +29,7 @@ - Logging Services™ + Apache Logging Services™ images/ls-logo.jpg http://logging.apache.org/