geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed to utilize tomcat55 instead of tomcat5 for

Browse Source 
SuSE versions greater or equal to 1030 since they no longer
support tomcat5.
This commit is contained in:
Juan Carlos Luciani 2007-08-09 16:23:09 +00:00
parent 51529653f5
commit 93bb0f1046
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CASA-auth-token/server-java/Svc/linux/envvars
View File

@ -13,10 +13,17 @@ if [ -d /usr/lib64 ]; then
else else
LIB=lib LIB=lib
fi fi
JAVA_HOME="/usr/$LIB/jvm/jre-1.5.0" JAVA_HOME="/usr/$LIB/jvm/jre-1.5.0"
CATALINA_BASE="/srv/www/casaats" CATALINA_BASE="/srv/www/casaats"
CATALINA_HOME="/usr/share/tomcat5"
if [ -d /usr/share/tomcat55 ]; then
CATALINA_HOME="/usr/share/tomcat55"
else
CATALINA_HOME="/usr/share/tomcat5"
fi
CATALINA_PID="/var/lib/CASA/authtoken/svc/casaatsd.pid" CATALINA_PID="/var/lib/CASA/authtoken/svc/casaatsd.pid"
JAVA_OPTS="-Dcom.novell.casa.authtoksvc.config=/etc/CASA/authtoken/svc -Dlog4j.configuration=file:/etc/CASA/authtoken/svc/log4j.properties -Djava.library.path=/usr/$LIB" JAVA_OPTS="-Dcom.novell.casa.authtoksvc.config=/etc/CASA/authtoken/svc -Dlog4j.configuration=file:/etc/CASA/authtoken/svc/log4j.properties -Djava.library.path=/usr/$LIB"
export CATALINA_BASE CATALINA_HOME CATALINA_PID JAVA_HOME JAVA_OPTS export CATALINA_BASE CATALINA_HOME CATALINA_PID JAVA_HOME JAVA_OPTS

7
CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Aug 9 10:19:43 MDT 2007 - jluciani@novell.com
- Changed tomcat5 dependency to tomcat55 for SuSE versions
greater or equal to 1030 to handle changes in the distribution.
This addresses BUG 297712.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 29 09:28:40 MDT 2007 - jluciani@novell.com Fri Jun 29 09:28:40 MDT 2007 - jluciani@novell.com

12
CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in
View File

@ -19,6 +19,11 @@ Name: @PACKAGE@
URL: http://www.novell.com/products URL: http://www.novell.com/products
BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit xerces-j2 xml-commons-apis BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit xerces-j2 xml-commons-apis
BuildRequires: java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging pwdutils CASA-devel curl BuildRequires: java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging pwdutils CASA-devel curl
%if %suse_version < 1030
BuildRequires: tomcat5
%else
BuildRequires: tomcat55
%endif
%define prefix /usr %define prefix /usr
License: LGPL License: LGPL
Group: Applications/System Group: Applications/System
@ -30,7 +35,12 @@ Summary: Novell CASA Authentication Token Service
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: jre >= 1.5.0 Requires: jre >= 1.5.0
Requires: servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j xerces-j2 CASA curl Requires: servletapi5 sysvinit insserv identity-abstraction sed log4j xerces-j2 CASA curl
%if %suse_version < 1030
Requires: tomcat5
%else
Requires: tomcat55
%endif
PreReq: %fillup_prereq %insserv_prereq PreReq: %fillup_prereq %insserv_prereq
PreReq: /usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd PreReq: /usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd
PreReq: /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent PreReq: /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent