Changeset 14727


Ignore:
Timestamp:
2007-10-24T09:23:02+13:00 (15 years ago)
Author:
qq6
Message:

looking for the JRE home first then the JAVA home while starting the gs3 server

Location:
greenstone3/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/gs3-server.bat

    r13931 r14727  
    11@echo off
    22
    3 set SERVERLANG=en
     3echo Greenstone 3 Server
     4echo Copyright (C) 2006, New Zealand Digital Library Project, University Of Waikato
     5echo This software comes with ABSOLUTELY NO WARRANTY; for details see LICENSE.txt
     6echo This is free software, and you are welcome to redistribute it
    47
    5 :: -------- Run the Greenstone 3 Server --------
    6 
    7 :: This script must be run from within the directory in which it lives
    8 if exist gs3-server.bat goto start
    9     if "%SERVERLANG%" == "en" echo This script must be run from the directory in which it resides.
    10     if "%SERVERLANG%" == "es" echo Este gui¢n deber  ejecutarse desde el directorio en el que reside.
    11     if "%SERVERLANG%" == "fr" echo Ce script doit ˆtre ex‚cut‚ 
 partir du r‚pertoire dans lequel il se trouve.
    12     if "%SERVERLANG%" == "ru" echo â®â áªàš¯â €®«Š¥­ ¡ëâì ¢§ïâ š§ €šà¥ªâ®àšš, ¢ ª®â®à®© ®­ à á¯®«®Š¥­
    13     goto exit
    14 
    15 :start
    16 if "%OS%" == "Windows_NT" goto findGSDL
    17     :: Invoke a new command processor to ensure there's enough environment space
    18     if "%1" == "Second" goto findGSDL
    19         command /E:2048 /C %0 Second %1 %2 %3 %4 %5 %6 %7 %8 %9
    20         goto done
    21 
    22 :findGSDL
    23 echo.
    24 if "%SERVERLANG%" == "en" echo Greenstone3 Server
    25 if "%SERVERLANG%" == "en" echo Copyright (C) 2006, New Zealand Digital Library Project, University Of Waikato
    26 if "%SERVERLANG%" == "en" echo This program comes with ABSOLUTELY NO WARRANTY; for details see LICENSE.txt
    27 if "%SERVERLANG%" == "en" echo This is free software, and you are welcome to redistribute it
    28 
    29 echo.
    308::  ---- Determine GSDL3HOME ----
     9:: Some users may set the above line manually
    3110set GSDL3PATH=
    3211
    33 :: Some users may set the above line manually
    34  if not "%GSDL3PATH%" == "" goto prepGSDL
     12:: The default location is the current directory
     13 if "%GSDL3PATH%" == "" set GSDL3PATH=.
    3514
    36  :: The default location is the current directory
    37  set GSDL3PATH=.
     15:: Setup Greenstone, unless it has already been done
     16if "%GSDL3SRCHOME%" == "" call "%GSDL3PATH%\gs3-setup.bat" SetEnv > nul
    3817
    39  :: If it is set, use the GSDLHOME environment variable
    40   if "%GSDL3SRCHOME%" == "" goto prepGSDL
    41   set GSDL3PATH=%GSDL3SRCHOME%
    42 
    43 :prepGSDL
    44 :: Setup Greenstone, unless it has already been done
    45 if not "%GSDL3SRCHOME%" == "" goto doneGSDL
    46    call "%GSDL3PATH%\gs3-setup.bat" SetEnv > nul
    47 
    48 :doneGSDL
    49 :: GSDL3PATH is no longer needed, since GSDL3SRCHOME should now be set
    5018set GSDL3PATH=
    5119
    52 :findJava
    53 :: ---- Check Java exists ----
    54 set JAVAPATH=
     20"%RUNJAVA%" -cp "%CLASSPATH%" org.greenstone.server.Server "%GSDL3SRCHOME%"
    5521
    56 :: Some users may set the above line manually
    57 if not "%JAVAPATH%" == "" goto testJava
    5822
    59 :: If it is set, use the JAVA_HOME environment variable
    60  if not "%JAVA_HOME%" == "" goto javahome
    6123
    62 :: Check if Java is on the search path
    63  echo %PATH%| winutil\which.exe java.exe | winutil\setvar.exe JAVAPATH > setjava.bat
    64  call setjava.bat
    65  del setjava.bat
    66  if not "%JAVAPATH%" == "" goto testJava
    67 
    68     :: Still haven't found anything, so try looking in the registry (gulp!)
    69     type nul > jdk.reg
    70     regedit /E jdk.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit"
    71     type jdk.reg > jdk.txt
    72     del jdk.reg
    73     type nul > jre.reg
    74     regedit /E jre.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment"
    75     type jre.reg > jre.txt
    76     del jre.reg
    77 
    78     winutil\findjava.exe jdk.txt jre.txt | winutil\setvar.exe JAVAPATH > setjava.bat
    79     del jdk.txt
    80     del jre.txt
    81     call setjava.bat
    82     del setjava.bat
    83 
    84    :: If nothing was found in the registry, we're stuck
    85    if "%JAVAPATH%" == "" goto noJava
    86 
    87    set JAVAPATH=%JAVAPATH%\bin
    88    goto testJava
    89 
    90 :javahome
    91     set JAVAPATH=%JAVA_HOME%\bin
    92 
    93 :testJava
    94 :: Check that a Java executable has been found
    95   if "%SERVERLANG%" == "en" echo Checking Java: %JAVAPATH%
    96   if "%SERVERLANG%" == "es" echo Revisando Java: %JAVAPATH%
    97   if "%SERVERLANG%" == "fr" echo V‚rification de Java: %JAVAPATH%
    98   if "%SERVERLANG%" == "ru" echo à®¢¥àª  Java: %JAVAPATH%
    99   if exist "%JAVAPATH%\java.exe" goto checkServer
    100 
    101 :noJava
    102  echo.
    103     if "%SERVERLANG%" == "en" echo Failed to locate an appropriate version of Java. You must install a
    104     if "%SERVERLANG%" == "en" echo Java Runtime Environment (version 1.4 or greater) before running the
    105     if "%SERVERLANG%" == "en" echo Greenstone3 Server.
    106     goto exit
    107 
    108 :checkServer
    109 ::---- Check that the server program has been compiled ----
    110 if exist "server.jar" goto runServer
    111 if "%SERVERLANG%" == "en" echo "You need to compile the code before running the server"
    112 goto exit
    113 
    114 :runServer
    115 echo Running the Greenstone Server
    116 :: -Xms32M          To set minimum memory
    117 :: -Xmx32M          To set maximum memory
    118 :: -verbose:gc      To set garbage collection messages
    119 :: -Xincgc          For incremental garbage collection
    120 :: -Xprof           Function call profiling
    121 :: -Xloggc:<file>   Write garbage collection log
    122 
    123 "%JAVAPATH%\java" -cp "%CLASSPATH%" org.greenstone.server.Server "%GSDL3SRCHOME%"
    124 
    125 :exit
    126 
    127 :done
    128 :: ---- Clean up ----
    129 set JAVAPATH=
    13024
    13125 
  • greenstone3/trunk/gs3-server.sh

    r13499 r14727  
    22serverlang=en
    33
    4 echo
    54echo "Greenstone 3 Server"
    65echo "Copyright (C) 2006, New Zealand Digital Library Project, University Of Waikato"
    76echo "This software comes with ABSOLUTELY NO WARRANTY; for details see LICENSE.txt"
    87echo "This is free software, and you are welcome to redistribute it"
    9 echo
    108
    119##  -------- Run the Greenstone 3 Server --------
     
    1412thisdir=`pwd`
    1513if [ ! -f "${thisdir}/gs3-server.sh" ]; then
    16     if [ "$serverlang" == "es" ]; then
    17         echo "Este guión deberá ejecutarse desde el directorio en el que reside."
    18     elif [ "$serverlang" == "fr" ]; then
    19     echo "Ce script doit être exécuté à partir du répertoire dans lequel il se trouve."
    20     elif [ "$serverlang" == "ru" ]; then
    21     echo "üÔÏÔ ÓËÒÉÐÔ ÄÏÌÖÅÎ ÂÙÔØ ×ÚÑÔ ÉÚ ÄÉÒÅËÔÏÒÉÉ, × ËÏÔÏÒÏÊ ÏÎ ÒÁÓÐÏÌÏÖÅÎ"
    22     else
    23     echo "This script must be run from the directory in which it resides."
    24     fi
     14    echo "This script must be run from the directory in which it resides."
    2515    exit 1
    2616fi
    27 
    2817
    2918##  ---- Determine GSDL3SRCHOME ----
     
    3120
    3221# Some users may set the above line manually
    33 if [ "x$gsdl3path" == "x" ]; then
    34     # Check the environment variable first
    35     if [ "x$GSDL3SRCHOME" != "x" ]; then
    36     gsdl3path=$GSDL3SRCHOME
    37     else
    38     gsdl3path=`pwd`
    39     fi
     22if [ -z "$gsdl3path" ]; then
     23   gsdl3path=`pwd` 
    4024fi
    4125
    42 # Setup Greenstone3, unless it has already been done
    43 if [ "x$GSDL3SRCHOME" == "x" ]; then
    44     pushd $gsdl3path > /dev/null
    45     source gs3-setup.sh
    46     popd > /dev/null
    47 fi
    48 
    49 ## ---- Check Java exists ----
    50 javapath=
    51 
    52 # Some users may set the above line manually
    53 if [ "x$javapath" = "x" ]; then
    54 
    55     # If it is set, use the JAVA_HOME environment variable
    56     if [ "x$JAVA_HOME" != "x" ]; then
    57         javapath="$JAVA_HOME/bin/java"
    58 
    59     # Check if Java is on the search path
    60     else
    61         javapath=`which java 2> /dev/null`
    62     fi
    63 fi
    64 
    65 # Check that a Java executable has been found
    66 if [ "$glilang" = "es" ]; then
    67     echo "Revisando Java: $javapath"
    68 elif [ "$glilang" = "fr" ]; then
    69     echo "V<E9>rification de Java: $javapath"
    70 elif [ "$glilang" = "ru" ]; then
    71     echo "<F0><D2><CF><D7><C5><D2><CB><C1> Java: $javapath"
    72 else
    73     echo "Checking Java: $javapath"
    74 fi
    75 if [ ! -x "$javapath" ]; then
    76     echo
    77     echo "Failed to locate an appropriate version of Java. You must installa"
    78     echo "Java Runtime Environment (version 1.4 or greater) before running the"
    79     echo "Greenstone Server."
    80 exit 1
    81 fi
    82 
    83 ## -- Check the version of Java is new enough (1.4.0 or higher) to run the Server -- do we need this?
    84 #`$javapath -classpath . CheckJavaVersion > /dev/null`
    85 #if [ $? -ne 2 ] ; then
    86 #   echo "The version of the Java Runtime Environment you have installed is too"
    87 #   echo "old to run the Greenstone Librarian Interface. Please install a new"
    88 #   echo "version of the JRE (version 1.4 or newer) and rerun this script."
    89 #exit 1
    90 #fi
    91 
    92 ## ---- Check that the server has been compiled ----
    93 if [ ! -f server.jar ]; then
    94   echo "You need to compile the server before running this script"
    95   exit 1
     26if [ -z "$GSDL3SRCHOME" ]; then
     27  # Setup Greenstone3, unless it has already been done
     28  pushd $gsdl3path > /dev/null
     29  source gs3-setup.sh
     30  popd > /dev/null
    9631fi
    9732
    9833
    99 # Other arguments you can provide to java
    100 # -Xms<number>M    To set minimum memory (by default 32MB)
    101 # -Xmx<number>M    To set maximum memory (by default the nearest 2^n to the total remaining physical memory)
    102 # -verbose:gc      To set garbage collection messages
    103 # -Xincgc          For incremental garbage collection (significantly slows performance)
    104 # -Xprof           Function call profiling
    105 # -Xloggc:<file>   Write garbage collection log
     34# JRE_HOME or JAVA_HOME must be set correctly to run this program
     35if [ -n "$RUNJAVA" ]; then
     36  "$RUNJAVA" -cp $CLASSPATH org.greenstone.server.Server $GSDL3SRCHOME
     37fi
    10638
    107 java -cp $CLASSPATH org.greenstone.server.Server $GSDL3SRCHOME
Note: See TracChangeset for help on using the changeset viewer.