More changes for the addition of the jakarta-commons-lang external dependency.
This commit is contained in:
parent
fbc58efaba
commit
71a80df32a
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
DIST_SUBDIRS = xmlsec log4j
|
DIST_SUBDIRS = xmlsec log4j commons-jakarta-lang
|
||||||
|
|
||||||
CFILES =
|
CFILES =
|
||||||
|
|
||||||
|
@ -36,6 +36,7 @@ IDENT_ABSTRACTION_DIR = $(BANDIT_DIR)
|
|||||||
XMLSEC_JARS_DIR = ../external/xmlsec/xml-security-1_4_0/libs
|
XMLSEC_JARS_DIR = ../external/xmlsec/xml-security-1_4_0/libs
|
||||||
XMLSEC_LICENSE = ../external/xmlsec/xml-security-1_4_0/LICENSE
|
XMLSEC_LICENSE = ../external/xmlsec/xml-security-1_4_0/LICENSE
|
||||||
LOG4J_JARS_DIR = ../external/log4j/logging-log4j-1.2.14/dist/lib
|
LOG4J_JARS_DIR = ../external/log4j/logging-log4j-1.2.14/dist/lib
|
||||||
|
COMMONS_LANG_JARS_DIR = ../external/jakarta-commons-lang/commons-lang-2.3
|
||||||
|
|
||||||
MANIFEST_DIR = ../manifest
|
MANIFEST_DIR = ../manifest
|
||||||
|
|
||||||
@ -118,7 +119,7 @@ AUTH_POLICY_EDITOR = $(AUTH_POLICY_EDITOR_MODULE_NAME).$(MODULE_EXT)
|
|||||||
|
|
||||||
CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
|
CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
|
||||||
|
|
||||||
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;$(CASA32_SDK_DIR)/lib/miCASA.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;$(CASA32_SDK_DIR)/lib/miCASA.jar;$(COMMONS_LANG_JARS_DIR)/commons-lang-2.3.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)
|
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)
|
CUR_DIR := $(shell pwd)
|
||||||
@ -146,6 +147,7 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES)
|
|||||||
cp $(XMLSEC_JARS_DIR)/xercesImpl.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_JARS_DIR)/xmlsec-1.4.0.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||||
cp $(LOG4J_JARS_DIR)/log4j-1.2.14.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
cp $(LOG4J_JARS_DIR)/log4j-1.2.14.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||||
|
cp $(COMMONS_LANG_JARS_DIR)/commons-lang-2.3.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||||
cp $(IDENT_ABSTRACTION_DIR)/identity-abstraction.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)/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)/castor-1.0.4.jar $(BUILDDIR)/webapp/WEB-INF/lib/
|
||||||
|
@ -280,6 +280,8 @@ Svc/external/log4j/Makefile
|
|||||||
Svc/external/log4j/logging-log4j-1.2.14/Makefile
|
Svc/external/log4j/logging-log4j-1.2.14/Makefile
|
||||||
Svc/external/log4j/logging-log4j-1.2.14/dist/Makefile
|
Svc/external/log4j/logging-log4j-1.2.14/dist/Makefile
|
||||||
Svc/external/log4j/logging-log4j-1.2.14/dist/lib/Makefile
|
Svc/external/log4j/logging-log4j-1.2.14/dist/lib/Makefile
|
||||||
|
Svc/external/jakarta-commons-lang/Makefile
|
||||||
|
Svc/external/jakarta-commons-lang/commons-lang-2.3/Makefile
|
||||||
Svc/src/Makefile
|
Svc/src/Makefile
|
||||||
Svc/src/com/Makefile
|
Svc/src/com/Makefile
|
||||||
Svc/src/com/novell/Makefile
|
Svc/src/com/novell/Makefile
|
||||||
|
Loading…
Reference in New Issue
Block a user