Changeset 20650 for gsdl

Timestamp:

2009-09-21T13:00:50+12:00 (15 years ago)

Author:

kjdon

Message:

findjava.sh changed to set javahome as well as javapath. Then gs2-server.sh adds javahome/bin to path before running Server2. Otherwise apache may use the wrong java, and lucene searching will fail if a lesser version has been used

Location:

gsdl/trunk

Files:

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

gsdl/trunk/findjava.sh

@@ -15 +15 @@
     # There is a JAVA_HOME already set, we're going to try using that
     javapath="$JAVA_HOME/bin/java"
-
+    javahome="$JAVA_HOME"
     # Print a warning that we're going to use whatever JAVA_HOME is set (fingers crossed)
     if [ "x$gslang" = "x" -o "$gslang" = "en" ]; then
@@ -75 +75 @@
     
     javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`"
+    javahome="`"$SEARCH4J_EXECUTABLE" -p "$HINT" -m $MINIMUM_JAVA_VERSION`"
 
     if [ "$?" != "0" ]; then

gsdl/trunk/gs2-server.sh

@@ -103 +103 @@
         export CLASSPATH
         echo "  - Adjusted CLASSPATH"
-
-    else
-        echo "  - CLASSPATH already correct"
     fi
 
@@ -116 +113 @@
         exit 1;
     fi
+    export PATH=$javahome/bin:$PATH
 
     if [ "x$silent" == "x" -o "x$silent" != "xtrue" ]; then 
         # verbose mode, show all output, but then we can't run the server interface in the background
+    
     "$javapath" org.greenstone.server.Server2 "$GSDLHOME" "$serverlang" $*
     else