Bug(s) fixed: 169663

Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components.  I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build.  This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none

1 files changed, 9 insertions, 141 deletions

diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk
index 6cb72d1d..f9e2db95 100644
--- a/internal_comp_deps.mk
+++ b/internal_comp_deps.mk
@@ -330,30 +330,12 @@ else
   ADMINUTIL_IMPORT=$(COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
 #  ADMINUTIL_IMPORT=$(FED_COMPONENTS_DIR)/${ADMINUTIL_BASE}/$(NSOBJDIR_NAME)
 endif
-# this is the base directory under which the component's files will be found
-# during the build process
 ADMINUTIL_BUILD_DIR=$(NSCP_DISTDIR_FULL_RTL)/adminutil
-ADMINUTIL_LIBPATH=$(ADMINUTIL_BUILD_DIR)/lib
-ADMINUTIL_INCPATH=$(ADMINUTIL_BUILD_DIR)/include
-
-PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib
-LIBS_TO_PKG += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
-LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
 
 #
 # Libadminutil
 #
 ADMINUTIL_DEP = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
-ifeq ($(ARCH), WINNT)
-ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX)
-ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s$(ADMINUTIL_VER).$(LIB_SUFFIX)
-LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
-else
-ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil$(ADMINUTIL_VER)
-endif
-ADMINUTIL_INCLUDE=-I$(ADMINUTIL_INCPATH) \
-	-I$(ADMINUTIL_INCPATH)/libadminutil \
-	-I$(ADMINUTIL_INCPATH)/libadmsslutil
 
 ifndef ADMINUTIL_PULL_METHOD
 ADMINUTIL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
@@ -406,21 +388,13 @@ ifeq ($(BUILD_MODE), int)
 else
   SETUPUTIL_RELEASE = $(FED_COMPONENTS_DIR)/$(SETUPUTIL_VERSDIR)/$(SETUPUTIL_VERSION)/$(NSOBJDIR_NAME)
 endif
-SETUPUTIL_LIBPATH = $(SETUPUTIL_BUILD_DIR)/lib
-SETUPUTIL_INCDIR = $(SETUPUTIL_BUILD_DIR)/include
-SETUPUTIL_BINPATH = $(SETUPUTIL_BUILD_DIR)/bin
-SETUPUTIL_INCLUDE = -I$(SETUPUTIL_INCDIR)
 
 ifeq ($(ARCH), WINNT)
 SETUPUTIL_FILES = setuputil.tar.gz -unzip $(NSCP_DISTDIR)/setuputil
 SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/nssetup32.$(LIB_SUFFIX)
-SETUPUTILLINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32.$(LIB_SUFFIX)
-SETUPUTIL_S_LINK = /LIBPATH:$(SETUPUTIL_LIBPATH) nssetup32_s.$(LIB_SUFFIX)
 else
 SETUPUTIL_FILES = bin,lib,include
 SETUPUTIL_DEP = $(SETUPUTIL_LIBPATH)/libinstall.$(LIB_SUFFIX)
-SETUPUTILLINK = -L$(SETUPUTIL_LIBPATH) -linstall
-SETUPUTIL_S_LINK = $(SETUPUTILLINK)
 endif
 
 ifndef SETUPUTIL_PULL_METHOD
@@ -436,17 +410,14 @@ endif
 	-@if [ ! -f $@ ] ; \
 	then echo "Error: could not get component SETUPUTIL file $@" ; \
 	fi
+
 # apache-axis java classes #######################################
-AXIS = axis-$(AXIS_VERSION).zip
-AXIS_FILES = $(AXIS)
 AXIS_RELEASE = $(COMPONENTS_DIR)/axis
 #AXISJAR_DIR = $(AXISJAR_RELEASE)/$(AXISJAR_COMP)/$(AXISJAR_VERSION)
 AXIS_DIR = $(AXIS_RELEASE)/$(AXIS_VERSION)
-AXIS_FILE = $(CLASS_DEST)/$(AXIS)
 AXIS_DEP = $(AXIS_FILE) 
 AXIS_REL_DIR=$(subst -bin,,$(subst .zip,,$(AXIS)))
 
-
 # This is java, so there is only one real platform subdirectory
 
 #PACKAGE_UNDER_JAVA += $(AXIS_FILE)
@@ -461,21 +432,18 @@ ifdef COMPONENT_DEPS
 	$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
 		-objdir $(CLASS_DEST) -componentdir $(AXIS_DIR) \
 		-files $(AXIS_FILES) -unzip $(CLASS_DEST)
-endif
+endifldap/
 	-@if [ ! -f $@ ] ; \
 	then echo "Error: could not get component AXIS files $@" ; \
 	fi
 
 ###########################################################
 
-
 # other dsml java classes #######################################
-DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar
 DSMLJAR_FILES = $(DSMLJAR)
 DSMLJAR_RELEASE = $(COMPONENTS_DIR)
 #DSMLJARJAR_DIR = $(DSMLJARJAR_RELEASE)/$(DSMLJARJAR_COMP)/$(DSMLJARJAR_VERSION)
 DSMLJAR_DIR = $(DSMLJAR_RELEASE)/dsmljars
-DSMLJAR_FILE = $(CLASS_DEST)
 DSMLJAR_DEP = $(CLASS_DEST)/activation.jar $(CLASS_DEST)/jaxrpc-api.jar $(CLASS_DEST)/jaxrpc.jar $(CLASS_DEST)/saaj.jar $(CLASS_DEST)/xercesImpl.jar $(CLASS_DEST)/xml-apis.jar
 
 ifndef DSMLJAR_PULL_METHOD
@@ -497,15 +465,11 @@ endif
 ###########################################################
 
 # XMLTOOLS java classes #######################################
-CRIMSONJAR = crimson.jar
-CRIMSON_LICENSE = LICENSE.crimson
 CRIMSONJAR_FILES = $(CRIMSONJAR),$(CRIMSON_LICENSE)
 CRIMSONJAR_RELEASE = $(COMPONENTS_DIR)
 CRIMSONJAR_DIR = $(CRIMSONJAR_RELEASE)/$(CRIMSONJAR_COMP)/$(CRIMSONJAR_VERSION)
-CRIMSONJAR_FILE = $(CLASS_DEST)/$(CRIMSONJAR)
 CRIMSONJAR_DEP = $(CRIMSONJAR_FILE) $(CLASS_DEST)/$(CRIMSON_LICENSE)
 
-
 # This is java, so there is only one real platform subdirectory
 
 PACKAGE_UNDER_JAVA += $(CRIMSONJAR_FILE)
@@ -516,7 +480,6 @@ endif
 
 $(CRIMSONJAR_DEP): $(CLASS_DEST)
 ifdef COMPONENT_DEPS
-	echo "Inside ftppull"
 	$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
 		-objdir $(CLASS_DEST) -componentdir $(CRIMSONJAR_DIR) \
 		-files $(CRIMSONJAR_FILES)
@@ -529,6 +492,7 @@ endif
 
 # ANT java classes #######################################
 ifeq ($(BUILD_JAVA_CODE),1)
+ifndef GET_ANT_FROM_PATH
 #  (we use ant for building some Java code)
 ANTJAR = ant.jar
 JAXPJAR = jaxp.jar
@@ -555,42 +519,14 @@ endif
 	then echo "Error: could not get component ant files $@" ; \
 	fi
 endif
-###########################################################
-
-# Servlet SDK classes #######################################
-SERVLETJAR = servlet.jar
-SERVLET_FILES = $(SERVLETJAR)
-SERVLET_RELEASE = $(COMPONENTS_DIR)
-SERVLET_DIR = $(SERVLET_RELEASE)/$(SERVLET_COMP)/$(SERVLET_VERSION)
-SERVLET_DEP = $(addprefix $(CLASS_DEST)/, $(SERVLET_FILES))
-SERVLET_CP = $(subst $(SPACE),$(PATH_SEP),$(SERVLET_DEP))
-SERVLET_PULL = $(subst $(SPACE),$(COMMA),$(SERVLET_FILES))
-
-ifndef SERVLET_PULL_METHOD
-SERVLET_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(SERVLET_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
-	echo "Inside ftppull"
-	$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-		-objdir $(CLASS_DEST) -componentdir $(SERVLET_DIR) \
-		-files $(SERVLET_PULL)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component servlet SDK files $@" ; \
-	fi
-
+endif # GET_ANT_FROM_PATH
 ###########################################################
 
 # LDAP java classes #######################################
-LDAPJDK = ldapjdk.jar
 LDAPJDK_VERSION = $(LDAPJDK_RELDATE)
 LDAPJDK_RELEASE = $(COMPONENTS_DIR)
-LDAPJDK_DIR = $(LDAPJDK_RELEASE)
 LDAPJDK_IMPORT = $(LDAPJDK_RELEASE)/$(LDAPJDK_COMP)/$(LDAPJDK_VERSION)/$(NSOBJDIR_NAME)
 # This is java, so there is only one real platform subdirectory
-LDAPJARFILE=$(CLASS_DEST)/ldapjdk.jar
 LDAPJDK_DEP=$(LDAPJARFILE)
 
 #PACKAGE_UNDER_JAVA += $(LDAPJARFILE)
@@ -612,23 +548,21 @@ endif
 ###########################################################
 # LDAP Console java classes
 ###########################################################
-LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar
-LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar
 
 #LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV)
 LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR)
 LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/ldapconsole/$(LDAPCONSOLE_COMP)$(BUILD_MODE)/$(LDAPCONSOLE_RELDATE)/jars
-LDAPCONSOLE_DEP = $(CLASS_DEST)/$(LDAPCONSOLEJAR)
+LDAPCONSOLE_DEP = $(LDAPCONSOLE_DIR)/$(LDAPCONSOLEJAR)
 LDAPCONSOLE_FILES=$(LDAPCONSOLEJAR),$(LDAPCONSOLEJAR_EN)
 
 ifndef LDAPCONSOLE_PULL_METHOD
 LDAPCONSOLE_PULL_METHOD = $(COMPONENT_PULL_METHOD)
 endif
 
-$(LDAPCONSOLE_DEP): $(CLASS_DEST)
+$(LDAPCONSOLE_DEP): $(LDAPCONSOLE_DIR)
 ifdef COMPONENT_DEPS
 	$(FTP_PULL) -method $(LDAPCONSOLE_PULL_METHOD) \
-		-objdir $(CLASS_DEST) -componentdir $(LDAPCONSOLE_JARDIR) \
+		-objdir $(LDAPCONSOLE_DIR) -componentdir $(LDAPCONSOLE_JARDIR) \
 		-files $(LDAPCONSOLE_FILES)
 endif
 	-@if [ ! -f $@ ] ; \
@@ -643,79 +577,15 @@ PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_
 PERLDAP_ZIP_FILE = perldap14.zip
 
 ###########################################################
-
-# JSS classes - for the Mission Control Console ######
-JSSJAR = jss$(JSS_JAR_VERSION).jar
-JSSJARFILE = $(CLASS_DEST)/$(JSSJAR)
-JSS_RELEASE = $(COMPONENTS_DIR)/$(JSS_COMP)/$(JSS_VERSION)
-JSS_DEP = $(JSSJARFILE)
-
-#PACKAGE_UNDER_JAVA += $(JSSJARFILE)
-
-ifndef JSS_PULL_METHOD
-JSS_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(JSS_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
-ifdef VSFTPD_HACK
-# work around vsftpd -L problem
-	$(FTP_PULL) -method $(JSS_PULL_METHOD) \
-		-objdir $(CLASS_DEST)/jss -componentdir $(JSS_RELEASE) \
-        -files xpclass.jar
-	mv $(CLASS_DEST)/jss/xpclass.jar $(CLASS_DEST)/$(JSSJAR)
-	rm -rf $(CLASS_DEST)/jss
-else
-	$(FTP_PULL) -method $(JSS_PULL_METHOD) \
-		-objdir $(CLASS_DEST) -componentdir $(JSS_RELEASE) \
-		-files $(JSSJAR)
-endif
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component JSS file $@" ; \
-	fi
-
-###########################################################
-
-### JSP compiler package ##################################
-
-JSPC_REL = $(JSPC_VERSDIR)
-JSPC_REL_DATE = $(JSPC_VERSION)
-JSPC_FILES = jasper-compiler.jar jasper-runtime.jar
-JSPC_RELEASE = $(COMPONENTS_DIR)
-JSPC_DIR = $(JSPC_RELEASE)/$(JSPC_COMP)/$(JSPC_VERSION)
-JSPC_DEP = $(addprefix $(CLASS_DEST)/, $(JSPC_FILES))
-JSPC_CP = $(subst $(SPACE),$(PATH_SEP),$(JSPC_DEP))
-JSPC_PULL = $(subst $(SPACE),$(COMMA),$(JSPC_FILES))
-
-ifndef JSPC_PULL_METHOD
-JSPC_PULL_METHOD = $(COMPONENT_PULL_METHOD)
-endif
-
-$(JSPC_DEP): $(CLASS_DEST)
-ifdef COMPONENT_DEPS
-	echo "Inside ftppull"
-	$(FTP_PULL) -method $(COMPONENT_PULL_METHOD) \
-		-objdir $(CLASS_DEST) -componentdir $(JSPC_DIR) \
-		-files $(JSPC_PULL)
-endif
-	-@if [ ! -f $@ ] ; \
-	then echo "Error: could not get component jspc files $@" ; \
-	fi
-
-###########################################################
-
-###########################################################
 ### Admin Server package ##################################
 
 ADMIN_REL = $(ADM_VERSDIR)
 ADMIN_REL_DATE = $(ADM_VERSION)
 #ADMIN_FILE = adminserver.tar.gz
-ADMIN_FILE = admin,base
+ADMIN_FILE = $(subst $(SPACE),$(COMMA),$(ADMINSERVER_SUBCOMPS))
 ADMIN_FILE_TAR = adminserver.tar
 IMPORTADMINSRV_BASE=$(COMPONENTS_DIR_DEV)/$(ADMIN_REL)/$(ADMIN_REL_DATE)
 IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
-ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver
 ADMSERV_DEP = $(ADMSERV_DIR)/admin/admin.inf
 
 ADM_VERSION = $(ADM_RELDATE)
@@ -728,8 +598,7 @@ endif
 ifndef ADMSERV_DEPS
 ADMSERV_DEPS = $(COMPONENT_DEPS)
 endif
-#IMPORTADMINSRV = /share/builds/sbsrel1/admsvr/admsvr62/ships/20030702.2/spd04_Solaris8/SunOS5.8-domestic-optimize-normal
-#ADM_RELEASE = /share/builds/sbsrel1/admsvr/admsvr62/ships/20030702.2/spd04_Solaris8/SunOS5.8-domestic-optimize-normal
+
 $(ADMSERV_DEP): $(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)
 ifdef ADMSERV_DEPS
 	$(FTP_PULL) -method $(ADMSERV_PULL_METHOD) \
@@ -768,7 +637,6 @@ $(DSDOC_DEP): $(NSCP_DISTDIR)
 	fi
 ### DOCS END #############################
 
-
 # Windows sync component for Active Directory
 ADSYNC = PassSync.msi
 ADSYNC_DEST = $(NSCP_DISTDIR_FULL_RTL)/winsync