QPID-444 : added log statements and some config parameters.

Removed the autoDelete parameter from createNewQueue method used from Management Console.



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@526692 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 15 deletions

diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
index 1bd1d12583..0dc7d025fe 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
@@ -53,7 +53,6 @@ import org.apache.qpid.management.ui.sasl.UserPasswordCallbackHandler;
 
 public class JMXServerRegistry extends ServerRegistry
 {
-    private boolean _securityEnabled = false;
     private ObjectName _serverObjectName = null;
     private JMXConnector _jmxc = null;
     private MBeanServerConnection _mbsc = null;
@@ -90,36 +89,37 @@ public class JMXServerRegistry extends ServerRegistry
         super(server);
         JMXServiceURL jmxUrl = new JMXServiceURL(server.getUrl());
         Map<String, Object> env = null;
-        
-        //String[] creds = {server.getUser(), server.getPassword()};
-        //env.put(JMXConnector.CREDENTIALS, creds);
        
         if (ApplicationRegistry.enableSecurity)
-        {
-            Security.addProvider(new SaslProvider());
-            jmxUrl = new JMXServiceURL("jmxmp", null, server.getPort());
-            //jmxUrl = new JMXServiceURL("service:jmx:jmxmp://localhost:8999");
-            
-            env = new HashMap<String, Object>();
-            env.put("jmx.remote.profiles", "SASL/PLAIN");
-            //env.put("jmx.remote.profiles", "SASL/CRAM-MD5"); 
-            env.put("jmx.remote.sasl.callback.handler",
-                    new UserPasswordCallbackHandler(server.getUser(), server.getPassword()));                      
+        {                                
             try
             {
+                // Check if the JMXMP connector is available
                 Class klass = Class.forName("javax.management.remote.jmxmp.JMXMPConnector");
+                
+                // Now create the instance of JMXMPConnector
+                Security.addProvider(new SaslProvider());
+                jmxUrl = new JMXServiceURL("jmxmp", null, server.getPort());
+                
+                env = new HashMap<String, Object>();
+                env.put("jmx.remote.profiles", "SASL/PLAIN");
+                //env.put("jmx.remote.profiles", "SASL/CRAM-MD5"); 
+                env.put("jmx.remote.sasl.callback.handler",
+                        new UserPasswordCallbackHandler(server.getUser(), server.getPassword())); 
+                
                 Class[] paramTypes = {JMXServiceURL.class, Map.class};                           
                 Constructor cons = klass.getConstructor(paramTypes);
                 
                 Object[] args = {jmxUrl, env};           
                 Object theObject = cons.newInstance(args);
                 _jmxc = (JMXConnector)theObject;
-                //_jmxc = new JMXMPConnector(jmxUrl, env);
                 _jmxc.connect();
+                System.out.println("Starting JMXConnector with SASL");
             }
             catch (Exception ex)
             {
                 // When JMXMPConnector is not available
+                System.out.println("Starting JMXConnector");                
                 jmxUrl = new JMXServiceURL(server.getUrl());
                 _jmxc = JMXConnectorFactory.connect(jmxUrl, null);
             }