Author: carnold
Date: Thu Dec 1 21:20:15 2005
New Revision: 351600
URL: http://svn.apache.org/viewcvs?rev=351600&view=rev
Log:
Bug 29719: log4jMini does not build
Added:
logging/sandbox/log4j/log4jMini/branches/
logging/sandbox/log4j/log4jMini/tags/
Modified:
logging/sandbox/log4j/log4jMini/trunk/build.xml
logging/sandbox/log4j/log4jMini/trunk/src/java/org/apache/log4j/Category.java
logging/sandbox/log4j/log4jMini/trunk/src/java/org/apache/log4j/spi/RootCategory.java
Modified: logging/sandbox/log4j/log4jMini/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/logging/sandbox/log4j/log4jMini/trunk/build.xml?rev=351600&r1=351599&r2=351600&view=diff
==============================================================================
--- logging/sandbox/log4j/log4jMini/trunk/build.xml (original)
+++ logging/sandbox/log4j/log4jMini/trunk/build.xml Thu Dec 1 21:20:15 2005
@@ -5,7 +5,7 @@
<!-- The base directory relative to which most targets are built -->
<property name="base" value="."/>
-
+
<!-- The directory where source files are stored. -->
<property name="java.source.dir" value="src/java/"/>
@@ -20,7 +20,7 @@
<property name="jar.dest" value="${basedir}"/>
<!-- The jar file that the jar task will generate -->
- <property name="log4jMini.jar" value="log4jMini-${version}.jar"/>
+ <property name="log4j.jar" value="log4jMini-${version}.jar"/>
<!-- Destination for documentation files generated or not -->
<property name="docs" value="docs"/>
@@ -43,7 +43,7 @@
<!-- Directory for temporary files. -->
<property name="dist.tmp" value="dist/tmp"/>
-
+
<!-- Construct compile classpath -->
<path id="compile.classpath">
<pathelement location="${build.home}/classes"/>
@@ -51,7 +51,7 @@
<target name="junitCheck">
<available classname="junit.framework.TestCase" property="junit-present"/>
- </target>
+ </target>
<target name="junit" depends="junitCheck" if="junit-present">
<echo message="JUnit is present."/>
</target>
@@ -94,12 +94,12 @@
</delete>
<jar jarfile="${jar.dest}/${log4j.jar}" basedir="${javac.dest}"
- includes="${stem}/*.class,
- ${stem}/helpers/*.class,
- ${stem}/spi/*.class,
- ${stem}/or/*.class,
- ${stem}/config/PropertySetter.class
- ${stem}/config/PropertySetterException.class"
+ includes="${stem}/*.class,
+ ${stem}/helpers/*.class,
+ ${stem}/spi/*.class,
+ ${stem}/or/*.class,
+ ${stem}/config/PropertySetter.class
+ ${stem}/config/PropertySetterException.class"
excludes="**/UnitTest**,
**/examples/**,
**/selectors/*.class,
@@ -123,25 +123,25 @@
<mkdir dir="${javadoc.dest}" />
- <javadoc sourcepath="${java.source.dir}"
- destdir="${javadoc.dest}"
- packagenames="org.apache.log4j,
+ <javadoc sourcepath="${java.source.dir}"
+ destdir="${javadoc.dest}"
+ packagenames="org.apache.log4j,
org.apache.log4j.helpers,
- org.apache.log4j.spi"
- version="true"
- protected="true"
- author="true"
- use="true"
- overview="${docs}/overview.html"
- doctitle="log4j MicroEdition version ${version}<br>API
Specification"
- windowtitle="Log4jME Version ${version}"
+ org.apache.log4j.spi"
+ version="true"
+ protected="true"
+ author="true"
+ use="true"
+ overview="${docs}/overview.html"
+ doctitle="log4j MicroEdition version ${version}<br>API
Specification"
+ windowtitle="Log4jME Version ${version}"
header="<b>Log4jME ${version}</b>"
- bottom="Please <a
href=http://lists.sourceforge.net/mailman/listinfo/log4j-announce><b>notify
me</b></a> about new log4j releases. <hr>">
-
- <link offline="true"
+ bottom="Please <a
href=http://lists.sourceforge.net/mailman/listinfo/log4j-announce><b>notify
me</b></a> about new log4j releases. <hr>">
+
+ <link offline="true"
href="http://java.sun.com/products/jdk/1.2/docs/api";
packageListLoc="${packaging.dir}"/>
- </javadoc>
+ </javadoc>
</target>
<!-- ================================================================= -->
@@ -150,24 +150,24 @@
<target name="dist" depends="init, clean, jar">
<delete verbose="true">
- <fileset dir=".">
+ <fileset dir=".">
<patternset>
- <include name="**/*.bak"/>
- <include name="dist/velocity.log"/>
- <include name="${BSTEM}/**/temp*"/>
- <include name="${BSTEM}/performance/test"/>
- <include name="${BSTEM}/test/current.*"/>
- <include name="${BSTEM}/test/current.*"/>
- <include name="${BSTEM}/examples/test"/>
- <include name="${BSTEM}/test/logging.*"/>
- <include name="${BSTEM}/test/log4j.properties"/>
- <include name="{$BSTEM}/test/socket.lcf"/>
- <include name="${BSTEM}/test/file"/>
- <include name="${BSTEM}/test/output.*"/>
- <include name="${jar.dest}/manifest.mf"/>
- <include name="${javac.dest}/*.class"/>
+ <include name="**/*.bak"/>
+ <include name="dist/velocity.log"/>
+ <include name="${BSTEM}/**/temp*"/>
+ <include name="${BSTEM}/performance/test"/>
+ <include name="${BSTEM}/test/current.*"/>
+ <include name="${BSTEM}/test/current.*"/>
+ <include name="${BSTEM}/examples/test"/>
+ <include name="${BSTEM}/test/logging.*"/>
+ <include name="${BSTEM}/test/log4j.properties"/>
+ <include name="{$BSTEM}/test/socket.lcf"/>
+ <include name="${BSTEM}/test/file"/>
+ <include name="${BSTEM}/test/output.*"/>
+ <include name="${jar.dest}/manifest.mf"/>
+ <include name="${javac.dest}/*.class"/>
</patternset>
- </fileset>
+ </fileset>
</delete>
<mkdir dir="${dist.images}" />
@@ -177,42 +177,42 @@
<copy todir="${dist.tmp}/log4jME-${version}">
<fileset dir="${base}"
includes="make/**,
- src/**,
- docs/**,
- Makefile,
- build/*, build.bat, build.sh,
- build/lib/*.jar,
- manifest.mf,
- INSTALL,
- LICENSE.txt,
- dist/lib/*.jar,
- org/**,
- dist/classes/**"
- excludes="make/make.loc,
- **/*.bak, **/goEnv.bat,
- **/.#*"/>
+ src/**,
+ docs/**,
+ Makefile,
+ build/*, build.bat, build.sh,
+ build/lib/*.jar,
+ manifest.mf,
+ INSTALL,
+ LICENSE.txt,
+ dist/lib/*.jar,
+ org/**,
+ dist/classes/**"
+ excludes="make/make.loc,
+ **/*.bak, **/goEnv.bat,
+ **/.#*"/>
</copy>
-
- <fixcrlf srcdir="${dist.tmp}/log4jME-${version}"
+
+ <fixcrlf srcdir="${dist.tmp}/log4jME-${version}"
includes="build.sh" cr="remove"/>
- <fixcrlf srcdir="${dist.tmp}/log4jME-${version}"
+ <fixcrlf srcdir="${dist.tmp}/log4jME-${version}"
includes="build.bat" cr="add"/>
- <chmod dir="${dist.tmp}/log4jME-${version}"
+ <chmod dir="${dist.tmp}/log4jME-${version}"
includes="build.sh" perm="+x"/>
- <tar tarfile="${dist.images}/log4jME-${version}.tar"
+ <tar tarfile="${dist.images}/log4jME-${version}.tar"
basedir="${dist.tmp}"
includes="log4jME-${version}/**" />
- <gzip src="${dist.images}/log4jME-${version}.tar"
+ <gzip src="${dist.images}/log4jME-${version}.tar"
zipfile="${dist.images}/log4jME-${version}.tar.gz" />
- <zip zipfile="${dist.images}/log4jME-${version}.zip"
+ <zip zipfile="${dist.images}/log4jME-${version}.zip"
basedir="${dist.tmp}"
includes="log4jME-${version}/**" />
-
+
<delete dir="${dist.tmp}" />
</target>
Modified:
logging/sandbox/log4j/log4jMini/trunk/src/java/org/apache/log4j/Category.java
URL:
http://svn.apache.org/viewcvs/logging/sandbox/log4j/log4jMini/trunk/src/java/org/apache/log4j/Category.java?rev=351600&r1=351599&r2=351600&view=diff
==============================================================================
---
logging/sandbox/log4j/log4jMini/trunk/src/java/org/apache/log4j/Category.java
(original)
+++
logging/sandbox/log4j/log4jMini/trunk/src/java/org/apache/log4j/Category.java
Thu Dec 1 21:20:15 2005
@@ -21,6 +21,7 @@
package org.apache.log4j;
import org.apache.log4j.Priority;
+import org.apache.log4j.spi.RootCategory;
import org.apache.log4j.spi.RootLogger;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.helpers.LogLog;
Modified:
logging/sandbox/log4j/log4jMini/trunk/src/java/org/apache/log4j/spi/RootCategory.java
URL:
http://svn.apache.org/viewcvs/logging/sandbox/log4j/log4jMini/trunk/src/java/org/apache/log4j/spi/RootCategory.java?rev=351600&r1=351599&r2=351600&view=diff
==============================================================================
---
logging/sandbox/log4j/log4jMini/trunk/src/java/org/apache/log4j/spi/RootCategory.java
(original)
+++
logging/sandbox/log4j/log4jMini/trunk/src/java/org/apache/log4j/spi/RootCategory.java
Thu Dec 1 21:20:15 2005
@@ -2,6 +2,7 @@
package org.apache.log4j.spi;
import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.log4j.Priority;
import org.apache.log4j.helpers.LogLog;
@@ -18,7 +19,7 @@
@author Ceki Gülcü
*/
-final public class RootCategory extends Category {
+final public class RootCategory extends Logger {
/**
The root category names itself as "root". However, the root
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
