From 71a80df32adfe4cbcb839608b0c7c4ce22ece2de Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Thu, 7 Jun 2007 23:51:01 +0000 Subject: [PATCH] More changes for the addition of the jakarta-commons-lang external dependency. --- CASA-auth-token/server-java/Svc/external/Makefile.am | 2 +- CASA-auth-token/server-java/Svc/windows/Makefile.am | 4 +++- CASA-auth-token/server-java/configure.in | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CASA-auth-token/server-java/Svc/external/Makefile.am b/CASA-auth-token/server-java/Svc/external/Makefile.am index a451d7cb..4941ce02 100644 --- a/CASA-auth-token/server-java/Svc/external/Makefile.am +++ b/CASA-auth-token/server-java/Svc/external/Makefile.am @@ -22,7 +22,7 @@ SUBDIRS = -DIST_SUBDIRS = xmlsec log4j +DIST_SUBDIRS = xmlsec log4j commons-jakarta-lang CFILES = diff --git a/CASA-auth-token/server-java/Svc/windows/Makefile.am b/CASA-auth-token/server-java/Svc/windows/Makefile.am index 62f49348..8d1fb7e4 100644 --- a/CASA-auth-token/server-java/Svc/windows/Makefile.am +++ b/CASA-auth-token/server-java/Svc/windows/Makefile.am @@ -36,6 +36,7 @@ IDENT_ABSTRACTION_DIR = $(BANDIT_DIR) 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 +COMMONS_LANG_JARS_DIR = ../external/jakarta-commons-lang/commons-lang-2.3 MANIFEST_DIR = ../manifest @@ -118,7 +119,7 @@ AUTH_POLICY_EDITOR = $(AUTH_POLICY_EDITOR_MODULE_NAME).$(MODULE_EXT) 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) 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)/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 $(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)/bandit-util.jar $(BUILDDIR)/webapp/WEB-INF/lib/ cp $(IDENT_ABSTRACTION_DIR)/castor-1.0.4.jar $(BUILDDIR)/webapp/WEB-INF/lib/ diff --git a/CASA-auth-token/server-java/configure.in b/CASA-auth-token/server-java/configure.in index d17b0dbe..5ae54373 100644 --- a/CASA-auth-token/server-java/configure.in +++ b/CASA-auth-token/server-java/configure.in @@ -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/dist/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/com/Makefile Svc/src/com/novell/Makefile