More Java6 and Tomcat6 compatability updates.

This commit is contained in:
Juan Carlos Luciani
2008-07-17 19:39:06 +00:00
parent a4689eea3f
commit 2cf31ee0dd
11 changed files with 45 additions and 11 deletions

View File

@@ -72,7 +72,7 @@ tokens that can later be used by applications to authenticate the entity or
services that are CASA authentication enabled.
%package -n CASA_auth_token_jaas_support
License: LGPL v2.1 or later
License: LGPL v2.1 or later
Summary: Novell CASA Authentication Token JAAS Support Components
Group: Applications/System
Requires: jre >= 1.5.0
@@ -160,8 +160,13 @@ install -d -m 755 %{buildroot}/etc/CASA/authtoken/keys/client
## CASA_auth_token_svc ##
# Libs
%if %suse_version > 1030
install -m 755 %{_lib}/java/CasaAuthTokenSvc.war.minus-commons-logging %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaAuthTokenSvc-%{bldno}.war
install -m 700 %{_lib}/java/CasaAuthTokenSvc.war.minus-commons-logging %{buildroot}/srv/www/casaats/webapps/CasaAuthTokenSvc.war
%else
install -m 755 %{_lib}/java/CasaAuthTokenSvc.war %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaAuthTokenSvc-%{bldno}.war
install -m 700 %{_lib}/java/CasaAuthTokenSvc.war %{buildroot}/srv/www/casaats/webapps/CasaAuthTokenSvc.war
%endif
install -m 755 %{_lib}/java/CasaAuthTokenSettingsEditor.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaAuthTokenSettingsEditor-%{bldno}.jar
install -m 755 %{_lib}/java/CasaIdenTokenSettingsEditor.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaIdenTokenSettingsEditor-%{bldno}.jar
install -m 755 %{_lib}/java/CasaSvcSettingsEditor.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaSvcSettingsEditor-%{bldno}.jar
@@ -190,6 +195,9 @@ install -m 600 Svc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings %{build
install -m 700 Svc/linux/envvars %{buildroot}/etc/CASA/authtoken/svc/envvars
install -m 700 Svc/linux/casaats.conf %{buildroot}/etc/CASA/authtoken/svc/casaats.conf
install -m 700 Svc/linux/log4j.properties %{buildroot}/etc/CASA/authtoken/svc/log4j.properties
%if %suse_version > 1030
install -m 700 Svc/tomcat6/conf/linux/tomcat6.conf %{buildroot}/etc/CASA/authtoken/svc/tomcat6.conf
%endif
# Others
install -m 700 Svc/linux/server_keystore_setup.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/server_keystore_setup.sh
@@ -206,6 +214,18 @@ install -m 700 Svc/linux/CasaIsWebServerAvailable.sh %{buildroot}%{prefix}/share
install -m 755 Svc/linux/CasaAuthtokenSvcD %{buildroot}/etc/init.d/casa_atsd
# Tomcat Base files
%if %suse_version > 1030
install -m 600 Svc/tomcat6/conf/catalina.policy %{buildroot}/srv/www/casaats/conf/catalina.policy
install -m 600 Svc/tomcat6/conf/catalina.properties %{buildroot}/srv/www/casaats/conf/catalina.properties
install -m 600 Svc/tomcat6/conf/jk2.properties %{buildroot}/srv/www/casaats/conf/jk2.properties
install -m 600 Svc/tomcat6/conf/logging.properties %{buildroot}/srv/www/casaats/conf/logging.properties
install -m 600 Svc/tomcat6/conf/linux/server-ibm.xml %{buildroot}/srv/www/casaats/conf/server-ibm.xml
install -m 600 Svc/tomcat6/conf/linux/server-pkcs12-ibm.xml %{buildroot}/srv/www/casaats/conf/server-pkcs12-ibm.xml
install -m 600 Svc/tomcat6/conf/linux/server-sun.xml %{buildroot}/srv/www/casaats/conf/server-sun.xml
install -m 600 Svc/tomcat6/conf/linux/server-pkcs12-sun.xml %{buildroot}/srv/www/casaats/conf/server-pkcs12-sun.xml
install -m 600 Svc/tomcat6/conf/tomcat-users.xml %{buildroot}/srv/www/casaats/conf/tomcat-users.xml
install -m 600 Svc/tomcat6/conf/web.xml %{buildroot}/srv/www/casaats/conf/web.xml
%else
install -m 600 Svc/tomcat5/conf/catalina.policy %{buildroot}/srv/www/casaats/conf/catalina.policy
install -m 600 Svc/tomcat5/conf/catalina.properties %{buildroot}/srv/www/casaats/conf/catalina.properties
install -m 600 Svc/tomcat5/conf/jk2.properties %{buildroot}/srv/www/casaats/conf/jk2.properties
@@ -215,6 +235,7 @@ install -m 600 Svc/tomcat5/conf/linux/server-sun.xml %{buildroot}/srv/www/casaat
install -m 600 Svc/tomcat5/conf/linux/server-pkcs12-sun.xml %{buildroot}/srv/www/casaats/conf/server-pkcs12-sun.xml
install -m 600 Svc/tomcat5/conf/tomcat-users.xml %{buildroot}/srv/www/casaats/conf/tomcat-users.xml
install -m 600 Svc/tomcat5/conf/web.xml %{buildroot}/srv/www/casaats/conf/web.xml
%endif
## CASA_auth_token_jaas_support ##
# Libs
@@ -350,6 +371,10 @@ rm -f /srv/www/casaats/conf/server.xml
%config /etc/CASA/authtoken/svc/identoken.settings
%config /etc/CASA/authtoken/svc/auth_mechanisms/Krb5Authenticate/mechanism.settings
%config /etc/CASA/authtoken/svc/auth_mechanisms/PwdAuthenticate/mechanism.settings
%if %suse_version > 1030
%config /etc/CASA/authtoken/svc/tomcat6.conf
%config /srv/www/casaats/conf/logging.properties
%endif
## CASA_auth_token_jaas_support ##

View File

@@ -183,7 +183,7 @@ 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 700 Svc/linux/CasaIsWebServerAvailable.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/CasaIsWebServerAvailable.sh
install -m 755 Svc/linux/CasaAuthtokenSvcD %{buildroot}/etc/init.d/casa_atsd
install -m 755 Svc/linux/CasaAuthtokenSvcD.zen %{buildroot}/etc/init.d/casa_atsd
# Tomcat Base files
install -m 600 Svc/tomcat5/conf/catalina.policy %{buildroot}/srv/www/casaats/conf/catalina.policy