1 files changed, 5 insertions, 57 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java b/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
index a2f3506502..ba5ea47fc1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
@@ -21,58 +21,31 @@
 package org.apache.qpid.server.logging.actors;
 
 import org.apache.qpid.server.logging.RootMessageLogger;
+import org.apache.qpid.server.logging.subjects.LogSubjectFormat;
 
-import javax.management.remote.JMXPrincipal;
-import javax.security.auth.Subject;
-import java.security.AccessController;
-import java.security.Principal;
 import java.text.MessageFormat;
-import java.util.Set;
 
 /**
  * Management actor to use in {@link MBeanInvocationHandlerImpl} to log all management operational logging.
  */
-public class ManagementActor extends AbstractActor
+public class ManagementActor extends AbstractManagementActor
 {
-    /**
-     * Holds the principal name to display when principal subject is not available.
-     * <p>
-     * This is useful for cases when users invoke JMX operation over JConsole
-     * attached to the local JVM.
-     */
-    private static final String UNKNOWN_PRINCIPAL = "N/A";
-
     private String _lastThreadName = null;
 
     /**
-     * LOG FORMAT for the ManagementActor,
-     * Uses a MessageFormat call to insert the required values according to
-     * these indices:
-     *
-     * 0 - User ID
-     * 1 - IP
-     */
-    public static final String MANAGEMENT_FORMAT = "mng:{0}({1})";
-
-    /**
      * The logString to be used for logging
      */
     private String _logStringContainingPrincipal;
 
-    /** used when the principal name cannot be discovered from the Subject */
-    private final String _fallbackPrincipalName;
-
     /** @param rootLogger The RootLogger to use for this Actor */
     public ManagementActor(RootMessageLogger rootLogger)
     {
-        super(rootLogger);
-        _fallbackPrincipalName = UNKNOWN_PRINCIPAL;
+        super(rootLogger, UNKNOWN_PRINCIPAL);
     }
 
     public ManagementActor(RootMessageLogger rootLogger, String principalName)
     {
-        super(rootLogger);
-        _fallbackPrincipalName = principalName;
+        super(rootLogger, principalName);
     }
 
     private synchronized String getAndCacheLogString()
@@ -96,7 +69,7 @@ public class ManagementActor extends AbstractActor
             if (split.length == 2)
             {
                 String ip = currentName.split("-")[1];
-                actor = MessageFormat.format(MANAGEMENT_FORMAT, principalName, ip);
+                actor = MessageFormat.format(LogSubjectFormat.MANAGEMENT_FORMAT, principalName, ip);
             }
             else
             {
@@ -119,33 +92,8 @@ public class ManagementActor extends AbstractActor
         return logString;
     }
 
-    /**
-     * Returns current JMX principal name.
-     *
-     * @return principal name or null if principal can not be found
-     */
-    private String getPrincipalName()
-    {
-        String identity = _fallbackPrincipalName;
-
-        // retrieve Subject from current AccessControlContext
-        final Subject subject = Subject.getSubject(AccessController.getContext());
-        if (subject != null)
-        {
-            // retrieve JMXPrincipal from Subject
-            final Set<JMXPrincipal> principals = subject.getPrincipals(JMXPrincipal.class);
-            if (principals != null && !principals.isEmpty())
-            {
-                final Principal principal = principals.iterator().next();
-                identity = principal.getName();
-            }
-        }
-        return identity;
-    }
-
     public String getLogMessage()
     {
         return getAndCacheLogString();
     }
-
 }