[embjopr-commits] EMBJOPR SVN: r491 - trunk/jbas5/etc.

embjopr-commits at lists.jboss.org embjopr-commits at lists.jboss.org
Tue Jun 2 13:27:52 EDT 2009


Author: ips
Date: 2009-06-02 13:27:52 -0400 (Tue, 02 Jun 2009)
New Revision: 491

Modified:
   trunk/jbas5/etc/generated-rhq-plugin.xml
Log:
the latest generated descriptor (includes the new EJB3 component types)


Modified: trunk/jbas5/etc/generated-rhq-plugin.xml
===================================================================
--- trunk/jbas5/etc/generated-rhq-plugin.xml	2009-06-02 16:36:12 UTC (rev 490)
+++ trunk/jbas5/etc/generated-rhq-plugin.xml	2009-06-02 17:27:52 UTC (rev 491)
@@ -1,559 +1,266 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <plugin xmlns="urn:xmlns:rhq-plugin" xmlns:c="urn:xmlns:rhq-configuration">
-    <service name="XA DataSource">
-        <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/>
-        <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics"
-                   description="Obtain a formatted statistics report">
-            <parameters>
-                <c:simple-property required="false" name="formatClassName"
-                                   description="The StatisticsFormatter class name"/>
-            </parameters>
-            <results>
-                <c:notes>Obtain a formatted statistics report</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="listStatistics" displayName="List Statistics" description="Obtain a statistics report">
-            <results>
-                <c:notes>Obtain a statistics report</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail"
-                displayName="Available Connection Count" description="number of available connection" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail"
-                displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail"
-                displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail"
-                displayName="In Use Connection Count" description="number of connections currently in use"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail"
-                displayName="Max Connections In Use Count" description="number of maximum connections in use"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="NoTx ConnectionFactory">
+        <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
-            <c:simple-property type="integer" required="false" name="allocation-retry"
-                               description="The number of times allocation retries should be tried"/>
-            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"
-                               description="The time to wait between allocation retries"/>
-            <c:simple-property type="boolean" required="false" name="background-validation"
-                               description="Whether to use backgroup validation"/>
+            <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/>
+            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/>
+            <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/>
             <c:simple-property type="long" required="false" name="background-validation-millis"/>
-            <c:simple-property type="long" required="false" name="blocking-timeout-millis"
-                               description="The time to wait for a connection to become available before giving up"/>
-            <c:simple-property required="false" name="check-valid-connection-sql"
-                               description="The SQL statement to validate a connection"/>
-            <c:map-property required="false" readOnly="true" name="config-property"
-                            description="The connection factory property info"/>
+            <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/>
+            <c:map-property required="false" name="config-property" description="The connection factory config properties"/>
             <c:simple-property name="connection-definition" description="The connection factory class name"/>
-            <c:simple-property required="false" name="exception-sorter-class-name"
-                               description="The exception sorter class name"/>
-            <c:simple-property type="integer" required="false" name="idle-timeout-minutes"
-                               description="The idle timeout in minutes"/>
+            <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/>
             <c:simple-property type="boolean" required="false" name="interleaving"/>
             <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/>
             <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/>
             <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/>
             <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/>
-            <c:simple-property type="integer" required="false" name="max-pool-size"
-                               description="The max size of the pool"/>
+            <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/>
             <c:map-property required="false" name="metadata">
                 <c:simple-property required="false" name="typeMapping"/>
             </c:map-property>
-            <c:simple-property type="integer" required="false" name="min-pool-size"
-                               description="The min size of the pool"/>
-            <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/>
+            <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/>
             <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/>
-            <c:simple-property required="false" name="password" description="The DataSource password"/>
-            <c:simple-property required="false" name="poolJndiName"/>
-            <c:simple-property type="boolean" required="false" name="prefill"
-                               description="Whether to prefill the pool"/>
-            <c:simple-property type="integer" required="false" name="prepared-statement-cache-size"
-                               description="The DataSource prepared statement cache size"/>
-            <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/>
+            <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/>
             <c:simple-property name="rar-name" description="The resource adapter archive name"/>
-            <c:map-property required="false" name="security-domain"
-                            description="The security-domain used to validate connections">
+            <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections">
                 <c:simple-property required="false" name="domain" description="the security domain"/>
-                <c:simple-property required="false" name="securityDeploymentType"
-                                   description="the security deployment type"/>
+                <c:simple-property required="false" name="securityDeploymentType" description="the security deployment type"/>
             </c:map-property>
-            <c:simple-property type="boolean" required="false" name="set-tx-query-timeout"
-                               description="Should query timeout be enabled"/>
-            <c:simple-property type="boolean" required="false" name="share-prepared-statements"
-                               description="Should prepared statements be shared"/>
-            <c:simple-property required="false" name="stale-connection-checker-class-name"
-                               description="The DataSource stale connection checker class name"/>
             <c:simple-property required="false" name="statistics-formatter"/>
             <c:simple-property type="boolean" required="false" name="track-connection-by-tx"/>
-            <c:simple-property required="false" name="track-statements" description="The track statements method"/>
-            <c:simple-property required="false" name="transaction-isolation"
-                               description="The DataSource transaction isolation level"/>
             <c:simple-property required="false" name="type-mapping"/>
-            <c:simple-property required="false" name="url-delimiter" description="The DataSource url delimiter"/>
-            <c:simple-property required="false" name="url-property" description="The url-property"/>
-            <c:simple-property required="false" name="url-selector-strategy-class-name"
-                               description="The DataSource url selector strategy class name"/>
-            <c:simple-property type="boolean" required="false" name="use-java-context"
-                               description="Should the jndi name be bound under the java: context"/>
+            <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/>
             <c:simple-property type="boolean" required="false" name="use-strict-min"/>
-            <c:simple-property type="long" required="false" name="use-try-lock"
-                               description="The internal lock timeout"/>
-            <c:simple-property required="false" name="user-name" description="The DataSource username"/>
-            <c:simple-property required="false" name="valid-connection-checker-class-name"
-                               description="The DataSource connection checker class name"/>
             <c:simple-property type="boolean" required="false" name="validate-on-match"/>
-            <c:simple-property name="xa-datasource-class" description="The XADataSource class"/>
-            <c:map-property required="false" name="xa-datasource-properties"
-                            description="The xa datasource properties"/>
-            <c:simple-property type="integer" required="false" name="xa-resource-timeout"
-                               description="The XAResource timeout"/>
         </resource-configuration>
     </service>
-    <service name="LocalTx DataSource">
-        <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/>
-        <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics"
-                   description="Obtain a formatted statistics report">
-            <parameters>
-                <c:simple-property required="false" name="formatClassName"
-                                   description="The StatisticsFormatter class name"/>
-            </parameters>
-            <results>
-                <c:notes>Obtain a formatted statistics report</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="listStatistics" displayName="List Statistics" description="Obtain a statistics report">
-            <results>
-                <c:notes>Obtain a statistics report</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail"
-                displayName="Available Connection Count" description="number of available connection" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail"
-                displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail"
-                displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail"
-                displayName="In Use Connection Count" description="number of connections currently in use"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail"
-                displayName="Max Connections In Use Count" description="number of maximum connections in use"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="Tx ConnectionFactory">
+        <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="xa-transaction" displayType="summary" displayName="Xa Transaction" description="The XA/local transaction behavior flag" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
-            <c:simple-property type="integer" required="false" name="allocation-retry"
-                               description="The number of times allocation retries should be tried"/>
-            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"
-                               description="The time to wait between allocation retries"/>
-            <c:simple-property type="boolean" required="false" name="background-validation"
-                               description="Whether to use backgroup validation"/>
+            <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/>
+            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/>
+            <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/>
             <c:simple-property type="long" required="false" name="background-validation-millis"/>
-            <c:simple-property type="long" required="false" name="blocking-timeout-millis"
-                               description="The time to wait for a connection to become available before giving up"/>
-            <c:simple-property required="false" name="check-valid-connection-sql"
-                               description="The SQL statement to validate a connection"/>
-            <c:map-property required="false" readOnly="true" name="config-property"
-                            description="The connection factory property info"/>
+            <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/>
+            <c:map-property required="false" name="config-property" description="The connection factory config properties"/>
             <c:simple-property name="connection-definition" description="The connection factory class name"/>
-            <c:map-property required="false" name="connection-properties"
-                            description="The DataSource connection properties"/>
-            <c:simple-property name="connection-url" description="The DataSource connection URL"/>
-            <c:simple-property name="driver-class" description="The DataSource connection driver class name"/>
-            <c:simple-property required="false" name="exception-sorter-class-name"
-                               description="The exception sorter class name"/>
-            <c:simple-property type="integer" required="false" name="idle-timeout-minutes"
-                               description="The idle timeout in minutes"/>
+            <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/>
             <c:simple-property type="boolean" required="false" name="interleaving"/>
             <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/>
             <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/>
             <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/>
             <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/>
-            <c:simple-property type="integer" required="false" name="max-pool-size"
-                               description="The max size of the pool"/>
+            <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/>
             <c:map-property required="false" name="metadata">
                 <c:simple-property required="false" name="typeMapping"/>
             </c:map-property>
-            <c:simple-property type="integer" required="false" name="min-pool-size"
-                               description="The min size of the pool"/>
-            <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/>
+            <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/>
             <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/>
-            <c:simple-property required="false" name="password" description="The DataSource password"/>
-            <c:simple-property required="false" name="poolJndiName"/>
-            <c:simple-property type="boolean" required="false" name="prefill"
-                               description="Whether to prefill the pool"/>
-            <c:simple-property type="integer" required="false" name="prepared-statement-cache-size"
-                               description="The DataSource prepared statement cache size"/>
-            <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/>
+            <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/>
             <c:simple-property name="rar-name" description="The resource adapter archive name"/>
-            <c:map-property required="false" name="security-domain"
-                            description="The security-domain used to validate connections">
+            <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections">
                 <c:simple-property required="false" name="domain" description="the security domain"/>
-                <c:simple-property required="false" name="securityDeploymentType"
-                                   description="the security deployment type"/>
+                <c:simple-property required="false" name="securityDeploymentType" description="the security deployment type"/>
             </c:map-property>
-            <c:simple-property type="boolean" required="false" name="set-tx-query-timeout"
-                               description="Should query timeout be enabled"/>
-            <c:simple-property type="boolean" required="false" name="share-prepared-statements"
-                               description="Should prepared statements be shared"/>
-            <c:simple-property required="false" name="stale-connection-checker-class-name"
-                               description="The DataSource stale connection checker class name"/>
             <c:simple-property required="false" name="statistics-formatter"/>
             <c:simple-property type="boolean" required="false" name="track-connection-by-tx"/>
-            <c:simple-property required="false" name="track-statements" description="The track statements method"/>
-            <c:simple-property required="false" name="transaction-isolation"
-                               description="The DataSource transaction isolation level"/>
             <c:simple-property required="false" name="type-mapping"/>
-            <c:simple-property required="false" name="url-delimiter" description="The DataSource url delimiter"/>
-            <c:simple-property required="false" name="url-selector-strategy-class-name"
-                               description="The DataSource url selector strategy class name"/>
-            <c:simple-property type="boolean" required="false" name="use-java-context"
-                               description="Should the jndi name be bound under the java: context"/>
+            <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/>
             <c:simple-property type="boolean" required="false" name="use-strict-min"/>
-            <c:simple-property type="long" required="false" name="use-try-lock"
-                               description="The internal lock timeout"/>
-            <c:simple-property required="false" name="user-name" description="The DataSource username"/>
-            <c:simple-property required="false" name="valid-connection-checker-class-name"
-                               description="The DataSource connection checker class name"/>
             <c:simple-property type="boolean" required="false" name="validate-on-match"/>
+            <c:simple-property type="integer" required="false" name="xa-resource-timeout" description="The XA resource timeout"/>
+            <c:simple-property type="boolean" required="false" readOnly="true" name="xa-transaction" description="The XA/local transaction behavior flag"/>
         </resource-configuration>
     </service>
-    <service name="NoTx DataSource">
-        <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/>
-        <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics"
-                   description="Obtain a formatted statistics report">
-            <parameters>
-                <c:simple-property required="false" name="formatClassName"
-                                   description="The StatisticsFormatter class name"/>
-            </parameters>
-            <results>
-                <c:notes>Obtain a formatted statistics report</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="listStatistics" displayName="List Statistics" description="Obtain a statistics report">
-            <results>
-                <c:notes>Obtain a statistics report</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail"
-                displayName="Available Connection Count" description="number of available connection" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail"
-                displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail"
-                displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail"
-                displayName="In Use Connection Count" description="number of connections currently in use"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail"
-                displayName="Max Connections In Use Count" description="number of maximum connections in use"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="LocalTx DataSource">
+        <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
-            <c:simple-property type="integer" required="false" name="allocation-retry"
-                               description="The number of times allocation retries should be tried"/>
-            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"
-                               description="The time to wait between allocation retries"/>
-            <c:simple-property type="boolean" required="false" name="background-validation"
-                               description="Whether to use backgroup validation"/>
+            <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/>
+            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/>
+            <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/>
             <c:simple-property type="long" required="false" name="background-validation-millis"/>
-            <c:simple-property type="long" required="false" name="blocking-timeout-millis"
-                               description="The time to wait for a connection to become available before giving up"/>
-            <c:simple-property required="false" name="check-valid-connection-sql"
-                               description="The SQL statement to validate a connection"/>
-            <c:map-property required="false" readOnly="true" name="config-property"
-                            description="The connection factory property info"/>
+            <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/>
+            <c:simple-property required="false" name="check-valid-connection-sql" description="The SQL statement to validate a connection"/>
+            <c:map-property required="false" readOnly="true" name="config-property" description="The connection factory property info"/>
             <c:simple-property name="connection-definition" description="The connection factory class name"/>
-            <c:map-property required="false" name="connection-properties"
-                            description="The DataSource connection properties"/>
+            <c:map-property required="false" name="connection-properties" description="The DataSource connection properties"/>
             <c:simple-property name="connection-url" description="The DataSource connection URL"/>
             <c:simple-property name="driver-class" description="The DataSource connection driver class name"/>
-            <c:simple-property required="false" name="exception-sorter-class-name"
-                               description="The exception sorter class name"/>
-            <c:simple-property type="integer" required="false" name="idle-timeout-minutes"
-                               description="The idle timeout in minutes"/>
+            <c:simple-property required="false" name="exception-sorter-class-name" description="The exception sorter class name"/>
+            <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/>
             <c:simple-property type="boolean" required="false" name="interleaving"/>
             <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/>
             <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/>
             <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/>
             <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/>
-            <c:simple-property type="integer" required="false" name="max-pool-size"
-                               description="The max size of the pool"/>
+            <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/>
             <c:map-property required="false" name="metadata">
                 <c:simple-property required="false" name="typeMapping"/>
             </c:map-property>
-            <c:simple-property type="integer" required="false" name="min-pool-size"
-                               description="The min size of the pool"/>
+            <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/>
             <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/>
             <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/>
             <c:simple-property required="false" name="password" description="The DataSource password"/>
-            <c:simple-property required="false" name="poolJndiName"/>
-            <c:simple-property type="boolean" required="false" name="prefill"
-                               description="Whether to prefill the pool"/>
-            <c:simple-property type="integer" required="false" name="prepared-statement-cache-size"
-                               description="The DataSource prepared statement cache size"/>
+            <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/>
+            <c:simple-property type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/>
             <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/>
             <c:simple-property name="rar-name" description="The resource adapter archive name"/>
-            <c:map-property required="false" name="security-domain"
-                            description="The security-domain used to validate connections">
+            <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections">
                 <c:simple-property required="false" name="domain" description="the security domain"/>
-                <c:simple-property required="false" name="securityDeploymentType"
-                                   description="the security deployment type"/>
+                <c:simple-property required="false" name="securityDeploymentType" description="the security deployment type"/>
             </c:map-property>
-            <c:simple-property type="boolean" required="false" name="set-tx-query-timeout"
-                               description="Should query timeout be enabled"/>
-            <c:simple-property type="boolean" required="false" name="share-prepared-statements"
-                               description="Should prepared statements be shared"/>
-            <c:simple-property required="false" name="stale-connection-checker-class-name"
-                               description="The DataSource stale connection checker class name"/>
+            <c:simple-property type="boolean" required="false" name="set-tx-query-timeout" description="Should query timeout be enabled"/>
+            <c:simple-property type="boolean" required="false" name="share-prepared-statements" description="Should prepared statements be shared"/>
+            <c:simple-property required="false" name="stale-connection-checker-class-name" description="The DataSource stale connection checker class name"/>
             <c:simple-property required="false" name="statistics-formatter"/>
             <c:simple-property type="boolean" required="false" name="track-connection-by-tx"/>
             <c:simple-property required="false" name="track-statements" description="The track statements method"/>
-            <c:simple-property required="false" name="transaction-isolation"
-                               description="The DataSource transaction isolation level"/>
+            <c:simple-property required="false" name="transaction-isolation" description="The DataSource transaction isolation level"/>
             <c:simple-property required="false" name="type-mapping"/>
             <c:simple-property required="false" name="url-delimiter" description="The DataSource url delimiter"/>
-            <c:simple-property required="false" name="url-selector-strategy-class-name"
-                               description="The DataSource url selector strategy class name"/>
-            <c:simple-property type="boolean" required="false" name="use-java-context"
-                               description="Should the jndi name be bound under the java: context"/>
+            <c:simple-property required="false" name="url-selector-strategy-class-name" description="The DataSource url selector strategy class name"/>
+            <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/>
             <c:simple-property type="boolean" required="false" name="use-strict-min"/>
-            <c:simple-property type="long" required="false" name="use-try-lock"
-                               description="The internal lock timeout"/>
+            <c:simple-property type="long" required="false" name="use-try-lock" description="The internal lock timeout"/>
             <c:simple-property required="false" name="user-name" description="The DataSource username"/>
-            <c:simple-property required="false" name="valid-connection-checker-class-name"
-                               description="The DataSource connection checker class name"/>
+            <c:simple-property required="false" name="valid-connection-checker-class-name" description="The DataSource connection checker class name"/>
             <c:simple-property type="boolean" required="false" name="validate-on-match"/>
         </resource-configuration>
     </service>
-    <service name="Tx ConnectionFactory">
-        <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/>
-        <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics"
-                   description="Obtain a formatted statistics report">
-            <parameters>
-                <c:simple-property required="false" name="formatClassName"
-                                   description="The StatisticsFormatter class name"/>
-            </parameters>
-            <results>
-                <c:notes>Obtain a formatted statistics report</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="listStatistics" displayName="List Statistics" description="Obtain a statistics report">
-            <results>
-                <c:notes>Obtain a statistics report</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail"
-                displayName="Available Connection Count" description="number of available connection" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail"
-                displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail"
-                displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail"
-                displayName="In Use Connection Count" description="number of connections currently in use"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail"
-                displayName="Max Connections In Use Count" description="number of maximum connections in use"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="xa-transaction" displayType="summary" displayName="Xa Transaction"
-                description="The XA/local transaction behavior flag" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
+    <service name="NoTx DataSource">
+        <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
-            <c:simple-property type="integer" required="false" name="allocation-retry"
-                               description="The number of times allocation retries should be tried"/>
-            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"
-                               description="The time to wait between allocation retries"/>
-            <c:simple-property type="boolean" required="false" name="background-validation"
-                               description="Whether to use backgroup validation"/>
+            <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/>
+            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/>
+            <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/>
             <c:simple-property type="long" required="false" name="background-validation-millis"/>
-            <c:simple-property type="long" required="false" name="blocking-timeout-millis"
-                               description="The time to wait for a connection to become available before giving up"/>
-            <c:map-property required="false" name="config-property"
-                            description="The connection factory config properties"/>
+            <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/>
+            <c:simple-property required="false" name="check-valid-connection-sql" description="The SQL statement to validate a connection"/>
+            <c:map-property required="false" readOnly="true" name="config-property" description="The connection factory property info"/>
             <c:simple-property name="connection-definition" description="The connection factory class name"/>
-            <c:simple-property type="integer" required="false" name="idle-timeout-minutes"
-                               description="The idle timeout in minutes"/>
+            <c:map-property required="false" name="connection-properties" description="The DataSource connection properties"/>
+            <c:simple-property name="connection-url" description="The DataSource connection URL"/>
+            <c:simple-property name="driver-class" description="The DataSource connection driver class name"/>
+            <c:simple-property required="false" name="exception-sorter-class-name" description="The exception sorter class name"/>
+            <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/>
             <c:simple-property type="boolean" required="false" name="interleaving"/>
             <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/>
             <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/>
             <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/>
             <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/>
-            <c:simple-property type="integer" required="false" name="max-pool-size"
-                               description="The max size of the pool"/>
+            <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/>
             <c:map-property required="false" name="metadata">
                 <c:simple-property required="false" name="typeMapping"/>
             </c:map-property>
-            <c:simple-property type="integer" required="false" name="min-pool-size"
-                               description="The min size of the pool"/>
+            <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/>
+            <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/>
             <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/>
-            <c:simple-property required="false" name="poolJndiName"/>
-            <c:simple-property type="boolean" required="false" name="prefill"
-                               description="Whether to prefill the pool"/>
+            <c:simple-property required="false" name="password" description="The DataSource password"/>
+            <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/>
+            <c:simple-property type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/>
+            <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/>
             <c:simple-property name="rar-name" description="The resource adapter archive name"/>
-            <c:map-property required="false" name="security-domain"
-                            description="The security-domain used to validate connections">
+            <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections">
                 <c:simple-property required="false" name="domain" description="the security domain"/>
-                <c:simple-property required="false" name="securityDeploymentType"
-                                   description="the security deployment type"/>
+                <c:simple-property required="false" name="securityDeploymentType" description="the security deployment type"/>
             </c:map-property>
+            <c:simple-property type="boolean" required="false" name="set-tx-query-timeout" description="Should query timeout be enabled"/>
+            <c:simple-property type="boolean" required="false" name="share-prepared-statements" description="Should prepared statements be shared"/>
+            <c:simple-property required="false" name="stale-connection-checker-class-name" description="The DataSource stale connection checker class name"/>
             <c:simple-property required="false" name="statistics-formatter"/>
             <c:simple-property type="boolean" required="false" name="track-connection-by-tx"/>
+            <c:simple-property required="false" name="track-statements" description="The track statements method"/>
+            <c:simple-property required="false" name="transaction-isolation" description="The DataSource transaction isolation level"/>
             <c:simple-property required="false" name="type-mapping"/>
-            <c:simple-property type="boolean" required="false" name="use-java-context"
-                               description="Should the jndi name be bound under the java: context"/>
+            <c:simple-property required="false" name="url-delimiter" description="The DataSource url delimiter"/>
+            <c:simple-property required="false" name="url-selector-strategy-class-name" description="The DataSource url selector strategy class name"/>
+            <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/>
             <c:simple-property type="boolean" required="false" name="use-strict-min"/>
+            <c:simple-property type="long" required="false" name="use-try-lock" description="The internal lock timeout"/>
+            <c:simple-property required="false" name="user-name" description="The DataSource username"/>
+            <c:simple-property required="false" name="valid-connection-checker-class-name" description="The DataSource connection checker class name"/>
             <c:simple-property type="boolean" required="false" name="validate-on-match"/>
-            <c:simple-property type="integer" required="false" name="xa-resource-timeout"
-                               description="The XA resource timeout"/>
-            <c:simple-property type="boolean" required="false" readOnly="true" name="xa-transaction"
-                               description="The XA/local transaction behavior flag"/>
         </resource-configuration>
     </service>
-    <service name="NoTx ConnectionFactory">
-        <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/>
-        <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics"
-                   description="Obtain a formatted statistics report">
-            <parameters>
-                <c:simple-property required="false" name="formatClassName"
-                                   description="The StatisticsFormatter class name"/>
-            </parameters>
-            <results>
-                <c:notes>Obtain a formatted statistics report</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="listStatistics" displayName="List Statistics" description="Obtain a statistics report">
-            <results>
-                <c:notes>Obtain a statistics report</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail"
-                displayName="Available Connection Count" description="number of available connection" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail"
-                displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail"
-                displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail"
-                displayName="In Use Connection Count" description="number of connections currently in use"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail"
-                displayName="Max Connections In Use Count" description="number of maximum connections in use"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="XA DataSource">
+        <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
-            <c:simple-property type="integer" required="false" name="allocation-retry"
-                               description="The number of times allocation retries should be tried"/>
-            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"
-                               description="The time to wait between allocation retries"/>
-            <c:simple-property type="boolean" required="false" name="background-validation"
-                               description="Whether to use backgroup validation"/>
+            <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/>
+            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/>
+            <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/>
             <c:simple-property type="long" required="false" name="background-validation-millis"/>
-            <c:simple-property type="long" required="false" name="blocking-timeout-millis"
-                               description="The time to wait for a connection to become available before giving up"/>
-            <c:map-property required="false" name="config-property"
-                            description="The connection factory config properties"/>
+            <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/>
+            <c:simple-property required="false" name="check-valid-connection-sql" description="The SQL statement to validate a connection"/>
+            <c:map-property required="false" readOnly="true" name="config-property" description="The connection factory property info"/>
             <c:simple-property name="connection-definition" description="The connection factory class name"/>
-            <c:simple-property type="integer" required="false" name="idle-timeout-minutes"
-                               description="The idle timeout in minutes"/>
+            <c:simple-property required="false" name="exception-sorter-class-name" description="The exception sorter class name"/>
+            <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/>
             <c:simple-property type="boolean" required="false" name="interleaving"/>
             <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/>
             <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/>
             <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/>
             <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/>
-            <c:simple-property type="integer" required="false" name="max-pool-size"
-                               description="The max size of the pool"/>
+            <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/>
             <c:map-property required="false" name="metadata">
                 <c:simple-property required="false" name="typeMapping"/>
             </c:map-property>
-            <c:simple-property type="integer" required="false" name="min-pool-size"
-                               description="The min size of the pool"/>
+            <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/>
+            <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/>
             <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/>
-            <c:simple-property required="false" name="poolJndiName"/>
-            <c:simple-property type="boolean" required="false" name="prefill"
-                               description="Whether to prefill the pool"/>
+            <c:simple-property required="false" name="password" description="The DataSource password"/>
+            <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/>
+            <c:simple-property type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/>
+            <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/>
             <c:simple-property name="rar-name" description="The resource adapter archive name"/>
-            <c:map-property required="false" name="security-domain"
-                            description="The security-domain used to validate connections">
+            <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections">
                 <c:simple-property required="false" name="domain" description="the security domain"/>
-                <c:simple-property required="false" name="securityDeploymentType"
-                                   description="the security deployment type"/>
+                <c:simple-property required="false" name="securityDeploymentType" description="the security deployment type"/>
             </c:map-property>
+            <c:simple-property type="boolean" required="false" name="set-tx-query-timeout" description="Should query timeout be enabled"/>
+            <c:simple-property type="boolean" required="false" name="share-prepared-statements" description="Should prepared statements be shared"/>
+            <c:simple-property required="false" name="stale-connection-checker-class-name" description="The DataSource stale connection checker class name"/>
             <c:simple-property required="false" name="statistics-formatter"/>
             <c:simple-property type="boolean" required="false" name="track-connection-by-tx"/>
+            <c:simple-property required="false" name="track-statements" description="The track statements method"/>
+            <c:simple-property required="false" name="transaction-isolation" description="The DataSource transaction isolation level"/>
             <c:simple-property required="false" name="type-mapping"/>
-            <c:simple-property type="boolean" required="false" name="use-java-context"
-                               description="Should the jndi name be bound under the java: context"/>
+            <c:simple-property required="false" name="url-delimiter" description="The DataSource url delimiter"/>
+            <c:simple-property required="false" name="url-property" description="The url-property"/>
+            <c:simple-property required="false" name="url-selector-strategy-class-name" description="The DataSource url selector strategy class name"/>
+            <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/>
             <c:simple-property type="boolean" required="false" name="use-strict-min"/>
+            <c:simple-property type="long" required="false" name="use-try-lock" description="The internal lock timeout"/>
+            <c:simple-property required="false" name="user-name" description="The DataSource username"/>
+            <c:simple-property required="false" name="valid-connection-checker-class-name" description="The DataSource connection checker class name"/>
             <c:simple-property type="boolean" required="false" name="validate-on-match"/>
+            <c:simple-property name="xa-datasource-class" description="The XADataSource class"/>
+            <c:map-property required="false" name="xa-datasource-properties" description="The xa datasource properties"/>
+            <c:simple-property type="integer" required="false" name="xa-resource-timeout" description="The XAResource timeout"/>
         </resource-configuration>
     </service>
+    <service name="SFSB EJB3">
+        <metric property="availableCount" measurementType="dynamic" displayType="detail" displayName="Available Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="cacheSize" measurementType="dynamic" displayType="detail" displayName="Cache Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="createCount" measurementType="dynamic" displayType="detail" displayName="Create Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="currentSize" measurementType="dynamic" displayType="detail" displayName="Current Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="passivatedCount" measurementType="dynamic" displayType="detail" displayName="Passivated Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="removeCount" measurementType="dynamic" displayType="detail" displayName="Remove Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="totalSize" measurementType="dynamic" displayType="detail" displayName="Total Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+    </service>
+    <service name="SLSB EJB3">
+        <metric property="availableCount" measurementType="dynamic" displayType="detail" displayName="Available Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="createCount" measurementType="dynamic" displayType="detail" displayName="Create Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="currentSize" measurementType="dynamic" displayType="detail" displayName="Current Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="removeCount" measurementType="dynamic" displayType="detail" displayName="Remove Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+    </service>
+    <service name="Session EJB3">
+        <operation name="resetStats" displayName="Reset Stats" description=""/>
+    </service>
     <service name="Queue JMSDestination">
         <operation name="create" displayName="Create" description="Service lifecycle operation"/>
         <operation name="destroy" displayName="Destroy" description="Service lifecycle operation"/>
@@ -572,8 +279,7 @@
                 </c:list-property>
             </results>
         </operation>
-        <operation name="listDurableMessages" displayName="List Durable Messages"
-                   description="List all durable mesages using a selector">
+        <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable mesages using a selector">
             <parameters>
                 <c:simple-property required="false" name="arg#0"/>
             </parameters>
@@ -588,22 +294,19 @@
                 </c:list-property>
             </results>
         </operation>
-        <operation name="listMessageCounterAsHTML" displayName="List Message Counter As HTML"
-                   description="Get the message counter as HTML">
+        <operation name="listMessageCounterAsHTML" displayName="List Message Counter As HTML" description="Get the message counter as HTML">
             <results>
                 <c:notes>Get the message counter as HTML</c:notes>
                 <c:simple-property required="false" name="result"/>
             </results>
         </operation>
-        <operation name="listMessageCounterHistoryAsHTML" displayName="List Message Counter History As HTML"
-                   description="Get the message counter history as HTML">
+        <operation name="listMessageCounterHistoryAsHTML" displayName="List Message Counter History As HTML" description="Get the message counter history as HTML">
             <results>
                 <c:notes>Get the message counter history as HTML</c:notes>
                 <c:simple-property required="false" name="result"/>
             </results>
         </operation>
-        <operation name="listNonDurableMessages" displayName="List Non Durable Messages"
-                   description="List all non durable mesages using a selector">
+        <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable mesages using a selector">
             <parameters>
                 <c:simple-property required="false" name="arg#0"/>
             </parameters>
@@ -618,119 +321,59 @@
                 </c:list-property>
             </results>
         </operation>
-        <operation name="removeAllMessages" displayName="Remove All Messages"
-                   description="Remove all messages in the queue"/>
-        <operation name="resetMessageCounter" displayName="Reset Message Counter"
-                   description="Reset the message counter"/>
-        <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History"
-                   description="Reset the message counter history"/>
+        <operation name="removeAllMessages" displayName="Remove All Messages" description="Remove all messages in the queue"/>
+        <operation name="resetMessageCounter" displayName="Reset Message Counter" description="Reset the message counter"/>
+        <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History" description="Reset the message counter history"/>
         <operation name="start" displayName="Start" description="Service lifecycle operation"/>
         <operation name="stop" displayName="Stop" description="Service lifecycle operation"/>
-        <metric property="consumerCount" measurementType="dynamic" displayType="detail" displayName="Consumer Count"
-                description="The number of consumers on the queue" defaultOn="true" defaultInterval="60000"
-                dataType="measurement" category="performance"/>
-        <metric property="createdProgrammatically" displayType="summary" displayName="Created Programmatically"
-                description="True if this destination was created programmatically" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count"
-                description="The number of messages currently being delivered" defaultOn="true" defaultInterval="60000"
-                dataType="measurement" category="performance"/>
-        <metric property="messageCount" measurementType="dynamic" displayType="detail" displayName="Message Count"
-                description="The number of messages in the queue" defaultOn="true" defaultInterval="60000"
-                dataType="measurement" category="performance"/>
-        <metric property="messageCounter.count" measurementType="dynamic" displayType="detail" displayName="Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="messageCounter.countDelta" measurementType="dynamic" displayType="detail"
-                displayName="Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageCounter.counterAsString" displayType="detail" displayName="Counter As String"
-                defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="messageCounter.destinationDurable" measurementType="dynamic" displayType="detail"
-                displayName="Destination Durable" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageCounter.destinationName" displayType="detail" displayName="Destination Name"
-                defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="messageCounter.destinationSubscription" displayType="detail"
-                displayName="Destination Subscription" defaultOn="true" defaultInterval="60000" dataType="trait"
-                category="performance"/>
-        <metric property="messageCounter.destinationTopic" measurementType="dynamic" displayType="detail"
-                displayName="Destination Topic" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageCounter.historyAsString" displayType="detail" displayName="History As String"
-                defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="messageCounter.historyLimit" measurementType="dynamic" displayType="detail"
-                displayName="History Limit" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageCounter.lastUpdate" measurementType="dynamic" displayType="detail"
-                displayName="Last Update" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageCounter.messageCount" measurementType="dynamic" displayType="detail"
-                displayName="Message Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageCounter.messageCountDelta" measurementType="dynamic" displayType="detail"
-                displayName="Message Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageStatistics.asString" displayType="detail" displayName="As String" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail"
-                displayName="Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail"
-                displayName="Depth Delta" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageStatistics.durable" measurementType="dynamic" displayType="detail"
-                displayName="Durable" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageStatistics.name" displayType="detail" displayName="Name" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="messageStatistics.subscriptionID" displayType="detail" displayName="Subscription ID"
-                defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail"
-                displayName="Time Last Update" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="messageStatistics.topic" measurementType="dynamic" displayType="detail" displayName="Topic"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail"
-                displayName="Scheduled Message Count" description="The number of scheduled messages in the queue"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="consumerCount" measurementType="dynamic" displayType="detail" displayName="Consumer Count" description="The number of consumers on the queue" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="createdProgrammatically" displayType="summary" displayName="Created Programmatically" description="True if this destination was created programmatically" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count" description="The number of messages currently being delivered" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageCount" measurementType="dynamic" displayType="detail" displayName="Message Count" description="The number of messages in the queue" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageCounter.count" measurementType="dynamic" displayType="detail" displayName="Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageCounter.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageCounter.counterAsString" displayType="detail" displayName="Counter As String" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="messageCounter.destinationDurable" measurementType="dynamic" displayType="detail" displayName="Destination Durable" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageCounter.destinationName" displayType="detail" displayName="Destination Name" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="messageCounter.destinationSubscription" displayType="detail" displayName="Destination Subscription" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="messageCounter.destinationTopic" measurementType="dynamic" displayType="detail" displayName="Destination Topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageCounter.historyAsString" displayType="detail" displayName="History As String" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="messageCounter.historyLimit" measurementType="dynamic" displayType="detail" displayName="History Limit" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageCounter.lastUpdate" measurementType="dynamic" displayType="detail" displayName="Last Update" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageCounter.messageCount" measurementType="dynamic" displayType="detail" displayName="Message Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageCounter.messageCountDelta" measurementType="dynamic" displayType="detail" displayName="Message Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageStatistics.asString" displayType="detail" displayName="As String" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail" displayName="Depth Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageStatistics.durable" measurementType="dynamic" displayType="detail" displayName="Durable" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageStatistics.name" displayType="detail" displayName="Name" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="messageStatistics.subscriptionID" displayType="detail" displayName="Subscription ID" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail" displayName="Time Last Update" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageStatistics.topic" measurementType="dynamic" displayType="detail" displayName="Topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail" displayName="Scheduled Message Count" description="The number of scheduled messages in the queue" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
         <resource-configuration>
-            <c:simple-property required="false" name="DLQ"
-                               description="The DLQ for this queue, overrides the default DLQ on the server peer"/>
+            <c:simple-property required="false" name="DLQ" description="The DLQ for this queue, overrides the default DLQ on the server peer"/>
             <c:simple-property name="JNDIName" description="The destination's JNDI name"/>
-            <c:simple-property type="boolean" required="false" readOnly="true" name="clustered"
-                               description="Is this a clustered destination?"/>
-            <c:simple-property type="integer" required="false" name="downCacheSize"
-                               description="The write-cache size, can only be set when queue is stopped"/>
-            <c:simple-property required="false" name="expiryQueue"
-                               description="The expiry queue for this queue, overrides the default expiry queue on the server peer"/>
-            <c:simple-property type="integer" required="false" name="fullSize"
-                               description="The in-memory message limit, can only be set when queue is stopped"/>
-            <c:simple-property type="integer" required="false" name="maxDeliveryAttempts"
-                               description="The maximum delivery attempts to the queue"/>
-            <c:simple-property type="integer" required="false" name="maxSize"
-                               description="The maximum number of messages this queue can hold before they are dropped"/>
-            <c:simple-property type="integer" required="false" name="messageCounterHistoryDayLimit"
-                               description="The day limit for the message counter"/>
+            <c:simple-property type="boolean" required="false" readOnly="true" name="clustered" description="Is this a clustered destination?"/>
+            <c:simple-property type="integer" required="false" name="downCacheSize" description="The write-cache size, can only be set when queue is stopped"/>
+            <c:simple-property required="false" name="expiryQueue" description="The expiry queue for this queue, overrides the default expiry queue on the server peer"/>
+            <c:simple-property type="integer" required="false" name="fullSize" description="The in-memory message limit, can only be set when queue is stopped"/>
+            <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" description="The maximum delivery attempts to the queue"/>
+            <c:simple-property type="integer" required="false" name="maxSize" description="The maximum number of messages this queue can hold before they are dropped"/>
+            <c:simple-property type="integer" required="false" name="messageCounterHistoryDayLimit" description="The day limit for the message counter"/>
             <c:simple-property readOnly="true" name="name" description="The destination name"/>
-            <c:simple-property type="integer" required="false" name="pageSize"
-                               description="The paging size, can only be set when queue is stopped"/>
-            <c:simple-property type="long" required="false" name="redeliveryDelay"
-                               description="The delay before redelivering"/>
-            <c:map-property required="false" name="securityConfig"
-                            description="The destination's security configuration"/>
-            <c:simple-property required="false" name="serverPeer"
-                               description="The ObjectName of the server peer this destination was deployed on"/>
+            <c:simple-property type="integer" required="false" name="pageSize" description="The paging size, can only be set when queue is stopped"/>
+            <c:simple-property type="long" required="false" name="redeliveryDelay" description="The delay before redelivering"/>
+            <c:map-property required="false" name="securityConfig" description="The destination's security configuration"/>
+            <c:simple-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on"/>
         </resource-configuration>
     </service>
     <service name="Topic JMSDestination">
         <operation name="create" displayName="Create" description="Service lifecycle operation"/>
         <operation name="destroy" displayName="Destroy" description="Service lifecycle operation"/>
-        <operation name="listAllMessages" displayName="List All Messages"
-                   description="List all messages for the specified subscription with the specified selector">
+        <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified subscription with the specified selector">
             <parameters>
                 <c:simple-property required="false" name="arg#0"/>
                 <c:simple-property required="false" name="arg#1"/>
@@ -746,8 +389,7 @@
                 </c:list-property>
             </results>
         </operation>
-        <operation name="listAllSubscriptions" displayName="List All Subscriptions"
-                   description="Return all subscriptions for the topic">
+        <operation name="listAllSubscriptions" displayName="List All Subscriptions" description="Return all subscriptions for the topic">
             <results>
                 <c:notes>Return all subscriptions for the topic</c:notes>
                 <c:list-property name="result">
@@ -755,15 +397,13 @@
                 </c:list-property>
             </results>
         </operation>
-        <operation name="listAllSubscriptionsAsHTML" displayName="List All Subscriptions As HTML"
-                   description="Return all subscriptions for the topic in HTML">
+        <operation name="listAllSubscriptionsAsHTML" displayName="List All Subscriptions As HTML" description="Return all subscriptions for the topic in HTML">
             <results>
                 <c:notes>Return all subscriptions for the topic in HTML</c:notes>
                 <c:simple-property required="false" name="result"/>
             </results>
         </operation>
-        <operation name="listDurableMessages" displayName="List Durable Messages"
-                   description="List all durable messages for the specified subscription with the specified selector">
+        <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified subscription with the specified selector">
             <parameters>
                 <c:simple-property required="false" name="arg#0"/>
                 <c:simple-property required="false" name="arg#1"/>
@@ -779,8 +419,7 @@
                 </c:list-property>
             </results>
         </operation>
-        <operation name="listDurableSubscriptions" displayName="List Durable Subscriptions"
-                   description="Return all durable subscriptions for the topic">
+        <operation name="listDurableSubscriptions" displayName="List Durable Subscriptions" description="Return all durable subscriptions for the topic">
             <results>
                 <c:notes>Return all durable subscriptions for the topic</c:notes>
                 <c:list-property name="result">
@@ -788,22 +427,19 @@
                 </c:list-property>
             </results>
         </operation>
-        <operation name="listDurableSubscriptionsAsHTML" displayName="List Durable Subscriptions As HTML"
-                   description="Return all durable subscriptions for the topic in HTML">
+        <operation name="listDurableSubscriptionsAsHTML" displayName="List Durable Subscriptions As HTML" description="Return all durable subscriptions for the topic in HTML">
             <results>
                 <c:notes>Return all durable subscriptions for the topic in HTML</c:notes>
                 <c:simple-property required="false" name="result"/>
             </results>
         </operation>
-        <operation name="listNonDurableMessages" displayName="List Non Durable Messages"
-                   description="List all non durable messages for the specified subscription with the specified selector">
+        <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified subscription with the specified selector">
             <parameters>
                 <c:simple-property required="false" name="arg#0"/>
                 <c:simple-property required="false" name="arg#1"/>
             </parameters>
             <results>
-                <c:notes>List all non durable messages for the specified subscription with the specified selector
-                </c:notes>
+                <c:notes>List all non durable messages for the specified subscription with the specified selector</c:notes>
                 <c:list-property name="result">
                     <c:map-property required="false" name="element">
                         <c:simple-property required="false" name="JMSCorrelationID"/>
@@ -813,8 +449,7 @@
                 </c:list-property>
             </results>
         </operation>
-        <operation name="listNonDurableSubscriptions" displayName="List Non Durable Subscriptions"
-                   description="Return all non durable subscriptions for the topic">
+        <operation name="listNonDurableSubscriptions" displayName="List Non Durable Subscriptions" description="Return all non durable subscriptions for the topic">
             <results>
                 <c:notes>Return all non durable subscriptions for the topic</c:notes>
                 <c:list-property name="result">
@@ -822,8 +457,7 @@
                 </c:list-property>
             </results>
         </operation>
-        <operation name="listNonDurableSubscriptionsAsHTML" displayName="List Non Durable Subscriptions As HTML"
-                   description="Return all non durable subscriptions for the topic in HTML">
+        <operation name="listNonDurableSubscriptionsAsHTML" displayName="List Non Durable Subscriptions As HTML" description="Return all non durable subscriptions for the topic in HTML">
             <results>
                 <c:notes>Return all non durable subscriptions for the topic in HTML</c:notes>
                 <c:simple-property required="false" name="result"/>
@@ -832,1131 +466,855 @@
         <operation name="removeAllMessages" displayName="Remove All Messages" description="Remove all messages"/>
         <operation name="start" displayName="Start" description="Service lifecycle operation"/>
         <operation name="stop" displayName="Stop" description="Service lifecycle operation"/>
-        <metric property="allMessageCount" measurementType="dynamic" displayType="detail"
-                displayName="All Message Count"
-                description="The count of all messages in all subscriptions of this topic" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="allSubscriptionsCount" measurementType="dynamic" displayType="detail"
-                displayName="All Subscriptions Count" description="The count of all subscriptions of this topic"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="createdProgrammatically" displayType="summary" displayName="Created Programmatically"
-                description="True if this destination was created programmatically" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="durableMessageCount" measurementType="dynamic" displayType="detail"
-                displayName="Durable Message Count"
-                description="The count of all messages in all durable subscriptions of this topic" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail"
-                displayName="Durable Subscriptions Count"
-                description="The count of all durable subscriptions of this topic" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="messageCounterHistoryDayLimit" measurementType="dynamic" displayType="detail"
-                displayName="Message Counter History Day Limit" description="The day limit for the message counter"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail"
-                displayName="Non Durable Message Count"
-                description="The count of all messages in all non durable subscriptions of this topic" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail"
-                displayName="Non Durable Subscriptions Count"
-                description="The count of all non durable subscriptions of this topic" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="allMessageCount" measurementType="dynamic" displayType="detail" displayName="All Message Count" description="The count of all messages in all subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="allSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="All Subscriptions Count" description="The count of all subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="createdProgrammatically" displayType="summary" displayName="Created Programmatically" description="True if this destination was created programmatically" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="durableMessageCount" measurementType="dynamic" displayType="detail" displayName="Durable Message Count" description="The count of all messages in all durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Durable Subscriptions Count" description="The count of all durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="messageCounterHistoryDayLimit" measurementType="dynamic" displayType="detail" displayName="Message Counter History Day Limit" description="The day limit for the message counter" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Message Count" description="The count of all messages in all non durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Subscriptions Count" description="The count of all non durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
         <resource-configuration>
-            <c:simple-property required="false" name="DLQ"
-                               description="The DLQ for this topic, overrides the default DLQ on the server peer"/>
+            <c:simple-property required="false" name="DLQ" description="The DLQ for this topic, overrides the default DLQ on the server peer"/>
             <c:simple-property name="JNDIName" description="The destination's JNDI name"/>
-            <c:simple-property type="boolean" required="false" readOnly="true" name="clustered"
-                               description="Is this a clustered destination?"/>
-            <c:simple-property type="boolean" required="false" readOnly="true" name="createdProgrammatically"
-                               description="True if this destination was created programmatically"/>
-            <c:simple-property type="integer" required="false" name="downCacheSize"
-                               description="The write-cache size, can only be set when topic is stopped"/>
-            <c:simple-property required="false" name="expiryQueue"
-                               description="The expiry queue for this topic, overrides the default expiry queue on the server peer"/>
-            <c:simple-property type="integer" required="false" name="fullSize"
-                               description="The in-memory message limit, can only be set when topic is stopped"/>
-            <c:simple-property type="integer" required="false" name="maxDeliveryAttempts"
-                               description="The maximum delivery attempts to the topic"/>
-            <c:simple-property type="integer" required="false" name="maxSize"
-                               description="The maximum number of messages this topic can hold before they are dropped"/>
+            <c:simple-property type="boolean" required="false" readOnly="true" name="clustered" description="Is this a clustered destination?"/>
+            <c:simple-property type="boolean" required="false" readOnly="true" name="createdProgrammatically" description="True if this destination was created programmatically"/>
+            <c:simple-property type="integer" required="false" name="downCacheSize" description="The write-cache size, can only be set when topic is stopped"/>
+            <c:simple-property required="false" name="expiryQueue" description="The expiry queue for this topic, overrides the default expiry queue on the server peer"/>
+            <c:simple-property type="integer" required="false" name="fullSize" description="The in-memory message limit, can only be set when topic is stopped"/>
+            <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" description="The maximum delivery attempts to the topic"/>
+            <c:simple-property type="integer" required="false" name="maxSize" description="The maximum number of messages this topic can hold before they are dropped"/>
             <c:simple-property readOnly="true" name="name" description="The destination name"/>
-            <c:simple-property type="integer" required="false" name="pageSize"
-                               description="The paging size, can only be set when topic is stopped"/>
-            <c:simple-property type="long" required="false" name="redeliveryDelay"
-                               description="The delay before redelivering"/>
-            <c:map-property required="false" name="securityConfig"
-                            description="The destination's security configuration"/>
-            <c:simple-property required="false" name="serverPeer"
-                               description="The ObjectName of the server peer this destination was deployed on"/>
+            <c:simple-property type="integer" required="false" name="pageSize" description="The paging size, can only be set when topic is stopped"/>
+            <c:simple-property type="long" required="false" name="redeliveryDelay" description="The delay before redelivering"/>
+            <c:map-property required="false" name="securityConfig" description="The destination's security configuration"/>
+            <c:simple-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on"/>
         </resource-configuration>
     </service>
     <service name="Platform MBean">
         <resource-configuration>
-            <c:simple-property required="false" readOnly="true" name="arch"
-                               description="the operating system architecture."/>
-            <c:simple-property type="integer" required="false" readOnly="true" name="availableProcessors"
-                               description="the number of processors available to the virtual machine; never smaller than one."/>
-            <c:simple-property required="false" readOnly="true" name="name" description="the operating system name."/>
-            <c:simple-property type="double" required="false" readOnly="true" name="systemLoadAverage"/>
-            <c:simple-property required="false" readOnly="true" name="version"
-                               description="the operating system version."/>
+            <c:simple-property type="long" required="false" readOnly="true" name="collectionCount"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="collectionTime"/>
+            <c:list-property required="false" readOnly="true" name="memoryPoolNames">
+                <c:simple-property required="false" name="element"/>
+            </c:list-property>
+            <c:simple-property required="false" readOnly="true" name="name"/>
+            <c:simple-property type="boolean" required="false" readOnly="true" name="valid"/>
         </resource-configuration>
     </service>
     <service name="Servlet MBean">
-        <metric property="classLoadTime" measurementType="dynamic" displayType="detail" displayName="Class Load Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="engineName" displayType="summary" displayName="Engine Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="errorCount" measurementType="dynamic" displayType="detail" displayName="Error Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="eventProvider" displayType="summary" displayName="Event Provider" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="loadTime" measurementType="dynamic" displayType="detail" displayName="Load Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="maxTime" measurementType="dynamic" displayType="detail" displayName="Max Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="minTime" measurementType="dynamic" displayType="detail" displayName="Min Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="objectName" displayType="summary" displayName="Object Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="requestCount" measurementType="dynamic" displayType="detail" displayName="Request Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="stateManageable" displayType="summary" displayName="State Manageable" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="statisticsProvider" displayType="summary" displayName="Statistics Provider" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="classLoadTime" measurementType="dynamic" displayType="detail" displayName="Class Load Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="engineName" displayType="summary" displayName="Engine Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="errorCount" measurementType="dynamic" displayType="detail" displayName="Error Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="eventProvider" displayType="summary" displayName="Event Provider" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="loadTime" measurementType="dynamic" displayType="detail" displayName="Load Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="maxTime" measurementType="dynamic" displayType="detail" displayName="Max Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="minTime" measurementType="dynamic" displayType="detail" displayName="Min Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="objectName" displayType="summary" displayName="Object Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="requestCount" measurementType="dynamic" displayType="detail" displayName="Request Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="stateManageable" displayType="summary" displayName="State Manageable" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="statisticsProvider" displayType="summary" displayName="Statistics Provider" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
     </service>
     <service name="Web MBean">
-        <metric property="currentThreadCount" measurementType="dynamic" displayType="detail"
-                displayName="Current Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="currentThreadsBusy" measurementType="dynamic" displayType="detail"
-                displayName="Current Threads Busy" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="maxThreads" measurementType="dynamic" displayType="detail" displayName="Max Threads"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="threadPriority" measurementType="dynamic" displayType="detail" displayName="Thread Priority"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="currentThreadCount" measurementType="dynamic" displayType="detail" displayName="Current Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="currentThreadsBusy" measurementType="dynamic" displayType="detail" displayName="Current Threads Busy" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="maxThreads" measurementType="dynamic" displayType="detail" displayName="Max Threads" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="threadPriority" measurementType="dynamic" displayType="detail" displayName="Thread Priority" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
         <resource-configuration>
             <c:simple-property required="false" readOnly="true" name="mbeanNameAsString"/>
             <c:simple-property required="false" name="state" description="The bean controller state"/>
         </resource-configuration>
     </service>
     <service name="WebApplication MBean">
-        <metric property="allowLinking" displayType="summary" displayName="Allow Linking" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="antiJARLocking" displayType="summary" displayName="Anti JAR Locking" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="antiResourceLocking" displayType="summary" displayName="Anti Resource Locking"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="cacheMaxSize" measurementType="dynamic" displayType="detail" displayName="Cache Max Size"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="cacheObjectMaxSize" measurementType="dynamic" displayType="detail"
-                displayName="Cache Object Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="cacheTTL" measurementType="dynamic" displayType="detail" displayName="Cache TTL"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="cachingAllowed" displayType="summary" displayName="Caching Allowed" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="caseSensitive" displayType="summary" displayName="Case Sensitive" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="compilerClasspath" displayType="summary" displayName="Compiler Classpath" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="configFile" displayType="summary" displayName="Config File" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="cookies" displayType="summary" displayName="Cookies" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="crossContext" displayType="summary" displayName="Cross Context" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="defaultContextXml" displayType="summary" displayName="Default Context Xml" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="defaultWebXml" displayType="summary" displayName="Default Web Xml" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="delegate" displayType="summary" displayName="Delegate" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="deploymentDescriptor" displayType="summary" displayName="Deployment Descriptor"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="docBase" displayType="summary" displayName="Doc Base" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="engineName" displayType="summary" displayName="Engine Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="eventProvider" displayType="summary" displayName="Event Provider" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="loader.delegate" measurementType="dynamic" displayType="detail" displayName="Delegate"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="loader.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000"
-                dataType="trait" category="performance"/>
-        <metric property="loader.reloadable" measurementType="dynamic" displayType="detail" displayName="Reloadable"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="logger.debugEnabled" measurementType="dynamic" displayType="detail"
-                displayName="Debug Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="logger.errorEnabled" measurementType="dynamic" displayType="detail"
-                displayName="Error Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="logger.fatalEnabled" measurementType="dynamic" displayType="detail"
-                displayName="Fatal Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="logger.infoEnabled" measurementType="dynamic" displayType="detail" displayName="Info Enabled"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="logger.traceEnabled" measurementType="dynamic" displayType="detail"
-                displayName="Trace Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="logger.warnEnabled" measurementType="dynamic" displayType="detail" displayName="Warn Enabled"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="manager.activeSessions" measurementType="dynamic" displayType="detail"
-                displayName="Active Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="manager.distributable" measurementType="dynamic" displayType="detail"
-                displayName="Distributable" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="manager.expiredSessions" measurementType="dynamic" displayType="detail"
-                displayName="Expired Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="manager.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000"
-                dataType="trait" category="performance"/>
-        <metric property="manager.maxActive" measurementType="dynamic" displayType="detail" displayName="Max Active"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="manager.maxInactiveInterval" measurementType="dynamic" displayType="detail"
-                displayName="Max Inactive Interval" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="manager.rejectedSessions" measurementType="dynamic" displayType="detail"
-                displayName="Rejected Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="manager.sessionAverageAliveTime" measurementType="dynamic" displayType="detail"
-                displayName="Session Average Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="manager.sessionCounter" measurementType="dynamic" displayType="detail"
-                displayName="Session Counter" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="manager.sessionIdLength" measurementType="dynamic" displayType="detail"
-                displayName="Session Id Length" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="manager.sessionMaxAliveTime" measurementType="dynamic" displayType="detail"
-                displayName="Session Max Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="namingContextListener.name" displayType="detail" displayName="Name" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="objectName" displayType="summary" displayName="Object Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="override" displayType="summary" displayName="Override" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="parentClassLoader.defaultAssertionStatus" measurementType="dynamic" displayType="detail"
-                displayName="Default Assertion Status" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="path" displayType="summary" displayName="Path" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="privileged" displayType="summary" displayName="Privileged" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="realm.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000"
-                dataType="trait" category="performance"/>
-        <metric property="reloadable" displayType="summary" displayName="Reloadable" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="saveConfig" displayType="summary" displayName="Save Config" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="server" displayType="summary" displayName="Server" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="startTime" measurementType="dynamic" displayType="detail" displayName="Start Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="startupTime" measurementType="dynamic" displayType="detail" displayName="Startup Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="state" measurementType="dynamic" displayType="detail" displayName="State" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="stateManageable" displayType="summary" displayName="State Manageable" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="statisticsProvider" displayType="summary" displayName="Statistics Provider" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="swallowOutput" displayType="summary" displayName="Swallow Output" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="tldScanTime" measurementType="dynamic" displayType="detail" displayName="Tld Scan Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="unloadDelay" measurementType="dynamic" displayType="detail" displayName="Unload Delay"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="useNaming" displayType="summary" displayName="Use Naming" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="workDir" displayType="summary" displayName="Work Dir" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="allowLinking" displayType="summary" displayName="Allow Linking" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="antiJARLocking" displayType="summary" displayName="Anti JAR Locking" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="antiResourceLocking" displayType="summary" displayName="Anti Resource Locking" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="cacheMaxSize" measurementType="dynamic" displayType="detail" displayName="Cache Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="cacheObjectMaxSize" measurementType="dynamic" displayType="detail" displayName="Cache Object Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="cacheTTL" measurementType="dynamic" displayType="detail" displayName="Cache TTL" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="cachingAllowed" displayType="summary" displayName="Caching Allowed" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="caseSensitive" displayType="summary" displayName="Case Sensitive" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="compilerClasspath" displayType="summary" displayName="Compiler Classpath" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="configFile" displayType="summary" displayName="Config File" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="cookies" displayType="summary" displayName="Cookies" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="crossContext" displayType="summary" displayName="Cross Context" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="defaultContextXml" displayType="summary" displayName="Default Context Xml" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="defaultWebXml" displayType="summary" displayName="Default Web Xml" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="delegate" displayType="summary" displayName="Delegate" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="deploymentDescriptor" displayType="summary" displayName="Deployment Descriptor" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="docBase" displayType="summary" displayName="Doc Base" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="engineName" displayType="summary" displayName="Engine Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="eventProvider" displayType="summary" displayName="Event Provider" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="loader.delegate" measurementType="dynamic" displayType="detail" displayName="Delegate" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="loader.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="loader.reloadable" measurementType="dynamic" displayType="detail" displayName="Reloadable" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="logger.debugEnabled" measurementType="dynamic" displayType="detail" displayName="Debug Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="logger.errorEnabled" measurementType="dynamic" displayType="detail" displayName="Error Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="logger.fatalEnabled" measurementType="dynamic" displayType="detail" displayName="Fatal Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="logger.infoEnabled" measurementType="dynamic" displayType="detail" displayName="Info Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="logger.traceEnabled" measurementType="dynamic" displayType="detail" displayName="Trace Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="logger.warnEnabled" measurementType="dynamic" displayType="detail" displayName="Warn Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="manager.activeSessions" measurementType="dynamic" displayType="detail" displayName="Active Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="manager.distributable" measurementType="dynamic" displayType="detail" displayName="Distributable" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="manager.expiredSessions" measurementType="dynamic" displayType="detail" displayName="Expired Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="manager.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="manager.maxActive" measurementType="dynamic" displayType="detail" displayName="Max Active" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="manager.maxInactiveInterval" measurementType="dynamic" displayType="detail" displayName="Max Inactive Interval" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="manager.rejectedSessions" measurementType="dynamic" displayType="detail" displayName="Rejected Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="manager.sessionAverageAliveTime" measurementType="dynamic" displayType="detail" displayName="Session Average Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="manager.sessionCounter" measurementType="dynamic" displayType="detail" displayName="Session Counter" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="manager.sessionIdLength" measurementType="dynamic" displayType="detail" displayName="Session Id Length" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="manager.sessionMaxAliveTime" measurementType="dynamic" displayType="detail" displayName="Session Max Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="namingContextListener.name" displayType="detail" displayName="Name" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="objectName" displayType="summary" displayName="Object Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="override" displayType="summary" displayName="Override" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="parentClassLoader.defaultAssertionStatus" measurementType="dynamic" displayType="detail" displayName="Default Assertion Status" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="path" displayType="summary" displayName="Path" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="privileged" displayType="summary" displayName="Privileged" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="realm.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="reloadable" displayType="summary" displayName="Reloadable" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="saveConfig" displayType="summary" displayName="Save Config" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="server" displayType="summary" displayName="Server" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="startTime" measurementType="dynamic" displayType="detail" displayName="Start Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="startupTime" measurementType="dynamic" displayType="detail" displayName="Startup Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="state" measurementType="dynamic" displayType="detail" displayName="State" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="stateManageable" displayType="summary" displayName="State Manageable" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="statisticsProvider" displayType="summary" displayName="Statistics Provider" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="swallowOutput" displayType="summary" displayName="Swallow Output" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="tldScanTime" measurementType="dynamic" displayType="detail" displayName="Tld Scan Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="unloadDelay" measurementType="dynamic" displayType="detail" displayName="Unload Delay" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="useNaming" displayType="summary" displayName="Use Naming" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="workDir" displayType="summary" displayName="Work Dir" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
     </service>
     <service name="WebApplicationManager MBean">
-        <metric property="activeSessions" measurementType="dynamic" displayType="detail" displayName="Active Sessions"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="algorithm" displayType="summary" displayName="Algorithm" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="className" displayType="summary" displayName="Class Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="distributable" displayType="summary" displayName="Distributable" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="duplicates" measurementType="dynamic" displayType="detail" displayName="Duplicates"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="entropy" displayType="summary" displayName="Entropy" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="expiredSessions" measurementType="dynamic" displayType="detail" displayName="Expired Sessions"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="maxActive" measurementType="dynamic" displayType="detail" displayName="Max Active"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="maxActiveSessions" measurementType="dynamic" displayType="detail"
-                displayName="Max Active Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="maxInactiveInterval" measurementType="dynamic" displayType="detail"
-                displayName="Max Inactive Interval" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="pathname" displayType="summary" displayName="Pathname" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="processExpiresFrequency" measurementType="dynamic" displayType="detail"
-                displayName="Process Expires Frequency" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="randomFile" displayType="summary" displayName="Random File" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="rejectedSessions" measurementType="dynamic" displayType="detail"
-                displayName="Rejected Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="sessionAverageAliveTime" measurementType="dynamic" displayType="detail"
-                displayName="Session Average Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="sessionCounter" measurementType="dynamic" displayType="detail" displayName="Session Counter"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="sessionIdLength" measurementType="dynamic" displayType="detail"
-                displayName="Session Id Length" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="sessionMaxAliveTime" measurementType="dynamic" displayType="detail"
-                displayName="Session Max Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
+        <metric property="activeSessions" measurementType="dynamic" displayType="detail" displayName="Active Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="algorithm" displayType="summary" displayName="Algorithm" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="className" displayType="summary" displayName="Class Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="distributable" displayType="summary" displayName="Distributable" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="duplicates" measurementType="dynamic" displayType="detail" displayName="Duplicates" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="entropy" displayType="summary" displayName="Entropy" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="expiredSessions" measurementType="dynamic" displayType="detail" displayName="Expired Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="maxActive" measurementType="dynamic" displayType="detail" displayName="Max Active" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="maxActiveSessions" measurementType="dynamic" displayType="detail" displayName="Max Active Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="maxInactiveInterval" measurementType="dynamic" displayType="detail" displayName="Max Inactive Interval" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="pathname" displayType="summary" displayName="Pathname" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="processExpiresFrequency" measurementType="dynamic" displayType="detail" displayName="Process Expires Frequency" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="randomFile" displayType="summary" displayName="Random File" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="rejectedSessions" measurementType="dynamic" displayType="detail" displayName="Rejected Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="sessionAverageAliveTime" measurementType="dynamic" displayType="detail" displayName="Session Average Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="sessionCounter" measurementType="dynamic" displayType="detail" displayName="Session Counter" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="sessionIdLength" measurementType="dynamic" displayType="detail" displayName="Session Id Length" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="sessionMaxAliveTime" measurementType="dynamic" displayType="detail" displayName="Session Max Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
     </service>
     <service name="WebHost MBean">
-        <metric property="appBase" displayType="summary" displayName="App Base" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="autoDeploy" displayType="summary" displayName="Auto Deploy" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="configClass" displayType="summary" displayName="Config Class" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="deployOnStartup" displayType="summary" displayName="Deploy On Startup" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="deployXML" displayType="summary" displayName="Deploy XML" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="realm.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000"
-                dataType="trait" category="performance"/>
-        <metric property="unpackWARs" displayType="summary" displayName="Unpack WA Rs" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="xmlNamespaceAware" displayType="summary" displayName="Xml Namespace Aware" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="xmlValidation" displayType="summary" displayName="Xml Validation" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="appBase" displayType="summary" displayName="App Base" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="autoDeploy" displayType="summary" displayName="Auto Deploy" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="configClass" displayType="summary" displayName="Config Class" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="deployOnStartup" displayType="summary" displayName="Deploy On Startup" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="deployXML" displayType="summary" displayName="Deploy XML" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="realm.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="unpackWARs" displayType="summary" displayName="Unpack WA Rs" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="xmlNamespaceAware" displayType="summary" displayName="Xml Namespace Aware" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="xmlValidation" displayType="summary" displayName="Xml Validation" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
     </service>
     <service name="WebRequestProcessor MBean">
-        <metric property="bytesReceived" measurementType="dynamic" displayType="detail" displayName="Bytes Received"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="bytesSent" measurementType="dynamic" displayType="detail" displayName="Bytes Sent"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="errorCount" measurementType="dynamic" displayType="detail" displayName="Error Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="maxTime" measurementType="dynamic" displayType="detail" displayName="Max Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="requestCount" measurementType="dynamic" displayType="detail" displayName="Request Count"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="bytesReceived" measurementType="dynamic" displayType="detail" displayName="Bytes Received" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="bytesSent" measurementType="dynamic" displayType="detail" displayName="Bytes Sent" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="errorCount" measurementType="dynamic" displayType="detail" displayName="Error Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="maxTime" measurementType="dynamic" displayType="detail" displayName="Max Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="requestCount" measurementType="dynamic" displayType="detail" displayName="Request Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
     </service>
     <service name="WebThreadPool MBean">
-        <metric property="acceptorThreadCount" measurementType="dynamic" displayType="detail"
-                displayName="Acceptor Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="backlog" measurementType="dynamic" displayType="detail" displayName="Backlog" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="currentThreadCount" measurementType="dynamic" displayType="detail"
-                displayName="Current Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="currentThreadsBusy" measurementType="dynamic" displayType="detail"
-                displayName="Current Threads Busy" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="daemon" displayType="summary" displayName="Daemon" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="maxThreads" measurementType="dynamic" displayType="detail" displayName="Max Threads"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="paused" displayType="summary" displayName="Paused" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true"
-                defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="running" displayType="summary" displayName="Running" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="soLinger" measurementType="dynamic" displayType="detail" displayName="So Linger"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="soTimeout" measurementType="dynamic" displayType="detail" displayName="So Timeout"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="tcpNoDelay" displayType="summary" displayName="Tcp No Delay" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="threadPriority" measurementType="dynamic" displayType="detail" displayName="Thread Priority"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="acceptorThreadCount" measurementType="dynamic" displayType="detail" displayName="Acceptor Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="backlog" measurementType="dynamic" displayType="detail" displayName="Backlog" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="currentThreadCount" measurementType="dynamic" displayType="detail" displayName="Current Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="currentThreadsBusy" measurementType="dynamic" displayType="detail" displayName="Current Threads Busy" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="daemon" displayType="summary" displayName="Daemon" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="maxThreads" measurementType="dynamic" displayType="detail" displayName="Max Threads" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="paused" displayType="summary" displayName="Paused" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="running" displayType="summary" displayName="Running" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="soLinger" measurementType="dynamic" displayType="detail" displayName="So Linger" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="soTimeout" measurementType="dynamic" displayType="detail" displayName="So Timeout" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="tcpNoDelay" displayType="summary" displayName="Tcp No Delay" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="threadPriority" measurementType="dynamic" displayType="detail" displayName="Thread Priority" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
     </service>
-    <service name="DefaultAspectManager MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="KernelDeploymentComponentMapper MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="JMXKernel MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ClassLoaderSystem MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="MainDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ClassLoaderDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ClassLoaderDescribeDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="JMXKernel MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AOPClassPoolFactory MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AOPClassLoaderScopingPolicy MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="deployers-classloader:0.0.0 MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="aop-classloader:0.0.0$MODULE MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ClassLoaderDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="bootstrap-classloader:0.0.0$MODULE MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AOPDeploymentAopMetaDataDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="deployers-classloader:0.0.0 MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ServiceMetaDataICF MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="profile-classloader:0.0.0 MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="BasicProfileFactory MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="KernelDeploymentManagedObjectCreator MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="BeanMetaDataICF MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="JARStructureCandidates MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AttachmentsSerializer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ServiceDeploymentDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ProfileServiceDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="JMXStartStopAdvice$AspectBinding MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ClassLoaderSystem MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="bootstrap-classloader:0.0.0 MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="JARStructure MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ProfileRepositoryFactory MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ProfileService MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="profile-classloader:0.0.0$MODULE MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="JMXRegistrationAdvice$AspectBinding MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ServiceMetaDataICF MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ProfileRepositoryFactory MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="KernelDeploymentDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AOPJBossIntegration MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="StructuralDeployers MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AOPXMLMetaDataParserDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ComponentMapperRegistry MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="WebVisitorAttributes MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ClassLoadingMetaDataParser MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="JMXCreateDestroyAdvice$AspectBinding MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ServiceClassLoaderDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="bootstrap-classloader:0.0.0 MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AOPClassLoaderDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="StructuralDeployers MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="JMXCreateDestroyAdvice$AspectBinding MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="StructureModCache MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="JMXStartStopAdvice MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ServiceDeploymentComponentMapper MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="MainDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="KernelDeploymentManagedObjectCreator MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="DefaultDeploymentRepositoryFactory MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="BootstrapProfileFactory MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ManagementView MCBean">
         <resource-configuration>
+            <c:simple-property required="false" name="state" description="The bean controller state"/>
+        </resource-configuration>
+    </service>
+    <service name="AOPJBossIntegration MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AttachmentStore MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="BeanMetaDataDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="DeclaredStructure MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="Deployers MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AOPAnnotationMetaDataParserDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ClassLoadingDefaultDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AspectManager MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="SARDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="JMXRegistrationAdvice MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ServiceDeploymentComponentMapper MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="MetaDataStructureModificationChecker MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="StructureModCache MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ClassLoading MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="FileStructure MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AOPClassLoaderDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="DeclaredStructure MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="BeanDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AttachmentStore MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ModificationTypeStructureProcessor MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ProfileServiceDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="profile-classloader:0.0.0$MODULE MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AOPXMLMetaDataParserDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="bootstrap-classloader:0.0.0$MODULE MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AOPDeploymentAopMetaDataDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="profile-classloader:0.0.0 MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="StructureBuilder MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="aop-classloader:0.0.0 MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="JMXCreateDestroyAdvice MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="DefaultDeploymentRepositoryFactory MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ServiceDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="DefaultProfileKey MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="JMXRegistrationAdvice MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ManagedObjectCreator MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AspectManager MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ProfileServicePersistenceDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="SynchAdapter MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="Deployers MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="BeanDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="FileStructure MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AOPClassPoolFactory MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="JARFilter MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="deployers-classloader:0.0.0$MODULE MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AttachmentStore$metaDataFilter#1 MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ClassLoaderClassPathDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="BeanMetaDataDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ProfileService MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ClassLoaderClassPathDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ManagedObjectCreator MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="SynchAdapter MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="BasicProfileFactory MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ManagedDeploymentCreator MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="jmx-classloader:0.0.0 MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="KernelDeploymentComponentMapper MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="BeanMetaDataICF MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="PersistenceFactory MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ModificationTypeStructureProcessor MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="jmx-classloader:0.0.0$MODULE MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="InMemoryClassesDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ProfileServiceBootstrap MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="DefaultAspectManager MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="StructureBuilder MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="JARStructure MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="JMXStartStopAdvice MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ProfileFactory MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="deployers-classloader:0.0.0$MODULE MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="DeploymentFilter MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="MetaDataStructureModificationChecker$filter#1 MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AOPAnnotationMetaDataParserDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="JARStructureCandidates MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="JARFilter MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="jmx-classloader:0.0.0 MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="PersistenceFactory MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ProfileFactory MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="DefaultProfileKey MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="DeploymentFilter MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="MetaDataStructureModificationChecker$filter#1 MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="BeansDeploymentAopMetaDataDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="MetaDataStructureModificationChecker MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ClassLoadingMetaDataParser MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="StructureModificationChecker MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ServiceClassLoaderDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="WebVisitorAttributes MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="InMemoryClassesDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AspectManagerJMXRegistrar MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="KernelDeploymentDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="jmx-classloader:0.0.0$MODULE MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ClassLoadingDefaultDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="BootstrapProfileFactory MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AspectManagerJMXRegistrar MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="FilteredProfileFactory MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="aop-classloader:0.0.0$MODULE MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AOPRegisterModuleCallback MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="StructureModificationChecker MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ManagedDeploymentCreator MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="FilteredProfileFactory MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="JMXRegistrationAdvice$AspectBinding MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ServiceDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="AttachmentsSerializer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="AOPClassLoaderScopingPolicy MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="aop-classloader:0.0.0 MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="JMXCreateDestroyAdvice MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="BeansDeploymentAopMetaDataDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ServiceDeploymentDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ProfileServicePersistenceDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="ManagementView MCBean">
+    <service name="ClassLoading MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
-            <c:simple-property required="false" name="state" description="The bean controller state"/>
-        </resource-configuration>
-    </service>
-    <service name="AOPRegisterModuleCallback MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
-        <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="SARDeployer MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ProfileServiceBootstrap MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="JMXStartStopAdvice$AspectBinding MCBean">
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+    <service name="ClassLoaderDescribeDeployer MCBean">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
@@ -2040,12 +1398,10 @@
             <c:simple-property required="false" readOnly="true" name="buildDate" description="The server build date"/>
             <c:simple-property required="false" readOnly="true" name="buildID" description="The server build ID"/>
             <c:simple-property required="false" readOnly="true" name="buildJVM" description="The server build JVM"/>
-            <c:simple-property required="false" readOnly="true" name="buildNumber"
-                               description="The server build number"/>
+            <c:simple-property required="false" readOnly="true" name="buildNumber" description="The server build number"/>
             <c:simple-property required="false" readOnly="true" name="buildOS" description="The server build OS"/>
             <c:map-property required="false" readOnly="true" name="config">
-                <c:map-property required="false" readOnly="true" name="libraryURL"
-                                description="the bootstrap library URL for the server.">
+                <c:map-property required="false" readOnly="true" name="libraryURL" description="the bootstrap library URL for the server.">
                     <c:simple-property required="false" name="authority"/>
                     <c:simple-property type="integer" required="false" name="defaultPort"/>
                     <c:simple-property required="false" name="file"/>
@@ -2057,14 +1413,10 @@
                     <c:simple-property required="false" name="ref"/>
                     <c:simple-property required="false" name="userInfo"/>
                 </c:map-property>
-                <c:simple-property required="false" readOnly="true" name="serverNativeDir"
-                                   description="the directory for platform native files"/>
-                <c:simple-property required="false" readOnly="true" name="homeDir"
-                                   description="the local home directory which the server is running from"/>
-                <c:simple-property required="false" readOnly="true" name="serverLogDir"
-                                   description="the server log directory"/>
-                <c:map-property required="false" readOnly="true" name="serverLibraryURL"
-                                description="the server home URL">
+                <c:simple-property required="false" readOnly="true" name="serverNativeDir" description="the directory for platform native files"/>
+                <c:simple-property required="false" readOnly="true" name="homeDir" description="the local home directory which the server is running from"/>
+                <c:simple-property required="false" readOnly="true" name="serverLogDir" description="the server log directory"/>
+                <c:map-property required="false" readOnly="true" name="serverLibraryURL" description="the server home URL">
                     <c:simple-property required="false" name="authority"/>
                     <c:simple-property type="integer" required="false" name="defaultPort"/>
                     <c:simple-property required="false" name="file"/>
@@ -2076,16 +1428,11 @@
                     <c:simple-property required="false" name="ref"/>
                     <c:simple-property required="false" name="userInfo"/>
                 </c:map-property>
-                <c:simple-property required="false" readOnly="true" name="serverHomeDir"
-                                   description="the server home directory"/>
-                <c:simple-property required="false" readOnly="true" name="serverName"
-                                   description="the name of the active profile the sever is using"/>
-                <c:simple-property required="false" name="rootDeploymentFilename"
-                                   description="the filename of the root deployable that will be used to finalize the bootstrap process"/>
-                <c:simple-property required="false" readOnly="true" name="specificationVersion"
-                                   description="the server Specification-Version"/>
-                <c:map-property required="false" readOnly="true" name="serverBaseURL"
-                                description="the base URL for calculating server home URLs">
+                <c:simple-property required="false" readOnly="true" name="serverHomeDir" description="the server home directory"/>
+                <c:simple-property required="false" readOnly="true" name="serverName" description="the name of the active profile the sever is using"/>
+                <c:simple-property required="false" name="rootDeploymentFilename" description="the filename of the root deployable that will be used to finalize the bootstrap process"/>
+                <c:simple-property required="false" readOnly="true" name="specificationVersion" description="the server Specification-Version"/>
+                <c:map-property required="false" readOnly="true" name="serverBaseURL" description="the base URL for calculating server home URLs">
                     <c:simple-property required="false" name="authority"/>
                     <c:simple-property type="integer" required="false" name="defaultPort"/>
                     <c:simple-property required="false" name="file"/>
@@ -2097,8 +1444,7 @@
                     <c:simple-property required="false" name="ref"/>
                     <c:simple-property required="false" name="userInfo"/>
                 </c:map-property>
-                <c:map-property required="false" readOnly="true" name="commonBaseURL"
-                                description="the common library URL base">
+                <c:map-property required="false" readOnly="true" name="commonBaseURL" description="the common library URL base">
                     <c:simple-property required="false" name="authority"/>
                     <c:simple-property type="integer" required="false" name="defaultPort"/>
                     <c:simple-property required="false" name="file"/>
@@ -2110,8 +1456,7 @@
                     <c:simple-property required="false" name="ref"/>
                     <c:simple-property required="false" name="userInfo"/>
                 </c:map-property>
-                <c:map-property required="false" readOnly="true" name="commonLibraryURL"
-                                description="the URL for the common library jars">
+                <c:map-property required="false" readOnly="true" name="commonLibraryURL" description="the URL for the common library jars">
                     <c:simple-property required="false" name="authority"/>
                     <c:simple-property type="integer" required="false" name="defaultPort"/>
                     <c:simple-property required="false" name="file"/>
@@ -2123,8 +1468,7 @@
                     <c:simple-property required="false" name="ref"/>
                     <c:simple-property required="false" name="userInfo"/>
                 </c:map-property>
-                <c:simple-property required="false" readOnly="true" name="serverTempDeployDir"
-                                   description="the temporary deployment dir"/>
+                <c:simple-property required="false" readOnly="true" name="serverTempDeployDir" description="the temporary deployment dir"/>
                 <c:map-property required="false" readOnly="true" name="serverHomeURL" description="the server home URL">
                     <c:simple-property required="false" name="authority"/>
                     <c:simple-property type="integer" required="false" name="defaultPort"/>
@@ -2137,8 +1481,7 @@
                     <c:simple-property required="false" name="ref"/>
                     <c:simple-property required="false" name="userInfo"/>
                 </c:map-property>
-                <c:map-property required="false" readOnly="true" name="homeURL"
-                                description="home URL which the server is running from">
+                <c:map-property required="false" readOnly="true" name="homeURL" description="home URL which the server is running from">
                     <c:simple-property required="false" name="authority"/>
                     <c:simple-property type="integer" required="false" name="defaultPort"/>
                     <c:simple-property required="false" name="file"/>
@@ -2150,12 +1493,9 @@
                     <c:simple-property required="false" name="ref"/>
                     <c:simple-property required="false" name="userInfo"/>
                 </c:map-property>
-                <c:simple-property required="false" readOnly="true" name="serverDataDir"
-                                   description="the directory where local data will be stored"/>
-                <c:simple-property required="false" readOnly="true" name="serverBaseDir"
-                                   description="the base directory for calculating server home directories"/>
-                <c:simple-property required="false" readOnly="true" name="serverTempDir"
-                                   description="the directory where temporary files will be stored"/>
+                <c:simple-property required="false" readOnly="true" name="serverDataDir" description="the directory where local data will be stored"/>
+                <c:simple-property required="false" readOnly="true" name="serverBaseDir" description="the base directory for calculating server home directories"/>
+                <c:simple-property required="false" readOnly="true" name="serverTempDir" description="the directory where temporary files will be stored"/>
                 <c:map-property required="false" readOnly="true" name="bootstrapURL" description="the bootstrap url">
                     <c:simple-property required="false" name="authority"/>
                     <c:simple-property type="integer" required="false" name="defaultPort"/>
@@ -2171,390 +1511,170 @@
             </c:map-property>
             <c:simple-property required="false" readOnly="true" name="startDate" description="The server start time"/>
             <c:simple-property required="false" readOnly="true" name="version" description="The server version string"/>
-            <c:simple-property required="false" readOnly="true" name="versionName"
-                               description="The server version name"/>
-            <c:simple-property required="false" readOnly="true" name="versionNumber"
-                               description="The server version number string"/>
+            <c:simple-property required="false" readOnly="true" name="versionName" description="The server version name"/>
+            <c:simple-property required="false" readOnly="true" name="versionNumber" description="The server version number string"/>
         </resource-configuration>
     </service>
     <service name="Security MCBean">
-        <operation name="createSecurityDomainContext" displayName="Create Security Domain Context"
-                   description="Create the context for the specified security domain">
+        <operation name="createSubject" displayName="Create Subject" description="Create a subject using the modules configured in the specified security domain">
             <parameters>
-                <c:simple-property required="false" name="securityDomain" description="The security domain name"/>
+                <c:simple-property required="false" name="securityDomainName" description="The security domain name"/>
             </parameters>
             <results>
-                <c:notes>Create the context for the specified security domain</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="deregisterJaasSecurityDomainInstance" displayName="Deregister Jaas Security Domain Instance"
-                   description="Deregister the specified security domain">
-            <parameters>
-                <c:simple-property required="false" name="securityDomain"
-                                   description="The name of the security domain being deregistered"/>
-            </parameters>
-        </operation>
-        <operation name="getAuditManager" displayName="Get Audit Manager"
-                   description="Get the audit manager for the specified security domain">
-            <parameters>
-                <c:simple-property required="false" name="securityDomain" description="The security domain name"/>
-            </parameters>
-            <results>
-                <c:notes>Get the audit manager for the specified security domain</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="getAuthenticationManager" displayName="Get Authentication Manager"
-                   description="Get the authentication manager for the specified security domain">
-            <parameters>
-                <c:simple-property required="false" name="securityDomain" description="The security domain name"/>
-            </parameters>
-            <results>
-                <c:notes>Get the authentication manager for the specified security domain</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="getAuthorizationManager" displayName="Get Authorization Manager"
-                   description="Get the authorization manager for the specified security domain">
-            <parameters>
-                <c:simple-property required="false" name="securityDomain" description="The security domain name"/>
-            </parameters>
-            <results>
-                <c:notes>Get the authorization manager for the specified security domain</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="getIdentityTrustManager" displayName="Get Identity Trust Manager"
-                   description="Get the identity trust manager for the specified security domain">
-            <parameters>
-                <c:simple-property required="false" name="securityDomain" description="The security domain name"/>
-            </parameters>
-            <results>
-                <c:notes>Get the identity trust manager for the specified security domain</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="getMappingManager" displayName="Get Mapping Manager"
-                   description="Get the mapping manager for the specified security domain">
-            <parameters>
-                <c:simple-property required="false" name="securityDomain" description="The security domain name"/>
-            </parameters>
-            <results>
-                <c:notes>Get the mapping manager for the specified security domain</c:notes>
-                <c:map-property required="false" name="result"/>
-            </results>
-        </operation>
-        <operation name="registerJaasSecurityDomainInstance" displayName="Register Jaas Security Domain Instance"
-                   description="Register the specified security domain">
-            <parameters>
-                <c:map-property required="false" name="domain" description="The security domain being registered">
-                    <c:simple-property required="false" name="cipherAlgorithm"/>
-                    <c:simple-property type="boolean" required="false" name="deepCopySubjectOption"/>
-                    <c:simple-property type="integer" required="false" name="iterationCount"/>
-                    <c:simple-property required="false" name="keyStoreAlias"/>
-                    <c:simple-property required="false" name="keyStorePass"/>
-                    <c:simple-property required="false" name="keyStoreType"/>
-                    <c:simple-property required="false" name="keyStoreURL"/>
-                    <c:simple-property required="false" name="name"/>
-                    <c:list-property name="notificationInfo">
+                <c:notes>Create a subject using the modules configured in the specified security domain</c:notes>
+                <c:map-property required="false" name="result">
+                    <c:list-property name="principals">
                         <c:map-property required="false" name="element">
-                            <c:simple-property required="false" name="description"/>
                             <c:simple-property required="false" name="name"/>
-                            <c:list-property name="notifTypes">
-                                <c:simple-property required="false" name="element"/>
-                            </c:list-property>
                         </c:map-property>
                     </c:list-property>
-                    <c:simple-property required="false" name="salt"/>
-                    <c:simple-property required="false" name="securityDomain"/>
-                    <c:simple-property type="integer" required="false" name="state"/>
-                    <c:simple-property required="false" name="stateString"/>
-                    <c:simple-property required="false" name="trustStorePass"/>
-                    <c:simple-property required="false" name="trustStoreType"/>
-                    <c:simple-property required="false" name="trustStoreURL"/>
+                    <c:list-property name="privateCredentials">
+                        <c:map-property required="false" name="element"/>
+                    </c:list-property>
+                    <c:list-property name="publicCredentials">
+                        <c:map-property required="false" name="element"/>
+                    </c:list-property>
+                    <c:simple-property type="boolean" required="false" name="readOnly"/>
                 </c:map-property>
-            </parameters>
+            </results>
         </operation>
         <resource-configuration>
-            <c:simple-property required="false" name="auditMgrClass"
-                               description="The class that implements the AuditManager interface"/>
-            <c:simple-property required="false" name="authenticationMgrClass"
-                               description="The class that implements the AuthenticationManager interface"/>
-            <c:simple-property required="false" name="authorizationMgrClass"
-                               description="The class that implements the AuthorizationManager interface"/>
-            <c:simple-property required="false" name="identityTrustMgrClass"
-                               description="The class that implements the IdentityTrustManager interface"/>
-            <c:simple-property required="false" name="mappingMgrClass"
-                               description="The class that implements the MappingManager interface"/>
+            <c:map-property required="false" name="securityManagement"/>
             <c:simple-property required="false" name="state" description="The bean controller state"/>
         </resource-configuration>
     </service>
     <service name="ServerConfig MCBean">
-        <metric property="bootstrapURL.authority" displayType="detail" displayName="Authority" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="bootstrapURL.defaultPort" measurementType="dynamic" displayType="detail"
-                displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="bootstrapURL.file" displayType="detail" displayName="File" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="bootstrapURL.host" displayType="detail" displayName="Host" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="bootstrapURL.path" displayType="detail" displayName="Path" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="bootstrapURL.port" measurementType="dynamic" displayType="detail" displayName="Port"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="bootstrapURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="bootstrapURL.query" displayType="detail" displayName="Query" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="bootstrapURL.ref" displayType="detail" displayName="Ref" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="bootstrapURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonBaseURL.defaultPort" measurementType="dynamic" displayType="detail"
-                displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="commonBaseURL.file" displayType="detail" displayName="File" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonBaseURL.host" displayType="detail" displayName="Host" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonBaseURL.path" displayType="detail" displayName="Path" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="commonBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonBaseURL.query" displayType="detail" displayName="Query" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonLibraryURL.defaultPort" measurementType="dynamic" displayType="detail"
-                displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="commonLibraryURL.file" displayType="detail" displayName="File" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="commonLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonLibraryURL.query" displayType="detail" displayName="Query" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonLibraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="commonLibraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="homeDir" displayType="summary" displayName="Home Dir"
-                description="the local home directory which the server is running from" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="homeURL.authority" displayType="detail" displayName="Authority" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="homeURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="homeURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000"
-                dataType="trait" category="performance"/>
-        <metric property="homeURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000"
-                dataType="trait" category="performance"/>
-        <metric property="homeURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000"
-                dataType="trait" category="performance"/>
-        <metric property="homeURL.port" measurementType="dynamic" displayType="detail" displayName="Port"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="homeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="homeURL.query" displayType="detail" displayName="Query" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="homeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000"
-                dataType="trait" category="performance"/>
-        <metric property="homeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="libraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="libraryURL.defaultPort" measurementType="dynamic" displayType="detail"
-                displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="libraryURL.file" displayType="detail" displayName="File" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="libraryURL.host" displayType="detail" displayName="Host" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="libraryURL.path" displayType="detail" displayName="Path" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="libraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="libraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="libraryURL.query" displayType="detail" displayName="Query" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="libraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="libraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="rootDeploymentFilename" displayType="summary" displayName="Root Deployment Filename"
-                description="the filename of the root deployable that will be used to finalize the bootstrap process"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="serverBaseDir" displayType="summary" displayName="Server Base Dir"
-                description="the base directory for calculating server home directories" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="serverBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverBaseURL.defaultPort" measurementType="dynamic" displayType="detail"
-                displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="serverBaseURL.file" displayType="detail" displayName="File" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverBaseURL.host" displayType="detail" displayName="Host" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverBaseURL.path" displayType="detail" displayName="Path" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="serverBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverBaseURL.query" displayType="detail" displayName="Query" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverDataDir" displayType="summary" displayName="Server Data Dir"
-                description="the directory where local data will be stored" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="serverHomeDir" displayType="summary" displayName="Server Home Dir"
-                description="the server home directory" defaultOn="true" defaultInterval="600000" dataType="trait"
-                category="performance"/>
-        <metric property="serverHomeURL.authority" displayType="detail" displayName="Authority" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverHomeURL.defaultPort" measurementType="dynamic" displayType="detail"
-                displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="serverHomeURL.file" displayType="detail" displayName="File" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverHomeURL.host" displayType="detail" displayName="Host" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverHomeURL.path" displayType="detail" displayName="Path" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverHomeURL.port" measurementType="dynamic" displayType="detail" displayName="Port"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="serverHomeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverHomeURL.query" displayType="detail" displayName="Query" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverHomeURL.ref" displayType="detail" displayName="Ref" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverHomeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverLibraryURL.defaultPort" measurementType="dynamic" displayType="detail"
-                displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="serverLibraryURL.file" displayType="detail" displayName="File" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="serverLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverLibraryURL.query" displayType="detail" displayName="Query" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverLibraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverLibraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true"
-                defaultInterval="60000" dataType="trait" category="performance"/>
-        <metric property="serverLogDir" displayType="summary" displayName="Server Log Dir"
-                description="the server log directory" defaultOn="true" defaultInterval="600000" dataType="trait"
-                category="performance"/>
-        <metric property="serverName" displayType="summary" displayName="Server Name"
-                description="the name of the active profile the sever is using" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="serverNativeDir" displayType="summary" displayName="Server Native Dir"
-                description="the directory for platform native files" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="serverTempDeployDir" displayType="summary" displayName="Server Temp Deploy Dir"
-                description="the temporary deployment dir" defaultOn="true" defaultInterval="600000" dataType="trait"
-                category="performance"/>
-        <metric property="serverTempDir" displayType="summary" displayName="Server Temp Dir"
-                description="the directory where temporary files will be stored" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="specificationVersion" displayType="summary" displayName="Specification Version"
-                description="the server Specification-Version" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
+        <metric property="bootstrapURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="bootstrapURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="bootstrapURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="bootstrapURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="bootstrapURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="bootstrapURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="bootstrapURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="bootstrapURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="bootstrapURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="bootstrapURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonBaseURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="commonBaseURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonBaseURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonBaseURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="commonBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonBaseURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonLibraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="commonLibraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="commonLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonLibraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonLibraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="commonLibraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="homeDir" displayType="summary" displayName="Home Dir" description="the local home directory which the server is running from" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="homeURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="homeURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="homeURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="homeURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="homeURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="homeURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="homeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="homeURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="homeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="homeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="libraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="libraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="libraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="libraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="libraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="libraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="libraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="libraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="libraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="libraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="rootDeploymentFilename" displayType="summary" displayName="Root Deployment Filename" description="the filename of the root deployable that will be used to finalize the bootstrap process" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="serverBaseDir" displayType="summary" displayName="Server Base Dir" description="the base directory for calculating server home directories" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="serverBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverBaseURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="serverBaseURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverBaseURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverBaseURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="serverBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverBaseURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverDataDir" displayType="summary" displayName="Server Data Dir" description="the directory where local data will be stored" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="serverHomeDir" displayType="summary" displayName="Server Home Dir" description="the server home directory" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="serverHomeURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverHomeURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="serverHomeURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverHomeURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverHomeURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverHomeURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="serverHomeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverHomeURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverHomeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverHomeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverLibraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="serverLibraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="serverLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverLibraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverLibraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverLibraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/>
+        <metric property="serverLogDir" displayType="summary" displayName="Server Log Dir" description="the server log directory" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="serverName" displayType="summary" displayName="Server Name" description="the name of the active profile the sever is using" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="serverNativeDir" displayType="summary" displayName="Server Native Dir" description="the directory for platform native files" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="serverTempDeployDir" displayType="summary" displayName="Server Temp Deploy Dir" description="the temporary deployment dir" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="serverTempDir" displayType="summary" displayName="Server Temp Dir" description="the directory where temporary files will be stored" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="specificationVersion" displayType="summary" displayName="Specification Version" description="the server Specification-Version" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
     </service>
     <service name="ServerInfo MCBean">
-        <operation name="listMemoryPools" displayName="List Memory Pools"
-                   description="Return a listing of the thread pools on jdk5+">
+        <operation name="listMemoryPools" displayName="List Memory Pools" description="Return a listing of the thread pools on jdk5+">
             <parameters>
-                <c:simple-property type="boolean" required="false" name="fancy"
-                                   description="produce a text-based graph when true"/>
+                <c:simple-property type="boolean" required="false" name="fancy" description="produce a text-based graph when true"/>
             </parameters>
             <results>
                 <c:notes>Return a listing of the thread pools on jdk5+</c:notes>
                 <c:simple-property required="false" name="result"/>
             </results>
         </operation>
-        <operation name="listThreadCpuUtilization" displayName="List Thread Cpu Utilization"
-                   description="Return a listing of the active threads and thread groups">
+        <operation name="listThreadCpuUtilization" displayName="List Thread Cpu Utilization" description="Return a listing of the active threads and thread groups">
             <results>
                 <c:notes>Return a listing of the active threads and thread groups</c:notes>
                 <c:simple-property required="false" name="result"/>
             </results>
         </operation>
-        <operation name="listThreadDump" displayName="List Thread Dump"
-                   description="Return a listing of the active threads and thread groups">
+        <operation name="listThreadDump" displayName="List Thread Dump" description="Return a listing of the active threads and thread groups">
             <results>
                 <c:notes>Return a listing of the active threads and thread groups</c:notes>
                 <c:simple-property required="false" name="result"/>
             </results>
         </operation>
-        <metric property="OSArch" displayType="summary" displayName="OS Arch" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="OSName" displayType="summary" displayName="OS Name" defaultOn="true" defaultInterval="600000"
-                dataType="trait" category="performance"/>
-        <metric property="OSVersion" displayType="summary" displayName="OS Version" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="activeThreadCount" measurementType="dynamic" displayType="detail"
-                displayName="Active Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="activeThreadGroupCount" measurementType="dynamic" displayType="detail"
-                displayName="Active Thread Group Count" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="availableProcessors" measurementType="dynamic" displayType="detail"
-                displayName="Available Processors" defaultOn="true" defaultInterval="60000" dataType="measurement"
-                category="performance"/>
-        <metric property="freeMemory" measurementType="dynamic" displayType="detail" displayName="Free Memory"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="hostAddress" displayType="summary" displayName="Host Address" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="hostName" displayType="summary" displayName="Host Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="javaVMName" displayType="summary" displayName="Java VM Name" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="javaVMVendor" displayType="summary" displayName="Java VM Vendor" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="javaVMVersion" displayType="summary" displayName="Java VM Version" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="javaVendor" displayType="summary" displayName="Java Vendor" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="javaVersion" displayType="summary" displayName="Java Version" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="maxMemory" measurementType="dynamic" displayType="detail" displayName="Max Memory"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="state" displayType="summary" displayName="State" description="The bean controller state"
-                defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
-        <metric property="totalMemory" measurementType="dynamic" displayType="detail" displayName="Total Memory"
-                defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="OSArch" displayType="summary" displayName="OS Arch" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="OSName" displayType="summary" displayName="OS Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="OSVersion" displayType="summary" displayName="OS Version" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="activeThreadCount" measurementType="dynamic" displayType="detail" displayName="Active Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="activeThreadGroupCount" measurementType="dynamic" displayType="detail" displayName="Active Thread Group Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="availableProcessors" measurementType="dynamic" displayType="detail" displayName="Available Processors" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="freeMemory" measurementType="dynamic" displayType="detail" displayName="Free Memory" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="hostAddress" displayType="summary" displayName="Host Address" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="hostName" displayType="summary" displayName="Host Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="javaVMName" displayType="summary" displayName="Java VM Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="javaVMVendor" displayType="summary" displayName="Java VM Vendor" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="javaVMVersion" displayType="summary" displayName="Java VM Version" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="javaVendor" displayType="summary" displayName="Java Vendor" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="javaVersion" displayType="summary" displayName="Java Version" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="maxMemory" measurementType="dynamic" displayType="detail" displayName="Max Memory" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="totalMemory" measurementType="dynamic" displayType="detail" displayName="Total Memory" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
         <resource-configuration>
             <c:simple-property required="false" readOnly="true" name="OSArch"/>
             <c:simple-property required="false" readOnly="true" name="OSName"/>
@@ -2569,14 +1689,92 @@
             <c:simple-property required="false" readOnly="true" name="javaVersion"/>
         </resource-configuration>
     </service>
+    <service name="ServiceBindingManager MCBean">
+        <resource-configuration>
+            <c:simple-property required="false" name="activeBindingSetName" description="the name of the binding set the ServiceBindingManager should use when resolving bindings"/>
+            <c:list-property required="false" name="bindingSets" description="the named binding sets">
+                <c:map-property required="false" name="element">
+                    <c:simple-property required="false" name="defaultHostName" description="the host name that should be used for all bindings whose configuration does not specify fixedHostName=&quot;true&quot;"/>
+                    <c:simple-property required="false" name="name" description="the name of the binding set"/>
+                    <c:list-property name="overrideBindings" description="binding configurations that apply only to this binding set, either non-standard bindings or ones that override standard binding configurations">
+                        <c:map-property required="false" name="element">
+                            <c:simple-property required="false" name="bindingName" description="a qualifier identifying which particular binding within the service this is"/>
+                            <c:simple-property required="false" name="description" description="description of the binding"/>
+                            <c:simple-property type="boolean" required="false" name="fixedHostName" description="whether the host name should remain fixed in all binding sets"/>
+                            <c:simple-property type="boolean" required="false" name="fixedPort" description="whether the port should remain fixed in all binding sets"/>
+                            <c:simple-property required="false" name="fullyQualifiedName" description="the fully qualified binding name"/>
+                            <c:simple-property required="false" name="hostName" description="the host name or string notation IP address to use for the binding"/>
+                            <c:simple-property type="integer" required="false" name="port" description="the port to use for the binding"/>
+                            <c:simple-property required="false" name="serviceName" description="the name of the service to which this binding applies"/>
+                        </c:map-property>
+                    </c:list-property>
+                    <c:simple-property type="integer" required="false" name="portOffset" description="value to add to the port configuration for a standard binding to derive the port to use in this binding set"/>
+                </c:map-property>
+            </c:list-property>
+            <c:list-property required="false" name="standardBindings" description="the base set of bindings that should be associated with each binding set">
+                <c:map-property required="false" name="element">
+                    <c:simple-property required="false" name="bindingName" description="a qualifier identifying which particular binding within the service this is"/>
+                    <c:simple-property required="false" name="description" description="description of the binding"/>
+                    <c:simple-property type="boolean" required="false" name="fixedHostName" description="whether the host name should remain fixed in all binding sets"/>
+                    <c:simple-property type="boolean" required="false" name="fixedPort" description="whether the port should remain fixed in all binding sets"/>
+                    <c:simple-property required="false" name="fullyQualifiedName" description="the fully qualified binding name"/>
+                    <c:simple-property required="false" name="hostName" description="the host name or string notation IP address to use for the binding"/>
+                    <c:simple-property type="integer" required="false" name="port" description="the port to use for the binding"/>
+                    <c:simple-property required="false" name="serviceName" description="the name of the service to which this binding applies"/>
+                </c:map-property>
+            </c:list-property>
+            <c:simple-property required="false" name="state" description="The bean controller state"/>
+        </resource-configuration>
+    </service>
     <service name="Context WAR">
-        <metric property="contextRoot" displayType="summary" displayName="Context Root" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="contextRoot" displayType="summary" displayName="Context Root" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:simple-property required="false" readOnly="true" name="contextRoot"/>
         </resource-configuration>
     </service>
+    <service name="ejb2x">
+        <resource-configuration>
+            <c:list-property required="false" name="beanFactories">
+                <c:map-property required="false" name="element"/>
+            </c:list-property>
+            <c:simple-property type="boolean" required="false" name="blackList"/>
+            <c:simple-property type="boolean" required="false" name="cache"/>
+            <c:map-property required="false" name="capabilities">
+                <c:list-property name="capabilities">
+                    <c:map-property required="false" name="element"/>
+                </c:list-property>
+            </c:map-property>
+            <c:simple-property required="false" name="domain"/>
+            <c:simple-property required="false" name="excluded"/>
+            <c:simple-property required="false" name="excludedExport"/>
+            <c:simple-property required="false" name="exportAll"/>
+            <c:simple-property type="boolean" required="false" name="importAll"/>
+            <c:simple-property required="false" name="included"/>
+            <c:simple-property required="false" name="name"/>
+            <c:simple-property required="false" name="parentDomain"/>
+            <c:simple-property type="boolean" required="false" name="parentFirst"/>
+            <c:list-property required="false" name="properties">
+                <c:map-property required="false" name="element"/>
+            </c:list-property>
+            <c:map-property required="false" name="requirements">
+                <c:list-property name="requirements">
+                    <c:map-property required="false" name="element">
+                        <c:simple-property type="boolean" required="false" name="dynamic"/>
+                        <c:simple-property type="boolean" required="false" name="optional"/>
+                        <c:simple-property type="boolean" required="false" name="reExport"/>
+                    </c:map-property>
+                </c:list-property>
+            </c:map-property>
+            <c:simple-property required="false" name="state" description="The bean controller state"/>
+            <c:simple-property required="false" name="version"/>
+        </resource-configuration>
+    </service>
     <service name="ejb3x">
+        <metric property="availableCount" measurementType="dynamic" displayType="detail" displayName="Available Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="createCount" measurementType="dynamic" displayType="detail" displayName="Create Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="currentSize" measurementType="dynamic" displayType="detail" displayName="Current Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
+        <metric property="removeCount" measurementType="dynamic" displayType="detail" displayName="Remove Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
         <resource-configuration>
             <c:list-property required="false" name="beanFactories">
                 <c:map-property required="false" name="element"/>
@@ -2614,8 +1812,7 @@
         </resource-configuration>
     </service>
     <service name="war">
-        <metric property="contextRoot" displayType="summary" displayName="Context Root" defaultOn="true"
-                defaultInterval="600000" dataType="trait" category="performance"/>
+        <metric property="contextRoot" displayType="summary" displayName="Context Root" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
             <c:simple-property type="boolean" required="false" name="blackList"/>
             <c:simple-property type="boolean" required="false" name="cache"/>
@@ -2724,7 +1921,10 @@
                 </c:list-property>
             </c:map-property>
             <c:list-property required="false" name="classpath" description="The deployment classpath">
-                <c:map-property required="false" name="element"/>
+                <c:map-property required="false" name="element">
+                    <c:simple-property required="false" name="codeBase"/>
+                    <c:simple-property required="false" name="archives"/>
+                </c:map-property>
             </c:list-property>
             <c:simple-property required="false" name="domain"/>
             <c:simple-property required="false" name="excluded"/>
@@ -2751,40 +1951,11 @@
         </resource-configuration>
     </service>
     <service name="beans">
+        <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/>
         <resource-configuration>
-            <c:list-property required="false" name="beanFactories">
-                <c:map-property required="false" name="element"/>
-            </c:list-property>
-            <c:simple-property type="boolean" required="false" name="blackList"/>
-            <c:simple-property type="boolean" required="false" name="cache"/>
-            <c:map-property required="false" name="capabilities">
-                <c:list-property name="capabilities">
-                    <c:map-property required="false" name="element"/>
-                </c:list-property>
-            </c:map-property>
-            <c:simple-property required="false" name="domain"/>
-            <c:simple-property required="false" name="excluded"/>
-            <c:simple-property required="false" name="excludedExport"/>
-            <c:simple-property required="false" name="exportAll"/>
-            <c:simple-property type="boolean" required="false" name="importAll"/>
-            <c:simple-property required="false" name="included"/>
-            <c:simple-property required="false" name="name"/>
-            <c:simple-property required="false" name="parentDomain"/>
-            <c:simple-property type="boolean" required="false" name="parentFirst"/>
             <c:list-property required="false" name="properties">
                 <c:map-property required="false" name="element"/>
             </c:list-property>
-            <c:map-property required="false" name="requirements">
-                <c:list-property name="requirements">
-                    <c:map-property required="false" name="element">
-                        <c:simple-property type="boolean" required="false" name="dynamic"/>
-                        <c:simple-property type="boolean" required="false" name="optional"/>
-                        <c:simple-property type="boolean" required="false" name="reExport"/>
-                    </c:map-property>
-                </c:list-property>
-            </c:map-property>
-            <c:simple-property required="false" name="state" description="The bean controller state"/>
-            <c:simple-property required="false" name="version"/>
         </resource-configuration>
     </service>
 </plugin>




More information about the embjopr-commits mailing list