diff -ru log4jmini/build.xml log4jmini-cdc/build.xml
--- log4jmini/build.xml 2006-04-09 19:58:09.000000000 +0200
+++ log4jmini-cdc/build.xml 2006-04-09 19:54:37.000000000 +0200
@@ -16,12 +16,18 @@
+
+
+
+
+
+
@@ -76,6 +82,21 @@
+
+
+
+
+
+
+
+
@@ -122,6 +144,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -ru log4jmini/src/java/org/apache/log4j/Logger.java log4jmini-cdc/src/java/org/apache/log4j/Logger.java
--- log4jmini/src/java/org/apache/log4j/Logger.java 2006-04-09 19:58:09.000000000 +0200
+++ log4jmini-cdc/src/java/org/apache/log4j/Logger.java 2006-04-09 19:54:37.000000000 +0200
@@ -64,6 +64,59 @@
final Hierarchy defaultHierarchy = new Hierarchy(new
RootLogger(Priority.DEBUG));
+ static public final String DEFAULT_CONFIGURATION_FILE = "log4j.properties";
+ static public final String DEFAULT_CONFIGURATION_KEY = "log4j.configuration";
+ static public final String DEFAULT_INIT_OVERRIDE_KEY = "log4j.defaultInitOverride";
+
+ static {
+ String override = null;
+ try {
+ override = System.getProperty(DEFAULT_INIT_OVERRIDE_KEY, override);
+ } catch (SecurityException e) {
+ LogLog.debug("Could not read system property \""
+ + DEFAULT_INIT_OVERRIDE_KEY + "\".", e);
+ }
+ // if there is no default init override, them get the resource
+ // specified by the user or the default config file.
+ if (override == null || "false".equalsIgnoreCase(override)) {
+ String resource = null;
+ try {
+ resource = System.getProperty(DEFAULT_CONFIGURATION_KEY,
+ DEFAULT_CONFIGURATION_FILE);
+ } catch (SecurityException e) {
+ LogLog.debug("Could not read system property \""
+ + DEFAULT_CONFIGURATION_KEY + "\".", e);
+ resource = DEFAULT_CONFIGURATION_FILE;
+ }
+ URL url = null;
+ try {
+ url = new URL(resource);
+ } catch (MalformedURLException ex) {
+ // so, resource is not a URL:
+ // attempt to get the resource in the most generic way:
+ try {
+ url = Logger.class.getResource(resource);
+ } catch (Exception e) {}
+ if (url == null) {
+ // if that doen't work, then try again in a slightly
+ // different way
+ ClassLoader loader = Logger.class.getClassLoader();
+ if (loader != null) {
+ try {
+ url = loader.getResource(resource);
+ } catch (Exception e) {}
+ }
+ }
+ }
+ if (url != null) {
+ PropertyConfigurator configurator = new PropertyConfigurator();
+ configurator.doConfigure(url, defaultHierarchy);
+ } else {
+ LogLog.debug("Could not find resource: [" + resource + "].");
+ }
+ }
+ }
+
/**
The name of this Logger.
*/