Removed the identity-abstraction files from the CasaAuthTokenSvc war
file to allow for the files to be deployed and updated separatedly.
This commit is contained in:
parent
eb90af6c4e
commit
f60d8d1cc6
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 20 09:53:55 MDT 2006 - jluciani@novell.com
|
||||||
|
|
||||||
|
- Modified the CasaAuthTokenSvc war file to no longer include the
|
||||||
|
identity-abstraction jars. The CASA_auth_token_svc rpm now requires
|
||||||
|
the installation of the identity-abstraction rpm and the service is
|
||||||
|
able to load its files from the location where they are installed
|
||||||
|
with settings set in the server.xml file of our tomcat base.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Oct 18 17:22:01 MDT 2006 - jluciani@novell.com
|
Wed Oct 18 17:22:01 MDT 2006 - jluciani@novell.com
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ Release: 0
|
|||||||
Summary: Novell Common Authentication Services Adapter Authentication Token Infrastructure "Java" (CASA_auth_token)
|
Summary: Novell Common Authentication Services Adapter Authentication Token Infrastructure "Java" (CASA_auth_token)
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Requires: java-1_5_0-ibm servletapi5 tomcat5 sysvinit insserv
|
Requires: java-1_5_0-ibm servletapi5 tomcat5 sysvinit insserv identity-abstraction
|
||||||
PreReq: %fillup_prereq %insserv_prereq
|
PreReq: %fillup_prereq %insserv_prereq
|
||||||
PreReq: /usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd
|
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
|
PreReq: /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent
|
||||||
@ -138,6 +138,9 @@ install -d -m 755 %{buildroot}/etc/CASA/authtoken/keys/client
|
|||||||
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
|
||||||
|
|
||||||
|
# Symbolic Links
|
||||||
|
ln -sf CasaAuthTokenSvc-%{bldno}.war %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaAuthTokenSvc.war
|
||||||
|
|
||||||
# Settings and configuration files
|
# Settings and configuration files
|
||||||
install -m 600 server/Svc/svc.settings %{buildroot}/etc/CASA/authtoken/svc/svc.settings
|
install -m 600 server/Svc/svc.settings %{buildroot}/etc/CASA/authtoken/svc/svc.settings
|
||||||
install -m 600 server/Svc/authtoken.settings %{buildroot}/etc/CASA/authtoken/svc/authtoken.settings
|
install -m 600 server/Svc/authtoken.settings %{buildroot}/etc/CASA/authtoken/svc/authtoken.settings
|
||||||
@ -179,6 +182,10 @@ install -m 755 server/Svc/external/xml-apis.jar %{buildroot}%{prefix}/share/java
|
|||||||
install -m 755 server/Svc/external/xmlsec-1.2.1.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar
|
install -m 755 server/Svc/external/xmlsec-1.2.1.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar
|
||||||
install -m 644 server/Jaas/linux/crypto.properties %{buildroot}/etc/CASA/authtoken/keys/client/crypto.properties
|
install -m 644 server/Jaas/linux/crypto.properties %{buildroot}/etc/CASA/authtoken/keys/client/crypto.properties
|
||||||
|
|
||||||
|
# Symbolic Links
|
||||||
|
ln -sf CasaJaasSupport-%{bldno}.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaJaasSupport.jar
|
||||||
|
ln -sf CasaAuthToken-%{bldno}.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaAuthToken.jar
|
||||||
|
|
||||||
# Others
|
# Others
|
||||||
install -m 700 server/Jaas/linux/client_keystore_setup.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/client_keystore_setup.sh
|
install -m 700 server/Jaas/linux/client_keystore_setup.sh %{buildroot}%{prefix}/share/java/CASA/authtoken/bin/client_keystore_setup.sh
|
||||||
|
|
||||||
@ -239,6 +246,7 @@ userdel casaatsd
|
|||||||
%dir /etc/CASA/authtoken
|
%dir /etc/CASA/authtoken
|
||||||
%dir /etc/CASA/authtoken/keys
|
%dir /etc/CASA/authtoken/keys
|
||||||
%{prefix}/share/java/CASA/authtoken/CasaAuthTokenSvc-%{bldno}.war
|
%{prefix}/share/java/CASA/authtoken/CasaAuthTokenSvc-%{bldno}.war
|
||||||
|
%{prefix}/share/java/CASA/authtoken/CasaAuthTokenSvc.war
|
||||||
%{prefix}/share/java/CASA/authtoken/bin/server_keystore_setup.sh
|
%{prefix}/share/java/CASA/authtoken/bin/server_keystore_setup.sh
|
||||||
/etc/init.d/casa_atsd
|
/etc/init.d/casa_atsd
|
||||||
%defattr(-,casaatsd,casaauth)
|
%defattr(-,casaatsd,casaauth)
|
||||||
@ -302,7 +310,9 @@ userdel casaatsd
|
|||||||
%dir /etc/CASA/authtoken/keys
|
%dir /etc/CASA/authtoken/keys
|
||||||
%dir /etc/CASA/authtoken/keys/client
|
%dir /etc/CASA/authtoken/keys/client
|
||||||
%{prefix}/share/java/CASA/authtoken/CasaJaasSupport-%{bldno}.jar
|
%{prefix}/share/java/CASA/authtoken/CasaJaasSupport-%{bldno}.jar
|
||||||
|
%{prefix}/share/java/CASA/authtoken/CasaJaasSupport.jar
|
||||||
%{prefix}/share/java/CASA/authtoken/CasaAuthToken-%{bldno}.jar
|
%{prefix}/share/java/CASA/authtoken/CasaAuthToken-%{bldno}.jar
|
||||||
|
%{prefix}/share/java/CASA/authtoken/CasaAuthToken.jar
|
||||||
%{prefix}/share/java/CASA/authtoken/bin/client_keystore_setup.sh
|
%{prefix}/share/java/CASA/authtoken/bin/client_keystore_setup.sh
|
||||||
%{prefix}/share/java/CASA/authtoken/external/axis.jar
|
%{prefix}/share/java/CASA/authtoken/external/axis.jar
|
||||||
%{prefix}/share/java/CASA/authtoken/external/axis-ant.jar
|
%{prefix}/share/java/CASA/authtoken/external/axis-ant.jar
|
||||||
|
@ -94,6 +94,10 @@ $(BUILDDIR)/%.class: %.java
|
|||||||
@echo [======== Compiling $@ ========]
|
@echo [======== Compiling $@ ========]
|
||||||
$(JAVAC) -g -sourcepath src -classpath $(CLASSPATH) -d $(BUILDDIR)/webapp/WEB-INF/classes $<
|
$(JAVAC) -g -sourcepath src -classpath $(CLASSPATH) -d $(BUILDDIR)/webapp/WEB-INF/classes $<
|
||||||
|
|
||||||
|
# The following two lines may need to be added below before we jar-up the war for builds where there is no identity-abstraction install
|
||||||
|
# cp $(IDENT_ABSTRACTION_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||||
|
# rm $(BUILDDIR)/webapp/WEB-INF/lib/identity-abstraction.jar
|
||||||
|
|
||||||
$(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES)
|
$(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES)
|
||||||
@echo [======== Creating Webapp $@ ========]
|
@echo [======== Creating Webapp $@ ========]
|
||||||
cp web.xml $(BUILDDIR)/webapp/WEB-INF/web.xml
|
cp web.xml $(BUILDDIR)/webapp/WEB-INF/web.xml
|
||||||
@ -103,8 +107,6 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES)
|
|||||||
cp linux/crypto.properties $(BUILDDIR)/webapp/WEB-INF/classes/crypto.properties
|
cp linux/crypto.properties $(BUILDDIR)/webapp/WEB-INF/classes/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 $(IDENT_ABSTRACTION_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
|
||||||
rm $(BUILDDIR)/webapp/WEB-INF/lib/identity-abstraction.jar
|
|
||||||
cp $(AXIS_JARS_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
cp $(AXIS_JARS_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||||
ls $(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 .
|
||||||
|
@ -54,4 +54,4 @@ server.loader=${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar
|
|||||||
# "foo/*.jar": Add all the JARs of the specified folder as class
|
# "foo/*.jar": Add all the JARs of the specified folder as class
|
||||||
# repositories
|
# repositories
|
||||||
# "foo/bar.jar": Add bar.jar as a class repository
|
# "foo/bar.jar": Add bar.jar as a class repository
|
||||||
shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
|
shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar,/usr/share/java/identity-abstraction/*.jar
|
||||||
|
Loading…
Reference in New Issue
Block a user