commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-commons/logging build.xml
Date Sat, 01 Feb 2003 04:29:06 GMT
craigmcc    2003/01/31 20:29:06

  Modified:    logging  build.xml
  Log:
  Update the build process to skip all the Log4J implementation classes
  if Log4J is not present.
  
  PR:  Bugzilla #16358
  Submitted by:  Jeremias Maerki <jeremias at apache.org>
  
  Revision  Changes    Path
  1.23      +8 -8      jakarta-commons/logging/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/logging/build.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- build.xml	28 Oct 2002 00:41:29 -0000	1.22
  +++ build.xml	1 Feb 2003 04:29:05 -0000	1.23
  @@ -117,12 +117,12 @@
   
     <target name="prepare" depends="init"
      description="Prepare build directory">
  -   
  +
       <echo>
       ${log4j.jar}
       ${logkit.jar}
       </echo>
  -   
  +
       <mkdir dir="${build.home}"/>
       <mkdir dir="${build.home}/classes"/>
       <mkdir dir="${build.home}/conf"/>
  @@ -148,11 +148,11 @@
     <target name="compile-only" depends="init" >
       <available property="jdk.1.4.present"
                  classname="java.util.logging.Logger"/>
  -    <available classname="org.apache.log4j.Category" 
  -               classpathref="compile.classpath" 
  +    <available classname="org.apache.log4j.Category"
  +               classpathref="compile.classpath"
                  property="log4j.present"/>
       <available property="logkit.present"
  -               classpathref="compile.classpath" 
  +               classpathref="compile.classpath"
                  classname="org.apache.log.Logger"/>
   
       <echo  message="jdk.1.4.present=${jdk.1.4.present}"/>
  @@ -168,9 +168,9 @@
         <classpath refid="compile.classpath"/>
         <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
                  unless="jdk.1.4.present"/>
  -      <exclude name="org/apache/commons/logging/impl/Log4JCategoryLog.java"
  +      <exclude name="org/apache/commons/logging/impl/Log4J*.java"
                  unless="log4j.present"/>
  -      <exclude name="org/apache/commons/logging/impl/Log4jFactory.java"
  +      <exclude name="org/apache/commons/logging/impl/Log4j*.java"
                  unless="log4j.present"/>
         <exclude name="org/apache/commons/logging/impl/LogKitLogger.java"
                  unless="logkit.present"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message