QPID-4103: [Java Performance Tests] Allow specifying of test configuration with javascript

Applied patch from Oleksandr Rudyy <orudyy@gmail.com> and Philip Harvey <phil@philharveyonline.com>.

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

14 files changed, 1045 insertions, 53 deletions

diff --git a/qpid/java/perftests/example/perftests.js b/qpid/java/perftests/example/perftests.js
new file mode 100644
index 0000000000..51160e7214
--- /dev/null
+++ b/qpid/java/perftests/example/perftests.js
@@ -0,0 +1,106 @@
+
+var jsonObject = {
+    _tests:[]
+};
+
+jsonObject._tests= jsonObject._tests.concat(
+    QPID.transform(
+    {
+      "_name": "Multiple clients: 1 consumer - 1 producer - PERSISTENT - message size=1024",
+      "_queues":[
+        {
+          "_name": "direct://amq.direct//varying-consumers?durable='true'",
+          "_durable": true,
+          "_attributes":
+            {
+              "x-qpid-capacity": 10485760,
+              "x-qpid-flow-resume-capacity": 8388608
+            }
+        }
+      ],
+      "_clients":[
+        {
+          "_name": "producingClient",
+          "_connections":[
+            {
+              "_name": "connection__INDEX_",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session__INDEX_",
+                  "_acknowledgeMode": 1,
+                  "_producers": [
+                    {
+                      "_name": "Producer__INDEX_",
+                      "_destinationName": "direct://amq.direct//varying-consumers?durable='true'",
+                      "_maximumDuration": 60000,
+                      "_deliveryMode": 2,
+                      "_messageSize": 1024
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "_name": "consumingClient",
+          "_connections":[
+            {
+              "_name": "connection__INDEX_",
+              "_factory": "connectionfactory",
+              "_sessions": [
+                {
+                  "_sessionName": "session__INDEX_",
+                  "_acknowledgeMode": 1,
+                  "_consumers": [
+                    {
+                      "_name": "Consumer__INDEX_",
+                      "_destinationName": "direct://amq.direct//varying-consumers?durable='true'",
+                      "_maximumDuration": 60000
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    function(json)
+    {
+        var producerNumbers = [1, 2, 5, 10];
+        var consumerNumbers = [1, 2, 5, 10];
+        var results = [];
+        for( var i =0; i < producerNumbers.length; i++)
+        {
+            for( var j = 0; j < consumerNumbers.length; j++)
+            {
+                var test = QPID.cloneJSON(json);
+                test._name = "Multiple clients: " + consumerNumbers[j] + " consumer - " + producerNumbers[i] + " producer";
+                results.push(test);
+                test._clients[0]._connections = QPID.times(producerNumbers[i], test._clients[0]._connections[0], "__INDEX_")
+                test._clients[1]._connections = QPID.times(consumerNumbers[j], test._clients[1]._connections[0], "__INDEX_")
+                for (var k =0; k< consumerNumbers[j]; k++)
+                {
+                    test._clients[1]._connections[k]._sessions[0]._consumers[0]._name = "consumer_" + k;
+                    test._clients[1]._connections[k]._sessions[0]._sessionName = "session_" + k;
+                    test._clients[1]._connections[k]._name = "connection_" + k;
+                    test._clients[1]._connections[k]._sessions[0]._consumers[0]._maximumDuration = 30000;
+                }
+                for (var k =0; k< producerNumbers[i]; k++)
+                {
+                    test._clients[0]._connections[k]._sessions[0]._producers[0]._name = "producer_" + k;
+                    test._clients[0]._connections[k]._sessions[0]._sessionName = "session_" + k;
+                    test._clients[0]._connections[k]._name = "connection_" + k;
+                    test._clients[0]._connections[k]._sessions[0]._producers[0]._maximumDuration= 30000;
+                    test._queues[0]._attributes["x-qpid-capacity"] = Math.round(10485760/producerNumbers[i]);
+                    test._queues[0]._attributes["x-qpid-flow-resume-capacity"] = Math.round(8388608/producerNumbers[i]);
+                }
+            }
+        }
+        return results;
+    }
+    )
+);
+
diff --git a/qpid/java/perftests/src/main/java/json2.js b/qpid/java/perftests/src/main/java/json2.js
new file mode 100644
index 0000000000..2dbf60d398
--- /dev/null
+++ b/qpid/java/perftests/src/main/java/json2.js
@@ -0,0 +1,487 @@
+/*
+    http://www.JSON.org/json2.js
+    2011-10-19
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+
+
+    This file creates a global JSON object containing two methods: stringify
+    and parse.
+
+        JSON.stringify(value, replacer, space)
+            value       any JavaScript value, usually an object or array.
+
+            replacer    an optional parameter that determines how object
+                        values are stringified for objects. It can be a
+                        function or an array of strings.
+
+            space       an optional parameter that specifies the indentation
+                        of nested structures. If it is omitted, the text will
+                        be packed without extra whitespace. If it is a number,
+                        it will specify the number of spaces to indent at each
+                        level. If it is a string (such as '\t' or '&nbsp;'),
+                        it contains the characters used to indent at each level.
+
+            This method produces a JSON text from a JavaScript value.
+
+            When an object value is found, if the object contains a toJSON
+            method, its toJSON method will be called and the result will be
+            stringified. A toJSON method does not serialize: it returns the
+            value represented by the name/value pair that should be serialized,
+            or undefined if nothing should be serialized. The toJSON method
+            will be passed the key associated with the value, and this will be
+            bound to the value
+
+            For example, this would serialize Dates as ISO strings.
+
+                Date.prototype.toJSON = function (key) {
+                    function f(n) {
+                        // Format integers to have at least two digits.
+                        return n < 10 ? '0' + n : n;
+                    }
+
+                    return this.getUTCFullYear()   + '-' +
+                         f(this.getUTCMonth() + 1) + '-' +
+                         f(this.getUTCDate())      + 'T' +
+                         f(this.getUTCHours())     + ':' +
+                         f(this.getUTCMinutes())   + ':' +
+                         f(this.getUTCSeconds())   + 'Z';
+                };
+
+            You can provide an optional replacer method. It will be passed the
+            key and value of each member, with this bound to the containing
+            object. The value that is returned from your method will be
+            serialized. If your method returns undefined, then the member will
+            be excluded from the serialization.
+
+            If the replacer parameter is an array of strings, then it will be
+            used to select the members to be serialized. It filters the results
+            such that only members with keys listed in the replacer array are
+            stringified.
+
+            Values that do not have JSON representations, such as undefined or
+            functions, will not be serialized. Such values in objects will be
+            dropped; in arrays they will be replaced with null. You can use
+            a replacer function to replace those with JSON values.
+            JSON.stringify(undefined) returns undefined.
+
+            The optional space parameter produces a stringification of the
+            value that is filled with line breaks and indentation to make it
+            easier to read.
+
+            If the space parameter is a non-empty string, then that string will
+            be used for indentation. If the space parameter is a number, then
+            the indentation will be that many spaces.
+
+            Example:
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}]);
+            // text is '["e",{"pluribus":"unum"}]'
+
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+            text = JSON.stringify([new Date()], function (key, value) {
+                return this[key] instanceof Date ?
+                    'Date(' + this[key] + ')' : value;
+            });
+            // text is '["Date(---current time---)"]'
+
+
+        JSON.parse(text, reviver)
+            This method parses a JSON text to produce an object or array.
+            It can throw a SyntaxError exception.
+
+            The optional reviver parameter is a function that can filter and
+            transform the results. It receives each of the keys and values,
+            and its return value is used instead of the original value.
+            If it returns what it received, then the structure is not modified.
+            If it returns undefined then the member is deleted.
+
+            Example:
+
+            // Parse the text. Values that look like ISO date strings will
+            // be converted to Date objects.
+
+            myData = JSON.parse(text, function (key, value) {
+                var a;
+                if (typeof value === 'string') {
+                    a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                    if (a) {
+                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                            +a[5], +a[6]));
+                    }
+                }
+                return value;
+            });
+
+            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                var d;
+                if (typeof value === 'string' &&
+                        value.slice(0, 5) === 'Date(' &&
+                        value.slice(-1) === ')') {
+                    d = new Date(value.slice(5, -1));
+                    if (d) {
+                        return d;
+                    }
+                }
+                return value;
+            });
+
+
+    This is a reference implementation. You are free to copy, modify, or
+    redistribute.
+*/
+
+/*jslint evil: true, regexp: true */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+    lastIndex, length, parse, prototype, push, replace, slice, stringify,
+    test, toJSON, toString, valueOf
+*/
+
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+var JSON;
+if (!JSON) {
+    JSON = {};
+}
+
+(function () {
+    'use strict';
+
+    function f(n) {
+        // Format integers to have at least two digits.
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+
+        Date.prototype.toJSON = function (key) {
+
+            return isFinite(this.valueOf())
+                ? this.getUTCFullYear()     + '-' +
+                    f(this.getUTCMonth() + 1) + '-' +
+                    f(this.getUTCDate())      + 'T' +
+                    f(this.getUTCHours())     + ':' +
+                    f(this.getUTCMinutes())   + ':' +
+                    f(this.getUTCSeconds())   + 'Z'
+                : null;
+        };
+
+        String.prototype.toJSON      =
+            Number.prototype.toJSON  =
+            Boolean.prototype.toJSON = function (key) {
+                return this.valueOf();
+            };
+    }
+
+    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        gap,
+        indent,
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        },
+        rep;
+
+
+    function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+        escapable.lastIndex = 0;
+        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+            var c = meta[a];
+            return typeof c === 'string'
+                ? c
+                : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"' : '"' + string + '"';
+    }
+
+
+    function str(key, holder) {
+
+// Produce a string from holder[key].
+
+        var i,          // The loop counter.
+            k,          // The member key.
+            v,          // The member value.
+            length,
+            mind = gap,
+            partial,
+            value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+        if (value && typeof value === 'object' &&
+                typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+
+// What happens next depends on the value's type.
+
+        switch (typeof value) {
+        case 'string':
+            return quote(value);
+
+        case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+            return isFinite(value) ? String(value) : 'null';
+
+        case 'boolean':
+        case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+            return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+        case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+            if (!value) {
+                return 'null';
+            }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+            gap += indent;
+            partial = [];
+
+// Is the value an array?
+
+            if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                length = value.length;
+                for (i = 0; i < length; i += 1) {
+                    partial[i] = str(i, value) || 'null';
+                }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                v = partial.length === 0
+                    ? '[]'
+                    : gap
+                    ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
+                    : '[' + partial.join(',') + ']';
+                gap = mind;
+                return v;
+            }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+            if (rep && typeof rep === 'object') {
+                length = rep.length;
+                for (i = 0; i < length; i += 1) {
+                    if (typeof rep[i] === 'string') {
+                        k = rep[i];
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                for (k in value) {
+                    if (Object.prototype.hasOwnProperty.call(value, k)) {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+            v = partial.length === 0
+                ? '{}'
+                : gap
+                ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
+                : '{' + partial.join(',') + '}';
+            gap = mind;
+            return v;
+        }
+    }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+    if (typeof JSON.stringify !== 'function') {
+        JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                    typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        };
+    }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+    if (typeof JSON.parse !== 'function') {
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            text = String(text);
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/
+                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function'
+                    ? walk({'': j}, '')
+                    : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
new file mode 100644
index 0000000000..fb4c1b700b
--- /dev/null
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+package org.apache.qpid.disttest;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConfigFileHelper
+{
+    /**
+     * Returns absolute paths to the config file(s).
+     * <p/>
+     * If testConfigPath is a directory, its .js and .json files are returned.
+     * Otherwise, the returned list just contains testConfigPath.
+     */
+    public List<String> getTestConfigFiles(String testConfigPath)
+    {
+        final List<String> testConfigFile = new ArrayList<String>();
+        final File configFileOrDirectory = new File(testConfigPath);
+
+        if (configFileOrDirectory.isDirectory())
+        {
+            final String[] configFiles = configFileOrDirectory.list(new FilenameFilter()
+            {
+                @Override
+                public boolean accept(File dir, String name)
+                {
+                    boolean suffixOk = name.endsWith(".json") || name.endsWith(".js");
+                    return new File(dir, name).isFile() && suffixOk;
+                }
+            });
+
+            for (String configFile : configFiles)
+            {
+                testConfigFile.add(new File(configFileOrDirectory, configFile).getAbsolutePath());
+            }
+        }
+        else
+        {
+            testConfigFile.add(configFileOrDirectory.getAbsolutePath());
+        }
+
+        return testConfigFile;
+    }
+
+    /**
+     * generateOutputCsvNameFrom("/config/testConfigFile.js", "/output") returns /output/testConfigFile.csv
+     */
+    public String generateOutputCsvNameFrom(String testConfigFile, String outputDir)
+    {
+        final String filenameOnlyWithExtension = new File(testConfigFile).getName();
+        final String cvsFile = filenameOnlyWithExtension.replaceFirst(".?\\w*$", ".csv");
+
+        return new File(outputDir, cvsFile).getAbsolutePath();
+    }
+}
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java
index 71e858b4cb..31ba4628c5 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ControllerRunner.java
@@ -19,12 +19,9 @@
  */
 package org.apache.qpid.disttest;
 
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
-import java.io.FilenameFilter;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.naming.Context;
@@ -53,6 +50,7 @@ public class ControllerRunner extends AbstractRunner
 
     private final Aggregator _aggregator = new Aggregator();
 
+    private final ConfigFileHelper _configFileHelper = new ConfigFileHelper();
 
     public ControllerRunner()
     {
@@ -88,7 +86,8 @@ public class ControllerRunner extends AbstractRunner
     {
         Controller controller = new Controller(jmsDelegate, DistributedTestConstants.REGISTRATION_TIMEOUT, DistributedTestConstants.COMMAND_RESPONSE_TIMEOUT);
 
-        final List<String> testConfigFiles = getTestConfigFiles();
+        String testConfigPath = getCliOptions().get(ControllerRunner.TEST_CONFIG_PROP);
+        List<String> testConfigFiles = _configFileHelper.getTestConfigFiles(testConfigPath);
         createClientsIfNotDistributed(testConfigFiles);
 
         try
@@ -108,7 +107,6 @@ public class ControllerRunner extends AbstractRunner
         {
             controller.stopAllRegisteredClients();
         }
-
     }
 
     private void runTest(Controller controller, String testConfigFile)
@@ -119,7 +117,8 @@ public class ControllerRunner extends AbstractRunner
         ResultsForAllTests rawResultsForAllTests = controller.runAllTests();
         ResultsForAllTests resultsForAllTests = _aggregator.aggregateResults(rawResultsForAllTests);
 
-        final String outputFile = generateOutputCsvNameFrom(testConfigFile);
+        String outputDir = getCliOptions().get(ControllerRunner.OUTPUT_DIR_PROP);
+        final String outputFile = _configFileHelper.generateOutputCsvNameFrom(testConfigFile, outputDir);
         writeResultsToFile(resultsForAllTests, outputFile);
     }
 
@@ -175,44 +174,6 @@ public class ControllerRunner extends AbstractRunner
         }
     }
 
-    private String generateOutputCsvNameFrom(String testConfigFile)
-    {
-        final String filenameOnlyWithExtension = new File(testConfigFile).getName();
-        final String cvsFile = filenameOnlyWithExtension.replaceFirst(".?\\w*$", ".csv");
-        final String outputDir = String.valueOf(getCliOptions().get(ControllerRunner.OUTPUT_DIR_PROP));
-
-        return new File(outputDir, cvsFile).getAbsolutePath();
-    }
-
-    private List<String> getTestConfigFiles()
-    {
-        final List<String> testConfigFile = new ArrayList<String>();
-        final File configFileOrDirectory = new File(getCliOptions().get(ControllerRunner.TEST_CONFIG_PROP));
-
-        if (configFileOrDirectory.isDirectory())
-        {
-            final String[] configFiles = configFileOrDirectory.list(new FilenameFilter()
-            {
-                @Override
-                public boolean accept(File dir, String name)
-                {
-                    return new File(dir, name).isFile() && name.endsWith(".json");
-                }
-            });
-
-            for (String configFile : configFiles)
-            {
-                testConfigFile.add(new File(configFileOrDirectory, configFile).getAbsolutePath());
-            }
-        }
-        else
-        {
-            testConfigFile.add(configFileOrDirectory.getAbsolutePath());
-        }
-
-        return testConfigFile;
-    }
-
     private Config buildTestConfigFrom(String testConfigFile)
     {
         ConfigReader configReader = new ConfigReader();
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConfigReader.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConfigReader.java
index 6288b42eac..bd7d239a90 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConfigReader.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ConfigReader.java
@@ -22,24 +22,44 @@ package org.apache.qpid.disttest.controller.config;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.Reader;
+import java.io.StringReader;
 
 import org.apache.qpid.disttest.client.property.PropertyValue;
 import org.apache.qpid.disttest.json.PropertyValueAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 public class ConfigReader
 {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigReader.class);
 
     public Config getConfigFromFile(String fileName) throws FileNotFoundException
     {
-        FileReader reader = new FileReader(fileName);
+        Reader reader = getConfigReader(fileName);
 
         Config config = readConfig(reader);
         return config;
     }
 
+    protected Reader getConfigReader(String fileName) throws FileNotFoundException
+    {
+        Reader reader = null;
+        if (fileName.endsWith(".js"))
+        {
+            LOGGER.info("Evaluating javascript:" + fileName);
+            reader = new StringReader(new JavaScriptConfigEvaluator().evaluateJavaScript(fileName));
+        }
+        else
+        {
+            LOGGER.info("Loading JSON:" + fileName);
+            reader = new FileReader(fileName);
+        }
+        return reader;
+    }
+
     public Config readConfig(Reader reader)
     {
         Gson gson = new GsonBuilder()
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluator.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluator.java
new file mode 100644
index 0000000000..bbc22af00f
--- /dev/null
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluator.java
@@ -0,0 +1,64 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.disttest.controller.config;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.InputStreamReader;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.apache.qpid.disttest.DistributedTestException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A helper class to load and evaluate JavaScript configuration, producing a JSON string.
+ */
+public class JavaScriptConfigEvaluator
+{
+    private static final Logger LOGGER = LoggerFactory.getLogger(JavaScriptConfigEvaluator.class);
+
+    public static final String TEST_CONFIG_VARIABLE_NAME = "jsonObject";
+
+    public String evaluateJavaScript(String fileName) throws FileNotFoundException
+    {
+        ScriptEngineManager mgr = new ScriptEngineManager();
+        ScriptEngine engine = mgr.getEngineByName("JavaScript");
+        try
+        {
+            engine.eval(new InputStreamReader(getClass().getClassLoader().getResourceAsStream("json2.js")));
+            engine.eval(new InputStreamReader(getClass().getClassLoader().getResourceAsStream("test-utils.js")));
+            engine.eval(new FileReader(fileName));
+            engine.eval("jsonString = JSON.stringify(" + TEST_CONFIG_VARIABLE_NAME + ")");
+        }
+        catch (ScriptException e)
+        {
+            throw new DistributedTestException("Exception while evaluating test config", e);
+        }
+        String result = (String) engine.get("jsonString");
+
+        LOGGER.debug("Evaluated javascript file " + fileName + ". Generated the following JSON: " + result);
+        return result;
+    }
+}
diff --git a/qpid/java/perftests/src/main/java/test-utils.js b/qpid/java/perftests/src/main/java/test-utils.js
new file mode 100644
index 0000000000..7bfe233266
--- /dev/null
+++ b/qpid/java/perftests/src/main/java/test-utils.js
@@ -0,0 +1,85 @@
+var QPID;
+if (!QPID) {
+    QPID = {};
+}
+(function () {
+    'use strict';
+
+    if (typeof QPID.times !== 'function') {
+        QPID.times = function (multiplicity, template, timeIndexName)
+        {
+            var retVal = new Array();
+            for (var i = 0; i < multiplicity; i++)
+            {
+                var templateName = template._name;
+                var teamplateAsString = JSON.stringify(template);
+                if (timeIndexName)
+                {
+                    teamplateAsString = teamplateAsString.replace(new RegExp(timeIndexName, "g"), i);
+                }
+                var expandedObject = JSON.parse(teamplateAsString);
+                if (!(timeIndexName))
+                {
+                  expandedObject._name = templateName + "_" + i;
+                }
+                retVal[i] = expandedObject;
+            }
+            return retVal;
+        }
+    }
+
+    if (typeof QPID.iterations !== 'function') {
+        QPID.iterations = function (values, template)
+        {
+            var retVal = new Array()
+
+            var iterationNumber = 0;
+
+            for (variableName in values)
+            {
+                var variableValues = values[variableName]
+                for (i in variableValues)
+                {
+                    var variableValue = variableValues[i]
+                    var templateTestString = JSON.stringify(template)
+                    var actualString = templateTestString.replace(new RegExp(variableName, "g"), variableValue)
+                    var iteration = JSON.parse(actualString)
+                    iteration._iterationNumber = iterationNumber
+                    retVal[iterationNumber] = iteration
+                    iterationNumber++
+                }
+            }
+
+            return retVal
+        }
+    }
+
+    if (typeof QPID.transform !== 'function') {
+
+        /**
+        * Function to transform JSON using specified transformation function.
+        * Any number of transformation function could be passed after the template argument.
+        * Each function should return a transformed JSON object.
+        * Example
+        * var json = transform({"name": "Test1"}, function(json){json.name="Test"; return json;});
+        */
+        QPID.transform = function (template)
+        {
+            var json = template;
+            for (var i=1, len=arguments.length; i<len; i++)
+            {
+                json = arguments[i](json);
+            }
+            return json;
+        }
+    }
+
+    if (typeof QPID.cloneJSON !== 'function') {
+        QPID.cloneJSON = function (json)
+        {
+            return JSON.parse( JSON.stringify( json ));
+        }
+    }
+
+}());
+
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
new file mode 100644
index 0000000000..a10b3b359e
--- /dev/null
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelperTest.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+package org.apache.qpid.disttest;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.TestFileUtils;
+
+public class ConfigFileHelperTest extends QpidTestCase
+{
+    private File _testDir;
+    private ConfigFileHelper _configFileHelper = new ConfigFileHelper();
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        _testDir = TestFileUtils.createTestDirectory();
+    }
+
+    public void testGenerateOutputCsvNameFrom()
+    {
+        String outputDir = "/tmp/outputDir";
+
+        assertEquals("/tmp/outputDir/my.json.file.csv", _configFileHelper.generateOutputCsvNameFrom("/tmp/my.json.file.json", outputDir));
+        assertEquals("/tmp/outputDir/my.js.file.csv", _configFileHelper.generateOutputCsvNameFrom("/tmp/my.js.file.js", outputDir));
+    }
+
+    public void testGetTestConfigFilesForDirectory() throws Exception
+    {
+        String jsFile = createFile("file1.js");
+        String jsonFile = createFile("file2.json");
+        createFile("file.txt");
+        createDir("dir.js");
+
+        String testConfigPath = _testDir.getAbsolutePath();
+
+        List<String> configFiles = _configFileHelper.getTestConfigFiles(testConfigPath);
+
+        Set<String> expectedFiles = new HashSet<String>(Arrays.asList(jsFile, jsonFile));
+        Set<String> actualFiles = new HashSet<String>(configFiles);
+
+        assertEquals(expectedFiles, actualFiles);
+    }
+
+    private void createDir(String dirName)
+    {
+        File dir = new File(_testDir, dirName);
+        dir.mkdir();
+    }
+
+    private String createFile(String fileName) throws IOException
+    {
+        File file = new File(_testDir, fileName);
+        file.createNewFile();
+        return file.getAbsolutePath();
+    }
+}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelper.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileTestHelper.java
index 12ba3b56ad..71cd61db82 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileHelper.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/ConfigFileTestHelper.java
@@ -26,7 +26,7 @@ import java.io.Reader;
 import org.apache.qpid.disttest.controller.config.Config;
 import org.apache.qpid.disttest.controller.config.ConfigReader;
 
-public class ConfigFileHelper
+public class ConfigFileTestHelper
 {
     public static Reader getConfigFileReader(Class<?> testClass, String resourceName)
     {
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
index 91b219585a..21981c93dd 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigReaderTest.java
@@ -25,7 +25,7 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.apache.qpid.disttest.ConfigFileHelper;
+import org.apache.qpid.disttest.ConfigFileTestHelper;
 import org.apache.qpid.disttest.client.property.PropertyValue;
 
 public class ConfigReaderTest extends TestCase
@@ -36,7 +36,7 @@ public class ConfigReaderTest extends TestCase
     protected void setUp()
     {
         ConfigReader configReader = new ConfigReader();
-        Reader reader = ConfigFileHelper.getConfigFileReader(getClass(), "sampleConfig.json");
+        Reader reader = ConfigFileTestHelper.getConfigFileReader(getClass(), "sampleConfig.json");
         _config = configReader.readConfig(reader);
     }
 
@@ -108,4 +108,38 @@ public class ConfigReaderTest extends TestCase
         assertNotNull("id property is not found", properties.get("id"));
      }
 
+    public void testReadsJS() throws Exception
+    {
+        ConfigReader configReader = new ConfigReader();
+        String path = getClass().getClassLoader().getResource("org/apache/qpid/disttest/controller/config/test-config.js").toURI().getPath();
+        _config = configReader.getConfigFromFile(path);
+        List<TestConfig> testConfigs = _config.getTestConfigs();
+        assertEquals("Unexpected number of tests", 2, testConfigs.size());
+        TestConfig testConfig1 = _config.getTestConfigs().get(0);
+        List<ClientConfig> cleintConfigs = testConfig1.getClients();
+        assertEquals("Unexpected number of test 1 clients", 2, cleintConfigs.size());
+        List<QueueConfig> queueConfigs = testConfig1.getQueues();
+        assertEquals("Unexpected number of test 1 queue", 1, queueConfigs.size());
+        assertEquals("Unexpected queue name", "Json-Queue-Name", queueConfigs.get(0).getName());
+        ClientConfig cleintConfig = cleintConfigs.get(0);
+        List<ConnectionConfig> connectionConfigs = cleintConfig.getConnections();
+        assertEquals("Unexpected number of connections", 1, connectionConfigs.size());
+        List<SessionConfig> sessionConfigs = connectionConfigs.get(0).getSessions();
+        assertEquals("Unexpected number of sessions", 1, sessionConfigs.size());
+        assertEquals("Unexpected ack mode", 0, sessionConfigs.get(0).getAcknowledgeMode());
+
+        TestConfig testConfig2 = _config.getTestConfigs().get(1);
+        List<ClientConfig> cleintConfigs2 = testConfig2.getClients();
+        assertEquals("Unexpected number of test 1 clients", 2, cleintConfigs2.size());
+        List<QueueConfig> queueConfigs2 = testConfig2.getQueues();
+        assertEquals("Unexpected number of test 1 queue", 1, queueConfigs2.size());
+        assertEquals("Unexpected queue name", "Json-Queue-Name", queueConfigs2.get(0).getName());
+        ClientConfig cleintConfig2 = cleintConfigs2.get(0);
+        List<ConnectionConfig> connectionConfigs2 = cleintConfig2.getConnections();
+        assertEquals("Unexpected number of connections", 1, connectionConfigs2.size());
+        List<SessionConfig> sessionConfigs2 = connectionConfigs2.get(0).getSessions();
+        assertEquals("Unexpected number of sessions", 1, sessionConfigs2.size());
+        assertEquals("Unexpected ack mode", 1, sessionConfigs2.get(0).getAcknowledgeMode());
+    }
+
 }
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest.java
new file mode 100644
index 0000000000..e797ce4c06
--- /dev/null
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/JavaScriptConfigEvaluatorTest.java
@@ -0,0 +1,48 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.disttest.controller.config;
+
+import junit.framework.TestCase;
+
+public class JavaScriptConfigEvaluatorTest extends TestCase
+{
+    public void testEvaluateJavaScript() throws Exception
+    {
+        String path = getClass().getClassLoader().getResource("org/apache/qpid/disttest/controller/config/test-config.js")
+                .toURI().getPath();
+
+        String config = new JavaScriptConfigEvaluator().evaluateJavaScript(path);
+
+        String expected = "{\"_tests\":[{\"_queues\":[{\"_name\":\"Json-Queue-Name\"}],\"_clients\":"
+                + "[{\"_connections\":[{\"_name\":\"connection1\",\"_sessions\":[{\"_acknowledgeMode\":\"0\","
+                + "\"_sessionName\":\"session1\",\"_consumers\":[]}]}],\"_name\":\"repeatingClient0\"},"
+                + "{\"_connections\":[{\"_name\":\"connection1\",\"_sessions\":[{\"_acknowledgeMode\":\"0\","
+                + "\"_sessionName\":\"session1\",\"_consumers\":[]}]}],\"_name\":\"repeatingClient1\"}]"
+                + ",\"_iterationNumber\":0,\"_name\":\"Test 1\"},{\"_queues\":[{\"_name\":\"Json-Queue-Name\"}],"
+                + "\"_clients\":[{\"_connections\":[{\"_name\":\"connection1\",\"_sessions\":"
+                + "[{\"_acknowledgeMode\":\"1\",\"_sessionName\":\"session1\",\"_consumers\":[]}]}],"
+                + "\"_name\":\"repeatingClient0\"},{\"_connections\":[{\"_name\":\"connection1\",\"_sessions\":"
+                + "[{\"_acknowledgeMode\":\"1\",\"_sessionName\":\"session1\",\"_consumers\":[]}]}],"
+                + "\"_name\":\"repeatingClient1\"}],\"_iterationNumber\":1,\"_name\":\"Test 1\"}]}";
+
+        assertEquals("Unexpected configuration", expected, config);
+    }
+}
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/test-config.js b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/test-config.js
new file mode 100644
index 0000000000..07f8bf9d92
--- /dev/null
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/test-config.js
@@ -0,0 +1,34 @@
+jsonObject = {
+  "_tests":
+    QPID.iterations( { "__ACK_MODE": [ 0, 1 ] },
+      {
+          // this is a comment - it wouldn't be allowed if this were pure JSON
+
+          "_name": "Test 1",
+          "_queues": [
+            {
+              "_name": "Json-Queue-Name"
+            }
+          ],
+
+          "_clients": QPID.times(2,
+            {
+              "_name": "repeatingClient__CLIENT_INDEX",
+              "_connections": [
+                {
+                  "_name": "connection1",
+                  "_sessions": [
+                    {
+                      "_sessionName": "session1",
+                      "_acknowledgeMode": "__ACK_MODE",
+                      "_consumers": []
+                    }
+                  ]
+                }
+              ]
+            },
+            "__CLIENT_INDEX"
+        )
+    })
+
+}
\ No newline at end of file
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
index c103af501c..ddb4cb7e51 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
@@ -32,7 +32,7 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.naming.NamingException;
 
-import org.apache.qpid.disttest.ConfigFileHelper;
+import org.apache.qpid.disttest.ConfigFileTestHelper;
 import org.apache.qpid.disttest.client.Client;
 import org.apache.qpid.disttest.client.ClientState;
 import org.apache.qpid.disttest.controller.Controller;
@@ -100,7 +100,7 @@ public class ControllerAndClientTest extends DistributedTestSystemTestBase
         // cleaning manually
         while(consumer.receive(1000l) != null);
 
-        final Config config = ConfigFileHelper.getConfigFromResource(getClass(), "produceClient.json");
+        final Config config = ConfigFileTestHelper.getConfigFromResource(getClass(), "produceClient.json");
         _controller.setConfig(config);
         final Client client1 = new Client(new ClientJmsDelegate(_context));
         final Thread client1Thread = createBackgroundClientThread(client1);
@@ -181,7 +181,7 @@ public class ControllerAndClientTest extends DistributedTestSystemTestBase
 
     private List<TestResult> runTestsForTwoClients(String jsonConfigFile, int expectedNumberOfTests) throws NamingException, InterruptedException
     {
-        final Config config = ConfigFileHelper.getConfigFromResource(getClass(), jsonConfigFile);
+        final Config config = ConfigFileTestHelper.getConfigFromResource(getClass(), jsonConfigFile);
         _controller.setConfig(config);
 
         final Client client1 = new Client(new ClientJmsDelegate(_context));
diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java
index ad7f0e0682..74c4724901 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java
@@ -38,7 +38,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TemporaryQueue;
 
-import org.apache.qpid.disttest.ConfigFileHelper;
+import org.apache.qpid.disttest.ConfigFileTestHelper;
 import org.apache.qpid.disttest.controller.Controller;
 import org.apache.qpid.disttest.controller.config.Config;
 import org.apache.qpid.disttest.jms.ControllerJmsDelegate;
@@ -96,7 +96,7 @@ public class DistributedControllerTest extends DistributedTestSystemTestBase
 
     public void testControllerSendsOneCommandToSingleClient() throws Exception
     {
-        Config config = ConfigFileHelper.getConfigFromResource(getClass(), "distributedControllerTest.json");
+        Config config = ConfigFileTestHelper.getConfigFromResource(getClass(), "distributedControllerTest.json");
         _controller.setConfig(config);
 
         sendRegistration(CLIENT1);