carnold 2005/05/11 21:53:13
Modified: . build.xml
tests build.xml
Removed: src/java/org/slf4j/impl Log4jLoggerFA.java
MessageFormatter.java NOPLogger.java
NOPLoggerFA.java SimpleLogger.java
SimpleLoggerFA.java
Log:
Bug 34883: Conditional SLF4J builds based on slf4j binary releases
Revision Changes Path
1.157 +15 -9 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- build.xml 12 May 2005 03:55:45 -0000 1.156
+++ build.xml 12 May 2005 04:53:13 -0000 1.157
@@ -242,7 +242,13 @@
Please make sure that "slf4j" is false or "slf4j-api.jar" property
in build.properties
file is set correctly.
- </fail>
+ </fail>
+
+ <condition property="slf4j.source.dir" value="src/slf4j">
+ <isset property="implement-slf4j"/>
+ </condition>
+ <property name="slf4j.source.dir" value="src/no-slf4j"/>
+
</target>
@@ -294,10 +300,6 @@
</target>
<target name="build.core" depends="init, jndiCheck, jaxpCheck, slf4jCheck">
- <condition property="slf4j.src.dir" value="src/slf4j">
- <isset property="implement-slf4j"/>
- </condition>
- <property name="slf4j.src.dir" value="src/slf4j"/>
<javac destdir="${javac.dest}"
includes="${stem}/**/*.java,
@@ -319,7 +321,7 @@
debug="${debug}"
>
<src path="${java.source.dir}"/>
- <src path="${slf4j.src.dir}"/>
+ <src path="${slf4j.source.dir}"/>
<classpath refid="compile.classpath"/>
</javac>
</target>
@@ -627,11 +629,11 @@
<!-- ================================================================= -->
<!-- This target builds the javadoc files. -->
<!-- ================================================================= -->
- <target name="javadoc" depends="init">
+ <target name="javadoc" depends="init, slf4jCheck">
<mkdir dir="${javadoc.dest}" />
- <javadoc sourcepath="${java.source.dir}"
+ <javadoc
destdir="${javadoc.dest}"
packagenames="org.apache.log4j,
org.apache.log4j.db,
@@ -667,7 +669,11 @@
doctitle="log4j version ${version}<br>API Specification"
windowtitle="Log4j Version ${version}"
header="<b>Log4j ${version}</b>"
- bottom="Copyright 2000-2005 Apache Software Foundation.">
+ bottom="Copyright 2000-2005 Apache Software Foundation.">
+ <sourcepath>
+ <pathelement path="${java.source.dir}"/>
+ <pathelement path="${slf4j.source.dir}"/>
+ </sourcepath>
<link href="http://java.sun.com/products/j2se/1.3/docs/api/"/>
<link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
1.106 +2 -1 logging-log4j/tests/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/build.xml,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- build.xml 12 May 2005 03:55:46 -0000 1.105
+++ build.xml 12 May 2005 04:53:13 -0000 1.106
@@ -131,7 +131,8 @@
excludes="${stem}/chainsaw/receivers/*.java,
${stem}/selector/PassByJNDI.java,
${stem}/ugli/**.java,
- ${stem}/db/**.java"
+ ${stem}/db/**.java,
+ org/apache/ugli/**/*.java"
deprecation="${deprecation}"
debug="on">
<classpath refid="tests.classpath"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
