ceki        2004/04/28 11:01:03

  Modified:    docs     HISTORY
               src/java/org/apache/log4j/xml log4j.dtd
               src/java/org/apache/log4j/spi LoggingEvent.java
  Log:
  - Updated the LoggingEvent equals method to reflect the addition of

    the sequenceNumber field.

  - Updated HISTORY.

  - Updated log4j.dtd.
  
  Revision  Changes    Path
  1.108     +3 -0      logging-log4j/docs/HISTORY
  
  Index: HISTORY
  ===================================================================
  RCS file: /home/cvs/logging-log4j/docs/HISTORY,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- HISTORY   22 Apr 2004 20:10:44 -0000      1.107
  +++ HISTORY   28 Apr 2004 18:01:03 -0000      1.108
  @@ -11,6 +11,9 @@
   
    April, 2004 
   
  + - A sequenceNumber field has been added to LoggingEvent. This fields is useful 
when 
  +   checking for the equality of two logging events or when ordering them. [*]
  +
    - Log4j now has its own Scheduler. It allows jobs to be executed at a certain date
      or even periodically. It only requires just one extra thread. [*]
      
  
  
  
  1.23      +2 -1      logging-log4j/src/java/org/apache/log4j/xml/log4j.dtd
  
  Index: log4j.dtd
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/xml/log4j.dtd,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- log4j.dtd 24 Jun 2003 08:07:57 -0000      1.22
  +++ log4j.dtd 28 Apr 2004 18:01:03 -0000      1.23
  @@ -149,12 +149,13 @@
   <!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:MDC?, 
                          log4j:throwable?, log4j:locationInfo?, log4j:properties?) >
   
  -<!-- The timestamp format is application dependent. -->
  +<!-- The timestamp format is the elapsed millis since 1970. -->
   <!ATTLIST log4j:event
       logger     CDATA #REQUIRED
       level      CDATA #REQUIRED
       thread     CDATA #REQUIRED
       timestamp  CDATA #REQUIRED
  +    sequenceNumber CDATA #REQUIRED
   >
   
   <!ELEMENT log4j:message (#PCDATA)>
  
  
  
  1.51      +7 -1      logging-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java
  
  Index: LoggingEvent.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- LoggingEvent.java 28 Apr 2004 17:54:03 -0000      1.50
  +++ LoggingEvent.java 28 Apr 2004 18:01:03 -0000      1.51
  @@ -290,11 +290,17 @@
   
       LoggingEvent rEvent = (LoggingEvent)rObject;
   
  -    // timeStamp cannot be null
       if ( timeStamp != rEvent.timeStamp ) {
         return false;
       }
  +    
  +    if ( sequenceNumber != rEvent.sequenceNumber ) {
  +      return false;
  +    }
   
  +    // TODO: the rest of the tests could be skipped and we could just return true.
  +    
  +    
       // level cannot be null
       if ( level != rEvent.level ) {
         return false;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to