QPID-6481: Move java source tree to top level

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

30 files changed, 0 insertions, 1177 deletions

diff --git a/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef b/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
deleted file mode 100644
index dd8d0f9918..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Impact of Message Size Bytes/S
-chartSubtitle=Transient messages
-chartDescription=1P 1C, single queue, transient, auto-ack, with message payload between 256-262144 bytes ${baselineName}.
-
-xAxisTitle=Message Size (B)
-yAxisTitle=Throughput (KB/s)
-
-series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All'
-series.1.legend=Current
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef b/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
deleted file mode 100644
index 42b91bacf8..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Impact of Message Size Bytes/S
-chartSubtitle=Persistent messages
-chartDescription=1P 1C, single queue, persistent, session-transacted, with message payload between 256-262144 bytes.
-
-xAxisTitle=Message Size (B)
-yAxisTitle=Throughput (KB/s)
-
-series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All'
-series.1.legend=Current
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef b/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
deleted file mode 100644
index bea3be0521..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Impact of Message Size
-chartSubtitle=Transient messages
-chartDescription=1P 1C, single queue, transient, auto-ack, with message payload between 256-262144 bytes.
-
-xAxisTitle=Message Size (B)
-yAxisTitle=Throughput (messages/s)
-
-series.1.statement=SELECT payloadSizeB, throughputMessagesPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All'
-series.1.legend=Current
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef b/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
deleted file mode 100644
index 993d54c9ca..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Impact of Message Size
-chartSubtitle=Persistent messages
-chartDescription=1P 1C, single queue, persistent, session-transacted, with message payload between 256-262144 bytes.
-
-xAxisTitle=Message Size (B)
-yAxisTitle=Throughput (messages/s)
-
-series.1.statement=SELECT payloadSizeB, throughputMessagesPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All'
-series.1.legend=Current
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef b/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
deleted file mode 100644
index 0d11f7014b..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Varying number of producers - transacted
-chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10,20,40 P/Cs, single queue, persistent, transacted, with message payload 1KB.
-
-xAxisTitle=Producers
-yAxisTitle=Throughput (messages/s)
-
-series.1.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' and acknowledgeMode = '0'
-series.1.legend=1 Consumer
-series.1.dir=${csvCurrentDir}
-series.1.colourName=red
-
-series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '5' and acknowledgeMode = '0'
-series.2.legend=5 Consumer
-series.2.dir=${csvCurrentDir}
-series.2.colourName=blue
-
-series.3.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '10' and acknowledgeMode = '0'
-series.3.legend=10 Consumer
-series.3.dir=${csvCurrentDir}
-series.3.colourName=green
-
-series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '20' and acknowledgeMode = '0'
-series.4.legend=20 Consumer
-series.4.dir=${csvCurrentDir}
-series.4.colourName=magenta
-
-series.5.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '40' and acknowledgeMode = '0'
-series.5.legend=40 Consumer
-series.5.dir=${csvCurrentDir}
-series.5.colourName=orange
-
-series.6.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1' and acknowledgeMode = '0'
-series.6.legend=1 Consumer (baseline ${baselineName})
-series.6.dir=${csvBaselineDir}
-series.6.colourName=dark_red
-series.6.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef b/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
deleted file mode 100644
index bd3f6a457a..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Varying number of consumers - transacted
-chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10,20,40 P/Cs, single queue, persistent, transacted, with message payload 1KB.
-
-xAxisTitle=Consumers
-yAxisTitle=Throughput (messages/s)
-
-series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '1' and acknowledgeMode = '0'
-series.1.legend=1 Producer
-series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
-
-series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '5' and acknowledgeMode = '0'
-series.2.legend=5 Producers
-series.2.dir=${csvCurrentDir}
-series.2.colourName=green
-
-series.3.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' and acknowledgeMode = '0'
-series.3.legend=10 Producers
-series.3.dir=${csvCurrentDir}
-series.3.colourName=red
-
-series.4.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '20' and acknowledgeMode = '0'
-series.4.legend=20 Producers
-series.4.dir=${csvCurrentDir}
-series.4.colourName=magenta
-
-series.5.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '40' and acknowledgeMode = '0'
-series.5.legend=40 Producers
-series.5.dir=${csvCurrentDir}
-series.5.colourName=yellow
-
-series.6.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10' and acknowledgeMode = '0'
-series.6.legend=10 Producers (baseline ${baselineName})
-series.6.dir=${csvBaselineDir}
-series.6.colourName=dark_red
-series.6.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
deleted file mode 100644
index 5028ce17fc..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=BAR
-chartTitle=Performance of acknowledgement modes
-chartSubtitle=Persistent messages (1KB)
-chartDescription=1P 1C, single queue, persistent, with message payload 1KB.
-
-xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge)
-yAxisTitle=Throughput (messages/s)
-
-series.1.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Persistent%' AND participantName = 'All' ORDER BY acknowledgeMode
-series.1.legend=Current
-series.1.dir=${csvCurrentDir}
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-
diff --git a/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
deleted file mode 100644
index 88d5cd9137..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=BAR
-chartTitle=Performance of acknowledgement modes
-chartSubtitle=Transient messages (1024b)
-chartDescription=1P 1C, single queue, transient, with message payload 1KB.
-
-xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge)
-yAxisTitle=Throughput (messages/s)
-
-series.1.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM AcknowledgementModes WHERE testName like 'Transient%' AND participantName = 'All' ORDER BY acknowledgeMode
-series.1.legend=Current
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
diff --git a/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef b/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
deleted file mode 100644
index cfc5efb71c..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1030-BatchSize-Equal.chartdef
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# 'License'); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Transaction Batch Sizes Equal
-chartSubtitle=Persistent 1KB messages
-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)
-
-series.1.statement=SELECT batchSize, throughputMessagesPerS FROM BatchSize WHERE participantName = 'All'
-series.1.legend=Equal Producer/Consumer
-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 ${baselineName})
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef b/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
deleted file mode 100644
index ac8de3d290..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1031-BatchSize-Unequal.chartdef
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# 'License'); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Transaction Batch Size Unequal
-chartSubtitle=Persistent 1KB messages
-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)
-
-#
-# If csvjdbc could do sub-selects (allowing us to extract the consumer/producer batch size from the All Consumers/All Producers rows),
-# we would not need the workaround where we have testdef place the consumer/producer batch size into testName field
-#
-
-series.1.statement=SELECT testName, throughputMessagesPerS FROM BatchSizeProducerVaries WHERE participantName = 'All'
-series.1.legend=Variable Producer, Fixed Consumer
-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 ${baselineName})
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.strokeWidth=-1
-
-series.3.statement=SELECT testName, throughputMessagesPerS FROM BatchSizeConsumerVaries WHERE participantName = 'All'
-series.3.legend=Fixed Producer, Variable Consumer
-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 ${baselineName})
-series.4.dir=${csvBaselineDir}
-series.4.colourName=dark_blue
-series.4.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef b/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
deleted file mode 100644
index 64fbda8953..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=BAR
-chartTitle=Queue Types
-chartSubtitle=Persistent 1KB messages
-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)
-
-series.1.statement=SELECT testName, throughputMessagesPerS FROM QueueTypes WHERE participantName = 'All'
-series.1.legend=Current
-series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
-
-series.2.statement=SELECT testName, throughputMessagesPerS FROM QueueTypes WHERE participantName = 'All'
-series.2.legend=Baseline ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
diff --git a/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef b/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
deleted file mode 100644
index 7aeeb37508..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Varying number of producer sessions on single connection
-chartSubtitle=Persistent messages (1024b)
-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)
-
-# testName contains the number of sessions
-series.1.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All'
-series.1.legend=Current - End-to-end throughput
-series.1.dir=${csvCurrentDir}
-series.1.colourName=red
-
-series.2.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All Producers'
-series.2.legend=Current - Producer only throughput
-series.2.dir=${csvCurrentDir}
-series.2.colourName=blue
-
-series.3.statement=SELECT testName, throughputKbPerS FROM VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All'
-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 ${baselineName} - Producer only throughput
-series.4.dir=${csvBaselineDir}
-series.4.colourName=dark_blue
-series.4.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef b/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef
deleted file mode 100644
index 90cb06d5c7..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1060-SSLConnections.chartdef
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=LINE
-chartTitle=Effect of SSL - transacted
-chartSubtitle=Persistent 1KB messages
-chartDescription=Matching number of P/Cs, single queue, persistent, transacted, with message payload 1KB.
-
-xAxisTitle=Number of producers and consumers on separate connections
-yAxisTitle=Throughput (messages/s)
-
-series.1.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0'
-series.1.legend=Plain
-series.1.dir=${csvCurrentDir}
-series.1.colourName=red
-
-series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0'
-series.2.legend=Plain (baseline ${baselineName})
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.strokeWidth=-1
-
-series.3.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipantsSSL WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0'
-series.3.legend=SSL
-series.3.dir=${csvCurrentDir}
-series.3.colourName=blue
-
-series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM VaryingNumberOfParticipantsSSL WHERE participantName = 'All' and totalNumberOfConsumers = totalNumberOfProducers and acknowledgeMode = '0'
-series.4.legend=SSL (baseline ${baselineName})
-series.4.dir=${csvBaselineDir}
-series.4.colourName=dark_blue
-series.4.strokeWidth=-1
-
diff --git a/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
deleted file mode 100644
index d806acda4b..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1300-QueueConsumersWithNonOverlappingSelectors-Transient.chartdef
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Impact of non-overlapping selectors on queue consumers with transient messages
-chartSubtitle=Transient 1KB messages
-xAxisTitle=Consumers
-yAxisTitle=Throughput (messages/s)
-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
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.stokeWidth=-1
-
diff --git a/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
deleted file mode 100644
index 94b354a3c4..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1301-QueueConsumersWithNonOverlappingSelectors-Persistent.chartdef
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Impact of non-overlapping selectors on queue consumers with persistent messages
-chartSubtitle=Persistent 1KB messages
-xAxisTitle=Consumers
-yAxisTitle=Throughput (messages/s)
-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'
-series.1.legend=Current
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.stokeWidth=-1
-
-series.3.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '1' and acknowledgeMode = '1'
-series.3.legend=Current: no selectors
-series.3.dir=${csvCurrentDir}
-series.3.colourName=green
-
diff --git a/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
deleted file mode 100644
index 319485ffba..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1302-QueueConsumersWithOverlappingSelectors-Transient.chartdef
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Impact of 50%-overlapping selectors in queue consumers with transient messages
-chartSubtitle=Transient 1KB messages
-xAxisTitle=Consumers
-yAxisTitle=Throughput (messages/s)
-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
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.stokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
deleted file mode 100644
index 17cfee2e62..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1303-QueueConsumersWithOverlappingSelectors-Persistent.chartdef
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Impact of 50%-overlapping selectors in queue consumers with persistent messages
-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)
-
-series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM QueueConsumersWithOverlappingSelectors WHERE participantName = 'All' and testName like '%50_ overlapping - PERSISTENT%'
-series.1.legend=Current
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.stokeWidth=-1
-
-series.3.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '1' and acknowledgeMode = '1'
-series.3.legend=Current: no selectors
-series.3.dir=${csvCurrentDir}
-series.3.colourName=green
-
diff --git a/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef b/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
deleted file mode 100644
index 22b6f4c9ca..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Number of topic consumers
-chartSubtitle=Transient 1KB messages
-chartDescription=1P 1-100C single topic, transient, transacted, with message payload 1KB.
-
-xAxisTitle=Numer of consumers
-yAxisTitle=Throughput (messages/s)
-
-series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All'
-series.1.legend=Current
-series.1.dir=${csvCurrentDir}
-series.1.colourName=red
-
-series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All'
-series.2.legend=Baseline ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef b/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
deleted file mode 100644
index c0a67243dc..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=XYLINE
-chartTitle=Number of topics
-chartSubtitle=Transient 1KB messages
-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)
-
-series.1.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM Topic-NumberOfTopics WHERE participantName = 'All'
-series.1.legend=Current
-series.1.dir=${csvCurrentDir}
-series.1.colourName=red
-
-series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM Topic-NumberOfTopics WHERE participantName = 'All'
-series.2.legend=Baseline ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.strokeWidth=-1
diff --git a/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef b/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
deleted file mode 100644
index 1a60ced1cf..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=BAR
-chartTitle=Topic transient/durable subscriptions
-chartSubtitle=1KB messages
-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)
-
-series.1.statement=SELECT isDurableSubscription, throughputMessagesPerS FROM Topic-Persistence WHERE participantName = 'All Consumers'
-series.1.legend=Current
-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 ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.stokeWidth=2
diff --git a/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef b/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
deleted file mode 100644
index c6decf0c4c..0000000000
--- a/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=BAR
-chartTitle=Topic acknowledge modes
-chartSubtitle=Transient 1KB messages
-chartDescription=1P 10C, single topic, transient, non-durable subscription, message payload 1KB.
-
-xAxisTitle=Ack Mode (0=transaction 1=auto-ack)
-yAxisTitle=Throughput (messages/s)
-
-series.1.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM Topic-AckModes WHERE participantName = 'All'
-series.1.legend=Current
-series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
-
-series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM Topic-AckModes WHERE participantName = 'All'
-series.2.legend=Baseline ${baselineName}
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-series.2.stokeWidth=2
diff --git a/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
deleted file mode 100644
index 7d0738fd7b..0000000000
--- a/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=STATISTICAL_BAR
-chartTitle=Impact of message size on latency
-chartSubtitle=Transient messages
-chartDescription=1P 1C, single queue, transient, auto-ack, with message payload between 256-262144 bytes.
-
-xAxisTitle=Message Size (B)
-yAxisTitle=Latency (millis)
-
-series.1.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
-series.1.legend=Average latency
-series.1.dir=${csvCurrentDir}
-series.1.colourName=red
-
-series.2.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
-series.2.legend=Average latency (baseline ${baselineName})
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-
-series.3.statement=SELECT payloadSizeB, minLatency, 0 FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
-series.3.legend=Minimum latency
-series.3.dir=${csvCurrentDir}
-series.3.colourName=green
diff --git a/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
deleted file mode 100644
index 5fd5a3c414..0000000000
--- a/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=STATISTICAL_BAR
-chartTitle=Impact of message size on latency
-chartSubtitle=Persistent messages
-chartDescription=1P 1C, single queue, persistent, session-transacted, with message payload between 256-262144 bytes.
-
-xAxisTitle=Message Size (B)
-yAxisTitle=Latency (millis)
-
-series.1.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
-series.1.legend=Average latency
-series.1.dir=${csvCurrentDir}
-series.1.colourName=red
-
-series.2.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
-series.2.legend=Average latency (baseline ${baselineName})
-series.2.dir=${csvBaselineDir}
-series.2.colourName=dark_red
-
-series.3.statement=SELECT payloadSizeB, minLatency, 0 FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
-series.3.legend=Minimum latency
-series.3.dir=${csvCurrentDir}
-series.3.colourName=green
diff --git a/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef b/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
deleted file mode 100644
index 91d3cbe0f7..0000000000
--- a/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=STATISTICAL_BAR
-chartTitle=Latency, varying number of participants
-chartSubtitle=Persistent 1KB messages
-chartDescription=1,2,5,10 P/Cs, single queue, persistent, session-transacted, with message payload 1KB.
-
-xAxisTitle=Consumers
-yAxisTitle=Latency (millis)
-
-series.1.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 1 producer - PERSISTENT'
-series.1.legend=1 producer
-series.1.dir=${csvCurrentDir}
-series.1.colourName=blue
-
-series.2.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 2 producers - PERSISTENT'
-series.2.legend=2 producers
-series.2.dir=${csvCurrentDir}
-series.2.colourName=green
-
-series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 5 producers - PERSISTENT'
-series.3.legend=5 producers
-series.3.dir=${csvCurrentDir}
-series.3.colourName=magenta
-
-series.4.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 10 producers - PERSISTENT'
-series.4.legend=10 producers
-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 ${baselineName})
-series.5.dir=${csvBaselineDir}
-series.5.colourName=dark_red
diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef
deleted file mode 100644
index e77f7b4eff..0000000000
--- a/qpid/java/perftests/etc/chartdefs/timeseries/1001-Large-Messages-Transient.chartdef
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=TIMELINE
-chartTitle=Large transient messages
-chartDescription=1P 1C, transient, auto-ack, with message payload 65536 bytes.
-
-xAxisTitle=Date
-yAxisTitle=Throughput (KB/s)
-
-series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'Message Size - 1P-1C - TRANSIENT' and payloadSizeB = 65536
-series.1.colourName=red
-series.1.legend=Throughput
diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef
deleted file mode 100644
index ffcf8c26b8..0000000000
--- a/qpid/java/perftests/etc/chartdefs/timeseries/1002-Large-Messages-Persistent.chartdef
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=TIMELINE
-chartTitle=Large persistent messages
-chartDescription=1P 1C, persistent, auto-ack, with message payload 65536 bytes.
-
-xAxisTitle=Date
-yAxisTitle=Throughput (KB/s)
-
-series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'Message Size - 1P-1C - PERSISTENT' and payloadSizeB = 65536
-series.1.colourName=red
-series.1.legend=Throughput
diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef
deleted file mode 100644
index 8f9b4cec9c..0000000000
--- a/qpid/java/perftests/etc/chartdefs/timeseries/1011-MultipleProducersAndConsumers-Persistent.chartdef
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=TIMELINE
-chartTitle=Multiple producers and consumers - auto ack
-chartSubtitle=Persistent 1KB messages
-chartDescription=10 P/Cs, persistent, auto-ack, with message payload 1KB.
-
-xAxisTitle=Date
-yAxisTitle=Throughput (KB/s)
-
-series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'Varying number of participants: 10 consumers - 10 producers - PERSISTENT' and acknowledgemode=1
-series.1.colourName=red
-series.1.legend=Throughput
\ No newline at end of file
diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef
deleted file mode 100644
index f755bf4a5b..0000000000
--- a/qpid/java/perftests/etc/chartdefs/timeseries/1030-Batch-Size-Small.chartdef
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=TIMELINE
-chartTitle=Transactions
-chartSubtitle=Persistent 1KB messages
-chartDescription=1P 1C, persistent, transacted with message payload 1KB with batch size 1 for both P and C
-
-xAxisTitle=Date
-yAxisTitle=Throughput (KB/s)
-
-series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'Batch Size 1-1 - PERSISTENT'
-series.1.colourName=red
-series.1.legend=Throughput
\ No newline at end of file
diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef
deleted file mode 100644
index ca390f8226..0000000000
--- a/qpid/java/perftests/etc/chartdefs/timeseries/1031-Batch-Size-Large.chartdef
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=TIMELINE
-chartTitle=Transactions with large batches
-chartSubtitle=Persistent 1KB messages
-chartDescription=1P 1C, persistent, transacted with message payload 1KB with batch size 100 for both P and C
-
-xAxisTitle=Date
-yAxisTitle=Throughput (KB/s)
-
-series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'Batch Size 100-100 - PERSISTENT'
-series.1.colourName=red
-series.1.legend=Throughput
diff --git a/qpid/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef b/qpid/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef
deleted file mode 100644
index 6dce3a1a77..0000000000
--- a/qpid/java/perftests/etc/chartdefs/timeseries/1040-SortedQueue.chartdef
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-chartType=TIMELINE
-chartTitle=Sorted queue
-chartSubtitle=Persistent 1KB messages
-chartDescription=1P 1C, persistent, auto-ack with message payload 1KB. Sorted queue with 160,000 random keys
-
-xAxisTitle=Date
-yAxisTitle=Throughput (KB/s)
-
-series.1.statement=SELECT insertedTimestamp, throughputKbPerS FROM RESULTS WHERE participantName = 'All' AND testName = 'queue-type:sorted-queue'
-series.1.colourName=red
-series.1.legend=Throughput
\ No newline at end of file