You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2013/04/22 12:25:49 UTC
svn commit: r1470433 - in /qpid/branches/QPID-4659/qpid/java: ./
amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/
broker-plugins/management-http/src/main/java/resources/
broker-plugins/management-http/src/main/java/resources/js/qpid/management/
b...
Author: rgodfrey
Date: Mon Apr 22 10:25:47 2013
New Revision: 1470433
URL: http://svn.apache.org/r1470433
Log:
QPID-4677 : merged to QPID-4659 branch
Modified:
qpid/branches/QPID-4659/qpid/java/ (props changed)
qpid/branches/QPID-4659/qpid/java/amqp-1-0-client/ (props changed)
qpid/branches/QPID-4659/qpid/java/amqp-1-0-client-jms/ (props changed)
qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
qpid/branches/QPID-4659/qpid/java/broker/bin/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0.java (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed)
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/ (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/JavaBDBExcludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/JavaPre010Excludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-dby.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/java-mms.0-9-1.testprofile (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/QPID-4659/qpid/java/test-profiles/testprofile.defaults (props changed)
Propchange: qpid/branches/QPID-4659/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/amqp-1-0-client/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1462470-1462472
Modified: qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Mon Apr 22 10:25:47 2013
@@ -183,141 +183,154 @@ define(["dojo/_base/xhr",
name: "peerStorePassword"});
}
}, {
- name: "alertThresholdQueueDepth",
+ name: "queue.alertThresholdQueueDepthMessages",
createWidget: function(brokerData) {
return new dijit.form.ValidationTextBox({
trim: "true",
regexp: "[0-9]+",
invalidMessage: "Invalid value",
required: false,
- value: brokerData.alertThresholdQueueDepth,
+ value: brokerData["queue.alertThresholdQueueDepthMessages"],
placeholder: "Count of messages",
- label: "Queue depth alert threshold:",
- name: "alertThresholdQueueDepth"
+ label: "Queue depth messages alert threshold:",
+ name: "queue.alertThresholdQueueDepthMessages"
});
}
}, {
- name: "alertThresholdMessageAge",
+ name: "queue.alertThresholdQueueDepthBytes",
+ createWidget: function(brokerData) {
+ return new dijit.form.ValidationTextBox({
+ trim: "true",
+ regexp: "[0-9]+",
+ invalidMessage: "Invalid value",
+ required: false,
+ value: brokerData["queue.alertThresholdQueueDepthBytes"],
+ placeholder: "Number of bytes",
+ label: "Queue depth bytes alert threshold:",
+ name: "queue.alertThresholdQueueDepthBytes"
+ });
+ }
+ }, {
+ name: "queue.alertThresholdMessageAge",
createWidget: function(brokerData) {
return new dijit.form.ValidationTextBox({
trim: "true",
regexp: "[0-9]+",
invalidMessage: "Invalid value",
required: false,
- value: brokerData.alertThresholdMessageAge,
+ value: brokerData["queue.alertThresholdMessageAge"],
placeholder: "Time in ms",
label: "Queue message age alert threshold:",
- name: "alertThresholdMessageAge"
+ name: "queue.alertThresholdMessageAge"
});
}
}, {
- name: "alertThresholdMessageSize",
+ name: "queue.alertThresholdMessageSize",
createWidget: function(brokerData) {
return new dijit.form.ValidationTextBox({
trim: "true",
regexp: "[0-9]+",
invalidMessage: "Invalid value",
required: false,
- value: brokerData.alertThresholdMessageSize,
+ value: brokerData["queue.alertThresholdMessageSize"],
placeholder: "Size in bytes",
label: "Queue message size alert threshold:",
- name: "alertThresholdMessageSize"
+ name: "queue.alertThresholdMessageSize"
});
}
}, {
- name: "alertRepeatGap",
+ name: "queue.alertRepeatGap",
createWidget: function(brokerData) {
return new dijit.form.ValidationTextBox({
trim: "true",
regexp: "[0-9]+",
invalidMessage: "Invalid value",
required: false,
- value: brokerData.alertThresholdMessageSize,
- value: brokerData.alertRepeatGap,
+ value: brokerData["queue.alertRepeatGap"],
placeholder: "Time in ms",
label: "Queue alert repeat gap:",
- name: "alertRepeatGap"
+ name: "queue.alertRepeatGap"
});
}
}, {
- name: "maximumDeliveryAttempts",
+ name: "queue.maximumDeliveryAttempts",
createWidget: function(brokerData) {
return new dijit.form.ValidationTextBox({
trim: "true",
regexp: "[0-9]+",
invalidMessage: "Invalid value",
required: false,
- value: brokerData.maximumDeliveryAttempts,
+ value: brokerData["queue.maximumDeliveryAttempts"],
placeholder: "Count of messages",
label: "Queue maximum delivery retries:",
- name: "maximumDeliveryAttempts"
+ name: "queue.maximumDeliveryAttempts"
});
}
}, {
- name: "deadLetterQueueEnabled",
+ name: "queue.deadLetterQueueEnabled",
createWidget: function(brokerData) {
return new dijit.form.CheckBox({
required: false,
- checked: brokerData.deadLetterQueueEnabled,
+ checked: brokerData["queue.deadLetterQueueEnabled"],
value: "true",
label: "Dead letter queue enabled:",
- name: "deadLetterQueueEnabled",
+ name: "queue.deadLetterQueueEnabled",
});
}
}, {
- name: "queueFlowControlSizeBytes",
+ name: "queue.flowControlSizeBytes",
createWidget: function(brokerData) {
return new dijit.form.ValidationTextBox({
trim: "true",
regexp: "[0-9]+",
invalidMessage: "Invalid value",
required: false,
- value: brokerData.queueFlowControlSizeBytes,
+ value: brokerData["queue.flowControlSizeBytes"],
placeholder: "Size in bytes",
label: "Queue flow capacity:",
- name: "queueFlowControlSizeBytes",
+ name: "queue.flowControlSizeBytes",
});
}
}, {
- name: "queueFlowResumeSizeBytes",
+ name: "queue.flowResumeSizeBytes",
createWidget: function(brokerData) {
return new dijit.form.ValidationTextBox({
trim: "true",
regexp: "[0-9]+",
invalidMessage: "Invalid value",
required: false,
- value: brokerData.queueFlowResumeSizeBytes,
+ value: brokerData["queue.flowResumeSizeBytes"],
placeholder: "Size in bytes",
label: "Queue flow resume capacity:",
- name: "queueFlowResumeSizeBytes",
+ name: "queue.flowResumeSizeBytes",
});
}
}, {
- name: "sessionCountLimit",
+ name: "connection.sessionCountLimit",
createWidget: function(brokerData)
{
return new dijit.form.NumberSpinner({
invalidMessage: "Invalid value",
required: false,
- value: brokerData.sessionCountLimit,
+ value: brokerData["connection.sessionCountLimit"],
smallDelta: 1,
constraints: {min:1,max:65535,places:0, pattern: "#####"},
label: "Connection session limit:",
- name: "sessionCountLimit"
+ name: "connection.sessionCountLimit"
});
}
}, {
- name: "heartBeatDelay",
+ name: "connection.heartBeatDelay",
createWidget: function(brokerData) {
return new dijit.form.ValidationTextBox({
trim: "true",
regexp: "[0-9]+",
invalidMessage: "Invalid value",
required: false,
- value: brokerData.heartBeatDelay,
+ value: brokerData["connection.heartBeatDelay"],
placeholder: "Time in ms",
label: "Heart beat delay:",
- name: "heartBeatDelay"
+ name: "connection.heartBeatDelay"
});
}
}, {
@@ -344,6 +357,76 @@ define(["dojo/_base/xhr",
name: "statisticsReportingResetEnabled"
});
}
+ }, {
+ name: "virtualhost.housekeepingCheckPeriod",
+ createWidget: function(brokerData) {
+ return new dijit.form.ValidationTextBox({
+ trim: "true",
+ regexp: "[0-9]+",
+ invalidMessage: "Invalid value",
+ required: false,
+ value: brokerData["virtualhost.housekeepingCheckPeriod"],
+ placeholder: "Time in ms",
+ label: "House keeping check period:",
+ name: "virtualhost.housekeepingCheckPeriod"
+ });
+ }
+ }, {
+ name: "virtualhost.storeTransactionIdleTimeoutClose",
+ createWidget: function(brokerData) {
+ return new dijit.form.ValidationTextBox({
+ trim: "true",
+ regexp: "[0-9]+",
+ invalidMessage: "Invalid value",
+ required: false,
+ value: brokerData["virtualhost.storeTransactionIdleTimeoutClose"],
+ placeholder: "Time in ms",
+ label: "Idle store transaction close timeout:",
+ name: "virtualhost.storeTransactionIdleTimeoutClose"
+ });
+ }
+ }, {
+ name: "virtualhost.storeTransactionIdleTimeoutWarn",
+ createWidget: function(brokerData) {
+ return new dijit.form.ValidationTextBox({
+ trim: "true",
+ regexp: "[0-9]+",
+ invalidMessage: "Invalid value",
+ required: false,
+ value: brokerData["virtualhost.storeTransactionIdleTimeoutWarn"],
+ placeholder: "Time in ms",
+ label: "Idle store transaction warn timeout:",
+ name: "virtualhost.storeTransactionIdleTimeoutWarn"
+ });
+ }
+ }, {
+ name: "virtualhost.storeTransactionOpenTimeoutClose",
+ createWidget: function(brokerData) {
+ return new dijit.form.ValidationTextBox({
+ trim: "true",
+ regexp: "[0-9]+",
+ invalidMessage: "Invalid value",
+ required: false,
+ value: brokerData["virtualhost.storeTransactionOpenTimeoutClose"],
+ placeholder: "Time in ms",
+ label: "Open store transaction close timeout:",
+ name: "virtualhost.storeTransactionOpenTimeoutClose"
+ });
+ }
+ }, {
+ name: "virtualhost.storeTransactionOpenTimeoutWarn",
+ createWidget: function(brokerData) {
+ return new dijit.form.ValidationTextBox({
+ trim: "true",
+ regexp: "[0-9]+",
+ invalidMessage: "Invalid value",
+ required: false,
+ value: brokerData["virtualhost.storeTransactionOpenTimeoutWarn"],
+ placeholder: "Time in ms",
+ label: "Open store transaction warn timeout:",
+ name: "virtualhost.storeTransactionOpenTimeoutWarn"
+ });
+ }
} ];
}
Modified: qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js (original)
+++ qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js Mon Apr 22 10:25:47 2013
@@ -263,28 +263,28 @@ define(["dojo/_base/xhr",
// update alerting info
- var alertRepeatGap = formatter.formatTime( thisObj.vhostData["alertRepeatGap"] );
+ var alertRepeatGap = formatter.formatTime( thisObj.vhostData["queue.alertRepeatGap"] );
thisObj.alertRepeatGap.innerHTML = alertRepeatGap.value;
thisObj.alertRepeatGapUnits.innerHTML = alertRepeatGap.units;
- var alertMsgAge = formatter.formatTime( thisObj.vhostData["alertThresholdMessageAge"] );
+ var alertMsgAge = formatter.formatTime( thisObj.vhostData["queue.alertThresholdMessageAge"] );
thisObj.alertThresholdMessageAge.innerHTML = alertMsgAge.value;
thisObj.alertThresholdMessageAgeUnits.innerHTML = alertMsgAge.units;
- var alertMsgSize = formatter.formatBytes( thisObj.vhostData["alertThresholdMessageSize"] );
+ var alertMsgSize = formatter.formatBytes( thisObj.vhostData["queue.alertThresholdMessageSize"] );
thisObj.alertThresholdMessageSize.innerHTML = alertMsgSize.value;
thisObj.alertThresholdMessageSizeUnits.innerHTML = alertMsgSize.units;
- var alertQueueDepth = formatter.formatBytes( thisObj.vhostData["alertThresholdQueueDepthBytes"] );
+ var alertQueueDepth = formatter.formatBytes( thisObj.vhostData["queue.alertThresholdQueueDepthBytes"] );
thisObj.alertThresholdQueueDepthBytes.innerHTML = alertQueueDepth.value;
thisObj.alertThresholdQueueDepthBytesUnits.innerHTML = alertQueueDepth.units;
- thisObj.alertThresholdQueueDepthMessages.innerHTML = thisObj.vhostData["alertThresholdQueueDepthMessages"];
+ thisObj.alertThresholdQueueDepthMessages.innerHTML = thisObj.vhostData["queue.alertThresholdQueueDepthMessages"];
var stats = thisObj.vhostData[ "statistics" ];
Modified: qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html (original)
+++ qpid/branches/QPID-4659/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html Mon Apr 22 10:25:47 2013
@@ -93,50 +93,78 @@
</div>
<div style="clear:both"></div>
<br/>
- <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Queue Attributes', open: true">
- <div id="brokerAttribute.alertThresholdQueueDepth.container" style="clear:both">
- <div class="formLabel-labelCell" style="float:left; width: 250px;">Queue depth alert threshold:</div>
- <div id="brokerAttribute.alertThresholdQueueDepth" style="float:left;"></div>
+ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Global Queue Defaults', open: true">
+ <div id="brokerAttribute.queue.alertThresholdQueueDepthMessages.container" style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 250px;">Queue depth messages alert threshold:</div>
+ <div id="brokerAttribute.queue.alertThresholdQueueDepthMessages" style="float:left;"></div>
+ </div>
+ <div id="brokerAttribute.queue.alertThresholdQueueDepthBytes.container" style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 250px;">Queue depth bytes alert threshold:</div>
+ <div id="brokerAttribute.queue.alertThresholdQueueDepthBytes" style="float:left;"></div> bytes
</div>
- <div id="brokerAttribute.alertThresholdMessageAge.container" style="clear:both">
+ <div id="brokerAttribute.queue.alertThresholdMessageAge.container" style="clear:both">
<div class="formLabel-labelCell" style="float:left; width: 250px;">Queue message age alert threshold:</div>
- <div id="brokerAttribute.alertThresholdMessageAge" style="float:left;"></div> ms
+ <div id="brokerAttribute.queue.alertThresholdMessageAge" style="float:left;"></div> ms
</div>
- <div id="brokerAttribute.alertThresholdMessageSize.container" style="clear:both">
+ <div id="brokerAttribute.queue.alertThresholdMessageSize.container" style="clear:both">
<div class="formLabel-labelCell" style="float:left; width: 250px;">Queue message size alert threshold:</div>
- <div id="brokerAttribute.alertThresholdMessageSize" style="float:left;"></div>
+ <div id="brokerAttribute.queue.alertThresholdMessageSize" style="float:left;"></div> bytes
</div>
- <div id="brokerAttribute.alertRepeatGap.container" style="clear:both">
+ <div id="brokerAttribute.queue.alertRepeatGap.container" style="clear:both">
<div class="formLabel-labelCell" style="float:left; width: 250px;">Queue alert repeat gap:</div>
- <div id="brokerAttribute.alertRepeatGap" style="float:left;"></div> ms
+ <div id="brokerAttribute.queue.alertRepeatGap" style="float:left;"></div> ms
</div>
- <div id="brokerAttribute.maximumDeliveryAttempts.container" style="clear:both">
+ <div id="brokerAttribute.queue.maximumDeliveryAttempts.container" style="clear:both">
<div class="formLabel-labelCell" style="float:left; width: 250px;">Queue maximum delivery retries:</div>
- <div id="brokerAttribute.maximumDeliveryAttempts" style="float:left;"></div>
+ <div id="brokerAttribute.queue.maximumDeliveryAttempts" style="float:left;"></div>
</div>
- <div id="brokerAttribute.deadLetterQueueEnabled.container" style="clear:both">
+ <div id="brokerAttribute.queue.deadLetterQueueEnabled.container" style="clear:both">
<div class="formLabel-labelCell" style="float:left; width: 250px;">Dead letter queue enabled:</div>
- <div id="brokerAttribute.deadLetterQueueEnabled" style="float:left;"></div>
+ <div id="brokerAttribute.queue.deadLetterQueueEnabled" style="float:left;"></div>
</div>
- <div id="brokerAttribute.queueFlowControlSizeBytes.container" style="clear:both">
+ <div id="brokerAttribute.queue.flowControlSizeBytes.container" style="clear:both">
<div class="formLabel-labelCell" style="float:left; width: 250px;">Queue flow capacity:</div>
- <div id="brokerAttribute.queueFlowControlSizeBytes" style="float:left;"></div>
+ <div id="brokerAttribute.queue.flowControlSizeBytes" style="float:left;"></div> bytes
</div>
- <div id="brokerAttribute.queueFlowResumeSizeBytes.container" style="clear:both">
+ <div id="brokerAttribute.queue.flowResumeSizeBytes.container" style="clear:both">
<div class="formLabel-labelCell" style="float:left; width: 250px;">Queue flow resume capacity:</div>
- <div id="brokerAttribute.queueFlowResumeSizeBytes" style="float:left;"></div>
+ <div id="brokerAttribute.queue.flowResumeSizeBytes" style="float:left;"></div> bytes
</div>
<div style="clear:both"></div>
</div>
<br/>
- <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Connection attributes', open: true">
- <div id="brokerAttribute.sessionCountLimit.container" style="clear:both">
+ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Global connection defaults', open: true">
+ <div id="brokerAttribute.connection.sessionCountLimit.container" style="clear:both">
<div class="formLabel-labelCell" style="float:left; width: 250px;">Connection session limit:</div>
- <div id="brokerAttribute.sessionCountLimit" style="float:left;"></div>
+ <div id="brokerAttribute.connection.sessionCountLimit" style="float:left;"></div>
</div>
- <div id="brokerAttribute.heartBeatDelay.container" style="clear:both">
+ <div id="brokerAttribute.connection.heartBeatDelay.container" style="clear:both">
<div class="formLabel-labelCell" style="float:left; width: 250px;">Heart beat delay:</div>
- <div id="brokerAttribute.heartBeatDelay" style="float:left;"></div> ms
+ <div id="brokerAttribute.connection.heartBeatDelay" style="float:left;"></div> ms
+ </div>
+ <div style="clear:both"></div>
+ </div>
+ <br/>
+ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Global virtual host defaults', open: true">
+ <div id="brokerAttribute.virtualhost.housekeepingCheckPeriod.container" style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 250px;">House keeping check period:</div>
+ <div id="brokerAttribute.virtualhost.housekeepingCheckPeriod" style="float:left;"></div>ms
+ </div>
+ <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutClose.container" style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 250px;">Idle store transaction close timeout:</div>
+ <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutClose" style="float:left;"></div>ms
+ </div>
+ <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutWarn.container" style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 250px;">Idle store transaction warn timeout:</div>
+ <div id="brokerAttribute.virtualhost.storeTransactionIdleTimeoutWarn" style="float:left;"></div>ms
+ </div>
+ <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutClose.container" style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 250px;">Open store transaction close timeout:</div>
+ <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutClose" style="float:left;"></div>ms
+ </div>
+ <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutWarn.container" style="clear:both">
+ <div class="formLabel-labelCell" style="float:left; width: 250px;">Open store transaction warn timeout:</div>
+ <div id="brokerAttribute.virtualhost.storeTransactionOpenTimeoutWarn" style="float:left;"></div>ms
</div>
<div style="clear:both"></div>
</div>
Propchange: qpid/branches/QPID-4659/qpid/java/broker/bin/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/bin:r1462470-1462472
Modified: qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java Mon Apr 22 10:25:47 2013
@@ -182,7 +182,7 @@ public class VirtualHostConfiguration ex
public Long getMaximumQueueDepth()
{
- return getLongValue("queues.maximumQueueDepth", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_QUEUE_DEPTH));
+ return getLongValue("queues.maximumQueueDepth", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES));
}
public Long getMaximumMessageSize()
@@ -192,7 +192,7 @@ public class VirtualHostConfiguration ex
public Long getMaximumMessageCount()
{
- return getLongValue("queues.maximumMessageCount", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_MESSAGE_COUNT));
+ return getLongValue("queues.maximumMessageCount", getBrokerAttributeAsLong(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES));
}
public Long getMinimumAlertRepeatGap()
@@ -243,22 +243,26 @@ public class VirtualHostConfiguration ex
public long getTransactionTimeoutOpenWarn()
{
- return getLongValue("transactionTimeout.openWarn", 0L);
+ return getLongValue("transactionTimeout.openWarn",
+ getBrokerAttributeAsLong(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN));
}
public long getTransactionTimeoutOpenClose()
{
- return getLongValue("transactionTimeout.openClose", 0L);
+ return getLongValue("transactionTimeout.openClose",
+ getBrokerAttributeAsLong(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE));
}
public long getTransactionTimeoutIdleWarn()
{
- return getLongValue("transactionTimeout.idleWarn", 0L);
+ return getLongValue("transactionTimeout.idleWarn",
+ getBrokerAttributeAsLong(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN));
}
public long getTransactionTimeoutIdleClose()
{
- return getLongValue("transactionTimeout.idleClose", 0L);
+ return getLongValue("transactionTimeout.idleClose",
+ getBrokerAttributeAsLong(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE));
}
public int getMaxDeliveryCount()
Modified: qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Broker.java Mon Apr 22 10:25:47 2013
@@ -56,19 +56,19 @@ public interface Broker extends Configur
String DEFAULT_AUTHENTICATION_PROVIDER = "defaultAuthenticationProvider";
String DEFAULT_VIRTUAL_HOST = "defaultVirtualHost";
- 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";
+ String ALERT_THRESHOLD_MESSAGE_AGE = "queue.alertThresholdMessageAge";
+ String ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES = "queue.alertThresholdQueueDepthMessages";
+ String ALERT_THRESHOLD_QUEUE_DEPTH_BYTES = "queue.alertThresholdQueueDepthBytes";
+ String ALERT_THRESHOLD_MESSAGE_SIZE = "queue.alertThresholdMessageSize";
+ String ALERT_REPEAT_GAP = "queue.alertRepeatGap";
+ String FLOW_CONTROL_SIZE_BYTES = "queue.flowControlSizeBytes";
+ String FLOW_CONTROL_RESUME_SIZE_BYTES = "queue.flowResumeSizeBytes";
+ String MAXIMUM_DELIVERY_ATTEMPTS = "queue.maximumDeliveryAttempts";
+ String DEAD_LETTER_QUEUE_ENABLED = "queue.deadLetterQueueEnabled";
+ String HOUSEKEEPING_CHECK_PERIOD = "virtualhost.housekeepingCheckPeriod";
- String SESSION_COUNT_LIMIT = "sessionCountLimit";
- String HEART_BEAT_DELAY = "heartBeatDelay";
+ String SESSION_COUNT_LIMIT = "connection.sessionCountLimit";
+ String HEART_BEAT_DELAY = "connection.heartBeatDelay";
String STATISTICS_REPORTING_PERIOD = "statisticsReportingPeriod";
String STATISTICS_REPORTING_RESET_ENABLED = "statisticsReportingResetEnabled";
String STORE_TYPE = "storeType";
@@ -76,6 +76,10 @@ public interface Broker extends Configur
String STORE_PATH = "storePath";
String MANAGEMENT_VERSION = "managementVersion";
+ String VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE = "virtualhost.storeTransactionIdleTimeoutClose";
+ String VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN = "virtualhost.storeTransactionIdleTimeoutWarn";
+ String VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE = "virtualhost.storeTransactionOpenTimeoutClose";
+ String VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN = "virtualhost.storeTransactionOpenTimeoutWarn";
/*
* A temporary attribute to pass the path to ACL file.
* TODO: It should be a part of AuthorizationProvider.
@@ -122,8 +126,8 @@ public interface Broker extends Configur
DEFAULT_AUTHENTICATION_PROVIDER,
DEFAULT_VIRTUAL_HOST,
ALERT_THRESHOLD_MESSAGE_AGE,
- ALERT_THRESHOLD_MESSAGE_COUNT,
- ALERT_THRESHOLD_QUEUE_DEPTH,
+ ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
+ ALERT_THRESHOLD_QUEUE_DEPTH_BYTES,
ALERT_THRESHOLD_MESSAGE_SIZE,
ALERT_REPEAT_GAP,
FLOW_CONTROL_SIZE_BYTES,
@@ -139,6 +143,10 @@ public interface Broker extends Configur
STORE_VERSION,
STORE_PATH,
MANAGEMENT_VERSION,
+ VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE,
+ VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN,
+ VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE,
+ VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN,
ACL_FILE,
KEY_STORE_PATH,
Modified: qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java Mon Apr 22 10:25:47 2013
@@ -57,16 +57,16 @@ public interface VirtualHost extends Con
XA_TRANSACTION_BRANCH_ENDS, XA_TRANSACTION_BRANCH_STARTS, XA_TRANSACTION_BRANCH_SUSPENDS,
QUEUE_COUNT, EXCHANGE_COUNT, CONNECTION_COUNT));
- String ALERT_REPEAT_GAP = "alertRepeatGap";
- String ALERT_THRESHOLD_MESSAGE_AGE = "alertThresholdMessageAge";
- String ALERT_THRESHOLD_MESSAGE_SIZE = "alertThresholdMessageSize";
- String ALERT_THRESHOLD_QUEUE_DEPTH_BYTES = "alertThresholdQueueDepthBytes";
- String ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES = "alertThresholdQueueDepthMessages";
- String DEAD_LETTER_QUEUE_ENABLED = "deadLetterQueueEnabled";
+ String ALERT_REPEAT_GAP = "queue.alertRepeatGap";
+ String ALERT_THRESHOLD_MESSAGE_AGE = "queue.alertThresholdMessageAge";
+ String ALERT_THRESHOLD_MESSAGE_SIZE = "queue.alertThresholdMessageSize";
+ String ALERT_THRESHOLD_QUEUE_DEPTH_BYTES = "queue.alertThresholdQueueDepthBytes";
+ String ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES = "queue.alertThresholdQueueDepthMessages";
+ String DEAD_LETTER_QUEUE_ENABLED = "queue.deadLetterQueueEnabled";
String HOUSEKEEPING_CHECK_PERIOD = "housekeepingCheckPeriod";
- String MAXIMUM_DELIVERY_ATTEMPTS = "maximumDeliveryAttempts";
- String QUEUE_FLOW_CONTROL_SIZE_BYTES = "queueFlowControlSizeBytes";
- String QUEUE_FLOW_RESUME_SIZE_BYTES = "queueFlowResumeSizeBytes";
+ String MAXIMUM_DELIVERY_ATTEMPTS = "queue.maximumDeliveryAttempts";
+ String QUEUE_FLOW_CONTROL_SIZE_BYTES = "queue.flowControlSizeBytes";
+ String QUEUE_FLOW_RESUME_SIZE_BYTES = "queue.flowResumeSizeBytes";
String STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE = "storeTransactionIdleTimeoutClose";
String STORE_TRANSACTION_IDLE_TIMEOUT_WARN = "storeTransactionIdleTimeoutWarn";
String STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE = "storeTransactionOpenTimeoutClose";
Modified: qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Mon Apr 22 10:25:47 2013
@@ -79,8 +79,8 @@ public class BrokerAdapter extends Abstr
@SuppressWarnings("serial")
public static final Map<String, Type> ATTRIBUTE_TYPES = Collections.unmodifiableMap(new HashMap<String, Type>(){{
put(ALERT_THRESHOLD_MESSAGE_AGE, Long.class);
- put(ALERT_THRESHOLD_MESSAGE_COUNT, Long.class);
- put(ALERT_THRESHOLD_QUEUE_DEPTH, Long.class);
+ put(ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, Long.class);
+ put(ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, Long.class);
put(ALERT_THRESHOLD_MESSAGE_SIZE, Long.class);
put(ALERT_REPEAT_GAP, Long.class);
put(FLOW_CONTROL_SIZE_BYTES, Long.class);
@@ -108,6 +108,10 @@ public class BrokerAdapter extends Abstr
put(PEER_STORE_PATH, String.class);
put(PEER_STORE_PASSWORD, String.class);
put(GROUP_FILE, String.class);
+ put(VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE, Long.class);
+ put(VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN, Long.class);
+ put(VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE, Long.class);
+ put(VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN, Long.class);
}});
public static final int DEFAULT_STATISTICS_REPORTING_PERIOD = 0;
@@ -125,6 +129,10 @@ public class BrokerAdapter extends Abstr
public static final int DEFAULT_HEART_BEAT_DELAY = 0;
public static final int DEFAULT_SESSION_COUNT_LIMIT = 256;
public static final String DEFAULT_NAME = "QpidBroker";
+ public static final long DEFAULT_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE = 0l;
+ public static final long DEFAULT_STORE_TRANSACTION_IDLE_TIMEOUT_WARN = 0l;
+ public static final long DEFAULT_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE = 0l;
+ public static final long DEFAULT_STORE_TRANSACTION_OPEN_TIMEOUT_WARN = 0l;
private static final String DEFAULT_KEY_STORE_NAME = "defaultKeyStore";
private static final String DEFAULT_TRUST_STORE_NAME = "defaultTrustStore";
private static final String DEFAULT_GROUP_PROFIDER_NAME = "defaultGroupProvider";
@@ -138,9 +146,9 @@ public class BrokerAdapter extends Abstr
put(Broker.STATISTICS_REPORTING_RESET_ENABLED, DEFAULT_STATISTICS_REPORTING_RESET_ENABLED);
put(Broker.ALERT_REPEAT_GAP, DEFAULT_ALERT_REPEAT_GAP);
put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, DEFAULT_ALERT_THRESHOLD_MESSAGE_AGE);
- put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, DEFAULT_ALERT_THRESHOLD_MESSAGE_COUNT);
+ put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, DEFAULT_ALERT_THRESHOLD_MESSAGE_COUNT);
put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, DEFAULT_ALERT_THRESHOLD_MESSAGE_SIZE);
- put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, DEFAULT_ALERT_THRESHOLD_QUEUE_DEPTH);
+ put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, DEFAULT_ALERT_THRESHOLD_QUEUE_DEPTH);
put(Broker.DEAD_LETTER_QUEUE_ENABLED, DEFAULT_DEAD_LETTER_QUEUE_ENABLED);
put(Broker.MAXIMUM_DELIVERY_ATTEMPTS, DEFAULT_MAXIMUM_DELIVERY_ATTEMPTS);
put(Broker.FLOW_CONTROL_RESUME_SIZE_BYTES, DEFAULT_FLOW_CONTROL_RESUME_SIZE_BYTES);
@@ -149,12 +157,18 @@ public class BrokerAdapter extends Abstr
put(Broker.HEART_BEAT_DELAY, DEFAULT_HEART_BEAT_DELAY);
put(Broker.SESSION_COUNT_LIMIT, DEFAULT_SESSION_COUNT_LIMIT);
put(Broker.NAME, DEFAULT_NAME);
+ put(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE, DEFAULT_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE);
+ put(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN, DEFAULT_STORE_TRANSACTION_IDLE_TIMEOUT_WARN);
+ put(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE, DEFAULT_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE);
+ put(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN, DEFAULT_STORE_TRANSACTION_OPEN_TIMEOUT_WARN);
}});
- private String[] POSITIVE_NUMERIC_ATTRIBUTES = { ALERT_THRESHOLD_MESSAGE_AGE, ALERT_THRESHOLD_MESSAGE_COUNT,
- ALERT_THRESHOLD_QUEUE_DEPTH, ALERT_THRESHOLD_MESSAGE_SIZE, ALERT_REPEAT_GAP, FLOW_CONTROL_SIZE_BYTES,
+ private String[] POSITIVE_NUMERIC_ATTRIBUTES = { ALERT_THRESHOLD_MESSAGE_AGE, ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES,
+ ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, ALERT_THRESHOLD_MESSAGE_SIZE, ALERT_REPEAT_GAP, FLOW_CONTROL_SIZE_BYTES,
FLOW_CONTROL_RESUME_SIZE_BYTES, MAXIMUM_DELIVERY_ATTEMPTS, HOUSEKEEPING_CHECK_PERIOD, SESSION_COUNT_LIMIT,
- HEART_BEAT_DELAY, STATISTICS_REPORTING_PERIOD };
+ HEART_BEAT_DELAY, STATISTICS_REPORTING_PERIOD, VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE,
+ VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN, VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE,
+ VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN};
private final StatisticsGatherer _statisticsGatherer;
@@ -1028,9 +1042,9 @@ public class BrokerAdapter extends Abstr
Collection<String> names = AVAILABLE_ATTRIBUTES;
for (String name : names)
{
- if (attributes.containsKey(name))
+ if (convertedAttributes.containsKey(name))
{
- Object desired = attributes.get(name);
+ Object desired = convertedAttributes.get(name);
Object expected = getAttribute(name);
if (changeAttribute(name, expected, desired))
{
Propchange: qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:r1462470-1462472
Modified: qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java Mon Apr 22 10:25:47 2013
@@ -357,4 +357,52 @@ public class VirtualHostConfigurationTes
// Check, that the property stored within the <dot.in.a.name> tag has been properly loaded
assertEquals("virtual host with dots in the name has been properly loaded", TestableMemoryMessageStore.class.getName(), test.getMessageStore().getClass().getName());
}
+
+ public void testStoreTransactionIdleTimeoutClose() throws Exception
+ {
+ VirtualHost vhost = createVirtualHost(getName());
+ assertEquals("Unexpected StoreTransactionIdleTimeoutClose value", 0, vhost.getConfiguration().getTransactionTimeoutIdleClose());
+
+ when(_broker.getAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE)).thenReturn(1000l);
+ assertEquals("Unexpected StoreTransactionIdleTimeoutClose value", 1000l, vhost.getConfiguration().getTransactionTimeoutIdleClose());
+
+ vhost.getConfiguration().getConfig().setProperty("transactionTimeout.idleClose", 2000l);
+ assertEquals("Unexpected StoreTransactionIdleTimeoutClose value", 2000l, vhost.getConfiguration().getTransactionTimeoutIdleClose());
+ }
+
+ public void testStoreTransactionIdleTimeoutWarn() throws Exception
+ {
+ VirtualHost vhost = createVirtualHost(getName());
+ assertEquals("Unexpected StoreTransactionIdleTimeoutWarn value", 0, vhost.getConfiguration().getTransactionTimeoutIdleWarn());
+
+ when(_broker.getAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN)).thenReturn(1000l);
+ assertEquals("Unexpected StoreTransactionIdleTimeoutWarn value", 1000l, vhost.getConfiguration().getTransactionTimeoutIdleWarn());
+
+ vhost.getConfiguration().getConfig().setProperty("transactionTimeout.idleWarn", 2000l);
+ assertEquals("Unexpected StoreTransactionIdleTimeoutWarn value", 2000l, vhost.getConfiguration().getTransactionTimeoutIdleWarn());
+ }
+
+ public void testStoreTransactionOpenTimeoutClose() throws Exception
+ {
+ VirtualHost vhost = createVirtualHost(getName());
+ assertEquals("Unexpected StoreTransactionOpenTimeoutClose value", 0, vhost.getConfiguration().getTransactionTimeoutOpenClose());
+
+ when(_broker.getAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE)).thenReturn(1000l);
+ assertEquals("Unexpected StoreTransactionOpenTimeoutClose value", 1000l, vhost.getConfiguration().getTransactionTimeoutOpenClose());
+
+ vhost.getConfiguration().getConfig().setProperty("transactionTimeout.openClose", 2000l);
+ assertEquals("Unexpected StoreTransactionOpenTimeoutClose value", 2000l, vhost.getConfiguration().getTransactionTimeoutOpenClose());
+ }
+
+ public void testStoreTransactionOpenTimeoutWarn() throws Exception
+ {
+ VirtualHost vhost = createVirtualHost(getName());
+ assertEquals("Unexpected StoreTransactionOpenTimeoutWarn value", 0, vhost.getConfiguration().getTransactionTimeoutOpenWarn());
+
+ when(_broker.getAttribute(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN)).thenReturn(1000l);
+ assertEquals("Unexpected StoreTransactionOpenTimeoutWarn value", 1000l, vhost.getConfiguration().getTransactionTimeoutOpenWarn());
+
+ vhost.getConfiguration().getConfig().setProperty("transactionTimeout.openWarn", 2000l);
+ assertEquals("Unexpected StoreTransactionOpenTimeoutWarn value", 2000l, vhost.getConfiguration().getTransactionTimeoutOpenWarn());
+ }
}
Modified: qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java Mon Apr 22 10:25:47 2013
@@ -91,8 +91,8 @@ public class BrokerRecovererTest extends
attributes.put(Broker.DEFAULT_VIRTUAL_HOST, "test");
attributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, "authenticationProvider1");
attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, 9l);
- attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, 8l);
- attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, 7l);
+ attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 8l);
+ attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 7l);
attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, 6l);
attributes.put(Broker.ALERT_REPEAT_GAP, 5l);
attributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, 5l);
Modified: qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java (original)
+++ qpid/branches/QPID-4659/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java Mon Apr 22 10:25:47 2013
@@ -62,8 +62,8 @@ public abstract class ConfigurationEntry
_brokerAttributes.put(Broker.DEFAULT_VIRTUAL_HOST, "test");
_brokerAttributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, "authenticationProvider1");
_brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, 9);
- _brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, 8);
- _brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, 7);
+ _brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 8);
+ _brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 7);
_brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, 6);
_brokerAttributes.put(Broker.ALERT_REPEAT_GAP, 5);
_brokerAttributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, 5);
@@ -173,8 +173,8 @@ public abstract class ConfigurationEntry
attributes.put(Broker.DEFAULT_VIRTUAL_HOST, "test");
attributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, "authenticationProvider1");
attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, 19);
- attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, 18);
- attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, 17);
+ attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 18);
+ attributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 17);
attributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, 16);
attributes.put(Broker.ALERT_REPEAT_GAP, 15);
attributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, 15);
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1462470-1462472
Modified: qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1470433&r1=1470432&r2=1470433&view=diff
==============================================================================
--- qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java Mon Apr 22 10:25:47 2013
@@ -34,7 +34,6 @@ import org.apache.qpid.server.model.Life
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.model.adapter.BrokerAdapter;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
import org.apache.qpid.test.utils.TestSSLConstants;
@@ -103,14 +102,36 @@ public class BrokerRestTest extends Qpid
assertBrokerAttributes(brokerAttributes, brokerDetails);
}
+ public void testPutUpdateWhereNumericAttributesAreSetAsStringValues() throws Exception
+ {
+ Map<String, Object> validAttributes = getValidBrokerAttributes();
+ Map<String, Object> attributes = new HashMap<String, Object>();
+
+ for (Map.Entry<String, Object> entry : validAttributes.entrySet())
+ {
+ Object value = entry.getValue();
+ if (value instanceof Number)
+ {
+ value = String.valueOf(value);
+ }
+ attributes.put(entry.getKey(), value);
+ }
+
+ int response = getRestTestHelper().submitRequest("/rest/broker", "PUT", attributes);
+ assertEquals("Unexpected update response", 200, response);
+
+ Map<String, Object> brokerDetails = getRestTestHelper().getJsonAsSingletonList("/rest/broker");
+ assertBrokerAttributes(validAttributes, brokerDetails);
+ }
+
public void testPutToUpdateWithInvalidAttributeValues() throws Exception
{
Map<String, Object> invalidAttributes = new HashMap<String, Object>();
invalidAttributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, "non-existing-provider");
invalidAttributes.put(Broker.DEFAULT_VIRTUAL_HOST, "non-existing-host");
invalidAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, -1000);
- invalidAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, -2000);
- invalidAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, -3000);
+ invalidAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, -2000);
+ invalidAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, -3000);
invalidAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, -4000);
invalidAttributes.put(Broker.ALERT_REPEAT_GAP, -5000);
invalidAttributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, -7000);
@@ -129,6 +150,10 @@ public class BrokerRestTest extends Qpid
invalidAttributes.put(Broker.PEER_STORE_PATH, QpidTestCase.QPID_HOME + File.separator + "etc" + File.separator + "non-existing-peerstore.jks");
invalidAttributes.put(Broker.PEER_STORE_PASSWORD, "password3");
invalidAttributes.put(Broker.GROUP_FILE, QpidTestCase.QPID_HOME + File.separator + "etc" + File.separator + "groups-non-existing");
+ invalidAttributes.put(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE, -13000);
+ invalidAttributes.put(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN, -14000);
+ invalidAttributes.put(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE, -15000);
+ invalidAttributes.put(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN, -16000);
for (Map.Entry<String, Object> entry : invalidAttributes.entrySet())
{
@@ -152,8 +177,8 @@ public class BrokerRestTest extends Qpid
brokerAttributes.put(Broker.DEFAULT_AUTHENTICATION_PROVIDER, ANONYMOUS_AUTHENTICATION_PROVIDER);
brokerAttributes.put(Broker.DEFAULT_VIRTUAL_HOST, TEST3_VIRTUALHOST);
brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_AGE, 1000);
- brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_COUNT, 2000);
- brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH, 3000);
+ brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES, 2000);
+ brokerAttributes.put(Broker.ALERT_THRESHOLD_QUEUE_DEPTH_BYTES, 3000);
brokerAttributes.put(Broker.ALERT_THRESHOLD_MESSAGE_SIZE, 4000);
brokerAttributes.put(Broker.ALERT_REPEAT_GAP, 5000);
brokerAttributes.put(Broker.FLOW_CONTROL_SIZE_BYTES, 7000);
@@ -174,6 +199,10 @@ public class BrokerRestTest extends Qpid
brokerAttributes.put(Broker.PEER_STORE_PATH, TestSSLConstants.TRUSTSTORE);
brokerAttributes.put(Broker.PEER_STORE_PASSWORD, TestSSLConstants.TRUSTSTORE_PASSWORD);
brokerAttributes.put(Broker.GROUP_FILE, QpidTestCase.QPID_HOME + File.separator + "etc" + File.separator + "groups");
+ brokerAttributes.put(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE, 13000);
+ brokerAttributes.put(Broker.VIRTUALHOST_STORE_TRANSACTION_IDLE_TIMEOUT_WARN, 14000);
+ brokerAttributes.put(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_CLOSE, 15000);
+ brokerAttributes.put(Broker.VIRTUALHOST_STORE_TRANSACTION_OPEN_TIMEOUT_WARN, 16000);
return brokerAttributes;
}
Propchange: qpid/branches/QPID-4659/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1462470-1462472
Propchange: qpid/branches/QPID-4659/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1462470-1462472
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org