Changeset 20655 for gsdl

Timestamp:

2009-09-21T14:29:59+12:00 (15 years ago)

Author:

ak19

Message:

Updated in sync with the changes Katherine just made to gs2-server.sh and findjava.sh (JAVA_HOME\bin added to the PATH) before launching the webserver so that apache can pass it on to the lucene indexers.

Location:

gsdl/trunk

Files:

• findjava.sh (modified) (2 diffs)
• gs2-server.bat (modified) (3 diffs)

gsdl/trunk/findjava.sh

@@ -68 +68 @@
     # Give search4j a hint to find Java depending on the platform
     if [ $GSDLOS = linux ]; then
-    HINT=`cd $GSDLHOME;pwd`/packages/jre
+    HINT=`cd "$GSDLHOME";pwd`/packages/jre
     elif [ $GSDLOS = darwin ]; then
     HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
@@ -132 +132 @@
     SEARCH4J_EXECUTABLE=search4j    
 elif [ -x "$GSDLHOME/bin/$GSDLOS/search4j" ]; then
-    SEARCH4J_EXECUTABLE=$GSDLHOME/bin/$GSDLOS/search4j
+    SEARCH4J_EXECUTABLE="$GSDLHOME/bin/$GSDLOS/search4j"
 elif [ -x "$GSDL3SRCHOME/bin/$GSDLOS/search4j" ]; then
-    SEARCH4J_EXECUTABLE=$GSDL3SRCHOME/bin/search4j
+    SEARCH4J_EXECUTABLE="$GSDL3SRCHOME/bin/search4j"
 elif [ -x "../bin/$GSDLOS/search4j" ]; then
     SEARCH4J_EXECUTABLE=../bin/$GSDLOS/search4j

gsdl/trunk/gs2-server.bat

@@ -32 +32 @@
    pushd "%gsdl2path%"
    call setup.bat
-::   echo **** GSDLOS: %GSDLOS% and GSDLHOME: %GSDLHOME%
+rem   echo **** GSDLOS: %GSDLOS% and GSDLHOME: %GSDLHOME%
    popd
 )
@@ -116 +116 @@
 :: ---- Check Java ----
 :chkjava
-:: call the script with source, so that we have the variables it sets ($javapath)
+:: call the script with source, so that we have the variables JAVA_EXECUTABLE and GS_JAVA_HOME it sets
 set exit_status=0
 :: Need to find Java. If found, JAVA_EXECUTABLE will be set
@@ -122 +122 @@
 call "%GSDLHOME%\findjava.bat"
 if "%JAVA_EXECUTABLE%" == "" echo **** No Java executable found& goto exit
+set PATH=%GS_JAVA_HOME%\bin;%PATH%