QPID-4313: Address review comments from QPID-4109 (Reenable LoggingManagement)

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

3 files changed, 17 insertions, 17 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
index e92da34a49..afb8a0029b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
@@ -36,7 +36,7 @@ import org.apache.qpid.server.logging.SystemOutMessageLogger;
 import org.apache.qpid.server.logging.actors.BrokerActor;
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.actors.GenericActor;
-import org.apache.qpid.server.logging.log4j.LoggingFacade;
+import org.apache.qpid.server.logging.log4j.LoggingManagementFacade;
 import org.apache.qpid.server.logging.messages.BrokerMessages;
 import org.apache.qpid.server.protocol.AmqpProtocolVersion;
 import org.apache.qpid.server.protocol.MultiVersionProtocolEngineFactory;
@@ -458,7 +458,7 @@ public class Broker
                 // log4j expects the watch interval in milliseconds
                 try
                 {
-                    LoggingFacade.configureAndWatch(logConfigFile.getPath(), logWatchTime * 1000);
+                    LoggingManagementFacade.configureAndWatch(logConfigFile.getPath(), logWatchTime * 1000);
                 }
                 catch (Exception e)
                 {
@@ -469,7 +469,7 @@ public class Broker
             {
                 try
                 {
-                    LoggingFacade.configure(logConfigFile.getPath());
+                    LoggingManagementFacade.configure(logConfigFile.getPath());
                 }
                 catch (Exception e)
                 {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/log4j/LoggingFacade.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacade.java
index 931171b175..6a961c8fa4 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/log4j/LoggingFacade.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacade.java
@@ -58,49 +58,49 @@ import java.util.Random;
  * turn {@link Logger} on, off and control their {@link Level}, and the manipulation and reload
  * of the log4j configuration file.
  */
-public class LoggingFacade
+public class LoggingManagementFacade
 {
     private static Logger LOGGER;
-    private static transient LoggingFacade _instance;
+    private static transient LoggingManagementFacade _instance;
     private final String _filename;
     private final int _delay;
 
-    public static LoggingFacade configure(String filename) throws LoggingFacadeException
+    public static LoggingManagementFacade configure(String filename) throws LoggingFacadeException
     {
-        _instance = new LoggingFacade(filename);
+        _instance = new LoggingManagementFacade(filename);
         return _instance;
     }
 
-    public static LoggingFacade configureAndWatch(String filename, int delay) throws LoggingFacadeException
+    public static LoggingManagementFacade configureAndWatch(String filename, int delay) throws LoggingFacadeException
     {
-        _instance = new LoggingFacade(filename, delay);
+        _instance = new LoggingManagementFacade(filename, delay);
         return _instance;
     }
 
-    public static LoggingFacade getCurrentInstance()
+    public static LoggingManagementFacade getCurrentInstance()
     {
         return _instance;
     }
 
-    private LoggingFacade(String filename)
+    private LoggingManagementFacade(String filename)
     {
         DOMConfigurator.configure(filename);
 
         if(LOGGER == null)
         {
-            LOGGER = Logger.getLogger(LoggingFacade.class);
+            LOGGER = Logger.getLogger(LoggingManagementFacade.class);
         }
         _filename = filename;
         _delay = 0;
     }
 
-    private LoggingFacade(String filename, int delay)
+    private LoggingManagementFacade(String filename, int delay)
     {
         DOMConfigurator.configureAndWatch(filename, delay);
 
         if(LOGGER == null)
         {
-            LOGGER = Logger.getLogger(LoggingFacade.class);
+            LOGGER = Logger.getLogger(LoggingManagementFacade.class);
         }
 
         _filename = filename;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/log4j/LoggingFacadeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacadeTest.java
index f871baffe6..6cb9d9b2e6 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/log4j/LoggingFacadeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacadeTest.java
@@ -28,9 +28,9 @@ import org.apache.qpid.util.FileUtils;
 
 import junit.framework.TestCase;
 
-public class LoggingFacadeTest extends TestCase
+public class LoggingManagementFacadeTest extends TestCase
 {
-    private LoggingFacade _loggingFacade;
+    private LoggingManagementFacade _loggingFacade;
     private String _log4jXmlFile;
 
     @Override
@@ -38,7 +38,7 @@ public class LoggingFacadeTest extends TestCase
     {
         super.setUp();
         _log4jXmlFile = createTestLog4jXml();
-        _loggingFacade = LoggingFacade.configure(_log4jXmlFile);
+        _loggingFacade = LoggingManagementFacade.configure(_log4jXmlFile);
     }
 
     public void testGetAvailableLoggerLevels() throws Exception