Pull DS Console as a component

Makefile

@@ -90,7 +90,7 @@ components: $(ADMINUTIL_DEP) $(NSPR_DEP) $(ARLIB_DEP) $(DBM_DEP) $(SECURITY_DEP)
 	-@echo "The components are up to date"
 
 ifeq ($(BUILD_JAVA_CODE),1)
-DS_CONSOLE_COMPONENT_DEP  = $(LDAPJDK_DEP) $(SWING_DEP) $(MCC_DEP)
+DS_CONSOLE_COMPONENT_DEP  = $(LDAPJDK_DEP) $(SWING_DEP) $(MCC_DEP) $(LDAPCONSOLE_DEP)
 DS_CONSOLE_COMPONENT_DEP += $(JAVASSL_DEP) $(JSS_DEP) $(CRIMSONJAR_DEP)
 java_platform_check:
 
@@ -201,7 +201,7 @@ cleanDirectory:
 
 buildDirectoryConsole: consoleComponents java_platform_check
 ifeq ($(BUILD_JAVA_CODE),1)
-	cd ldap/admin/src/java/com/netscape/admin/dirserv; $(MAKE) $(MFLAGS) package
+#	cd ldap/admin/src/java/com/netscape/admin/dirserv; $(MAKE) $(MFLAGS) package
 	cd ldap/admin/src/java/com/netscape/xmltools; $(MAKE) $(MFLAGS) package
 endif
 

component_versions.mk

@@ -142,6 +142,17 @@ ifndef MCC_RELDATE
   MCC_RELDATE=20041117
 endif
 
+# LDAP Console
+ifndef LDAPCONSOLE_REL
+  LDAPCONSOLE_REL=71
+endif
+ifndef LDAPCONSOLE_COMP
+  LDAPCONSOLE_COMP = ldapconsole$(LDAPCONSOLE_REL)
+endif
+ifndef LDAPCONSOLE_RELDATE
+  LDAPCONSOLE_RELDATE=20050314
+endif
+
 ifndef PERLDAP_VERSION
   PERLDAP_VERSION=20041116
 endif

components.mk

@@ -761,6 +761,29 @@ endif
 	fi
 
 ###########################################################
+# LDAP Console java classes
+###########################################################
+LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar
+LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar
+                                                                                                                            
+LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV)
+LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/$(LDAPCONSOLE_COMP)ext/$(LDAPCONSOLE_RELDATE)/jars
+LDAPCONSOLE_DEP = $(CLASS_DEST)/$(LDAPCONSOLEJAR)
+LDAPCONSOLE_FILES=$(LDAPCONSOLEJAR),$(LDAPCONSOLEJAR_EN)
+
+ifndef LDAPCONSOLE_PULL_METHOD
+LDAPCONSOLE_PULL_METHOD = $(COMPONENT_PULL_METHOD)
+endif
+                                                                                                                            
+$(LDAPCONSOLE_DEP): $(CLASS_DEST)
+ifdef COMPONENT_DEPS
+	$(FTP_PULL) -method $(LDAPCONSOLE_PULL_METHOD) \
+		-objdir $(CLASS_DEST) -componentdir $(LDAPCONSOLE_JARDIR) \
+		-files $(LDAPCONSOLE_FILES)
+endif
+	-@if [ ! -f $@ ] ; \
+	then echo "Error: could not get component LDAPCONSOLE file $@" ; \
+	fi
 
 ###########################################################
 ### Perldap package #######################################

ldap/cm/Makefile

@@ -203,8 +203,6 @@ NSDIST = $(BUILD_ROOT)/../dist
 
 DS_JAR_SRC_PATH = $(NSDIST)/$(BUILD_DEBUG)
 DS_JAR_DEST_PATH = java/jars
-DS_JAR_FILE = ds71.jar
-DS_JAR_LANG_FILE = ds71_en.jar
 XMLTOOLS_JAR_FILE = xmltools.jar
 
 UNZIP=unzip -o
@@ -408,8 +406,8 @@ endif
 
 # install the ds jar file in the <server root>/$(DS_JAR_DEST_PATH) directory
 # also install the other jar files we use
-	$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(DS_JAR_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
-	$(INSTALL) -m 644 $(DS_JAR_SRC_PATH)/$(DS_JAR_LANG_FILE) $(RELDIR)/$(DS_JAR_DEST_PATH)
+	$(INSTALL) -m 644 $(NSDIST)/classes/$(LDAPCONSOLEJAR) $(RELDIR)/$(DS_JAR_DEST_PATH)
+	$(INSTALL) -m 644 $(NSDIST)/classes/$(LDAPCONSOLEJAR_EN) $(RELDIR)/$(DS_JAR_DEST_PATH)
 	$(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)
 	$(INSTALL) -m 644 $(NSDIST)/classes/$(CRIMSON_LICENSE) $(RELDIR)/$(DS_JAR_DEST_PATH)