Author: nhosoi Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435 Modified Files: Makefile components.mk nsconfig.mk 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: Makefile =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile 29 Sep 2005 22:11:57 -0000 1.14 +++ Makefile 28 Oct 2005 22:43:18 -0000 1.15 @@ -107,9 +107,9 @@ @echo ==== Finished Branding Administration Server ========== versionAdmin: $(RELTOOLS) - @echo ==== Branding Administration Server ========== + @echo ==== Versioning Administration Server ========== $(PERL5) $(RELTOOLS)/brandver.pl -i branding/fedora/brandver.dat - @echo ==== Finished Branding Administration Server ========== + @echo ==== Finished Versioning Administration Server ========== normalizeAdmin: $(RELTOOLS) @echo ==== Normalizing Administration Server ========== Index: components.mk =================================================================== RCS file: /cvs/dirsec/adminserver/components.mk,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- components.mk 25 Oct 2005 15:29:07 -0000 1.37 +++ components.mk 28 Oct 2005 22:43:18 -0000 1.38 @@ -158,9 +158,9 @@ # SETUPUTIL ############################################################## -SETUPUTIL_RELDATE = 20050831 +SETUPUTIL_RELDATE = 20051027 SETUPUTIL_FILE = setuputil.tar.gz -SETUPUTIL_COMPNAME = setuputil/7.1 +SETUPUTIL_COMPNAME = setuputil/1.0 SETUPUTIL_ROOT = $(NSCP_COMPDIR)/setuputil @@ -196,11 +196,11 @@ # ADMINUTIL Library ############################################################### -ADMINUTIL_SUF = 71 -ADMINUTIL_RELDATE = 20050721 +ADMINUTIL_SUF = 10 +ADMINUTIL_RELDATE = 20051026 ADMINUTIL_VERSION = $(ADMINUTIL_RELDATE) ADMINUTIL_ROOT = $(NSCP_COMPDIR)/adminutil -ADMINUTIL_COMPNAME = adminutil/7.1 +ADMINUTIL_COMPNAME = adminutil/1.0 ADMINUTILOBJDIR = $(NSOBJDIR_NAME) @@ -233,8 +233,8 @@ # DOCS ################################################################ -ADMDOC_SUF = 7.1$(BUILD_MODE) -ADMDOC_RELDATE = 20050309 +ADMDOC_SUF = 1.0$(BUILD_MODE) +ADMDOC_RELDATE = 20050930 ADMDOC_VERSION = $(ADMDOC_RELDATE) ADMDOC_PATH = $(NSCP_COMPDIR)/admservdoc ADMDOC_ABSPATH = $(ABS_ROOT)/components/admservdoc @@ -313,10 +313,10 @@ # Console java classes ############################################################# -NMCJDK_SUF = 71 -NMCJDK_RELDATE = 20051024 +NMCJDK_SUF = 10 +NMCJDK_RELDATE = 20051027 -NMCJDK_COMP = console/7.1 +NMCJDK_COMP = console/1.0 NMCJDK_VERSION = $(NMCJDK_RELDATE) @@ -420,10 +420,10 @@ ########################################################### # mod_admserv ############################################# -MOD_ADMSERV_RELDATE = 20050819 +MOD_ADMSERV_RELDATE = 20051028 #BASE_MOD_ADMSERV = $(COMPONENTS_DIR)/mod_admserv/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME) -BASE_MOD_ADMSERV = $(INT_DIR)/mod_admserv/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME) +BASE_MOD_ADMSERV = $(FED_COMPONENTS_DIR)/mod_admserv/1.0/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME) MOD_ADMSERV = $(MOD_ADMSERV_LIBPATH)/libmodadmserv.$(DLL_SUFFIX) Index: nsconfig.mk =================================================================== RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- nsconfig.mk 7 Oct 2005 21:49:29 -0000 1.16 +++ nsconfig.mk 28 Oct 2005 22:43:18 -0000 1.17 @@ -499,7 +499,7 @@ endif endif -ADM_SUF=71 +ADM_SUF=10 # CLEAN THIS UP @@ -784,7 +784,7 @@ # ADMINUTIL ######################################## -ADMINUTIL_LIB_VERSION=71 +ADMINUTIL_LIB_VERSION=10 ifdef ADMINUTIL_SOURCE_ROOT ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/lib ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include @@ -841,7 +841,7 @@ # NMCSDK ######################################### -NMCJDK_JAR_VERSION = 71 +NMCJDK_JAR_VERSION = 10 NMCJDK_JARS = base.jar mcc$(NMCJDK_JAR_VERSION).jar mcc$(NMCJDK_JAR_VERSION)_en.jar nmclf$(NMCJDK_JAR_VERSION).jar nmclf$(NMCJDK_JAR_VERSION)_en.jar #########################################