cvs commit: jakarta-log4j/src/java/org/apache/log4j/xml XMLLayout.java log4j.dtd

ceki        02/04/26 09:11:42

  Modified:    .        build.xml
               src/java/org/apache/log4j/xml XMLLayout.java log4j.dtd
  Log:
  Added version info in <log4j:eventSet> plus documentation
  
  Revision  Changes    Path
  1.32      +3 -6      jakarta-log4j/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/build.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- build.xml	25 Apr 2002 20:25:46 -0000	1.31
  +++ build.xml	26 Apr 2002 16:11:41 -0000	1.32
  @@ -169,13 +169,11 @@
                       **/StressCategory.java,
                       **/doc-files/*,
                       ${stem}/xml/**,
  -                    ${stem}/gui/**,
                       ${stem}/test/serialization/**,
   		    ${stem}/net/SMTPAppender.java,
                  	    ${stem}/net/JMS*.java,
                  	    ${stem}/jmx/*.java,
  -               	    ${stem}/or/jms/MessageRenderer.java,
  -		    **/pending/**"
  +               	    ${stem}/or/jms/*.java"
   	    debug="on">
         <classpath refid="compile.classpath"/>
       </javac>
  @@ -310,9 +308,8 @@
   		${stem}/or/*.class,
   		${stem}/or/sax/*.class,
                   ${stem}/or/jms/*.class,
  -		${stem}/config/*.class,
  -		${stem}/gui/TextPaneAppender.class"
  -      excludes="**/StressCategory*, **/UnitTest**"
  +		${stem}/config/*.class"
  +      excludes="**/UnitTest**"
         manifest="${jar.dest}/manifest.mf"
       />
     </target>
  
  
  
  1.18      +8 -2      jakarta-log4j/src/java/org/apache/log4j/xml/XMLLayout.java
  
  Index: XMLLayout.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/XMLLayout.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XMLLayout.java	25 Apr 2002 21:18:15 -0000	1.17
  +++ XMLLayout.java	26 Apr 2002 16:11:42 -0000	1.18
  @@ -32,13 +32,19 @@
   
      &lt;!DOCTYPE log4j:eventSet SYSTEM "log4j.dtd" [&lt;!ENTITY data SYSTEM "abc"&gt;]&gt;
   
  -   &lt;log4j:eventSet xmlns:log4j="http://jakarta.apache.org/log4j/"&gt;
  +   &lt;log4j:eventSet version="1.2" xmlns:log4j="http://jakarta.apache.org/log4j/"&gt;
          &nbsp;&nbsp;&data;
      &lt;/log4j:eventSet&gt;
      </pre>
   
      <p>This approach enforces the independence of the XMLLayout and the
  -   appender where it is embedded.
  +   appender where it is embedded. 
  +
  +   <p>The <code>version</code> attribute helps components to correctly
  +   intrepret output generated by XMLLayout. The value of this
  +   attribute should be "1.1" for output generated by log4j versions
  +   prior to log4j 1.2 (final release) and "1.2" for relase 1.2 and
  +   later.
   
      @author Ceki  G&uuml;lc&uuml;
      @since 0.9.0 */
  
  
  
  1.17      +1 -0      jakarta-log4j/src/java/org/apache/log4j/xml/log4j.dtd
  
  Index: log4j.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/log4j.dtd,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- log4j.dtd	24 Apr 2002 21:25:32 -0000	1.16
  +++ log4j.dtd	26 Apr 2002 16:11:42 -0000	1.17
  @@ -131,6 +131,7 @@
   <!-- ==================================================================== -->
   <!ELEMENT log4j:eventSet (log4j:event*)>
   <!ATTLIST log4j:eventSet
  +  version                (1.1|1.2) "1.2" 
     includesLocationInfo   (true|false) "true"
   >