# HG changeset patch
# User dwanvik
# Date 1302901269 -7200
# Node ID da8c6a765bc93b1624401dbcd8d7fb7fd1f46eed
# Parent  f66626469aa8c01b61a84de4d41a675d678ddf86
7036048: Bring the Java DB in JDK7 to the same level as JDK 6 (Java DB v10.6.2.1)
Summary: Replace the existing Java DB bundles with newer ones, and move demo dir into JDK's demo dir as db
Reviewed-by: ohair

diff -r f66626469aa8 -r da8c6a765bc9 jdk/make/common/Release.gmk
--- a/jdk/make/common/Release.gmk	Thu Apr 14 21:27:10 2011 -0700
+++ b/jdk/make/common/Release.gmk	Fri Apr 15 23:01:09 2011 +0200
@@ -885,12 +885,18 @@
 ABS_DB_PATH  :=$(call FullPath,$(CLOSED_SHARE_SRC)/db)
 DB_ZIP_LIST = $(shell $(LS) $(ABS_DB_PATH)/*.zip 2>/dev/null)
 
+# Java DB image. Move the Java DB demo directory into the JDK's demo
+# dir and in the process, rename it to db.  Also remove index.html,
+# since it presumes docs are co-located. Also remove register.html (no
+# longer relevant).
 initial-image-jdk-db: $(DB_ZIP_LIST)
 	$(MKDIR) -p $(JDK_IMAGE_DIR)/db
 	for d in $(DB_ZIP_LIST); do \
           ($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $$d); \
 	done
-
+	$(RM) -rf $(DEMODIR)/db
+	$(MV) $(JDK_IMAGE_DIR)/db/demo $(DEMODIR)/db
+	$(RM) $(JDK_IMAGE_DIR)/db/index.html $(JDK_IMAGE_DIR)/db/register.html
 endif
 
 # Standard jdk image