# HG changeset patch
# User David Powell <david.e.powell@oracle.com>
# Date 1295659445 28800
# Node ID f1833b84c12fa4eacf287861bb28827a477167c5
# Parent  d2f5ddc6d701b36fdffec0a3ce3c809c22d47c8e
17760 deliver .desktop file for sharemgr

diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/cmd/applications/vp-apache.desktop
--- a/usr/src/cmd/applications/vp-apache.desktop	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/cmd/applications/vp-apache.desktop	Fri Jan 21 17:24:05 2011 -0800
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Apache Web Server
 Comment=Share files using the Apache HTTP Server
-Exec=/usr/bin/java -client -jar /usr/share/vpanels/vpanels-client.jar apache
-Icon=/usr/share/gnome-system-tools/pixmaps/services.png
+Exec=/usr/bin/vp apache
+Icon=/usr/share/vpanels/pixmaps/apache.png
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Application;System;Settings;
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/cmd/applications/vp-coreadm.desktop
--- a/usr/src/cmd/applications/vp-coreadm.desktop	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/cmd/applications/vp-coreadm.desktop	Fri Jan 21 17:24:05 2011 -0800
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Core Files
 Comment=Configure where core files are stored
-Exec=/usr/bin/java -client -jar /usr/share/vpanels/vpanels-client.jar coreadm
-Icon=/usr/share/gnome-system-tools/pixmaps/services.png
+Exec=/usr/bin/vp coreadm
+Icon=/usr/share/vpanels/pixmaps/coreadm.png
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Application;System;Settings;
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/cmd/applications/vp-firewall.desktop
--- a/usr/src/cmd/applications/vp-firewall.desktop	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/cmd/applications/vp-firewall.desktop	Fri Jan 21 17:24:05 2011 -0800
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=System Firewall
 Comment=Configure which system services are accessible from the network
-Exec=/usr/bin/java -client -jar /usr/share/vpanels/vpanels-client.jar firewall
-Icon=/usr/share/gnome-system-tools/pixmaps/services.png
+Exec=/usr/bin/vp firewall
+Icon=/usr/share/vpanels/pixmaps/firewall.png
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Application;System;Settings;
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/cmd/applications/vp-shares.desktop
--- a/usr/src/cmd/applications/vp-shares.desktop	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/cmd/applications/vp-shares.desktop	Fri Jan 21 17:24:05 2011 -0800
@@ -94,8 +94,8 @@
 Comment[zh_CN]=配置哪些文件夹可共享给网络邻居
 Comment[zh_HK]=設定那一個資料夾共享給你的網絡芳鄰
 Comment[zh_TW]=設定那一個資料夾共享給您的網路芳鄰
-Exec=/usr/bin/java -client -jar /usr/share/vpanels/vpanels-client.jar -D vpanels.ui.navbar sharemgr
-Icon=/usr/share/gnome-system-tools/pixmaps/shares.png
+Exec=/usr/bin/vp sharemgr
+Icon=/usr/share/vpanels/pixmaps/sharemgr.png
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Application;System;Settings;
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/cmd/applications/vp-svcs.desktop
--- a/usr/src/cmd/applications/vp-svcs.desktop	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/cmd/applications/vp-svcs.desktop	Fri Jan 21 17:24:05 2011 -0800
@@ -109,8 +109,8 @@
 Comment[zh_CN]=配置要在系统启动时使用哪些服务
 Comment[zh_HK]=設定當系統啟動時要執行哪項服務
 Comment[zh_TW]=設定當系統啟動時要執行哪項服務
-Exec=/usr/bin/java -client -jar /usr/share/vpanels/vpanels-client.jar -D vpanels.ui.navbar svcs
-Icon=/usr/share/gnome-system-tools/pixmaps/services.png
+Exec=/usr/bin/vp svcs
+Icon=/usr/share/vpanels/pixmaps/svcs.png
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Application;System;Settings;
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/cmd/applications/vp-sysmon.desktop
--- a/usr/src/cmd/applications/vp-sysmon.desktop	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/cmd/applications/vp-sysmon.desktop	Fri Jan 21 17:24:05 2011 -0800
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=System Monitor
 Comment=Monitor the System
-Exec=/usr/bin/java -client -jar /usr/share/vpanels/vpanels-client.jar sysmon
-Icon=/usr/share/gnome-system-tools/pixmaps/computer.png
+Exec=/usr/bin/vp sysmon
+Icon=/usr/share/vpanels/pixmaps/sysmon.png
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Application;System;Settings;
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/cmd/applications/vp-time.desktop
--- a/usr/src/cmd/applications/vp-time.desktop	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/cmd/applications/vp-time.desktop	Fri Jan 21 17:24:05 2011 -0800
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Time/Date
 Comment=Set time/date
-Exec=/usr/bin/java -client -jar /usr/share/vpanels/vpanels-client.jar time
-Icon=/usr/share/gnome-system-tools/pixmaps/time.png
+Exec=/usr/bin/vp time
+Icon=/usr/share/vpanels/pixmaps/time.png
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Application;System;Settings;
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/cmd/applications/vp-usermgr.desktop
--- a/usr/src/cmd/applications/vp-usermgr.desktop	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/cmd/applications/vp-usermgr.desktop	Fri Jan 21 17:24:05 2011 -0800
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=User Manager
 Comment=Manage users on this computer
-Exec=/usr/bin/java -client -jar /usr/share/vpanels/vpanels-client.jar usermgr
-Icon=/usr/share/gnome-system-tools/pixmaps/users-groups.png
+Exec=/usr/bin/vp usermgr
+Icon=/usr/share/vpanels/pixmaps/usermgr.png
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Application;System;Settings;
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/java/vpanels/env-vpanels.xml
--- a/usr/src/java/vpanels/env-vpanels.xml	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/java/vpanels/env-vpanels.xml	Fri Jan 21 17:24:05 2011 -0800
@@ -19,8 +19,7 @@
 
   CDDL HEADER END
 
-  Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-  Use is subject to license terms.
+  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <project name="vpanelsenv">
@@ -40,4 +39,5 @@
 	<property name="proto.panels" location="${proto.vpanels}/panel" />
 	<property name="proto.vpmod" location="${proto.vpanels}/modules" />
 	<property name="proto.vppanel" location="${proto.vpanels}/panels" />
+	<property name="proto.vppixmaps" location="${proto.vpanels}/pixmaps" />
 </project>
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/java/vpanels/panels/apache/build.xml
--- a/usr/src/java/vpanels/panels/apache/build.xml	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/java/vpanels/panels/apache/build.xml	Fri Jan 21 17:24:05 2011 -0800
@@ -19,7 +19,7 @@
  
   CDDL HEADER END
  
-  Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <project name="vpanels-panels-apache" default="jar">
@@ -28,9 +28,14 @@
 	    value="org.opensolaris.os.vp.panels.apache.client.swing.ApachePanelDescriptor"
 	    />
 	<property name="panel.name" value="Apache Web Server" />
+	<property name="panel.icon.src"
+	    value="org/opensolaris/os/vp/panels/apache/client/swing/images/apache-129.png" />
+	<property name="panel.icon.dst" value="apache.png" />
 
 	<import file="../build-panels.xml" />
 
+	<target name="install_project" depends="install_icon" />
+
 	<path id="classpath.javac">
 		<path refid="classpath.panels" />
                 <pathelement location="${ws.java}/rad/rad.jar" />
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/java/vpanels/panels/build-panels.xml
--- a/usr/src/java/vpanels/panels/build-panels.xml	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/java/vpanels/panels/build-panels.xml	Fri Jan 21 17:24:05 2011 -0800
@@ -19,8 +19,7 @@
 
   CDDL HEADER END
 
-  Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-  Use is subject to license terms.
+  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <project name="panelsdef">
@@ -47,6 +46,12 @@
 		</generate.filter>
 	</target>
 
+	<target name="install_icon">
+		<mkdir dir="${proto.vppixmaps}" />
+		<copy file="${panel.icon.src}"
+		    tofile="${proto.vppixmaps}/${panel.icon.dst}" />
+	</target>
+
 	<target name="install" depends="jar,install_project">
 		<install.default targetdir="${proto.panels}" />
 		<install.vpxml />
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/java/vpanels/panels/coreadm/build.xml
--- a/usr/src/java/vpanels/panels/coreadm/build.xml	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/java/vpanels/panels/coreadm/build.xml	Fri Jan 21 17:24:05 2011 -0800
@@ -19,12 +19,14 @@
  
   CDDL HEADER END
  
-  Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <project name="vpanels-panels-coreadm" default="jar">
 	<import file="../build-panels.xml" />
 
+	<target name="install_project" depends="install_icon" />
+
 	<path id="classpath.javac">
 		<path refid="classpath.panels" />
 		<pathelement location="${ws.java}/rad/rad.jar" />
@@ -35,4 +37,7 @@
 	<property name="panel.class"
 	    value="org.opensolaris.os.vp.panels.coreadm.client.swing.CoreAdmPanelDescriptor" />
 	<property name="panel.name" value="Core Files Management" />
+	<property name="panel.icon.src"
+	    value="org/opensolaris/os/vp/panels/coreadm/client/swing/images/core-96.png" />
+	<property name="panel.icon.dst" value="coreadm.png" />
 </project>
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/java/vpanels/panels/firewall/build.xml
--- a/usr/src/java/vpanels/panels/firewall/build.xml	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/java/vpanels/panels/firewall/build.xml	Fri Jan 21 17:24:05 2011 -0800
@@ -19,12 +19,14 @@
  
   CDDL HEADER END
  
-  Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <project name="vpanels-panels-firewall" default="jar">
 	<import file="../build-panels.xml" />
 
+	<target name="install_project" depends="install_icon" />
+
 	<path id="classpath.javac">
 		<fileset refid="ws.extlibs" />
 		<path refid="classpath.panels" />
@@ -37,4 +39,7 @@
 	    value="org.opensolaris.os.vp.panels.firewall.client.swing.FirewallPanelDescriptor"
 	    />
 	<property name="panel.name" value="Network Service Security Management" />
+	<property name="panel.icon.src"
+	    value="org/opensolaris/os/vp/panels/firewall/client/swing/images/server-32.png" />
+	<property name="panel.icon.dst" value="firewall.png" />
 </project>
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/java/vpanels/panels/sharemgr/build.xml
--- a/usr/src/java/vpanels/panels/sharemgr/build.xml	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/java/vpanels/panels/sharemgr/build.xml	Fri Jan 21 17:24:05 2011 -0800
@@ -19,19 +19,22 @@
 
   CDDL HEADER END
 
-  Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-  Use is subject to license terms.
+  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <project name="vpanels-panels-sharemgr" default="jar">
 	<property name="panel.panel" value="sharemgr" />
 	<property name="panel.class"
 	    value="org.opensolaris.os.vp.panels.sharemgr.client.swing.SwingSharemgrPanelDescriptor" />
-
 	<property name="panel.name" value="Share Management" />
+	<property name="panel.icon.src"
+	    value="org/opensolaris/os/vp/panels/sharemgr/client/swing/images/share-96.png" />
+	<property name="panel.icon.dst" value="sharemgr.png" />
 
 	<import file="../build-panels.xml" />
 
+	<target name="install_project" depends="install_icon" />
+
 	<target name="generate_project" depends="panelsdef.generate_project">
 		<generate.adrimpl api="sharemgr.xml" />
 		<generate.struct />
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/java/vpanels/panels/svcs/build.xml
--- a/usr/src/java/vpanels/panels/svcs/build.xml	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/java/vpanels/panels/svcs/build.xml	Fri Jan 21 17:24:05 2011 -0800
@@ -19,7 +19,7 @@
  
   CDDL HEADER END
  
-  Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <project name="vpanels-panels-svcs" default="jar">
@@ -27,9 +27,15 @@
 	<property name="panel.class"
 	    value="org.opensolaris.os.vp.panels.svcs.client.swing.SvcsPanelDescriptor" />
 	<property name="panel.name" value="Service Management Facility panel" />
+	<property name="panel.icon.src"
+	    value="../../panel/org/opensolaris/os/vp/panel/common/smf/images/smf-192.png" />
+	<property name="panel.icon.dst" value="svcs.png" />
+
 
 	<import file="../build-panels.xml" />
 
+	<target name="install_project" depends="install_icon" />
+
 	<path id="classpath.javac">
 		<path refid="classpath.panels" />
 		<pathelement location="${ws.java}/rad/rad.jar" />
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/java/vpanels/panels/sysmon/build.xml
--- a/usr/src/java/vpanels/panels/sysmon/build.xml	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/java/vpanels/panels/sysmon/build.xml	Fri Jan 21 17:24:05 2011 -0800
@@ -19,8 +19,7 @@
  
   CDDL HEADER END
  
-  Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-  Use is subject to license terms.
+  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <project name="vpanels-panels-sysmon" default="jar">
@@ -28,9 +27,14 @@
 	<property name="panel.class"
 	    value="org.opensolaris.os.vp.panels.sysmon.client.swing.SysMonPanelDescriptor" />
 	<property name="panel.name" value="Service Management Facility panel" />
+	<property name="panel.icon.src"
+	    value="org/opensolaris/os/vp/panels/sysmon/client/swing/images/sysmon-32.png" />
+	<property name="panel.icon.dst" value="sysmon.png" />
 
 	<import file="../build-panels.xml" />
 
+	<target name="install_project" depends="install_icon" />
+
 	<path id="classpath.javac">
 		<path refid="classpath.panels" />
 	</path>
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/java/vpanels/panels/time/build.xml
--- a/usr/src/java/vpanels/panels/time/build.xml	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/java/vpanels/panels/time/build.xml	Fri Jan 21 17:24:05 2011 -0800
@@ -19,13 +19,14 @@
 
   CDDL HEADER END
 
-  Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-  Use is subject to license terms.
+  Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <project name="vpanels-panels-time" default="jar">
 	<import file="../build-panels.xml" />
 
+	<target name="install_project" depends="install_icon" />
+
 	<path id="classpath.javac">
 		<fileset refid="ws.extlibs" />
 		<path refid="classpath.panels" />
@@ -37,4 +38,7 @@
 	<property name="panel.class"
 	    value="org.opensolaris.os.vp.panels.time.client.swing.TimePanelDescriptor" />
 	<property name="panel.name" value="Time &amp;amp; Date" />
+	<property name="panel.icon.src"
+	    value="org/opensolaris/os/vp/panels/time/client/swing/images/time-192.png" />
+	<property name="panel.icon.dst" value="time.png" />
 </project>
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/java/vpanels/panels/usermgr/build.xml
--- a/usr/src/java/vpanels/panels/usermgr/build.xml	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/java/vpanels/panels/usermgr/build.xml	Fri Jan 21 17:24:05 2011 -0800
@@ -19,12 +19,14 @@
 
   CDDL HEADER END
 
-  Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 -->
 
 <project name="vpanels-panels-usermgr" default="jar">
 	<import file="../build-panels.xml" />
 
+	<target name="install_project" depends="install_icon" />
+
 	<path id="classpath.javac">
 		<fileset refid="ws.extlibs" />
 		<path refid="classpath.panels" />
@@ -36,6 +38,9 @@
 	<property name="panel.class"
 	    value="org.opensolaris.os.vp.panels.usermgr.client.swing.UserMgrPanelDescriptor" />
 	<property name="panel.name" value="User Manager" />
+	<property name="panel.icon.src"
+	    value="org/opensolaris/os/vp/panels/usermgr/client/swing/images/config-users-32.png" />
+	<property name="panel.icon.dst" value="usermgr.png" />
 
 	<target name="generate_project" depends="panelsdef.generate_project">
 		<generate.adrimpl api="usermgr.xml" />
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/pkg/manifests/system-management-visual-panels-apache.mf
--- a/usr/src/pkg/manifests/system-management-visual-panels-apache.mf	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/pkg/manifests/system-management-visual-panels-apache.mf	Fri Jan 21 17:24:05 2011 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 license cr_Oracle license=cr_Oracle
@@ -48,6 +48,8 @@
 file path=usr/share/vpanels/panel/vpanels-panels-apache.jar
 dir path=usr/share/vpanels/panels
 file path=usr/share/vpanels/panels/apache.xml
+dir path=usr/share/vpanels/pixmaps
+file path=usr/share/vpanels/pixmaps/apache.png
 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/module/apache-php5 type=require
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/pkg/manifests/system-management-visual-panels-coreadm.mf
--- a/usr/src/pkg/manifests/system-management-visual-panels-coreadm.mf	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/pkg/manifests/system-management-visual-panels-coreadm.mf	Fri Jan 21 17:24:05 2011 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 license cr_Oracle license=cr_Oracle
@@ -38,4 +38,6 @@
 file path=usr/share/vpanels/panel/vpanels-panels-coreadm.jar
 dir path=usr/share/vpanels/panels
 file path=usr/share/vpanels/panels/coreadm.xml
+dir path=usr/share/vpanels/pixmaps
+file path=usr/share/vpanels/pixmaps/coreadm.png
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/pkg/manifests/system-management-visual-panels-firewall.mf
--- a/usr/src/pkg/manifests/system-management-visual-panels-firewall.mf	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/pkg/manifests/system-management-visual-panels-firewall.mf	Fri Jan 21 17:24:05 2011 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 license cr_Oracle license=cr_Oracle
@@ -38,5 +38,7 @@
 file path=usr/share/vpanels/panel/vpanels-panels-firewall.jar
 dir path=usr/share/vpanels/panels
 file path=usr/share/vpanels/panels/firewall.xml
+dir path=usr/share/vpanels/pixmaps
+file path=usr/share/vpanels/pixmaps/firewall.png
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
 depend fmri=pkg:/network/ipfilter type=require
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/pkg/manifests/system-management-visual-panels-sharemgr.mf
--- a/usr/src/pkg/manifests/system-management-visual-panels-sharemgr.mf	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/pkg/manifests/system-management-visual-panels-sharemgr.mf	Fri Jan 21 17:24:05 2011 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 license cr_Oracle license=cr_Oracle
@@ -35,6 +35,8 @@
 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/applications group=other
+file path=usr/share/applications/vp-shares.desktop
 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
@@ -43,4 +45,6 @@
 file path=usr/share/vpanels/panel/vpanels-panels-sharemgr.jar
 dir path=usr/share/vpanels/panels
 file path=usr/share/vpanels/panels/sharemgr.xml
+dir path=usr/share/vpanels/pixmaps
+file path=usr/share/vpanels/pixmaps/sharemgr.png
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/pkg/manifests/system-management-visual-panels-svcs.mf
--- a/usr/src/pkg/manifests/system-management-visual-panels-svcs.mf	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/pkg/manifests/system-management-visual-panels-svcs.mf	Fri Jan 21 17:24:05 2011 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 license cr_Oracle license=cr_Oracle
@@ -38,5 +38,7 @@
 file path=usr/share/vpanels/panel/vpanels-panels-svcs.jar
 dir path=usr/share/vpanels/panels
 file path=usr/share/vpanels/panels/svcs.xml
+dir path=usr/share/vpanels/pixmaps
+file path=usr/share/vpanels/pixmaps/svcs.png
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
 depend fmri=pkg:/system/management/visual-panels/panel-smf@$(PKGVERS) type=require
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/pkg/manifests/system-management-visual-panels-sysmon.mf
--- a/usr/src/pkg/manifests/system-management-visual-panels-sysmon.mf	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/pkg/manifests/system-management-visual-panels-sysmon.mf	Fri Jan 21 17:24:05 2011 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 license cr_Oracle license=cr_Oracle
@@ -39,4 +39,6 @@
 file path=usr/share/vpanels/panel/vpanels-panels-sysmon.jar
 dir path=usr/share/vpanels/panels
 file path=usr/share/vpanels/panels/sysmon.xml
+dir path=usr/share/vpanels/pixmaps
+file path=usr/share/vpanels/pixmaps/sysmon.png
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/pkg/manifests/system-management-visual-panels-time.mf
--- a/usr/src/pkg/manifests/system-management-visual-panels-time.mf	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/pkg/manifests/system-management-visual-panels-time.mf	Fri Jan 21 17:24:05 2011 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 license cr_Oracle license=cr_Oracle
@@ -35,9 +35,13 @@
 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/applications group=other
+file path=usr/share/applications/vp-time.desktop
 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
+dir path=usr/share/vpanels/pixmaps
+file path=usr/share/vpanels/pixmaps/time.png
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require
diff -r d2f5ddc6d701 -r f1833b84c12f usr/src/pkg/manifests/system-management-visual-panels-usermgr.mf
--- a/usr/src/pkg/manifests/system-management-visual-panels-usermgr.mf	Wed Jan 19 14:32:11 2011 -0500
+++ b/usr/src/pkg/manifests/system-management-visual-panels-usermgr.mf	Fri Jan 21 17:24:05 2011 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 license cr_Oracle license=cr_Oracle
@@ -42,4 +42,6 @@
 file path=usr/share/vpanels/panel/vpanels-panels-usermgr.jar
 dir path=usr/share/vpanels/panels
 file path=usr/share/vpanels/panels/usermgr.xml
+dir path=usr/share/vpanels/pixmaps
+file path=usr/share/vpanels/pixmaps/usermgr.png
 depend fmri=pkg:/system/management/visual-panels@$(PKGVERS) type=require