[Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw Makefile, 1.9, 1.10 build.xml, 1.6, 1.7

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21391/ldapserver/ldap/clients/dsmlgw

Modified Files:
	Makefile build.xml 
Log Message:
Bug(s) fixed: 171892
Bug Description: parameterize ldapjdk and crimson jar locations
Reviewed by: Noriko, Nathan (Thanks!)
Fix Description: This is also needed for GAR.  The xmltools also 
ldapjdk.jar, and needs crimson.jar.  DSMLGW does not need crimson.jar.  
It makes sense to separate these out of the dsmlgw jars.  I changed the 
dsmlgw build.xml to be able to pickup ldapjdk.jar from a different 
location - defaults to the usual dist/classes.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none

Bug(s) fixed: 172005
Bug Description: Change ldapserver version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: This also fixes some lingering build issues involving 
perldap, which is no longer a separate setup package, but just gets 
included into DS in a similar manner to nspr, nss, etc.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	27 Oct 2005 14:12:40 -0000	1.9
+++ Makefile	29 Oct 2005 02:21:46 -0000	1.10
@@ -46,10 +46,10 @@
 include $(BUILD_ROOT)/ldap/javarules.mk
 
 all: $(ANT_DEP) $(LDAPJDK_DEP)
-	@if [ ! -f $(CLASS_DEST)/axis.jar ]; then \
+	@if [ ! -f $(DSMLGWJARS_BUILD_DIR)/axis.jar ]; then \
 		cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST) ; \
 	fi
-	$(ANT) -Dglobaldist.dir=$(DSMLGWJARS_BUILD_DIR)
+	$(ANT) -Dglobaldist.dir=$(DSMLGWJARS_BUILD_DIR) -Dldapdist.dir=$(LDAPJDK_DIR)
 
 clean: 	
 	$(ANT) clean


Index: build.xml
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml	19 Apr 2005 22:07:19 -0000	1.6
+++ build.xml	29 Oct 2005 02:21:46 -0000	1.7
@@ -45,10 +45,11 @@
 <!-- ******************** Adjustable Properties *********************** -->
 <property name="mcom.root"       value="../../.."/>
 <property name="globaldist.dir"  value="${mcom.root}/../dist/classes"/>
+<property name="ldapdist.dir"    value="${mcom.root}/../dist/classes"/>
 <property name="app.name"        value="dsmlgw"/>
 <property name="taglib.name"     value="dsmlgw"/>
 
-<property name="ldapjdk.jar"     value="${globaldist.dir}/ldapjdk.jar"/>
+<property name="ldapjdk.jar"     value="${ldapdist.dir}/ldapjdk.jar"/>
 <property name="activation.jar"  value="${globaldist.dir}/activation.jar"/>
 <property name="jaxrpc-api.jar"  value="${globaldist.dir}/jaxrpc-api.jar"/>
 <property name="jaxrpc.jar"  value="${globaldist.dir}/jaxrpc.jar"/>