Changeset 7896

Timestamp:

2004-08-06T15:08:20+12:00 (20 years ago)

Author:

mdewsnip

Message:

Added mySQL startup and shutdown into the Windows launcher.

Location:

trunk/gsdl3

Files:

• gs3-launch.bat (modified) (1 diff)
• gs3-launch.sh.in (modified) (6 diffs)

trunk/gsdl3/gs3-launch.bat

@@ -1 +1 @@
 @echo off
 
+echo.
+echo Greenstone 3 (GSDL3)
+echo Copyright (C) 2004 New Zealand Digital Libraries, University Of Waikato
+echo Greenstone 3 comes with ABSOLUTELY NO WARRANTY; for details see LICENSE.txt
+echo This is free software, and you are welcome to redistribute it
+echo.
 
 ::  -------- Launch the Greenstone 3 Digital Library Software --------
 
-if exist gs3-setup.bat goto start
+if exist gs3-setup.bat goto begin
   echo This script must be run from within the Greenstone 3 home directory
   pause
   goto exit
 
-:start
+:begin
 :: ---- Run setup.bat to set the necessary environment variables ----
 call gs3-setup.bat
 echo.
-if "%JAVA_HOME%" == "" goto exit
 
+:: Set up java options for catalina
 set CATALINA_HOME=%GSDL3HOME%\comms\jakarta\tomcat
 set CATALINA_OPTS="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=%GSDL3HOME% -DGSDLOS=%GSDLOS% -DGSDLHOME= -DPATH=%PATH%"
 
-:: ---- Start the Tomcat server ----
-call "%GSDL3HOME%\comms\jakarta\tomcat\bin\startup.bat"
+if ""%1"" == ""-shutdown"" goto shutdown
+    ::  -------- Run MySQL --------
+    echo Starting MySQL server...
+    echo.
+    cd %GSDL3HOME%\packages\mysql
+    start bin\mysqld
+    cd %GSDL3HOME%
+    echo Done.
 
-:: ---- Launch a web browser ----
-start http://localhost:8080/gsdl3
+    ::  -------- Run Tomcat --------
+    echo Starting Tomcat Webserver...
+    echo.
+    call "%GSDL3HOME%\comms\jakarta\tomcat\bin\startup.bat"
+    echo Done.
+
+    :: ---- Launch a web browser ----
+    start http://localhost:8080/gsdl3
+    goto exit
+
+:shutdown
+    :: -------- Stop Tomcat --------
+    echo Shutting down Tomcat Webserver...
+    echo.
+    call "%GSDL3HOME%\comms\jakarta\tomcat\bin\shutdown.bat"
+    echo Done.
+
+    :: -------- Stop MySQL --------
+    echo Stopping MySQL server...
+    echo.
+    cd %GSDL3HOME%\packages\mysql
+    bin\mysqladmin --user=root shutdown
+    cd %GSDL3HOME%
+    echo Done.
+
+    echo ****************************************************************
+    echo  Greenstone 3 has been shutdown. Run gs3-launch.bat to restart.
+    echo ****************************************************************
 
 :exit

trunk/gsdl3/gs3-launch.sh.in

@@ -3 +3 @@
 echo
 echo "Greenstone 3 (GSDL3)"
-echo "Copyright (C) 2003 New Zealand Digital Libraries, University Of Waikato"
-echo "GSDL3 comes with ABSOLUTELY NO WARRANTY; for details see LICENSE.txt"
+echo "Copyright (C) 2004 New Zealand Digital Libraries, University Of Waikato"
+echo "Greenstone 3 comes with ABSOLUTELY NO WARRANTY; for details see LICENSE.txt"
 echo "This is free software, and you are welcome to redistribute it"
 echo
@@ -27 +27 @@
 
     ##  -------- Run MySQL --------
-
     echo "Starting MySQL Daemon..."
     echo ""
@@ -34 +33 @@
     popd
     echo "Done."
+
     ##  -------- Run Tomcat --------
-
     echo "Starting Tomcat Webserver..."
     echo ""
@@ -44 +43 @@
 
     ##  -------- Greenstone 3 --------
-        
     echo ""
     echo "****************************************************************"
@@ -68 +66 @@
     
     ## -------- Stop Tomcat --------
-    
     echo "Shutting Down Tomcat Webserver..."
     echo ""
@@ -77 +74 @@
 
     ## -------- Stop MySQL --------
-
     echo "Stop MySQL Daemon..."
     echo ""
     ./gs3-mysql-server.sh stop
     echo "Done."
-   
+
     ##  -------- Greenstone 3 -------- 
     echo "****************************************************************"
-    echo "Greenstone 3 has been shutdown. Run gs3-launch.sh to restart."
+    echo " Greenstone 3 has been shutdown. Run gs3-launch.sh to restart."
     echo "****************************************************************"