Updated the project to allow us to build RPMs that meet Zen's

requirements which state that we must work with the Java and Tomcat
packages that their install bundle.

CASA-auth-token/server-java/Svc/linux/envvars

@@ -6,16 +6,20 @@
 # when starting the service.                               #
 #                                                          #
 ############################################################
-if [ -d /usr/lib64 ]; then
-  LIB=lib64
-else
-  LIB=lib
+
+# Set JAVA_HOME if not yet set
+if [ "$JAVA_HOME" == "" ]; then
+   if [ -d /usr/lib64 ]; then
+      LIB=lib64
+   else
+      LIB=lib
+   fi
+   JAVA_HOME="/usr/$LIB/jvm/jre-1.5.0"
 fi
 
 CATALINA_BASE="/srv/www/casaats"
 CATALINA_HOME="/usr/share/tomcat5"
 CATALINA_PID="/var/lib/CASA/authtoken/svc/casaatsd.pid"
-JAVA_HOME="/usr/$LIB/jvm/jre-1.5.0"
 JAVA_OPTS="-Dcom.novell.casa.authtoksvc.config=/etc/CASA/authtoken/svc"
 export CATALINA_BASE CATALINA_HOME JAVA_HOME JAVA_OPTS