[embjopr-commits] EMBJOPR SVN: r301 - in trunk/jbas5/etc: overlay and 1 other directories.

embjopr-commits at lists.jboss.org embjopr-commits at lists.jboss.org
Fri Apr 17 10:59:57 EDT 2009


Author: ips
Date: 2009-04-17 10:59:57 -0400 (Fri, 17 Apr 2009)
New Revision: 301

Added:
   trunk/jbas5/etc/overlay/lib/
   trunk/jbas5/etc/overlay/lib/jboss-vfs.jar
Modified:
   trunk/jbas5/etc/generated-rhq-plugin.xml
Log:
updated rhq-plugin.xml; patched jboss-vfs.jar w/ fix for https://jira.jboss.org/jira/browse/JBVFS-107 - we should remove this once JBVFS-107 is fixed


Modified: trunk/jbas5/etc/generated-rhq-plugin.xml
===================================================================
--- trunk/jbas5/etc/generated-rhq-plugin.xml	2009-04-17 14:53:08 UTC (rev 300)
+++ trunk/jbas5/etc/generated-rhq-plugin.xml	2009-04-17 14:59:57 UTC (rev 301)
@@ -17,43 +17,36 @@
                 <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"/>
         <resource-configuration>
-            <c:simple-property type="integer" required="false" name="allocation-retry"/>
-            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"/>
-            <c:simple-property type="boolean" required="false" name="background-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"/>
+            <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" name="config-property" description="The connection factory property info"/>
-            <c:simple-property required="false" name="connection-definition"/>
+            <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 required="false" name="exception-sorter-class-name" description="The exception sorter class name"/>
-            <c:simple-property type="integer" required="false" name="idle-timeout-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"/>
-            <c:simple-property required="false" name="jndi-name" description="The global JNDI name to bind the factory under"/>
-            <c:simple-property type="integer" required="false" name="max-pool-size"/>
+            <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: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"/>
+            <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 type="boolean" required="false" name="prefill"/>
+            <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 required="false" name="rar-name"/>
-            <c:map-property required="false" name="security-domain"/>
+            <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: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"/>
@@ -71,8 +64,8 @@
             <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 required="false" name="xa-datasource-class" description="The XADataSource class"/>
-            <c:map-property required="false" name="xa-datasource-properties" description="The DataSource properties"/>
+            <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>
@@ -93,46 +86,39 @@
                 <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"/>
         <resource-configuration>
-            <c:simple-property type="integer" required="false" name="allocation-retry"/>
-            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"/>
-            <c:simple-property type="boolean" required="false" name="background-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"/>
+            <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" name="config-property" description="The connection factory property info"/>
-            <c:simple-property required="false" name="connection-definition"/>
+            <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:simple-property required="false" name="connection-url" description="The DataSource connection URL"/>
-            <c:simple-property required="false" name="driver-class" description="The DataSource connection driver class name"/>
+            <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"/>
+            <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"/>
-            <c:simple-property required="false" name="jndi-name" description="The global JNDI name to bind the factory under"/>
-            <c:simple-property type="integer" required="false" name="max-pool-size"/>
+            <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: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"/>
+            <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 type="boolean" required="false" name="prefill"/>
+            <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 required="false" name="rar-name"/>
-            <c:map-property required="false" name="security-domain">
+            <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:simple-property required="false" readOnly="true" name="securityDeploymentType"/>
                 <c:simple-property required="false" name="domain"/>
             </c:map-property>
@@ -157,6 +143,9 @@
     <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"/>
@@ -168,46 +157,39 @@
                 <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"/>
         <resource-configuration>
-            <c:simple-property type="integer" required="false" name="allocation-retry"/>
-            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"/>
-            <c:simple-property type="boolean" required="false" name="background-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"/>
+            <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" name="config-property" description="The connection factory property info"/>
-            <c:simple-property required="false" name="connection-definition"/>
+            <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:simple-property required="false" name="connection-url" description="The DataSource connection URL"/>
-            <c:simple-property required="false" name="driver-class" description="The DataSource connection driver class name"/>
+            <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"/>
+            <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"/>
-            <c:simple-property required="false" name="jndi-name" description="The global JNDI name to bind the factory under"/>
-            <c:simple-property type="integer" required="false" name="max-pool-size"/>
+            <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: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"/>
+            <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 type="boolean" required="false" name="prefill"/>
+            <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 required="false" name="rar-name"/>
-            <c:map-property required="false" name="security-domain"/>
+            <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: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"/>
@@ -226,9 +208,12 @@
             <c:simple-property type="boolean" required="false" name="validate-on-match"/>
         </resource-configuration>
     </service>
-    <service name="NoTx ConnectionFactory">
+    <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"/>
@@ -240,48 +225,49 @@
                 <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"/>
         <resource-configuration>
-            <c:simple-property type="integer" required="false" name="allocation-retry"/>
-            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"/>
-            <c:simple-property type="boolean" required="false" name="background-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"/>
-            <c:map-property required="false" name="config-property"/>
-            <c:simple-property required="false" name="connection-definition"/>
-            <c:simple-property type="integer" required="false" name="idle-timeout-minutes"/>
+            <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 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"/>
-            <c:simple-property required="false" name="jndi-name" description="The global JNDI name to bind the factory under"/>
-            <c:simple-property type="integer" required="false" name="max-pool-size"/>
+            <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: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"/>
+            <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 type="boolean" required="false" name="prefill"/>
-            <c:simple-property required="false" name="rar-name"/>
-            <c:map-property required="false" name="security-domain"/>
+            <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 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:simple-property required="false" readOnly="true" name="securityDeploymentType"/>
+                <c:simple-property required="false" name="domain"/>
+            </c:map-property>
             <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="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 type="boolean" required="false" name="use-strict-min"/>
             <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="Tx ConnectionFactory">
+    <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"/>
@@ -293,58 +279,53 @@
                 <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="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"/>
         <resource-configuration>
-            <c:simple-property type="integer" required="false" name="allocation-retry"/>
-            <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"/>
-            <c:simple-property type="boolean" required="false" name="background-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"/>
-            <c:map-property required="false" name="config-property"/>
-            <c:simple-property required="false" name="connection-definition"/>
-            <c:simple-property type="integer" required="false" name="idle-timeout-minutes"/>
+            <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 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"/>
-            <c:simple-property required="false" name="jndi-name" description="The global JNDI name to bind the factory under"/>
-            <c:simple-property type="boolean" required="false" name="local-transaction"/>
-            <c:simple-property type="integer" required="false" name="max-pool-size"/>
+            <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: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"/>
+            <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 type="boolean" required="false" name="prefill"/>
-            <c:simple-property required="false" name="rar-name"/>
-            <c:map-property required="false" name="security-domain">
-                <c:simple-property required="false" readOnly="true" name="securityDeploymentType"/>
-                <c:simple-property required="false" name="domain"/>
-            </c:map-property>
+            <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 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: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="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 type="boolean" required="false" name="use-strict-min"/>
             <c:simple-property type="boolean" required="false" name="validate-on-match"/>
-            <c:simple-property type="integer" required="false" name="xa-resource-timeout"/>
-            <c:simple-property type="boolean" required="false" name="xa-transaction"/>
         </resource-configuration>
     </service>
     <service name="Queue 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">
+        <operation name="listAllMessages" displayName="List All Messages" description="List all messages with selector">
+            <parameters>
+                <c:simple-property required="false" name="arg#0"/>
+            </parameters>
             <results>
-                <c:notes>List all messages</c:notes>
+                <c:notes>List all messages with selector</c:notes>
                 <c:list-property name="result">
-                    <c:map-property required="false" name="element"/>
+                    <c:map-property required="false" name="element">
+                        <c:simple-property required="false" name="JMSCorrelationID"/>
+                        <c:simple-property required="false" name="JMSMessageID"/>
+                        <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+                    </c:map-property>
                 </c:list-property>
             </results>
         </operation>
@@ -355,7 +336,11 @@
             <results>
                 <c:notes>List all durable mesages using a selector</c:notes>
                 <c:list-property name="result">
-                    <c:map-property required="false" name="element"/>
+                    <c:map-property required="false" name="element">
+                        <c:simple-property required="false" name="JMSCorrelationID"/>
+                        <c:simple-property required="false" name="JMSMessageID"/>
+                        <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+                    </c:map-property>
                 </c:list-property>
             </results>
         </operation>
@@ -378,7 +363,11 @@
             <results>
                 <c:notes>List all non durable mesages using a selector</c:notes>
                 <c:list-property name="result">
-                    <c:map-property required="false" name="element"/>
+                    <c:map-property required="false" name="element">
+                        <c:simple-property required="false" name="JMSCorrelationID"/>
+                        <c:simple-property required="false" name="JMSMessageID"/>
+                        <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+                    </c:map-property>
                 </c:list-property>
             </results>
         </operation>
@@ -387,10 +376,6 @@
         <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"/>
@@ -413,46 +398,39 @@
         <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="name" displayType="summary" displayName="Name" description="The destination name" defaultOn="true" defaultInterval="600000" dataType="trait" 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:map-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="domain" description="The domain name"/>
-                <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/>
-            </c:map-property>
-            <c:simple-property required="false" name="JNDIName" description="The destination's JNDI name"/>
-            <c:simple-property type="boolean" required="false" name="clustered" description="Is this a clustered destination?"/>
+            <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:map-property required="false" name="expiryQueue" description="The expiry queue for this queue, overrides the default expiry queue on the server peer">
-                <c:simple-property required="false" name="domain" description="The domain name"/>
-                <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/>
-            </c:map-property>
+            <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="tagName"/>
-            </c:map-property>
-            <c:map-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on">
-                <c:simple-property required="false" name="domain" description="The domain name"/>
-                <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/>
-            </c:map-property>
+            <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">
+        <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"/>
             </parameters>
             <results>
-                <c:notes>List all messages for the specified subscription</c:notes>
+                <c:notes>List all messages for the specified subscription with the specified selector</c:notes>
                 <c:list-property name="result">
-                    <c:map-property required="false" name="element"/>
+                    <c:map-property required="false" name="element">
+                        <c:simple-property required="false" name="JMSCorrelationID"/>
+                        <c:simple-property required="false" name="JMSMessageID"/>
+                        <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+                    </c:map-property>
                 </c:list-property>
             </results>
         </operation>
@@ -470,14 +448,19 @@
                 <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">
+        <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"/>
             </parameters>
             <results>
-                <c:notes>List all durable messages for the specified subscription</c:notes>
+                <c:notes>List all 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:map-property required="false" name="element">
+                        <c:simple-property required="false" name="JMSCorrelationID"/>
+                        <c:simple-property required="false" name="JMSMessageID"/>
+                        <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+                    </c:map-property>
                 </c:list-property>
             </results>
         </operation>
@@ -503,7 +486,11 @@
             <results>
                 <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:map-property required="false" name="element">
+                        <c:simple-property required="false" name="JMSCorrelationID"/>
+                        <c:simple-property required="false" name="JMSMessageID"/>
+                        <c:simple-property type="long" required="false" name="JMSTimestamp"/>
+                    </c:map-property>
                 </c:list-property>
             </results>
         </operation>
@@ -524,162 +511,37 @@
         <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="name" displayType="summary" displayName="Name" description="The destination name" defaultOn="true" defaultInterval="600000" dataType="trait" 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:map-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="domain" description="The domain name"/>
-                <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/>
-            </c:map-property>
-            <c:simple-property required="false" name="JNDIName" description="The destination's JNDI name"/>
-            <c:simple-property type="boolean" required="false" name="clustered" description="Is this a clustered destination?"/>
+            <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:map-property required="false" name="expiryQueue" description="The expiry queue for this topic, overrides the default expiry queue on the server peer">
-                <c:simple-property required="false" name="domain" description="The domain name"/>
-                <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/>
-            </c:map-property>
+            <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="tagName"/>
-            </c:map-property>
-            <c:map-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on">
-                <c:simple-property required="false" name="domain" description="The domain name"/>
-                <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/>
-            </c:map-property>
+            <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">
-        <operation name="gc" displayName="Gc" description="Runs the garbage collector"/>
         <resource-configuration>
-            <c:map-property required="false" readOnly="true" name="heapMemoryUsage" description="object representing the heap memory usage.">
-                <c:simple-property type="long" required="false" name="committed"/>
-                <c:simple-property type="long" required="false" name="init"/>
-                <c:simple-property type="long" required="false" name="max"/>
-                <c:simple-property type="long" required="false" name="used"/>
-            </c:map-property>
-            <c:map-property required="false" readOnly="true" name="nonHeapMemoryUsage" description="object representing the non-heap memory usage.">
-                <c:simple-property type="long" required="false" name="committed"/>
-                <c:simple-property type="long" required="false" name="init"/>
-                <c:simple-property type="long" required="false" name="max"/>
-                <c:simple-property type="long" required="false" name="used"/>
-            </c:map-property>
-            <c:simple-property type="integer" required="false" readOnly="true" name="objectPendingFinalizationCount" description="the approximate number objects for which finalization is pending."/>
-            <c:simple-property type="boolean" required="false" name="verbose" description="the verbose output flag for the memory system."/>
+            <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="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"/>
         <resource-configuration>
             <c:simple-property required="false" readOnly="true" name="mbeanNameAsString"/>
         </resource-configuration>
     </service>
-    <service name="jboss.system:type=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" measurementType="dynamic" displayType="detail" displayName="Home Dir" description="the local home directory which the server is running from" defaultOn="true" defaultInterval="60000" dataType="measurement" 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" measurementType="dynamic" displayType="detail" displayName="Root Deployment Filename" description="the filename of the root deployable that will be used to finalize the bootstrap process" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="serverBaseDir" measurementType="dynamic" displayType="detail" displayName="Server Base Dir" description="the base directory for calculating server home directories" defaultOn="true" defaultInterval="60000" dataType="measurement" 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" measurementType="dynamic" displayType="detail" displayName="Server Data Dir" description="the directory where local data will be stored" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="serverHomeDir" measurementType="dynamic" displayType="detail" displayName="Server Home Dir" description="the server home directory" defaultOn="true" defaultInterval="60000" dataType="measurement" 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" measurementType="dynamic" displayType="detail" displayName="Server Log Dir" description="the server log directory" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="serverName" measurementType="dynamic" displayType="detail" displayName="Server Name" description="the name of the active profile the sever is using" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="serverNativeDir" measurementType="dynamic" displayType="detail" displayName="Server Native Dir" description="the directory for platform native files" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="serverTempDeployDir" measurementType="dynamic" displayType="detail" displayName="Server Temp Deploy Dir" description="the temporary deployment dir" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="serverTempDir" measurementType="dynamic" displayType="detail" displayName="Server Temp Dir" description="the directory where temporary files will be stored" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-        <metric property="specificationVersion" measurementType="dynamic" displayType="detail" displayName="Specification Version" description="the server Specification-Version" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/>
-    </service>
     <service name="%Generated% MCBean">
         <resource-configuration>
             <c:list-property required="false" name="properties">
@@ -687,6 +549,11 @@
             </c:list-property>
         </resource-configuration>
     </service>
+    <service name="ManagementView MCBean">
+        <resource-configuration>
+            <c:simple-property required="false" name="state" description="The bean controller state"/>
+        </resource-configuration>
+    </service>
     <service name="%Generated% MCBean">
         <resource-configuration>
             <c:list-property required="false" name="properties">
@@ -722,7 +589,78 @@
             </c:list-property>
         </resource-configuration>
     </service>
-    <service name="jboss.system:type=MCServer MCBean">
+    <service name="JTA MCBean">
+        <resource-configuration>
+            <c:map-property required="false" readOnly="true" name="XATerminator"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="applicationRollbackCount"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="commitCount"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="heuristicCount"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="nestedTransactonCount"/>
+            <c:simple-property required="false" name="objectStoreDir"/>
+            <c:simple-property type="boolean" required="false" name="propagateFullContext"/>
+            <c:map-property required="false" name="recoveryInetAddress">
+                <c:simple-property type="boolean" required="false" name="MCGlobal"/>
+                <c:simple-property type="boolean" required="false" name="MCLinkLocal"/>
+                <c:simple-property type="boolean" required="false" name="MCNodeLocal"/>
+                <c:simple-property type="boolean" required="false" name="MCOrgLocal"/>
+                <c:simple-property type="boolean" required="false" name="MCSiteLocal"/>
+                <c:list-property name="address">
+                    <c:simple-property required="false" name="element"/>
+                </c:list-property>
+                <c:simple-property type="boolean" required="false" name="anyLocalAddress"/>
+                <c:simple-property required="false" name="canonicalHostName"/>
+                <c:simple-property required="false" name="hostAddress"/>
+                <c:simple-property required="false" name="hostName"/>
+                <c:simple-property type="boolean" required="false" name="linkLocalAddress"/>
+                <c:simple-property type="boolean" required="false" name="loopbackAddress"/>
+                <c:simple-property type="boolean" required="false" name="multicastAddress"/>
+                <c:simple-property type="boolean" required="false" name="siteLocalAddress"/>
+            </c:map-property>
+            <c:simple-property type="integer" required="false" name="recoveryPort"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="resourceRollbackCount"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="rollbackCount"/>
+            <c:simple-property type="boolean" required="false" name="runInVMRecoveryManager"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="runningTransactionCount"/>
+            <c:simple-property type="integer" required="false" name="socketProcessIdPort"/>
+            <c:simple-property required="false" name="state" description="The bean controller state"/>
+            <c:simple-property type="boolean" required="false" name="statisticsEnabled"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="timedoutCount"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="transactionCount"/>
+            <c:map-property required="false" readOnly="true" name="transactionManager">
+                <c:simple-property type="integer" required="false" name="status"/>
+                <c:simple-property type="integer" required="false" name="transactionTimeout"/>
+            </c:map-property>
+            <c:map-property required="false" name="transactionStatusManagerInetAddress">
+                <c:simple-property type="boolean" required="false" name="MCGlobal"/>
+                <c:simple-property type="boolean" required="false" name="MCLinkLocal"/>
+                <c:simple-property type="boolean" required="false" name="MCNodeLocal"/>
+                <c:simple-property type="boolean" required="false" name="MCOrgLocal"/>
+                <c:simple-property type="boolean" required="false" name="MCSiteLocal"/>
+                <c:list-property name="address">
+                    <c:simple-property required="false" name="element"/>
+                </c:list-property>
+                <c:simple-property type="boolean" required="false" name="anyLocalAddress"/>
+                <c:simple-property required="false" name="canonicalHostName"/>
+                <c:simple-property required="false" name="hostAddress"/>
+                <c:simple-property required="false" name="hostName"/>
+                <c:simple-property type="boolean" required="false" name="linkLocalAddress"/>
+                <c:simple-property type="boolean" required="false" name="loopbackAddress"/>
+                <c:simple-property type="boolean" required="false" name="multicastAddress"/>
+                <c:simple-property type="boolean" required="false" name="siteLocalAddress"/>
+            </c:map-property>
+            <c:simple-property type="integer" required="false" name="transactionStatusManagerPort"/>
+            <c:map-property required="false" readOnly="true" name="transactionSynchronizationRegistry">
+                <c:simple-property type="boolean" required="false" name="rollbackOnly"/>
+                <c:simple-property type="integer" required="false" name="transactionStatus"/>
+            </c:map-property>
+            <c:simple-property type="integer" required="false" name="transactionTimeout"/>
+            <c:map-property required="false" readOnly="true" name="userTransaction">
+                <c:simple-property type="integer" required="false" name="status"/>
+                <c:simple-property type="integer" required="false" name="transactionTimeout"/>
+            </c:map-property>
+        </resource-configuration>
+    </service>
+    <service name="MCServer MCBean">
         <operation name="shutdown" displayName="Shutdown" description="Shutdown the server"/>
         <resource-configuration>
             <c:simple-property required="false" readOnly="true" name="buildDate" description="The server build date"/>
@@ -845,25 +783,116 @@
             <c:simple-property required="false" readOnly="true" name="versionNumber" description="The server version number string"/>
         </resource-configuration>
     </service>
-    <service name="ManagementView MCBean"/>
-    <service name="jboss.system:type=ServerInfo MCBean"/>
-    <service name="JTA MCBean"/>
     <service name="Security MCBean">
         <resource-configuration>
-            <c:list-property required="false" name="properties">
-                <c:map-property required="false" name="element">
-                    <c:simple-property required="false" name="description"/>
-                    <c:simple-property required="false" name="name"/>
-                    <c:map-property required="false" name="value"/>
-                    <c:simple-property required="false" readOnly="true" name="classShortName"/>
-                    <c:map-property required="false" readOnly="true" name="children"/>
-                    <c:simple-property type="boolean" required="false" name="preInstantiate"/>
-                    <c:list-property required="false" name="annotations">
-                        <c:map-property required="false" name="element"/>
-                    </c:list-property>
-                    <c:simple-property required="false" readOnly="true" name="type"/>
-                </c:map-property>
+            <c:simple-property required="false" name="baseContext"/>
+            <c:simple-property required="false" name="factoryName"/>
+            <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="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="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="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"/>
+    </service>
+    <service name="ServerInfo MCBean">
+        <resource-configuration>
+            <c:simple-property required="false" readOnly="true" name="OSArch"/>
+            <c:simple-property required="false" readOnly="true" name="OSName"/>
+            <c:simple-property required="false" readOnly="true" name="OSVersion"/>
+            <c:simple-property type="integer" required="false" readOnly="true" name="activeThreadCount"/>
+            <c:simple-property type="integer" required="false" readOnly="true" name="activeThreadGroupCount"/>
+            <c:list-property required="false" name="alias" description="Aliases of the bean">
+                <c:simple-property required="false" name="element"/>
             </c:list-property>
+            <c:simple-property type="integer" required="false" readOnly="true" name="availableProcessors"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="freeMemory"/>
+            <c:simple-property required="false" readOnly="true" name="hostAddress"/>
+            <c:simple-property required="false" readOnly="true" name="hostName"/>
+            <c:simple-property required="false" readOnly="true" name="javaVMName"/>
+            <c:simple-property required="false" readOnly="true" name="javaVMVendor"/>
+            <c:simple-property required="false" readOnly="true" name="javaVMVersion"/>
+            <c:simple-property required="false" readOnly="true" name="javaVendor"/>
+            <c:simple-property required="false" readOnly="true" name="javaVersion"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="maxMemory"/>
+            <c:simple-property type="long" required="false" readOnly="true" name="totalMemory"/>
         </resource-configuration>
     </service>
     <service name="ServiceBindingSet MCBean">
@@ -885,4 +914,210 @@
             <c:simple-property type="integer" required="false" name="portOffset" description="offset that should be applied to non-fixed-portbindings associated with this set"/>
         </resource-configuration>
     </service>
+    <service name="ear">
+        <resource-configuration>
+            <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: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="version"/>
+        </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:list-property required="false" name="properties">
+                <c:map-property required="false" name="element"/>
+            </c:list-property>
+            <c:simple-property required="false" name="state" description="The bean controller state"/>
+        </resource-configuration>
+    </service>
+    <service name="ejb3x">
+        <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="war">
+        <resource-configuration>
+            <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: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="version"/>
+        </resource-configuration>
+    </service>
+    <service name="sar">
+        <resource-configuration>
+            <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:list-property required="false" name="classpath" description="The deployment classpath">
+                <c:map-property required="false" name="element"/>
+            </c:list-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: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:list-property required="false" name="services" description="The mbeans">
+                <c:map-property required="false" name="element">
+                    <c:simple-property type="integer" required="false" readOnly="true" name="nonDurableSubscriptionsCount" description="The count of all non durable subscriptions of this topic"/>
+                    <c:simple-property type="boolean" required="false" readOnly="true" name="clustered" description="Is this a clustered destination?"/>
+                    <c:simple-property type="integer" required="false" readOnly="true" name="durableSubscriptionsCount" description="The count of all durable subscriptions of this topic"/>
+                    <c:simple-property required="false" name="DLQ" description="The DLQ for this topic, overrides the default DLQ on the server peer"/>
+                    <c:simple-property type="integer" required="false" readOnly="true" name="allMessageCount" description="The count of all messages in all subscriptions of this topic"/>
+                    <c:map-property required="false" name="securityConfig" description="The destination's security configuration"/>
+                    <c:list-property required="false" readOnly="true" name="messageCounters" description="The message counters for the topic">
+                        <c:map-property required="false" name="element"/>
+                    </c:list-property>
+                    <c:simple-property type="integer" required="false" name="pageSize" description="The paging 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 required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on"/>
+                    <c:simple-property type="integer" required="false" readOnly="true" name="durableMessageCount" description="The count of all messages in all durable subscriptions of this topic"/>
+                    <c:simple-property readOnly="true" name="name" description="The destination name"/>
+                    <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 name="JNDIName" description="The destination's JNDI name"/>
+                    <c:simple-property type="integer" required="false" name="messageCounterHistoryDayLimit" description="The day limit for the message counter"/>
+                    <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 type="long" required="false" name="redeliveryDelay" description="The delay before redelivering"/>
+                    <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" readOnly="true" name="allSubscriptionsCount" description="The count of all subscriptions of this 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="integer" required="false" readOnly="true" name="nonDurableMessageCount" description="The count of all messages in all non durable subscriptions of this topic"/>
+                    <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" description="The maximum delivery attempts to the topic"/>
+                </c:map-property>
+            </c:list-property>
+            <c:simple-property required="false" name="version"/>
+        </resource-configuration>
+    </service>
+    <service name="beans">
+        <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>

Added: trunk/jbas5/etc/overlay/lib/jboss-vfs.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jbas5/etc/overlay/lib/jboss-vfs.jar
___________________________________________________________________
Name: svn:mime-type
   + application/java-archive




More information about the embjopr-commits mailing list