QPID-4827: now most chart definition settings can contain system property placeholders

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

35 files changed, 63 insertions, 54 deletions

diff --git a/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef b/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
index 7559b5934e..73d1a93b11 100644
--- a/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
+++ b/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
@@ -20,7 +20,7 @@
 chartType=XYLINE
 chartTitle=Impact of Message Size Bytes/S
 chartSubtitle=Transient messages
-chartDescription=1P 1C, transient, auto-ack, with message payload between 256-262144 bytes.
+chartDescription=1P 1C, transient, auto-ack, with message payload between 256-262144 bytes ${baselineName}.
 
 xAxisTitle=Message Size (B)
 yAxisTitle=Throughput (KB/s)
@@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=red
 
 series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef b/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
index db8a5f3896..2cd5e8d9d5 100644
--- a/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
+++ b/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
@@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=red
 
 series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef b/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
index 7f18fcc986..ae59f61741 100644
--- a/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
+++ b/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
@@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=red
 
 series.2.statement=SELECT payloadSizeB, throughputMessagesPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef b/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
index 667be044bc..f5ce7662f3 100644
--- a/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
+++ b/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
@@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir}
 series.2.colourName=red
 
 series.2.statement=SELECT payloadSizeB, throughputMessagesPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef b/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
index b3038c1671..d67c8881de 100644
--- a/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
+++ b/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
@@ -41,7 +41,7 @@ series.3.dir=${csvCurrentDir}
 series.3.colourName=green
 
 series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' and acknowledgeMode = '1'
-series.4.legend=1 Consumer (baseline)
+series.4.legend=1 Consumer (baseline ${baselineName})
 series.4.dir=${csvBaselineDir}
 series.4.colourName=dark_red
 series.4.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef b/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
index d1f3d6e9a4..b78c7c53d2 100644
--- a/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
+++ b/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
@@ -41,7 +41,7 @@ series.3.dir=${csvCurrentDir}
 series.3.colourName=red
 
 series.4.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' and acknowledgeMode = '1'
-series.4.legend=10 Producers (baseline)
+series.4.legend=10 Producers (baseline ${baselineName})
 series.4.dir=${csvBaselineDir}
 series.4.colourName=dark_red
 series.4.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef b/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
index 42ba6f8f20..d00d1e9d00 100644
--- a/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
+++ b/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
@@ -41,7 +41,7 @@ series.3.dir=${csvCurrentDir}
 series.3.colourName=green
 
 series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' and acknowledgeMode = '0'
-series.4.legend=1 Consumer (baseline)
+series.4.legend=1 Consumer (baseline ${baselineName})
 series.4.dir=${csvBaselineDir}
 series.4.colourName=dark_red
 series.4.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef b/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
index 0afd162ad0..a808334560 100644
--- a/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
+++ b/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
@@ -41,7 +41,7 @@ series.3.dir=${csvCurrentDir}
 series.3.colourName=red
 
 series.4.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' and acknowledgeMode = '0'
-series.4.legend=10 Producers (baseline)
+series.4.legend=10 Producers (baseline ${baselineName})
 series.4.dir=${csvBaselineDir}
 series.4.colourName=dark_red
 series.4.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef b/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
index 827f8b5567..a8abd6f02c 100644
--- a/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
+++ b/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
@@ -32,7 +32,7 @@ series.1.colourName=blue
 
 
 series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Persistent%' AND participantName = 'All' ORDER BY acknowledgeMode
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 
diff --git a/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef b/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
index 8ca5d838e2..ebc040cd25 100644
--- a/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
+++ b/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
@@ -31,6 +31,6 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=blue
 
 series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Transient%' AND participantName = 'All' ORDER BY acknowledgeMode
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
diff --git a/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef b/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
index 97b712e027..bf55750c4a 100644
--- a/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
+++ b/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
@@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=red
 
 series.2.statement=SELECT batchSize, throughputMessagesPerS FROM BatchSize WHERE participantName = 'All'
-series.2.legend=Equal Producer/Consumer (Baseline)
+series.2.legend=Equal Producer/Consumer (Baseline ${baselineName})
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef b/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
index 51b3bb2144..5f846c6ca0 100644
--- a/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
+++ b/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
@@ -36,7 +36,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=red
 
 series.2.statement=SELECT testName, throughputMessagesPerS FROM BatchSizeProducerVaries WHERE participantName = 'All'
-series.2.legend=Variable Producer, Fixed Consumer (Baseline)
+series.2.legend=Variable Producer, Fixed Consumer (Baseline ${baselineName})
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.strokeWidth=-1
@@ -47,7 +47,7 @@ series.3.dir=${csvCurrentDir}
 series.3.colourName=blue
 
 series.4.statement=SELECT testName, throughputMessagesPerS FROM BatchSizeConsumerVaries WHERE participantName = 'All'
-series.4.legend=Fixed Producer, Variable Consumer (Baseline)
+series.4.legend=Fixed Producer, Variable Consumer (Baseline ${baselineName})
 series.4.dir=${csvBaselineDir}
 series.4.colourName=dark_blue
 series.4.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef b/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
index aacedab421..248db4905f 100644
--- a/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
+++ b/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
@@ -31,6 +31,6 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=blue
 
 series.2.statement=SELECT testName, throughputMessagesPerS FROM QueueTypes WHERE participantName = 'All'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
diff --git a/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef b/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
index 46696bf942..50816a8cd3 100644
--- a/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
+++ b/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
@@ -37,13 +37,13 @@ series.2.dir=${csvCurrentDir}
 series.2.colourName=blue
 
 series.3.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All'
-series.3.legend=Baseline - End-to-end throughput
+series.3.legend=Baseline ${baselineName} - End-to-end throughput
 series.3.dir=${csvBaselineDir}
 series.3.colourName=dark_red
 series.3.strokeWidth=-1
 
 series.4.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All Producers'
-series.4.legend=Baseline - Producer only throughput
+series.4.legend=Baseline ${baselineName} - Producer only throughput
 series.4.dir=${csvBaselineDir}
 series.4.colourName=dark_blue
 series.4.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef b/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
index 5081b379e7..67821b8581 100644
--- a/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
+++ b/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
@@ -30,7 +30,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=blue
 
 series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - NON_PERSISTENT%'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.stokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef b/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
index 137f7bde36..7fbf55a2ab 100644
--- a/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
+++ b/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
@@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=blue
 
 series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithNonOverlappingSelectors WHERE participantName = 'All' and testName like '%non overlapping - PERSISTENT'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.stokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef b/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
index 74f370317b..1734265adf 100644
--- a/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
+++ b/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
@@ -30,7 +30,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=blue
 
 series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - NON_PERSISTENT%'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.stokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef b/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
index 0dd78e02ef..ef7beb252d 100644
--- a/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
+++ b/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
@@ -30,7 +30,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=blue
 
 series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - PERSISTENT%'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.stokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef b/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
index 073cee810d..ef82fdf45f 100644
--- a/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
+++ b/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
@@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=red
 
 series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef b/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
index b32f43d0c2..394b23227c 100644
--- a/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
+++ b/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
@@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=red
 
 series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM Topic-NumberOfTopics WHERE participantName = 'All'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.strokeWidth=-1
diff --git a/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef b/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
index 5fd905ab4f..c418709a82 100644
--- a/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
+++ b/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
@@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=blue
 
 series.2.statement=SELECT isDurableSubscription, throughputMessagesPerS FROM Topic-Persistence WHERE participantName = 'All Consumers'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.stokeWidth=2
diff --git a/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef b/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
index 9edb1950a4..f25dd89a2b 100644
--- a/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
+++ b/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
@@ -31,7 +31,7 @@ series.1.dir=${csvCurrentDir}
 series.1.colourName=blue
 
 series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM Topic-AckModes WHERE participantName = 'All'
-series.2.legend=Baseline
+series.2.legend=Baseline ${baselineName}
 series.2.dir=${csvBaselineDir}
 series.2.colourName=dark_red
 series.2.stokeWidth=2
diff --git a/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef b/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
index 67a0278bff..84a3c4b6c3 100644
--- a/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
+++ b/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
@@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir}
 series.2.colourName=red
 
 series.3.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
-series.3.legend=Average latency (baseline)
+series.3.legend=Average latency (baseline ${baselineName})
 series.3.dir=${csvBaselineDir}
 series.3.colourName=dark_red
 
diff --git a/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef b/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
index e9761f07d8..c2ae16e207 100644
--- a/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
+++ b/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
@@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir}
 series.2.colourName=red
 
 series.3.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
-series.3.legend=Average latency (baseline)
+series.3.legend=Average latency (baseline ${baselineName})
 series.3.dir=${csvBaselineDir}
 series.3.colourName=dark_red
 
diff --git a/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef b/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
index 663912b622..ea8d82af2d 100644
--- a/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
+++ b/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
@@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir}
 series.2.colourName=red
 
 series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%'
-series.3.legend=Average latency (baseline)
+series.3.legend=Average latency (baseline ${baselineName})
 series.3.dir=${csvBaselineDir}
 series.3.colourName=dark_red
 
diff --git a/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef b/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
index 3b9e207e10..96efcd64ba 100644
--- a/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
+++ b/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
@@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir}
 series.2.colourName=red
 
 series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers'  and testName like '%overlapping 50% - NON_PERSISTENT%'
-series.3.legend=Average latency (baseline)
+series.3.legend=Average latency (baseline ${baselineName})
 series.3.dir=${csvBaselineDir}
 series.3.colourName=dark_red
 
diff --git a/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef b/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
index 296d115d3f..a457e3cd3c 100644
--- a/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
+++ b/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
@@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir}
 series.2.colourName=red
 
 series.3.statement=SELECT totalNumberOfConsumers, averageLatency, latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT'
-series.3.legend=Average latency (baseline)
+series.3.legend=Average latency (baseline ${baselineName})
 series.3.dir=${csvBaselineDir}
 series.3.colourName=dark_red
 
diff --git a/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef b/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
index 65be60b5e5..84f58fc5f2 100644
--- a/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
+++ b/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
@@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir}
 series.2.colourName=red
 
 series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%'
-series.3.legend=Average latency (baseline)
+series.3.legend=Average latency (baseline ${baselineName})
 series.3.dir=${csvBaselineDir}
 series.3.colourName=dark_red
 
diff --git a/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef b/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
index d52b05d870..fa688feb1f 100644
--- a/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
+++ b/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
@@ -46,6 +46,6 @@ series.4.dir=${csvCurrentDir}
 series.4.colourName=red
 
 series.5.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 10 producers - PERSISTENT'
-series.5.legend=10 producers (baseline)
+series.5.legend=10 producers (baseline ${baselineName})
 series.5.dir=${csvBaselineDir}
 series.5.colourName=dark_red
diff --git a/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef b/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
index dac8a52f89..a669fcd227 100644
--- a/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
+++ b/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
@@ -36,7 +36,7 @@ series.2.dir=${csvCurrentDir}
 series.2.colourName=red
 
 series.3.statement=SELECT testName, averageLatency,latencyStandardDeviation FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
-series.3.legend=Average Latency (baseline)
+series.3.legend=Average Latency (baseline ${baselineName})
 series.3.dir=${csvBaselineDir}
 series.3.colourName=dark_red
 
diff --git a/java/perftests/etc/visualisation.sh b/java/perftests/etc/visualisation.sh
index 53a3f94f9c..282fb3d3e7 100755
--- a/java/perftests/etc/visualisation.sh
+++ b/java/perftests/etc/visualisation.sh
@@ -28,8 +28,9 @@ BASE_DIR=`dirname $0`
 
 java -cp "${BASE_DIR}:${BASE_DIR}/../../build/lib/*" \
   -Djava.awt.headless=true -Dlog4j.configuration=file:log4j.properties \
-  -DcsvCurrentDir=. \
-  -DcsvBaselineDir=. \
+  -DcsvCurrentDir=/home/V510279/tasks/_old/PerfTestDryRun/etc/ \
+  -DcsvBaselineDir=/home/V510279/tasks/_old/PerfTestDryRun/etc/ \
+  -DbaselineName=${BASELINE_NAME}  \
   org.apache.qpid.disttest.charting.ChartingUtil \
   chart-defs=chartdefs \
   ${JDBC_DRIVER} ${JDBC_URL}
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java b/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
index 1988f561b6..e0f43cb34a 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
+++ b/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreator.java
@@ -19,6 +19,8 @@
  */
 package org.apache.qpid.disttest.charting.definition;
 
+import static org.apache.commons.lang.text.StrSubstitutor.replaceSystemProperties;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileFilter;
@@ -80,12 +82,12 @@ public class ChartingDefinitionCreator
 
             final String chartStemName = getStemNameFrom(file);
 
-            final ChartType chartType = ChartType.valueOf(props.getProperty(CHART_TYPE_KEY));
-            final String chartTitle = props.getProperty(CHART_TITLE_KEY);
-            final String chartSubtitle = props.getProperty(CHART_SUBTITLE_KEY);
-            final String chartDescription = props.getProperty(CHART_DESCRIPTION_KEY);
-            final String xAxisTitle = props.getProperty(XAXIS_TITLE_KEY);
-            final String yAxisTitle = props.getProperty(YAXIS_TITLE_KEY);
+            final ChartType chartType = ChartType.valueOf(replaceSystemProperties(props.getProperty(CHART_TYPE_KEY)));
+            final String chartTitle = replaceSystemProperties(props.getProperty(CHART_TITLE_KEY));
+            final String chartSubtitle = replaceSystemProperties(props.getProperty(CHART_SUBTITLE_KEY));
+            final String chartDescription = replaceSystemProperties(props.getProperty(CHART_DESCRIPTION_KEY));
+            final String xAxisTitle = replaceSystemProperties(props.getProperty(XAXIS_TITLE_KEY));
+            final String yAxisTitle = replaceSystemProperties(props.getProperty(YAXIS_TITLE_KEY));
 
             final List<SeriesDefinition> seriesDefinitions = createSeriesDefinitions(props);
 
diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java b/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
index d47e7488e1..e7d828bdcc 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
+++ b/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreator.java
@@ -19,12 +19,12 @@
  */
 package org.apache.qpid.disttest.charting.definition;
 
+import static org.apache.commons.lang.text.StrSubstitutor.replaceSystemProperties;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.commons.lang.text.StrSubstitutor;
-
 public class SeriesDefinitionCreator
 {
     public static final String SERIES_STATEMENT_KEY_FORMAT = "series.%d.statement";
@@ -41,10 +41,10 @@ public class SeriesDefinitionCreator
         boolean moreSeriesDefinitions = true;
         while(moreSeriesDefinitions)
         {
-            String seriesStatement = properties.getProperty(String.format(SERIES_STATEMENT_KEY_FORMAT, index));
-            String seriesLegend = properties.getProperty(String.format(SERIES_LEGEND_KEY_FORMAT, index));
-            String seriesDir = StrSubstitutor.replaceSystemProperties(properties.getProperty(String.format(SERIES_DIRECTORY_KEY_FORMAT, index)));
-            String seriesColourName = properties.getProperty(String.format(SERIES_COLOUR_NAME_FORMAT, index));
+            String seriesStatement = replaceSystemProperties(properties.getProperty(String.format(SERIES_STATEMENT_KEY_FORMAT, index)));
+            String seriesLegend = replaceSystemProperties(properties.getProperty(String.format(SERIES_LEGEND_KEY_FORMAT, index)));
+            String seriesDir = replaceSystemProperties(properties.getProperty(String.format(SERIES_DIRECTORY_KEY_FORMAT, index)));
+            String seriesColourName = replaceSystemProperties(properties.getProperty(String.format(SERIES_COLOUR_NAME_FORMAT, index)));
             Integer seriesStrokeWidth = properties.getProperty(String.format(SERIES_STROKE_WIDTH_FORMAT, index)) == null
                     ? null : Integer.parseInt(properties.getProperty(String.format(SERIES_STROKE_WIDTH_FORMAT, index)));
 
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java b/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
index e4b4d4d272..47eee43002 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
+++ b/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/ChartingDefinitionCreatorTest.java
@@ -38,7 +38,7 @@ import org.apache.qpid.test.utils.QpidTestCase;
 
 public class ChartingDefinitionCreatorTest extends QpidTestCase
 {
-    private static final String TEST_CHART_TITLE = "CHART_TITLE";
+    private static final String TEST_CHART_TITLE = "CHART_TITLE ${ChartingDefinitionSysProp}";
     private static final String TEST_CHART_SUBTITLE = "CHART_SUBTITLE";
     private static final String TEST_CHART_DESCRIPTION = "CHART_DESCRIPTION";
     private static final String TEST_XAXIS_TITLE = "XAXIS_TITLE";
@@ -47,6 +47,8 @@ public class ChartingDefinitionCreatorTest extends QpidTestCase
 
     private static final String TEST_SERIES_SELECT_STATEMENT = "SERIES_SELECT_STATEMENT";
 
+    private static final String SYSTEM_PROPERTY_NAME = "ChartingDefinitionSysProp";
+
     private ChartingDefinitionCreator _chartingDefinitionLoader = new ChartingDefinitionCreator();
     private File _testTempDir;
 
@@ -79,13 +81,14 @@ public class ChartingDefinitionCreatorTest extends QpidTestCase
 
     public void testDefinitionsProperties() throws Exception
     {
+        setTestSystemProperty(SYSTEM_PROPERTY_NAME, "propValue");
         File testDefFile = createTestDefinitionWithin(_testTempDir);
 
         List<ChartingDefinition> definitions = _chartingDefinitionLoader.createFromFileOrDirectory(testDefFile.getAbsolutePath());
         assertEquals(1, definitions.size());
 
         ChartingDefinition definition1 = definitions.get(0);
-        assertEquals(TEST_CHART_TITLE, definition1.getChartTitle());
+        assertEquals("CHART_TITLE propValue", definition1.getChartTitle());
         assertEquals(TEST_CHART_SUBTITLE, definition1.getChartSubtitle());
         assertEquals(TEST_CHART_DESCRIPTION, definition1.getChartDescription());
         assertEquals(TEST_XAXIS_TITLE, definition1.getXAxisTitle());
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java b/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
index ef605024cc..e937e80108 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
+++ b/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/definition/SeriesDefinitionCreatorTest.java
@@ -32,13 +32,15 @@ import org.apache.qpid.test.utils.QpidTestCase;
 
 public class SeriesDefinitionCreatorTest extends QpidTestCase
 {
+    private static final String SYSTEM_PROPERTY_NAME = "SeriesDefinitionProp";
     private static final String TEST_SERIES_1_SELECT_STATEMENT = "SERIES_1_SELECT_STATEMENT";
     private static final String TEST_SERIES_1_LEGEND = "SERIES_1_LEGEND";
+    private static final String TEST_SERIES_1_LEGEND_WITH_SYSPROP = "SERIES_1_LEGEND ${SeriesDefinitionProp}";
     private static final String TEST_SERIES_1_DIR = "SERIES_1_DIR";
     private static final String TEST_SERIES_1_COLOUR_NAME = "seriesColourName";
     private static final Integer TEST_SERIES_1_STROKE_WIDTH = 1;;
 
-    private static final String TEST_SERIES_1_DIR_WITH_SYSPROP = "${java.io.tmpdir}/mydir";
+    private static final String TEST_SERIES_1_DIR_WITH_SYSPROP = "${SeriesDefinitionProp}/mydir";
 
     private static final String TEST_SERIES_2_SELECT_STATEMENT = "SERIES_2_SELECT_STATEMENT";
     private static final String TEST_SERIES_2_LEGEND = "SERIES_2_LEGEND";
@@ -97,16 +99,17 @@ public class SeriesDefinitionCreatorTest extends QpidTestCase
         assertEquals(1, definitions.size());
     }
 
-    public void testSeriesDirectorySubstitution() throws Exception
+    public void testSeriesDirectoryAndNameSubstitution() throws Exception
     {
-        final String tmpDir = System.getProperty("java.io.tmpdir");
-        createTestProperties(1, TEST_SERIES_1_SELECT_STATEMENT, TEST_SERIES_1_LEGEND, TEST_SERIES_1_DIR_WITH_SYSPROP, null, null);
+        setTestSystemProperty(SYSTEM_PROPERTY_NAME, "propValue");
+        createTestProperties(1, TEST_SERIES_1_SELECT_STATEMENT, TEST_SERIES_1_LEGEND_WITH_SYSPROP, TEST_SERIES_1_DIR_WITH_SYSPROP, null, null);
 
         List<SeriesDefinition> definitions = _seriesDefinitionLoader.createFromProperties(_properties);
         assertEquals(1, definitions.size());
 
         SeriesDefinition seriesDefinition1 = definitions.get(0);
-        assertTrue(seriesDefinition1.getSeriesDirectory().startsWith(tmpDir));
+        assertEquals("propValue/mydir", seriesDefinition1.getSeriesDirectory());
+        assertEquals("SERIES_1_LEGEND propValue", seriesDefinition1.getSeriesLegend());
     }
 
     private void createTestProperties(int index, String selectStatement, String seriesLegend, String seriesDir, String seriesColourName, Integer seriesStrokeWidth) throws Exception