Author: orudyy
Date: Wed Dec 12 17:40:53 2012
New Revision: 1420867
URL: http://svn.apache.org/viewvc?rev=1420867&view=rev
Log:
QPID-4390: Remove obsolete broker attributes and replace some of them with
system properties
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.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/store/XMLConfigurationEntryStore.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.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/protocol/AMQProtocolEngine.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/util/MapValueConverter.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/configuration/startup/BrokerRecovererTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
Modified:
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=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
Wed Dec 12 17:40:53 2012
@@ -9,11 +9,9 @@ public class BrokerProperties
{
public static final long DEFAULT_MINIMUM_ALERT_REPEAT_GAP = 30000l;
public static final long DEFAULT_HOUSEKEEPING_PERIOD = 30000L;
- public static final int DEFAULT_FRAME_SIZE = 65536;
- public static final int DEFAULT_HEART_BEAT_DELAY = 5;
- public static final double DEFAULT_HEART_BEAT_TIMEOUT_FACTOR = 2.0;
- public static final int DEFAULT_STATISTICS_SAMPLE_PERIOD = 5000;
- public static final int DEFAULT_STATISTICS_REPORTING_PERIOD = 0;
+ public static final int DEFAULT_HEART_BEAT_DELAY = 0;
+ public static final int DEFAULT_HEART_BEAT_TIMEOUT_FACTOR = 2;
+ public static final int DEFAULT_STATISTICS_REPORTING_PERIOD = 0;
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";
@@ -29,8 +27,11 @@ public class BrokerProperties
public static final String PROPERTY_FRAME_SIZE = "qpid.frame_size";
public static final String PROPERTY_MSG_AUTH = "qpid.msg_auth";
public static final String PROPERTY_STATUS_UPDATES = "qpid.status_updates";
- public static final String PROPERTY_SYNCHED_CLOCKS = "qpid.synched_clocks";
public static final String PROPERTY_LOCALE = "qpid.locale";
+ public static final String PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY =
"qpid.default_supported_protocol_version_reply";
+ public static final String PROPERTY_DISABLED_FEATURES =
"qpid.broker_disabled_features";
+
+ public static final int DEFAULT_FRAME_SIZE =
Integer.getInteger(PROPERTY_FRAME_SIZE, 65535);
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=1420867&r1=1420866&r2=1420867&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
Wed Dec 12 17:40:53 2012
@@ -33,7 +33,6 @@ import org.apache.commons.configuration.
import org.apache.log4j.Logger;
import org.apache.qpid.server.configuration.plugins.AbstractConfiguration;
import org.apache.qpid.server.exchange.DefaultExchangeFactory;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.server.queue.AMQQueueFactory;
import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -45,10 +44,8 @@ public class ServerConfiguration extends
// Default Configuration values
public static final int DEFAULT_BUFFER_SIZE = 262144;
- public static final String DEFAULT_STATUS_UPDATES = "on";
public static final String SECURITY_CONFIG_RELOADED = "SECURITY
CONFIGURATION RELOADED";
- public static final int DEFAULT_FRAME_SIZE = 65536;
public static final int DEFAULT_PORT = 5672;
public static final int DEFAULT_SSL_PORT = 5671;
public static final long DEFAULT_HOUSEKEEPING_PERIOD = 30000L;
@@ -79,13 +76,11 @@ public class ServerConfiguration extends
public static final String SECURITY_DEFAULT_AUTH_MANAGER =
"security.default-auth-manager";
public static final String
SECURITY_PORT_MAPPINGS_PORT_MAPPING_AUTH_MANAGER =
"security.port-mappings.port-mapping.auth-manager";
public static final String SECURITY_PORT_MAPPINGS_PORT_MAPPING_PORT =
"security.port-mappings.port-mapping.port";
- public static final String ADVANCED_LOCALE = "advanced.locale";
public static final String CONNECTOR_AMQP10ENABLED =
"connector.amqp10enabled";
public static final String CONNECTOR_AMQP010ENABLED =
"connector.amqp010enabled";
public static final String CONNECTOR_AMQP091ENABLED =
"connector.amqp091enabled";
public static final String CONNECTOR_AMQP09ENABLED =
"connector.amqp09enabled";
public static final String CONNECTOR_AMQP08ENABLED =
"connector.amqp08enabled";
- public static final String CONNECTOR_AMQP_SUPPORTED_REPLY =
"connector.amqpDefaultSupportedProtocolReply";
public static final String CONNECTOR_INCLUDE_10 = "connector.include10";
public static final String CONNECTOR_INCLUDE_010 = "connector.include010";
public static final String CONNECTOR_INCLUDE_091 = "connector.include091";
@@ -93,7 +88,6 @@ public class ServerConfiguration extends
public static final String CONNECTOR_INCLUDE_08 = "connector.include08";
{
- 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");
@@ -395,16 +389,6 @@ public class ServerConfiguration extends
_virtualHosts.put(config.getName(), config);
}
- public int getFrameSize()
- {
- return getIntValue("advanced.framesize", DEFAULT_FRAME_SIZE);
- }
-
- public boolean getSynchedClocks()
- {
- return getBooleanValue("advanced.synced-clocks");
- }
-
public String getDefaultAuthenticationManager()
{
return getStringValue(SECURITY_DEFAULT_AUTH_MANAGER);
@@ -454,11 +438,6 @@ public class ServerConfiguration extends
return getIntValue("heartbeat.delay", 5);
}
- public double getHeartBeatTimeout()
- {
- return getDoubleValue("heartbeat.timeoutFactor", 2.0);
- }
-
@Deprecated
public long getMaximumMessageAge()
{
@@ -501,11 +480,6 @@ public class ServerConfiguration extends
return getLongValue("flowResumeCapacity", getCapacity());
}
- public int getConnectorProcessors()
- {
- return getIntValue("connector.processors", 4);
- }
-
public List getPorts()
{
return getListValue("connector.port",
Collections.<Integer>singletonList(DEFAULT_PORT));
@@ -677,26 +651,6 @@ public class ServerConfiguration extends
return getLongValue("housekeeping.checkPeriod",
DEFAULT_HOUSEKEEPING_PERIOD);
}
- public long getStatisticsSamplePeriod()
- {
- return getConfig().getLong("statistics.sample.period", 5000L);
- }
-
- public boolean isStatisticsGenerationBrokerEnabled()
- {
- return getConfig().getBoolean("statistics.generation.broker", false);
- }
-
- public boolean isStatisticsGenerationVirtualhostsEnabled()
- {
- return getConfig().getBoolean("statistics.generation.virtualhosts",
false);
- }
-
- public boolean isStatisticsGenerationConnectionsEnabled()
- {
- return getConfig().getBoolean("statistics.generation.connections",
false);
- }
-
public long getStatisticsReportingPeriod()
{
return getConfig().getLong("statistics.reporting.period", 0L);
@@ -712,18 +666,6 @@ public class ServerConfiguration extends
return getIntValue("maximumChannelCount", 256);
}
- /**
- * List of Broker features that have been disabled within configuration.
Disabled
- * features won't be advertised to the clients on connection.
- *
- * @return list of disabled features, or empty list if no features are
disabled.
- */
- public List<String> getDisabledFeatures()
- {
- final List<String> disabledFeatures = getListValue("disabledFeatures",
Collections.emptyList());
- return disabledFeatures;
- }
-
public boolean getManagementRightsInferAllAccess()
{
return getBooleanValue("management.managementRightsInferAllAccess",
true);
@@ -787,16 +729,6 @@ public class ServerConfiguration extends
return getConfig().getBoolean(CONNECTOR_AMQP08ENABLED, true);
}
- /**
- * Returns the configured default reply to an unsupported AMQP protocol
initiation, or null if there is none
- */
- public AmqpProtocolVersion getDefaultSupportedProtocolReply()
- {
- String reply = getConfig().getString(CONNECTOR_AMQP_SUPPORTED_REPLY,
null);
-
- return reply == null ? null : AmqpProtocolVersion.valueOf(reply);
- }
-
public File getVirtualHostsFile()
{
return _vhostsFile;
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=1420867&r1=1420866&r2=1420867&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
Wed Dec 12 17:40:53 2012
@@ -134,13 +134,7 @@ public class XMLConfigurationEntryStore
brokerAttributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER,
_serverConfiguration.getDefaultAuthenticationManager());
brokerAttributes.put(Broker.ACL_FILE,
_serverConfiguration.getConfig().getString("security.acl"));
brokerAttributes.put(Broker.SESSION_COUNT_LIMIT,
_serverConfiguration.getMaxChannelCount());
- brokerAttributes.put(Broker.FRAME_SIZE,
_serverConfiguration.getFrameSize());
brokerAttributes.put(Broker.HEART_BEAT_DELAY,
_serverConfiguration.getHeartBeatDelay());
- brokerAttributes.put(Broker.HEART_BEAT_TIMEOUT_FACTOR,
_serverConfiguration.getHeartBeatTimeout());
- brokerAttributes.put(Broker.DEFAULT_SUPPORTED_PROTOCOL_REPLY,
_serverConfiguration.getDefaultSupportedProtocolReply());
- brokerAttributes.put(Broker.DISABLED_FEATURES, new
HashSet<String>(_serverConfiguration.getDisabledFeatures()));
- brokerAttributes.put(Broker.STATISTICS_ENABLED,
_serverConfiguration.isStatisticsGenerationBrokerEnabled() ||
_serverConfiguration.isStatisticsGenerationVirtualhostsEnabled());
- brokerAttributes.put(Broker.STATISTICS_SAMPLE_PERIOD,
_serverConfiguration.getStatisticsSamplePeriod());
brokerAttributes.put(Broker.STATISTICS_REPORTING_PERIOD,
_serverConfiguration.getStatisticsReportingPeriod());
brokerAttributes.put(Broker.STATISTICS_REPORTING_RESET_ENABLED,
_serverConfiguration.isStatisticsReportResetEnabled());
ConfigurationEntry rootEntry = new ConfigurationEntry(_rootId,
Broker.class.getSimpleName(), brokerAttributes,
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
Wed Dec 12 17:40:53 2012
@@ -30,6 +30,7 @@ import org.apache.qpid.framing.Connectio
import org.apache.qpid.framing.ConnectionTuneBody;
import org.apache.qpid.framing.MethodRegistry;
import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.protocol.AMQProtocolSession;
import org.apache.qpid.server.security.SubjectCreator;
@@ -98,7 +99,7 @@ public class ConnectionSecureOkMethodHan
ConnectionTuneBody tuneBody =
methodRegistry.createConnectionTuneBody((Integer)broker.getAttribute(Broker.SESSION_COUNT_LIMIT),
-
(Integer)broker.getAttribute(Broker.FRAME_SIZE),
+
BrokerProperties.DEFAULT_FRAME_SIZE,
(Integer)broker.getAttribute(Broker.HEART_BEAT_DELAY));
session.writeFrame(tuneBody.generateFrame(0));
session.setAuthorizedSubject(authResult.getSubject());
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
Wed Dec 12 17:40:53 2012
@@ -29,6 +29,7 @@ import org.apache.qpid.framing.Connectio
import org.apache.qpid.framing.ConnectionTuneBody;
import org.apache.qpid.framing.MethodRegistry;
import org.apache.qpid.protocol.AMQConstant;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.protocol.AMQProtocolSession;
import org.apache.qpid.server.security.SubjectCreator;
@@ -112,7 +113,7 @@ public class ConnectionStartOkMethodHand
stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
ConnectionTuneBody tuneBody =
methodRegistry.createConnectionTuneBody((Integer)broker.getAttribute(Broker.SESSION_COUNT_LIMIT),
-
(Integer)broker.getAttribute(Broker.FRAME_SIZE),
+
BrokerProperties.DEFAULT_FRAME_SIZE,
(Integer)broker.getAttribute(Broker.HEART_BEAT_DELAY));
session.writeFrame(tuneBody.generateFrame(0));
break;
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=1420867&r1=1420866&r2=1420867&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
Wed Dec 12 17:40:53 2012
@@ -66,13 +66,7 @@ public interface Broker extends Configur
String HOUSEKEEPING_CHECK_PERIOD = "housekeepingCheckPeriod";
String SESSION_COUNT_LIMIT = "sessionCountLimit";
- String FRAME_SIZE = "frameSize";
String HEART_BEAT_DELAY = "heartBeatDelay";
- String HEART_BEAT_TIMEOUT_FACTOR = "heartBeatTimeoutFactor";
- String DEFAULT_SUPPORTED_PROTOCOL_REPLY = "defaultSupportedProtocolReply";
- String DISABLED_FEATURES = "disabledFeatures";
- String STATISTICS_ENABLED = "statisticsEnabled";
- String STATISTICS_SAMPLE_PERIOD = "statisticsSamplePeriod";
String STATISTICS_REPORTING_PERIOD = "statisticsReportingPeriod";
String STATISTICS_REPORTING_RESET_ENABLED =
"statisticsReportingResetEnabled";
@@ -114,13 +108,7 @@ public interface Broker extends Configur
HOUSEKEEPING_CHECK_PERIOD,
ACL_FILE,
SESSION_COUNT_LIMIT,
- FRAME_SIZE,
HEART_BEAT_DELAY,
- HEART_BEAT_TIMEOUT_FACTOR,
- DEFAULT_SUPPORTED_PROTOCOL_REPLY,
- DISABLED_FEATURES,
- STATISTICS_ENABLED,
- STATISTICS_SAMPLE_PERIOD,
STATISTICS_REPORTING_PERIOD,
STATISTICS_REPORTING_RESET_ENABLED
));
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=1420867&r1=1420866&r2=1420867&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
Wed Dec 12 17:40:53 2012
@@ -20,12 +20,9 @@
*/
package org.apache.qpid.server.model.adapter;
-import static org.apache.qpid.server.util.MapValueConverter.getDoubleAttribute;
-import static org.apache.qpid.server.util.MapValueConverter.getEnumAttribute;
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 static
org.apache.qpid.server.util.MapValueConverter.getSetOfStringAttribute;
import static org.apache.qpid.server.util.MapValueConverter.getStringAttribute;
import java.net.InetSocketAddress;
@@ -36,7 +33,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import java.util.UUID;
import org.apache.log4j.Logger;
@@ -59,7 +55,6 @@ import org.apache.qpid.server.model.Stat
import org.apache.qpid.server.model.Statistics;
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.server.security.group.GroupPrincipalAccessor;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.SubjectCreator;
@@ -104,13 +99,7 @@ public class BrokerAdapter extends Abstr
private String _defaultVirtualHost;
private String _aclFile;
private int _sessionCountLimit;
- private int _frameSize;
private int _heartBeatDelay;
- private double _heartBeatTimeoutFactor;
- private AmqpProtocolVersion _defaultSupportedProtocolReply;
- private Set<String> _disabledFeatures;
- private boolean _statisticsEnabled;
- private int _statisticsSamplePeriod;
private int _statisticsReportingPeriod;
private boolean _statisticsReportingResetEnabled;
@@ -144,13 +133,7 @@ public class BrokerAdapter extends Abstr
_securityManager = new SecurityManager(_aclFile);
_sessionCountLimit = getIntegerAttribute(SESSION_COUNT_LIMIT,
attributes, 256);
- _frameSize = getIntegerAttribute(FRAME_SIZE, attributes,
Integer.getInteger(BrokerProperties.PROPERTY_FRAME_SIZE,
BrokerProperties.DEFAULT_FRAME_SIZE));
_heartBeatDelay = getIntegerAttribute(HEART_BEAT_DELAY, attributes,
BrokerProperties.DEFAULT_HEART_BEAT_DELAY);
- _heartBeatTimeoutFactor =
getDoubleAttribute(HEART_BEAT_TIMEOUT_FACTOR, attributes,
BrokerProperties.DEFAULT_HEART_BEAT_TIMEOUT_FACTOR);
- _defaultSupportedProtocolReply =
getEnumAttribute(AmqpProtocolVersion.class, DEFAULT_SUPPORTED_PROTOCOL_REPLY,
attributes, null);
- _disabledFeatures = getSetOfStringAttribute(DISABLED_FEATURES,
attributes, Collections.<String>emptySet());
- _statisticsEnabled = getBooleanAttribute(STATISTICS_ENABLED,
attributes, false);
- _statisticsSamplePeriod =
getIntegerAttribute(STATISTICS_SAMPLE_PERIOD, attributes,
BrokerProperties.DEFAULT_STATISTICS_SAMPLE_PERIOD);
_statisticsReportingPeriod =
getIntegerAttribute(STATISTICS_REPORTING_PERIOD, attributes,
BrokerProperties.DEFAULT_STATISTICS_REPORTING_PERIOD);
_statisticsReportingResetEnabled =
getBooleanAttribute(STATISTICS_REPORTING_RESET_ENABLED, attributes, false);
}
@@ -598,34 +581,10 @@ public class BrokerAdapter extends Abstr
{
return _sessionCountLimit;
}
- else if (FRAME_SIZE.equals(name))
- {
- return _frameSize;
- }
else if (HEART_BEAT_DELAY.equals(name))
{
return _heartBeatDelay;
}
- else if (HEART_BEAT_TIMEOUT_FACTOR.equals(name))
- {
- return _heartBeatTimeoutFactor;
- }
- else if (DEFAULT_SUPPORTED_PROTOCOL_REPLY.equals(name))
- {
- return _defaultSupportedProtocolReply;
- }
- else if (DISABLED_FEATURES.equals(name))
- {
- return _disabledFeatures;
- }
- else if (STATISTICS_ENABLED.equals(name))
- {
- return _statisticsEnabled;
- }
- else if (STATISTICS_SAMPLE_PERIOD.equals(name))
- {
- return _statisticsSamplePeriod;
- }
else if (STATISTICS_REPORTING_PERIOD.equals(name))
{
return _statisticsReportingPeriod;
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Wed Dec 12 17:40:53 2012
@@ -52,6 +52,7 @@ import org.apache.qpid.protocol.AMQMetho
import org.apache.qpid.protocol.AMQMethodListener;
import org.apache.qpid.protocol.ServerProtocolEngine;
import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.handler.ServerMethodDispatcherImpl;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.LogSubject;
@@ -748,7 +749,7 @@ public class AMQProtocolEngine implement
if (delay > 0)
{
_network.setMaxWriteIdle(delay);
-
_network.setMaxReadIdle(((Number)_broker.getAttribute(Broker.HEART_BEAT_TIMEOUT_FACTOR)).intValue()
* delay);
+
_network.setMaxReadIdle(BrokerProperties.DEFAULT_HEART_BEAT_TIMEOUT_FACTOR *
delay);
}
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.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/IncomingMessage.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
Wed Dec 12 17:40:53 2012
@@ -28,7 +28,6 @@ import org.apache.qpid.framing.BasicCont
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.abstraction.ContentChunk;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.EnqueableMessage;
@@ -47,8 +46,6 @@ public class IncomingMessage implements
/** Used for debugging purposes. */
private static final Logger _logger =
Logger.getLogger(IncomingMessage.class);
- private static final boolean SYNCHED_CLOCKS =
Boolean.getBoolean(BrokerProperties.PROPERTY_SYNCHED_CLOCKS);
-
private final MessagePublishInfo _messagePublishInfo;
private ContentHeaderBody _contentHeaderBody;
@@ -100,33 +97,7 @@ public class IncomingMessage implements
public void setExpiration()
{
- long expiration =
- ((BasicContentHeaderProperties)
_contentHeaderBody.getProperties()).getExpiration();
- long timestamp =
- ((BasicContentHeaderProperties)
_contentHeaderBody.getProperties()).getTimestamp();
-
- if (SYNCHED_CLOCKS)
- {
- _expiration = expiration;
- }
- else
- {
- // Update TTL to be in broker time.
- if (expiration != 0L)
- {
- if (timestamp != 0L)
- {
- // todo perhaps use arrival time
- long diff = (System.currentTimeMillis() - timestamp);
-
- if ((diff > 1000L) || (diff < 1000L))
- {
- _expiration = expiration + diff;
- }
- }
- }
- }
-
+ _expiration = ((BasicContentHeaderProperties)
_contentHeaderBody.getProperties()).getExpiration();
}
public MessageMetaData headersReceived(long currentTime)
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java
Wed Dec 12 17:40:53 2012
@@ -30,6 +30,7 @@ import java.util.UUID;
import javax.net.ssl.SSLContext;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.messages.BrokerMessages;
@@ -157,10 +158,14 @@ public class AmqpPortAdapter extends Por
return sslContext;
}
- /** This will be refactored later into AmqpPort model */
private AmqpProtocolVersion getDefaultAmqpSupportedReply()
{
- return
(AmqpProtocolVersion)_broker.getAttribute(Broker.DEFAULT_SUPPORTED_PROTOCOL_REPLY);
+ String defaultAmqpSupportedReply =
System.getProperty(BrokerProperties.PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY);
+ if (defaultAmqpSupportedReply != null)
+ {
+ return AmqpProtocolVersion.valueOf(defaultAmqpSupportedReply);
+ }
+ return null;
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
Wed Dec 12 17:40:53 2012
@@ -27,12 +27,12 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.StringTokenizer;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
import org.apache.qpid.common.ServerPropertyNames;
import org.apache.qpid.properties.ConnectionStartProperties;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.security.SecurityManager;
@@ -81,8 +81,7 @@ public class ServerConnectionDelegate ex
private static List<String> getFeatures(Broker broker)
{
- @SuppressWarnings("unchecked")
- Set<String> brokerDisabledFeatures =
(Set<String>)broker.getAttribute(Broker.DISABLED_FEATURES);
+ String brokerDisabledFeatures =
System.getProperty(BrokerProperties.PROPERTY_DISABLED_FEATURES);
final List<String> features = new ArrayList<String>();
if (brokerDisabledFeatures == null ||
!brokerDisabledFeatures.contains(ServerPropertyNames.FEATURE_QPID_JMS_SELECTOR))
{
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/util/MapValueConverter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/util/MapValueConverter.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/util/MapValueConverter.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/util/MapValueConverter.java
Wed Dec 12 17:40:53 2012
@@ -20,9 +20,7 @@
*/
package org.apache.qpid.server.util;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -173,27 +171,6 @@ public class MapValueConverter
}
}
- public static Double getDoubleAttribute(String name, Map<String,Object>
attributes, Double defaultValue)
- {
- Object obj = attributes.get(name);
- if(obj == null)
- {
- return defaultValue;
- }
- else if(obj instanceof Number)
- {
- return ((Number) obj).doubleValue();
- }
- else if(obj instanceof String)
- {
- return Double.valueOf((String) obj);
- }
- else
- {
- throw new IllegalArgumentException("Value for attribute " + name +
" is not of required type Double");
- }
- }
-
public static <T> Set<T> getSetAttribute(String name, Map<String,Object>
attributes)
{
assertMandatoryAttribute(name, attributes);
@@ -218,30 +195,4 @@ public class MapValueConverter
}
}
- @SuppressWarnings("unchecked")
- public static Set<String> getSetOfStringAttribute(String name,
Map<String,Object> attributes, Set<String> defaultValue)
- {
- Object obj = attributes.get(name);
- if(obj == null)
- {
- return defaultValue;
- }
- else if(obj instanceof Set)
- {
- return (Set<String>) obj;
- }
- else if(obj instanceof String)
- {
- return new
HashSet<String>(Arrays.asList(((String)obj).split(",")));
- }
- else if(obj instanceof String[])
- {
- return new HashSet<String>(Arrays.asList((String[])obj));
- }
- else
- {
- throw new IllegalArgumentException("Value for attribute " + name +
" is not of required type Set");
- }
- }
-
}
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=1420867&r1=1420866&r2=1420867&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
Wed Dec 12 17:40:53 2012
@@ -32,7 +32,6 @@ import org.apache.qpid.server.logging.Ro
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.server.stats.StatisticsGatherer;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
@@ -40,6 +39,7 @@ import org.apache.qpid.test.utils.QpidTe
import static org.apache.qpid.transport.ConnectionSettings.WILDCARD_ADDRESS;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.File;
import java.io.FileWriter;
@@ -120,32 +120,6 @@ public class ServerConfigurationTest ext
assertEquals(false, _serverConfig.getPlatformMbeanserver());
}
- public void testGetFrameSize() throws ConfigurationException
- {
- // Check default
- _serverConfig.initialise();
- assertEquals(65536, _serverConfig.getFrameSize());
-
- // Check value we set
- _config.setProperty("advanced.framesize", "23");
- _serverConfig = new ServerConfiguration(_config);
- _serverConfig.initialise();
- assertEquals(23, _serverConfig.getFrameSize());
- }
-
- public void testGetSynchedClocks() throws ConfigurationException
- {
- // Check default
- _serverConfig.initialise();
- assertEquals(false, _serverConfig.getSynchedClocks());
-
- // Check value we set
- _config.setProperty("advanced.synced-clocks", true);
- _serverConfig = new ServerConfiguration(_config);
- _serverConfig.initialise();
- assertEquals(true, _serverConfig.getSynchedClocks());
- }
-
public void testGetManagementKeyStorePath() throws ConfigurationException
{
// Check default
@@ -275,19 +249,6 @@ public class ServerConfigurationTest ext
assertEquals(23, _serverConfig.getHeartBeatDelay());
}
- public void testGetHeartBeatTimeout() throws ConfigurationException
- {
- // Check default
- _serverConfig.initialise();
- assertEquals(2.0, _serverConfig.getHeartBeatTimeout());
-
- // Check value we set
- _config.setProperty("heartbeat.timeoutFactor", 2.3);
- _serverConfig = new ServerConfiguration(_config);
- _serverConfig.initialise();
- assertEquals(2.3, _serverConfig.getHeartBeatTimeout());
- }
-
public void testGetMaximumMessageAge() throws ConfigurationException
{
// Check default
@@ -353,19 +314,6 @@ public class ServerConfigurationTest ext
assertEquals(10, _serverConfig.getMinimumAlertRepeatGap());
}
- public void testGetProcessors() throws ConfigurationException
- {
- // Check default
- _serverConfig.initialise();
- assertEquals(4, _serverConfig.getConnectorProcessors());
-
- // Check value we set
- _config.setProperty("connector.processors", 10);
- _serverConfig = new ServerConfiguration(_config);
- _serverConfig.initialise();
- assertEquals(10, _serverConfig.getConnectorProcessors());
- }
-
public void testGetPorts() throws ConfigurationException
{
// Check default
@@ -1269,26 +1217,6 @@ public class ServerConfigurationTest ext
fail("Should throw a ConfigurationException");
}
}
-
- /**
- * Tests that element disabledFeatures allows features that would
- * otherwise be advertised by the broker to be turned off.
- */
- public void testDisabledFeatures() throws ConfigurationException
- {
- // Check default
- _serverConfig.initialise();
- _serverConfig = new ServerConfiguration(_config);
- assertEquals("Unexpected size", 0,
_serverConfig.getDisabledFeatures().size());
-
- // Check value we set
- _config.addProperty("disabledFeatures", "qpid.feature1");
- _config.addProperty("disabledFeatures", "qpid.feature2");
- _serverConfig = new ServerConfiguration(_config);
-
- assertEquals("Unexpected size",2,
_serverConfig.getDisabledFeatures().size());
- assertTrue("Unexpected contents",
_serverConfig.getDisabledFeatures().contains("qpid.feature1"));
- }
/**
* Tests that the old element security.jmx.access (that used to be used
@@ -1408,7 +1336,6 @@ public class ServerConfigurationTest ext
/**
* Test XML configuration file correctly enables dead letter queues
*/
- /*
public void testDeadLetterQueueConfigurationFile() throws Exception
{
// Write config
@@ -1459,15 +1386,14 @@ public class ServerConfigurationTest ext
config.close();
// Load config
- ApplicationRegistry.remove();
- ConfigurationEntryStore store = new XMLConfigurationEntryStore(xml);
- ApplicationRegistry registry = new ApplicationRegistry(store);
- ApplicationRegistry.initialise(registry);
- ServerConfiguration serverConfiguration =
ApplicationRegistry.getInstance().getConfiguration();
+ ServerConfiguration serverConfiguration = new ServerConfiguration(xml);
+ serverConfiguration.initialise();
- VirtualHostConfiguration test =
serverConfiguration.getVirtualHostConfig("test");
+ Broker broker = mock(Broker.class);
+
when(broker.getAttribute(Broker.DEAD_LETTER_QUEUE_ENABLED)).thenReturn(true);
+ VirtualHostConfiguration test = new VirtualHostConfiguration("test",
serverConfiguration.getVirtualHostConfig("test").getConfig(), broker );
assertNotNull("Host 'test' is not found", test);
- VirtualHostConfiguration extra =
serverConfiguration.getVirtualHostConfig("extra");
+ VirtualHostConfiguration extra = new VirtualHostConfiguration("extra",
serverConfiguration.getVirtualHostConfig("extra").getConfig(), broker);
assertNotNull("Host 'extra' is not found", test);
QueueConfiguration biggles = test.getQueueConfiguration("biggles");
@@ -1485,7 +1411,7 @@ public class ServerConfigurationTest ext
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
@@ -1618,19 +1544,6 @@ public class ServerConfigurationTest ext
assertTrue(_serverConfig.getPortInclude10().contains("10"));
}
- public void testGetDefaultSupportedProtocolReply() throws Exception
- {
- // Check default
- _serverConfig.initialise();
- assertNull("unexpected default value",
_serverConfig.getDefaultSupportedProtocolReply());
-
- // Check values we set
-
_config.addProperty(ServerConfiguration.CONNECTOR_AMQP_SUPPORTED_REPLY,
"v0_10");
- _serverConfig = new ServerConfiguration(_config);
- _serverConfig.initialise();
- assertEquals(AmqpProtocolVersion.v0_10,
_serverConfig.getDefaultSupportedProtocolReply());
- }
-
public void testDefaultAuthenticationManager() throws Exception
{
// Check default
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.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/startup/BrokerRecovererTest.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
Wed Dec 12 17:40:53 2012
@@ -30,13 +30,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
import java.util.UUID;
import junit.framework.TestCase;
-import org.apache.qpid.common.ServerPropertyNames;
import org.apache.qpid.server.configuration.ConfigurationEntry;
import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -54,7 +52,6 @@ import org.apache.qpid.server.model.Trus
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.adapter.AuthenticationProviderFactory;
import org.apache.qpid.server.model.adapter.PortFactory;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.server.security.group.GroupPrincipalAccessor;
import org.apache.qpid.server.stats.StatisticsGatherer;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
@@ -103,13 +100,7 @@ public class BrokerRecovererTest extends
attributes.put(Broker.HOUSEKEEPING_CHECK_PERIOD, 1l);
attributes.put(Broker.ACL_FILE, "/path/to/acl");
attributes.put(Broker.SESSION_COUNT_LIMIT, 1000);
- attributes.put(Broker.FRAME_SIZE, 128);
attributes.put(Broker.HEART_BEAT_DELAY, 2000);
- attributes.put(Broker.HEART_BEAT_TIMEOUT_FACTOR, 5.0);
- attributes.put(Broker.DEFAULT_SUPPORTED_PROTOCOL_REPLY,
AmqpProtocolVersion.v1_0_0);
- attributes.put(Broker.DISABLED_FEATURES, new
HashSet<String>(Arrays.asList(ServerPropertyNames.FEATURE_QPID_JMS_SELECTOR)));
- attributes.put(Broker.STATISTICS_ENABLED, true);
- attributes.put(Broker.STATISTICS_SAMPLE_PERIOD, 3000);
attributes.put(Broker.STATISTICS_REPORTING_PERIOD, 4000);
attributes.put(Broker.STATISTICS_REPORTING_RESET_ENABLED, true);
@@ -377,29 +368,7 @@ public class BrokerRecovererTest extends
private String convertToString(Object attributeValue)
{
- String value = null;
- if (attributeValue instanceof Collection)
- {
- @SuppressWarnings("unchecked")
- Collection<Object> data = (Collection<Object>)attributeValue;
- StringBuilder sb = new StringBuilder();
- Iterator<Object> it = data.iterator();
- while (it.hasNext())
- {
- Object val = it.next();
- sb.append(String.valueOf(val));
- if (it.hasNext())
- {
- sb.append(",");
- }
- }
- value = sb.toString();
- }
- else
- {
- value = String.valueOf(attributeValue);
- }
- return value;
+ return String.valueOf(attributeValue);
}
private RecovererProvider createRecoveryProvider(final
ConfigurationEntry[] entries, final ConfiguredObject[] objectsToRecoverer)
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
Wed Dec 12 17:40:53 2012
@@ -23,6 +23,7 @@ package org.apache.qpid.server;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.configuration.ClientProperties;
import org.apache.qpid.framing.ProtocolVersion;
+import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.ServerConfiguration;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -145,7 +146,7 @@ public class SupportedProtocolVersionsTe
//disable 0-10 support, and set the default unsupported protocol
initiation reply to 0-9
setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP010ENABLED,
"false");
-
setConfigurationProperty(ServerConfiguration.CONNECTOR_AMQP_SUPPORTED_REPLY,
"v0_9");
+
setTestSystemProperty(BrokerProperties.PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY,
"v0_9");
super.setUp();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
Wed Dec 12 17:40:53 2012
@@ -42,6 +42,7 @@ public class ServerConfigurationFileTest
fail("Unable to test without config file:" + _configFile);
}
+ getTestConfiguration().setProperty("connector.port", "9999");
saveTestConfiguration();
saveTestVirtualhosts();
@@ -62,9 +63,10 @@ public class ServerConfigurationFileTest
_serverConfig.getConfig().getProperty(property));
}
- public void testLocale() throws ConfigurationException
+ public void testChangedProperty() throws ConfigurationException
{
- validatePropertyDefinedInFile(ServerConfiguration.ADVANCED_LOCALE);
+ validatePropertyDefinedInFile("connector.port");
+ assertEquals("Unexpected port", "9999",
_serverConfig.getConfig().getProperty("connector.port"));
}
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java
Wed Dec 12 17:40:53 2012
@@ -56,6 +56,6 @@ public class BrokerRestHttpsTest extends
Asserts.assertAttributesPresent(brokerDetails,
Broker.AVAILABLE_ATTRIBUTES, Broker.BYTES_RETAINED,
Broker.PROCESS_PID, Broker.SUPPORTED_STORE_TYPES,
Broker.CREATED, Broker.TIME_TO_LIVE, Broker.UPDATED,
- Broker.ACL_FILE, Broker.DEFAULT_SUPPORTED_PROTOCOL_REPLY);
+ Broker.ACL_FILE);
}
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1420867&r1=1420866&r2=1420867&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
Wed Dec 12 17:40:53 2012
@@ -90,8 +90,7 @@ public class BrokerRestTest extends Qpid
{
Asserts.assertAttributesPresent(brokerDetails,
Broker.AVAILABLE_ATTRIBUTES,
Broker.BYTES_RETAINED, Broker.PROCESS_PID,
Broker.SUPPORTED_STORE_TYPES,
- Broker.CREATED, Broker.TIME_TO_LIVE, Broker.UPDATED,
Broker.ACL_FILE,
- Broker.DEFAULT_SUPPORTED_PROTOCOL_REPLY);
+ Broker.CREATED, Broker.TIME_TO_LIVE, Broker.UPDATED,
Broker.ACL_FILE);
assertEquals("Unexpected value of attribute " + Broker.BUILD_VERSION,
QpidProperties.getBuildVersion(),
brokerDetails.get(Broker.BUILD_VERSION));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
