1 files changed, 51 insertions, 16 deletions

diff --git a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java b/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
index e00859855e..91eafe324b 100644
--- a/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
+++ b/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/ChartingUtil.java
@@ -30,7 +30,8 @@ import org.apache.qpid.disttest.charting.chartbuilder.ChartBuilder;
 import org.apache.qpid.disttest.charting.chartbuilder.ChartBuilderFactory;
 import org.apache.qpid.disttest.charting.definition.ChartingDefinition;
 import org.apache.qpid.disttest.charting.definition.ChartingDefinitionCreator;
-import org.apache.qpid.disttest.charting.seriesbuilder.JdbcCsvSeriesBuilder;
+import org.apache.qpid.disttest.charting.seriesbuilder.JdbcSeriesBuilder;
+import org.apache.qpid.disttest.charting.seriesbuilder.JdbcUrlGenerator;
 import org.apache.qpid.disttest.charting.seriesbuilder.SeriesBuilder;
 import org.apache.qpid.disttest.charting.writer.ChartWriter;
 import org.jfree.chart.JFreeChart;
@@ -44,24 +45,46 @@ import org.slf4j.LoggerFactory;
  * The following arguments are understood:
  * </p>
  * <ol>
- *  <li>chart-defs=<i>directory contain chartdef file(s)</i></li>
- *  <li>output-dir=<i>directory in which to produce the PNGs</i></li>
+ *  <li>{@link #OUTPUT_DIR_PROP}</li>
+ *  <li>{@link #CHART_DEFINITIONS_PROP}</li>
+ *  <li>{@link #SUMMARY_TITLE_PROP}</li>
+ *  <li>{@link #JDBC_DRIVER_NAME_PROP}</li>
+ *  <li>{@link #JDBC_URL_PROP}</li>
  * </ol>
+ * Default values are indicated by the similarly named constants in this class.
  */
 public class ChartingUtil
 {
     private static final Logger LOGGER = LoggerFactory.getLogger(ChartingUtil.class);
 
+    /** directory in which to produce the PNGs */
     public static final String OUTPUT_DIR_PROP = "outputdir";
     public static final String OUTPUT_DIR_DEFAULT = ".";
 
+    /** the path to the directory containing the chart definition files */
     public static final String CHART_DEFINITIONS_PROP = "chart-defs";
     public static final String CHART_DEFINITIONS_DEFAULT = ".";
 
+    public static final String SUMMARY_TITLE_PROP = "summary-title";
+    public static final String SUMMARY_TITLE_DEFAULT = "Performance Charts";
+
+    /** the class name of the JDBC driver to use for reading the chart data */
+    public static final String JDBC_DRIVER_NAME_PROP = "jdbcDriverClass";
+    public static final String JDBC_DRIVER_NAME_DEFAULT = JdbcUrlGenerator.DEFAULT_JDBC_DRIVER_NAME;
+
+    /** the JDBC URL of the data to be charted */
+    public static final String JDBC_URL_PROP = "jdbcUrl";
+    public static final String JDBC_URL_DEFAULT = null;
+
+
     private Map<String,String> _cliOptions = new HashMap<String, String>();
+
     {
         _cliOptions.put(OUTPUT_DIR_PROP, OUTPUT_DIR_DEFAULT);
         _cliOptions.put(CHART_DEFINITIONS_PROP, CHART_DEFINITIONS_DEFAULT);
+        _cliOptions.put(SUMMARY_TITLE_PROP, SUMMARY_TITLE_DEFAULT);
+        _cliOptions.put(JDBC_DRIVER_NAME_PROP, JDBC_DRIVER_NAME_DEFAULT);
+        _cliOptions.put(JDBC_URL_PROP, JDBC_URL_DEFAULT);
     }
 
     public static void main(String[] args) throws Exception
@@ -82,26 +105,38 @@ public class ChartingUtil
 
     private void produceAllCharts()
     {
-        final String chartingDefsDir = _cliOptions.get(CHART_DEFINITIONS_PROP);
-        final File chartDirectory = new File(_cliOptions.get(OUTPUT_DIR_PROP));
-        LOGGER.info("Chart chartdef directory/file: {} output directory : {}", chartingDefsDir, chartDirectory);
-
-        List<ChartingDefinition> definitions  = loadChartDefinitions(chartingDefsDir);
-
-        LOGGER.info("There are {} chart(s) to produce", definitions.size());
 
         final ChartWriter writer = new ChartWriter();
-        writer.setOutputDirectory(chartDirectory);
+        writer.setOutputDirectory(new File(_cliOptions.get(OUTPUT_DIR_PROP)));
+
+        SeriesBuilder seriesBuilder = new JdbcSeriesBuilder(
+                _cliOptions.get(JDBC_DRIVER_NAME_PROP),
+                _cliOptions.get(JDBC_URL_PROP));
 
-        final SeriesBuilder seriesBuilder = new JdbcCsvSeriesBuilder();
-        for (ChartingDefinition chartingDefinition : definitions)
+        for (ChartingDefinition chartingDefinition : loadChartDefinitions())
         {
-            ChartBuilder chartBuilder = ChartBuilderFactory.createChartBuilder(chartingDefinition.getChartType(), seriesBuilder);
+            ChartBuilder chartBuilder = ChartBuilderFactory.createChartBuilder(
+                    chartingDefinition.getChartType(),
+                    seriesBuilder);
+
             JFreeChart chart = chartBuilder.buildChart(chartingDefinition);
-            writer.writeChartToFileSystem(chart, chartingDefinition.getChartStemName());
+            writer.writeChartToFileSystem(chart, chartingDefinition);
         }
 
-        writer.writeHtmlSummaryToFileSystem();
+        final String summaryChartTitle = _cliOptions.get(SUMMARY_TITLE_PROP);
+        writer.writeHtmlSummaryToFileSystem(summaryChartTitle);
+    }
+
+    private List<ChartingDefinition> loadChartDefinitions()
+    {
+        final String chartingDefsDir = _cliOptions.get(CHART_DEFINITIONS_PROP);
+
+        LOGGER.info("Chart chartdef directory/file: {}", chartingDefsDir);
+
+        List<ChartingDefinition> definitions  = loadChartDefinitions(chartingDefsDir);
+
+        LOGGER.info("There are {} chart(s) to produce", definitions.size());
+        return definitions;
     }
 
     private List<ChartingDefinition> loadChartDefinitions(String chartingDefsDir)