ceki 01/09/25 01:48:45
Modified: src/java/org/apache/log4j PropertyConfigurator.java
Added: src/java/org/apache/log4j/jmx Makefile MethodUnion.java
Log:
Added missing files in ..../jmx/
Added support for the logger prefix in PropertyConfigurator.java.
Revision Changes Path
1.38 +16 -10
jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
Index: PropertyConfigurator.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- PropertyConfigurator.java 2001/09/06 22:40:39 1.37
+++ PropertyConfigurator.java 2001/09/25 08:48:45 1.38
@@ -90,6 +90,7 @@
protected LoggerFactory categoryFactory = new DefaultCategoryFactory();
static final String CATEGORY_PREFIX = "log4j.category.";
+ static final String LOGGER_PREFIX = "log4j.logger.";
static final String FACTORY_PREFIX = "log4j.factory";
static final String ADDITIVITY_PREFIX = "log4j.additivity.";
static final String ROOT_CATEGORY_PREFIX = "log4j.rootCategory";
@@ -513,13 +514,18 @@
Enumeration enum = props.propertyNames();
while(enum.hasMoreElements()) {
String key = (String) enum.nextElement();
- if(key.startsWith(CATEGORY_PREFIX)) {
- String categoryName = key.substring(CATEGORY_PREFIX.length());
+ if(key.startsWith(CATEGORY_PREFIX) || key.startsWith(LOGGER_PREFIX)) {
+ String loggerName = null;
+ if(key.startsWith(CATEGORY_PREFIX)) {
+ loggerName = key.substring(CATEGORY_PREFIX.length());
+ } else if(key.startsWith(LOGGER_PREFIX)) {
+ loggerName = key.substring(LOGGER_PREFIX.length());
+ }
String value = OptionConverter.findAndSubst(key, props);
- Logger logger = hierarchy.getLogger(categoryName, categoryFactory);
+ Logger logger = hierarchy.getLogger(loggerName, categoryFactory);
synchronized(logger) {
- parseCategory(props, logger, key, categoryName, value);
- parseAdditivityForCategory(props, logger, categoryName);
+ parseCategory(props, logger, key, loggerName, value);
+ parseAdditivityForLogger(props, logger, loggerName);
}
} else if(key.startsWith(RENDERER_PREFIX)) {
String renderedClass = key.substring(RENDERER_PREFIX.length());
@@ -535,15 +541,15 @@
/**
Parse the additivity option for a non-root category.
*/
- void parseAdditivityForCategory(Properties props, Logger cat,
- String categoryName) {
- String value = OptionConverter.findAndSubst(ADDITIVITY_PREFIX + categoryName,
+ void parseAdditivityForLogger(Properties props, Logger cat,
+ String loggerName) {
+ String value = OptionConverter.findAndSubst(ADDITIVITY_PREFIX + loggerName,
props);
- LogLog.debug("Handling "+ADDITIVITY_PREFIX + categoryName+"=["+value+"]");
+ LogLog.debug("Handling "+ADDITIVITY_PREFIX + loggerName+"=["+value+"]");
// touch additivity only if necessary
if((value != null) && (!value.equals(""))) {
boolean additivity = OptionConverter.toBoolean(value, true);
- LogLog.debug("Setting additivity for \""+categoryName+"\" to "+
+ LogLog.debug("Setting additivity for \""+loggerName+"\" to "+
additivity);
cat.setAdditivity(additivity);
}
1.1 jakarta-log4j/src/java/org/apache/log4j/jmx/Makefile
Index: Makefile
===================================================================
PKG_DIR :=org/apache/log4j/jmx
DEPTH :=../../../../../..
JSOURCES:=AbstractDynamicMBean.java\
Agent.java\
AppenderDynamicMBean.java\
HierarchyDynamicMBean.java\
LayoutDynamicMBean.java\
LoggerDynamicMBean.java\
MethodUnion.java\
# include master-rule file
include $(DEPTH)/make/make.inc
1.1 jakarta-log4j/src/java/org/apache/log4j/jmx/MethodUnion.java
Index: MethodUnion.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software
* License version 1.1, a copy of which has been included with this
* distribution in the LICENSE.txt file. */
package org.apache.log4j.jmx;
import java.lang.reflect.Method;
class MethodUnion {
Method readMethod;
Method writeMethod;
MethodUnion( Method readMethod, Method writeMethod) {
this.readMethod = readMethod;
this.writeMethod = writeMethod;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
