ceki 01/07/20 09:03:41
Modified: src/java/org/apache/log4j Hierarchy.java Makefile
Log:
- Added new types of event firing methods to match changes in HiearchyEventListener.
- Removed jmx subdir from Makefile
Revision Changes Path
1.20 +33 -5 jakarta-log4j/src/java/org/apache/log4j/Hierarchy.java
Index: Hierarchy.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Hierarchy.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Hierarchy.java 2001/07/13 07:53:01 1.19
+++ Hierarchy.java 2001/07/20 16:03:41 1.20
@@ -25,6 +25,7 @@
import org.apache.log4j.spi.RootCategory;
import org.apache.log4j.spi.CategoryFactory;
import org.apache.log4j.spi.HierarchyEventListener;
+import org.apache.log4j.Appender;
import org.apache.log4j.or.RendererMap;
import org.apache.log4j.or.ObjectRenderer;
import org.apache.log4j.helpers.LogLog;
@@ -234,18 +235,47 @@
}
private
- void fireCategoryCreationEvent(Category category) {
+ void fireAddAppenderEvent(Category category, Appender appender) {
if(listeners != null) {
int size = listeners.size();
HierarchyEventListener listener;
for(int i = 0; i < size; i++) {
listener = (HierarchyEventListener) listeners.elementAt(i);
- listener.categoryCreationEvent(category);
+ listener.addAppenderEvent(category, appender);
}
}
}
+
+ private
+ void fireRemoveAppenderEvent(Category category, Appender appender) {
+ if(listeners != null) {
+ int size = listeners.size();
+ HierarchyEventListener listener;
+ for(int i = 0; i < size; i++) {
+ listener = (HierarchyEventListener) listeners.elementAt(i);
+ listener.removeAppenderEvent(category, appender);
+ }
+ }
+ }
+
/**
+ Returns the string representation of the internal
+ <code>disable</code> state.
+
+ @since 1.2
+ */
+ public
+ String getDisableAsString() {
+ switch(disable) {
+ case DISABLE_OFF: return "DISABLE_OFF";
+ case DISABLE_OVERRIDE: return "DISABLE_OVERRIDE";
+ case Priority.DEBUG_INT: return "DISABLE_DEBUG";
+ default: return "UNKNOWN_STATE";
+ }
+ }
+
+ /**
Return a new category instance named as the first parameter using
the default factory.
@@ -290,7 +320,6 @@
category.setHierarchy(this);
ht.put(key, category);
updateParents(category);
- fireCategoryCreationEvent(category);
return category;
} else if(o instanceof Category) {
return (Category) o;
@@ -301,7 +330,6 @@
ht.put(key, category);
updateChildren((ProvisionNode) o, category);
updateParents(category);
- fireCategoryCreationEvent(category);
return category;
}
else {
@@ -396,7 +424,7 @@
<p>This method should be used sparingly and with care as it will
block all logging until it is completed.</p>
- @since version 0.8.5 */
+ @since 0.8.5 */
public
void resetConfiguration() {
1.12 +1 -1 jakarta-log4j/src/java/org/apache/log4j/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 2001/07/13 07:53:05 1.11
+++ Makefile 2001/07/20 16:03:41 1.12
@@ -30,7 +30,7 @@
endif
-SUBDIRS :=helpers spi config or xml net nt varia jmx test performance examples
+SUBDIRS :=helpers spi config or xml net nt varia test performance examples
# include master-rule file
include $(DEPTH)/make/make.inc
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
