Browse Source

More Travis testing

Steven Smith 9 years ago
parent
commit
0529ffaa6b
1 changed files with 2 additions and 3 deletions
  1. 2 3
      frameworks/Java/gemini/start_postgres.sh

+ 2 - 3
frameworks/Java/gemini/start_postgres.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 
 
-# load java environment variables
-source $IROOT/java7.installed
+fw_depends java7 resin maven
 
 
 sed -i 's|db.ConnectString = .*/|db.ConnectString = '"$DBHOST"':5432/|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|db.ConnectString = .*/|db.ConnectString = '"$DBHOST"':5432/|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|root-directory=".*/FrameworkBenchmarks/frameworks/Java/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml
 sed -i 's|root-directory=".*/FrameworkBenchmarks/frameworks/Java/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml
@@ -9,4 +8,4 @@ sed -i 's|db.Driver.Class = .*|db.Driver.Class = org.postgresql.Driver|g' Docroo
 sed -i 's|db.Driver.UrlPrefix = .*|db.Driver.UrlPrefix = jdbc:postgresql://|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|db.Driver.UrlPrefix = .*|db.Driver.UrlPrefix = jdbc:postgresql://|g' Docroot/WEB-INF/GeminiHello.conf
 mkdir -p Docroot/WEB-INF/classes
 mkdir -p Docroot/WEB-INF/classes
 ant compile
 ant compile
-$RESIN_HOME/bin/resinctl -conf $TROOT/Docroot/WEB-INF/resin.xml start
+resinctl -conf $TROOT/Docroot/WEB-INF/resin.xml start