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

7 files changed, 23 insertions, 21 deletions

diff --git a/java/broker/etc/persistent_config.xml b/java/broker/etc/persistent_config.xml
index 708a219c2b..ff9ec74774 100644
--- a/java/broker/etc/persistent_config.xml
+++ b/java/broker/etc/persistent_config.xml
@@ -37,6 +37,7 @@
     </connector>
     <management>
         <enabled>true</enabled>
+        <jmxport>8999</jmxport>
     </management>
     <advanced>
         <filterchain enableExecutorPool="true"/>
diff --git a/java/broker/etc/transient_config.xml b/java/broker/etc/transient_config.xml
index 3d55623ad4..b1006e3949 100644
--- a/java/broker/etc/transient_config.xml
+++ b/java/broker/etc/transient_config.xml
@@ -37,6 +37,7 @@
     </connector>
     <management>
         <enabled>true</enabled>
+        <jmxport>8999</jmxport>
     </management>
     <advanced>
         <filterchain enableExecutorPool="true"/>
diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
index 23c32aceab..bcbc8f52f6 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
@@ -140,8 +140,7 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
      * @param autoDelete
      * @throws JMException
      */
-    public void createNewQueue(String queueName, String owner, boolean durable,boolean autoDelete)
-            throws JMException
+    public void createNewQueue(String queueName, String owner, boolean durable) throws JMException
     {
         AMQQueue queue = _queueRegistry.getQueue(new AMQShortString(queueName));
         if (queue != null)
@@ -156,7 +155,7 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
             {
                 ownerShortString = new AMQShortString(owner);
             }
-            queue = new AMQQueue(new AMQShortString(queueName), durable, ownerShortString, autoDelete, getVirtualHost());
+            queue = new AMQQueue(new AMQShortString(queueName), durable, ownerShortString, false, getVirtualHost());
             if (queue.isDurable() && !queue.isAutoDelete())
             {
                 _messageStore.createQueue(queue);
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
index 71dd9beef7..cf0253b4be 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
@@ -124,11 +124,13 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
                     MBeanServerForwarder mbsf = MBeanInvocationHandlerImpl.newProxyInstance();
                     cs.setMBeanServerForwarder(mbsf);
                     cs.start();
+                    _log.info("JMX: Starting JMXConnector server with SASL");
                 }
                 catch (java.net.MalformedURLException urlException)
                 {
                     // When JMXMPConnector is not available
                     // java.net.MalformedURLException: Unsupported protocol: jmxmp
+                    _log.info("JMX: Starting JMXConnector server");
                     startJMXConnectorServer(port);
                 }
             }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java b/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
index b2f79b6410..aba25fb115 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/ManagedBroker.java
@@ -81,8 +81,7 @@ public interface ManagedBroker
     @MBeanOperation(name="createNewQueue", description="Create a new Queue on the Broker server", impact= MBeanOperationInfo.ACTION)
     void createNewQueue(@MBeanOperationParameter(name="queue name", description="Name of the new queue")String queueName,
                         @MBeanOperationParameter(name="owner", description="Owner name")String owner,
-                        @MBeanOperationParameter(name="durable", description="true if the queue should be durable")boolean durable,
-                        @MBeanOperationParameter(name="autoDelete", description="true if the queue should be auto delete") boolean autoDelete)
+                        @MBeanOperationParameter(name="durable", description="true if the queue should be durable")boolean durable)
         throws IOException, JMException;
 
     /**
diff --git a/java/management/eclipse-plugin/bin/qpidmc.sh b/java/management/eclipse-plugin/bin/qpidmc.sh
index 2472545a14..4ab4b7f025 100755
--- a/java/management/eclipse-plugin/bin/qpidmc.sh
+++ b/java/management/eclipse-plugin/bin/qpidmc.sh
@@ -61,4 +61,4 @@ elif [ $os = "Linux" ]; then
     os="linux"
 fi
 
-"$JAVA_HOME/bin/java" -Xms40m -Xmx256m -Declipse.consoleLog=false -jar $QPIDMC_HOME/eclipse/startup.jar org.eclipse.core.launcher.Main -launcher $QPIDMC_HOME/eclipse/eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:$QPIDMC_HOME/configuration" -os $os -ws $ws -arch $arch
+"$JAVA_HOME/bin/java" -Xms40m -Xmx256m -Declipse.consoleLog=false -Dsecurity=true -jar $QPIDMC_HOME/eclipse/startup.jar org.eclipse.core.launcher.Main -launcher $QPIDMC_HOME/eclipse/eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:$QPIDMC_HOME/configuration" -os $os -ws $ws -arch $arch
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);
             }