Changeset 15191 for greenstone3/branches/customizingGreenstone3/resources

Timestamp:

2008-04-14T16:20:45+12:00 (16 years ago)

Author:

dmn

Message:

updating branch from trunk

Location:

greenstone3/branches/customizingGreenstone3/resources

Files:

• java/global.properties.in (modified) (1 diff)
• tomcat/setclasspath.bat (modified) (2 diffs)
• tomcat/setclasspath.sh (modified) (1 diff)

greenstone3/branches/customizingGreenstone3/resources/java/global.properties.in

@@ -1 +1 @@
 ## greenstone home
 gsdl3.home=@gsdl3home@
-gsdl3.version=@gsdl3version@
+gsdl3.version=S20080214
 
 # tomcat info

greenstone3/branches/customizingGreenstone3/resources/tomcat/setclasspath.bat

@@ -6 +6 @@
 
 rem Make sure prerequisite environment variables are set
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo The JAVA_HOME environment variable is not defined
-echo This environment variable is needed to run this program
+if not "%JAVA_HOME%" == "" goto gotJdkHome
+if not "%JRE_HOME%" == "" goto gotJreHome
+echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined
+echo At least one of these environment variable is needed to run this program
 goto exit
-:gotJavaHome
+
+:gotJreHome
+if not exist "%JRE_HOME%\bin\java.exe" goto noJavaHome
+if not exist "%JRE_HOME%\bin\javaw.exe" goto noJavaHome
+if not ""%1"" == ""debug"" goto okJavaHome
+echo JAVA_HOME should point to a JDK in order to run in debug mode.
+goto exit
+
+:gotJdkHome
 if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\javaw.exe" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome
+if not "%JRE_HOME%" == "" goto okJavaHome
+set JRE_HOME=%JAVA_HOME%
 goto okJavaHome
+
 :noJavaHome
 echo The JAVA_HOME environment variable is not defined correctly
@@ -45 +57 @@
 rem Note that NT requires a window name argument when using start.
 rem Also note the quoting as JAVA_HOME may contain spaces.
-set _RUNJAVA="%JAVA_HOME%\bin\java"
-set _RUNJAVAW="%JAVA_HOME%\bin\javaw"
+set _RUNJAVA="%JRE_HOME%\bin\java"
+set _RUNJAVAW="%JRE_HOME%\bin\javaw"
 set _RUNJDB="%JAVA_HOME%\bin\jdb"
 set _RUNJAVAC="%JAVA_HOME%\bin\javac"

greenstone3/branches/customizingGreenstone3/resources/tomcat/setclasspath.sh

@@ -7 +7 @@
 
 # First clear out the user classpath
-# gs3 - we need to set classpath
 CLASSPATH=$CLASSPATH
 
 # Make sure prerequisite environment variables are set
 if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
-  echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
-  echo "At least one of these environment variable is needed to run this program"
-  exit 1
+  # Bugzilla 37284
+  if $darwin && [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home" ]; then
+    export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
+  else
+    echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
+    echo "At least one of these environment variable is needed to run this program"
+    exit 1
+  fi
 fi
 if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then