Merge bug26129

Author: Simon MacMullen

test/src/com/rabbitmq/examples/perf/ScenarioFactory.java

@@ -7,11 +7,20 @@
 
 public class ScenarioFactory {
     public static Scenario fromJSON(Map json, ConnectionFactory factory) {
+        String uri = "amqp://localhost";
         String type = read("type", json, String.class);
         String name = read("name", json, String.class);
         Integer interval = read("interval", json, Integer.class, 1000);
         List paramsJSON = read("params", json, List.class);
 
+        try {
+            uri = read("uri", json, String.class);
+            factory.setUri(uri);
+        } catch(Exception e) {
+            throw new RuntimeException("scenario: " + name + " with malformed uri: "
+                                       + uri + " - " + e.getMessage());
+        }
+
         MulticastParams[] params = new MulticastParams[paramsJSON.size()];
         for (int i = 0; i < paramsJSON.size(); i++) {
             params[i] = paramsFromJSON((Map) paramsJSON.get(i));