fyi build currently seems to be broken, missing HierarchyEventListener.java... ----- Original Message ----- From: "Ceki Gülcü" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]> Cc: <[EMAIL PROTECTED]> Sent: Friday, July 13, 2001 5:44 AM Subject: Re: cvs commit: jakarta-log4j/src/java/org/apache/log4j/helpers OptionConverter.java I forgot to mention the following important points: 1) Category.assert is removed since assert is a language reserved word. 2) I started adding JMX support for log4j. In particular, Hierarchy class is being enhanced to support event broadcasting. At 07:53 13.07.2001 +0000, [EMAIL PROTECTED] wrote: >ceki 01/07/13 00:53:57 > > Modified: src/java/org/apache/log4j Appender.java > AppenderSkeleton.java AsyncAppender.java > BasicConfigurator.java Category.java > CategoryKey.java CompositeRollingAppender.java > ConsoleAppender.java DailyRollingFileAppender.java > DefaultCategoryFactory.java FileAppender.java > HTMLLayout.java Hierarchy.java Layout.java Makefile > Priority.java PropertyConfigurator.java > ProvisionNode.java RollingFileAppender.java > RollingFileAppenderBeanInfo.java > StressCategory.java WriterAppender.java > src/java/org/apache/log4j/helpers OptionConverter.java > Log: > Changed copyright reference to the LICENSE.txt file. > > Revision Changes Path > 1.6 +1 -1 jakarta-log4j/src/java/org/apache/log4j/Appender.java > > Index: Appender.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Appender.java,v > retrieving revision 1.5 > retrieving revision 1.6 > diff -u -r1.5 -r1.6 > --- Appender.java 2001/02/02 21:46:12 1.5 > +++ Appender.java 2001/07/13 07:52:41 1.6 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.14 +1 -1 jakarta-log4j/src/java/org/apache/log4j/AppenderSkeleton.java > > Index: AppenderSkeleton.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/AppenderSkeleton.java,v > retrieving revision 1.13 > retrieving revision 1.14 > diff -u -r1.13 -r1.14 > --- AppenderSkeleton.java 2001/05/21 18:21:24 1.13 > +++ AppenderSkeleton.java 2001/07/13 07:52:43 1.14 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.20 +1 -1 jakarta-log4j/src/java/org/apache/log4j/AsyncAppender.java > > Index: AsyncAppender.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/AsyncAppender.java,v > retrieving revision 1.19 > retrieving revision 1.20 > diff -u -r1.19 -r1.20 > --- AsyncAppender.java 2001/05/21 18:21:23 1.19 > +++ AsyncAppender.java 2001/07/13 07:52:45 1.20 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > // Contibutors: Aaron Greenhouse <[EMAIL PROTECTED]> > > > > > 1.16 +1 -1 jakarta-log4j/src/java/org/apache/log4j/BasicConfigurator.java > > Index: BasicConfigurator.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/BasicConfigurator.java,v > retrieving revision 1.15 > retrieving revision 1.16 > diff -u -r1.15 -r1.16 > --- BasicConfigurator.java 2001/06/20 07:59:42 1.15 > +++ BasicConfigurator.java 2001/07/13 07:52:47 1.16 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > // Contibutors: "Luke Blanshard" <[EMAIL PROTECTED]> > // "Mark DONSZELMANN" <[EMAIL PROTECTED]> > > > > 1.36 +8 -6 jakarta-log4j/src/java/org/apache/log4j/Category.java > > Index: Category.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Category.java,v > retrieving revision 1.35 > retrieving revision 1.36 > diff -u -r1.35 -r1.36 > --- Category.java 2001/06/26 19:40:05 1.35 > +++ Category.java 2001/07/13 07:52:48 1.36 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > // Contibutors: Alex Blewitt <[EMAIL PROTECTED]> > // Markus Oestreicher <[EMAIL PROTECTED]> > @@ -228,11 +228,13 @@ > false. > > @since 0.8.1 */ > - public > - void assert(boolean assertion, String msg) { > - if(!assertion) > - this.error(msg); > - } > + // Assert is a language reserved word in JDK 1.4. We can no longer use it. > + > + //public > + //void assert(boolean assertion, String msg) { > + //if(!assertion) > + // this.error(msg); > + //} > > > /** > > > > 1.3 +1 -1 jakarta-log4j/src/java/org/apache/log4j/CategoryKey.java > > Index: CategoryKey.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/CategoryKey.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- CategoryKey.java 2000/12/14 21:07:17 1.2 > +++ CategoryKey.java 2001/07/13 07:52:50 1.3 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.3 +1 -1 jakarta-log4j/src/java/org/apache/log4j/CompositeRollingAppender.java > > Index: CompositeRollingAppender.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/CompositeRollingAppender.j ava,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- CompositeRollingAppender.java 2001/07/05 16:54:35 1.2 > +++ CompositeRollingAppender.java 2001/07/13 07:52:51 1.3 > @@ -5,7 +5,7 @@ > * > * 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.APL file. > + * distribution in the LICENSE.txt file. > */ > > import org.apache.log4j.RollingCalendar; > > > > 1.9 +1 -1 jakarta-log4j/src/java/org/apache/log4j/ConsoleAppender.java > > Index: ConsoleAppender.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/ConsoleAppender.java,v > retrieving revision 1.8 > retrieving revision 1.9 > diff -u -r1.8 -r1.9 > --- ConsoleAppender.java 2001/04/22 21:18:59 1.8 > +++ ConsoleAppender.java 2001/07/13 07:52:53 1.9 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.13 +1 -1 jakarta-log4j/src/java/org/apache/log4j/DailyRollingFileAppender.java > > Index: DailyRollingFileAppender.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/DailyRollingFileAppender.j ava,v > retrieving revision 1.12 > retrieving revision 1.13 > diff -u -r1.12 -r1.13 > --- DailyRollingFileAppender.java 2001/05/19 00:08:45 1.12 > +++ DailyRollingFileAppender.java 2001/07/13 07:52:54 1.13 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > > > > > > 1.5 +1 -1 jakarta-log4j/src/java/org/apache/log4j/DefaultCategoryFactory.java > > Index: DefaultCategoryFactory.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/DefaultCategoryFactory.jav a,v > retrieving revision 1.4 > retrieving revision 1.5 > diff -u -r1.4 -r1.5 > --- DefaultCategoryFactory.java 2001/02/03 22:39:22 1.4 > +++ DefaultCategoryFactory.java 2001/07/13 07:52:56 1.5 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.22 +1 -1 jakarta-log4j/src/java/org/apache/log4j/FileAppender.java > > Index: FileAppender.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/FileAppender.java,v > retrieving revision 1.21 > retrieving revision 1.22 > diff -u -r1.21 -r1.22 > --- FileAppender.java 2001/05/21 18:21:21 1.21 > +++ FileAppender.java 2001/07/13 07:52:57 1.22 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.21 +1 -1 jakarta-log4j/src/java/org/apache/log4j/HTMLLayout.java > > Index: HTMLLayout.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/HTMLLayout.java,v > retrieving revision 1.20 > retrieving revision 1.21 > diff -u -r1.20 -r1.21 > --- HTMLLayout.java 2001/06/21 05:19:45 1.20 > +++ HTMLLayout.java 2001/07/13 07:52:59 1.21 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.19 +43 -30 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.18 > retrieving revision 1.19 > diff -u -r1.18 -r1.19 > --- Hierarchy.java 2001/06/19 15:44:53 1.18 > +++ Hierarchy.java 2001/07/13 07:53:01 1.19 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > // WARNING This class MUST not have references to the Category or > // WARNING RootCategory classes in its static initiliazation neither > @@ -24,6 +24,7 @@ > > import org.apache.log4j.spi.RootCategory; > import org.apache.log4j.spi.CategoryFactory; > +import org.apache.log4j.spi.HierarchyEventListener; > import org.apache.log4j.or.RendererMap; > import org.apache.log4j.or.ObjectRenderer; > import org.apache.log4j.helpers.LogLog; > @@ -62,8 +63,8 @@ > static final int DISABLE_OVERRIDE = -2; > > private CategoryFactory defaultFactory; > + private Vector listeners; > > - > Hashtable ht; > Category root; > RendererMap rendererMap; > @@ -82,6 +83,7 @@ > public > Hierarchy(Category root) { > ht = new Hashtable(); > + listeners = new Vector(1); > this.root = root; > // Don't disable any priority level by default. > disable = DISABLE_OFF; > @@ -230,30 +232,19 @@ > void enableAll() { > disable = DISABLE_OFF; > } > - > - /** > - Override the shipped code flag if the <code>override</code> > - parameter is not null. > > - <p>If <code>override</code> is null then there is nothing to do. > - Otherwise, set Category.shippedCode to false if override has a > - value other than "false". > - */ > - public > - void overrideAsNeeded(String override) { > - // If override is defined, any value other than false will be > - // interpreted as true. > - if(override != null) { > - LogLog.debug("Handling non-null disable override directive: \""+ > - override +"\"."); > - if(OptionConverter.toBoolean(override, true)) { > - LogLog.debug("Overriding all disable methods."); > - disable = DISABLE_OVERRIDE; > + private > + void fireCategoryCreationEvent(Category category) { > + if(listeners != null) { > + int size = listeners.size(); > + HierarchyEventListener listener; > + for(int i = 0; i < size; i++) { > + listener = (HierarchyEventListener) listeners.elementAt(i); > + listener.categoryCreationEvent(category); > } > - } > + } > } > > - > /** > Return a new category instance named as the first parameter using > the default factory. > @@ -299,6 +290,7 @@ > category.setHierarchy(this); > ht.put(key, category); > updateParents(category); > + fireCategoryCreationEvent(category); > return category; > } else if(o instanceof Category) { > return (Category) o; > @@ -309,6 +301,7 @@ > ht.put(key, category); > updateChildren((ProvisionNode) o, category); > updateParents(category); > + fireCategoryCreationEvent(category); > return category; > } > else { > @@ -342,12 +335,6 @@ > return v.elements(); > } > > - > - public > - boolean isDisabled(int level) { > - return disable >= level; > - } > - > /** > Get the renderer map for this hierarchy. > */ > @@ -367,6 +354,34 @@ > return root; > } > > + public > + boolean isDisabled(int level) { > + return disable >= level; > + } > + > + /** > + Override the shipped code flag if the <code>override</code> > + parameter is not null. > + > + <p>This method is intended to be used by configurators. > + > + <p>If the <code>override</code> paramter is <code>null</code> > + then there is nothing to do. Otherwise, set > + <code>Hiearchy.disable</code> to <code>false</code> if override > + has a value other than <code>false</code>. */ > + public > + void overrideAsNeeded(String override) { > + // If override is defined, any value other than false will be > + // interpreted as true. > + if(override != null) { > + LogLog.debug("Handling non-null disable override directive: \""+ > + override +"\"."); > + if(OptionConverter.toBoolean(override, true)) { > + LogLog.debug("Overriding all disable methods."); > + disable = DISABLE_OVERRIDE; > + } > + } > + } > > /** > Reset all values contained in this hierarchy instance to their > @@ -428,8 +443,6 @@ > disable = DISABLE_OVERRIDE; > } > } > - > - > > /** > Shutting down a hierarchy will <em>safely</em> close and remove > > > > 1.5 +1 -1 jakarta-log4j/src/java/org/apache/log4j/Layout.java > > Index: Layout.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Layout.java,v > retrieving revision 1.4 > retrieving revision 1.5 > diff -u -r1.4 -r1.5 > --- Layout.java 2001/03/20 16:05:34 1.4 > +++ Layout.java 2001/07/13 07:53:03 1.5 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.11 +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.10 > retrieving revision 1.11 > diff -u -r1.10 -r1.11 > --- Makefile 2001/07/04 21:14:28 1.10 > +++ Makefile 2001/07/13 07:53:05 1.11 > @@ -30,7 +30,7 @@ > endif > > > -SUBDIRS :=helpers spi config or xml net nt varia test performance examples > +SUBDIRS :=helpers spi config or xml net nt varia jmx test performance examples > > # include master-rule file > include $(DEPTH)/make/make.inc > > > > 1.8 +1 -1 jakarta-log4j/src/java/org/apache/log4j/Priority.java > > Index: Priority.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/Priority.java,v > retrieving revision 1.7 > retrieving revision 1.8 > diff -u -r1.7 -r1.8 > --- Priority.java 2001/02/15 16:22:15 1.7 > +++ Priority.java 2001/07/13 07:53:07 1.8 > @@ -3,7 +3,7 @@ > * > * 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.APL file. > + * the LICENSE.txt file. > */ > > // Contributors: Kitching Simon <[EMAIL PROTECTED]> > > > > 1.29 +1 -1 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.28 > retrieving revision 1.29 > diff -u -r1.28 -r1.29 > --- PropertyConfigurator.java 2001/06/23 08:37:05 1.28 > +++ PropertyConfigurator.java 2001/07/13 07:53:08 1.29 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > > // Contibutors: "Luke Blanshard" <[EMAIL PROTECTED]> > > > > 1.3 +1 -1 jakarta-log4j/src/java/org/apache/log4j/ProvisionNode.java > > Index: ProvisionNode.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/ProvisionNode.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- ProvisionNode.java 2000/12/14 21:07:19 1.2 > +++ ProvisionNode.java 2001/07/13 07:53:09 1.3 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.13 +1 -1 jakarta-log4j/src/java/org/apache/log4j/RollingFileAppender.java > > Index: RollingFileAppender.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/RollingFileAppender.java,v > retrieving revision 1.12 > retrieving revision 1.13 > diff -u -r1.12 -r1.13 > --- RollingFileAppender.java 2001/04/22 17:16:12 1.12 > +++ RollingFileAppender.java 2001/07/13 07:53:11 1.13 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > > > > > > 1.3 +1 -1 jakarta-log4j/src/java/org/apache/log4j/RollingFileAppenderBeanInfo.java > > Index: RollingFileAppenderBeanInfo.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/RollingFileAppenderBeanInf o.java,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -r1.2 -r1.3 > --- RollingFileAppenderBeanInfo.java 2001/04/22 21:24:18 1.2 > +++ RollingFileAppenderBeanInfo.java 2001/07/13 07:53:14 1.3 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > > > > > > 1.5 +1 -1 jakarta-log4j/src/java/org/apache/log4j/StressCategory.java > > Index: StressCategory.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/StressCategory.java,v > retrieving revision 1.4 > retrieving revision 1.5 > diff -u -r1.4 -r1.5 > --- StressCategory.java 2001/01/07 21:10:56 1.4 > +++ StressCategory.java 2001/07/13 07:53:15 1.5 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.15 +1 -1 jakarta-log4j/src/java/org/apache/log4j/WriterAppender.java > > Index: WriterAppender.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/WriterAppender.java,v > retrieving revision 1.14 > retrieving revision 1.15 > diff -u -r1.14 -r1.15 > --- WriterAppender.java 2001/06/13 00:20:35 1.14 > +++ WriterAppender.java 2001/07/13 07:53:17 1.15 > @@ -3,7 +3,7 @@ > * > * 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.APL file. */ > + * distribution in the LICENSE.txt file. */ > > package org.apache.log4j; > > > > > 1.20 +1 -1 jakarta-log4j/src/java/org/apache/log4j/helpers/OptionConverter.java > > Index: OptionConverter.java > =================================================================== > RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/OptionConverter.ja va,v > retrieving revision 1.19 > retrieving revision 1.20 > diff -u -r1.19 -r1.20 > --- OptionConverter.java 2001/07/05 19:09:43 1.19 > +++ OptionConverter.java 2001/07/13 07:53:53 1.20 > @@ -428,7 +428,7 @@ > > if (clazz.indexOf('.') == -1 || clazz.indexOf('/') != -1 || clazz.indexOf('\\') != -1) { > LogLog.warn("Suspicious reference in URL ["+url+ > - "] will ignore refence part assuming BEA Weblogic environment."); > + "] will ignore refence part assuming custom URL."); > clazz = null; > } > > > > > >--------------------------------------------------------------------- >To unsubscribe, e-mail: [EMAIL PROTECTED] >For additional commands, e-mail: [EMAIL PROTECTED] -- Ceki Gülcü - http://qos.ch --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]