You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/13 08:05:16 UTC
svn commit: r636646 -
/geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java
Author: djencks
Date: Thu Mar 13 00:05:13 2008
New Revision: 636646
URL: http://svn.apache.org/viewvc?rev=636646&view=rev
Log:
GERONIMO-3898 Make the ApplicationLog4jConfigurationGBean actually work
Modified:
geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java?rev=636646&r1=636645&r2=636646&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java Thu Mar 13 00:05:13 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() {