Finished updating the java tests

frameworks/Java/servlet/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 resin maven

frameworks/Java/servlet/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
-
-export RESIN_HOME=${IROOT}/resin-4.0.41
-
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/webapp/WEB-INF/resin-web.xml
 
+fw_depends java7 resin maven
+
 mvn clean compile war:war
 rm -rf $RESIN_HOME/webapps/*
 cp target/servlet.war $RESIN_HOME/webapps/
-$RESIN_HOME/bin/resinctl start
+resinctl start

frameworks/Java/servlet3-cass/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java8 resin maven

frameworks/Java/servlet3-cass/setup.sh

@@ -1,12 +1,10 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java8.installed
-export RESIN_HOME=${IROOT}/resin-4.0.41
-
 sed -i 's|localhost|'"${DBHOST}"'|g' src/main/resources/application.properties
 
+fw_depends java8 resin maven
+
 mvn clean compile war:war
 rm -rf $RESIN_HOME/webapps/*
 cp target/servlet3-cass.war $RESIN_HOME/webapps
-$RESIN_HOME/bin/resinctl start
+$RESIN_HOME/bin/resinctl start

frameworks/Java/spark/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 resin maven

frameworks/Java/spark/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
-
-export RESIN_HOME=${IROOT}/resin-4.0.41
-
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/webapp/WEB-INF/resin-web.xml
 
+fw_depends java7 resin maven
+
 mvn clean package -Ddb-host=${DBHOST}
 rm -rf $RESIN_HOME/webapps/*
 cp target/spark.war $RESIN_HOME/webapps/spark.war
-$RESIN_HOME/bin/resinctl start
+resinctl start

frameworks/Java/spring/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/spring/setup.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java7 maven
 
 mvn clean package
 cd target
-java -Ddatabase.host=${DBHOST} -jar spring.war &
+java -Ddatabase.host=${DBHOST} -jar spring.war &

frameworks/Java/tapestry/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 resin maven

frameworks/Java/tapestry/setup.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
-# load java environment variables
-source $IROOT/java7.installed
-export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' hello/src/main/webapp/WEB-INF/resin-web.xml
 
+fw_depends java7 resin maven
+
 cd hello
 mvn clean compile war:war
 rm -rf $RESIN_HOME/webapps/*
 cp target/tapestry.war $RESIN_HOME/webapps/tapestry.war
-$RESIN_HOME/bin/resinctl start
+resinctl start

frameworks/Java/undertow-edge/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/undertow-edge/setup.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
-# load java environment variables
-source $IROOT/java7.installed
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/resources/hello/server.properties
 sed -i 's|postgresql://.*:5432|postgresql://'"${DBHOST}"':5432|g' src/main/resources/hello/server.properties
 
+fw_depends java7 maven
+
 mvn clean package
-java -Djava.library.path=target/ -jar target/undertow-edge-0.1-jar-with-dependencies.jar &
+java -Djava.library.path=target/ -jar target/undertow-edge-0.1-jar-with-dependencies.jar &

frameworks/Java/undertow/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/undertow/setup.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
-# load java environment variables
-source $IROOT/java7.installed
 
 sed -i 's|DATABASE_HOST|'"${DBHOST}"'|g' src/main/resources/hello/server.properties
 
+fw_depends java7 maven
+
 mvn clean compile assembly:single
 cd target
-java -jar undertow-example-0.1-jar-with-dependencies.jar &
+java -jar undertow-example-0.1-jar-with-dependencies.jar &

frameworks/Java/vertx/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 vertx 

frameworks/Java/vertx/setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-# load java environment variables
-source $IROOT/java7.installed
 
 sed -i 's|host: \x27.*\x27|host: \x27'"${DBHOST}"'\x27|g' app.js
 
-${IROOT}/vert.x-2.1.1/bin/vertx run app.js &
+fw_depends java7 vertx 
+
+vertx run app.js &

frameworks/Java/wicket/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 resin maven

frameworks/Java/wicket/setup.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
-# load java environment variables
-source $IROOT/java7.installed
-export RESIN_HOME=${IROOT}/resin-4.0.41
 
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' src/main/webapp/WEB-INF/resin-web.xml
 
+fw_depends java7 resin maven
+
 mvn clean compile war:war
 rm -rf $RESIN_HOME/webapps/*
 cp target/hellowicket-1.0-SNAPSHOT.war $RESIN_HOME/webapps/wicket.war
-$RESIN_HOME/bin/resinctl start
+resinctl start

frameworks/Java/wildfly-ee7/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends java7 maven

frameworks/Java/wildfly-ee7/setup.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
-# load java environment variables
-source $IROOT/java7.installed
+
+fw_depends java7 maven
 
 export JAVA_OPTS="-Xms2g -Xmx2g -XX:MaxPermSize=256m -XX:+UseG1GC -XX:MaxGCPauseMillis=25 -verbosegc -Xloggc:/tmp/wildfly_gc.log"
 
 mvn clean initialize package -Pbenchmark -Ddatabase.host=${DBHOST}
-target/wildfly-9.0.0.Beta2/bin/standalone.sh -b 0.0.0.0 &
+target/wildfly-9.0.0.Beta2/bin/standalone.sh -b 0.0.0.0 &

toolset/setup/linux/frameworks/vertx.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/vert.x-2.1.1.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+VERSION="2.1.1"
+VERTX_HOME=$IROOT/vert.x-$VERSION
+RETCODE=$(fw_exists ${VERTX_HOME}.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $VERTX_HOME.installed
+  return 0; }
 
 fw_get http://dl.bintray.com/vertx/downloads/vert.x-2.1.1.tar.gz?direct=true -O vert.x-2.1.1.tar.gz
 fw_untar vert.x-2.1.1.tar.gz
 
-touch ${IROOT}/vert.x-2.1.1.installed
+echo "export VERTX_HOME=${VERTX_HOME}" > $VERTX_HOME.installed
+echo -e "export PATH=${VERTX_HOME}/bin:\$PATH" >> $VERTX_HOME.installed
+
+source $VERTX_HOME.installed