Fixed up tooling to 'fw_depends' on 'java' and not 'java7' or 'java8'. Also fixed a bug in verify's error output handling

toolset/benchmark/framework_test.py

@@ -389,7 +389,7 @@ class FrameworkTest:
       try:
         results = test.verify(base_url)
       except ConnectionError as e:
-        results = [('fail',"Server did not respond to request")]
+        results = [('fail',"Server did not respond to request", base_url)]
         logging.warning("Verifying test %s for %s caused an exception: %s", test_type, self.name, e)
       except Exception as e:
         results = [('fail',"""Caused Exception in TFB

toolset/setup/linux/frameworks/grails.sh

@@ -6,7 +6,7 @@ RETCODE=$(fw_exists ${IROOT}/grails.installed)
   return 0; }
 
 VERSION="2.4.4"
-GRAINS_HOME=$IROOT/grains-$VERSION
+GRAILS_HOME=$IROOT/grails-$VERSION
 
 fw_get -O http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-$VERSION.zip
 fw_unzip grails-$VERSION.zip

toolset/setup/linux/languages/jruby-9k.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm java8
+fw_depends rvm java
 
 # rvm stable [typically] only provides one version of jruby-9.0
 # update this when it changes

toolset/setup/linux/webservers/resin.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends java7
+fw_depends java
 
 RETCODE=$(fw_exists ${IROOT}/resin.installed)
 [ ! "$RETCODE" == 0 ] || { \