From 950be55861aebbc191f9c74e0cc8514cb4a7d782 Mon Sep 17 00:00:00 2001 From: Bhupendra Bhusman Bhardwaj Date: Mon, 9 Apr 2007 09:45:06 +0000 Subject: 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 --- java/broker/etc/persistent_config.xml | 1 + java/broker/etc/transient_config.xml | 1 + .../src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java | 5 ++--- .../org/apache/qpid/server/management/JMXManagedObjectRegistry.java | 2 ++ .../main/java/org/apache/qpid/server/management/ManagedBroker.java | 3 +-- 5 files changed, 7 insertions(+), 5 deletions(-) (limited to 'java/broker') 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 @@ true + 8999 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 @@ true + 8999 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; /** -- cgit v1.2.1