Author: carnold
Date: Wed Dec 21 18:45:18 2005
New Revision: 358444

URL: http://svn.apache.org/viewcvs?rev=358444&view=rev
Log:
Bug 37864: Add auxilary jars to compatibility report, hide LF5

Modified:
    logging/log4j/trunk/build.xml
    logging/log4j/trunk/src/xdocs/stylesheets/compatibility.xslt

Modified: logging/log4j/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/logging/log4j/trunk/build.xml?rev=358444&r1=358443&r2=358444&view=diff
==============================================================================
--- logging/log4j/trunk/build.xml (original)
+++ logging/log4j/trunk/build.xml Wed Dec 21 18:45:18 2005
@@ -737,9 +737,31 @@
                   <fail unless="reference.jar">-Dreference.jar=PATH must be 
specified.</fail>
               <taskdef resource="clirrtask.properties" 
                   classpath="${clirr-core.jar};${bcel.jar}"/>
-               <clirr failOnBinError="no" failOnSrcError="no">
-                       <origfiles file="${reference.jar}"/>
-                       <newfiles file="${jar.dest}/${log4j.jar}"/>
+              <delete dir="build/clirr"/>
+              <mkdir dir="build/clirr/orig"/>
+              <mkdir dir="build/clirr/new"/>
+              <copy todir="build/clirr/orig">         
+                   <fileset file="${jms.jar}"/>
+                   <fileset file="${jmx.jar}"/>
+              </copy>
+              <copy todir="build/clirr/new">
+                   <fileset dir="build/clirr/orig"/>
+                   <fileset dir="${jar.dest}">
+                           <include name="${log4j.jar}"/>
+                           <include name="${log4j-db.jar}"/>
+                           <include name="${log4j-jms.jar}"/>
+                           <include name="${log4j-optional.jar}"/>
+                           <include name="${log4j-oro.jar}"/>
+                           <include name="${log4j-smtp.jar}"/>
+                           <include name="${log4j-xml.jar}"/>
+                       </fileset>                      
+              </copy>
+              <copy todir="build/clirr/orig">
+                       <fileset file="${reference.jar}"/>
+              </copy>
+                  <clirr failOnBinError="no" failOnSrcError="no">
+                       <origfiles dir="build/clirr/orig" includes="*.jar"/>
+                       <newfiles dir="build/clirr/new" includes="*.jar"/>
                            <formatter type="xml" 
outfile="${docs.dest}/compatibility.xml"/>
                  </clirr>
                  <xslt in="${docs.dest}/compatibility.xml"

Modified: logging/log4j/trunk/src/xdocs/stylesheets/compatibility.xslt
URL: 
http://svn.apache.org/viewcvs/logging/log4j/trunk/src/xdocs/stylesheets/compatibility.xslt?rev=358444&r1=358443&r2=358444&view=diff
==============================================================================
--- logging/log4j/trunk/src/xdocs/stylesheets/compatibility.xslt (original)
+++ logging/log4j/trunk/src/xdocs/stylesheets/compatibility.xslt Wed Dec 21 
18:45:18 2005
@@ -31,7 +31,7 @@
   
   <xsl:template match="diffreport">
      <table border="1" summary="Source and binary compatibility errors">
-       <xsl:apply-templates select="[EMAIL PROTECTED]'ERROR' or 
@binseverity='ERROR']"/>
+       <xsl:apply-templates select="difference[(@srcseverity='ERROR' or 
@binseverity='ERROR') and not(starts-with(@class, 'org.apache.log4j.lf5'))]"/>
         </table>
   </xsl:template>
   



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

Reply via email to