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

More Java6 and Tomcat6 compatability updates.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CASA-auth-token/server-java/Svc/Makefile.am
View File

@ -20,7 +20,7 @@
####################################################################### #######################################################################
SUBDIRS = src $(TARGET_OS) 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 \ EXTRA_DIST = README \
TODO \ TODO \

5
CASA-auth-token/server-java/Svc/linux/Makefile.am
View File

@ -177,9 +177,12 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES)
cp ../linux/casa_crypto.properties $(BUILDDIR)/webapp/WEB-INF/classes/casa_crypto.properties 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/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 ../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/ cp $(XMLSEC_JARS_DIR)/xmlsec-1.4.0.jar $(BUILDDIR)/webapp/WEB-INF/lib/
ls $(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 . jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp .
cp $(BUILDDIR)/$(WEBAPP) $(LIBDIR)/java/ cp $(BUILDDIR)/$(WEBAPP) $(LIBDIR)/java/

3
CASA-auth-token/server-java/Svc/tomcat6/conf/Makefile.am
View File

@ -22,13 +22,14 @@
SUBDIRS = $(TARGET_OS) SUBDIRS = $(TARGET_OS)
DIST_SUBDIRS = Catalina linux windows DIST_SUBDIRS = linux
CFILES = CFILES =
EXTRA_DIST = catalina.policy \ EXTRA_DIST = catalina.policy \
catalina.properties \ catalina.properties \
jk2.properties \ jk2.properties \
logging.properties \
server.xml \ server.xml \
server-minimal.xml \ server-minimal.xml \
tomcat-users.xml \ tomcat-users.xml \

5
CASA-auth-token/server-java/Svc/tomcat6/conf/linux/Makefile.am
View File

@ -22,14 +22,15 @@
SUBDIRS = SUBDIRS =
DIST_SUBDIRS = zen DIST_SUBDIRS =
CFILES = CFILES =
EXTRA_DIST = server-ibm.xml \ EXTRA_DIST = server-ibm.xml \
server-sun.xml \ server-sun.xml \
server-pkcs12-ibm.xml \ server-pkcs12-ibm.xml \
server-pkcs12-sun.xml server-pkcs12-sun.xml \
tomcat6.conf
.PHONY: package package-clean package-install package-uninstall .PHONY: package package-clean package-install package-uninstall
package package-clean package-install package-uninstall: package package-clean package-install package-uninstall:

2
CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-ibm.xml
View File

@ -90,7 +90,7 @@
enableLookups="false" disableUploadTimeout="true" enableLookups="false" disableUploadTimeout="true"
maxPostSize="16384" connectionTimeout="10000" maxPostSize="16384" connectionTimeout="10000"
acceptCount="300" debug="0" scheme="https" secure="true" 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" keystoreFile="/etc/CASA/authtoken/keys/server/jks-store"
keystorePass="secret" algorithm="IbmX509" /> keystorePass="secret" algorithm="IbmX509" />
<!-- SSL_CONNECTOR_END --> <!-- SSL_CONNECTOR_END -->

2
CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-pkcs12-ibm.xml
View File

@ -90,7 +90,7 @@
enableLookups="false" disableUploadTimeout="true" enableLookups="false" disableUploadTimeout="true"
maxPostSize="16384" connectionTimeout="10000" maxPostSize="16384" connectionTimeout="10000"
acceptCount="300" debug="0" scheme="https" secure="true" acceptCount="300" debug="0" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" SSLEnabled="true" clientAuth="false" sslProtocol="TLS"
keystoreFile="/etc/ssl/servercerts/keystore.p12" keystoreFile="/etc/ssl/servercerts/keystore.p12"
keystorePass="password" keystoreType="pkcs12" algorithm="IbmX509" /> keystorePass="password" keystoreType="pkcs12" algorithm="IbmX509" />
<!-- SSL_CONNECTOR_END --> <!-- SSL_CONNECTOR_END -->

2
CASA-auth-token/server-java/Svc/tomcat6/conf/linux/server-pkcs12-sun.xml
View File

@ -90,7 +90,7 @@
enableLookups="false" disableUploadTimeout="true" enableLookups="false" disableUploadTimeout="true"
maxPostSize="16384" connectionTimeout="10000" maxPostSize="16384" connectionTimeout="10000"
acceptCount="300" debug="0" scheme="https" secure="true" acceptCount="300" debug="0" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" SSLEnabled="true" clientAuth="false" sslProtocol="TLS"
keystoreFile="/etc/ssl/servercerts/keystore.p12" keystoreFile="/etc/ssl/servercerts/keystore.p12"
keystorePass="password" keystoreType="pkcs12" algorithm="SunX509" /> keystorePass="password" keystoreType="pkcs12" algorithm="SunX509" />
<!-- SSL_CONNECTOR_END --> <!-- SSL_CONNECTOR_END -->

2
CASA-auth-token/server-java/Svc/tomcat6/conf/tomcat6.conf → CASA-auth-token/server-java/Svc/tomcat6/conf/linux/tomcat6.conf
View File

@ -5,7 +5,7 @@
#CATALINA_BASE="/usr/share/tomcat6" #CATALINA_BASE="/usr/share/tomcat6"
#CATALINA_HOME="/usr/share/tomcat6" #CATALINA_HOME="/usr/share/tomcat6"
JASPER_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 # You can pass some parameters to java here if you wish to
#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3" #JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"

4
CASA-auth-token/server-java/configure.in
View File

@ -292,6 +292,10 @@ Svc/tomcat5/conf/Catalina/localhost/Makefile
Svc/tomcat5/conf/linux/Makefile Svc/tomcat5/conf/linux/Makefile
Svc/tomcat5/conf/linux/zen/Makefile Svc/tomcat5/conf/linux/zen/Makefile
Svc/tomcat5/conf/windows/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/linux/Makefile
Svc/templates/Makefile Svc/templates/Makefile
Svc/templates/windows/Makefile Svc/templates/windows/Makefile

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

@ -160,8 +160,13 @@ install -d -m 755 %{buildroot}/etc/CASA/authtoken/keys/client
## CASA_auth_token_svc ## ## CASA_auth_token_svc ##
# Libs # 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 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 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/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/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 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/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/casaats.conf %{buildroot}/etc/CASA/authtoken/svc/casaats.conf
install -m 700 Svc/linux/log4j.properties %{buildroot}/etc/CASA/authtoken/svc/log4j.properties 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 # Others
install -m 700 Svc/linux/server_keystore_setup.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/server_keystore_setup.sh 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 install -m 755 Svc/linux/CasaAuthtokenSvcD %{buildroot}/etc/init.d/casa_atsd
# Tomcat Base files # 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.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/catalina.properties %{buildroot}/srv/www/casaats/conf/catalina.properties
install -m 600 Svc/tomcat5/conf/jk2.properties %{buildroot}/srv/www/casaats/conf/jk2.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/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/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 install -m 600 Svc/tomcat5/conf/web.xml %{buildroot}/srv/www/casaats/conf/web.xml
%endif
## CASA_auth_token_jaas_support ## ## CASA_auth_token_jaas_support ##
# Libs # 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/identoken.settings
%config /etc/CASA/authtoken/svc/auth_mechanisms/Krb5Authenticate/mechanism.settings %config /etc/CASA/authtoken/svc/auth_mechanisms/Krb5Authenticate/mechanism.settings
%config /etc/CASA/authtoken/svc/auth_mechanisms/PwdAuthenticate/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 ## ## CASA_auth_token_jaas_support ##

2
CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in
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/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/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 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 # Tomcat Base files
install -m 600 Svc/tomcat5/conf/catalina.policy %{buildroot}/srv/www/casaats/conf/catalina.policy install -m 600 Svc/tomcat5/conf/catalina.policy %{buildroot}/srv/www/casaats/conf/catalina.policy