Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 31017 invoked from network); 13 Mar 2008 07:06:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Mar 2008 07:06:46 -0000 Received: (qmail 20716 invoked by uid 500); 13 Mar 2008 07:06:43 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 20656 invoked by uid 500); 13 Mar 2008 07:06:43 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 20644 invoked by uid 99); 13 Mar 2008 07:06:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2008 00:06:43 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2008 07:06:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 592821A9832; Thu, 13 Mar 2008 00:06:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r636647 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java Date: Thu, 13 Mar 2008 07:06:22 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080313070622.592821A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Thu Mar 13 00:06:20 2008 New Revision: 636647 URL: http://svn.apache.org/viewvc?rev=636647&view=rev Log: GERONIMO-3898 Make the ApplicationLog4jConfigurationGBean actually work Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java?rev=636647&r1=636646&r2=636647&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java Thu Mar 13 00:06:20 2008 @@ -33,12 +33,14 @@ import org.apache.log4j.PropertyConfigurator; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public class ApplicationLog4jConfigurationGBean { + private static final String ADDITIVITY_PREFIX = "log4j.additivity."; private static final String CATEGORY_PREFIX = "log4j.category."; private static final String LOGGER_PREFIX = "log4j.logger."; + private static final String APPENDER_PREFIX = "log4j.appender."; private static final String RENDERER_PREFIX = "log4j.renderer."; public ApplicationLog4jConfigurationGBean(String log4jResource, String log4jFile, ServerInfo serverInfo, ClassLoader classloader) throws IOException { @@ -65,6 +67,8 @@ String key = (String) it.next(); if (key.startsWith(CATEGORY_PREFIX) || key.startsWith(LOGGER_PREFIX) + || key.startsWith(ADDITIVITY_PREFIX) + || key.startsWith(APPENDER_PREFIX) || key.startsWith(RENDERER_PREFIX)) { continue; } @@ -77,17 +81,17 @@ public static final GBeanInfo GBEAN_INFO; static { - GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(ApplicationLog4jConfigurationGBean.class, "SystemLog"); + GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ApplicationLog4jConfigurationGBean.class, "SystemLog"); + infoBuilder.setPriority(2); + infoBuilder.addAttribute("log4jResource", String.class, true); + infoBuilder.addAttribute("log4jFile", String.class, true); + infoBuilder.addAttribute("classloader", ClassLoader.class, false); - infoFactory.addAttribute("log4jResource", String.class, true); - infoFactory.addAttribute("log4jFile", String.class, true); - infoFactory.addAttribute("classloader", ClassLoader.class, false); + infoBuilder.addReference("ServerInfo", ServerInfo.class, "GBean"); - infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean"); + infoBuilder.setConstructor(new String[]{"log4jResource", "log4jFile", "ServerInfo", "classloader"}); - infoFactory.setConstructor(new String[]{"log4jResource", "log4jFile", "ServerInfo", "classloader"}); - - GBEAN_INFO = infoFactory.getBeanInfo(); + GBEAN_INFO = infoBuilder.getBeanInfo(); } public static GBeanInfo getGBeanInfo() {