--- a/components/visual-panels/core/system-management-visual-panels-doc.p5m	Mon Oct 28 17:52:58 2013 -0700
+++ b/components/visual-panels/core/system-management-visual-panels-doc.p5m	Wed Oct 30 16:53:48 2013 -0400
@@ -31,78 +31,6 @@
 
 license ../vpanels.copyright license=Oracle
 
-dir path=usr
-dir path=usr/share
-dir path=usr/share/lib
-dir path=usr/share/lib/java
-dir path=usr/share/lib/java/javadoc
-dir path=usr/share/lib/java/javadoc/smf-old
-dir path=usr/share/lib/java/javadoc/smf-old/com
-dir path=usr/share/lib/java/javadoc/smf-old/com/oracle
-dir path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris
-dir path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/scf
-dir path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/scf/common
-dir path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp
-dir path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel
-dir path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common
-dir path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api
-dir path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old
-dir path=usr/share/lib/java/javadoc/smf-old/resources
-dir path=usr/share/lib/java/javadoc/vpanels-panel
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/action
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/auth
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/file
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/network
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/time
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/control
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/model
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/depend
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/view
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/swing
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/swing/action
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/swing/control
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/swing/model
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/swing/smf
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/swing/timezone
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/swing/view
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels
-dir path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time
-dir path=usr/share/lib/java/javadoc/vpanels-panel/resources
-dir path=usr/share/lib/java/javadoc/vpanels-util
-dir path=usr/share/lib/java/javadoc/vpanels-util/com
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/cli
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/cli/exception
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/common
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/common/propinfo
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/misc
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/misc/converter
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/misc/event
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/misc/exception
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/misc/finder
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/misc/predicate
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/misc/property
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/swing
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/swing/event
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/swing/glass
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/swing/layout
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/swing/property
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/swing/propinfo
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/swing/time
-dir path=usr/share/lib/java/javadoc/vpanels-util/com/oracle/solaris/vp/util/swing/tree
-dir path=usr/share/lib/java/javadoc/vpanels-util/resources
 file path=usr/share/lib/java/javadoc/smf-old/allclasses-frame.html
 file path=usr/share/lib/java/javadoc/smf-old/allclasses-noframe.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/scf/common/FMRI.html
@@ -115,7 +43,7 @@
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/scf/common/package-tree.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/scf/common/ScfConstants.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/scf/common/ScfException.html
-file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/AggregatorMXBean.html
+file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/Aggregator.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/Dependency.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/Instance.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/LogInfo.html
@@ -127,7 +55,7 @@
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/PropertyType.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/PropertyVisibility.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/Service.html
-file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/ServiceInfoMXBean.html
+file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/ServiceInfo.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/SmfError.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/SmfErrorCode.html
 file path=usr/share/lib/java/javadoc/smf-old/com/oracle/solaris/vp/panel/common/api/smf_old/SmfState.html
@@ -170,28 +98,25 @@
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/auth/RoleHint.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/auth/UnauthorizedException.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/auth/UserHint.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/file/FileBrowserMXBean.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/file/FileBrowserUtil.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/file/FileBrowser.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/file/FileSnapshot.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/file/package-frame.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/file/package-summary.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/file/package-tree.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/file/RemoteFile.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/file/RemoteFileSystemView.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/network/NetworkMXBean.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/network/NetworkUtil.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/network/Network.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/network/package-frame.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/network/package-summary.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/network/package-tree.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel/CustomPanel.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel/MBeanUtil.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel/package-frame.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel/package-summary.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel/package-tree.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel/PanelMXBean.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel/PanelMXBeanTracker.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel/Panel.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel/PanelBeanTracker.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/panel/ResourceDescriptor.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/time/HasTimeMXBean.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/time/HasTimeBean.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/time/package-frame.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/time/package-summary.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/api/time/package-tree.html
@@ -256,7 +181,7 @@
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/model/PanelDescriptor.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/model/PropertyChangeForwarder.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/model/View.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/MXBeanTracker.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/BeanTracker.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/package-frame.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/package-summary.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/package-tree.html
@@ -294,8 +219,8 @@
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/PropertyValuePropInfo.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/RepoManagedObject.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/ServiceManagedObject.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/ServiceMXBean.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/ServiceMXBeanAdaptor.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/ServiceBean.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/ServiceBeanAdaptor.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/ServicePanelDescriptor.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/ServiceTracker.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/common/smf/ServiceUtil.html
@@ -460,19 +385,19 @@
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/swing/view/WizardPanel.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panel/swing/view/WizardStepPanel.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/Continent.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/ContinentImpl.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/Continent.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/Coordinates.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/Coordinates.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/CoordinatesImpl.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/Country.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/CountryImpl.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/Country.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/package-frame.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/package-summary.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/package-tree.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/ServerInfo.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/ServerInfoImpl.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/TimeMXBean.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/ServerInfo.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/Time.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/TimeZoneInfo.html
-file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/TimeZoneInfoImpl.html
+file path=usr/share/lib/java/javadoc/vpanels-panel/com/oracle/solaris/vp/panels/time/TimeZoneInfo.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/constant-values.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/deprecated-list.html
 file path=usr/share/lib/java/javadoc/vpanels-panel/help-doc.html