More Java6 and Tomcat6 compatability updates.
This commit is contained in:
@@ -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 \
|
||||
|
||||
@@ -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/
|
||||
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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" />
|
||||
<!-- SSL_CONNECTOR_END -->
|
||||
|
||||
@@ -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" />
|
||||
<!-- SSL_CONNECTOR_END -->
|
||||
|
||||
@@ -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" />
|
||||
<!-- SSL_CONNECTOR_END -->
|
||||
|
||||
@@ -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"
|
||||
Reference in New Issue
Block a user