QPID-2051: relax the parser validation to only halt startup on fatal-errors in the xml file, and relax the level-check to allow undefined system properties. Move the Log4J initialisation override inside Main instead of the startup scripts, and have it check for -Dlog4j.configuration first before engaging.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@805188 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 2 deletions

diff --git a/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java b/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
index 643f1fa48e..9f350033d6 100644
--- a/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
+++ b/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
@@ -386,11 +386,11 @@ public class QpidLog4JConfiguratorTest extends TestCase
         }
         catch (IllegalLoggerLevelException e)
         {
-            fail("Incorrect Exception, expected an IOException");
+            //expected, ignore
         }
         catch (IOException e)
         {
-            //expected, ignore
+            fail("Incorrect Exception, expected an IllegalLoggerLevelException");
         }
     }
 }