Return-Path: 
 <commits-return-1241-apmail-logging-commits-archive=logging.apache.org@logging.apache.org>
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 EC8E7DBCE
	for <apmail-logging-commits-archive@minotaur.apache.org>;
 Sat,  6 Oct 2012 19:58:53 +0000 (UTC)
Received: (qmail 25457 invoked by uid 500); 6 Oct 2012 19:58:53 -0000
Delivered-To: apmail-logging-commits-archive@logging.apache.org
Received: (qmail 25432 invoked by uid 500); 6 Oct 2012 19:58:53 -0000
Mailing-List: contact commits-help@logging.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@logging.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@logging.apache.org>
List-Post: <mailto:commits@logging.apache.org>
List-Id: <commits.logging.apache.org>
Reply-To: dev@logging.apache.org
Delivered-To: mailing list commits@logging.apache.org
Received: (qmail 25420 invoked by uid 99); 6 Oct 2012 19:58:53 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Oct 2012 19:58:53 +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; Sat, 06 Oct 2012 19:58:50 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0B81C23889E7;
	Sat,  6 Oct 2012 19:58:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1395162 - in /logging/log4j/log4j2/trunk: NOTICE.txt
 api/pom.xml api/src/main/resources/LICENSE api/src/main/resources/NOTICE
 core/src/main/resources/META-INF/NOTICE flume-ng/pom.xml jcl-bridge/pom.xml
 log4j12-api/pom.xml slf4j-impl/pom.xml
Date: Sat, 06 Oct 2012 19:58:05 -0000
To: commits@logging.apache.org
From: rgoers@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121006195806.0B81C23889E7@eris.apache.org>

Author: rgoers
Date: Sat Oct  6 19:58:04 2012
New Revision: 1395162

URL: http://svn.apache.org/viewvc?rev=1395162&view=rev
Log:
Eliminate duplicate NOTICE files. Cause NOTICE files to contain proper component names

Added:
    logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/NOTICE
Removed:
    logging/log4j/log4j2/trunk/api/src/main/resources/LICENSE
    logging/log4j/log4j2/trunk/api/src/main/resources/NOTICE
Modified:
    logging/log4j/log4j2/trunk/NOTICE.txt
    logging/log4j/log4j2/trunk/api/pom.xml
    logging/log4j/log4j2/trunk/flume-ng/pom.xml
    logging/log4j/log4j2/trunk/jcl-bridge/pom.xml
    logging/log4j/log4j2/trunk/log4j12-api/pom.xml
    logging/log4j/log4j2/trunk/slf4j-impl/pom.xml

Modified: logging/log4j/log4j2/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/NOTICE.txt?rev=1395162&r1=1395161&r2=1395162&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/NOTICE.txt (original)
+++ logging/log4j/log4j2/trunk/NOTICE.txt Sat Oct  6 19:58:04 2012
@@ -1,8 +1,8 @@
-Apache log4j2 1.0-beta1
-Copyright 2012 The Apache Software Foundation
+Apache Log4j
+Copyright 1999-2012 Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
\ No newline at end of file
+Copyright 2005-2006 Tim Fennell

Modified: logging/log4j/log4j2/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/pom.xml?rev=1395162&r1=1395161&r2=1395162&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/api/pom.xml Sat Oct  6 19:58:04 2012
@@ -26,7 +26,7 @@
   <groupId>org.apache.logging.log4j</groupId>
   <artifactId>log4j-api</artifactId>
   <packaging>jar</packaging>
-  <name>Log4J API</name>
+  <name>Apache Log4j API</name>
   <description>The Log4J API</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>

Added: logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/NOTICE?rev=1395162&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/NOTICE (added)
+++ logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/NOTICE Sat Oct  6 19:58:04 2012
@@ -0,0 +1,8 @@
+Apache Log4j Core
+Copyright 1999-2012 Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
\ No newline at end of file

Modified: logging/log4j/log4j2/trunk/flume-ng/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/pom.xml?rev=1395162&r1=1395161&r2=1395162&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/pom.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/pom.xml Sat Oct  6 19:58:04 2012
@@ -26,7 +26,7 @@
   <groupId>org.apache.logging.log4j.adapters</groupId>
   <artifactId>log4j-flume-ng</artifactId>
   <packaging>jar</packaging>
-  <name>Log4J Flume NG</name>
+  <name>Apache Log4j Flume NG Bridge</name>
   <description>Log4j 2.0 Flume Appender</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>

Modified: logging/log4j/log4j2/trunk/jcl-bridge/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/pom.xml?rev=1395162&r1=1395161&r2=1395162&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/jcl-bridge/pom.xml (original)
+++ logging/log4j/log4j2/trunk/jcl-bridge/pom.xml Sat Oct  6 19:58:04 2012
@@ -28,7 +28,7 @@
   <groupId>org.apache.logging.log4j.adapters</groupId>
   <artifactId>log4j-jcl</artifactId>
   <packaging>jar</packaging>
-  <name>Log4J Commons Logging</name>
+  <name>Apache Log4j Commons Logging Bridge</name>
   <description>Log4j 2.0 Commons Logging Adapter</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>

Modified: logging/log4j/log4j2/trunk/log4j12-api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/pom.xml?rev=1395162&r1=1395161&r2=1395162&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/pom.xml Sat Oct  6 19:58:04 2012
@@ -26,7 +26,7 @@
   <groupId>org.apache.logging.log4j.adapters</groupId>
   <artifactId>log4j12-api</artifactId>
   <packaging>jar</packaging>
-  <name>Log4J Compatibility API</name>
+  <name>Apache Log4j 1.x Compatibility API</name>
   <description>The Log4J Compatibility API</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>

Modified: logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/pom.xml?rev=1395162&r1=1395161&r2=1395162&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/pom.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/pom.xml Sat Oct  6 19:58:04 2012
@@ -26,7 +26,7 @@
   <groupId>org.apache.logging.log4j.adapters</groupId>
   <artifactId>slf4j-impl</artifactId>
   <packaging>jar</packaging>
-  <name>SLF4J Binding</name>
+  <name>Apache Log4j SLF4J Binding</name>
   <description>Binding between SLF4J API and Log4J2 Core</description>
   <properties>
     <log4jParentDir>${basedir}/..</log4jParentDir>