Add .json to benchmark_config, Resolve TechEmpower/FrameworkBenchmarks#1095

Squashed commit of the following:

commit 5a47f06436fb2e75bd6a9fe78b37073d3a60274c
Merge: 31042fe eccebd3
Author: Brittany Mazza <[email protected]>
Date:   Wed Mar 4 15:19:46 2015 -0800

    Merge branch 'master' of https://github.com/LadyMozzarella/FrameworkBenchmarks into convert-benchmark_config-to-json

commit 31042fe024e4a7d593a1413a372c623efad5fd8d
Merge: cfb64e7 a996a8e
Author: Brittany Mazza <[email protected]>
Date:   Wed Mar 4 14:48:08 2015 -0800

    Merge branch 'master' of https://github.com/LadyMozzarella/FrameworkBenchmarks into convert-benchmark_config-to-json

commit cfb64e765139584c84da00a277453dc7cd13e680
Author: Brittany Mazza <[email protected]>
Date:   Wed Mar 4 12:50:06 2015 -0800

    Remove period that doesn't work on anchor links

commit 06fcba71aab29e0ac83f96a246ea8200130f5c85
Author: Brittany Mazza <[email protected]>
Date:   Wed Mar 4 12:45:25 2015 -0800

    Period doesn't work for anchor links, remote

commit 60f78884d04d6b397adb4f305d16e351ad25ba56
Author: Brittany Mazza <[email protected]>
Date:   Wed Mar 4 12:39:06 2015 -0800

    Add .json extension to all benchmark_config files remaining

commit 5ec4859039f32e73cc6e8055142cc250fb3577e1
Author: Brittany Mazza <[email protected]>
Date:   Wed Mar 4 12:34:12 2015 -0800

    Revert "DO NOT MERGE - Travis commented out"

    This reverts commit 2d7b64faa818d81324016e7d8e726bb991b9b5df.

commit 2a4ee68da2a746b36e64e07f762086d6206f4cb1
Author: Brittany Mazza <[email protected]>
Date:   Wed Mar 4 11:40:03 2015 -0800

    Update md files to reference benchmark_config.json, switch lwan config to .json

commit 4fcc5bd400740f16d6b999f5d9dadc2731386668
Author: Brittany Mazza <[email protected]>
Date:   Wed Mar 4 11:18:11 2015 -0800

    Convert haywaire benchmark_config to json

commit 2d7b64faa818d81324016e7d8e726bb991b9b5df
Author: Brittany Mazza <[email protected]>
Date:   Wed Mar 4 11:12:10 2015 -0800

    DO NOT MERGE - Travis commented out

commit 273612905015993fad7e472dfaa679a04b632d01
Author: Brittany Mazza <[email protected]>
Date:   Wed Mar 4 11:10:00 2015 -0800

    Add .json extension to benchmark_config

frameworks/Java/play1siena/setup.sh

@@ -5,5 +5,5 @@ export RESIN_HOME=${IROOT}/resin-4.0.41
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 
 rm -rf $RESIN_HOME/webapps/*
-$PLAY1_HOME/play war -o $RESIN_HOME/webapps/play1 --exclude benchmark_config
+$PLAY1_HOME/play war -o $RESIN_HOME/webapps/play1 --exclude benchmark_config.json
 $RESIN_HOME/bin/resinctl start

frameworks/Java/play2-java/README.md

@@ -2,4 +2,4 @@
 
 1. Add new test applications in subdirectories named either `play2-java` or `play2-java-orm`.
 2. Edit `frameworks/Java/play2-java/generate_config.py` and add configuration for the new test applications.
-3. Run `python frameworks/Java/play2-java/generate_config.py` to generate a new `benchmark_config` file and to generate a `setup_*.py` file for your test application.
+3. Run `python frameworks/Java/play2-java/generate_config.py` to generate a new `benchmark_config.json` file and to generate a `setup_*.py` file for your test application.

frameworks/Java/play2-java/generate_config.py

@@ -2,7 +2,7 @@
 
 import collections, json, os, textwrap
 
-# This script generates the benchmark_config and setup_*.py files.
+# This script generates the benchmark_config.json and setup_*.py files.
 # To add new tests, modify the `configurations` and `test_urls` tables.
 
 # Each line corresponds to a test application.
@@ -85,7 +85,7 @@ for lang, orm, opsyses, tests in configurations:
       lang_test_configs[lang][test_name] = test_config_json
 
 for lang, _ in langs.iteritems():
-  benchmark_config_path = os.path.join(pathForLang(lang), 'benchmark_config')
+  benchmark_config_path = os.path.join(pathForLang(lang), 'benchmark_config.json')
   print 'Generating', benchmark_config_path
   with open(benchmark_config_path, 'w') as f:
     json_str = json.dumps({