From 261b8bc1a4daae8c658c7ec53294ebde5d53e179 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Thu, 15 Mar 2007 17:27:46 +0000 Subject: [PATCH] Windows makefile changes for removing Axis dependency changes. --- CASA-auth-token/server-java/Svc/windows/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CASA-auth-token/server-java/Svc/windows/Makefile.am b/CASA-auth-token/server-java/Svc/windows/Makefile.am index b068991f..f9542aee 100644 --- a/CASA-auth-token/server-java/Svc/windows/Makefile.am +++ b/CASA-auth-token/server-java/Svc/windows/Makefile.am @@ -35,8 +35,8 @@ LIBDIR = $(ROOT)/$(LIB) IDENT_ABSTRACTION_DIR = $(BANDIT_DIR) BANDIT_EXTERN_DIR = $(BANDIT_DIR) #AXIS_JARS_DIR = $(PWD)/external -AXIS_JARS_DIR = ../external - +XMLSEC_JARS_DIR = ../external/xmlsec/xml-security-1_4_0/libs +XMLSEC_LICENSE = ../external/xmlsec/xml-security-1_4_0/LICENSE MANIFEST_DIR = ../manifest @@ -119,9 +119,7 @@ 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)/xml-apis.jar;$(AXIS_JARS_DIR)/xmlsec-1.2.1.jar;$(AXIS_JARS_DIR)/xercesImpl.jar -#AXIS_LIBS = $(AXIS_JARS_DIR)/wss4j-1.5.0.jar +XMLSEC_LIBS = $(XMLSEC_JARS_DIR)/xmlsec-1.4.0.jar LIBS = $(TOMCAT_DIR)/servlet-api.jar;../external/log4j-1.2.8.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) @@ -147,7 +145,9 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES) cp ../windows/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 $(AXIS_JARS_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ + 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_LICENSE) $(BUILDDIR)/webapp/WEB-INF/lib/ cp $(IDENT_ABSTRACTION_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ cp $(BANDIT_EXTERN_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ ls $(BUILDDIR)/webapp/WEB-INF/lib/