carnold 2005/07/27 09:14:52
Modified: docs Tag: v1_2-branch HISTORY.txt
src/java/org/apache/log4j/helpers Tag: v1_2-branch
Loader.java
Log:
Bug 35893: Add Loader.getResource(String, Class) for log4j 1.1 compatibility
Revision Changes Path
No revision
No revision
1.27.2.8 +2 -0 logging-log4j/docs/HISTORY.txt
Index: HISTORY.txt
===================================================================
RCS file: /home/cvs/logging-log4j/docs/HISTORY.txt,v
retrieving revision 1.27.2.7
retrieving revision 1.27.2.8
diff -u -r1.27.2.7 -r1.27.2.8
--- HISTORY.txt 27 Jul 2005 15:57:21 -0000 1.27.2.7
+++ HISTORY.txt 27 Jul 2005 16:14:51 -0000 1.27.2.8
@@ -40,6 +40,8 @@
- Added jdiff target to build.xml (bug 35516). [*]
- Fixed bug 35831 whereby log4j would not build with a JDK 1.5 javac. [*]
+
+ - Fixed bug 35893 by adding log4j 1.1 compatibility method to
o.a.l.helpers.Loader. [*]
June 18th, 2005
No revision
No revision
1.17.2.6 +12 -3
logging-log4j/src/java/org/apache/log4j/helpers/Loader.java
Index: Loader.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/helpers/Loader.java,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -u -r1.17.2.5 -r1.17.2.6
--- Loader.java 24 May 2005 05:06:19 -0000 1.17.2.5
+++ Loader.java 27 Jul 2005 16:14:52 -0000 1.17.2.6
@@ -21,8 +21,6 @@
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
-//import java.awt.Image;
-//import java.awt.Toolkit;
/**
Load resources (or images) from various sources.
@@ -54,10 +52,21 @@
ignoreTCL = OptionConverter.toBoolean(ignoreTCLProp, true);
}
}
+
+ /**
+ * Get a resource by delegating to getResource(String).
+ * @param resource resource name
+ * @param clazz class, ignored.
+ * @return URL to resource or null.
+ * @deprecated as of 1.2.
+ */
+ public static URL getResource(String resource, Class clazz) {
+ return getResource(resource);
+ }
/**
This method will search for <code>resource</code> in different
- places. The rearch order is as follows:
+ places. The search order is as follows:
<ol>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
