You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-cvs@jakarta.apache.org by ce...@apache.org on 2001/08/06 22:21:02 UTC
cvs commit: jakarta-log4j/src/java/org/apache/log4j/xml DOMConfigurator.java
ceki 01/08/06 13:21:02
Modified: src/java/org/apache/log4j BasicConfigurator.java
src/java/org/apache/log4j/helpers Loader.java Makefile
OptionConverter.java
src/java/org/apache/log4j/spi LocationInfo.java
LoggingEvent.java
src/java/org/apache/log4j/xml DOMConfigurator.java
Removed: src/java/org/apache/log4j/helpers VersionHelper.java
VersionHelper11.java VersionHelper20.java
Log:
Removed VersionHelper classes. Their functionality has been moved to the
Loader class.
Revision Changes Path
1.17 +2 -2 jakarta-log4j/src/java/org/apache/log4j/BasicConfigurator.java
Index: BasicConfigurator.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/BasicConfigurator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BasicConfigurator.java 2001/07/13 07:52:47 1.16
+++ BasicConfigurator.java 2001/08/06 20:21:01 1.17
@@ -12,7 +12,7 @@
package org.apache.log4j;
import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.helpers.VersionHelper;
+import org.apache.log4j.helpers.Loader;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.or.ObjectRenderer;
import org.apache.log4j.or.RendererMap;
@@ -110,7 +110,7 @@
return;
} else {
try {
- Class renderedClass = VersionHelper.getInstance().loadClass(renderedClassName);
+ Class renderedClass = Loader.loadClass(renderedClassName);
hierarchy.rendererMap.put(renderedClass, renderer);
} catch(ClassNotFoundException e) {
LogLog.error("Could not find class ["+renderedClassName+"].", e);
1.12 +36 -1 jakarta-log4j/src/java/org/apache/log4j/helpers/Loader.java
Index: Loader.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/Loader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Loader.java 2001/07/05 19:09:40 1.11
+++ Loader.java 2001/08/06 20:21:01 1.12
@@ -14,13 +14,28 @@
/**
Load resources (or images) from various sources.
- @author Sven Reimers
@author Ceki Gülcü
*/
public class Loader {
static String TSTR = "Caught Exception while in Loader.getResource. This may be innocuous.";
+
+ // We conservatively assume that we are running under Java 1.x
+ static private boolean java1 = true;
+
+ static {
+ String prop = OptionConverter.getSystemProperty("java.version", null);
+
+ if(prop != null) {
+ int i = prop.indexOf('.');
+ if(i != -1) {
+ if(prop.charAt(i+1) != '1')
+ java1 = false;
+ }
+ }
+ }
+
/**
This method will search for <code>resource</code> in different
@@ -109,6 +124,26 @@
return resource;
}
+
+ /**
+ Are we running under JDK 1.x?
+
+ */
+ public
+ static
+ boolean java1() {
+ return java1;
+ }
+
+ static
+ public
+ Class loadClass (String clazz) throws ClassNotFoundException {
+ if(java1) {
+ return Class.forName(clazz);
+ } else {
+ return Thread.currentThread().getContextClassLoader().loadClass(clazz);
+ }
+ }
//public static Image getGIF_Image ( String path ) {
// Image img = null;
1.10 +0 -3 jakarta-log4j/src/java/org/apache/log4j/helpers/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile 2001/08/06 19:29:19 1.9
+++ Makefile 2001/08/06 20:21:01 1.10
@@ -20,9 +20,6 @@
BoundedFIFO.java\
FileWatchdog.java\
Loader.java\
- VersionHelper.java\
- VersionHelper11.java\
- VersionHelper20.java\
ThreadLocalMap.java\
SUBDIRS :=
1.23 +2 -3 jakarta-log4j/src/java/org/apache/log4j/helpers/OptionConverter.java
Index: OptionConverter.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/OptionConverter.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- OptionConverter.java 2001/07/20 16:23:19 1.22
+++ OptionConverter.java 2001/08/06 20:21:01 1.23
@@ -16,7 +16,6 @@
import org.apache.log4j.spi.Configurator;
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.helpers.VersionHelper;
// Contributors: Avy Sharell (sharell@online.fr)
// Matthieu Verbert (mve@zurich.ibm.com)
@@ -204,7 +203,7 @@
+ ":pri=[" + priorityName + "]");
try {
- Class customPriority = VersionHelper.getInstance().loadClass(clazz);
+ Class customPriority = Loader.loadClass(clazz);
// get a ref to the specified class' static method
// toPriority(String, org.apache.log4j.Priority)
@@ -311,7 +310,7 @@
Object defaultValue) {
if(className != null) {
try {
- Class classObj = VersionHelper.getInstance().loadClass(className);
+ Class classObj = Loader.loadClass(className);
if(!superClass.isAssignableFrom(classObj)) {
LogLog.error("A \""+className+"\" object is not assignable to a \""+
superClass.getName() + "\" variable.");
1.9 +2 -2 jakarta-log4j/src/java/org/apache/log4j/spi/LocationInfo.java
Index: LocationInfo.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/LocationInfo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LocationInfo.java 2001/07/05 19:07:19 1.8
+++ LocationInfo.java 2001/08/06 20:21:01 1.9
@@ -13,7 +13,7 @@
import java.io.PrintWriter;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.Layout;
-import org.apache.log4j.helpers.VersionHelper;
+import org.apache.log4j.helpers.Loader;
/**
The internal representation of caller location information.
@@ -60,7 +60,7 @@
static boolean inVisualAge = false;
static {
try {
- Class dummy = VersionHelper.getInstance().loadClass("com.ibm.uvm.tools.DebugSupport");
+ Class dummy = Loader.loadClass("com.ibm.uvm.tools.DebugSupport");
inVisualAge = true;
LogLog.debug("Detected IBM VisualAge environment.");
} catch(Throwable e) {
1.15 +2 -2 jakarta-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java
Index: LoggingEvent.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LoggingEvent.java 2001/07/05 19:07:20 1.14
+++ LoggingEvent.java 2001/08/06 20:21:01 1.15
@@ -12,7 +12,7 @@
import org.apache.log4j.NDC;
import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.helpers.VersionHelper;
+import org.apache.log4j.helpers.Loader;
import java.io.StringWriter;
import java.io.PrintWriter;
@@ -231,7 +231,7 @@
} else {
Method m = (Method) methodCache.get(className);
if(m == null) {
- Class clazz = VersionHelper.getInstance().loadClass(className);
+ Class clazz = Loader.loadClass(className);
m = clazz.getDeclaredMethod(TO_PRIORITY, TO_PRIORITY_PARAMS);
methodCache.put(className, m);
}
1.27 +6 -6 jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java
Index: DOMConfigurator.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/xml/DOMConfigurator.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DOMConfigurator.java 2001/06/27 21:34:36 1.26
+++ DOMConfigurator.java 2001/08/06 20:21:01 1.27
@@ -24,12 +24,12 @@
import org.apache.log4j.Priority;
import org.apache.log4j.Hierarchy;
import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.Filter;
+import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.helpers.FileWatchdog;
-import org.apache.log4j.helpers.VersionHelper;
+import org.apache.log4j.helpers.Loader;
import org.xml.sax.InputSource;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -159,7 +159,7 @@
String className = subst(appenderElement.getAttribute(CLASS_ATTR));
LogLog.debug("Class name: [" + className+']');
try {
- Object instance = VersionHelper.getInstance().loadClass(className).newInstance();
+ Object instance = Loader.loadClass(className).newInstance();
Appender appender = (Appender)instance;
PropertySetter propSetter = new PropertySetter(appender);
@@ -296,7 +296,7 @@
else {
LogLog.debug("Desired category sub-class: ["+className+']');
try {
- Class clazz = VersionHelper.getInstance().loadClass(className);
+ Class clazz = Loader.loadClass(className);
Method getInstanceMethod = clazz.getMethod("getInstance",
ONE_STRING_PARAM);
cat = (Category) getInstanceMethod.invoke(null, new Object[] {catName});
@@ -425,7 +425,7 @@
String className = subst(layout_element.getAttribute(CLASS_ATTR));
LogLog.debug("Parsing layout of class: \""+className+"\"");
try {
- Object instance = VersionHelper.getInstance().loadClass(className).newInstance();
+ Object instance = Loader.loadClass(className).newInstance();
Layout layout = (Layout)instance;
PropertySetter propSetter = new PropertySetter(layout);
@@ -487,7 +487,7 @@
} else {
LogLog.debug("Desired Priority sub-class: ["+className+']');
try {
- Class clazz = VersionHelper.getInstance().loadClass(className);
+ Class clazz = Loader.loadClass(className);
Method toPriorityMethod = clazz.getMethod("toPriority",
ONE_STRING_PARAM);
Priority pri = (Priority) toPriorityMethod.invoke(null,
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: log4j-cvs-help@jakarta.apache.org