Changeset 1675

Timestamp:

10/06/11 22:08:51 (8 months ago)

Author:

jharrop

Message:

Allow auto config of log4j to be disabled

Location:

trunk/docx4j/src/main

Files:

• java/org/docx4j/utils/Log4jConfigurator.java (modified) (2 diffs)
• resources/docx4j.properties (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/utils/Log4jConfigurator.java

@@ -7 +7 @@
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
+import org.docx4j.Docx4jProperties;
 
 //From http://wiki.apache.org/logging-log4j/UsefulCode
@@ -13 +14 @@
     public synchronized static void configure() {
         if (!isConfigured()) {
+                
+                        boolean disabled = Boolean.parseBoolean(
+                                        Docx4jProperties.getProperties().getProperty("docx4j.Log4j.Configurator.disabled", "false"));                           
+                        if (disabled) return;
+                
             BasicConfigurator.configure();
         

trunk/docx4j/src/main/resources/docx4j.properties

@@ -25 +25 @@
 #
 #docx4j.McPreprocessor=true
+
+# If you haven't configured log4j yourself
+# docx4j will autoconfigure it.  Set this to true to disable that
+docx4j.Log4j.Configurator.disabled=false