You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/07/22 19:09:19 UTC
svn commit: r796798 - in /qpid/trunk/qpid/java: broker/etc/
broker/src/main/java/org/apache/qpid/server/configuration/
broker/src/main/java/org/apache/qpid/server/logging/
broker/src/test/java/org/apache/qpid/server/configuration/
broker/src/test/java/...
Author: ritchiem
Date: Wed Jul 22 17:09:19 2009
New Revision: 796798
URL: http://svn.apache.org/viewvc?rev=796798&view=rev
Log:
QPID-1992 : Corrected duplication in ServerConfiguration for StatusUpdates and so renamed method getStatusUpdatesEnabled
Ensured tested in ServerConfiguration[File]Test and removed standalone test that replicated functionality.
Removed:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/StatusUpdateConfigurationTest.java
Modified:
qpid/trunk/qpid/java/broker/etc/config-systests.xml
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
Modified: qpid/trunk/qpid/java/broker/etc/config-systests.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/config-systests.xml?rev=796798&r1=796797&r2=796798&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/etc/config-systests.xml (original)
+++ qpid/trunk/qpid/java/broker/etc/config-systests.xml Wed Jul 22 17:09:19 2009
@@ -134,6 +134,8 @@
<auto_register>true</auto_register>
</queue>
+ <status-updates>ON</status-updates>
+
<virtualhosts>${conf}/virtualhosts-systests.xml</virtualhosts>
</broker>
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=796798&r1=796797&r2=796798&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java Wed Jul 22 17:09:19 2009
@@ -54,6 +54,7 @@
public static final int DEFAULT_BUFFER_READ_LIMIT_SIZE = 262144;
public static final int DEFAULT_BUFFER_WRITE_LIMIT_SIZE = 262144;
public static final boolean DEFAULT_BROKER_CONNECTOR_PROTECTIO_ENABLED = false;
+ public static final String DEFAULT_STATUS_UPDATES = "on";
private static final int DEFAULT_FRAME_SIZE = 65536;
private static final int DEFAULT_PORT = 5672;
@@ -81,6 +82,7 @@
public static final String CONNECTOR_PROTECTIO_ENABLED = "connector.protectio.enabled";
public static final String CONNECTOR_PROTECTIO_READ_BUFFER_LIMIT_SIZE = "connector.protectio.readBufferLimitSize";
public static final String CONNECTOR_PROTECTIO_WRITE_BUFFER_LIMIT_SIZE = "connector.protectio.writeBufferLimitSize";
+ public static final String STATUS_UPDATES = "status-updates";
{
envVarMap.put("QPID_PORT", "connector.port");
@@ -198,9 +200,16 @@
return conf;
}
- public boolean getStatusEnabled()
+ /**
+ * Check the configuration file to see if status updates are enabled.
+ * @return true if status updates are enabled
+ */
+ public boolean getStatusUpdatesEnabled()
{
- return getConfig().getBoolean("status-updates", true);
+ // Retrieve the setting from configuration but default to on.
+ String value = getConfig().getString(STATUS_UPDATES, DEFAULT_STATUS_UPDATES);
+
+ return value.equalsIgnoreCase("on");
}
// Our configuration class needs to make the interpolate method
@@ -557,13 +566,4 @@
getConfig().getLong("housekeeping.expiredMessageCheckPeriod",
DEFAULT_HOUSEKEEPING_PERIOD));
}
-
- public boolean getStatusUpdates()
- {
- // Retrieve the setting from configuration but default to on.
- String value = getConfig().getString("status-updates", "on");
-
- return value.equalsIgnoreCase("on");
- }
-
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java?rev=796798&r1=796797&r2=796798&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/RootMessageLoggerImpl.java Wed Jul 22 17:09:19 2009
@@ -31,7 +31,7 @@
public RootMessageLoggerImpl(ServerConfiguration configuration, RawMessageLogger rawLogger)
{
- _enabled = configuration.getStatusUpdates();
+ _enabled = configuration.getStatusUpdatesEnabled();
_rawLogger = rawLogger;
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=796798&r1=796797&r2=796798&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java Wed Jul 22 17:09:19 2009
@@ -223,6 +223,24 @@
assertEquals(23, serverConfig.getBufferWriteLimit());
}
+
+ public void testGetStatusEnabled() throws ConfigurationException
+ {
+ // Check default
+ ServerConfiguration serverConfig = new ServerConfiguration(_config);
+ assertEquals(true, serverConfig.getStatusUpdatesEnabled());
+
+ // Check disabling we set
+ _config.setProperty(ServerConfiguration.STATUS_UPDATES, "off");
+ serverConfig = new ServerConfiguration(_config);
+ assertEquals(false, serverConfig.getStatusUpdatesEnabled());
+
+ // Check invalid values don't cause error but result in disabled
+ _config.setProperty(ServerConfiguration.STATUS_UPDATES, "Yes Please");
+ serverConfig = new ServerConfiguration(_config);
+ assertEquals(false, serverConfig.getStatusUpdatesEnabled());
+
+ }
public void testGetSynchedClocks() throws ConfigurationException
{
// Check default
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java?rev=796798&r1=796797&r2=796798&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java Wed Jul 22 17:09:19 2009
@@ -29,7 +29,6 @@
*
* All configuration values should be set in the systest config file so that
* the ability to load them can be validated.
- *
*/
public class ServerConfigurationFileTest extends QpidTestCase
{
@@ -72,4 +71,10 @@
{
validatePropertyDefinedInFile(ServerConfiguration.CONNECTOR_PROTECTIO_WRITE_BUFFER_LIMIT_SIZE);
}
+
+ public void testStatusUpdates() throws ConfigurationException
+ {
+ validatePropertyDefinedInFile(ServerConfiguration.STATUS_UPDATES);
+ }
+
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org