--- a/src/util/distro-import/75a/all.i386.75a	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/75a/all.i386.75a	Wed Apr 16 15:24:51 2008 -0700
@@ -43,6 +43,12 @@
 include common/SUNWhpijs
 include common/SUNWiiim
 include common/SUNWiniu8
+include common/SUNWjavadb-client
+include common/SUNWjavadb-common
+include common/SUNWjavadb-core
+include common/SUNWjavadb-demo
+include common/SUNWjavadb-docs
+include common/SUNWjavadb-javadoc
 include common/SUNWjaxp
 include common/SUNWjds-registration.72
 include common/SUNWkiu8
@@ -107,6 +113,7 @@
 include common/SUNWxwsvr
 include common/SUNWxwts
 include common/SUNWxwxft
+include common/SUNWzone
 include i386/NVDAgraphics
 include i386/SUNWaac
 include i386/SUNWamd8111s

--- a/src/util/distro-import/79b/all.i386.79b	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/79b/all.i386.79b	Wed Apr 16 15:24:51 2008 -0700
@@ -51,6 +51,12 @@
 include common/SUNWiiim
 include common/SUNWiniu8
 include common/SUNWisns
+include common/SUNWjavadb-client
+include common/SUNWjavadb-common
+include common/SUNWjavadb-core
+include common/SUNWjavadb-demo
+include common/SUNWjavadb-docs
+include common/SUNWjavadb-javadoc
 include common/SUNWjaxp.78
 include common/SUNWjds-registration.72
 include common/SUNWkiu8
@@ -140,6 +146,7 @@
 include common/SUNWxwsvr
 include common/SUNWxwts
 include common/SUNWxwxft
+include common/SUNWzone
 include i386/NVDAgraphics.76
 include i386/SUNWaac
 include i386/SUNWamd8111s.76

--- a/src/util/distro-import/84/all.i386.84	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/84/all.i386.84	Wed Apr 16 15:24:51 2008 -0700
@@ -56,6 +56,12 @@
 include common/SUNWiiim
 include common/SUNWiniu8
 include common/SUNWisns
+include common/SUNWjavadb-client
+include common/SUNWjavadb-common
+include common/SUNWjavadb-core
+include common/SUNWjavadb-demo
+include common/SUNWjavadb-docs
+include common/SUNWjavadb-javadoc
 include common/SUNWjaxp.78
 include common/SUNWjds-registration.72
 include common/SUNWkiu8
@@ -155,6 +161,7 @@
 include common/SUNWxwsvr
 include common/SUNWxwts
 include common/SUNWxwxft
+include common/SUNWzone
 include i386/NVDAgraphics.81
 include i386/SUNWamd8111s.76
 include i386/SUNWatigfx

--- a/src/util/distro-import/85/all.i386.85	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/85/all.i386.85	Wed Apr 16 15:24:51 2008 -0700
@@ -74,6 +74,12 @@
 include common/SUNWipkg-gui
 include common/SUNWipkg-gui-data
 include common/SUNWisns
+include common/SUNWjavadb-client
+include common/SUNWjavadb-common
+include common/SUNWjavadb-core
+include common/SUNWjavadb-demo
+include common/SUNWjavadb-docs
+include common/SUNWjavadb-javadoc
 include common/SUNWjaxp.78
 include common/SUNWjds-registration.72
 include common/SUNWkiu8
@@ -190,6 +196,7 @@
 include common/SUNWxwsvr
 include common/SUNWxwts
 include common/SUNWxwxft
+include common/SUNWzone
 include i386/NVDAgraphics.81
 include i386/SUNWamd8111s.76
 include i386/SUNWatigfx

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/86/SUNWblank.xml	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ Use is subject to license terms.
+
+ CDDL HEADER START
+
+ The contents of this file are subject to the terms of the
+ Common Development and Distribution License (the "License").
+ You may not use this file except in compliance with the License.
+
+ You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ or http://www.opensolaris.org/os/licensing.
+ See the License for the specific language governing permissions
+ and limitations under the License.
+
+ When distributing Covered Code, include this CDDL HEADER in each
+ file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ If applicable, add the following below this CDDL HEADER, with the
+ fields enclosed by brackets "[]" replaced with your own identifying
+ information: Portions Copyright [yyyy] [name of copyright owner]
+
+ CDDL HEADER END
+
+    ident	"@(#)SUNWblank.xml	1.2	05/06/08 SMI"
+
+    DO NOT EDIT THIS FILE.  Use zonecfg(1M) instead.
+-->
+
+<!DOCTYPE zone PUBLIC "-//Sun Microsystems Inc//DTD Zones//EN" "file:///usr/share/lib/xml/dtd/zonecfg.dtd.1">
+
+<zone name="blank" zonepath="" autoboot="false" brand="ipkg">
+</zone>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/86/SUNWdefault.xml	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<!--
+ Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ Use is subject to license terms.
+
+ CDDL HEADER START
+
+ The contents of this file are subject to the terms of the
+ Common Development and Distribution License (the "License").
+ You may not use this file except in compliance with the License.
+
+ You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ or http://www.opensolaris.org/os/licensing.
+ See the License for the specific language governing permissions
+ and limitations under the License.
+
+ When distributing Covered Code, include this CDDL HEADER in each
+ file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ If applicable, add the following below this CDDL HEADER, with the
+ fields enclosed by brackets "[]" replaced with your own identifying
+ information: Portions Copyright [yyyy] [name of copyright owner]
+
+ CDDL HEADER END
+
+    ident	"@(#)SUNWdefault.xml	1.2	05/06/08 SMI"
+
+    DO NOT EDIT THIS FILE.  Use zonecfg(1M) instead.
+-->
+
+<!DOCTYPE zone PUBLIC "-//Sun Microsystems Inc//DTD Zones//EN" "file:///usr/share/lib/xml/dtd/zonecfg.dtd.1">
+
+<zone name="default" zonepath="" autoboot="false" brand="ipkg">
+</zone>

--- a/src/util/distro-import/86/SUNWfixes.prototype	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/86/SUNWfixes.prototype	Wed Apr 16 15:24:51 2008 -0700
@@ -25,6 +25,8 @@
 f none etc/svc/nonglobal_repo.db 0600 root sys
 e none etc/user_attr 0644 root sys
 e none etc/user_attr.cdonly 0644 root sys
+f none etc/zones/SUNWblank.xml 0444 root bin
+f none etc/zones/SUNWdefault.xml 0444 root bin
 f none lib/svc/method/fs-usr 0555 root bin
 f none lib/svc/method/sshd 0555 root bin
 f none lib/svc/method/svc-dlmgmtd 0555 root bin

--- a/src/util/distro-import/86/all.i386.86	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/86/all.i386.86	Wed Apr 16 15:24:51 2008 -0700
@@ -22,9 +22,9 @@
 include common/SUNWcairomm
 include common/SUNWccsm
 include common/SUNWciu8.86
-include common/SUNWcompiz
 include common/SUNWcompiz-fusion-extra
 include common/SUNWcompiz-fusion-main
+include common/SUNWcompiz.86
 include common/SUNWcompizconfig-gconf
 include common/SUNWcompizconfig-python
 include common/SUNWcs.86
@@ -79,6 +79,7 @@
 include common/SUNWinstall-libs
 include common/SUNWipkg-gui.86
 include common/SUNWisns
+include common/SUNWjavadb
 include common/SUNWjaxp.78
 include common/SUNWjds-registration.72
 include common/SUNWkiu8.86
@@ -197,6 +198,7 @@
 include common/SUNWxwpmn.86
 include common/SUNWxwsvr.86
 include common/SUNWxwts
+include common/SUNWzone.86
 include i386/NVDAgraphics.81
 include i386/SUNWamd8111s.76
 include i386/SUNWatigfx

--- a/src/util/distro-import/86/redist_cluster	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/86/redist_cluster	Wed Apr 16 15:24:51 2008 -0700
@@ -89,9 +89,9 @@
 include common/SUNWciu8.86
 include common/SUNWcnetr
 include common/SUNWcns
-include common/SUNWcompiz
 include common/SUNWcompiz-fusion-extra
 include common/SUNWcompiz-fusion-main
+include common/SUNWcompiz.86
 include common/SUNWcompizconfig-gconf
 include common/SUNWcompizconfig-python
 include common/SUNWcpcu
@@ -328,12 +328,7 @@
 include common/SUNWj6dmx
 include common/SUNWj6dvx
 include common/SUNWj6man
-include common/SUNWjavadb-client
-include common/SUNWjavadb-common
-include common/SUNWjavadb-core
-include common/SUNWjavadb-demo
-include common/SUNWjavadb-docs
-include common/SUNWjavadb-javadoc
+include common/SUNWjavadb
 include common/SUNWjpg
 include common/SUNWjre-config-plugin
 include common/SUNWjss
@@ -674,7 +669,7 @@
 include common/SUNWzfskr
 include common/SUNWzip
 include common/SUNWzlib
-include common/SUNWzone
+include common/SUNWzone.86
 include common/SUNWzsh
 include common/loc/SUNWauaos.86
 include common/loc/SUNWauaow.86

--- a/src/util/distro-import/86/slim_cluster	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/86/slim_cluster	Wed Apr 16 15:24:51 2008 -0700
@@ -38,9 +38,9 @@
 include common/SUNWcfpl
 include common/SUNWchxge
 include common/SUNWcnetr
-include common/SUNWcompiz
 include common/SUNWcompiz-fusion-extra
 include common/SUNWcompiz-fusion-main
+include common/SUNWcompiz.86
 include common/SUNWcompizconfig-gconf
 include common/SUNWcompizconfig-python
 include common/SUNWcpcu
@@ -395,7 +395,7 @@
 include common/SUNWzfskr
 include common/SUNWzip
 include common/SUNWzlib
-include common/SUNWzone
+include common/SUNWzone.86
 include common/SUNWzsh
 include common/loc/SUNWfirefoxl10n-de-DE
 include common/loc/SUNWfirefoxl10n-es-ES

--- a/src/util/distro-import/Makefile	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/Makefile	Wed Apr 16 15:24:51 2008 -0700
@@ -69,6 +69,8 @@
 	boot/grub/menu.lst			\
 	boot/grub/splash.xpm.gz			\
 	etc/inet/hosts				\
+	etc/zones/SUNWblank.xml			\
+	etc/zones/SUNWdefault.xml		\
 	lib/svc/method/fs-usr			\
 	lib/svc/method/sshd			\
 	lib/svc/method/svc-dlmgmtd		\
@@ -246,6 +248,7 @@
 	mkdir -p proto/etc/inet
 	mkdir -p proto/etc/security
 	mkdir -p proto/etc/svc
+	mkdir -p proto/etc/zones
 	mkdir -p proto/lib/svc/method
 	mkdir -p proto/usr/bin
 	mkdir -p proto/usr/jdk/instances/jdk1.6.0/jre

--- a/src/util/distro-import/all.i386	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/all.i386	Wed Apr 16 15:24:51 2008 -0700
@@ -399,12 +399,6 @@
 include common/SUNWjato
 include common/SUNWjatodmo
 include common/SUNWjatodoc
-include common/SUNWjavadb-client
-include common/SUNWjavadb-common
-include common/SUNWjavadb-core
-include common/SUNWjavadb-demo
-include common/SUNWjavadb-docs
-include common/SUNWjavadb-javadoc
 include common/SUNWjdmk-base
 include common/SUNWjdsrm
 include common/SUNWjdsver
@@ -779,6 +773,5 @@
 include common/SUNWzfskr
 include common/SUNWzip
 include common/SUNWzlib
-include common/SUNWzone
 include common/SUNWzsh
 include cluster.import

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWcompiz.86	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,5 @@
+package SUNWcompiz
+import SUNWcompiz
+import SUNWcompiz-devel
+import SUNWcompiz-root
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWjavadb	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,8 @@
+package SUNWjavadb
+import SUNWjavadb-client
+import SUNWjavadb-common
+import SUNWjavadb-core
+import SUNWjavadb-demo
+import SUNWjavadb-docs
+import SUNWjavadb-javadoc
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWjavadb-client.86	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,8 @@
+#
+# As there isn't currently a way to delete packages on upgrade, create an
+# empty package which will cause the previous contents of the package to
+# be deleted when the newer package is installed.
+#
+package SUNWjavadb-client
+depend SUNWjavadb
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWjavadb-common.86	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,8 @@
+#
+# As there isn't currently a way to delete packages on upgrade, create an
+# empty package which will cause the previous contents of the package to
+# be deleted when the newer package is installed.
+#
+package SUNWjavadb-common
+depend SUNWjavadb
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWjavadb-core.86	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,8 @@
+#
+# As there isn't currently a way to delete packages on upgrade, create an
+# empty package which will cause the previous contents of the package to
+# be deleted when the newer package is installed.
+#
+package SUNWjavadb-core
+depend SUNWjavadb
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWjavadb-demo.86	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,8 @@
+#
+# As there isn't currently a way to delete packages on upgrade, create an
+# empty package which will cause the previous contents of the package to
+# be deleted when the newer package is installed.
+#
+package SUNWjavadb-demo
+depend SUNWjavadb
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWjavadb-docs.86	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,8 @@
+#
+# As there isn't currently a way to delete packages on upgrade, create an
+# empty package which will cause the previous contents of the package to
+# be deleted when the newer package is installed.
+#
+package SUNWjavadb-docs
+depend SUNWjavadb
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWjavadb-javadoc.86	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,8 @@
+#
+# As there isn't currently a way to delete packages on upgrade, create an
+# empty package which will cause the previous contents of the package to
+# be deleted when the newer package is installed.
+#
+package SUNWjavadb-javadoc
+depend SUNWjavadb
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/common/SUNWzone.86	Wed Apr 16 15:24:51 2008 -0700
@@ -0,0 +1,10 @@
+package SUNWzone
+import SUNWzoneu
+import SUNWzoner
+drop etc/zones/SUNWblank.xml
+drop etc/zones/SUNWdefault.xml
+from SUNWfixes import
+etc/zones/SUNWblank.xml
+etc/zones/SUNWdefault.xml
+end import
+end package

--- a/src/util/distro-import/i386/SUNWj6rt	Wed Apr 16 14:39:01 2008 -0700
+++ b/src/util/distro-import/i386/SUNWj6rt	Wed Apr 16 15:24:51 2008 -0700
@@ -18,6 +18,7 @@
 add link path=usr/bin/rmiregistry target=../java/bin/rmiregistry
 add link path=usr/bin/servertool target=../java/bin/servertool
 add link path=usr/bin/tnameserv target=../java/bin/tnameserv
-add link path=usr/java target=jdk/instances/jdk1.6.0
-add link path=usr/jdk/latest target=instances/jdk1.6.0
+add link path=usr/java target=jdk/jdk1.6.0_04
+add link path=usr/jdk/jdk1.6.0_04 target=instances/jdk1.6.0
+add link path=usr/jdk/latest target=jdk1.6.0_04
 end package