[Fedora-directory-commits] ldapserver/include version.h,1.6,1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver/include
Modified Files:
version.h
Log Message:
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: version.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/version.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- version.h 19 Apr 2005 22:06:43 -0000 1.6
+++ version.h 29 Oct 2005 02:25:55 -0000 1.7
@@ -44,18 +44,18 @@
exist, the PRODUCT_VERSION define has _DEF appended.
*/
-#define DIRECTORY_VERSION_DEF "7.1"
+#define DIRECTORY_VERSION_DEF "1.0"
#define DIRECTORY_COMPATIBLE "3.0"
-#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1"
+#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0"
#define DS_VERSION_DEF DIRECTORY_VERSION_DEF
#define DS_VERSION_STRING DIRECTORY_VERSION_STRING
#define DSS_VERSION_DEF DIRECTORY_VERSION_DEF
-#define DSS_VERSION_STRING "Fedora-DirSynchService/7.1"
+#define DSS_VERSION_STRING "Fedora-DirSynchService/1.0"
-#define ADMSERV_VERSION_DEF "7.0"
-#define ADMSERV_VERSION_STRING "Fedora-Administrator/7.0"
+#define ADMSERV_VERSION_DEF "1.0"
+#define ADMSERV_VERSION_STRING "Fedora-Administrator/1.0"
/* supposedly the trunk is currently the home of 3.x development */
#define ENTERPRISE_VERSION_DEF "3.01"
18 years, 5 months
[Fedora-directory-commits] ldapserver Makefile, 1.26, 1.27 component_versions.mk, 1.38, 1.39 internal_comp_deps.mk, 1.28, 1.29 nsdefs.mk, 1.14, 1.15
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21454/ldapserver
Modified Files:
Makefile component_versions.mk internal_comp_deps.mk nsdefs.mk
Log Message:
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/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile 2 Sep 2005 20:40:46 -0000 1.26
+++ Makefile 29 Oct 2005 02:25:50 -0000 1.27
@@ -132,7 +132,7 @@
ifeq ($(INTERNAL_BUILD), 1)
COMPONENT_DEPENDENCIES = $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(DBM_DEP) $(SECURITY_DEP) $(SVRCORE_DEP) \
$(ICU_DEP) $(SETUPUTIL_DEP) $(LDAPSDK_DEP) $(DB_LIB_DEP) $(SASL_DEP) $(NETSNMP_DEP) \
- $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP)
+ $(AXIS_DEP) $(DSMLJAR_DEP) $(DSDOC_DEP) $(ADSYNC_DEP) $(NT4SYNC_DEP) $(PERLDAP_DEP)
endif
# Pull WiX MSI toolkit on Windows.
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- component_versions.mk 3 Oct 2005 19:53:40 -0000 1.38
+++ component_versions.mk 29 Oct 2005 02:25:50 -0000 1.39
@@ -114,10 +114,10 @@
# admin server
ifndef ADM_RELDATE
- ADM_RELDATE = 20050901
+ ADM_RELDATE = 20051028
endif
ifndef ADM_VERSDIR
- ADM_VERSDIR = adminserver/7.1
+ ADM_VERSDIR = adminserver/1.0
endif
# Net-SNMP
@@ -127,22 +127,17 @@
# setuputil
ifndef SETUPUTIL_RELDATE
- SETUPUTIL_RELDATE = 20050831
+ SETUPUTIL_RELDATE = 20051027
endif
ifndef SETUPUTIL_VER
- SETUPUTIL_VER = 71
- SETUPUTIL_DOT_VER = 7.1
+ SETUPUTIL_VER = 10
+ SETUPUTIL_DOT_VER = 1.0
endif
ifndef SETUPUTIL_VERSDIR
SETUPUTIL_VERSDIR=setuputil/$(SETUPUTIL_DOT_VER)
endif
-# infozip utilities
-ifndef INFOZIP_RELDATE
- INFOZIP_RELDATE = CMSTOOLS_7_x
-endif
-
# server core
ifndef SVRCORE_RELDATE
SVRCORE_RELDATE = SVRCORE_4_0_RTM
@@ -150,11 +145,11 @@
# admin utility library
ifndef ADMINUTIL_VER
- ADMINUTIL_VER=71
- ADMINUTIL_DOT_VER=7.1
+ ADMINUTIL_VER=10
+ ADMINUTIL_DOT_VER=1.0
endif
ifndef ADMINUTIL_RELDATE
- ADMINUTIL_RELDATE=20050721
+ ADMINUTIL_RELDATE=20051026
endif
ifndef ADMINUTIL_VERSDIR
@@ -163,17 +158,17 @@
# LDAP Console
ifndef LDAPCONSOLE_REL
- LDAPCONSOLE_REL=71
+ LDAPCONSOLE_REL=10
endif
ifndef LDAPCONSOLE_COMP
LDAPCONSOLE_COMP = ldapconsole$(LDAPCONSOLE_REL)
endif
ifndef LDAPCONSOLE_RELDATE
- LDAPCONSOLE_RELDATE=20050913
+ LDAPCONSOLE_RELDATE=20051028
endif
ifndef PERLDAP_VERSION
- PERLDAP_VERSION=20050330
+ PERLDAP_VERSION=20051028
endif
ifndef JSS_COMP
@@ -236,9 +231,9 @@
endif
ifndef ADSYNC_VERSION
- ADSYNC_VERSION=20050912
+ ADSYNC_VERSION=20051017
endif
ifndef NT4SYNC_VERSION
- NT4SYNC_VERSION=20050912
+ NT4SYNC_VERSION=20051017
endif
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- internal_comp_deps.mk 5 Oct 2005 01:29:14 -0000 1.28
+++ internal_comp_deps.mk 29 Oct 2005 02:25:50 -0000 1.29
@@ -574,7 +574,26 @@
#PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32)
-PERLDAP_ZIP_FILE = perldap14.zip
+PERLDAP_FILES=lib,arch
+PERLDAP_DEP = $(PERLDAP_BUILT_DIR)/lib
+
+# this is the rule to pull PerLDAP
+ifndef PERLDAP_PULL_METHOD
+PERLDAP_PULL_METHOD = FTP
+endif
+
+$(PERLDAP_DEP):
+ifdef INTERNAL_BUILD
+ $(RM) $@
+ $(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
+ -objdir $(dir $@) \
+ -componentdir $(PERLDAP_COMPONENT_DIR) \
+ -files $(PERLDAP_FILES)
+ @if [ ! -f $@ ] ; \
+ then echo "Error: could not get component PERLDAP file $@" ; \
+ exit 1 ; \
+ fi
+endif
###########################################################
### Admin Server package ##################################
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nsdefs.mk 3 Oct 2005 19:53:40 -0000 1.14
+++ nsdefs.mk 29 Oct 2005 02:25:50 -0000 1.15
@@ -141,10 +141,10 @@
endif
endif
-MAJOR_VERSION:="7"
-MINOR_VERSION:="1"
-MAJOR_VERSION_NOQUOTES:=7
-MINOR_VERSION_NOQUOTES:=1
+MAJOR_VERSION:="1"
+MINOR_VERSION:="0"
+MAJOR_VERSION_NOQUOTES:=1
+MINOR_VERSION_NOQUOTES:=0
# the LINK version is the one used for -l linking e.g. -l$(LINK_HTTPDLL_NAME)
ifeq ($(BUILD_ARCH), WINNT)
@@ -232,9 +232,9 @@
OBJDIR=$(COMMON_OBJDIR)
OBJDIR_32=$(COMMON_OBJDIR_32)
DO_SEARCH=no
-DIR_VERSION:=7.1
-NOSP_DIR_VERSION:=7.1
-DIR_NORM_VERSION:=7.1
+DIR_VERSION:=1.0
+NOSP_DIR_VERSION:=1.0
+DIR_NORM_VERSION:=1.0
PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)"
# When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must
# update all of the .exp and .def files by executing the following command:
18 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.38,1.39
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21391/ldapserver/ldap/cm
Modified Files:
Makefile
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/cm/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile 27 Oct 2005 14:12:40 -0000 1.38
+++ Makefile 29 Oct 2005 02:21:51 -0000 1.39
@@ -106,9 +106,9 @@
endif
ifdef USE_64
-VERSION=-ver 7.1-64bit
+VERSION=-ver 1.0-64bit
else
-VERSION=-ver 7.1
+VERSION=-ver 1.0
endif
ifeq ($(ARCH), HPUX)
@@ -185,10 +185,6 @@
PACKAGE_STAGE_DIR=$(OBJDIR)/package
endif
-ifdef INTERNAL_BUILD
- PERLDAP := perldap
-endif
-
# these are files and directories in the import adminsrv directory which we don't
# make a local copy of, we just import directly into the tar file or create a
# symlink to
@@ -225,7 +221,7 @@
ifdef BUILD_PATCH
PATCHINSTDIR = $(ABS_INSTDIR)-SP
-SLAPDSP = slapd-71
+SLAPDSP = slapd-10
endif
INST_TARGET_RESKIT=$(INSTDIR)/reskit
@@ -261,7 +257,7 @@
ifdef BUILD_RPM
# name and version of RPM - must correspond to the spec file - these get branded
RPM_BASE_NAME=fedora
- RPM_VERSION=7.1
+ RPM_VERSION=1.0
RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION)
RPM_ARCH = $(shell uname -i)
# root dir for RPM built and temp files
@@ -340,8 +336,8 @@
# install the DSMLGW into the client directory
ifeq ($(USE_DSMLGW), 1)
$(MKDIR) $(RELDIR)/clients/dsmlgw
- if [ -d $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis ] ; then \
- $(CP) -R $(NSDIST)/classes/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/ ; \
+ if [ -d $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis ] ; then \
+ $(CP) -R $(DSMLGWJARS_BUILD_DIR)/$(AXIS_REL_DIR)/webapps/axis/* $(RELDIR)/clients/dsmlgw/ ; \
fi
$(INSTALL) -m 644 $(NSDIST)/dsmlgw/dsmlgw.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
@@ -349,7 +345,7 @@
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
# now time to move the necessary jars in place
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/ldapjdk.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(LDAPJARFILE) $(RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
# if you use the jaxrpc.jar from the axis distribution, you don't need the api file
# or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa
@@ -473,9 +469,9 @@
endif
ifeq ($(USE_JAVATOOLS), 1)
$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(XMLTOOLS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
- $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSONJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
- if [ -f $(NSDIST)/classes/$(CRIMSON_LICENSE) ] ; then \
- $(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
+ $(INSTALL) -m 644 $(CRIMSONJAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
+ if [ -f $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) ] ; then \
+ $(INSTALL) -m 644 $(CRIMSON_BUILD_DIR)/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH) ; \
fi
endif
@@ -552,25 +548,6 @@
# For security reason, it's readable only by the owner
chmod 700 $(RELDIR)/bin/slapd/server
-# this is the rule to pull PerLDAP
-ifndef PERLDAP_PULL_METHOD
-PERLDAP_PULL_METHOD = FTP
-endif
-
-$(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE):
-ifdef INTERNAL_BUILD
- $(RM) $@
- $(FTP_PULL) -method $(PERLDAP_PULL_METHOD) \
- -objdir $(dir $@) \
- -componentdir $(PERLDAP_COMPONENT_DIR) \
- -files $(notdir $(a)),perldap.inf
- @if [ ! -f $@ ] ; \
- then echo "Error: could not get component PERLDAP file $@" ; \
- exit 1 ; \
- fi
- $(PERL) -w fixPerlDAPInf.pl $(dir $(a))/perldap.inf
-endif
-
$(INSTDIR)/slapd:
$(MKDIR) -p $@
@@ -580,7 +557,6 @@
# ---THE UNIX PACKAGE---
packageDirectory: $(INSTDIR)/slapd \
- $(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE) \
$(ADMSERV_DEP)
# this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others
@@ -675,6 +651,7 @@
for file in $(ADMINSERVER_SUBCOMPS) ; \
do rm -rf $(INSTDIR)/$$file ; \
cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
+ rm -rf $(INSTDIR)/$$file/unzipped ; \
done ; \
fi
@@ -702,14 +679,14 @@
ifdef BUILD_SHIP
ifndef BUILD_PATCH
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
- $(PERLDAP) dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
+ dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
endif
ifeq ($(DEBUG), optimize)
# $(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
endif
else
cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
- $(PERLDAP) dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+ dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
endif # BUILD_SHIP
#cp $(INSTDIR).tar.gz $(BUILD_SHIP)
#cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz $(BUILD_SHIP)
@@ -882,11 +859,9 @@
SLAPD_DIR=slapd
-_perl: $(INSTDIR)/perldap/$(PERLDAP_ZIP_FILE)
-
# ------------------------- all below this line is packageDirectory --------------------------
-packageDirectory: $(INSTDIR)/$(SLAPD_DIR) _admserv_files _perl _slapd_files _setup_files make_zip
+packageDirectory: $(INSTDIR)/$(SLAPD_DIR) _admserv_files _slapd_files _setup_files make_zip
#-------------------------- admserv rules ----------------------------------------------------
_admserv_files: $(INSTDIR) $(ADMSERV_DEP)
18 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw Makefile, 1.9, 1.10 build.xml, 1.6, 1.7
by Doctor Conrad
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"/>
18 years, 5 months
[Fedora-directory-commits] ldapserver buildpaths.mk, 1.7, 1.8 components.mk, 1.33, 1.34 internal_buildpaths.mk, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21391/ldapserver
Modified Files:
buildpaths.mk components.mk internal_buildpaths.mk
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: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buildpaths.mk 27 Oct 2005 14:12:33 -0000 1.7
+++ buildpaths.mk 29 Oct 2005 02:21:40 -0000 1.8
@@ -122,7 +122,10 @@
SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
#SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
-LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+# it's customary and easier to use the pre-built jars
+#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
+# Crimson - crimson.jar - http://xml.apache.org/crimson/
+#CRIMSON_SOURCE_DIR = $(BUILD_ROOT)/../crimson
ADMINSERVER_SOURCE_ROOT = $(BUILD_ROOT)/../adminserver
@@ -134,9 +137,7 @@
# Xerces-J - xercesImpl.jar, xml-apis.jar http://xml.apache.org/xerces2-j/download.cgi
# JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
# JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html
-# Crimson - crimson.jar - http://xml.apache.org/crimson/
-# Also the ldapjdk.jar
-# all of these files need to be in the following directory
+# all of these files need to be in the following directory:
DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars
PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- components.mk 21 Oct 2005 19:21:04 -0000 1.33
+++ components.mk 29 Oct 2005 02:21:40 -0000 1.34
@@ -538,7 +538,8 @@
LDAPJDK = ldapjdk.jar
ifdef LDAPJDK_SOURCE_DIR
LDAPJDK_DIR = $(LDAPJDK_SOURCE_DIR)/directory/java-sdk/dist/packages
-else
+endif
+ifndef LDAPJDK_DIR
LDAPJDK_DIR = $(CLASS_DEST)
endif
LDAPJARFILE=$(LDAPJDK_DIR)/ldapjdk.jar
@@ -552,7 +553,13 @@
CRIMSON_LICENSE = LICENSE.crimson
CRIMSONJAR = crimson.jar
-CRIMSONJAR_FILE = $(CLASS_DEST)/$(CRIMSONJAR)
+ifdef CRIMSON_SOURCE_DIR
+ CRIMSONJAR_BUILD_DIR = $(CRIMSON_SOURCE_DIR)
+endif
+ifndef CRIMSONJAR_BUILD_DIR
+ CRIMSONJAR_BUILD_DIR = $(CLASS_DEST)
+endif
+CRIMSONJAR_FILE = $(CRIMSONJAR_BUILD_DIR)/$(CRIMSONJAR)
ifdef ADMINSERVER_SOURCE_ROOT
ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)
@@ -744,12 +751,13 @@
########### PerLDAP #############
ifdef PERLDAP_SOURCE_ROOT
PERLDAP_BUILT_DIR = $(PERLDAP_SOURCE_ROOT)/directory/perldap/blib
- PERLDAP_ARCHLIB_DIR = $(PERLDAP_BUILT_DIR)/arch
- PERLDAP_LIB_DIR = $(PERLDAP_BUILT_DIR)/lib/Mozilla
- PERLDAP_AUTOLIB_DIR = $(PERLDAP_BUILT_DIR)/lib/auto
-# under the serverroot/lib directory, we should have a perl directory which contains arch/, auto/, and Mozilla/
- PACKAGE_SRC_DEST += $(PERLDAP_ARCHLIB_DIR) lib/perl
- PACKAGE_SRC_DEST += $(PERLDAP_LIB_DIR) lib/perl
- PACKAGE_SRC_DEST += $(PERLDAP_AUTOLIB_DIR) lib/perl
-# else we're using the pre-built zip file - see ldap/cm/Makefile
+# else set in internal_buildpaths.mk and pulled in internal_comp_deps.mk
endif
+
+PERLDAP_ARCHLIB_DIR = $(PERLDAP_BUILT_DIR)/arch
+PERLDAP_LIB_DIR = $(PERLDAP_BUILT_DIR)/lib/Mozilla
+PERLDAP_AUTOLIB_DIR = $(PERLDAP_BUILT_DIR)/lib/auto
+# under the serverroot/lib directory, we should have a perl directory which contains arch/, auto/, and Mozilla/
+PACKAGE_SRC_DEST += $(PERLDAP_ARCHLIB_DIR) lib/perl
+PACKAGE_SRC_DEST += $(PERLDAP_LIB_DIR) lib/perl
+PACKAGE_SRC_DEST += $(PERLDAP_AUTOLIB_DIR) lib/perl
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- internal_buildpaths.mk 27 Oct 2005 14:12:33 -0000 1.7
+++ internal_buildpaths.mk 29 Oct 2005 02:21:40 -0000 1.8
@@ -141,3 +141,11 @@
endif
DSMLGWJARS_BUILD_DIR = $(CLASS_DEST)
+
+LDAPJDK_DIR = $(CLASS_DEST)
+
+CRIMSON_BUILD_DIR = $(CLASS_DEST)
+
+ifndef PERLDAP_SOURCE_ROOT
+PERLDAP_BUILT_DIR = $(NSCP_DISTDIR_FULL_RTL)/perldap
+endif
18 years, 5 months
[Fedora-directory-commits] adminserver/mcc mcc.inf,1.4,1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/mcc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/mcc
Modified Files:
mcc.inf
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: mcc.inf
===================================================================
RCS file: /cvs/dirsec/adminserver/mcc/mcc.inf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mcc.inf 18 Aug 2005 19:21:14 -0000 1.4
+++ mcc.inf 28 Oct 2005 22:45:07 -0000 1.5
@@ -25,7 +25,7 @@
Nickname = mcc
Version=%%%VERSION%%%
BuildNumber= %%%BUILD_NUM%%%
-Compatible= 4.0
+Compatible= 1.0
Security=%%%SECURITY%%%
SourcePath=mcc
Archive= nsmcc.zip
18 years, 5 months
[Fedora-directory-commits] adminserver/include/nt regparms.h, 1.6, 1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/include/nt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/include/nt
Modified Files:
regparms.h
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: regparms.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/nt/regparms.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- regparms.h 9 Sep 2005 18:50:29 -0000 1.6
+++ regparms.h 28 Oct 2005 22:45:01 -0000 1.7
@@ -46,19 +46,19 @@
/* Admin IDs */
#define ADM_ID_PRODUCT "admin"
#define ADM_NAME_SHORT "Administration"
-#define ADM_VERSION "7.1"
-#define ADM_NAME_VERSION "Administration 7.1"
+#define ADM_VERSION "1.0"
+#define ADM_NAME_VERSION "Administration 1.0"
#define ADM_NAME_SERVER "Administration Server"
#define ADM_NAME_FULL "Fedora Administration Server"
-#define ADM_NAME_FULL_VERSION "Fedora Administration Server 7.1"
-#define ADM_NAME_SERVICE "Fedora Administration 7.1"
+#define ADM_NAME_FULL_VERSION "Fedora Administration Server 1.0"
+#define ADM_NAME_SERVICE "Fedora Administration 1.0"
#define ADM_EXE "ns-admin.exe"
#define ADM_EXE_START "admin.exe"
-#define ADM_ID_SERVICE "admin71"
-#define ADM_KEY_ROOT "Administration\\7.1"
+#define ADM_ID_SERVICE "admin10"
+#define ADM_KEY_ROOT "Administration\\1.0"
#define ADM_SERVER_LST_NAME "adm:Netscape Enterprise Server"
#define ADM_DIR_ROOT "admin"
-#define ADM_NAME_UNINSTALL "Uninstall Administration Server 7.1"
+#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0"
/* original definitions */
// Upper-level registry parameters
18 years, 5 months
[Fedora-directory-commits] adminserver/include version.h,1.5,1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/include
Modified Files:
version.h
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: version.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/version.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- version.h 9 Sep 2005 18:50:06 -0000 1.5
+++ version.h 28 Oct 2005 22:44:56 -0000 1.6
@@ -32,14 +32,14 @@
* (miodrag) Note: BASE_VERSION_DEF and MCC_VERSION_DEF are used by SETUPSDK
* build scripts as SETUP_BASE and setup svrcore versions
*/
-#define BASE_VERSION_DEF "7.1"
-#define BASE_VERSION_STRING "Fedora Base components/7.1"
+#define BASE_VERSION_DEF "1.0"
+#define BASE_VERSION_STRING "Fedora Base components/1.0"
-#define MCC_VERSION_DEF "7.1"
-#define MCC_VERSION_STRING "Fedora Management Console/7.1"
+#define MCC_VERSION_DEF "1.0"
+#define MCC_VERSION_STRING "Fedora Management Console/1.0"
-#define ADMSERV_VERSION_DEF "7.1"
-#define ADMSERV_VERSION_STRING "Fedora-Administrator/7.1"
+#define ADMSERV_VERSION_DEF "1.0"
+#define ADMSERV_VERSION_STRING "Fedora-Administrator/1.0"
#define ADMSERV_NAME Fedora Administration Server
#define VI_COMPANYNAME "Fedora Project\0"
18 years, 5 months
[Fedora-directory-commits] adminserver/i18npkg/apollo server.flt, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/i18npkg/apollo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/i18npkg/apollo
Modified Files:
server.flt
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: server.flt
===================================================================
RCS file: /cvs/dirsec/adminserver/i18npkg/apollo/server.flt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- server.flt 9 Sep 2005 18:49:44 -0000 1.5
+++ server.flt 28 Oct 2005 22:44:50 -0000 1.6
@@ -19,7 +19,7 @@
#
# END COPYRIGHT BLOCK
-$servername = "Fedora Server 7.1";
+$servername = "Fedora Server 1.0";
# These are subdirectories should be ignored
@ignore_dirs = (
'bin/base/jre/.*',
18 years, 5 months
[Fedora-directory-commits] adminserver/base/nt base.inf,1.5,1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/base/nt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/base/nt
Modified Files:
base.inf
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: base.inf
===================================================================
RCS file: /cvs/dirsec/adminserver/base/nt/base.inf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- base.inf 18 Aug 2005 19:12:05 -0000 1.5
+++ base.inf 28 Oct 2005 22:44:45 -0000 1.6
@@ -31,7 +31,7 @@
Description=Shared Files used by Server Products
Vendor= Fedora Project
Version=%%%VERSION%%%
-Compatible=4.0
+Compatible=1.0
BuildNumber=%%%BUILD_NUM%%%
Dependencies=svrcore/6.0
Security=%%%SECURITY%%%
@@ -48,7 +48,7 @@
Name= Core Java Classes
Description=Core Java Classes
Version= %%%VERSION%%%
-Compatible=4.0
+Compatible=1.0
Dependencies=svrcore/6.0
BuildNumber=%%%BUILD_NUM%%%
Security=%%%SECURITY%%%
18 years, 5 months