Changes to allow project to build under Windows given the changes that have been made to remove Axis dependency.
This commit is contained in:
@@ -33,10 +33,9 @@ ROOT = ../..
|
||||
LIBDIR = $(ROOT)/$(LIB)
|
||||
|
||||
IDENT_ABSTRACTION_DIR = $(BANDIT_DIR)
|
||||
BANDIT_EXTERN_DIR = $(BANDIT_DIR)
|
||||
#AXIS_JARS_DIR = $(PWD)/external
|
||||
XMLSEC_JARS_DIR = ../external/xmlsec/xml-security-1_4_0/libs
|
||||
XMLSEC_LICENSE = ../external/xmlsec/xml-security-1_4_0/LICENSE
|
||||
LOG4J_JARS_DIR = ../external/log4j/logging-log4j-1.2.14/dist/lib
|
||||
|
||||
MANIFEST_DIR = ../manifest
|
||||
|
||||
@@ -119,9 +118,7 @@ AUTH_POLICY_EDITOR = $(AUTH_POLICY_EDITOR_MODULE_NAME).$(MODULE_EXT)
|
||||
|
||||
CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
|
||||
|
||||
XMLSEC_LIBS = $(XMLSEC_JARS_DIR)/xmlsec-1.4.0.jar
|
||||
|
||||
LIBS = $(TOMCAT_DIR)/servlet-api.jar;../external/log4j-1.2.8.jar
|
||||
LIBS = $(TOMCAT_DIR)/servlet-api.jar;$(LOG4J_JARS_DIR)/log4j-1.2.14.jar;$(XMLSEC_JARS_DIR)/xmlsec-1.4.0.jar;$(XMLSEC_JARS_DIR)/xercesImpl.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)
|
||||
|
||||
CUR_DIR := $(shell pwd)
|
||||
@@ -146,10 +143,17 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES)
|
||||
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)/xercesImpl.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/
|
||||
cp $(LOG4J_JARS_DIR)/log4j-1.2.14.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
cp $(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
cp $(IDENT_ABSTRACTION_DIR)/bandit-util.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
cp $(IDENT_ABSTRACTION_DIR)/castor-1.0.4.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
cp $(IDENT_ABSTRACTION_DIR)/ldap.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
cp $(IDENT_ABSTRACTION_DIR)/sunxacml-exp.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
cp $(IDENT_ABSTRACTION_DIR)/sunxacml-support-exp.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
cp $(IDENT_ABSTRACTION_DIR)/dom4j-1.6.1.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
cp $(IDENT_ABSTRACTION_DIR)/jaxen-1.1-beta-12.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
ls $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||
jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp .
|
||||
echo "LIBDIR = $(LIBDIR)"
|
||||
|
||||
Reference in New Issue
Block a user