1
0

Comment out some remains from the log4j 1.3 build. Add notes to put them back again if/when the build uses log4j 1.3.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@373312 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dennis Lundberg
2006-01-29 14:51:18 +00:00
parent 3d053f5969
commit e8b532f31e
2 changed files with 12 additions and 3 deletions

View File

@@ -16,7 +16,8 @@
log4j12.jar=lib/log4j-1.2.12.jar log4j12.jar=lib/log4j-1.2.12.jar
# Apache Log4j 1.3.x series # Apache Log4j 1.3.x series
log4j13.jar=lib/log4j-1.3.0.jar # Note: Log4j 1.3 support not available in the 1.1 release
#log4j13.jar=lib/log4j-1.3.0.jar
# logkit.jar - Avalon LogKit classes (see http://jakarta.apache.org/avalon) # logkit.jar - Avalon LogKit classes (see http://jakarta.apache.org/avalon)
logkit.jar=lib/logkit-1.0.1.jar logkit.jar=lib/logkit-1.0.1.jar

View File

@@ -241,7 +241,8 @@
<echo> <echo>
Log4j12: ${log4j12.jar} Log4j12: ${log4j12.jar}
Log4j13: ${log4j13.jar} <!-- Note: log4j13 support is not available in the 1.1 release. -->
<!--Log4j13: ${log4j13.jar}-->
LogKit: ${logkit.jar} LogKit: ${logkit.jar}
Avalon-Framework: ${avalon-framework.jar} Avalon-Framework: ${avalon-framework.jar}
</echo> </echo>
@@ -290,10 +291,16 @@
</target> </target>
<target name="log4j13-warning" unless='log4j13.present' depends='init,discovery'> <target name="log4j13-warning" unless='log4j13.present' depends='init,discovery'>
<!--
- Note: log4j13 support is not available in the 1.1 release.
- If we add it in a future release, the code below should be uncommented.
-->
<!--
<echo> <echo>
*** WARNING *** *** WARNING ***
Log4j 1.3 not found: Cannot Build Log4J13Logger Log4j 1.3 not found: Cannot Build Log4J13Logger
</echo> </echo>
-->
</target> </target>
<target name="logkit-warning" unless='logkit.present' depends='init,discovery'> <target name="logkit-warning" unless='logkit.present' depends='init,discovery'>
@@ -333,7 +340,8 @@
<target name="show-lib-presence"> <target name="show-lib-presence">
<echo message="jdk.1.4.present=${jdk.1.4.present}"/> <echo message="jdk.1.4.present=${jdk.1.4.present}"/>
<echo message="log4j12.present=${log4j12.present}"/> <echo message="log4j12.present=${log4j12.present}"/>
<echo message="log4j13.present=${log4j13.present}"/> <!-- Note: log4j13 support is not available in the 1.1 release. -->
<!--<echo message="log4j13.present=${log4j13.present}"/>-->
<echo message="logkit.present=${logkit.present}"/> <echo message="logkit.present=${logkit.present}"/>
<echo message="avalon-framework.present=${avalon-framework.present}"/> <echo message="avalon-framework.present=${avalon-framework.present}"/>
</target> </target>