Merge pull request #1098 from marko-asplund/master

Upgrade Resin to v4.0.41

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.36
+export RESIN_HOME=${IROOT}/resin-4.0.41
 export GRAILS_HOME=${IROOT}/grails-2.4.2
 export VERTX_HOME=${IROOT}/vert.x-2.1.1
 export GOROOT=${IROOT}/go

frameworks/Clojure/compojure/bash_profile.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.36
+export RESIN_HOME=${IROOT}/resin-4.0.41
 export LEIN_HOME=$IROOT/bin
 
 export PATH="$JAVA_HOME/bin:$LEIN_HOME:$PATH"

frameworks/Clojure/luminus/bash_profile.sh

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

frameworks/Groovy/grails/bash_profile.sh

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

frameworks/Java/activeweb/bash_profile.sh

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

frameworks/Java/gemini/bash_profile.sh

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

frameworks/Java/servlet/bash_profile.sh

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

frameworks/Java/servlet3-cass/bash_profile.sh

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

frameworks/Java/spark/bash_profile.sh

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

frameworks/Java/tapestry/bash_profile.sh

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

frameworks/Java/wicket/bash_profile.sh

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

frameworks/Scala/scalatra/bash_profile.sh

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

toolset/setup/linux/webservers/resin.sh

@@ -1,14 +1,16 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists resin-4.0.36/conf/resin.xml)
+RVER=4.0.41
+
+RETCODE=$(fw_exists resin-$RVER/conf/resin.xml)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_depends java
 sudo cp -r /usr/lib/jvm/java-1.7.0-openjdk-amd64/include /usr/lib/jvm/java-1.7.0-openjdk-amd64/jre/bin/
 
-fw_get http://www.caucho.com/download/resin-4.0.36.tar.gz
-fw_untar resin-4.0.36.tar.gz
-cd resin-4.0.36
+fw_get http://www.caucho.com/download/resin-$RVER.tar.gz
+fw_untar resin-$RVER.tar.gz
+cd resin-$RVER
 ./configure --prefix=`pwd`
 make
 make install

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.36"
+$resin_version            = "resin-4.0.41"
 $resin_installer_file     = "$resin_version.zip"
 $ant_version              = "apache-ant-1.9.2"
 $ant_installer_file       = "$ant_version-bin.zip"