Author: ritchiem
Date: Mon Apr 13 13:39:44 2009
New Revision: 764454
URL: http://svn.apache.org/viewvc?rev=764454&view=rev
Log:
QPID-1699: fix mbean annotation, log failure to reload file. Address review
comments from robbie.
merged from trunk r748591
Modified:
qpid/branches/0.5-fix/qpid/ (props changed)
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java
Propchange: qpid/branches/0.5-fix/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 13:39:44 2009
@@ -1 +1 @@
-/qpid/trunk/qpid:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561
+/qpid/trunk/qpid:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591
Modified:
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=764454&r1=764453&r2=764454&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Mon Apr 13 13:39:44 2009
@@ -27,8 +27,6 @@
import java.util.Map;
import java.util.Map.Entry;
-import javax.management.NotCompliantMBeanException;
-
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -39,6 +37,9 @@
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
+import org.apache.qpid.tools.messagestore.MessageStoreTool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import sun.misc.Signal;
import sun.misc.SignalHandler;
@@ -62,8 +63,11 @@
private SecurityConfiguration _securityConfiguration = null;
private File _configFile;
+
+ private Logger _log = LoggerFactory.getLogger(this.getClass());
private ConfigurationManagementMBean _mbean;
+
// Map of environment variables to config items
private static final Map<String, String> envVarMap = new HashMap<String,
String>();
@@ -206,7 +210,7 @@
}
catch (ConfigurationException e)
{
- // Not much we can do about it really.
+ _log.error("Could not reload configuration file", e);
}
}
Modified:
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java?rev=764454&r1=764453&r2=764454&view=diff
==============================================================================
---
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java
(original)
+++
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ConfigurationManagement.java
Mon Apr 13 13:39:44 2009
@@ -20,8 +20,10 @@
*/
package org.apache.qpid.server.configuration.management;
+import javax.management.MBeanOperationInfo;
+
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.qpid.server.management.MBeanAttribute;
+import org.apache.qpid.server.management.MBeanOperation;
public interface ConfigurationManagement
{
@@ -33,8 +35,9 @@
* Reload the
* @throws ConfigurationException
*/
- @MBeanAttribute(name="reloadSecurityConfiguration",
- description = "Force a reload of the security
configuration sections")
+ @MBeanOperation(name="reloadSecurityConfiguration",
+ description = "Force a reload of the security
configuration sections",
+ impact = MBeanOperationInfo.ACTION)
void reloadSecurityConfiguration() throws ConfigurationException;
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
