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/Makefile.am

@@ -28,6 +28,7 @@ CFILES =
 
 EXTRA_DIST = CasaAuthtokenSvcD \
 		envvars \
+		envvars.zen \
 		server_keystore_setup.sh \
 		crypto.properties \
 		CasaBasicATSSetup.sh \

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
 

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

@@ -0,0 +1,17 @@
+############################################################
+#                                                          #
+# Environment variable file for casa_atsd in a ZenWorks    #
+# installation.                                            #
+#                                                          #
+# Note: This file is sourced by the casa_atsd rc script    #
+# when starting the service.                               #
+#                                                          #
+############################################################
+
+JAVA_HOME="/opt/novell/zenworks/share/java"
+CATALINA_BASE="/srv/www/casaats"
+CATALINA_HOME="/opt/novell/zenworks/share/tomcat"
+CATALINA_PID="/var/lib/CASA/authtoken/svc/casaatsd.pid"
+JAVA_OPTS="-Dcom.novell.casa.authtoksvc.config=/etc/CASA/authtoken/svc"
+export CATALINA_BASE CATALINA_HOME JAVA_HOME JAVA_OPTS
+