You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/03/10 23:32:11 UTC
svn commit: r1454941 - in
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server:
configuration/BrokerProperties.java
handler/ConnectionSecureOkMethodHandler.java
handler/ConnectionStartOkMethodHandler.java protocol/AMQProtocolEngine.java
Author: robbie
Date: Sun Mar 10 22:32:11 2013
New Revision: 1454941
URL: http://svn.apache.org/r1454941
Log:
QPID-4390: change new sytem property names to include broker to allow distinguising them from any related client config. Separate defaults from the configurable value.
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java?rev=1454941&r1=1454940&r2=1454941&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java Sun Mar 10 22:32:11 2013
@@ -7,19 +7,23 @@ import java.util.Locale;
*/
public class BrokerProperties
{
- public static final int DEFAULT_HEART_BEAT_TIMEOUT_FACTOR = 2;
-
- 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_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_LOCALE = "qpid.locale";
- public static final String PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY = "qpid.default_supported_protocol_version_reply";
+ public static final int DEFAULT_HEARTBEAT_TIMEOUT_FACTOR = 2;
+ public static final String PROPERTY_HEARTBEAT_TIMEOUT_FACTOR = "qpid.broker_heartbeat_timeout_factor";
+ public static final int HEARTBEAT_TIMEOUT_FACTOR = Integer.getInteger(PROPERTY_HEARTBEAT_TIMEOUT_FACTOR, DEFAULT_HEARTBEAT_TIMEOUT_FACTOR);
+
+ public static final String PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX = "qpid.broker_dead_letter_exchange_suffix";
+ public static final String PROPERTY_DEAD_LETTER_QUEUE_SUFFIX = "qpid.broker_dead_letter_queue_suffix";
+
+ public static final String PROPERTY_MSG_AUTH = "qpid.broker_msg_auth";
+ public static final String PROPERTY_STATUS_UPDATES = "qpid.broker_status_updates";
+ public static final String PROPERTY_LOCALE = "qpid.broker_locale";
+ public static final String PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY = "qpid.broker_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 static final int DEFAULT_FRAME_SIZE = 65535;
+ public static final String PROPERTY_FRAME_SIZE = "qpid.broker_frame_size";
+ public static final int FRAME_SIZE = Integer.getInteger(PROPERTY_FRAME_SIZE, DEFAULT_FRAME_SIZE);
+
public static final String PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_EXCLUDES = "qpid.broker_default_amqp_protocol_excludes";
public static final String PROPERTY_BROKER_DEFAULT_AMQP_PROTOCOL_INCLUDES = "qpid.broker_default_amqp_protocol_includes";
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java?rev=1454941&r1=1454940&r2=1454941&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java Sun Mar 10 22:32:11 2013
@@ -99,7 +99,7 @@ public class ConnectionSecureOkMethodHan
ConnectionTuneBody tuneBody =
methodRegistry.createConnectionTuneBody((Integer)broker.getAttribute(Broker.SESSION_COUNT_LIMIT),
- BrokerProperties.DEFAULT_FRAME_SIZE,
+ BrokerProperties.FRAME_SIZE,
(Integer)broker.getAttribute(Broker.HEART_BEAT_DELAY));
session.writeFrame(tuneBody.generateFrame(0));
session.setAuthorizedSubject(authResult.getSubject());
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java?rev=1454941&r1=1454940&r2=1454941&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java Sun Mar 10 22:32:11 2013
@@ -113,7 +113,7 @@ public class ConnectionStartOkMethodHand
stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
ConnectionTuneBody tuneBody = methodRegistry.createConnectionTuneBody((Integer)broker.getAttribute(Broker.SESSION_COUNT_LIMIT),
- BrokerProperties.DEFAULT_FRAME_SIZE,
+ BrokerProperties.FRAME_SIZE,
(Integer)broker.getAttribute(Broker.HEART_BEAT_DELAY));
session.writeFrame(tuneBody.generateFrame(0));
break;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=1454941&r1=1454940&r2=1454941&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java Sun Mar 10 22:32:11 2013
@@ -764,7 +764,7 @@ public class AMQProtocolEngine implement
if (delay > 0)
{
_network.setMaxWriteIdle(delay);
- _network.setMaxReadIdle(BrokerProperties.DEFAULT_HEART_BEAT_TIMEOUT_FACTOR * delay);
+ _network.setMaxReadIdle(BrokerProperties.HEARTBEAT_TIMEOUT_FACTOR * delay);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org