diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-10-29 02:21:51 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-10-29 02:21:51 +0000 |
| commit | 1edb0d5cd52be6c43a2291997468d7ff413f6a21 (patch) | |
| tree | 2b39b7c681498ecff7947fba1ae3f1b9d09792a5 /ldap/clients | |
| parent | 3d5f79ddfc4b6f9c6ee97c1e7a300bdc7ba90d01 (diff) | |
| download | ds-1edb0d5cd52be6c43a2291997468d7ff413f6a21.tar.gz ds-1edb0d5cd52be6c43a2291997468d7ff413f6a21.tar.xz ds-1edb0d5cd52be6c43a2291997468d7ff413f6a21.zip | |
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
Diffstat (limited to 'ldap/clients')
| -rw-r--r-- | ldap/clients/dsmlgw/Makefile | 4 | ||||
| -rw-r--r-- | ldap/clients/dsmlgw/build.xml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ldap/clients/dsmlgw/Makefile b/ldap/clients/dsmlgw/Makefile index 2b427027..1e3f933c 100644 --- a/ldap/clients/dsmlgw/Makefile +++ b/ldap/clients/dsmlgw/Makefile @@ -46,10 +46,10 @@ include $(BUILD_ROOT)/nsconfig.mk 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 diff --git a/ldap/clients/dsmlgw/build.xml b/ldap/clients/dsmlgw/build.xml index c0ec4252..8509821d 100644 --- a/ldap/clients/dsmlgw/build.xml +++ b/ldap/clients/dsmlgw/build.xml @@ -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"/> |