Continuation of changes to start using log4j.
This commit is contained in:
		| @@ -18,7 +18,7 @@ | ||||
| Name:          @PACKAGE@  | ||||
| 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:  java-sdk-1.5.0 update-alternatives | ||||
| BuildRequires:  java-sdk-1.5.0 update-alternatives log4j | ||||
| %define prefix /usr | ||||
| License:       LGPL | ||||
| Group:         Applications/System | ||||
| @@ -30,7 +30,7 @@ Summary:       Novell Common Authentication Services Adapter Authentication Toke | ||||
| Source:        %{name}-%{version}.tar.bz2 | ||||
| BuildRoot:     %{_tmppath}/%{name}-%{version}-build | ||||
| Requires:      jre >= 1.5.0 | ||||
| Requires:      servletapi5 tomcat5 sysvinit insserv identity-abstraction sed | ||||
| Requires:      servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j | ||||
| PreReq:        %fillup_prereq %insserv_prereq | ||||
| 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 | ||||
| @@ -161,6 +161,8 @@ install -m 600 Svc/templates/authtoken.settings %{buildroot}/etc/CASA/authtoken/ | ||||
| install -m 600 Svc/templates/identoken.settings %{buildroot}/etc/CASA/authtoken/svc/identoken.settings | ||||
| install -m 600 Svc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings %{buildroot}/etc/CASA/authtoken/svc/auth_mechanisms/Krb5Authenticate/mechanism.settings | ||||
| install -m 600 Svc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings %{buildroot}/etc/CASA/authtoken/svc/auth_mechanisms/PwdAuthenticate/mechanism.settings | ||||
| install -m 700 Svc/linux/envvars %{buildroot}/etc/CASA/authtoken/svc/envvars | ||||
| install -m 700 Svc/linux/log4j.properties %{buildroot}/etc/CASA/authtoken/svc/log4j.properties | ||||
|  | ||||
| # Others | ||||
| install -m 700 Svc/linux/server_keystore_setup.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/server_keystore_setup.sh | ||||
| @@ -170,7 +172,6 @@ install -m 700 Svc/linux/CasaAuthTokenSettingsEditor.sh %{buildroot}%{prefix}/sh | ||||
| install -m 700 Svc/linux/CasaIdenTokenSettingsEditor.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaIdenTokenSettingsEditor.sh | ||||
| install -m 700 Svc/linux/CasaSvcSettingsEditor.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaSvcSettingsEditor.sh | ||||
| install -m 755 Svc/linux/CasaAuthtokenSvcD %{buildroot}/etc/init.d/casa_atsd | ||||
| install -m 700 Svc/linux/envvars %{buildroot}/etc/CASA/authtoken/svc/envvars | ||||
|  | ||||
| # Tomcat Base files | ||||
| install -m 600 Svc/tomcat5/conf/catalina.policy %{buildroot}/srv/www/casaats/conf/catalina.policy | ||||
| @@ -240,7 +241,10 @@ fi | ||||
| %stop_on_removal casa_atsd | ||||
|  | ||||
| %postun | ||||
| %stop_on_update casa_atsd  | ||||
|  | ||||
| # Always undeploy our webapp to force re-deployment on upgrade cases | ||||
| echo "Cleaning up webapp folders" | ||||
| rm -drf /srv/www/casaats/webapps/CasaAuthTokenSvc | ||||
| rm -drf /srv/www/casaats/work/Catalina | ||||
| rm -f /srv/www/casaats/conf/server.xml | ||||
| @@ -311,6 +315,7 @@ fi | ||||
| %config /srv/www/casaats/conf/tomcat-users.xml | ||||
| %config /srv/www/casaats/conf/web.xml | ||||
| %config /etc/CASA/authtoken/svc/envvars | ||||
| %config /etc/CASA/authtoken/svc/log4j.properties | ||||
| /etc/CASA/authtoken/svc/templates/svc.settings | ||||
| /etc/CASA/authtoken/svc/templates/auth.policy | ||||
| /etc/CASA/authtoken/svc/templates/iaRealms.xml | ||||
|   | ||||
		Reference in New Issue
	
	Block a user