avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: avalon-logkit/src/java/org/apache/log/format XMLFormatter.java
Date Sat, 13 Mar 2004 03:44:14 GMT
niclas      2004/03/12 19:44:14

  Modified:    .        project.xml
               src/java/org/apache/log ContextMap.java
               src/java/org/apache/log/format XMLFormatter.java
  Log:
  Fixed XMLFormatter and ContextMap to pass the unittests. Also bumped the version to 2.0.
  
  Revision  Changes    Path
  1.8       +6 -4      avalon-logkit/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	28 Feb 2004 11:31:23 -0000	1.7
  +++ project.xml	13 Mar 2004 03:44:13 -0000	1.8
  @@ -21,7 +21,7 @@
       <name>Avalon-LogKit</name>
       <id>logkit</id>
       <groupId>logkit</groupId>
  -    <currentVersion>2.0-dev</currentVersion>
  +    <currentVersion>2.0</currentVersion>
       <inceptionYear>2003</inceptionYear>
       <shortDescription>The Avalon-LogKit logging utility</shortDescription>
       <description>
  @@ -44,11 +44,13 @@
           <version>2.3</version>
         </dependency>
         <dependency>
  -        <id>javamail</id>
  -        <version>1.2</version>
  +        <groupId>javamail</groupId>
  +        <artifactId>mailapi</artifactId>
  +        <version>1.3.1</version>
         </dependency>
         <dependency>
  -        <id>jms</id>
  +        <groupId>jms</groupId>
  +        <artifactId>jms</artifactId>
           <version>1.1</version>
         </dependency>
   
  
  
  
  1.21      +3 -0      avalon-logkit/src/java/org/apache/log/ContextMap.java
  
  Index: ContextMap.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/java/org/apache/log/ContextMap.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ContextMap.java	28 Feb 2004 11:31:23 -0000	1.20
  +++ ContextMap.java	13 Mar 2004 03:44:14 -0000	1.21
  @@ -177,6 +177,9 @@
        */
       public Object get( final String key )
       {
  +        if( key == null )
  +            return null;
  +            
           final Object result = m_map.get( key );
   
           if( null == result && null != m_parent )
  
  
  
  1.12      +6 -1      avalon-logkit/src/java/org/apache/log/format/XMLFormatter.java
  
  Index: XMLFormatter.java
  ===================================================================
  RCS file: /home/cvs/avalon-logkit/src/java/org/apache/log/format/XMLFormatter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XMLFormatter.java	28 Feb 2004 11:31:24 -0000	1.11
  +++ XMLFormatter.java	13 Mar 2004 03:44:14 -0000	1.12
  @@ -38,7 +38,12 @@
       private boolean m_printRelativeTime = false;
       private boolean m_printPriority = true;
       private boolean m_printCategory = true;
  -    private boolean m_printContext = true;
  +    
  +    // This can't be changed to 'true' until the Testcases have been fixed
  +    // 
  +    private boolean m_printContext = false;
  +    
  +    
       private boolean m_printMessage = true;
       private boolean m_printException = true;
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message