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 2014/10/17 15:58:07 UTC
svn commit: r1632579 [3/3] - in
/qpid/branches/QPID-6125-ProtocolRefactoring/java: ./
amqp-1-0-client-websocket/src/main/java/org/apache/qpid/amqp_1_0/client/websocket/
amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/
amqp-1-0-common/src/...
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Impact of Message Size Bytes/S
chartSubtitle=Persistent messages
-chartDescription=1P 1C, persistent, auto-ack, with message payload between 256-262144 bytes, single queue.
+chartDescription=1P 1C, single queue, persistent, session-transacted, with message payload between 256-262144 bytes.
xAxisTitle=Message Size (B)
yAxisTitle=Throughput (KB/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Impact of Message Size
chartSubtitle=Transient messages
-chartDescription=1P 1C, transient, auto-ack, with message payload between 256-262144 bytes, single queue.
+chartDescription=1P 1C, single queue, transient, auto-ack, with message payload between 256-262144 bytes.
xAxisTitle=Message Size (B)
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Impact of Message Size
chartSubtitle=Persistent messages
-chartDescription=1P 1C, persistent, auto-ack, with message payload between 256-262144 bytes, single queue.
+chartDescription=1P 1C, single queue, persistent, session-transacted, with message payload between 256-262144 bytes.
xAxisTitle=Message Size (B)
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Varying number of producers - auto ack
chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10 P/Cs, persistent, auto-ack, with message payload 1KB, single queue.
+chartDescription=1,2,5,10 P/Cs, single queue, persistent, auto-ack, with message payload 1KB.
xAxisTitle=Producers
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Varying number of consumers - auto ack
chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10 P/Cs, persistent, auto-ack, with message payload 1KB, single queue.
+chartDescription=1,2,5,10 P/Cs, single queue, persistent, auto-ack, with message payload 1KB.
xAxisTitle=Consumers
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Varying number of producers - transacted
chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10 P/Cs, persistent, transacted, with message payload 1KB, single queue.
+chartDescription=1,2,5,10 P/Cs, single queue, persistent, transacted, with message payload 1KB.
xAxisTitle=Producers
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Varying number of consumers - transacted
chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10 P/Cs, persistent, transacted, with message payload 1KB, single queue.
+chartDescription=1,2,5,10 P/Cs, single queue, persistent, transacted, with message payload 1KB.
xAxisTitle=Consumers
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=BAR
chartTitle=Performance of acknowledgement modes
chartSubtitle=Persistent messages (1KB)
-chartDescription=1P 1C, persistent, with message payload 1KB, single queue.
+chartDescription=1P 1C, single queue, persistent, with message payload 1KB.
xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge)
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=BAR
chartTitle=Performance of acknowledgement modes
chartSubtitle=Transient messages (1024b)
-chartDescription=1P 1C, transient, with message payload 1KB, single queue.
+chartDescription=1P 1C, single queue, transient, with message payload 1KB.
xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge)
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Transaction Batch Sizes Equal
chartSubtitle=Persistent 1KB messages
-chartDescription=1P 1C, persistent, transacted with message payload 1KB with producer/consumer batch size varying between 1-400 messages for both P and C, single queue.
+chartDescription=1P 1C, single queue, persistent, transacted with message payload 1KB with producer/consumer batch size varying between 1-400 messages for both P and C.
xAxisTitle=Batch Size
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Transaction Batch Size Unequal
chartSubtitle=Persistent 1KB messages
-chartDescription=1P 1C, persistent, transacted with message payload 1KB with fixed batch size 1 for one party whilst other varies between 1-400 messages, single queue.
+chartDescription=1P 1C, single queue, persistent, transacted with message payload 1KB with fixed batch size 1 for one party whilst other varies between 1-400 messages.
xAxisTitle=Batch Size
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=BAR
chartTitle=Queue Types
chartSubtitle=Persistent 1KB messages
-chartDescription=1P 1C, persistent, auto-ack with message payload 1KB. Sorted queue - 160,000 random keys, Priority - iteriates priority 0..9, single queue.
+chartDescription=1P 1C, single queue, persistent, session-transacted with message payload 1KB. Sorted queue - 160,000 random keys, Priority - iteriates priority 0..9.
xAxisTitle=Queue Types
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Varying number of producer sessions on single connection
chartSubtitle=Persistent messages (1024b)
-chartDescription=1-80P transacted on single connection, 20C transacted on separate connections, persistent, message payload 1KB, single queue.
+chartDescription=1-80P single queue, transacted on single connection, 20C transacted on separate connections, persistent, message payload 1KB.
xAxisTitle=Number of producer sessions
yAxisTitle=Throughput (KB/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef Fri Oct 17 13:58:04 2014
@@ -22,7 +22,7 @@ chartTitle=Impact of non-overlapping sel
chartSubtitle=Transient 1KB messages
xAxisTitle=Consumers
yAxisTitle=Throughput (messages/s)
-chartDescription=Impact of non-overlapping selectors on queue consumers with transient messages, auto-ack, message payload of 1024 bytes, 1 producer, varying number of consumers from 1 to 32, single queue.
+chartDescription=Impact of non-overlapping selectors on queue consumers with single queue, transient messages, auto-ack, message payload of 1024 bytes, 1 producer, varying number of consumers from 1 to 32.
series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - NON_PERSISTENT%'
series.1.legend=Current
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef Fri Oct 17 13:58:04 2014
@@ -22,7 +22,7 @@ chartTitle=Impact of non-overlapping sel
chartSubtitle=Persistent 1KB messages
xAxisTitle=Consumers
yAxisTitle=Throughput (messages/s)
-chartDescription=Impact of non-overlapping selectors on queue consumers with persistent messages, auto-ack, message payload of 1024 bytes, 1 producer, varying number of consumers from 1 to 32, single queue.
+chartDescription=Impact of non-overlapping selectors on queue consumers with single queue, persistent messages, session-transacted, message payload of 1024 bytes, 1 producer, varying number of consumers from 1 to 32.
series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - PERSISTENT'
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef Fri Oct 17 13:58:04 2014
@@ -22,7 +22,7 @@ chartTitle=Impact of 50%-overlapping sel
chartSubtitle=Transient 1KB messages
xAxisTitle=Consumers
yAxisTitle=Throughput (messages/s)
-chartDescription=Impact of 50%-overlapping selectors in queue consumers with transient messages, auto-ack, message payload 1KB, 1 producer, varying number of consumers from 2 to 32, single queue.
+chartDescription=Impact of 50%-overlapping selectors in queue consumers with single queue, transient messages, auto-ack, message payload 1KB, 1 producer, varying number of consumers from 2 to 32.
series.1.statement=SELECT totalNumberOfConsumers,throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - NON_PERSISTENT%'
series.1.legend=Current
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef Fri Oct 17 13:58:04 2014
@@ -19,7 +19,7 @@
chartType=XYLINE
chartTitle=Impact of 50%-overlapping selectors in queue consumers with persistent messages
-chartDescription=Impact of 50%-overlapping selectors in queue consumers with persistent messages, auto-ack, message payload of 1KB, 1 producer, varying number of consumers from 2 to 32, single queue.
+chartDescription=Impact of 50%-overlapping selectors in queue consumers with single queue, persistent messages, session-transacted, message payload of 1KB, 1 producer, varying number of consumers from 2 to 32.
chartSubtitle=Persistent 1KB messages
xAxisTitle=Consumers
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Number of topic consumers
chartSubtitle=Transient 1KB messages
-chartDescription=1P 1-100C transient, transacted, with message payload 1KB, single queue.
+chartDescription=1P 1-100C single topic, transient, transacted, with message payload 1KB.
xAxisTitle=Numer of consumers
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=XYLINE
chartTitle=Number of topics
chartSubtitle=Transient 1KB messages
-chartDescription=1,10,50,100 PC, transient, transacted, with each PC pair having own topic, message payload 1KB, single topic.
+chartDescription=1,10,50,100 PC, single topic, transient, transacted, with each PC pair having own topic, message payload 1KB.
xAxisTitle=Numer of topics
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=BAR
chartTitle=Topic transient/durable subscriptions
chartSubtitle=1KB messages
-chartDescription=1P 10C, transacted, message payload 1KB, transient messages on non-durable sub, persistent messages on durable sub, single topic,
+chartDescription=1P 10C, single topic, transacted, message payload 1KB, transient messages on non-durable sub, persistent messages on durable sub.
xAxisTitle=Subscription type (true durable, false non durable)
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=BAR
chartTitle=Topic acknowledge modes
chartSubtitle=Transient 1KB messages
-chartDescription=1P 10C, transient, non-durable subscription, message payload 1KB, single topic.
+chartDescription=1P 10C, single topic, transient, non-durable subscription, message payload 1KB.
xAxisTitle=Ack Mode (0=transaction 1=auto-ack)
yAxisTitle=Throughput (messages/s)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=STATISTICAL_BAR
chartTitle=Impact of message size on latency
chartSubtitle=Transient messages
-chartDescription=1P 1C, transient, auto-ack, with message payload between 256-262144 bytes, single queue.
+chartDescription=1P 1C, single queue, transient, auto-ack, with message payload between 256-262144 bytes.
xAxisTitle=Message Size (B)
yAxisTitle=Latency (millis)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=STATISTICAL_BAR
chartTitle=Impact of message size on latency
chartSubtitle=Persistent messages
-chartDescription=1P 1C, persistent, auto-ack, with message payload between 256-262144 bytes, single queue.
+chartDescription=1P 1C, single queue, persistent, session-transacted, with message payload between 256-262144 bytes.
xAxisTitle=Message Size (B)
yAxisTitle=Latency (millis)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef Fri Oct 17 13:58:04 2014
@@ -20,7 +20,7 @@
chartType=STATISTICAL_BAR
chartTitle=Latency, varying number of participants
chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10 P/Cs, persistent, auto-ack, with message payload 1KB, single queue.
+chartDescription=1,2,5,10 P/Cs, single queue, persistent, session-transacted, with message payload 1KB.
xAxisTitle=Consumers
yAxisTitle=Latency (millis)
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueTypes.json
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueTypes.json?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueTypes.json (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/etc/testdefs/QueueTypes.json Fri Oct 17 13:58:04 2014
@@ -16029,7 +16029,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -16054,7 +16054,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
@@ -16087,7 +16087,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -16111,7 +16111,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
@@ -16154,7 +16154,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_producers": [
{
"_name": "Producer1",
@@ -16179,7 +16179,7 @@
"_sessions": [
{
"_sessionName": "session1",
- "_acknowledgeMode": 1,
+ "_acknowledgeMode": 0,
"_consumers": [
{
"_name": "Consumer1",
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/pom.xml?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/pom.xml (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/perftests/pom.xml Fri Oct 17 13:58:04 2014
@@ -179,7 +179,10 @@
</arguments>
<systemProperties>
<systemProperty>
- <key>qpid.amqp</key><value>0-91</value>
+ <key>log4j.configuration</key><value>file:log4j.properties</value>
+ </systemProperty>
+ <systemProperty>
+ <key>qpid.amqp.version</key><value>0-91</value>
</systemProperty>
<systemProperty>
<key>qpid.dest_syntax</key><value>BURL</value>
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/etc/config-systests.json
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/etc/config-systests.json?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/etc/config-systests.json (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/etc/config-systests.json Fri Oct 17 13:58:04 2014
@@ -21,7 +21,7 @@
{
"name": "Broker",
"defaultVirtualHost" : "test",
- "modelVersion": "2.0",
+ "modelVersion": "2.1",
"authenticationproviders" : [ {
"name" : "plain",
"type" : "PlainPasswordFile",
@@ -41,7 +41,17 @@
"name" : "amqp",
"authenticationProvider" : "plain",
"port" : "${test.port}",
- "protocols" : "${test.amqp_port_protocols}"
+ "protocols" : "${test.amqp_port_protocols}",
+ "virtualhostaliases" : [ {
+ "name" : "nameAlias",
+ "type" : "nameAlias"
+ }, {
+ "name" : "defaultAlias",
+ "type" : "defaultAlias"
+ }, {
+ "name" : "hostnameAlias",
+ "type" : "hostnameAlias"
+ } ]
}, {
"name" : "http",
"authenticationProvider" : "plain",
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Fri Oct 17 13:58:04 2014
@@ -50,6 +50,7 @@ import javax.naming.NamingException;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQConnectionFactory;
import org.apache.qpid.client.AMQConnectionURL;
Propchange: qpid/branches/QPID-6125-ProtocolRefactoring/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:r1628068-1632578
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Fri Oct 17 13:58:04 2014
@@ -57,6 +57,8 @@ import org.apache.qpid.server.model.Plug
import org.apache.qpid.server.model.PreferencesProvider;
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.UUIDGenerator;
+import org.apache.qpid.server.model.VirtualHostAlias;
+import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.model.adapter.FileBasedGroupProvider;
import org.apache.qpid.server.model.adapter.FileBasedGroupProviderImpl;
import org.apache.qpid.server.plugin.PluggableFactoryLoader;
@@ -254,12 +256,47 @@ public class TestBrokerConfiguration
}
public UUID[] removeObjectConfiguration(final Class<? extends ConfiguredObject> category,
- String name)
+ final String name)
{
final ConfiguredObjectRecord entry = findObject(category, name);
+
if (entry != null)
{
+
+ if(category == VirtualHostNode.class)
+ {
+ final List<ConfiguredObjectRecord> aliasRecords = new ArrayList<>();
+ // remove vhost aliases associated with the vhost
+ final ConfiguredObjectRecordHandler visitor = new ConfiguredObjectRecordHandler()
+ {
+ @Override
+ public void begin()
+ {
+
+ }
+
+ @Override
+ public boolean handle(final ConfiguredObjectRecord record)
+ {
+ if (record.getType().equals(VirtualHostAlias.class.getSimpleName())
+ && name.equals(record.getAttributes().get(ConfiguredObject.NAME)))
+ {
+ aliasRecords.add(record);
+ }
+ return true;
+ }
+
+ @Override
+ public void end()
+ {
+
+ }
+ };
+ _store.visitConfiguredObjectRecords(visitor);
+ _store.remove(aliasRecords.toArray(new ConfiguredObjectRecord[aliasRecords.size()]));
+ }
return _store.remove(entry);
+
}
return null;
}
@@ -271,6 +308,18 @@ public class TestBrokerConfiguration
return id;
}
+ public UUID addObjectConfiguration(final Class<? extends ConfiguredObject> parentCategory, final String parentName,
+ Class<? extends ConfiguredObject> type, Map<String, Object> attributes)
+ {
+ UUID id = UUIDGenerator.generateRandomUUID();
+ ConfiguredObjectRecord entry =
+ new ConfiguredObjectRecordImpl(id, type.getSimpleName(), attributes,
+ Collections.singletonMap(parentCategory.getSimpleName(), findObject(parentCategory,parentName).getId()));
+
+ _store.update(true, entry);
+ return id;
+ }
+
public UUID addJmxManagementConfiguration()
{
Map<String, Object> attributes = new HashMap<String, Object>();
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java Fri Oct 17 13:58:04 2014
@@ -36,15 +36,19 @@ import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.qpid.client.AMQConnectionURL;
import org.apache.qpid.client.AMQTestConnection_0_10;
import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.server.model.DefaultVirtualHostAlias;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Transport;
+import org.apache.qpid.server.model.VirtualHostAlias;
+import org.apache.qpid.server.model.VirtualHostNameAlias;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class SSLTest extends QpidBrokerTestCase
{
@@ -215,7 +219,7 @@ public class SSLTest extends QpidBrokerT
AMQTestConnection_0_10 con = new AMQTestConnection_0_10(url);
org.apache.qpid.transport.Connection transportCon = con.getConnection();
String userID = transportCon.getSecurityLayer().getUserID();
- assertEquals("The correct certificate was not choosen","app1@acme.org",userID);
+ assertEquals("The correct certificate was not chosen","app1@acme.org",userID);
con.close();
url = "amqp://guest:guest@test/?brokerlist='tcp://localhost:" +
@@ -225,7 +229,7 @@ public class SSLTest extends QpidBrokerT
con = new AMQTestConnection_0_10(url);
transportCon = con.getConnection();
userID = transportCon.getSecurityLayer().getUserID();
- assertEquals("The correct certificate was not choosen","app2@acme.org",userID);
+ assertEquals("The correct certificate was not chosen","app2@acme.org",userID);
con.close();
}
}
@@ -464,6 +468,17 @@ public class SSLTest extends QpidBrokerT
sslPortAttributes.put(Port.KEY_STORE, TestBrokerConfiguration.ENTRY_NAME_SSL_KEYSTORE);
sslPortAttributes.put(Port.TRUST_STORES, Collections.singleton(TestBrokerConfiguration.ENTRY_NAME_SSL_TRUSTSTORE));
getBrokerConfiguration().addObjectConfiguration(Port.class,sslPortAttributes);
+
+ Map<String, Object> aliasAttributes = new HashMap<>();
+ aliasAttributes.put(VirtualHostAlias.NAME, "defaultAlias");
+ aliasAttributes.put(VirtualHostAlias.TYPE, DefaultVirtualHostAlias.TYPE_NAME);
+ getBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes);
+
+ aliasAttributes = new HashMap<>();
+ aliasAttributes.put(VirtualHostAlias.NAME, "nameAlias");
+ aliasAttributes.put(VirtualHostAlias.TYPE, VirtualHostNameAlias.TYPE_NAME);
+ getBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes);
+
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java Fri Oct 17 13:58:04 2014
@@ -41,9 +41,12 @@ import javax.jms.JMSException;
import org.apache.qpid.client.AMQConnectionURL;
import org.apache.qpid.management.common.mbeans.ManagedConnection;
import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.DefaultVirtualHostAlias;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.TrustStore;
+import org.apache.qpid.server.model.VirtualHostAlias;
+import org.apache.qpid.server.model.VirtualHostNameAlias;
import org.apache.qpid.server.security.FileTrustStore;
import org.apache.qpid.test.utils.JMXTestUtils;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -346,6 +349,17 @@ public class ExternalAuthenticationTest
sslPortAttributes.put(Port.TRUST_STORES, trustStoreNames);
config.addObjectConfiguration(Port.class, sslPortAttributes);
+ Map<String, Object> aliasAttributes = new HashMap<>();
+ aliasAttributes.put(VirtualHostAlias.NAME, "defaultAlias");
+ aliasAttributes.put(VirtualHostAlias.TYPE, DefaultVirtualHostAlias.TYPE_NAME);
+ getBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes);
+
+ aliasAttributes = new HashMap<>();
+ aliasAttributes.put(VirtualHostAlias.NAME, "nameAlias");
+ aliasAttributes.put(VirtualHostAlias.TYPE, VirtualHostNameAlias.TYPE_NAME);
+ getBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes);
+
+
Map<String, Object> externalAuthProviderAttributes = new HashMap<String, Object>();
externalAuthProviderAttributes.put(AuthenticationProvider.NAME, TestBrokerConfiguration.ENTRY_NAME_EXTERNAL_PROVIDER);
externalAuthProviderAttributes.put(AuthenticationProvider.TYPE, ExternalAuthenticationManager.PROVIDER_TYPE);
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java Fri Oct 17 13:58:04 2014
@@ -35,8 +35,11 @@ import javax.jms.JMSException;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.DefaultVirtualHostAlias;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Transport;
+import org.apache.qpid.server.model.VirtualHostAlias;
+import org.apache.qpid.server.model.VirtualHostNameAlias;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -61,6 +64,17 @@ public class MultipleAuthenticationManag
sslPortAttributes.put(Port.AUTHENTICATION_PROVIDER, TestBrokerConfiguration.ENTRY_NAME_ANONYMOUS_PROVIDER);
config.addObjectConfiguration(Port.class, sslPortAttributes);
+ Map<String, Object> aliasAttributes = new HashMap<>();
+ aliasAttributes.put(VirtualHostAlias.NAME, "defaultAlias");
+ aliasAttributes.put(VirtualHostAlias.TYPE, DefaultVirtualHostAlias.TYPE_NAME);
+ config.addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes);
+
+ aliasAttributes = new HashMap<>();
+ aliasAttributes.put(VirtualHostAlias.NAME, "nameAlias");
+ aliasAttributes.put(VirtualHostAlias.TYPE, VirtualHostNameAlias.TYPE_NAME);
+ getBrokerConfiguration().addObjectConfiguration(Port.class, TestBrokerConfiguration.ENTRY_NAME_SSL_PORT, VirtualHostAlias.class, aliasAttributes);
+
+
// set the ssl system properties
setSystemProperty("javax.net.ssl.keyStore", KEYSTORE);
setSystemProperty("javax.net.ssl.keyStorePassword", KEYSTORE_PASSWORD);
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java Fri Oct 17 13:58:04 2014
@@ -35,7 +35,6 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.test.utils.JMXTestUtils;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
-import org.apache.qpid.tools.security.Passwd;
/**
* System test for User Management.
@@ -49,11 +48,9 @@ public class UserManagementTest extends
private String _testUserName;
private File _passwordFile;
private UserManagement _userManagement;
- private Passwd _passwd;
public void setUp() throws Exception
{
- _passwd = createPasswordEncodingUtility();
_passwordFile = createTemporaryPasswordFileWithJmxAdminUser();
Map<String, Object> newAttributes = new HashMap<String, Object>();
@@ -161,17 +158,6 @@ public class UserManagementTest extends
assertEquals("unexpected authentication provider type", getAuthenticationManagerType(), actualType);
}
- protected Passwd createPasswordEncodingUtility()
- {
- return new Passwd()
- {
- @Override
- public String getOutput(String username, String password)
- {
- return username + ":" + password;
- }
- };
- }
protected String getAuthenticationManagerType()
{
@@ -188,21 +174,25 @@ public class UserManagementTest extends
private void writePasswordFile(File passwordFile, String... userNamePasswordPairs) throws Exception
{
- FileWriter writer = null;
- try
+ try(FileWriter writer = new FileWriter(passwordFile))
{
- writer = new FileWriter(passwordFile);
for (int i = 0; i < userNamePasswordPairs.length; i=i+2)
{
String username = userNamePasswordPairs[i];
String password = userNamePasswordPairs[i+1];
- writer.append(_passwd.getOutput(username, password) + "\n");
+ writeUsernamePassword(writer, username, password);
}
}
- finally
- {
- writer.close();
- }
+
+ }
+
+ protected void writeUsernamePassword(final FileWriter writer, final String username, final String password)
+ throws IOException
+ {
+ writer.append(username);
+ writer.append(':');
+ writer.append(password);
+ writer.append('\n');
}
@@ -218,10 +208,8 @@ public class UserManagementTest extends
private boolean passwordFileContainsUser(String username) throws IOException
{
- BufferedReader reader = null;
- try
+ try(BufferedReader reader = new BufferedReader(new FileReader(_passwordFile)))
{
- reader = new BufferedReader(new FileReader(_passwordFile));
String line = reader.readLine();
while(line != null)
{
@@ -234,10 +222,6 @@ public class UserManagementTest extends
return false;
}
- finally
- {
- reader.close();
- }
}
private void assertJmsConnectionSucceeds(String username, String password) throws Exception
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java Fri Oct 17 13:58:04 2014
@@ -18,17 +18,42 @@
*/
package org.apache.qpid.systest.management.jmx;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import javax.xml.bind.DatatypeConverter;
+
import org.apache.qpid.server.security.auth.manager.Base64MD5PasswordDatabaseAuthenticationManager;
-import org.apache.qpid.tools.security.Passwd;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class UserManagementWithBase64MD5PasswordsTest extends UserManagementTest
{
@Override
- protected Passwd createPasswordEncodingUtility()
+ protected void writeUsernamePassword(final FileWriter writer, final String username, final String password)
+ throws IOException
{
- return new Passwd();
+ writer.append(username);
+ writer.append(":");
+ byte[] data = password.getBytes(StandardCharsets.UTF_8);
+ MessageDigest md = null;
+ try
+ {
+ md = MessageDigest.getInstance("MD5");
+ }
+ catch (NoSuchAlgorithmException e)
+ {
+ throw new ServerScopedRuntimeException("MD5 not supported although Java compliance requires it");
+ }
+
+ md.update(data);
+ writer.append(DatatypeConverter.printBase64Binary(md.digest()));
+ writer.append('\n');
}
+
@Override
protected String getAuthenticationManagerType()
{
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/systest/rest/SaslRestTest.java Fri Oct 17 13:58:04 2014
@@ -29,11 +29,14 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.net.HttpURLConnection;
+import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.xml.bind.DatatypeConverter;
+
import org.apache.commons.codec.binary.Base64;
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
@@ -41,7 +44,6 @@ import org.codehaus.jackson.map.JsonMapp
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.security.auth.manager.Base64MD5PasswordDatabaseAuthenticationManager;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
-import org.apache.qpid.tools.security.Passwd;
public class SaslRestTest extends QpidRestTestCase
{
@@ -353,7 +355,12 @@ public class SaslRestTest extends QpidRe
String passwordFileEntry;
try
{
- passwordFileEntry = new Passwd().getOutput("admin", "admin");
+
+ MessageDigest md = MessageDigest.getInstance("MD5");
+
+ md.update("admin".getBytes("utf-8"));
+
+ passwordFileEntry = "admin" + ":" + DatatypeConverter.printBase64Binary(md.digest());
}
catch (NoSuchAlgorithmException e)
{
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/tools/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/tools/pom.xml?rev=1632579&r1=1632578&r2=1632579&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/tools/pom.xml (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/tools/pom.xml Fri Oct 17 13:58:04 2014
@@ -51,7 +51,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${geronimo-jms-1-1-version}</version>
- <scope>provided</scope>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org