You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2012/11/13 18:19:10 UTC
svn commit: r1408840 - in
/qpid/branches/java-broker-config-qpid-4390/qpid/java:
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
broker/src/main/java/org/apache/qpid/server/configuration/
broker/src/main/java/org/apache/qpid/server/conf...
Author: orudyy
Date: Tue Nov 13 17:19:07 2012
New Revision: 1408840
URL: http://svn.apache.org/viewvc?rev=1408840&view=rev
Log:
QPID-4390: WIP - Remove references to ServerConfiguration from various broker components
Added:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAMessageStoreTest.java Tue Nov 13 17:19:07 2012
@@ -24,7 +24,6 @@ import java.io.File;
import java.net.InetAddress;
import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.qpid.server.configuration.ServerConfiguration;
import org.apache.qpid.server.logging.SystemOutMessageLogger;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.actors.TestLogActor;
@@ -158,8 +157,7 @@ public class BDBHAMessageStoreTest exten
private TestApplicationRegistry initialize() throws Exception
{
CurrentActor.set(new TestLogActor(new SystemOutMessageLogger()));
- ServerConfiguration configuration = new ServerConfiguration(_configXml);
- TestApplicationRegistry registry = new TestApplicationRegistry(configuration);
+ TestApplicationRegistry registry = new TestApplicationRegistry(_configXml);
ApplicationRegistry.initialise(registry);
registry.getVirtualHostRegistry().setDefaultVirtualHostName("test" + _masterPort);
return registry;
Added: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java?rev=1408840&view=auto
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java (added)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java Tue Nov 13 17:19:07 2012
@@ -0,0 +1,31 @@
+package org.apache.qpid.server.configuration;
+
+/**
+ * Declares broker system property names
+ */
+public class BrokerProperties
+{
+ public static final String PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX = "qpid.dead_letter_exchange_suffix";
+ public static final String PROPERTY_DEAD_LETTER_QUEUE_SUFFIX = "qpid.dead_letter_queue_suffix";
+ public static final String PROPERTY_HOUSE_KEEPING_CHECK_PERIOD = "qpid.house_keeping_check_period";
+ public static final String PROPERTY_MAXIMUM_MESSAGE_AGE = "qpid.maximum_message_age";
+ public static final String PROPERTY_MAXIMUM_MESSAGE_COUNT = "qpid.maximum_message_count";
+ public static final String PROPERTY_MAXIMUM_QUEUE_DEPTH = "qpid.maximum_queue_depth";
+ public static final String PROPERTY_MAXIMUM_MESSAGE_SIZE = "qpid.maximum_message_size";
+ public static final String PROPERTY_MAXIMUM_CHANNEL_COUNT = "qpid.maximum_channel_count";
+ public static final String PROPERTY_MINIMUM_ALERT_REPEAT_GAP = "qpid.minimum_alert_repeat_gap";
+ public static final String PROPERTY_FLOW_CAPACITY = "qpid.flow_capacity";
+ public static final String PROPERTY_FLOW_RESUME_CAPACITY = "qpid.flow_resume_capacity";
+ public static final String PROPERTY_FRAME_SIZE = "qpid.frame_size";
+ public static final String PROPERTY_MSG_AUTH = "qpid.msg_auth";
+
+ public static final long DEFAULT_MINIMUM_ALERT_REPEAT_GAP = 30000l;
+ public static final long DEFAULT_HOUSEKEEPING_PERIOD = 30000L;
+
+ // TODO: delete
+ public static final String PROPERTY_STATUS_UPDATES = "qpid.status_updates";
+
+ private BrokerProperties()
+ {
+ }
+}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java Tue Nov 13 17:19:07 2012
@@ -37,6 +37,7 @@ import org.apache.qpid.server.exchange.D
import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.server.queue.AMQQueueFactory;
import org.apache.qpid.server.registry.ApplicationRegistry;
+
import static org.apache.qpid.transport.ConnectionSettings.WILDCARD_ADDRESS;
public class ServerConfiguration extends AbstractConfiguration
@@ -95,30 +96,17 @@ public class ServerConfiguration extends
public static final String CONNECTOR_INCLUDE_08 = "connector.include08";
{
- envVarMap.put("QPID_PORT", "connector.port");
- envVarMap.put("QPID_SSLPORT", "connector.ssl.port");
- envVarMap.put("QPID_JMXPORT_REGISTRYSERVER", MGMT_JMXPORT_REGISTRYSERVER);
- envVarMap.put("QPID_JMXPORT_CONNECTORSERVER", MGMT_JMXPORT_CONNECTORSERVER);
- envVarMap.put("QPID_FRAMESIZE", "advanced.framesize");
- envVarMap.put("QPID_MSGAUTH", "security.msg-auth");
- envVarMap.put("QPID_AUTOREGISTER", "auto_register");
- envVarMap.put("QPID_MANAGEMENTENABLED", "management.enabled");
- envVarMap.put("QPID_HTTPMANAGEMENTENABLED", "management.http.enabled");
- envVarMap.put("QPID_HTTPMANAGEMENTPORT", "management.http.port");
- envVarMap.put("QPID_HEARTBEATDELAY", "heartbeat.delay");
- envVarMap.put("QPID_HEARTBEATTIMEOUTFACTOR", "heartbeat.timeoutFactor");
- envVarMap.put("QPID_MAXIMUMMESSAGEAGE", "maximumMessageAge");
- envVarMap.put("QPID_MAXIMUMMESSAGECOUNT", "maximumMessageCount");
- envVarMap.put("QPID_MAXIMUMQUEUEDEPTH", "maximumQueueDepth");
- envVarMap.put("QPID_MAXIMUMMESSAGESIZE", "maximumMessageSize");
- envVarMap.put("QPID_MAXIMUMCHANNELCOUNT", "maximumChannelCount");
- envVarMap.put("QPID_MINIMUMALERTREPEATGAP", "minimumAlertRepeatGap");
- envVarMap.put("QPID_QUEUECAPACITY", "capacity");
- envVarMap.put("QPID_FLOWRESUMECAPACITY", "flowResumeCapacity");
- envVarMap.put("QPID_SOCKETRECEIVEBUFFER", "connector.socketReceiveBuffer");
- envVarMap.put("QPID_SOCKETWRITEBUFFER", "connector.socketWriteBuffer");
- envVarMap.put("QPID_TCPNODELAY", "connector.tcpNoDelay");
- envVarMap.put("QPID_STATUS-UPDATES", "status-updates");
+ envVarMap.put(BrokerProperties.PROPERTY_FRAME_SIZE, "advanced.framesize");
+ envVarMap.put(BrokerProperties.PROPERTY_MSG_AUTH, "security.msg-auth");
+ envVarMap.put(BrokerProperties.PROPERTY_MAXIMUM_MESSAGE_AGE, "maximumMessageAge");
+ envVarMap.put(BrokerProperties.PROPERTY_MAXIMUM_MESSAGE_COUNT, "maximumMessageCount");
+ envVarMap.put(BrokerProperties.PROPERTY_MAXIMUM_QUEUE_DEPTH, "maximumQueueDepth");
+ envVarMap.put(BrokerProperties.PROPERTY_MAXIMUM_MESSAGE_SIZE, "maximumMessageSize");
+ envVarMap.put(BrokerProperties.PROPERTY_MAXIMUM_CHANNEL_COUNT, "maximumChannelCount");
+ envVarMap.put(BrokerProperties.PROPERTY_MINIMUM_ALERT_REPEAT_GAP, "minimumAlertRepeatGap");
+ envVarMap.put(BrokerProperties.PROPERTY_FLOW_CAPACITY, "capacity");
+ envVarMap.put(BrokerProperties.PROPERTY_FLOW_RESUME_CAPACITY, "flowResumeCapacity");
+ envVarMap.put(BrokerProperties.PROPERTY_STATUS_UPDATES, "status-updates");
}
/**
@@ -313,7 +301,7 @@ public class ServerConfiguration extends
String name = (String) hosts.get(j);
// Add the virtual hosts to the server configuration
- VirtualHostConfiguration virtualhost = new VirtualHostConfiguration(name, vhostConfiguration.subset("virtualhost." + escapeTagName(name)));
+ VirtualHostConfiguration virtualhost = new VirtualHostConfiguration(name, vhostConfiguration.subset("virtualhost." + escapeTagName(name)), null);
_virtualHosts.put(virtualhost.getName(), virtualhost);
}
}
@@ -555,36 +543,43 @@ public class ServerConfiguration extends
return getDoubleValue("heartbeat.timeoutFactor", 2.0);
}
+ @Deprecated
public long getMaximumMessageAge()
{
return getLongValue("maximumMessageAge");
}
+ @Deprecated
public long getMaximumMessageCount()
{
return getLongValue("maximumMessageCount");
}
+ @Deprecated
public long getMaximumQueueDepth()
{
return getLongValue("maximumQueueDepth");
}
+ @Deprecated
public long getMaximumMessageSize()
{
return getLongValue("maximumMessageSize");
}
+ @Deprecated
public long getMinimumAlertRepeatGap()
{
return getLongValue("minimumAlertRepeatGap", DEFAULT_MINIMUM_ALERT_REPEAT_GAP);
}
+ @Deprecated
public long getCapacity()
{
return getLongValue("capacity");
}
+ @Deprecated
public long getFlowResumeCapacity()
{
return getLongValue("flowResumeCapacity", getCapacity());
@@ -760,6 +755,7 @@ public class ServerConfiguration extends
getConfig().setProperty("housekeeping.checkPeriod", value);
}
+ @Deprecated
public long getHousekeepingCheckPeriod()
{
return getLongValue("housekeeping.checkPeriod", DEFAULT_HOUSEKEEPING_PERIOD);
@@ -817,6 +813,7 @@ public class ServerConfiguration extends
return getBooleanValue("management.managementRightsInferAllAccess", true);
}
+ @Deprecated
public int getMaxDeliveryCount()
{
return getConfig().getInt("maximumDeliveryCount", 0);
@@ -825,6 +822,7 @@ public class ServerConfiguration extends
/**
* Check if dead letter queue delivery is enabled, defaults to disabled if not set.
*/
+ @Deprecated
public boolean isDeadLetterQueueEnabled()
{
return getConfig().getBoolean("deadLetterQueues", false);
@@ -833,6 +831,7 @@ public class ServerConfiguration extends
/**
* String to affix to end of queue name when generating an alternate exchange for DLQ purposes.
*/
+ @Deprecated
public String getDeadLetterExchangeSuffix()
{
return getConfig().getString("deadLetterExchangeSuffix", DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
@@ -841,6 +840,7 @@ public class ServerConfiguration extends
/**
* String to affix to end of queue name when generating a queue for DLQ purposes.
*/
+ @Deprecated
public String getDeadLetterQueueSuffix()
{
return getConfig().getString("deadLetterQueueSuffix", AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java Tue Nov 13 17:19:07 2012
@@ -25,7 +25,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.qpid.server.configuration.plugins.AbstractConfiguration;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.store.MemoryMessageStore;
import java.util.HashMap;
@@ -38,10 +38,12 @@ public class VirtualHostConfiguration ex
private final String _name;
private final Map<String, QueueConfiguration> _queues = new HashMap<String, QueueConfiguration>();
private final Map<String, ExchangeConfiguration> _exchanges = new HashMap<String, ExchangeConfiguration>();
+ private final Broker _broker;
- public VirtualHostConfiguration(String name, Configuration config) throws ConfigurationException
+ public VirtualHostConfiguration(String name, Configuration config, Broker broker) throws ConfigurationException
{
_name = name;
+ _broker = broker;
setConfiguration(config);
}
@@ -80,10 +82,9 @@ public class VirtualHostConfiguration ex
return _name;
}
- // XXX remove reference on ServerConfiguration
public long getHousekeepingCheckPeriod()
{
- return getLongValue("housekeeping.checkPeriod", ApplicationRegistry.getInstance().getConfiguration().getHousekeepingCheckPeriod());
+ return getLongValue("housekeeping.checkPeriod", getBrokerAttributeAsLong(Broker.HOUSEKEEPING_CHECK_PERIOD));
}
public Configuration getStoreConfiguration()
@@ -140,38 +141,37 @@ public class VirtualHostConfiguration ex
public int getMaximumMessageAge()
{
- return getIntValue("queues.maximumMessageAge");
+ return getIntValue("queues.maximumMessageAge", getBrokerAttributeAsInt(Broker.ALERT_THRESHOLD_MESSAGE_AGE));
}
public Long getMaximumQueueDepth()
{
- return getLongValue("queues.maximumQueueDepth");
+ return getLongValue("queues.maximumQueueDepth", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_QUEUE_DEPTH));
}
public Long getMaximumMessageSize()
{
- return getLongValue("queues.maximumMessageSize");
+ return getLongValue("queues.maximumMessageSize", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_MESSAGE_SIZE));
}
public Long getMaximumMessageCount()
{
- return getLongValue("queues.maximumMessageCount");
+ return getLongValue("queues.maximumMessageCount", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_MESSAGE_COUNT));
}
- // XXX remove reference on ServerConfiguration
public Long getMinimumAlertRepeatGap()
{
- return getLongValue("queues.minimumAlertRepeatGap", ApplicationRegistry.getInstance().getConfiguration().getMinimumAlertRepeatGap());
+ return getLongValue("queues.minimumAlertRepeatGap", getBrokerAttributeAsLong(Broker.ALERT_REPEAT_GAP));
}
public long getCapacity()
{
- return getLongValue("queues.capacity");
+ return getLongValue("queues.capacity", getBrokerAttributeAsLong(Broker.FLOW_CONTROL_SIZE_BYTES));
}
public long getFlowResumeCapacity()
{
- return getLongValue("queues.flowResumeCapacity", getCapacity());
+ return getLongValue("queues.flowResumeCapacity", getBrokerAttributeAsLong(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES));
}
public String[] getElementsProcessed()
@@ -225,19 +225,35 @@ public class VirtualHostConfiguration ex
return getLongValue("transactionTimeout.idleClose", 0L);
}
- // XXX remove reference on ServerConfiguration
public int getMaxDeliveryCount()
{
- return getIntValue("queues.maximumDeliveryCount", ApplicationRegistry.getInstance().getConfiguration().getMaxDeliveryCount());
+ return getIntValue("queues.maximumDeliveryCount", getBrokerAttributeAsInt(Broker.MAXIMUM_DELIVERY_ATTEMPTS));
}
/**
* Check if dead letter queue delivery is enabled, deferring to the broker configuration if not set.
*/
- // XXX remove reference on ServerConfiguration
public boolean isDeadLetterQueueEnabled()
{
- return getBooleanValue("queues.deadLetterQueues", ApplicationRegistry.getInstance().getConfiguration().isDeadLetterQueueEnabled());
+ return getBooleanValue("queues.deadLetterQueues", getBrokerAttributeAsBoolean(Broker.DEAD_LETTER_QUEUE_ENABLED));
+ }
+
+ private long getBrokerAttributeAsLong(String name)
+ {
+ Number brokerValue = (Number)_broker.getAttribute(name);
+ return brokerValue == null? 0 : brokerValue.longValue();
+ }
+
+ private int getBrokerAttributeAsInt(String name)
+ {
+ Number brokerValue = (Number)_broker.getAttribute(name);
+ return brokerValue == null? 0 : brokerValue.intValue();
+ }
+
+ private boolean getBrokerAttributeAsBoolean(String name)
+ {
+ Boolean brokerValue = (Boolean)_broker.getAttribute(name);
+ return brokerValue == null? false : brokerValue.booleanValue();
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/XmlConfigurationUtilities.java Tue Nov 13 17:19:07 2012
@@ -50,16 +50,15 @@ public class XmlConfigurationUtilities
ConfigurationFactory factory = new ConfigurationFactory();
factory.setConfigurationFileName(file.getAbsolutePath());
Configuration conf = factory.getConfiguration();
-
+
Iterator<?> keys = conf.getKeys();
if (!keys.hasNext())
{
keys = null;
conf = flatConfig(file);
}
-
+
XmlConfigurationUtilities.substituteEnvironmentVariables(conf, envVarMap);
-
return conf;
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/BrokerRecoverer.java Tue Nov 13 17:19:07 2012
@@ -39,11 +39,15 @@ public class BrokerRecoverer implements
@Override
public Broker create(RecovererProvider recovererProvider, ConfigurationEntry entry, ConfiguredObject... parents)
{
- BrokerAdapter broker = new BrokerAdapter(entry.getId(), _registry, _authenticationProviderFactory, _portFactory);
+ BrokerAdapter broker = new BrokerAdapter(entry.getId(), entry.getAttributes(), _registry, _authenticationProviderFactory, _portFactory);
Map<ConfiguredObjectType, Collection<ConfigurationEntry>> childEntries = entry.getChildren();
for (ConfiguredObjectType type : childEntries.keySet())
{
ConfiguredObjectRecoverer<?> recoverer = recovererProvider.getRecoverer(type);
+ if (recoverer == null)
+ {
+ throw new IllegalConfigurationException("Cannot recover entry for the type '" + type + "' from broker");
+ }
Collection<ConfigurationEntry> entries = childEntries.get(type);
for (ConfigurationEntry childEntry : entries)
{
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProvider.java Tue Nov 13 17:19:07 2012
@@ -70,7 +70,7 @@ public class DefaultRecovererProvider im
case PLUGIN:
return new PluginRecoverer(_pluginFactoryServiceLoader);
}
- throw new IllegalConfigurationException("Cannot create a recoverer for the type: " + type);
+ return null;
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/startup/VirtualHostRecoverer.java Tue Nov 13 17:19:07 2012
@@ -63,6 +63,7 @@ public class VirtualHostRecoverer extend
Configuration conf = null;
if (configuration == null)
{
+ // TODO throw an exception
conf = new XMLConfiguration();
}
else
@@ -83,10 +84,11 @@ public class VirtualHostRecoverer extend
throw new IllegalConfigurationException("Cannot load configuration for virtual host '" + name + "' from file " + configurationFile);
}
}
+ // TODO: remove virtual host configuration
VirtualHostConfiguration virtualHostConfiguration = null;
try
{
- virtualHostConfiguration = new VirtualHostConfiguration(name, conf);
+ virtualHostConfiguration = new VirtualHostConfiguration(name, conf, broker);
}
catch (ConfigurationException e)
{
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/XMLConfigurationEntryStore.java Tue Nov 13 17:19:07 2012
@@ -68,6 +68,11 @@ public class XMLConfigurationEntryStore
private PortConfigurationHelper _portConfigurationHelper;
+ public XMLConfigurationEntryStore(File configFile) throws ConfigurationException
+ {
+ this(new ServerConfiguration(configFile), new BrokerOptions());
+ }
+
public XMLConfigurationEntryStore(File configFile, BrokerOptions options) throws ConfigurationException
{
this(new ServerConfiguration(configFile), options);
@@ -106,6 +111,17 @@ public class XMLConfigurationEntryStore
{
// XXX include all broker attributes
Map<String, Object> brokerAttributes = new HashMap<String, Object>();
+ brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, _serverConfiguration.getMaximumMessageAge());
+ brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, _serverConfiguration.getMaximumMessageSize());
+ brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, _serverConfiguration.getMaximumQueueDepth());
+ brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, _serverConfiguration.getMaximumMessageCount());
+ brokerAttributes.put(Broker.ALERT_REPEAT_GAP, _serverConfiguration.getMinimumAlertRepeatGap());
+ brokerAttributes.put(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES, _serverConfiguration.getFlowResumeCapacity());
+ brokerAttributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, _serverConfiguration.getCapacity());
+ brokerAttributes.put(Broker.MAXIMUM_DELIVERY_ATTEMPTS, _serverConfiguration.getMaxDeliveryCount());
+ brokerAttributes.put(Broker.DEAD_LETTER_QUEUE_ENABLED, _serverConfiguration.isDeadLetterQueueEnabled());
+ brokerAttributes.put(Broker.HOUSEKEEPING_CHECK_PERIOD, _serverConfiguration.getHousekeepingCheckPeriod());
+
brokerAttributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, _serverConfiguration.getDefaultAuthenticationManager());
ConfigurationEntry rootEntry = new ConfigurationEntry(_rootId, ConfiguredObjectType.BROKER, brokerAttributes,
Collections.unmodifiableSet(_rootChildren.keySet()), this);
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java Tue Nov 13 17:19:07 2012
@@ -46,6 +46,17 @@ public interface Broker extends Configur
String UPDATED = "updated";
String DEFAULT_AUTHENTICATION_PROVIDER = "defaultAuthenticationProvider";
+ String ALERT_THRESHOLD_MESSAGE_AGE = "alertThresholdMessageAge";
+ String ALERT_THRESHOLD_MESSAGE_COUNT = "alertThresholdMessageCount";
+ String ALERT_THRESHOLD_QUEUE_DEPTH = "alertThresholdQueueDepth";
+ String ALERT_THRESHOLD_MESSAGE_SIZE = "alertThresholdMessageSize";
+ String ALERT_REPEAT_GAP = "alertRepeatGap";
+ String FLOW_CONTROL_SIZE_BYTES = "queueFlowControlSizeBytes";
+ String FLOW_CONTROL_RESUME_SIZE_BYTES = "queueFlowResumeSizeBytes";
+ String MAXIMUM_DELIVERY_ATTEMPTS = "maximumDeliveryAttempts";
+ String DEAD_LETTER_QUEUE_ENABLED = "deadLetterQueueEnabled";
+ String HOUSEKEEPING_CHECK_PERIOD = "housekeepingCheckPeriod";
+
// Attributes
public static final Collection<String> AVAILABLE_ATTRIBUTES =
Collections.unmodifiableList(
@@ -64,7 +75,17 @@ public interface Broker extends Configur
STATE,
TIME_TO_LIVE,
UPDATED,
- DEFAULT_AUTHENTICATION_PROVIDER));
+ DEFAULT_AUTHENTICATION_PROVIDER,
+ ALERT_THRESHOLD_MESSAGE_AGE,
+ ALERT_THRESHOLD_MESSAGE_COUNT,
+ ALERT_THRESHOLD_QUEUE_DEPTH,
+ ALERT_THRESHOLD_MESSAGE_SIZE,
+ ALERT_REPEAT_GAP,
+ FLOW_CONTROL_SIZE_BYTES,
+ FLOW_CONTROL_RESUME_SIZE_BYTES,
+ MAXIMUM_DELIVERY_ATTEMPTS,
+ DEAD_LETTER_QUEUE_ENABLED,
+ HOUSEKEEPING_CHECK_PERIOD));
//children
Collection < VirtualHost > getVirtualHosts();
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Tue Nov 13 17:19:07 2012
@@ -20,6 +20,10 @@
*/
package org.apache.qpid.server.model.adapter;
+import static org.apache.qpid.server.util.MapValueConverter.getLongAttribute;
+import static org.apache.qpid.server.util.MapValueConverter.getIntegerAttribute;
+import static org.apache.qpid.server.util.MapValueConverter.getBooleanAttribute;
+
import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.Collection;
@@ -30,8 +34,8 @@ import java.util.UUID;
import org.apache.log4j.Logger;
import org.apache.qpid.common.QpidProperties;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.logging.actors.BrokerActor;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.model.AuthenticationProvider;
@@ -68,8 +72,20 @@ public class BrokerAdapter extends Abstr
private final PortFactory _portFactory;
+ private long _maximumMessageAge;
+ private long _maximumMessageCount;
+ private long _maximumQueueDepth;
+ private long _maximumMessageSize;
+ private long _minimumAlertRepeatGap;
+ private long _flowResumeCapacity;
+ private long _flowCapacity;
+ private int _maximumDeliveryCount;
+ private boolean _deadLetterQueueEnabled;
+ private long _housekeepingCheckPeriod;
+
- public BrokerAdapter(UUID id, IApplicationRegistry instance, AuthenticationProviderFactory authenticationProviderFactory, PortFactory portFactory)
+ public BrokerAdapter(UUID id, Map<String, Object> attributes, IApplicationRegistry instance,
+ AuthenticationProviderFactory authenticationProviderFactory, PortFactory portFactory)
{
super(id);
_name = "Broker";
@@ -78,6 +94,17 @@ public class BrokerAdapter extends Abstr
_statistics = new StatisticsAdapter(instance);
_authenticationProviderFactory = authenticationProviderFactory;
_portFactory = portFactory;
+
+ _maximumMessageAge = getLongAttribute(ALERT_THRESHOLD_MESSAGE_AGE, attributes, Long.getLong(BrokerProperties.PROPERTY_MAXIMUM_MESSAGE_AGE, 0));
+ _maximumMessageCount = getLongAttribute(ALERT_THRESHOLD_MESSAGE_COUNT, attributes, Long.getLong(BrokerProperties.PROPERTY_MAXIMUM_MESSAGE_COUNT, 0));
+ _maximumQueueDepth = getLongAttribute(ALERT_THRESHOLD_QUEUE_DEPTH, attributes, Long.getLong(BrokerProperties.PROPERTY_MAXIMUM_QUEUE_DEPTH, 0));
+ _maximumMessageSize = getLongAttribute(ALERT_THRESHOLD_MESSAGE_SIZE, attributes, Long.getLong(BrokerProperties.PROPERTY_MAXIMUM_MESSAGE_SIZE, 0));
+ _minimumAlertRepeatGap = getLongAttribute(ALERT_REPEAT_GAP, attributes, Long.getLong(BrokerProperties.PROPERTY_MINIMUM_ALERT_REPEAT_GAP, BrokerProperties.DEFAULT_MINIMUM_ALERT_REPEAT_GAP));
+ _flowCapacity = getLongAttribute(FLOW_CONTROL_SIZE_BYTES, attributes, Long.getLong(BrokerProperties.PROPERTY_FLOW_CAPACITY, 0));
+ _flowResumeCapacity = getLongAttribute(FLOW_CONTROL_RESUME_SIZE_BYTES, attributes, Long.getLong(BrokerProperties.PROPERTY_FLOW_RESUME_CAPACITY, _flowCapacity));
+ _maximumDeliveryCount = getIntegerAttribute(MAXIMUM_DELIVERY_ATTEMPTS, attributes, 0);
+ _deadLetterQueueEnabled = getBooleanAttribute(DEAD_LETTER_QUEUE_ENABLED, attributes, false);
+ _housekeepingCheckPeriod = getLongAttribute(HOUSEKEEPING_CHECK_PERIOD, attributes, Long.getLong(BrokerProperties.PROPERTY_HOUSE_KEEPING_CHECK_PERIOD, BrokerProperties.DEFAULT_HOUSEKEEPING_PERIOD));
}
public Collection<VirtualHost> getVirtualHosts()
@@ -155,13 +182,10 @@ public class BrokerAdapter extends Abstr
private VirtualHost createVirtualHost(final Map<String, Object> attributes)
throws AccessControlException, IllegalArgumentException
{
- String virtualHostName = (String) attributes.get(VirtualHost.NAME);
- VirtualHostConfiguration vhostConfig = _applicationRegistry.getConfiguration().getVirtualHostConfig(virtualHostName);
-
VirtualHostRegistry virtualHostRegistry = _applicationRegistry.getVirtualHostRegistry();
final VirtualHostAdapter virtualHostAdapter = new VirtualHostAdapter(UUID.randomUUID(), this,
attributes, virtualHostRegistry, (StatisticsGatherer)_applicationRegistry,
- _applicationRegistry.getSecurityManager(), vhostConfig);
+ _applicationRegistry.getSecurityManager(), null);
synchronized (_vhostAdapters)
{
@@ -432,6 +456,46 @@ public class BrokerAdapter extends Abstr
{
return getDefaultAuthenticationProvider();
}
+ else if (ALERT_THRESHOLD_MESSAGE_AGE.equals(name))
+ {
+ return _maximumMessageAge;
+ }
+ else if (ALERT_THRESHOLD_MESSAGE_COUNT.equals(name))
+ {
+ return _maximumMessageCount;
+ }
+ else if (ALERT_THRESHOLD_QUEUE_DEPTH.equals(name))
+ {
+ return _maximumQueueDepth;
+ }
+ else if (ALERT_THRESHOLD_MESSAGE_SIZE.equals(name))
+ {
+ return _maximumMessageSize;
+ }
+ else if (ALERT_REPEAT_GAP.equals(name))
+ {
+ return _minimumAlertRepeatGap;
+ }
+ else if (FLOW_CONTROL_SIZE_BYTES.equals(name))
+ {
+ return _flowCapacity;
+ }
+ else if (FLOW_CONTROL_RESUME_SIZE_BYTES.equals(name))
+ {
+ return _flowResumeCapacity;
+ }
+ else if (MAXIMUM_DELIVERY_ATTEMPTS.equals(name))
+ {
+ return _maximumDeliveryCount;
+ }
+ else if (DEAD_LETTER_QUEUE_ENABLED.equals(name))
+ {
+ return _deadLetterQueueEnabled;
+ }
+ else if (HOUSEKEEPING_CHECK_PERIOD.equals(name))
+ {
+ return _housekeepingCheckPeriod;
+ }
return super.getAttribute(name); //TODO - Implement.
}
@@ -622,4 +686,5 @@ public class BrokerAdapter extends Abstr
addPlugin(object);
}
}
+
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java Tue Nov 13 17:19:07 2012
@@ -30,13 +30,13 @@ import org.apache.qpid.AMQSecurityExcept
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.QueueConfiguration;
-import org.apache.qpid.server.configuration.ServerConfiguration;
+import org.apache.qpid.server.exchange.DefaultExchangeFactory;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.exchange.ExchangeFactory;
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.model.UUIDGenerator;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
public class AMQQueueFactory
@@ -411,10 +411,7 @@ public class AMQQueueFactory
*/
protected static String getDeadLetterQueueName(String name)
{
- //XXX remove reference to ServerConfiguration
- ServerConfiguration serverConfig = ApplicationRegistry.getInstance().getConfiguration();
- String dlQueueName = name + serverConfig.getDeadLetterQueueSuffix();
- return dlQueueName;
+ return name + System.getProperty(BrokerProperties.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, DEFAULT_DLQ_NAME_SUFFIX);
}
/**
@@ -426,10 +423,7 @@ public class AMQQueueFactory
*/
protected static String getDeadLetterExchangeName(String name)
{
- //XXX remove reference to ServerConfiguration
- ServerConfiguration serverConfig = ApplicationRegistry.getInstance().getConfiguration();
- String dlExchangeName = name + serverConfig.getDeadLetterExchangeSuffix();
- return dlExchangeName;
+ return name + System.getProperty(BrokerProperties.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
}
private static Map<String, Object> createQueueArgumentsFromConfig(QueueConfiguration config)
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Tue Nov 13 17:19:07 2012
@@ -131,25 +131,24 @@ public class SimpleAMQQueue implements A
private final AtomicInteger _bindingCountHigh = new AtomicInteger();
- // XXX remove references to ServerConfiguration
/** max allowed size(KB) of a single message */
- private long _maximumMessageSize = ApplicationRegistry.getInstance().getConfiguration().getMaximumMessageSize();
+ private long _maximumMessageSize;
/** max allowed number of messages on a queue. */
- private long _maximumMessageCount = ApplicationRegistry.getInstance().getConfiguration().getMaximumMessageCount();
+ private long _maximumMessageCount;
/** max queue depth for the queue */
- private long _maximumQueueDepth = ApplicationRegistry.getInstance().getConfiguration().getMaximumQueueDepth();
+ private long _maximumQueueDepth;
/** maximum message age before alerts occur */
- private long _maximumMessageAge = ApplicationRegistry.getInstance().getConfiguration().getMaximumMessageAge();
+ private long _maximumMessageAge;
/** the minimum interval between sending out consecutive alerts of the same type */
- private long _minimumAlertRepeatGap = ApplicationRegistry.getInstance().getConfiguration().getMinimumAlertRepeatGap();
+ private long _minimumAlertRepeatGap;
- private long _capacity = ApplicationRegistry.getInstance().getConfiguration().getCapacity();
+ private long _capacity;
- private long _flowResumeCapacity = ApplicationRegistry.getInstance().getConfiguration().getFlowResumeCapacity();
+ private long _flowResumeCapacity;
private final Set<NotificationCheck> _notificationChecks = EnumSet.noneOf(NotificationCheck.class);
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Tue Nov 13 17:19:07 2012
@@ -28,11 +28,9 @@ import java.util.TimerTask;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.commons.configuration.ConfigurationException;
import org.apache.log4j.Logger;
import org.apache.qpid.common.Closeable;
import org.apache.qpid.common.QpidProperties;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.configuration.ConfigurationEntryStore;
import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer;
import org.apache.qpid.server.configuration.RecovererProvider;
@@ -78,8 +76,6 @@ public class ApplicationRegistry impleme
private static AtomicReference<IApplicationRegistry> _instance = new AtomicReference<IApplicationRegistry>(null);
- private final ServerConfiguration _configuration;
-
private final VirtualHostRegistry _virtualHostRegistry = new VirtualHostRegistry(this);
private SecurityManager _securityManager;
@@ -166,25 +162,13 @@ public class ApplicationRegistry impleme
}
}
- // XXX remove this constructor
- public ApplicationRegistry(ServerConfiguration configuration) throws ConfigurationException
- {
- _configuration = configuration;
- }
-
public ApplicationRegistry(ConfigurationEntryStore store)
{
_store = store;
- _configuration = ((XMLConfigurationEntryStore)store).getConfiguration();
}
public void initialise() throws Exception
{
- // only in tests store is null
- if (_store == null)
- {
- _store = new XMLConfigurationEntryStore(_configuration, new BrokerOptions());
- }
_logRecorder = new LogRecorder();
//Create the composite (log4j+SystemOut MessageLogger to be used during startup
@@ -201,13 +185,15 @@ public class ApplicationRegistry impleme
logStartupMessages(CurrentActor.get());
- _securityManager = new SecurityManager(_configuration.getConfig());
+ // XXX hack
+ ServerConfiguration configuration = ((XMLConfigurationEntryStore)_store).getConfiguration();
+ _securityManager = new SecurityManager(configuration.getConfig());
RecovererProvider provider = new DefaultRecovererProvider(this);
ConfiguredObjectRecoverer<? extends ConfiguredObject> brokerRecoverer = provider.getRecoverer(ConfiguredObjectType.BROKER);
_broker = (Broker) brokerRecoverer.create(provider, _store.getRootEntry());
- getVirtualHostRegistry().setDefaultVirtualHostName(_configuration.getDefaultVirtualHost());
+ getVirtualHostRegistry().setDefaultVirtualHostName(configuration.getDefaultVirtualHost());
initialiseStatisticsReporting();
@@ -218,7 +204,7 @@ public class ApplicationRegistry impleme
// Create the RootLogger to be used during broker operation
// XXX this setting should be retrieved from the broker
- _rootMessageLogger = new Log4jMessageLogger(_configuration.getStatusUpdatesEnabled()); // _broker.getStatusUpdatesEnabled()
+ _rootMessageLogger = new Log4jMessageLogger(configuration.getStatusUpdatesEnabled()); // _broker.getStatusUpdatesEnabled()
CurrentActor.setDefault(new BrokerActor(_rootMessageLogger));
GenericActor.setDefaultMessageLogger(_rootMessageLogger);
@@ -237,10 +223,12 @@ public class ApplicationRegistry impleme
public void initialiseStatisticsReporting()
{
- long report = _configuration.getStatisticsReportingPeriod() * 1000; // convert to ms
- final boolean broker = _configuration.isStatisticsGenerationBrokerEnabled();
- final boolean virtualhost = _configuration.isStatisticsGenerationVirtualhostsEnabled();
- final boolean reset = _configuration.isStatisticsReportResetEnabled();
+ // XXX hack
+ ServerConfiguration configuration = ((XMLConfigurationEntryStore)_store).getConfiguration();
+ long report = configuration.getStatisticsReportingPeriod() * 1000; // convert to ms
+ final boolean broker = configuration.isStatisticsGenerationBrokerEnabled();
+ final boolean virtualhost = configuration.isStatisticsGenerationVirtualhostsEnabled();
+ final boolean reset = configuration.isStatisticsReportResetEnabled();
/* add a timer task to report statistics if generation is enabled for broker or virtualhosts */
if (report > 0L && (broker || virtualhost))
@@ -386,11 +374,14 @@ public class ApplicationRegistry impleme
{
CurrentActor.remove();
}
+ _store = null;
+ _broker = null;
}
public ServerConfiguration getConfiguration()
{
- return _configuration;
+ // XXX hack
+ return ((XMLConfigurationEntryStore)_store).getConfiguration();
}
public VirtualHostRegistry getVirtualHostRegistry()
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java Tue Nov 13 17:19:07 2012
@@ -25,8 +25,10 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.util.TestApplicationRegistry;
+import org.mockito.Mockito;
public class QueueConfigurationTest extends TestCase
{
@@ -34,11 +36,13 @@ public class QueueConfigurationTest exte
private VirtualHostConfiguration _emptyConf;
private PropertiesConfiguration _env;
private VirtualHostConfiguration _fullHostConf;
+ private Broker _broker;
public void setUp() throws Exception
{
+ _broker = Mockito.mock(Broker.class);
_env = new PropertiesConfiguration();
- _emptyConf = new VirtualHostConfiguration("test", _env);
+ _emptyConf = new VirtualHostConfiguration("test", _env, _broker);
PropertiesConfiguration fullEnv = new PropertiesConfiguration();
fullEnv.setProperty("queues.maximumMessageAge", 1);
@@ -49,7 +53,7 @@ public class QueueConfigurationTest exte
fullEnv.setProperty("queues.deadLetterQueues", true);
fullEnv.setProperty("queues.maximumDeliveryCount", 5);
- _fullHostConf = new VirtualHostConfiguration("test", fullEnv);
+ _fullHostConf = new VirtualHostConfiguration("test", fullEnv, _broker);
}
@@ -57,9 +61,11 @@ public class QueueConfigurationTest exte
{
try
{
- ApplicationRegistry registry = new TestApplicationRegistry(new ServerConfiguration(_env));
+ ApplicationRegistry registry = new TestApplicationRegistry(_env);
ApplicationRegistry.initialise(registry);
+ Mockito.when(_broker.getAttribute(Broker.MAXIMUM_DELIVERY_ATTEMPTS)).thenReturn(0);
+
// Check default value
QueueConfiguration qConf = new QueueConfiguration("test", _emptyConf);
assertEquals("Unexpected default server configuration for max delivery count ", 0, qConf.getMaxDeliveryCount());
@@ -89,9 +95,11 @@ public class QueueConfigurationTest exte
{
try
{
- ApplicationRegistry registry = new TestApplicationRegistry(new ServerConfiguration(_env));
+ ApplicationRegistry registry = new TestApplicationRegistry(_env);
ApplicationRegistry.initialise(registry);
+ Mockito.when(_broker.getAttribute(Broker.DEAD_LETTER_QUEUE_ENABLED)).thenReturn(false);
+
// Check default value
QueueConfiguration qConf = new QueueConfiguration("test", _emptyConf);
assertFalse("Unexpected queue configuration for dead letter enabled attribute", qConf.isDeadLetterQueueEnabled());
@@ -180,8 +188,11 @@ public class QueueConfigurationTest exte
{
try
{
- ApplicationRegistry registry = new TestApplicationRegistry(new ServerConfiguration(_env));
+ ApplicationRegistry registry = new TestApplicationRegistry(_env);
ApplicationRegistry.initialise(registry);
+
+ Mockito.when(_broker.getAttribute(Broker.ALERT_REPEAT_GAP)).thenReturn(ServerConfiguration.DEFAULT_MINIMUM_ALERT_REPEAT_GAP);
+
// Check default value
QueueConfiguration qConf = new QueueConfiguration("test", _emptyConf);
assertEquals(ServerConfiguration.DEFAULT_MINIMUM_ALERT_REPEAT_GAP, qConf.getMinimumAlertRepeatGap());
@@ -235,6 +246,6 @@ public class QueueConfigurationTest exte
config.addConfiguration(_fullHostConf.getConfig());
config.addConfiguration(queueConfig);
- return new VirtualHostConfiguration("test", config);
+ return new VirtualHostConfiguration("test", config, _broker);
}
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java Tue Nov 13 17:19:07 2012
@@ -24,6 +24,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.configuration.store.XMLConfigurationEntryStore;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -52,7 +53,7 @@ public class ServerConfigurationTest ext
{
super.setUp();
_serverConfig = new ServerConfiguration(_config);
- ApplicationRegistry.initialise(new TestApplicationRegistry(_serverConfig));
+ ApplicationRegistry.initialise(new TestApplicationRegistry(_config));
}
@Override
@@ -899,7 +900,9 @@ public class ServerConfigurationTest ext
// Load config
ApplicationRegistry.remove();
- ApplicationRegistry reg = new ApplicationRegistry(new ServerConfiguration(mainFile));
+
+ ConfigurationEntryStore store = new XMLConfigurationEntryStore(mainFile);
+ ApplicationRegistry reg = new ApplicationRegistry(store);
ApplicationRegistry.initialise(reg);
// Test config
@@ -932,7 +935,8 @@ public class ServerConfigurationTest ext
// Load config
ApplicationRegistry.remove();
- ApplicationRegistry reg = new ApplicationRegistry(new ServerConfiguration(mainFile));
+ ConfigurationEntryStore store = new XMLConfigurationEntryStore(mainFile);
+ ApplicationRegistry reg = new ApplicationRegistry(store);
ApplicationRegistry.initialise(reg);
// Test config
@@ -967,7 +971,8 @@ public class ServerConfigurationTest ext
// Load config
ApplicationRegistry.remove();
- ApplicationRegistry reg = new ApplicationRegistry(new ServerConfiguration(mainFile));
+ ConfigurationEntryStore store = new XMLConfigurationEntryStore(mainFile);
+ ApplicationRegistry reg = new ApplicationRegistry(store);
ApplicationRegistry.initialise(reg);
// Test config
@@ -1012,7 +1017,8 @@ public class ServerConfigurationTest ext
try
{
ApplicationRegistry.remove();
- ApplicationRegistry reg = new ApplicationRegistry(new ServerConfiguration(mainFile));
+ ConfigurationEntryStore store = new XMLConfigurationEntryStore(mainFile);
+ ApplicationRegistry reg = new ApplicationRegistry(store);
ApplicationRegistry.initialise(reg);
fail("Different virtualhost XML configurations not allowed");
}
@@ -1047,7 +1053,8 @@ public class ServerConfigurationTest ext
try
{
ApplicationRegistry.remove();
- ApplicationRegistry reg = new ApplicationRegistry(new ServerConfiguration(mainFile));
+ ConfigurationEntryStore store = new XMLConfigurationEntryStore(mainFile);
+ ApplicationRegistry reg = new ApplicationRegistry(store);
ApplicationRegistry.initialise(reg);
fail("Multiple virtualhost XML configurations not allowed");
}
@@ -1479,6 +1486,7 @@ public class ServerConfigurationTest ext
/**
* Test XML configuration file correctly enables dead letter queues
*/
+ /*
public void testDeadLetterQueueConfigurationFile() throws Exception
{
// Write config
@@ -1530,7 +1538,8 @@ public class ServerConfigurationTest ext
// Load config
ApplicationRegistry.remove();
- ApplicationRegistry registry = new ApplicationRegistry(new ServerConfiguration(xml));
+ ConfigurationEntryStore store = new XMLConfigurationEntryStore(xml);
+ ApplicationRegistry registry = new ApplicationRegistry(store);
ApplicationRegistry.initialise(registry);
ServerConfiguration serverConfiguration = ApplicationRegistry.getInstance().getConfiguration();
@@ -1547,13 +1556,14 @@ public class ServerConfigurationTest ext
// Validate config
assertTrue("Broker DLQ should be configured as enabled", serverConfiguration.isDeadLetterQueueEnabled());
assertFalse("Test vhost DLQ should be configured as disabled", test.isDeadLetterQueueEnabled());
+
assertTrue("Extra vhost DLQ should be enabled, using broker default", extra.isDeadLetterQueueEnabled());
assertTrue("Biggles queue DLQ should be configured as enabled", biggles.isDeadLetterQueueEnabled());
assertFalse("Beetle queue DLQ should be disabled, using test vhost default", beetle.isDeadLetterQueueEnabled());
assertFalse("R2D2 queue DLQ should be configured as disabled", r2d2.isDeadLetterQueueEnabled());
assertTrue("C3P0 queue DLQ should be enabled, using broker default", c3p0.isDeadLetterQueueEnabled());
}
-
+*/
public void testIsAmqp010enabled() throws ConfigurationException
{
// Check default
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java Tue Nov 13 17:19:07 2012
@@ -37,7 +37,7 @@ public class BaseActorTestCase extends I
@Override
public void configure()
{
- getConfiguration().getConfig().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
+ getConfigXml().setProperty(ServerConfiguration.STATUS_UPDATES, "on");
}
@Override
@@ -45,7 +45,7 @@ public class BaseActorTestCase extends I
{
super.createBroker();
- _rawLogger = new UnitTestMessageLogger(getConfiguration().getStatusUpdatesEnabled());
+ _rawLogger = new UnitTestMessageLogger(getRegistry().getConfiguration().getStatusUpdatesEnabled());
_rootLogger = _rawLogger;
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java Tue Nov 13 17:19:07 2012
@@ -23,7 +23,6 @@ package org.apache.qpid.server.protocol;
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.qpid.protocol.ServerProtocolEngine;
-import org.apache.qpid.server.configuration.ServerConfiguration;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.util.TestApplicationRegistry;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -41,7 +40,7 @@ public class MultiVersionProtocolEngineF
{
super.setUp();
- _appRegistry = new TestApplicationRegistry(new ServerConfiguration(new XMLConfiguration()));
+ _appRegistry = new TestApplicationRegistry(new XMLConfiguration());
ApplicationRegistry.initialise(_appRegistry);
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java Tue Nov 13 17:19:07 2012
@@ -26,7 +26,7 @@ import org.apache.qpid.AMQException;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.configuration.ServerConfiguration;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.exchange.DefaultExchangeFactory;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.exchange.ExchangeRegistry;
@@ -56,9 +56,13 @@ public class AMQQueueFactoryTest extends
configXml.addProperty("virtualhosts.virtualhost(-1).name", getName());
configXml.addProperty("virtualhosts.virtualhost(-1)."+getName()+".store.class", TestableMemoryMessageStore.class.getName());
- ServerConfiguration configuration = new ServerConfiguration(configXml);
+ if (getName().equals("testDeadLetterQueueDoesNotInheritDLQorMDCSettings"))
+ {
+ configXml.addProperty("deadLetterQueues","true");
+ configXml.addProperty("maximumDeliveryCount","5");
+ }
- ApplicationRegistry registry = new TestApplicationRegistry(configuration);
+ ApplicationRegistry registry = new TestApplicationRegistry(configXml);
ApplicationRegistry.initialise(registry);
registry.getVirtualHostRegistry().setDefaultVirtualHostName(getName());
@@ -172,11 +176,8 @@ public class AMQQueueFactoryTest extends
* are not applied to the DLQ itself.
* @throws AMQException
*/
- public void testDeadLetterQueueDoesNotInheritDLQorMDCSettings() throws AMQException
+ public void testDeadLetterQueueDoesNotInheritDLQorMDCSettings() throws Exception
{
- ApplicationRegistry.getInstance().getConfiguration().getConfig().addProperty("deadLetterQueues","true");
- ApplicationRegistry.getInstance().getConfiguration().getConfig().addProperty("maximumDeliveryCount","5");
-
String queueName = "testDeadLetterQueueEnabled";
AMQShortString dlExchangeName = new AMQShortString(queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
AMQShortString dlQueueName = new AMQShortString(queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
@@ -336,11 +337,8 @@ public class AMQQueueFactoryTest extends
try
{
// change DLQ name to make its length bigger than exchange name
- ApplicationRegistry.getInstance().getConfiguration().getConfig()
- .addProperty("deadLetterExchangeSuffix", "_DLE");
- ApplicationRegistry.getInstance().getConfiguration().getConfig()
- .addProperty("deadLetterQueueSuffix", "_DLQUEUE");
-
+ setTestSystemProperty(BrokerProperties.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, "_DLE");
+ setTestSystemProperty(BrokerProperties.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, "_DLQUEUE");
FieldTable fieldTable = new FieldTable();
fieldTable.setBoolean(AMQQueueFactory.X_QPID_DLQ_ENABLED, true);
AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner",
@@ -372,11 +370,8 @@ public class AMQQueueFactoryTest extends
try
{
// change DLQ name to make its length bigger than exchange name
- ApplicationRegistry.getInstance().getConfiguration().getConfig()
- .addProperty("deadLetterExchangeSuffix", "_DLEXCHANGE");
- ApplicationRegistry.getInstance().getConfiguration().getConfig()
- .addProperty("deadLetterQueueSuffix", "_DLQ");
-
+ setTestSystemProperty(BrokerProperties.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, "_DLEXCHANGE");
+ setTestSystemProperty(BrokerProperties.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, "_DLQ");
FieldTable fieldTable = new FieldTable();
fieldTable.setBoolean(AMQQueueFactory.X_QPID_DLQ_ENABLED, true);
AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner",
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java Tue Nov 13 17:19:07 2012
@@ -44,6 +44,7 @@ import org.apache.qpid.server.exchange.D
import org.apache.qpid.server.message.AMQMessage;
import org.apache.qpid.server.message.MessageMetaData;
import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.queue.BaseQueue.PostEnqueueAction;
import org.apache.qpid.server.queue.SimpleAMQQueue.QueueEntryFilter;
@@ -113,7 +114,7 @@ public class SimpleAMQQueueTest extends
ApplicationRegistry applicationRegistry = (ApplicationRegistry)ApplicationRegistry.getInstance();
PropertiesConfiguration env = new PropertiesConfiguration();
- final VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(getClass().getName(), env);
+ final VirtualHostConfiguration vhostConfig = new VirtualHostConfiguration(getClass().getName(), env, mock(Broker.class));
vhostConfig.setMessageStoreClass(TestableMemoryMessageStore.class.getName());
_virtualHost = new VirtualHostImpl( applicationRegistry.getVirtualHostRegistry(), (StatisticsGatherer)applicationRegistry,
applicationRegistry.getSecurityManager(), vhostConfig);
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java Tue Nov 13 17:19:07 2012
@@ -85,7 +85,7 @@ public class ApplicationRegistryShutdown
//Close the registry which will perform the close the AuthenticationManager
stopBroker();
- //Validate that the SASL plugFins have been removed.
+ //Validate that the SASL plugins have been removed.
Provider[] providersAfterClose = Security.getProviders();
assertTrue("No providers unregistered", providersAfterInitialisation.length > providersAfterClose.length);
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java Tue Nov 13 17:19:07 2012
@@ -38,6 +38,7 @@ import org.apache.qpid.server.exchange.E
import org.apache.qpid.server.exchange.TopicExchange;
import org.apache.qpid.server.message.AMQMessage;
import org.apache.qpid.server.message.MessageMetaData;
+import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.plugin.ExchangeType;
import org.apache.qpid.server.queue.AMQPriorityQueue;
@@ -54,6 +55,7 @@ import org.apache.qpid.server.txn.Server
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.util.FileUtils;
+import org.mockito.Mockito;
import java.io.File;
import java.util.HashMap;
@@ -132,7 +134,7 @@ public class MessageStoreTest extends In
try
{
- setVirtualHost(ApplicationRegistry.getInstance().createVirtualHost(new VirtualHostConfiguration(getClass().getName(), _config)));
+ setVirtualHost(ApplicationRegistry.getInstance().createVirtualHost(new VirtualHostConfiguration(getClass().getName(), _config, Mockito.mock(Broker.class))));
}
catch (Exception e)
{
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java Tue Nov 13 17:19:07 2012
@@ -32,7 +32,6 @@ import org.apache.qpid.framing.ContentHe
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.configuration.ServerConfiguration;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.logging.SystemOutMessageLogger;
import org.apache.qpid.server.logging.actors.CurrentActor;
@@ -58,7 +57,6 @@ public class InternalBrokerBaseCase exte
private VirtualHost _virtualHost;
private AMQQueue _queue;
private AMQShortString QUEUE_NAME;
- private ServerConfiguration _configuration;
private XMLConfiguration _configXml = new XMLConfiguration();
private boolean _started = false;
@@ -80,8 +78,6 @@ public class InternalBrokerBaseCase exte
_started = true;
CurrentActor.set(new TestLogActor(new SystemOutMessageLogger()));
- _configuration = new ServerConfiguration(_configXml);
-
configure();
_registry = createApplicationRegistry();
@@ -120,7 +116,7 @@ public class InternalBrokerBaseCase exte
protected IApplicationRegistry createApplicationRegistry() throws ConfigurationException
{
- return new TestApplicationRegistry(_configuration);
+ return new TestApplicationRegistry(_configXml);
}
protected void configure()
@@ -340,16 +336,6 @@ public class InternalBrokerBaseCase exte
this.QUEUE_NAME = QUEUE_NAME;
}
- public ServerConfiguration getConfiguration()
- {
- return _configuration;
- }
-
- public void setConfiguration(ServerConfiguration configuration)
- {
- _configuration = configuration;
- }
-
public XMLConfiguration getConfigXml()
{
return _configXml;
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java Tue Nov 13 17:19:07 2012
@@ -20,8 +20,15 @@
*/
package org.apache.qpid.server.util;
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.qpid.server.configuration.ServerConfiguration;
+import org.apache.commons.configuration.ConfigurationUtils;
+import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.qpid.server.configuration.ConfigurationEntryStore;
+import org.apache.qpid.server.configuration.store.XMLConfigurationEntryStore;
import org.apache.qpid.server.logging.NullRootMessageLogger;
import org.apache.qpid.server.logging.actors.BrokerActor;
import org.apache.qpid.server.logging.actors.CurrentActor;
@@ -33,16 +40,15 @@ import org.apache.qpid.server.security.a
public class TestApplicationRegistry extends ApplicationRegistry
{
- public TestApplicationRegistry(ServerConfiguration config) throws ConfigurationException
+ public TestApplicationRegistry(Configuration config) throws ConfigurationException
{
- super(config);
+ super(createStore(config));
}
@Override
public void initialise() throws Exception
{
LoggingManagementFacade.configure("test-profiles/log4j-test.xml");
- getConfiguration().getConfig().addProperty("security." + TestAuthenticationManagerFactory.TEST_AUTH_MANAGER_MARKER, "");
super.initialise();
@@ -50,6 +56,30 @@ public class TestApplicationRegistry ext
GenericActor.setDefaultMessageLogger(new NullRootMessageLogger());
}
+ private static ConfigurationEntryStore createStore(Configuration config) throws ConfigurationException
+ {
+ File file;
+ try
+ {
+ file = File.createTempFile("_config", ".xml");
+ }
+ catch (IOException e)
+ {
+ throw new ConfigurationException("Cannot create configuration file");
+ }
+ XMLConfiguration xmlConfiguration = null;
+ if (config instanceof XMLConfiguration)
+ {
+ xmlConfiguration = (XMLConfiguration)config;
+ }
+ else
+ {
+ xmlConfiguration = new XMLConfiguration(ConfigurationUtils.convertToHierarchical(config));
+ }
+ xmlConfiguration.addProperty("security." + TestAuthenticationManagerFactory.TEST_AUTH_MANAGER_MARKER, "");
+ xmlConfiguration.save(file);
+ return new XMLConfigurationEntryStore(file);
+ }
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java?rev=1408840&r1=1408839&r2=1408840&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostImplTest.java Tue Nov 13 17:19:07 2012
@@ -38,7 +38,6 @@ import java.io.IOException;
public class VirtualHostImplTest extends QpidTestCase
{
- private ServerConfiguration _configuration;
private ApplicationRegistry _registry;
@Override
@@ -174,9 +173,7 @@ public class VirtualHostImplTest extends
private VirtualHost createVirtualHost(String vhostName, File config) throws Exception
{
- _configuration = new ServerConfiguration(new XMLConfiguration(config));
-
- _registry = new TestApplicationRegistry(_configuration);
+ _registry = new TestApplicationRegistry(new XMLConfiguration(config));
ApplicationRegistry.initialise(_registry);
return _registry.getVirtualHostRegistry().getVirtualHost(vhostName);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org