QPID-3977: tidy up chart generation.

Specifically:
- chart-summary.html now shows charts in deterministic order (dictated by the chart file names)
- We now only have one set of test definitions rather than maintaining both short and standard sets of files. We will use QPID-4103 to adjust the durations across the board.
- Charts have been given subtitles, and sloping CategoryLabelPositions to Plots that aren't CategoryPlots.  Also added test for statistical bar charts to ChartProductionTest.

Applied patch from Philip Harvey <phil@philharveyonline.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1357682 13f79535-47bb-0310-9956-ffa450edef68

16 files changed, 30 insertions, 14 deletions

diff --git a/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef b/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef
index 22d78042d8..ce9e108c09 100644
--- a/qpid/java/perftests/etc/chartdefs/MessageSizeNonPersistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef
@@ -18,10 +18,11 @@
 #
 
 chartType=LINE
-chartTitle=Impact of Message Size (Non-Persistent)
+chartTitle=Impact of Message Size
+chartSubtitle=Transient messages
 xAxisTitle=Message Size (B)
 yAxisTitle=Throughput (KB/s)
 
-series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%NON_PERSISTENT' AND participantName = 'All'
+series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All'
 series.1.legend=Current
 series.1.dir=${csvCurrentDir}
diff --git a/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef b/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef
index 4a57215714..d5ad7efbaa 100644
--- a/qpid/java/perftests/etc/chartdefs/MessageSizePersistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef
@@ -18,7 +18,8 @@
 #
 
 chartType=LINE
-chartTitle=Impact of Message Size (Persistent)
+chartTitle=Impact of Message Size
+chartSubtitle=Persistent messages
 xAxisTitle=Message Size (B)
 yAxisTitle=Throughput (KB/s)
 
diff --git a/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef b/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef
index 51ea92b909..8dbc5dc04a 100644
--- a/qpid/java/perftests/etc/chartdefs/VaryingNumberOfProducers.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef
@@ -19,6 +19,7 @@
 
 chartType=LINE
 chartTitle=Varying number of producers
+chartSubtitle=Persistent 1KB messages
 xAxisTitle=Producers
 yAxisTitle=Throughput (KB/s)
 
diff --git a/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef b/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef
index 83d6fe2659..010093e0c7 100644
--- a/qpid/java/perftests/etc/chartdefs/VaryingNumberOfConsumers.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef
@@ -19,6 +19,7 @@
 
 chartType=LINE
 chartTitle=Varying number of consumers
+chartSubtitle=Persistent 1KB messages
 xAxisTitle=Consumers
 yAxisTitle=Throughput (KB/s)
 
diff --git a/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef b/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef
index 42e4a0c11e..fc2f72bc29 100644
--- a/qpid/java/perftests/etc/chartdefs/AcknowledgementModesAutoAck.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef
@@ -18,7 +18,8 @@
 #
 
 chartType=BAR
-chartTitle=Performance of acknowledgement modes (Auto-acknowledgement)
+chartTitle=Performance of acknowledgement modes
+chartSubtitle=Auto-acknowledge
 xAxisTitle=Persistence
 yAxisTitle=Throughput (KB/s)
 
diff --git a/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef b/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef
index 3bbee462a0..7efbd7202e 100644
--- a/qpid/java/perftests/etc/chartdefs/AcknowledgementModesTransacted.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef
@@ -18,7 +18,8 @@
 #
 
 chartType=BAR
-chartTitle=Performance of acknowledgement modes (Transacted)
+chartTitle=Performance of acknowledgement modes
+chartSubtitle=Transacted
 xAxisTitle=Persistence
 yAxisTitle=Throughput (KB/s)
 
diff --git a/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef b/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef
index 13c42b2ebf..28a4e67194 100644
--- a/qpid/java/perftests/etc/chartdefs/BatchSize.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef
@@ -19,6 +19,7 @@
 
 chartType=LINE
 chartTitle=Transaction Batch Size
+chartSubtitle=Persistent 1KB messages
 xAxisTitle=Batch Size
 yAxisTitle=Throughput (KB/s)
 
diff --git a/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef b/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
index 770b5cc719..5c3ef39c3f 100644
--- a/qpid/java/perftests/etc/chartdefs/QueueTypes.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
@@ -19,6 +19,7 @@
 
 chartType=BAR
 chartTitle=Queue Types
+chartSubtitle=Persistent 1KB messages
 xAxisTitle=Queue Types
 yAxisTitle=Throughput (KB/s)
 
diff --git a/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Transient.chardef b/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
index eb00bc3f33..c4591afd1c 100644
--- a/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Transient.chardef
+++ b/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
@@ -18,7 +18,8 @@
 #
 
 chartType=STATISTICAL_BAR
-chartTitle=Impact of transient message size on latency
+chartTitle=Impact of message size on latency
+chartSubtitle=Transient messages
 xAxisTitle=Message Size (B)
 yAxisTitle=Latency (millis)
 
diff --git a/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Persistent.chardef b/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
index 7a7b2d3e67..23ed620fc5 100644
--- a/qpid/java/perftests/etc/chartdefs/Latency-MessageSize-Persistent.chardef
+++ b/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
@@ -18,7 +18,8 @@
 #
 
 chartType=STATISTICAL_BAR
-chartTitle=Impact of persistent message size on latency
+chartTitle=Impact of message size on latency
+chartSubtitle=Persistent messages
 xAxisTitle=Message Size (B)
 yAxisTitle=Latency (millis)
 
diff --git a/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
index 35e95e3f7a..c5980e29f6 100644
--- a/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
@@ -18,7 +18,8 @@
 #
 
 chartType=STATISTICAL_BAR
-chartTitle=Latency with consumers having non-overlapping selectors, transient,  message size 1KB
+chartTitle=Latency with consumers having non-overlapping selectors
+chartSubtitle=Transient 1KB messages
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
 
diff --git a/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
index ae409e0e8f..2bc48d54f4 100644
--- a/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Transient.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
@@ -18,7 +18,8 @@
 #
 
 chartType=STATISTICAL_BAR
-chartTitle=Latency with consumers having 50%-overlapping selectors, transient, message size 1KB
+chartTitle=Latency with consumers having 50%-overlapping selectors
+chartSubtitle=Transient 1KB messages
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
 
diff --git a/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
index ba108e5f92..64e6372ded 100644
--- a/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
@@ -18,7 +18,8 @@
 #
 
 chartType=STATISTICAL_BAR
-chartTitle=Latency with consumers having non-overlapping selectors, persistent,  message size 1KB
+chartTitle=Latency with consumers having non-overlapping selectors
+chartSubtitle=Persistent 1KB messages
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
 
diff --git a/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
index 69d2e69038..eda6256b68 100644
--- a/qpid/java/perftests/etc/chartdefs/Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
@@ -18,7 +18,8 @@
 #
 
 chartType=STATISTICAL_BAR
-chartTitle=Latency with consumers having 50%-overlapping selectors, persistent, message size 1KB
+chartTitle=Latency with consumers having 50%-overlapping selectors
+chartSubtitle=Persistent 1KB messages
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
 
diff --git a/qpid/java/perftests/etc/chartdefs/Latency-VaryingNumberOfParticipants.chartdef b/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
index aa817dfeaf..0f3b0103ea 100644
--- a/qpid/java/perftests/etc/chartdefs/Latency-VaryingNumberOfParticipants.chartdef
+++ b/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
@@ -18,7 +18,8 @@
 #
 
 chartType=STATISTICAL_BAR
-chartTitle=Latency, Varying number of participants, persistent, message size 1K
+chartTitle=Latency, varying number of participants
+chartSubtitle=Persistent 1KB messages
 xAxisTitle=Consumers
 yAxisTitle=Latency (millis)
 
diff --git a/qpid/java/perftests/etc/chartdefs/Latency-QueueTypes.chardef b/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
index a8afca376f..6f5a3724dd 100644
--- a/qpid/java/perftests/etc/chartdefs/Latency-QueueTypes.chardef
+++ b/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
@@ -18,8 +18,9 @@
 #
 
 chartType=STATISTICAL_BAR
-chartTitle=Latency on different queues, message size 1KB
-xAxisTitle=Queue types
+chartTitle=Latency on different queues
+chartSubtitle=Persistent 1KB messages
+xAxisTitle=Queue type
 yAxisTitle=Latency (millis)
 
 series.1.statement=SELECT testName, maxLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers'