Mercurial Mercurial > upstream > oracle > vpanels / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
16428 Packages should use transforms for common attributes
authorDavid Powell <david.e.powell@oracle.com>
Wed, 30 Jun 2010 16:01:09 -0700
changeset 531 b9cbb1abb42a
parent 530 01ff2192fcb8
child 532 3a3f853d60b3
16428 Packages should use transforms for common attributes
usr/src/pkg/Makefile file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-rad-pkg.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-rad-zones.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-rad.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-apache.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-browser.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-coreadm.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-doc.mf.sh file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-examples.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-firewall.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-hypervisor.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-sharemgr.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-smf.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-svcs.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-sysid.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-sysmon.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels-time.mf file | annotate | diff | comparison | revisions
usr/src/pkg/manifests/system-management-visual-panels.mf file | annotate | diff | comparison | revisions
usr/src/pkg/transforms/common_actions file | annotate | diff | comparison | revisions
usr/src/pkg/transforms/defaults file | annotate | diff | comparison | revisions 
--- a/usr/src/pkg/Makefile	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/Makefile	Wed Jun 30 16:01:09 2010 -0700
@@ -82,6 +82,8 @@
 %.mog: manifests/%.mf
 	$(PKGMOGRIFY) $(PKGMOG_DEFINES:%=-D %) -O $(@) $(<) $(TRANSFORMS)
 
+$(MOGS): $(TRANSFORMS)
+
 pkgsend: $(MOGS)
 	if [ "$(PKG_REPO)" = "$(PKG_REPO_LOCAL)" ]; \
 	then \
--- a/usr/src/pkg/manifests/system-management-rad-pkg.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-rad-pkg.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,17 +25,16 @@
 
 set name=pkg.fmri value=pkg:/system/management/rad/pkg@$(PKGVERS)
 set name=pkg.description value="pkg configuration module"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=bin mode=0755 owner=root path=usr/lib
-dir group=bin mode=0755 owner=root path=usr/lib/rad
-dir group=bin mode=0755 owner=root path=usr/lib/rad/module
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/mod_pkg.so
-dir group=bin mode=0755 owner=root path=usr/lib/python2.6
-dir group=bin mode=0755 owner=root path=usr/lib/python2.6/vendor-packages
-dir group=bin mode=0755 owner=root path=usr/lib/python2.6/vendor-packages/pkg_rad
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/pkg_rad/__init__.py
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/pkg_rad/__init__.pyc
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/pkg_rad/radpkg_glue.py
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/pkg_rad/radpkg_glue.pyc
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr/lib
+dir path=usr/lib/rad
+dir path=usr/lib/rad/module
+file path=usr/lib/rad/module/mod_pkg.so
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/pkg_rad
+file path=usr/lib/python2.6/vendor-packages/pkg_rad/__init__.py
+file path=usr/lib/python2.6/vendor-packages/pkg_rad/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/pkg_rad/radpkg_glue.py
+file path=usr/lib/python2.6/vendor-packages/pkg_rad/radpkg_glue.pyc
 depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-rad-zones.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-rad-zones.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,13 +25,12 @@
 
 set name=pkg.fmri value=pkg:/system/management/rad/zones@$(PKGVERS)
 set name=pkg.description value="zones configuration module"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=usr
-dir group=bin mode=0755 owner=root path=usr/bin
-file group=bin mode=0555 owner=root path=usr/bin/zmgr
-dir group=bin mode=0755 owner=root path=usr/lib
-dir group=bin mode=0755 owner=root path=usr/lib/rad
-dir group=bin mode=0755 owner=root path=usr/lib/rad/module
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/mod_zones.so
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr group=sys
+dir path=usr/bin
+file path=usr/bin/zmgr mode=0555
+dir path=usr/lib
+dir path=usr/lib/rad
+dir path=usr/lib/rad/module
+file path=usr/lib/rad/module/mod_zones.so
 depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-rad.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-rad.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,55 +25,54 @@
 
 set name=pkg.fmri value=pkg:/system/management/rad@$(PKGVERS)
 set name=pkg.description value="RAD - Remote Administration Daemon"
-set name=consolidation value=vpanels
-set name=classification value="System/Administration and Configuration"
-dir group=sys mode=0755 owner=root path=etc
-dir group=bin mode=0755 owner=root path=etc/rad
-dir group=bin mode=0755 owner=root path=lib
-dir group=bin mode=0755 owner=root path=lib/svc
-dir group=sys mode=0755 owner=root path=lib/svc/manifest
-dir group=sys mode=0755 owner=root path=lib/svc/manifest/system
-file group=sys mode=0444 owner=root path=lib/svc/manifest/system/rad.xml
-dir group=sys mode=0755 owner=root path=usr
-dir group=bin mode=0755 owner=root path=usr/include
-dir group=bin mode=0755 owner=root path=usr/include/rad
-file group=bin mode=0444 owner=root path=usr/include/rad/adr.h
-file group=bin mode=0444 owner=root path=usr/include/rad/adr_object.h
-file group=bin mode=0444 owner=root path=usr/include/rad/adr_name.h
-file group=bin mode=0444 owner=root path=usr/include/rad/radclient.h
-dir group=bin mode=0755 owner=root path=usr/lib
-dir group=bin mode=0755 owner=root path=usr/lib/python2.6
-dir group=bin mode=0755 owner=root path=usr/lib/python2.6/vendor-packages
-dir group=bin mode=0755 owner=root path=usr/lib/python2.6/vendor-packages/rad
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/rad/__init__.py
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/rad/__init__.pyc
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/rad/client.py
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/rad/client.pyc
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/rad/recordmarking.py
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/rad/recordmarking.pyc
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/rad/util.py
-file group=bin mode=0444 owner=root path=usr/lib/python2.6/vendor-packages/rad/util.pyc
-file group=bin mode=0555 owner=root path=usr/lib/libadr.so.1
+set name=info.classification value="System/Administration and Configuration"
+dir path=etc group=sys
+dir path=etc/rad
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/manifest group=sys
+dir path=lib/svc/manifest/system group=sys
+file path=lib/svc/manifest/system/rad.xml group=sys
+dir path=usr group=sys
+dir path=usr/include
+dir path=usr/include/rad
+file path=usr/include/rad/adr.h
+file path=usr/include/rad/adr_object.h
+file path=usr/include/rad/adr_name.h
+file path=usr/include/rad/radclient.h
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/rad
+file path=usr/lib/python2.6/vendor-packages/rad/__init__.py
+file path=usr/lib/python2.6/vendor-packages/rad/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/rad/client.py
+file path=usr/lib/python2.6/vendor-packages/rad/client.pyc
+file path=usr/lib/python2.6/vendor-packages/rad/recordmarking.py
+file path=usr/lib/python2.6/vendor-packages/rad/recordmarking.pyc
+file path=usr/lib/python2.6/vendor-packages/rad/util.py
+file path=usr/lib/python2.6/vendor-packages/rad/util.pyc
+file path=usr/lib/libadr.so.1
 link path=usr/lib/libadr.so target=libadr.so.1
-file group=bin mode=0555 owner=root path=usr/lib/$(ARCH64)/libadr.so.1
+file path=usr/lib/$(ARCH64)/libadr.so.1
 link path=usr/lib/$(ARCH64)/libadr.so target=libadr.so.1
-file group=bin mode=0555 owner=root path=usr/lib/libradproto.so.1
+file path=usr/lib/libradproto.so.1
 link path=usr/lib/libradproto.so target=libradproto.so.1
-file group=bin mode=0555 owner=root path=usr/lib/$(ARCH64)/libradproto.so.1
+file path=usr/lib/$(ARCH64)/libradproto.so.1
 link path=usr/lib/$(ARCH64)/libradproto.so target=libradproto.so.1
-dir group=bin mode=0755 owner=root path=usr/lib/rad
-dir group=bin mode=0755 owner=root path=usr/lib/rad/module
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/mod_files.so
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/mod_network.so
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/mod_smf.so
-dir group=bin mode=0755 owner=root path=usr/lib/rad/protocol
-file group=bin mode=0555 owner=root path=usr/lib/rad/protocol/mod_proto_rad.so
-file group=bin mode=0555 owner=root path=usr/lib/rad/rad
-dir group=bin mode=0755 owner=root path=usr/lib/rad/transport
-file group=bin mode=0555 owner=root path=usr/lib/rad/transport/mod_xport_pipe.so
-file group=bin mode=0555 owner=root path=usr/lib/rad/transport/mod_xport_socket.so
-file group=bin mode=0555 owner=root path=usr/lib/rad/transport/mod_xport_tls.so
-file group=bin mode=0555 owner=root path=usr/lib/rad/transport/mod_xport_uds.so
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-file group=sys mode=0644 owner=root path=usr/share/vpanels/adr.jar
+dir path=usr/lib/rad
+dir path=usr/lib/rad/module
+file path=usr/lib/rad/module/mod_files.so
+file path=usr/lib/rad/module/mod_network.so
+file path=usr/lib/rad/module/mod_smf.so
+dir path=usr/lib/rad/protocol
+file path=usr/lib/rad/protocol/mod_proto_rad.so
+file path=usr/lib/rad/rad mode=0555
+dir path=usr/lib/rad/transport
+file path=usr/lib/rad/transport/mod_xport_pipe.so
+file path=usr/lib/rad/transport/mod_xport_socket.so
+file path=usr/lib/rad/transport/mod_xport_tls.so
+file path=usr/lib/rad/transport/mod_xport_uds.so
+dir path=usr/share group=sys
+dir path=usr/share/vpanels
+file path=usr/share/vpanels/adr.jar
--- a/usr/src/pkg/manifests/system-management-visual-panels-apache.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-apache.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,27 +25,26 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/apache@$(PKGVERS)
 set name=pkg.description value="Apache Web Server Administration GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=etc
-dir group=sys mode=0755 owner=root path=etc/vpanels
-file group=sys mode=0444 owner=root path=etc/vpanels/httpd_conf.templ
-dir group=bin mode=0755 owner=root path=lib
-dir group=bin mode=0755 owner=root path=lib/svc
-dir group=sys mode=0755 owner=root path=lib/svc/manifest
-dir group=sys mode=0755 owner=root path=lib/svc/manifest/network
-file group=sys mode=0444 owner=root path=lib/svc/manifest/network/http-vpanels.xml
-dir group=bin mode=0755 owner=root path=lib/svc/method
-file group=bin mode=0555 owner=root path=lib/svc/method/http-vpanels
-dir group=sys mode=0755 owner=root path=usr
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=other mode=0755 owner=root path=usr/share/applications
-file group=bin mode=0644 owner=root path=usr/share/applications/vp-apache.desktop
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-apache.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/apache.xml
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=etc group=sys
+dir path=etc/vpanels group=sys
+file path=etc/vpanels/httpd_conf.templ group=sys
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/manifest group=sys
+dir path=lib/svc/manifest/network group=sys
+file path=lib/svc/manifest/network/http-vpanels.xml group=sys
+dir path=lib/svc/method
+file path=lib/svc/method/http-vpanels mode=0555
+dir path=usr group=sys
+dir path=usr/share group=sys
+dir path=usr/share/applications group=other
+file path=usr/share/applications/vp-apache.desktop
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-apache.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/apache.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
 depend fmri=pkg:/web/server/apache-22 type=require
 depend fmri=pkg:/web/server/apache-22/plugin/plugin-php52 type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-browser.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-browser.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,14 +25,13 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/browser@$(PKGVERS)
 set name=pkg.description value="Visual Panels - Panel Browser GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=usr
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=other mode=0755 owner=root path=usr/share/applications
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-browser.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/browser.xml
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr group=sys
+dir path=usr/share group=sys
+dir path=usr/share/applications group=other
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-browser.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/browser.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-coreadm.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-coreadm.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,15 +25,14 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/coreadm@$(PKGVERS)
 set name=pkg.description value="Core Files Administration GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=usr
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=other mode=0755 owner=root path=usr/share/applications
-file group=bin mode=0644 owner=root path=usr/share/applications/vp-coreadm.desktop
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-coreadm.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/coreadm.xml
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr group=sys
+dir path=usr/share group=sys
+dir path=usr/share/applications group=other
+file path=usr/share/applications/vp-coreadm.desktop
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-coreadm.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/coreadm.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-doc.mf.sh	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-doc.mf.sh	Wed Jun 30 16:01:09 2010 -0700
@@ -27,8 +27,7 @@
 cat <<EOF
 set name=pkg.fmri value=pkg:/system/management/visual-panels/doc@\$(PKGVERS)
 set name=pkg.description value="Visual Panels - API Documentation"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
+set name=info.classification value="Applications/Configuration and Preferences"
 EOF
 
 # pkgsend doesn't have any way to specify limits on the files it processes, so
--- a/usr/src/pkg/manifests/system-management-visual-panels-examples.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-examples.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,18 +25,17 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/examples@$(PKGVERS)
 set name=pkg.description value="Visual Panels - Example Panels"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=usr
-dir group=bin mode=0755 owner=root path=usr/lib
-dir group=bin mode=0755 owner=root path=usr/lib/rad
-dir group=bin mode=0755 owner=root path=usr/lib/rad/module
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/example-time2.so
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-examples.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/example-time1.xml
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/example-time2.xml
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/rad
+dir path=usr/lib/rad/module
+file path=usr/lib/rad/module/example-time2.so
+dir path=usr/share group=sys
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-examples.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/example-time1.xml
+file path=usr/share/vpanels/panels/example-time2.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-firewall.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-firewall.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,16 +25,15 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/firewall@$(PKGVERS)
 set name=pkg.description value="Service Firewal Administration GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=usr
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=other mode=0755 owner=root path=usr/share/applications
-file group=bin mode=0644 owner=root path=usr/share/applications/vp-firewall.desktop
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-firewall.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/firewall.xml
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr group=sys
+dir path=usr/share group=sys
+dir path=usr/share/applications group=other
+file path=usr/share/applications/vp-firewall.desktop
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-firewall.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/firewall.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
 depend fmri=pkg:/network/ipfilter type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-hypervisor.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-hypervisor.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,21 +25,20 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/hypervisor@$(PKGVERS)
 set name=pkg.description value="Hypervisor Administration GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
+set name=info.classification value="Applications/Configuration and Preferences"
 set name=variant.arch value=i386
-dir group=sys mode=0755 owner=root path=usr
-dir group=bin mode=0755 owner=root path=usr/lib
-dir group=bin mode=0755 owner=root path=usr/lib/rad
-dir group=bin mode=0755 owner=root path=usr/lib/rad/module
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/mod_hypervisor.so
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=other mode=0755 owner=root path=usr/share/applications
-file group=bin mode=0644 owner=root path=usr/share/applications/vp-hypervisor.desktop
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-hypervisor.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/hypervisor.xml
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/rad
+dir path=usr/lib/rad/module
+file path=usr/lib/rad/module/mod_hypervisor.so
+dir path=usr/share group=sys
+dir path=usr/share/applications group=other
+file path=usr/share/applications/vp-hypervisor.desktop
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-hypervisor.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/hypervisor.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
 depend fmri=pkg:/system/xvm/header-xvm type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-sharemgr.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-sharemgr.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,20 +25,19 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/sharemgr@$(PKGVERS)
 set name=pkg.description value="Share Management Administration GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=usr
-dir group=bin mode=0755 owner=root path=usr/lib
-dir group=bin mode=0755 owner=root path=usr/lib/rad
-dir group=bin mode=0755 owner=root path=usr/lib/rad/module
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/mod_sharemgr.so
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=sys mode=0755 owner=root path=usr/share/lib
-dir group=sys mode=0755 owner=root path=usr/share/lib/java
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/rad
+dir path=usr/lib/rad/module
+file path=usr/lib/rad/module/mod_sharemgr.so
+dir path=usr/share group=sys
+dir path=usr/share/lib group=sys
+dir path=usr/share/lib/java group=sys
 link path=usr/share/lib/java/vpanels-panels-sharemgr.jar target=../../vpanels/panel/vpanels-panels-sharemgr.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-sharemgr.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/sharemgr.xml
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-sharemgr.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/sharemgr.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-smf.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-smf.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,22 +25,21 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/smf@$(PKGVERS)
 set name=pkg.description value="SMF Service Administration GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=etc
-dir group=sys mode=0755 owner=root path=etc/gconf
-dir group=sys mode=0755 owner=root path=etc/gconf/schemas
-file group=sys mode=0444 owner=root path=etc/gconf/schemas/scf.schemas
-dir group=sys mode=0755 owner=root path=usr
-dir group=bin mode=0755 owner=root path=usr/lib
-file group=bin mode=0755 owner=root path=usr/lib/service-browser
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=sys mode=0755 owner=root path=usr/share/lib
-dir group=sys mode=0755 owner=root path=usr/share/lib/java
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=etc group=sys
+dir path=etc/gconf group=sys
+dir path=etc/gconf/schemas group=sys
+file path=etc/gconf/schemas/scf.schemas group=sys
+dir path=usr group=sys
+dir path=usr/lib
+file path=usr/lib/service-browser mode=0555
+dir path=usr/share group=sys
+dir path=usr/share/lib group=sys
+dir path=usr/share/lib/java group=sys
 link path=usr/share/lib/java/vpanels-panels-smf.jar target=../../vpanels/panel/vpanels-panels-smf.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-smf.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/smf.xml
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-smf.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/smf.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-svcs.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-svcs.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,16 +25,15 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/svcs@$(PKGVERS)
 set name=pkg.description value="SMF Services Administration GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=usr
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=other mode=0755 owner=root path=usr/share/applications
-file group=bin mode=0644 owner=root path=usr/share/applications/vp-svcs.desktop
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-svcs.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/svcs.xml
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr group=sys
+dir path=usr/share group=sys
+dir path=usr/share/applications group=other
+file path=usr/share/applications/vp-svcs.desktop
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-svcs.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/svcs.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
 depend fmri=pkg:/system/management/visual-panels/smf@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-sysid.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-sysid.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,18 +25,17 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/sysid@$(PKGVERS)
 set name=pkg.description value="System Identification GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=usr
-dir group=bin mode=0755 owner=root path=usr/lib
-dir group=bin mode=0755 owner=root path=usr/lib/rad
-dir group=bin mode=0755 owner=root path=usr/lib/rad/module
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/mod_sysid.so
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-sysid.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/sysid.xml
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/rad
+dir path=usr/lib/rad/module
+file path=usr/lib/rad/module/mod_sysid.so
+dir path=usr/share group=sys
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-sysid.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/sysid.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
 depend fmri=pkg:/system/management/visual-panels/time@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-sysmon.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-sysmon.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,16 +25,15 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/sysmon@$(PKGVERS)
 set name=pkg.description value="System Monitor GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=usr
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=other mode=0755 owner=root path=usr/share/gnome
-dir group=bin mode=0755 owner=root path=usr/share/gnome/autostart
-file group=bin mode=0644 owner=root path=usr/share/gnome/autostart/vp-sysmon.desktop
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-sysmon.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/sysmon.xml
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr group=sys
+dir path=usr/share group=sys
+dir path=usr/share/gnome group=other
+dir path=usr/share/gnome/autostart
+file path=usr/share/gnome/autostart/vp-sysmon.desktop
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-sysmon.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/sysmon.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels-time.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels-time.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,17 +25,16 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/time@$(PKGVERS)
 set name=pkg.description value="Time Settings GUI"
-set name=consolidation value=vpanels
-set name=classification value="Applications/Configuration and Preferences"
-dir group=sys mode=0755 owner=root path=usr
-dir group=bin mode=0755 owner=root path=usr/lib
-dir group=bin mode=0755 owner=root path=usr/lib/rad
-dir group=bin mode=0755 owner=root path=usr/lib/rad/module
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/mod_time.so
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panel
-file group=sys mode=0644 owner=root path=usr/share/vpanels/panel/vpanels-panels-time.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels/panels
-file group=sys mode=0444 owner=root path=usr/share/vpanels/panels/time.xml
+set name=info.classification value="Applications/Configuration and Preferences"
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/rad
+dir path=usr/lib/rad/module
+file path=usr/lib/rad/module/mod_time.so
+dir path=usr/share group=sys
+dir path=usr/share/vpanels
+dir path=usr/share/vpanels/panel
+file path=usr/share/vpanels/panel/vpanels-panels-time.jar
+dir path=usr/share/vpanels/panels
+file path=usr/share/vpanels/panels/time.xml
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
--- a/usr/src/pkg/manifests/system-management-visual-panels.mf	Wed Jun 30 13:13:45 2010 -0700
+++ b/usr/src/pkg/manifests/system-management-visual-panels.mf	Wed Jun 30 16:01:09 2010 -0700
@@ -25,35 +25,34 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels@$(PKGVERS)
 set name=pkg.description value="Visual Panels - Framework"
-set name=consolidation value=vpanels
-set name=classification value="System/Administration and Configuration"
-dir group=sys mode=0755 owner=root path=usr
-dir group=bin mode=0755 owner=root path=usr/bin
-file group=bin mode=0555 owner=root path=usr/bin/sleeklock
+set name=info.classification value="System/Administration and Configuration"
+dir path=usr group=sys
+dir path=usr/bin
+file path=usr/bin/sleeklock mode=0555
 link path=usr/bin/vp target=../share/lib/java/vpanels-client.jar
-dir group=bin mode=0755 owner=root path=usr/lib
-file group=bin mode=0755 owner=root path=usr/lib/libUnixDomainSocket_jni.so.1
+dir path=usr/lib
+file path=usr/lib/libUnixDomainSocket_jni.so.1
 link path=usr/lib/libjniutil.so target=libjniutil.so.1
-file group=bin mode=0755 owner=root path=usr/lib/libjniutil.so.1
-dir group=bin mode=0755 owner=root path=usr/lib/rad
-dir group=bin mode=0755 owner=root path=usr/lib/rad/module
-file group=bin mode=0555 owner=root path=usr/lib/rad/module/mod_panels.so
-dir group=sys mode=0755 owner=root path=usr/share
-dir group=sys mode=0755 owner=root path=usr/share/lib/xml
-dir group=sys mode=0755 owner=root path=usr/share/lib/xml/dtd
-file group=bin mode=0444 owner=root path=usr/share/lib/xml/dtd/vpanel.dtd.1
-dir group=sys mode=0755 owner=root path=usr/share/lib
-dir group=sys mode=0755 owner=root path=usr/share/lib/java
+file path=usr/lib/libjniutil.so.1
+dir path=usr/lib/rad
+dir path=usr/lib/rad/module
+file path=usr/lib/rad/module/mod_panels.so
+dir path=usr/share group=sys
+dir path=usr/share/lib/xml group=sys
+dir path=usr/share/lib/xml/dtd group=sys
+file path=usr/share/lib/xml/dtd/vpanel.dtd.1
+dir path=usr/share/lib group=sys
+dir path=usr/share/lib/java group=sys
 link path=usr/share/lib/java/vpanels-client.jar target=../../vpanels/vpanels-client.jar
-dir group=sys mode=0755 owner=root path=usr/share/vpanels
-file group=sys mode=0644 owner=root path=usr/share/vpanels/TimingFramework-1.0.jar
-file group=sys mode=0644 owner=root path=usr/share/vpanels/rad.jar
-file group=sys mode=0644 owner=root path=usr/share/vpanels/scf-common.jar
-file group=sys mode=0644 owner=root path=usr/share/vpanels/swingx-0.9.3.jar
-file group=sys mode=0755 owner=root path=usr/share/vpanels/vpanels-client.jar
-file group=sys mode=0644 owner=root path=usr/share/vpanels/vpanels-common.jar
-file group=sys mode=0644 owner=root path=usr/share/vpanels/vpanels-panel.jar
-file group=sys mode=0644 owner=root path=usr/share/vpanels/vpanels-util.jar
+dir path=usr/share/vpanels
+file path=usr/share/vpanels/TimingFramework-1.0.jar
+file path=usr/share/vpanels/rad.jar
+file path=usr/share/vpanels/scf-common.jar
+file path=usr/share/vpanels/swingx-0.9.3.jar
+file path=usr/share/vpanels/vpanels-client.jar mode=0555
+file path=usr/share/vpanels/vpanels-common.jar
+file path=usr/share/vpanels/vpanels-panel.jar
+file path=usr/share/vpanels/vpanels-util.jar
 depend fmri=pkg:/system/management/rad@$(PKGVERS) type=require
 depend fmri=pkg:/library/java/java-gnome type=require
 depend fmri=pkg:/library/java/javahelp type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/transforms/common_actions	Wed Jun 30 16:01:09 2010 -0700
@@ -0,0 +1,39 @@
+#
+# 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
+#
+
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# These actions represent settings which should appear in every package.
+#
+
+#
+# Name the consolidation this package came from.
+#
+set name=org.opensolaris.consolidation value=vpanels
+
+#
+# Indicate that the package was published in a zones aware
+# fashion.
+#
+set name=variant.opensolaris.zone value=global value=nonglobal
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/transforms/defaults	Wed Jun 30 16:01:09 2010 -0700
@@ -0,0 +1,39 @@
+#
+# 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
+#
+
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+
+#
+# shared objects should generally have mode 0555
+#
+<transform file path=.*lib/.*\.so.* -> default mode 0555>
+
+#
+# For what's left, go with root:bin 0644, +x for directories
+#
+#
+<transform file dir -> default owner root>
+<transform file dir -> default group bin>
+<transform file -> default mode 0444>
+<transform dir -> default mode 0755>
upstream/oracle/vpanels