Revert "Install resin with gcc-6 in separate directory (#3189)" (#3225)

This reverts commit d967f73f8e22a01d8c25d6cb7dd530d9c4e10820.

This line was breaking the normal resin installation, despite the wishes
communicated in the comment:

  # We need separate folder so not to clash with the normal resin folder
  mv resin-$RVER resingcc6-$RVER

(resin-$RVER is where normal resin was installed, so after this line of
 code ran, frameworks that depended on normal resin later in the same run
 would fail.)

We could fix that by naming the .tar.gz file in resingcc6.sh to something
else, but there are more important issues:

1. The original PR #3189 asked us to test the change and provide sample
   results.  It's not clear they wanted us to merge the change in as is.

2. The way gcc-6 is installed, it's not sandboxed, so actually resin.sh
   and resingcc6.sh are installing exactly the same build of resin.
   gcc-6 happens to already be installed from other frameworks and
   previous runs, so we've already been testing resin with gcc-6
   apparently, and this alternative installation is not necessary.

frameworks/Java/servlet/benchmark_config.json

@@ -2,7 +2,7 @@
   "framework": "servlet",
   "tests": [{
     "default": {
-      "setup_file": "setup-resin-gcc-6",
+      "setup_file": "setup",
       "json_url": "/servlet/json",
       "plaintext_url": "/servlet/plaintext",
       "port": 8080,

frameworks/Java/servlet/setup-resin-gcc-6.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-fw_depends java resingcc6 maven
-
-mvn clean install
-rm -rf $RESIN_HOME/webapps/*
-cp target/servlet.war $RESIN_HOME/webapps/
-resinctl start

toolset/setup/linux/webservers/resin/resingcc6.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-fw_depends java gcc-6
-
-fw_installed resingcc6 && return 0
-
-RVER=4.0.55
-RESIN=resingcc6-$RVER
-RESIN_HOME=$IROOT/$RESIN
-
-fw_get -O http://www.caucho.com/download/resin-$RVER.tar.gz
-fw_untar resin-$RVER.tar.gz
-# We need separate folder so not to clash with the normal resin folder
-mv resin-$RVER resingcc6-$RVER
-cd resingcc6-$RVER
-./configure --prefix=`pwd`
-make
-make install
-
-mv conf/resin.properties conf/resin.properties.orig
-cat $FWROOT/toolset/setup/linux/webservers/resin/resin.properties > conf/resin.properties
-
-mv conf/resin.xml conf/resin.xml.orig
-cat $FWROOT/toolset/setup/linux/webservers/resin/resin.xml > conf/resin.xml
-
-echo "export RESIN_HOME=${RESIN_HOME}" > $IROOT/resingcc6.installed
-echo -e "export PATH=\$RESIN_HOME/bin:\$PATH" >> $IROOT/resingcc6.installed
-
-source $IROOT/resingcc6.installed