From ce7dfe79e838760d6dffaff5a00b0bba8e69da2e Mon Sep 17 00:00:00 2001 From: jeb228 Date: Tue, 31 Aug 2010 15:34:53 +0000 Subject: [PATCH] NIHVIVO-222 Return to stopping and starting Tomcat - stopping the webapp ran out of PermGen space no matter what I tried. Also some output formatting improvements. --- .../example.acceptance_tests.properties | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/utilities/acceptance-tests/example.acceptance_tests.properties b/utilities/acceptance-tests/example.acceptance_tests.properties index e601aa6a..003c11f1 100644 --- a/utilities/acceptance-tests/example.acceptance_tests.properties +++ b/utilities/acceptance-tests/example.acceptance_tests.properties @@ -13,18 +13,18 @@ selenium_jar_path = /vitro/utilities/testrunner/selenium/selenium-se # These properties are needed to cleanse the data model between test suites. # -vivo_webapp_name = vivo -tomcat_manager_username = tomcat -tomcat_manager_password = tomcat -mysql_username = vivoUser -mysql_password = vivoPass -mysql_dumpfile = test-model/testmodeldump.sql -mysql_db_name = vivo -vivo_webapp_directory = /usr/local/tomcat//webapps/vivo -upload_directory = /usr/local/vivo/data/uploads +mysql_username = vivoUser +mysql_password = vivoPass +mysql_dumpfile = test-model/testmodeldump.sql +mysql_db_name = vivo +vivo_webapp_directory = /usr/local/tomcat//webapps/vivo +upload_directory = /usr/local/vivo/data/uploads +tomcat_check_ready_command = /usr/local/vivo/commands/check_tomcat.sh +tomcat_stop_command = /usr/local/vivo/commands/stop_tomcat.sh +tomcat_start_command = /usr/local/vivo/commands/start_tomcat.sh + # # These properties control the output formatting of the tests. # ignored_tests_file = suites/ignored_tests.txt -summary_css_file = suites/output_summary.css \ No newline at end of file