Continuation of changes to remove Axis dependency.
This commit is contained in:
Juan Carlos Luciani
parent
c5912db983
commit
902d44e6de
@ -22,7 +22,7 @@
|
||||
|
||||
SUBDIRS =
|
||||
|
||||
DIST_SUBDIRS =
|
||||
DIST_SUBDIRS = xmlsec
|
||||
|
||||
CFILES =
|
||||
|
||||
|
||||
@ -43,7 +43,7 @@ ROOT = ../..
|
||||
LIBDIR = $(ROOT)/$(LIB)
|
||||
|
||||
IDENT_ABSTRACTION_DIR = /usr/share/java/identity-abstraction
|
||||
AXIS_JARS_DIR = ../external
|
||||
XMLSEC_JARS_DIR = ../external/xmlsec/xml-security-1_4_0/libs
|
||||
|
||||
MANIFEST_DIR = ../manifest
|
||||
|
||||
@ -65,7 +65,6 @@ JAVAFILES = ../src/com/novell/casa/authtoksvc/ProtoDefs.java \
|
||||
../src/com/novell/casa/authtoksvc/AuthTokenConfig.java \
|
||||
../src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java \
|
||||
../src/com/novell/casa/authtoksvc/AuthMechanism.java \
|
||||
../src/com/novell/casa/authtoksvc/WSSecurity.java \
|
||||
../src/com/novell/casa/authtoksvc/SessionToken.java \
|
||||
../src/com/novell/casa/authtoksvc/Authenticate.java \
|
||||
../src/com/novell/casa/authtoksvc/RpcMethod.java \
|
||||
@ -91,6 +90,7 @@ JAVAFILES = ../src/com/novell/casa/authtoksvc/ProtoDefs.java \
|
||||
../src/com/novell/casa/authtoksvc/AuthTokenSettingsEditor.java \
|
||||
../src/com/novell/casa/authtoksvc/IdenTokenSettingsEditor.java \
|
||||
../src/com/novell/casa/authtoksvc/RealmsInfo.java \
|
||||
../src/com/novell/casa/authtoksvc/SecureTokenUtil.java \
|
||||
../src/com/novell/casa/authtoksvc/SvcSettingsEditor.java
|
||||
|
||||
BUILDDIR = ../build
|
||||
@ -126,12 +126,10 @@ AUTH_POLICY_EDITOR = $(AUTH_POLICY_EDITOR_MODULE_NAME).$(MODULE_EXT)
|
||||
|
||||
CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
|
||||
|
||||
#AXIS_LIBS = $(AXIS_JARS_DIR)/axis.jar:$(AXIS_JARS_DIR)/axis-ant.jar:$(AXIS_JARS_DIR)/commons-discovery-0.2.jar:$(AXIS_JARS_DIR)/commons-logging-1.0.4.jar:$(AXIS_JARS_DIR)/commons-logging-api.jar:$(AXIS_JARS_DIR)/jaxrpc.jar:$(AXIS_JARS_DIR)/log4j-1.2.8.jar:$(AXIS_JARS_DIR)/saaj.jar:$(AXIS_JARS_DIR)/wsdl4j-1.5.1.jar:$(AXIS_JARS_DIR)/wss4j-1.5.0.jar:$(AXIS_JARS_DIR)/xalan.jar:$(AXIS_JARS_DIR)/xercesImpl.jar:$(AXIS_JARS_DIR)/xml-apis.jar:$(AXIS_JARS_DIR)/xmlsec-1.2.1.jar
|
||||
AXIS_LIBS = $(AXIS_JARS_DIR)/axis.jar:$(AXIS_JARS_DIR)/saaj.jar:$(AXIS_JARS_DIR)/wss4j-1.5.0.jar:$(AXIS_JARS_DIR)/xmlsec-1.2.1.jar
|
||||
#AXIS_LIBS = $(AXIS_JARS_DIR)/wss4j-1.5.0.jar
|
||||
XMLSEC_LIBS = $(XMLSEC_JARS_DIR)/xmlsec-1.4.0.jar
|
||||
|
||||
LIBS = /usr/share/java/servletapi5.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/log4j.jar
|
||||
CLASSPATH = $(AXIS_LIBS):$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(IDENT_ABSTRACTION_DIR)/bandit-util.jar:$(IDENT_ABSTRACTION_DIR)/castor-1.0.4.jar:$(LIBS)
|
||||
LIBS = /usr/share/java/servletapi5.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/log4j.jar:/usr/share/java/commons-logging.jar:/usr/share/java/xalan-j2.jar
|
||||
CLASSPATH = $(XMLSEC_LIBS):$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(IDENT_ABSTRACTION_DIR)/bandit-util.jar:$(IDENT_ABSTRACTION_DIR)/castor-1.0.4.jar:$(LIBS)
|
||||
|
||||
CUR_DIR := $(shell pwd)
|
||||
|
||||
@ -154,9 +152,7 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES)
|
||||
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/Pwd_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate/mechanism.settings
|
||||
cp $(AXIS_JARS_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
rm $(BUILDDIR)/webapp/WEB-INF/lib/xercesImpl.jar
|
||||
rm $(BUILDDIR)/webapp/WEB-INF/lib/log4j-1.2.8.jar
|
||||
cp $(XMLSEC_JARS_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
ls $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp .
|
||||
cp $(BUILDDIR)/$(WEBAPP) $(LIBDIR)/java/
|
||||
|
||||
@ -49,7 +49,6 @@ JAVAFILES = ProtoDefs.java \
|
||||
Krb5Authenticate.java \
|
||||
PwdAuthenticate.java \
|
||||
SessionToken.java \
|
||||
WSSecurity.java \
|
||||
AuthPolicyEditor.java \
|
||||
AuthTokenSettingsEditor.java \
|
||||
IdenTokenSettingsEditor.java \
|
||||
@ -57,7 +56,8 @@ JAVAFILES = ProtoDefs.java \
|
||||
SettingsFileUtil.java \
|
||||
SettingsFileSAXHandler.java \
|
||||
RealmsInfo.java \
|
||||
SvcSettingsEditor.java
|
||||
SvcSettingsEditor.java \
|
||||
SecureTokenUtil.java
|
||||
|
||||
EXTRA_DIST = $(JAVAFILES) \
|
||||
Krb5_mechanism.settings \
|
||||
|
||||
@ -58,7 +58,6 @@ JAVAFILES = ../src/com/novell/casa/authtoksvc/ProtoDefs.java \
|
||||
../src/com/novell/casa/authtoksvc/AuthTokenConfig.java \
|
||||
../src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java \
|
||||
../src/com/novell/casa/authtoksvc/AuthMechanism.java \
|
||||
../src/com/novell/casa/authtoksvc/WSSecurity.java \
|
||||
../src/com/novell/casa/authtoksvc/SessionToken.java \
|
||||
../src/com/novell/casa/authtoksvc/Authenticate.java \
|
||||
../src/com/novell/casa/authtoksvc/RpcMethod.java \
|
||||
@ -84,6 +83,7 @@ JAVAFILES = ../src/com/novell/casa/authtoksvc/ProtoDefs.java \
|
||||
../src/com/novell/casa/authtoksvc/AuthTokenSettingsEditor.java \
|
||||
../src/com/novell/casa/authtoksvc/IdenTokenSettingsEditor.java \
|
||||
../src/com/novell/casa/authtoksvc/RealmsInfo.java \
|
||||
../src/com/novell/casa/authtoksvc/SecureTokenUtil.java \
|
||||
../src/com/novell/casa/authtoksvc/SvcSettingsEditor.java
|
||||
|
||||
BUILDDIR = ../build
|
||||
|
||||
@ -279,6 +279,9 @@ package/windows/UpdateWarFile/Makefile
|
||||
package/windows/server-java_msi/Makefile
|
||||
Svc/Makefile
|
||||
Svc/external/Makefile
|
||||
Svc/external/xmlsec/Makefile
|
||||
Svc/external/xmlsec/xml-security-1_4_0/Makefile
|
||||
Svc/external/xmlsec/xml-security-1_4_0/libs/Makefile
|
||||
Svc/src/Makefile
|
||||
Svc/src/com/Makefile
|
||||
Svc/src/com/novell/Makefile
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
Name: @PACKAGE@
|
||||
URL: http://www.novell.com/products
|
||||
BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit xerces-j2 xml-commons-apis
|
||||
BuildRequires: java-sdk-1.5.0 update-alternatives log4j
|
||||
BuildRequires: java-sdk-1.5.0 update-alternatives log4j xalan-j2 jakarta-commons-logging
|
||||
%define prefix /usr
|
||||
License: LGPL
|
||||
Group: Applications/System
|
||||
@ -30,7 +30,7 @@ Summary: Novell CASA Authentication Token Service
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: jre >= 1.5.0
|
||||
Requires: servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j
|
||||
Requires: servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j xalan-j2 jakarta-commons-logging
|
||||
PreReq: %fillup_prereq %insserv_prereq
|
||||
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
|
||||
@ -56,7 +56,7 @@ services that are CASA authentication enabled.
|
||||
Summary: Novell CASA Authentication Token JAAS Support Components
|
||||
Group: Applications/System
|
||||
Requires: jre >= 1.5.0
|
||||
Requires: log4j
|
||||
Requires: log4j xalan-j2 jakarta-commons-logging
|
||||
|
||||
%description -n CASA_auth_token_jaas_support
|
||||
CASA_auth_token is an authentication token infrastructure with support for
|
||||
@ -187,21 +187,7 @@ install -m 600 Svc/tomcat5/conf/web.xml %{buildroot}/srv/www/casaats/conf/web.xm
|
||||
# Libs
|
||||
install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaJaasSupport-%{bldno}.jar
|
||||
install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/CasaAuthToken-%{bldno}.jar
|
||||
install -m 755 Svc/external/axis.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/axis.jar
|
||||
install -m 755 Svc/external/axis-ant.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/axis-ant.jar
|
||||
install -m 755 Svc/external/commons-discovery-0.2.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/commons-discovery-0.2.jar
|
||||
install -m 755 Svc/external/commons-logging-1.0.4.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/commons-logging-1.0.4.jar
|
||||
install -m 755 Svc/external/commons-logging-api.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/commons-logging-api.jar
|
||||
install -m 755 Svc/external/jaxrpc.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/jaxrpc.jar
|
||||
install -m 755 Svc/external/log4j.properties %{buildroot}%{prefix}/share/java/CASA/authtoken/external/log4j.properties
|
||||
install -m 755 Svc/external/log4j-1.2.8.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/log4j-1.2.8.jar
|
||||
install -m 755 Svc/external/saaj.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/saaj.jar
|
||||
install -m 755 Svc/external/wsdl4j-1.5.1.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/wsdl4j-1.5.1.jar
|
||||
install -m 755 Svc/external/wss4j-1.5.0.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/wss4j-1.5.0.jar
|
||||
install -m 755 Svc/external/xalan.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xalan.jar
|
||||
install -m 755 Svc/external/xercesImpl.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xercesImpl.jar
|
||||
install -m 755 Svc/external/xml-apis.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xml-apis.jar
|
||||
install -m 755 Svc/external/xmlsec-1.2.1.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar
|
||||
install -m 755 Svc/external/xmlsec/xml-security-1_4_0/libs/xmlsec-1.4.0.jar %{buildroot}%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.4.0.jar
|
||||
install -m 644 Jaas/linux/crypto.properties %{buildroot}/etc/CASA/authtoken/keys/client/crypto.properties
|
||||
|
||||
# Symbolic Links
|
||||
@ -352,21 +338,7 @@ rm -f /srv/www/casaats/conf/server.xml
|
||||
%{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/external/axis.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/axis-ant.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/commons-discovery-0.2.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/commons-logging-1.0.4.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/commons-logging-api.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/jaxrpc.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/log4j.properties
|
||||
%{prefix}/share/java/CASA/authtoken/external/log4j-1.2.8.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/saaj.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/wsdl4j-1.5.1.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/wss4j-1.5.0.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/xalan.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/xercesImpl.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/xml-apis.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar
|
||||
%{prefix}/share/java/CASA/authtoken/external/xmlsec-1.4.0.jar
|
||||
%config /etc/CASA/authtoken/keys/client/crypto.properties
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user