From 2cf31ee0dde78fa0a9b76932d11129565cca55c1 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Thu, 17 Jul 2008 19:39:06 +0000 Subject: [PATCH] More Java6 and Tomcat6 compatability updates. --- CASA-auth-token/server-java/Svc/Makefile.am | 2 +- .../server-java/Svc/linux/Makefile.am | 5 +++- .../server-java/Svc/tomcat6/conf/Makefile.am | 3 ++- .../Svc/tomcat6/conf/linux/Makefile.am | 5 ++-- .../Svc/tomcat6/conf/linux/server-ibm.xml | 2 +- .../tomcat6/conf/linux/server-pkcs12-ibm.xml | 2 +- .../tomcat6/conf/linux/server-pkcs12-sun.xml | 2 +- .../Svc/tomcat6/conf/{ => linux}/tomcat6.conf | 2 +- CASA-auth-token/server-java/configure.in | 4 +++ .../package/linux/CASA_auth_token_svc.spec.in | 27 ++++++++++++++++++- .../linux/CASA_auth_token_svc_4zen.spec.in | 2 +- 11 files changed, 45 insertions(+), 11 deletions(-) rename CASA-auth-token/server-java/Svc/tomcat6/conf/{ => linux}/tomcat6.conf (95%) diff --git a/CASA-auth-token/server-java/Svc/Makefile.am b/CASA-auth-token/server-java/Svc/Makefile.am index 6b75fe3c..377850ef 100644 --- a/CASA-auth-token/server-java/Svc/Makefile.am +++ b/CASA-auth-token/server-java/Svc/Makefile.am @@ -20,7 +20,7 @@ ####################################################################### SUBDIRS = src $(TARGET_OS) -DIST_SUBDIRS = src external tomcat5 linux manifest templates windows +DIST_SUBDIRS = src external tomcat5 tomcat6 linux manifest templates windows EXTRA_DIST = README \ TODO \ diff --git a/CASA-auth-token/server-java/Svc/linux/Makefile.am b/CASA-auth-token/server-java/Svc/linux/Makefile.am index f8d7902d..777ee981 100644 --- a/CASA-auth-token/server-java/Svc/linux/Makefile.am +++ b/CASA-auth-token/server-java/Svc/linux/Makefile.am @@ -177,9 +177,12 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES) cp ../linux/casa_crypto.properties $(BUILDDIR)/webapp/WEB-INF/classes/casa_crypto.properties cp ../src/com/novell/casa/authtoksvc/Krb5_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate/mechanism.settings cp ../src/com/novell/casa/authtoksvc/Pwd_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate/mechanism.settings - cp $(XMLSEC_JARS_DIR)/commons-logging.jar $(BUILDDIR)/webapp/WEB-INF/lib/ cp $(XMLSEC_JARS_DIR)/xmlsec-1.4.0.jar $(BUILDDIR)/webapp/WEB-INF/lib/ ls $(BUILDDIR)/webapp/WEB-INF/lib/ + jar cvf $(BUILDDIR)/$(WEBAPP).minus-commons-logging -C $(BUILDDIR)/webapp . + cp $(BUILDDIR)/$(WEBAPP).minus-commons-logging $(LIBDIR)/java/ + cp $(XMLSEC_JARS_DIR)/commons-logging.jar $(BUILDDIR)/webapp/WEB-INF/lib/ + ls $(BUILDDIR)/webapp/WEB-INF/lib/ jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp . cp $(BUILDDIR)/$(WEBAPP) $(LIBDIR)/java/ diff --git a/CASA-auth-token/server-java/Svc/tomcat6/conf/Makefile.am b/CASA-auth-token/server-java/Svc/tomcat6/conf/Makefile.am index 4b0edf6d..64e7d8c6 100644 --- a/CASA-auth-token/server-java/Svc/tomcat6/conf/Makefile.am +++ b/CASA-auth-token/server-java/Svc/tomcat6/conf/Makefile.am @@ -22,13 +22,14 @@ SUBDIRS = $(TARGET_OS) -DIST_SUBDIRS = Catalina linux windows +DIST_SUBDIRS = linux CFILES = EXTRA_DIST = catalina.policy \ catalina.properties \ jk2.properties \ + logging.properties \ server.xml \ server-minimal.xml \ tomcat-users.xml \ diff --git a/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/Makefile.am b/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/Makefile.am index 9641cf70..556212da 100644 --- a/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/Makefile.am +++ b/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/Makefile.am @@ -22,14 +22,15 @@ SUBDIRS = -DIST_SUBDIRS = zen +DIST_SUBDIRS = CFILES = EXTRA_DIST = server-ibm.xml \ server-sun.xml \ server-pkcs12-ibm.xml \ - server-pkcs12-sun.xml + server-pkcs12-sun.xml \ + tomcat6.conf .PHONY: package package-clean package-install package-uninstall package package-clean package-install package-uninstall: diff --git a/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-ibm.xml b/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-ibm.xml index cd522eee..50f47a9d 100644 --- a/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-ibm.xml +++ b/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-ibm.xml @@ -90,7 +90,7 @@ enableLookups="false" disableUploadTimeout="true" maxPostSize="16384" connectionTimeout="10000" acceptCount="300" debug="0" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" + SSLEnabled="true" clientAuth="false" sslProtocol="TLS" keystoreFile="/etc/CASA/authtoken/keys/server/jks-store" keystorePass="secret" algorithm="IbmX509" /> diff --git a/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-pkcs12-ibm.xml b/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-pkcs12-ibm.xml index 076454fc..cb5e60f7 100644 --- a/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-pkcs12-ibm.xml +++ b/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-pkcs12-ibm.xml @@ -90,7 +90,7 @@ enableLookups="false" disableUploadTimeout="true" maxPostSize="16384" connectionTimeout="10000" acceptCount="300" debug="0" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" + SSLEnabled="true" clientAuth="false" sslProtocol="TLS" keystoreFile="/etc/ssl/servercerts/keystore.p12" keystorePass="password" keystoreType="pkcs12" algorithm="IbmX509" /> diff --git a/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-pkcs12-sun.xml b/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-pkcs12-sun.xml index 63d16ce6..853d382f 100644 --- a/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-pkcs12-sun.xml +++ b/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-pkcs12-sun.xml @@ -90,7 +90,7 @@ enableLookups="false" disableUploadTimeout="true" maxPostSize="16384" connectionTimeout="10000" acceptCount="300" debug="0" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" + SSLEnabled="true" clientAuth="false" sslProtocol="TLS" keystoreFile="/etc/ssl/servercerts/keystore.p12" keystorePass="password" keystoreType="pkcs12" algorithm="SunX509" /> diff --git a/CASA-auth-token/server-java/Svc/tomcat6/conf/tomcat6.conf b/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/tomcat6.conf similarity index 95% rename from CASA-auth-token/server-java/Svc/tomcat6/conf/tomcat6.conf rename to CASA-auth-token/server-java/Svc/tomcat6/conf/linux/tomcat6.conf index 97e4075c..f12d1abc 100644 --- a/CASA-auth-token/server-java/Svc/tomcat6/conf/tomcat6.conf +++ b/CASA-auth-token/server-java/Svc/tomcat6/conf/linux/tomcat6.conf @@ -5,7 +5,7 @@ #CATALINA_BASE="/usr/share/tomcat6" #CATALINA_HOME="/usr/share/tomcat6" JASPER_HOME="/usr/share/tomcat6" -CATALINA_TMPDIR="/var/tmp/tomcat6" +CATALINA_TMPDIR="/var/lib/CASA/authtoken/svc" # You can pass some parameters to java here if you wish to #JAVA_OPTS="-Xminf0.1 -Xmaxf0.3" diff --git a/CASA-auth-token/server-java/configure.in b/CASA-auth-token/server-java/configure.in index d17b0dbe..ccd030e8 100644 --- a/CASA-auth-token/server-java/configure.in +++ b/CASA-auth-token/server-java/configure.in @@ -292,6 +292,10 @@ Svc/tomcat5/conf/Catalina/localhost/Makefile Svc/tomcat5/conf/linux/Makefile Svc/tomcat5/conf/linux/zen/Makefile Svc/tomcat5/conf/windows/Makefile +Svc/tomcat6/Makefile +Svc/tomcat6/conf/Makefile +Svc/tomcat6/conf/linux/Makefile +Svc/tomcat6/conf/windows/Makefile Svc/linux/Makefile Svc/templates/Makefile Svc/templates/windows/Makefile diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in index 922f0d06..af6e8bb2 100644 --- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in +++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in @@ -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 ## diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in index c36dd358..f2b7a7a4 100644 --- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in +++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in @@ -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