Revert "update Resin paths; don't set JAVA_HOME & RESIN_HOME env vars in test implementation bash_profile.sh files, they're already set in config/benchmark_profile"

This reverts commit 77550b3e3973db78d9239387ba5f4c83672c341d.

config/benchmark_profile

@@ -11,7 +11,7 @@ fi
 IROOT=${FWROOT}/installs
 
 export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.41
+export RESIN_HOME=${IROOT}/resin-4.0.36
 export GRAILS_HOME=${IROOT}/grails-2.4.2
 export VERTX_HOME=${IROOT}/vert.x-2.1.1
 export GOROOT=${IROOT}/go

frameworks/Clojure/luminus/bash_profile.sh

@@ -0,0 +1,2 @@
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.36

frameworks/Groovy/grails/bash_profile.sh

@@ -1,2 +1,5 @@
-export GRAILS_PATH=$GRAILS_HOME/bin/
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.36
+
+export GRAILS_PATH=${IROOT}/grails-2.4.2/bin/
 export PATH=${GRAILS_PATH}:$PATH

frameworks/Java/activeweb/bash_profile.sh

@@ -0,0 +1,2 @@
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.36

frameworks/Java/gemini/bash_profile.sh

@@ -0,0 +1,2 @@
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.36

frameworks/Java/servlet/bash_profile.sh

@@ -0,0 +1 @@
+export RESIN_HOME=${IROOT}/resin-4.0.36

frameworks/Java/servlet3-cass/bash_profile.sh

@@ -0,0 +1,2 @@
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.36

frameworks/Java/spark/bash_profile.sh

@@ -0,0 +1,2 @@
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.36

frameworks/Java/tapestry/bash_profile.sh

@@ -0,0 +1,2 @@
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.36

frameworks/Java/wicket/bash_profile.sh

@@ -0,0 +1 @@
+export RESIN_HOME=${IROOT}/resin-4.0.36

frameworks/Scala/scalatra/bash_profile.sh

@@ -0,0 +1,2 @@
+export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+export RESIN_HOME=${IROOT}/resin-4.0.36

toolset/setup/linux/webservers/resin.sh

@@ -10,7 +10,6 @@ sudo cp -r /usr/lib/jvm/java-1.7.0-openjdk-amd64/include /usr/lib/jvm/java-1.7.0
 
 fw_get http://www.caucho.com/download/resin-$RVER.tar.gz
 fw_untar resin-$RVER.tar.gz
-ln -s resin-$RVER resin-4.0
 cd resin-$RVER
 ./configure --prefix=`pwd`
 make

toolset/setup/windows/installer.ps1

@@ -14,7 +14,7 @@ $jre_installer_file       = "jdk-7u65-windows-x64.exe"
 $jdk_installer_file       = "jdk-7u65-windows-x64.exe"
 $jdk_master_hash          = "f0270817998c7408b24a2dd9ac420346" 
 # http://www.oracle.com/technetwork/java/javase/downloads/java-se-binaries-checksum-1956892.html
-$resin_version            = "resin-4.0.41"
+$resin_version            = "resin-4.0.36"
 $resin_installer_file     = "$resin_version.zip"
 $ant_version              = "apache-ant-1.9.2"
 $ant_installer_file       = "$ant_version-bin.zip"