modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 4
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 84 +++++-----
2 files changed, 46 insertions(+), 42 deletions(-)
New commits:
commit 1ee873f2e9eec7507e65f77e5aa70336c5beaa7e
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri May 25 15:28:09 2012 +0200
BZ 811288 - If a property name ends in :expr, we need to set a displayName
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index c4371af..54c1ca5 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -2680,9 +2680,9 @@
<c:simple-property name="default-mdb-instance-pool" required="false" type="string" readOnly="true" description="Name of the default MDB instance pool, which will be applicable to all MDBs, unless overridden at the deployment or bean level"/>
<c:simple-property name="default-resource-adapter-name" required="false" type="string" readOnly="true" defaultValue="hornetq-ra" description="Name of the default resource adapter name that will be used by MDBs, unless overridden at the deployment or bean level. The default value is hornetq-ra."/>
<c:simple-property name="default-sfsb-cache" required="false" type="string" readOnly="true" description="Name of the default stateful bean cache, which will be applicable to all stateful EJBs, unless overridden at the deployment or bean level"/>
- <c:simple-property name="default-singleton-bean-access-timeout:expr" required="false" type="string" readOnly="true" defaultValue="5000" description="The default access timeout for singleton beans. The default value is 5000."/>
+ <c:simple-property name="default-singleton-bean-access-timeout:expr" displayName="Default Singleton Bean Access Timeout" required="false" type="string" readOnly="true" defaultValue="5000" description="The default access timeout for singleton beans. The default value is 5000."/>
<c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="true" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/>
- <c:simple-property name="default-stateful-bean-access-timeout:expr" required="false" type="string" readOnly="true" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/>
+ <c:simple-property name="default-stateful-bean-access-timeout:expr" displayName="Default Stateful Bean Access Timeout" required="false" type="string" readOnly="true" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/>
<c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="true" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/>
</resource-configuration>
@@ -2708,7 +2708,7 @@
<c:simple-property name="time" required="true" type="long" readOnly="true" description="The time"/>
<c:simple-property name="unit" required="true" type="string" readOnly="true" description="The time unit"/>
</c:map-property>
- <c:simple-property name="max-threads:expr" required="false" type="string" readOnly="true" description="The maximum thread pool size."/>
+ <c:simple-property name="max-threads:expr" displayName="Max Threads" required="false" type="string" readOnly="true" description="The maximum thread pool size."/>
<c:simple-property name="name" required="false" type="string" readOnly="true" description="The name of the thread pool."/>
<c:simple-property name="thread-factory" required="false" type="string" readOnly="true" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/>
</resource-configuration>
@@ -2725,12 +2725,12 @@
<resource-configuration>
<c:simple-property name="groups-path" required="false" type="string" readOnly="true" defaultValue="ejb3/groups"/>
- <c:simple-property name="idle-timeout:expr" required="false" type="string" readOnly="true" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
+ <c:simple-property name="idle-timeout:expr" displayName="Idle Timeout" required="false" type="string" readOnly="true" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
<c:simple-property name="idle-timeout-unit" required="false" type="string" readOnly="true" defaultValue="SECONDS" description="The unit of idle-timeout. The default value is SECONDS."/>
- <c:simple-property name="max-size:expr" required="false" type="string" readOnly="true" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
+ <c:simple-property name="max-size:expr" displayName="Max Size" required="false" type="string" readOnly="true" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
<c:simple-property name="relative-to" required="false" type="string" readOnly="true" defaultValue="jboss.server.data.dir"/>
<c:simple-property name="sessions-path" required="false" type="string" readOnly="true" defaultValue="ejb3/sessions"/>
- <c:simple-property name="subdirectory-count:expr" required="false" type="string" readOnly="true" defaultValue="100"/>
+ <c:simple-property name="subdirectory-count:expr" displayName="Subdirectory Count" required="false" type="string" readOnly="true" defaultValue="100"/>
</resource-configuration>
</service>
@@ -2744,8 +2744,8 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="max-pool-size:expr" required="false" type="string" readOnly="true" defaultValue="20" description="The maximum number of bean instances that the pool can hold at a given point in time. The default value is 20."/>
- <c:simple-property name="timeout:expr" required="false" type="string" readOnly="true" defaultValue="5" description="The maximum amount of time to wait for a bean instance to be available from the pool. The default value is 5."/>
+ <c:simple-property name="max-pool-size:expr" displayName="Max Pool Size" required="false" type="string" readOnly="true" defaultValue="20" description="The maximum number of bean instances that the pool can hold at a given point in time. The default value is 20."/>
+ <c:simple-property name="timeout:expr" displayName="Timeout" required="false" type="string" readOnly="true" defaultValue="5" description="The maximum amount of time to wait for a bean instance to be available from the pool. The default value is 5."/>
<c:simple-property name="timeout-unit" required="false" type="string" readOnly="true" defaultValue="MINUTES" description="The instance acquisition timeout unit. The default value is MINUTES."/>
</resource-configuration>
</service>
@@ -2780,9 +2780,9 @@
<c:simple-property name="bean-cache" required="false" type="string" readOnly="true" description="The name of the cache used to store bean instances."/>
<c:simple-property name="cache-container" required="false" type="string" readOnly="true" defaultValue="ejb" description="The name of the cache container used for the bean and client-mappings caches. The default value is ejb."/>
<c:simple-property name="client-mappings-cache" required="false" type="string" readOnly="true" defaultValue="remote-connector-client-mappings" description="The name of the cache used to store client-mappings of the EJB remoting connector's socket-bindings. The default value is remote-connector-client-mappings."/>
- <c:simple-property name="idle-timeout:expr" required="false" type="string" readOnly="true" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
+ <c:simple-property name="idle-timeout:expr" displayName="Idle Timeout" required="false" type="string" readOnly="true" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
<c:simple-property name="idle-timeout-unit" required="false" type="string" readOnly="true" defaultValue="SECONDS" description="The unit of idle-timeout. The default value is SECONDS."/>
- <c:simple-property name="max-size:expr" required="false" type="string" readOnly="true" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
+ <c:simple-property name="max-size:expr" displayName="Max Size" required="false" type="string" readOnly="true" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
<c:simple-property name="passivate-events-on-replicate" required="false" type="boolean" readOnly="true" defaultValue="true" description="Indicates whether replication should trigger passivation events on the bean. The default value is true."/>
</resource-configuration>
</service>
@@ -3898,9 +3898,9 @@
<c:simple-property name="default-mdb-instance-pool" required="false" type="string" readOnly="false" description="Name of the default MDB instance pool, which will be applicable to all MDBs, unless overridden at the deployment or bean level"/>
<c:simple-property name="default-resource-adapter-name" required="false" type="string" readOnly="false" defaultValue="hornetq-ra" description="Name of the default resource adapter name that will be used by MDBs, unless overridden at the deployment or bean level. The default value is hornetq-ra."/>
<c:simple-property name="default-sfsb-cache" required="false" type="string" readOnly="false" description="Name of the default stateful bean cache, which will be applicable to all stateful EJBs, unless overridden at the deployment or bean level"/>
- <c:simple-property name="default-singleton-bean-access-timeout:expr" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for singleton beans. The default value is 5000."/>
+ <c:simple-property name="default-singleton-bean-access-timeout:expr" displayName="Default Singleton Bean Access Timeout" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for singleton beans. The default value is 5000."/>
<c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="false" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/>
- <c:simple-property name="default-stateful-bean-access-timeout:expr" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/>
+ <c:simple-property name="default-stateful-bean-access-timeout:expr" displayName="Default Stateful Bean Access Timeout" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/>
<c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="false" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/>
</resource-configuration>
@@ -3937,12 +3937,12 @@
<resource-configuration>
<c:simple-property name="groups-path" required="false" type="string" readOnly="false" defaultValue="ejb3/groups"/>
- <c:simple-property name="idle-timeout:expr" required="false" type="string" readOnly="false" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
+ <c:simple-property name="idle-timeout:expr" displayName="Idle Timeout" required="false" type="string" readOnly="false" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
<c:simple-property name="idle-timeout-unit" required="false" type="string" readOnly="false" defaultValue="SECONDS" description="The unit of idle-timeout. The default value is SECONDS."/>
- <c:simple-property name="max-size:expr" required="false" type="string" readOnly="false" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
+ <c:simple-property name="max-size:expr" displayName="Max Size" required="false" type="string" readOnly="false" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
<c:simple-property name="relative-to" required="false" type="string" readOnly="false" defaultValue="jboss.server.data.dir"/>
<c:simple-property name="sessions-path" required="false" type="string" readOnly="false" defaultValue="ejb3/sessions"/>
- <c:simple-property name="subdirectory-count:expr" required="false" type="string" readOnly="false" defaultValue="100"/>
+ <c:simple-property name="subdirectory-count:expr" displayName="Subdirectory Count" required="false" type="string" readOnly="false" defaultValue="100"/>
</resource-configuration>
</service>
@@ -3957,8 +3957,8 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="max-pool-size:expr" required="false" type="string" readOnly="false" defaultValue="20" description="The maximum number of bean instances that the pool can hold at a given point in time. The default value is 20."/>
- <c:simple-property name="timeout:expr" required="false" type="string" readOnly="false" defaultValue="5" description="The maximum amount of time to wait for a bean instance to be available from the pool. The default value is 5."/>
+ <c:simple-property name="max-pool-size:expr" displayName="Max Pool Size" required="false" type="string" readOnly="false" defaultValue="20" description="The maximum number of bean instances that the pool can hold at a given point in time. The default value is 20."/>
+ <c:simple-property name="timeout:expr" displayName="Timeout" required="false" type="string" readOnly="false" defaultValue="5" description="The maximum amount of time to wait for a bean instance to be available from the pool. The default value is 5."/>
<c:simple-property name="timeout-unit" required="false" type="string" readOnly="false" defaultValue="MINUTES" description="The instance acquisition timeout unit. The default value is MINUTES."/>
</resource-configuration>
</service>
@@ -3995,9 +3995,9 @@
<c:simple-property name="bean-cache" required="false" type="string" readOnly="false" description="The name of the cache used to store bean instances."/>
<c:simple-property name="cache-container" required="false" type="string" readOnly="false" defaultValue="ejb" description="The name of the cache container used for the bean and client-mappings caches. The default value is ejb."/>
<c:simple-property name="client-mappings-cache" required="false" type="string" readOnly="false" defaultValue="remote-connector-client-mappings" description="The name of the cache used to store client-mappings of the EJB remoting connector's socket-bindings. The default value is remote-connector-client-mappings."/>
- <c:simple-property name="idle-timeout:expr" required="false" type="string" readOnly="false" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
+ <c:simple-property name="idle-timeout:expr" displayName="Idle Timeout" required="false" type="string" readOnly="false" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
<c:simple-property name="idle-timeout-unit" required="false" type="string" readOnly="false" defaultValue="SECONDS" description="The unit of idle-timeout. The default value is SECONDS."/>
- <c:simple-property name="max-size:expr" required="false" type="string" readOnly="false" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
+ <c:simple-property name="max-size:expr" displayName="Max Size" required="false" type="string" readOnly="false" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
<c:simple-property name="passivate-events-on-replicate" required="false" type="boolean" readOnly="false" defaultValue="true" description="Indicates whether replication should trigger passivation events on the bean. The default value is true."/>
</resource-configuration>
</service>
@@ -6920,8 +6920,8 @@
<c:simple-property name="log-journal-write-rate" required="false" type="boolean" readOnly="false" defaultValue="false" description="Whether to periodically log the journal's write rate and flush rate. The default value is false."/>
<c:simple-property name="management-address" required="false" type="string" readOnly="false" defaultValue="jms.queue.hornetq.management" description="Address to send management messages to. The default value is jms.queue.hornetq.management."/>
<c:simple-property name="management-notification-address" required="false" type="string" readOnly="false" defaultValue="hornetq.notifications" description="The name of the address that consumers bind to to receive management notifications. The default value is hornetq.notifications."/>
- <c:simple-property name="memory-measure-interval:expr" required="false" type="string" readOnly="false" defaultValue="-1" description="Frequency to sample JVM memory in ms (or -1 to disable memory sampling). The default value is -1."/>
- <c:simple-property name="memory-warning-threshold:expr" required="false" type="string" readOnly="false" defaultValue="25" description="Percentage of available memory which if exceeded results in a warning log. The default value is 25."/>
+ <c:simple-property name="memory-measure-interval:expr" displayName="Memory Measure Interval" required="false" type="string" readOnly="false" defaultValue="-1" description="Frequency to sample JVM memory in ms (or -1 to disable memory sampling). The default value is -1."/>
+ <c:simple-property name="memory-warning-threshold:expr" displayName="Memory Warning Threshold" required="false" type="string" readOnly="false" defaultValue="25" description="Percentage of available memory which if exceeded results in a warning log. The default value is 25."/>
<c:simple-property name="message-counter-enabled" required="false" type="boolean" readOnly="false" defaultValue="false" description="Whether message counters are enabled. The default value is false."/>
<c:simple-property name="message-counter-max-day-history" required="false" type="integer" readOnly="false" defaultValue="10" description="How many days to keep message counter history. The default value is 10."/>
<c:simple-property name="message-counter-sample-period" required="false" type="long" readOnly="false" defaultValue="10000" description="The sample period (in ms) to use for message counters. The default value is 10000."/>
@@ -6936,13 +6936,13 @@
<c:simple-property name="remoting-interceptors"/>
</c:list-property>
<c:simple-property name="run-sync-speed-test" required="false" type="boolean" readOnly="false" defaultValue="false" description="Whether on startup to perform a diagnostic test on how fast your disk can sync. Useful when determining performance issues. The default value is false."/>
- <c:simple-property name="scheduled-thread-pool-max-size:expr" required="false" type="string" readOnly="false" defaultValue="5" description="The number of threads that the main scheduled thread pool has. The default value is 5."/>
+ <c:simple-property name="scheduled-thread-pool-max-size:expr" displayName="Scheduled Thread Pool Max Size" required="false" type="string" readOnly="false" defaultValue="5" description="The number of threads that the main scheduled thread pool has. The default value is 5."/>
<c:simple-property name="security-domain" required="false" type="string" readOnly="false" defaultValue="other" description="The security domain to use to verify user and role information. The default value is other."/>
<c:simple-property name="security-enabled" required="false" type="boolean" readOnly="false" defaultValue="true" description="Whether security is enabled. The default value is true."/>
<c:simple-property name="security-invalidation-interval" required="false" type="long" readOnly="false" defaultValue="10000" description="How long (in ms) to wait before invalidating the security cache. The default value is 10000."/>
<c:simple-property name="server-dump-interval" required="false" type="long" readOnly="false" defaultValue="-1" description="How often to dump basic runtime information to the server log. A value less than 1 disables this feature. The default value is -1."/>
<c:simple-property name="shared-store" required="false" type="boolean" readOnly="false" defaultValue="true" description="Whether this server is using a shared store for failover. The default value is true."/>
- <c:simple-property name="thread-pool-max-size:expr" required="false" type="string" readOnly="false" defaultValue="30" description="The number of threads that the main thread pool has. -1 means no limit. The default value is 30."/>
+ <c:simple-property name="thread-pool-max-size:expr" displayName="Thread Pool Max Size" required="false" type="string" readOnly="false" defaultValue="30" description="The number of threads that the main thread pool has. -1 means no limit. The default value is 30."/>
<c:simple-property name="transaction-timeout" required="false" type="long" readOnly="false" defaultValue="300000" description="How long (in ms) before a transaction can be removed from the resource manager after create time. The default value is 300000."/>
<c:simple-property name="transaction-timeout-scan-period" required="false" type="long" readOnly="false" defaultValue="1000" description="How often (in ms) to scan for timeout transactions. The default value is 1000."/>
<c:simple-property name="wild-card-routing-enabled" required="false" type="boolean" readOnly="false" defaultValue="true" description="Whether the server supports wild card routing. The default value is true."/>
@@ -8468,9 +8468,9 @@
<c:simple-property name="default-mdb-instance-pool" required="false" type="string" readOnly="false" description="Name of the default MDB instance pool, which will be applicable to all MDBs, unless overridden at the deployment or bean level"/>
<c:simple-property name="default-resource-adapter-name" required="false" type="string" readOnly="false" defaultValue="hornetq-ra" description="Name of the default resource adapter name that will be used by MDBs, unless overridden at the deployment or bean level. The default value is hornetq-ra."/>
<c:simple-property name="default-sfsb-cache" required="false" type="string" readOnly="false" description="Name of the default stateful bean cache, which will be applicable to all stateful EJBs, unless overridden at the deployment or bean level"/>
- <c:simple-property name="default-singleton-bean-access-timeout:expr" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for singleton beans. The default value is 5000."/>
+ <c:simple-property name="default-singleton-bean-access-timeout:expr" displayName="Default Singleton Bean Access Timeout" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for singleton beans. The default value is 5000."/>
<c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="false" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/>
- <c:simple-property name="default-stateful-bean-access-timeout:expr" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/>
+ <c:simple-property name="default-stateful-bean-access-timeout:expr" displayName="Default Stateful Bean Access Timeout" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/>
<c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="false" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/>
</resource-configuration>
@@ -8514,12 +8514,12 @@
<resource-configuration>
<c:simple-property name="groups-path" required="false" type="string" readOnly="false" defaultValue="ejb3/groups"/>
- <c:simple-property name="idle-timeout:expr" required="false" type="string" readOnly="false" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
+ <c:simple-property name="idle-timeout:expr" displayName="Idle Timeout" required="false" type="string" readOnly="false" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
<c:simple-property name="idle-timeout-unit" required="false" type="string" readOnly="false" defaultValue="SECONDS" description="The unit of idle-timeout. The default value is SECONDS."/>
- <c:simple-property name="max-size:expr" required="false" type="string" readOnly="false" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
+ <c:simple-property name="max-size:expr" displayName="Max Size" required="false" type="string" readOnly="false" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
<c:simple-property name="relative-to" required="false" type="string" readOnly="false" defaultValue="jboss.server.data.dir"/>
<c:simple-property name="sessions-path" required="false" type="string" readOnly="false" defaultValue="ejb3/sessions"/>
- <c:simple-property name="subdirectory-count:expr" required="false" type="string" readOnly="false" defaultValue="100"/>
+ <c:simple-property name="subdirectory-count:expr" displayName="Subdirectory count" required="false" type="string" readOnly="false" defaultValue="100"/>
</resource-configuration>
</service>
@@ -8534,8 +8534,8 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="max-pool-size:expr" required="false" type="string" readOnly="false" defaultValue="20" description="The maximum number of bean instances that the pool can hold at a given point in time. The default value is 20."/>
- <c:simple-property name="timeout:expr" required="false" type="string" readOnly="false" defaultValue="5" description="The maximum amount of time to wait for a bean instance to be available from the pool. The default value is 5."/>
+ <c:simple-property name="max-pool-size:expr" displayName="Max Pool Size" required="false" type="string" readOnly="false" defaultValue="20" description="The maximum number of bean instances that the pool can hold at a given point in time. The default value is 20."/>
+ <c:simple-property name="timeout:expr" displayName="Timeout" required="false" type="string" readOnly="false" defaultValue="5" description="The maximum amount of time to wait for a bean instance to be available from the pool. The default value is 5."/>
<c:simple-property name="timeout-unit" required="false" type="string" readOnly="false" defaultValue="MINUTES" description="The instance acquisition timeout unit. The default value is MINUTES."/>
</resource-configuration>
</service>
@@ -8572,9 +8572,9 @@
<c:simple-property name="bean-cache" required="false" type="string" readOnly="false" description="The name of the cache used to store bean instances."/>
<c:simple-property name="cache-container" required="false" type="string" readOnly="false" defaultValue="ejb" description="The name of the cache container used for the bean and client-mappings caches. The default value is ejb."/>
<c:simple-property name="client-mappings-cache" required="false" type="string" readOnly="false" defaultValue="remote-connector-client-mappings" description="The name of the cache used to store client-mappings of the EJB remoting connector's socket-bindings. The default value is remote-connector-client-mappings."/>
- <c:simple-property name="idle-timeout:expr" required="false" type="string" readOnly="false" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
+ <c:simple-property name="idle-timeout:expr" displayName="Idle Timeout" required="false" type="string" readOnly="false" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
<c:simple-property name="idle-timeout-unit" required="false" type="string" readOnly="false" defaultValue="SECONDS" description="The unit of idle-timeout. The default value is SECONDS."/>
- <c:simple-property name="max-size:expr" required="false" type="string" readOnly="false" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
+ <c:simple-property name="max-size:expr" displayName="Max Size" required="false" type="string" readOnly="false" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
<c:simple-property name="passivate-events-on-replicate" required="false" type="boolean" readOnly="false" defaultValue="true" description="Indicates whether replication should trigger passivation events on the bean. The default value is true."/>
</resource-configuration>
</service>
@@ -9440,8 +9440,8 @@
<c:simple-property name="log-journal-write-rate" required="false" type="boolean" readOnly="false" defaultValue="false" description="Whether to periodically log the journal's write rate and flush rate. The default value is false."/>
<c:simple-property name="management-address" required="false" type="string" readOnly="false" defaultValue="jms.queue.hornetq.management" description="Address to send management messages to. The default value is jms.queue.hornetq.management."/>
<c:simple-property name="management-notification-address" required="false" type="string" readOnly="false" defaultValue="hornetq.notifications" description="The name of the address that consumers bind to to receive management notifications. The default value is hornetq.notifications."/>
- <c:simple-property name="memory-measure-interval:expr" required="false" type="string" readOnly="false" defaultValue="-1" description="Frequency to sample JVM memory in ms (or -1 to disable memory sampling). The default value is -1."/>
- <c:simple-property name="memory-warning-threshold:expr" required="false" type="string" readOnly="false" defaultValue="25" description="Percentage of available memory which if exceeded results in a warning log. The default value is 25."/>
+ <c:simple-property name="memory-measure-interval:expr" displayName="Memory Measure Interval" required="false" type="string" readOnly="false" defaultValue="-1" description="Frequency to sample JVM memory in ms (or -1 to disable memory sampling). The default value is -1."/>
+ <c:simple-property name="memory-warning-threshold:expr" displayName="Memory Warning Threshold" required="false" type="string" readOnly="false" defaultValue="25" description="Percentage of available memory which if exceeded results in a warning log. The default value is 25."/>
<c:simple-property name="message-counter-enabled" required="false" type="boolean" readOnly="false" defaultValue="false" description="Whether message counters are enabled. The default value is false."/>
<c:simple-property name="message-counter-max-day-history" required="false" type="integer" readOnly="false" defaultValue="10" description="How many days to keep message counter history. The default value is 10."/>
<c:simple-property name="message-counter-sample-period" required="false" type="long" readOnly="false" defaultValue="10000" description="The sample period (in ms) to use for message counters. The default value is 10000."/>
@@ -9456,13 +9456,13 @@
<c:simple-property name="remoting-interceptors"/>
</c:list-property>
<c:simple-property name="run-sync-speed-test" required="false" type="boolean" readOnly="false" defaultValue="false" description="Whether on startup to perform a diagnostic test on how fast your disk can sync. Useful when determining performance issues. The default value is false."/>
- <c:simple-property name="scheduled-thread-pool-max-size:expr" required="false" type="string" readOnly="false" defaultValue="5" description="The number of threads that the main scheduled thread pool has. The default value is 5."/>
+ <c:simple-property name="scheduled-thread-pool-max-size:expr" displayName="Scheduled Thread Pool Max Size" required="false" type="string" readOnly="false" defaultValue="5" description="The number of threads that the main scheduled thread pool has. The default value is 5."/>
<c:simple-property name="security-domain" required="false" type="string" readOnly="false" defaultValue="other" description="The security domain to use to verify user and role information. The default value is other."/>
<c:simple-property name="security-enabled" required="false" type="boolean" readOnly="false" defaultValue="true" description="Whether security is enabled. The default value is true."/>
<c:simple-property name="security-invalidation-interval" required="false" type="long" readOnly="false" defaultValue="10000" description="How long (in ms) to wait before invalidating the security cache. The default value is 10000."/>
<c:simple-property name="server-dump-interval" required="false" type="long" readOnly="false" defaultValue="-1" description="How often to dump basic runtime information to the server log. A value less than 1 disables this feature. The default value is -1."/>
<c:simple-property name="shared-store" required="false" type="boolean" readOnly="false" defaultValue="true" description="Whether this server is using a shared store for failover. The default value is true."/>
- <c:simple-property name="thread-pool-max-size:expr" required="false" type="string" readOnly="false" defaultValue="30" description="The number of threads that the main thread pool has. -1 means no limit. The default value is 30."/>
+ <c:simple-property name="thread-pool-max-size:expr" displayName="Thread Pool Max Size" required="false" type="string" readOnly="false" defaultValue="30" description="The number of threads that the main thread pool has. -1 means no limit. The default value is 30."/>
<c:simple-property name="transaction-timeout" required="false" type="long" readOnly="false" defaultValue="300000" description="How long (in ms) before a transaction can be removed from the resource manager after create time. The default value is 300000."/>
<c:simple-property name="transaction-timeout-scan-period" required="false" type="long" readOnly="false" defaultValue="1000" description="How often (in ms) to scan for timeout transactions. The default value is 1000."/>
<c:simple-property name="wild-card-routing-enabled" required="false" type="boolean" readOnly="false" defaultValue="true" description="Whether the server supports wild card routing. The default value is true."/>
@@ -9842,8 +9842,8 @@
<c:simple-property name="reconnect-attempts" required="false" type="integer" readOnly="false" defaultValue="0" description="The reconnect attempts. The default value is 0."/>
<c:simple-property name="retry-interval" required="false" type="long" readOnly="false" defaultValue="2000" description="The retry interval. The default value is 2000."/>
<c:simple-property name="retry-interval-multiplier" required="false" type="double" readOnly="false" defaultValue="1.0" description="The retry interval multiplier. The default value is 1.0."/>
- <c:simple-property name="scheduled-thread-pool-max-size:expr" required="false" type="string" readOnly="false" defaultValue="5" description="The scheduled thread pool max size. The default value is 5."/>
- <c:simple-property name="thread-pool-max-size:expr" required="false" type="string" readOnly="false" defaultValue="30" description="The thread pool max size. The default value is 30."/>
+ <c:simple-property name="scheduled-thread-pool-max-size:expr" displayName="Scheduled Thread Pool Max Size" required="false" type="string" readOnly="false" defaultValue="5" description="The scheduled thread pool max size. The default value is 5."/>
+ <c:simple-property name="thread-pool-max-size:expr" displayName="Thread Pool Max Size" required="false" type="string" readOnly="false" defaultValue="30" description="The thread pool max size. The default value is 30."/>
<c:simple-property name="transaction-batch-size" required="false" type="integer" readOnly="false" defaultValue="1048576" description="The transaction batch size. The default value is 1048576."/>
<c:simple-property name="use-global-pools" required="false" type="boolean" readOnly="false" defaultValue="true" description="True to use global pools. The default value is true."/>
</resource-configuration>
@@ -9887,10 +9887,10 @@
<c:simple-property name="group-id" required="false" type="string" readOnly="false" description="The group id."/>
<c:simple-property name="ha" required="false" type="boolean" readOnly="false" defaultValue="false" description="Whether the connection factory supports High Availability. The default value is false."/>
<c:simple-property name="jndi-params" required="false" type="string" readOnly="false" description="The JNDI params to use for locating the destination for incoming connections."/>
- <c:simple-property name="max-pool-size:expr" required="false" type="string" readOnly="false" defaultValue="-1" description="The maximum size for the pool. The default value is -1."/>
+ <c:simple-property name="max-pool-size:expr" displayName="Max Pool Size" required="false" type="string" readOnly="false" defaultValue="-1" description="The maximum size for the pool. The default value is -1."/>
<c:simple-property name="max-retry-interval" required="false" type="long" readOnly="false" defaultValue="2000" description="The max retry interval. The default value is 2000."/>
<c:simple-property name="min-large-message-size" required="false" type="integer" readOnly="false" defaultValue="102400" description="The min large message size. The default value is 102400."/>
- <c:simple-property name="min-pool-size:expr" required="false" type="string" readOnly="false" defaultValue="-1" description="The minimum size for the pool. The default value is -1."/>
+ <c:simple-property name="min-pool-size:expr" displayName="Min Pool Size" required="false" type="string" readOnly="false" defaultValue="-1" description="The minimum size for the pool. The default value is -1."/>
<c:simple-property name="password" required="false" type="string" readOnly="false" description="The default password to use with this connection factory. This is only needed when pointing the connection factory to a remote host."/>
<c:simple-property name="pre-acknowledge" required="false" type="boolean" readOnly="false" defaultValue="false" description="True to pre-acknowledge. The default value is false."/>
<c:simple-property name="producer-max-rate" required="false" type="integer" readOnly="false" defaultValue="-1" description="The producer max rate. The default value is -1."/>
@@ -9898,10 +9898,10 @@
<c:simple-property name="reconnect-attempts" required="false" type="integer" readOnly="false" defaultValue="0" description="The reconnect attempts. The default value is 0."/>
<c:simple-property name="retry-interval" required="false" type="long" readOnly="false" defaultValue="2000" description="The retry interval. The default value is 2000."/>
<c:simple-property name="retry-interval-multiplier" required="false" type="double" readOnly="false" defaultValue="1.0" description="The retry interval multiplier. The default value is 1.0."/>
- <c:simple-property name="scheduled-thread-pool-max-size:expr" required="false" type="string" readOnly="false" defaultValue="5" description="The scheduled thread pool max size. The default value is 5."/>
+ <c:simple-property name="scheduled-thread-pool-max-size:expr" displayName="Scheduled Thread Pool Max Size" required="false" type="string" readOnly="false" defaultValue="5" description="The scheduled thread pool max size. The default value is 5."/>
<c:simple-property name="setup-attempts" required="false" type="integer" readOnly="false" description="The number of times to set up an MDB endpoint"/>
<c:simple-property name="setup-interval" required="false" type="long" readOnly="false" description="The interval between attempts at setting up an MDB endpoint."/>
- <c:simple-property name="thread-pool-max-size:expr" required="false" type="string" readOnly="false" defaultValue="30" description="The thread pool max size. The default value is 30."/>
+ <c:simple-property name="thread-pool-max-size:expr" displayName="Thread Pool Max Size" required="false" type="string" readOnly="false" defaultValue="30" description="The thread pool max size. The default value is 30."/>
<c:simple-property name="transaction" required="false" type="string" readOnly="false" defaultValue="transaction" description="TODO. The default value is transaction."/>
<c:simple-property name="transaction-batch-size" required="false" type="integer" readOnly="false" defaultValue="1048576" description="The transaction batch size. The default value is 1048576."/>
<c:simple-property name="use-global-pools" required="false" type="boolean" readOnly="false" defaultValue="true" description="True to use global pools. The default value is true."/>
commit c415055674a5d384d4abd7ffada3d1b1b7bbc178
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri May 25 14:08:45 2012 +0200
If we can't connect tell the user so (manually picked from 03c692ff88 )
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
index af53314..ed716e1 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
@@ -442,6 +442,10 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent
ProductInfo productInfo = new ProductInfo(hostname, user, pass, port).getFromRemote();
JBossProductType productType = productInfo.getProductType();
+ if (productType==null) {
+ throw new InvalidPluginConfigurationException("Can not connect to [" + hostname + ":" + port + "] as user [" + user +"]. Did you provide the correct credentials?");
+ }
+
HostPort hostPort = new HostPort(false);
HostPort managementHostPort = new HostPort(false);
managementHostPort.host = hostname;
1
0
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 5
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java | 13 +
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/CreateResourceDelegate.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NetworkInterfaceComponent.java | 93 ++++++++++
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 64 ++++++
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java | 27 ++
modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml | 20 +-
7 files changed, 209 insertions(+), 15 deletions(-)
New commits:
commit ae8691518ef66d602b74046efa0f1395b2ce7162
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri May 25 11:43:51 2012 +0200
BZ 824878 Support crud on network interfaces
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index ace2a35..30fe82b 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -359,6 +359,11 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone
}
}
+ // Allow to modify the configuration coming in from the RHQ server see also BZ 825120
+ if (report.getResourceType().getName().equals("Network Interface")) {
+ Configuration configuration = report.getResourceConfiguration();
+ NetworkInterfaceComponent.preProcessCreateChildConfiguration(configuration);
+ }
CreateResourceDelegate delegate = new CreateResourceDelegate(configDef, connection, address);
return delegate.createResource(report);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
index cf4749d..a2e6cc1 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
@@ -426,6 +426,9 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
if (property.getStringValue() == null && !propertyDefinition.isRequired())
return;
+ if (property.getName().endsWith(":ignore")) // Caller takes care
+ return;
+
if (propertyDefinition.isReadOnly() && !createChildRequested)
return;
@@ -488,7 +491,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
entry = new SimpleEntry<String, Object>(realName, null);
}
} else {
- entry = new SimpleEntry<String, Object>(name, property.getStringValue());
+ Object o = getObjectWithType(propertyDefinition,property.getStringValue());
+ entry = new SimpleEntry<String, Object>(name, o);
}
return entry;
@@ -632,6 +636,12 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
String val = (String) entry.getValue();
+ Object ret = getObjectWithType(pds, val);
+
+ return ret;
+ }
+
+ private Object getObjectWithType(PropertyDefinitionSimple pds, String val) {
PropertySimpleType type = pds.getType();
Object ret;
switch (type) {
@@ -656,7 +666,6 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
default:
ret= val;
}
-
return ret;
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/CreateResourceDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/CreateResourceDelegate.java
index a7201a2..4f14ea6 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/CreateResourceDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/CreateResourceDelegate.java
@@ -72,7 +72,7 @@ public class CreateResourceDelegate extends ConfigurationWriteDelegate implement
PropertyDefinitionSimple propertyDefinition = this.configurationDefinition
.getPropertyDefinitionSimple(propertySimple.getName());
- if (!propertyDefinition.isRequired() && propertySimple.getStringValue() == null) {
+ if (propertyDefinition==null || (!propertyDefinition.isRequired() && propertySimple.getStringValue() == null)) {
isEntryEligible = false;
} else {
entry = preparePropertySimple(propertySimple, propertyDefinition);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NetworkInterfaceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NetworkInterfaceComponent.java
new file mode 100644
index 0000000..5440605
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NetworkInterfaceComponent.java
@@ -0,0 +1,93 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.modules.plugins.jbossas7;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
+import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
+
+/**
+ * Component classes for network interfaces
+ * @author Heiko W. Rupp
+ */
+public class NetworkInterfaceComponent extends BaseComponent<NetworkInterfaceComponent> implements
+ ConfigurationFacet {
+
+ private static final String[] wildCards = {"any-address","any-ipv4-address","any-ipv6-address"};
+ private static final String WILDCARD_IGNORE = "wildcard:ignore";
+
+ @Override
+ public Configuration loadResourceConfiguration() throws Exception {
+ Configuration configuration = super.loadResourceConfiguration();
+
+
+
+/* TODO revisit later BZ 825169
+ // We now need to get the any*address properties separately
+ for (String wildcard : wildCards) {
+ Boolean val = readAttribute(getAddress(),wildcard,Boolean.class);
+ if (val) {
+ PropertySimple wildCardProp = new PropertySimple(WILDCARD_IGNORE,wildcard);
+ configuration.put(wildCardProp);
+ break;
+ }
+ }
+*/
+
+ return configuration;
+ }
+
+ @Override
+ public void updateResourceConfiguration(ConfigurationUpdateReport report) {
+
+ Configuration configuration = report.getConfiguration();
+ super.updateResourceConfiguration(report);
+ }
+
+ public static void preProcessCreateChildConfiguration(Configuration configuration) {
+
+ // Server is too stupid to accept all three any*address props for :add
+ // [standalone@localhost:9999 interface=test] :add(any-address=true,any-ipv4-address=false,any-ipv6-address=false)
+ // {
+ // "outcome" => "failed",
+ // "failure-description" => "JBAS014690: any-address is invalid",
+ // "rolled-back" => true
+ //}
+ // So we need to filter the false ones
+
+ for (String wildCard: wildCards) {
+ PropertySimple ps = configuration.getSimple(wildCard);
+ if (ps!=null && ps.getStringValue().equals("false"))
+ configuration.remove(wildCard);
+ }
+
+
+/* TODO revisit later BZ 825169
+ PropertySimple wildCardProp = configuration.getSimple(WILDCARD_IGNORE);//, "any-address");
+ String tmp = wildCardProp.getStringValue();
+ for (String wildCard : wildCards) {
+ boolean val = wildCard.equals(tmp);
+ PropertySimple prop = new PropertySimple(wildCard,val);
+ configuration.put(prop);
+ }
+*/
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 9589865..c4371af 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -6159,8 +6159,10 @@
<service name="Network Interface"
discovery="SubsystemDiscovery"
- class="BaseComponent"
- description="A named network interface, along with required criteria for determining the IP address to associate with that interface">
+ class="NetworkInterfaceComponent"
+ description="A named network interface, along with required criteria for determining the IP address to associate with that interface"
+ createDeletePolicy="both"
+ >
<runs-inside>
<parent-resource-type name="JBossAS7 Host Controller" plugin="&pluginName;"/>
@@ -6171,6 +6173,64 @@
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="interface"/>
</plugin-configuration>
+
+ <resource-configuration>
+
+ <c:simple-property name="inet-address" required="false" type="string" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether or not the address matches the given value. Value is either a IP address in IPv6 or IPv4 dotted decimal notation, or a hostname that can be resolved to an IP address. An 'undefined' value means this attribute is not relevant to the IP address selection."/>
+
+ <c:group name="address" displayName="Wildcard selection (exactly one property must be set to true)">
+ <c:simple-property name="any-address" required="true" type="boolean" readOnly="false" default="true" defaultValue="false"
+ description="Attribute indicating that sockets using this interface should be bound to a wildcard address. The IPv6 wildcard address (::) will be used unless the java.net.preferIpV4Stack system property is set to true, in which case the IPv4 wildcard address (0.0.0.0) will be used. If a socket is bound to an IPv6 anylocal address on a dual-stack machine, it can accept both IPv6 and IPv4 traffic; if it is bound to an IPv4 (IPv4-mapped) anylocal address, it can only accept IPv4 traffic."/>
+ <c:simple-property name="any-ipv4-address" required="true" type="boolean" readOnly="false" default="false" defaultValue="false"
+ description="Attribute indicating that sockets using this interface should be bound to the IPv4 wildcard address (0.0.0.0)."/>
+ <c:simple-property name="any-ipv6-address" required="true" type="boolean" readOnly="false" default="false" defaultValue="false"
+ description="Attribute indicating that sockets using this interface should be bound to the IPv6 wildcard address (::)."/>
+ </c:group>
+<!-- TODO revisit later BZ 825169
+ <c:simple-property name="wildcard:ignore" displayName="Address family selection" defaultValue="any-address" default="any-address"
+ description="Attribute indicating that sockets using this interface should be bound to a wildcard address. If set to 'Any', the IPv6 wildcard address (::) will be used unless the java.net.preferIpV4Stack system property is set to true, in which case the IPv4 wildcard address (0.0.0.0) will be used. If a socket is bound to an IPv6 anylocal address on a dual-stack machine, it can accept both IPv6 and IPv4 traffic; if it is bound to an IPv4 (IPv4-mapped) anylocal address, it can only accept IPv4 traffic.">
+ <c:property-options>
+ <c:option value="any-address" name="Any"/>
+ <c:option value="any-ipv4-address" name="Any IPv4"/>
+ <c:option value="any-ipv6-address" name="Any IPv6"/>
+ </c:property-options>
+ </c:simple-property>
+-->
+
+ <c:group name="advanced" displayName="Advanced settings" hiddenByDefault="true">
+ <c:simple-property name="link-local-address" required="false" type="boolean" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether or not the address is link-local. An 'undefined' or 'false' value means this attribute is not relevant to the IP address selection."/>
+ <c:simple-property name="loopback" required="false" type="boolean" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether or not it is a loopback address. An 'undefined' or 'false' value means this attribute is not relevant to the IP address selection."/>
+ <c:simple-property name="loopback-address" required="false" type="string" readOnly="false"
+ description="Attribute indicating that the IP address for this interface should be the given value, if a loopback interface exists on the machine. A 'loopback address' may not actually be configured on the machine's loopback interface. Differs from inet-address in that the given value will be used even if no NIC can be found that has the IP specified address associated with it. An 'undefined' or 'false' value means this attribute is not relevant to the IP address selection."/>
+
+ <c:simple-property name="multicast" required="false" type="boolean" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether or not its network interface supports multicast. An 'undefined' or 'false' value means this attribute is not relevant to the IP address selection."/>
+
+
+ <c:simple-property name="nic" required="false" type="string" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether its network interface has the given name. The name of a network interface (e.g. eth0, eth1, lo). An 'undefined' value means this attribute is not relevant to the IP address selection."/>
+
+ <c:simple-property name="nic-match" required="false" type="string" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether its network interface has a name that matches the given regular expression. Value is a regular expression against which the names of the network interfaces available on the machine can be matched to find an acceptable interface. An 'undefined' value means this attribute is not relevant to the IP address selection."/>
+
+ <c:simple-property name="point-to-point" required="false" type="boolean" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether or not its network interface is a point-to-point interface. An 'undefined' or 'false' value means this attribute is not relevant to the IP address selection"/>
+ <c:simple-property name="public-address" required="false" type="boolean" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether or not it is a publicly routable address. An 'undefined' or 'false' value means this attribute is not relevant to the IP address selection"/>
+ <c:simple-property name="site-local-address" required="false" type="boolean" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether or it is a site-local address. An 'undefined' or 'false' value means this attribute is not relevant to the IP address selection"/>
+ <c:simple-property name="subnet-match" required="false" type="string" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether or it the address fits in the given subnet definition. Value is a network IP address and the number of bits in the address' network prefix, written in 'slash notation'; e.g. '192.168.0.0/16'. An 'undefined' value means this attribute is not relevant to the IP address selection."/>
+
+ <c:simple-property name="up" required="false" type="boolean" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether its network interface is currently up. An 'undefined' or 'false' value means this attribute is not relevant to the IP address selection"/>
+ <c:simple-property name="virtual" required="false" type="boolean" readOnly="false"
+ description="Attribute indicating that part of the selection criteria for choosing an IP address for this interface should be whether its network interface is a virtual interface. An 'undefined' or 'false' value means this attribute is not relevant to the IP address selection"/>
+ </c:group>
+ </resource-configuration>
</service>
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
index ae35eae..ba2f13c 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
@@ -368,7 +368,8 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
assert step1.getAdditionalProperties().get("name").equals("test-prop");
assert step1.getAdditionalProperties().get("value").equals("Heiko");
assert step2.getAdditionalProperties().get("name").equals("check-interval");
- assert step2.getAdditionalProperties().get("value").equals("23");
+ assert step2.getAdditionalProperties().get("value").equals(23);
+ assert step3.getAdditionalProperties().get("value").equals(true);
}
@@ -583,7 +584,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
additionalProperties = cop.step(2).getAdditionalProperties();
assert additionalProperties.get("name").equals("bar");
- assert additionalProperties.get("value").equals("456");
+ assert additionalProperties.get("value").equals(456);
}
@@ -796,12 +797,12 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
}
- /** Tests that c:group entries are updated correctly in addition to special c:group syntax handling.
+ /** Tests that c:group entries are updated correctly in addition to special c:group syntax handling.
* Ex. <c:group name="proxy" displayName="Proxy Options">
* <c:simple-property name="proxy-list" required="false" type="string" readOnly="false" defaultValue="" description="List of proxies, Format (hostname:port) separated with comas."/>
* <c:simple-property name="proxy-url" required="false" type="string" readOnly="false" defaultValue="/" description="Base URL for MCMP requests."/>
* </c:group>
- *
+ *
* @throws Exception
*/
public void testUpdateGroupConfiguration() throws Exception {
@@ -843,4 +844,22 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
+ "' was not updated correctly. Expected '" + properties.get(name) + "' but was '" + value + "'.";
}
}
+
+ public void testIgnoreProperty() throws Exception {
+ ConfigurationDefinition definition = loadDescriptor("testIgnore");
+
+ Configuration configuration = new Configuration();
+
+ configuration.put(new PropertySimple("normal","0xdeadbeef"));
+ configuration.put(new PropertySimple("test:ignore","Hello world!")); // should not create a step
+
+ FakeConnection connection = new FakeConnection();
+
+ ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(definition, connection, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(configuration, new Address());
+
+ assert cop != null;
+ assert cop.numberOfSteps() == 1 : "One step was expected, but got " + cop.numberOfSteps();
+
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
index 8959b24..4350230 100644
--- a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
@@ -166,6 +166,14 @@
</resource-configuration>
</server>
+ <server class="foo" discovery="foo" name="testIgnore">
+
+ <resource-configuration>
+ <c:simple-property name="normal" readOnly="false"/>
+ <c:simple-property name="test:ignore" readOnly="false" required="false"/>
+ </resource-configuration>
+ </server>
+
<server class="foo" discovery="foo" name="listOfSimple1">
<resource-configuration>
@@ -281,12 +289,12 @@
</c:group>
</resource-configuration>
</server>
-
+
<!-- Simple c:group entries from descriptor with no special handling. -->
<service name="simpleGroupNoSpecial"
class="BaseComponent"
discovery="SubsystemDiscovery"
- description="simple grouped properties. No special handling"
+ description="simple grouped properties. No special handling"
singleton="true">
<resource-configuration>
<c:group name="proxy" displayName="Proxy Options">
@@ -302,21 +310,21 @@
<!--<c:option-source target="resource" expression="type=Connector plugin=&pluginName;"/>-->
</c:simple-property>
</c:group>
- </resource-configuration>
- </service>
+ </resource-configuration>
+ </service>
<!-- Same as previous but for update. -->
<service name="simpleGroupNoSpecialUpdate"
class="BaseComponent"
discovery="SubsystemDiscovery"
- description="simple grouped properties. No special handling"
+ description="simple grouped properties. No special handling"
singleton="true">
<resource-configuration>
<c:group name="proxy" displayName="Proxy Options">
<c:simple-property name="proxy-list" required="false" type="string" readOnly="false" defaultValue="" description="List of proxies, Format (hostname:port) separated with comas."/>
<c:simple-property name="proxy-url" required="false" type="string" readOnly="false" defaultValue="/" description="Base URL for MCMP requests."/>
</c:group>
- </resource-configuration>
+ </resource-configuration>
</service>
</plugin>
\ No newline at end of file
1
0
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 2869 +++++++++-
1 file changed, 2618 insertions(+), 251 deletions(-)
New commits:
commit acc5f0a08049440b70441fda1d591e225f2156ab
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri May 25 01:07:16 2012 -0500
[BZ 811288] Updated various subsystems to match the definition for stanadlone, profile, and managed server. Where applicable a single resource definition was split into two or three resources based on the parent type and available properties, metrics, and operations.
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index aeb3112..9589865 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -1623,11 +1623,11 @@
<c:option value="object-factory"/>
</c:property-options>
</c:simple-property>
- <c:simple-property name="class" required="false" type="string" readOnly="false" description="The object factory class name for object factory bindings"/>
- <c:simple-property name="lookup" required="false" type="string" readOnly="false" description="The entry to lookup in JNDI for lookup bindings"/>
- <c:simple-property name="module" required="false" type="string" readOnly="false" description="The module to load the object factory from for object factory bindings"/>
- <c:simple-property name="type" required="false" type="string" readOnly="false" description="The type of the value to bind for simple bindings, this must be a primitive type"/>
- <c:simple-property name="value" required="false" type="string" readOnly="false" description="The value to bind for simple bindings"/>
+ <c:simple-property name="class" required="false" type="string" readOnly="true" description="The object factory class name for object factory bindings"/>
+ <c:simple-property name="lookup" required="false" type="string" readOnly="true" description="The entry to lookup in JNDI for lookup bindings"/>
+ <c:simple-property name="module" required="false" type="string" readOnly="true" description="The module to load the object factory from for object factory bindings"/>
+ <c:simple-property name="type" required="false" type="string" readOnly="true" description="The type of the value to bind for simple bindings, this must be a primitive type"/>
+ <c:simple-property name="value" required="false" type="string" readOnly="true" description="The value to bind for simple bindings"/>
</resource-configuration>
</service>
</service>
@@ -2067,168 +2067,2405 @@
</service>
</service>
- </server>
+ <service name="JBossWeb (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true">
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=web"/>
+ <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
+ </plugin-configuration>
- <service name="Profile"
- description="A profile in a domain. Profiles are assigned to server groups."
- discovery="SubsystemDiscovery"
- class="BaseComponent">
+ <resource-configuration>
+ <c:simple-property name="default-virtual-server" required="true" type="string" readOnly="true" defaultValue="default-host" description="The web container's default virtual server. The default value is default-host.">
+ <c:option-source target="resource" expression="type=VHost plugin=&pluginName;"/>
+ </c:simple-property>
+ <c:simple-property name="instance-id" readOnly="true" required="false" type="string" description="The identifier for this server instance."/>
+ <c:simple-property name="native" required="false" type="boolean" readOnly="true" defaultValue="true" description="Add the native initialization listener to the web container. The default value is true."/>
+
+ <c:group name="child:configuration=static-resources" displayName="Static Resources">
+ <c:simple-property name="disabled:0" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable the default Servlet mapping. The default value is false."/>
+ <c:simple-property name="file-encoding" required="false" readOnly="true" description="Force a file encoding." type="string"/>
+ <c:simple-property name="listings" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable folder listings. The default value is false."/>
+ <c:simple-property name="max-depth" required="false" type="integer" readOnly="true" defaultValue="3" description="Maximum recursion for PROPFIND. The default value is 3."/>
+ <c:simple-property name="read-only" required="false" type="boolean" readOnly="true" defaultValue="true" description="Allow write HTTP methods (PUT, DELETE). The default value is true."/>
+ <c:simple-property name="sendfile" required="false" type="integer" readOnly="true" defaultValue="49152" description="Enable sendfile if possible, for files bigger than the specified byte size. The default value is 49152."/>
+ <c:simple-property name="secret" required="false" type="string" readOnly="true" description="Secret for WebDAV locking operations."/>
+ <c:simple-property name="webdav" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable WebDAV functionality. The default value is false."/>
+ </c:group>
+ <c:group name="child:configuration=jsp-configuration" displayName="JSP Configuration">
+ <c:simple-property name="check-interval" required="false" type="integer" readOnly="true" defaultValue="0" description="Check interval for JSP updates using a background thread. The default value is 0."/>
+ <c:simple-property name="development" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable the development mode, which gives more information when an error occurs. The default value is false."/>
+ <c:simple-property name="disabled:1" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable the JSP container. The default value is false."/>
+ <c:simple-property name="display-source-fragment" required="false" type="boolean" readOnly="true" defaultValue="true" description="When a runtime error occurs, attempts to display corresponding JSP source fragment. The default value is true."/>
+ <c:simple-property name="dump-smap" required="false" type="boolean" readOnly="true" defaultValue="false" description="Write SMAP data to a file. The default value is false."/>
+ <c:simple-property name="error-on-use-bean-invalid-class-attribute" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable errors when using a bad class in useBean. The default value is false."/>
+ <c:simple-property name="generate-strings-as-char-arrays" required="false" type="boolean" readOnly="true" defaultValue="false" description="Generate String constants as char arrays. The default value is false."/>
+ <c:simple-property name="java-encoding" required="false" type="string" readOnly="true" defaultValue="UTF8" description="Specify the encoding used for Java sources. The default value is UTF8."/>
+ <c:simple-property name="keep-generated" required="false" type="boolean" readOnly="true" defaultValue="true" description="Keep the generated Servlets. The default value is true."/>
+ <c:simple-property name="mapped-file" required="false" type="boolean" readOnly="true" defaultValue="true" description="Map to the JSP source. The default value is true."/>
+ <c:simple-property name="modification-test-interval" required="false" type="integer" readOnly="true" defaultValue="4" description="Minimum amount of time between two tests for updates, in seconds. The default value is 4."/>
+ <c:simple-property name="recompile-on-fail" required="false" type="boolean" readOnly="true" defaultValue="false" description="Retry failed JSP compilations on each request. The default value is false."/>
+ <c:simple-property name="scratch-dir" required="false" type="string" readOnly="true" description="Specify a different work directory."/>
+ <c:simple-property name="smap" required="false" type="boolean" readOnly="true" defaultValue="true" description="Enable SMAP. The default value is true."/>
+ <c:simple-property name="source-vm" required="false" type="string" readOnly="true" defaultValue="1.5" description="Source VM level for compilation. The default value is 1.5."/>
+ <c:simple-property name="tag-pooling" required="false" type="boolean" readOnly="true" defaultValue="true" description="Enable tag pooling. The default value is true."/>
+ <c:simple-property name="target-vm" required="false" type="string" readOnly="true" defaultValue="1.5" description="Target VM level for compilation. The default value is 1.5."/>
+ <c:simple-property name="trim-spaces" required="false" type="boolean" readOnly="true" defaultValue="false" description="Trim some spaces from the generated Servlet. The default value is false."/>
+ <c:simple-property name="x-powered-by" required="false" type="boolean" readOnly="true" defaultValue="true" description="Enable advertising the JSP engine in x-powered-by. The default value is true."/>
+ </c:group>
+ <c:group name="child:configuration=container" displayName="Container">
+ <!-- Commented out - see https://bugzilla.redhat.com/show_bug.cgi?id=815288
+ <c:list-property name="mime-mapping" description="A mime-mapping definition." required="false">
+ <c:map-property name="mime-mapping:collapsed">
+ <c:simple-property name="name:0" displayName="Name" description="A MIME mapping name without the dot (e.g. 'txt')"/>
+ <c:simple-property name="value:1" displayName="Value" description="A MIME mapping value (e.g. 'text/plain' )"/>
+ </c:map-property>
+ </c:list-property>
+ -->
+ <c:list-property name="welcome-file" required="false" readOnly="true" description="A welcome file declaration.">
+ <c:simple-property name="welcome-file" type="string" readOnly="true"/>
+ </c:list-property>
+ </c:group>
+ </resource-configuration>
- <plugin-configuration>
- <c:simple-property name="path" default="profile" readOnly="true"/>
- </plugin-configuration>
+ <service name="Connector (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="WebConnectorComponent">
- <!-- Necessary to duplicate the ModCluster component for Standalone and Domain because supported operations
- list is different. Update similar Standalone service if changes are necessary. -->
- <service name="ModCluster Domain Service"
- class="ModClusterComponent"
- discovery="ModClusterDiscoveryComponent"
- description="Mod_cluster support"
- singleton="true">
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="connector"/>
+ </plugin-configuration>
+
+ <metric property="bytesSent" measurementType="trendsup" description="Number of byte sent by the connector."/>
+ <metric property="bytesReceived" measurementType="trendsup" description="Number of byte received by the connector (POST data)."/>
+ <metric property="processingTime" measurementType="trendsup" units="milliseconds" description="Processing time used by the connector. Im milli-seconds."/>
+ <metric property="errorCount" measurementType="trendsup" displayType="summary" description="Number of error that occurs when processing requests by the connector."/>
+ <metric property="maxTime" units="milliseconds" description="Max time spent to process a requests."/>
+ <metric property="requestCount" measurementType="trendsup" displayType="summary" description="Number of the request processed by the connector."/>
+ <metric property="_maxConnections" displayName="Max connections" description="Number of max connections this connector can handle (see configuration to set it)" defaultOn="true" defaultInterval="14400000"/>
+
+ <resource-configuration>
+ <c:simple-property name="scheme" required="true" type="string" readOnly="true" description="The web connector scheme.">
+ <c:property-options>
+ <c:option value="http"/>
+ <c:option value="https"/>
+ <c:option value="ajp"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="socket-binding" required="true" type="string" readOnly="true" description="The web connector socket-binding reference, this connector should be bound to.">
+ <c:option-source target="configuration" expression="*/socket-binding=name:type=SocketBindingGroup"/>
+ </c:simple-property>
+ <c:simple-property name="enabled" required="false" type="boolean" readOnly="true" defaultValue="true" description="Defines whether the connector should be started on startup. The default value is true."/>
+ <c:simple-property name="enable-lookups" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable DNS lookups for Servlet API. The default value is false."/>
+ <c:simple-property name="executor" required="false" type="string" readOnly="true" description="The name of the executor that should be used for the processing threads of this connector. If undefined defaults to using an internal pool."/>
+ <c:simple-property name="max-connections" required="false" type="integer" readOnly="true" description="Amount of concurrent connections that can be processed by the connector with optimum performance. The default value depends on the connector used and the number of cpu cores (512*cores for HTTP, 32*cores for AJP)."/>
+ <c:simple-property name="max-post-size" required="false" type="integer" readOnly="true" defaultValue="2097152" description="Maximum size in bytes of a POST request that can be parsed by the container. The default value is 2097152."/>
+ <c:simple-property name="max-save-post-size" required="false" type="integer" readOnly="true" defaultValue="4096" description="Maximum size in bytes of a POST request that will be saved during certain authentication schemes. The default value is 4096."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="A unique name for the connector."/>
+ <c:simple-property name="protocol" required="true" type="string" readOnly="true" default="HTTP/1.1" defaultValue="HTTP/1.1" description="The web connector protocol. (e.g. 'HTTP/1.1' or 'AJP' or a name of a class implementing ProtocolHandler and MBeanRegistration )">
+ <!-- TODO let the user could enter a custom value here when the UI supports this. -->
+ <c:property-options>
+ <c:option value="HTTP/1.1"/>
+ <c:option value="AJP/1.3"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="proxy-name" required="false" type="string" readOnly="true" description="The host name that will be used when sending a redirect. The default value is null."/>
+ <c:simple-property name="proxy-port" required="false" type="integer" readOnly="true" description="The port that will be used when sending a redirect."/>
+ <c:simple-property name="redirect-port" required="false" type="integer" readOnly="true" defaultValue="8433" description="The port for redirection to a secure connector. The default value is 8433."/>
+ <c:simple-property name="secure" required="false" type="boolean" readOnly="true" defaultValue="false" description="Indicates if content sent or received by the connector is secured from the user perspective. The default value is false."/>
+ <c:simple-property name="virtual-server" required="false" type="string" readOnly="true" description="The list of virtual servers that can be accessed through this connector. The default is to allow all virtual servers."/>
+
+ <c:group name="child:ssl=configuration:enabled=secure=true" displayName="SSL Configuration">
+ <c:map-property name="*Configuration+" displayName="Configuration" readOnly="true" required="false">
+ <c:simple-property name="ca-certificate-file" required="false" type="string" readOnly="true" description="Certificate authority."/>
+ <c:simple-property name="ca-certificate-password" required="false" type="string" readOnly="true" description="Certificate password."/>
+ <c:simple-property name="ca-revocation-url" required="false" type="string" readOnly="true" description="Certificate authority revocation list."/>
+ <c:simple-property name="certificate-file" required="false" type="string" readOnly="true" description="Server certificate file. If the value is not given, ~/.keystore is the default"/>
+ <c:simple-property name="certificate-key-file" required="false" type="string" readOnly="true" description="Key file for the certificate."/>
+ <c:simple-property name="cipher-suite" required="false" type="string" readOnly="true" description="The allowed cipher suite."/>
+ <c:simple-property name="key-alias" required="false" type="string" readOnly="true" description="The key alias."/>
+ <c:simple-property name="keystore-type" required="false" type="string" readOnly="true" description="Type of the keystore, There are various types of keystores available, including 'PKCS12' and Sun's 'JKS.'"/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="The configuration name."/>
+ <c:simple-property name="password" required="false" type="string" readOnly="true" description="Password."/>
+ <c:simple-property name="protocol" required="false" type="string" readOnly="true" description="The SSL protocols that are enabled." default="ALL" defaultValue="ALL">
+ <c:property-options>
+ <c:option value="SSLv2"/>
+ <c:option value="SSLv3"/>
+ <c:option value="TLSv1"/>
+ <c:option value="SSLv2+SSLv3"/>
+ <c:option value="ALL"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="session-cache-size" required="false" type="integer" readOnly="true" description="SSL session cache."/>
+ <c:simple-property name="session-timeout" required="false" type="integer" readOnly="true" description="SSL session cache timeout."/>
+ <c:simple-property name="truststore-type" required="false" type="string" readOnly="true" description="Type of the truststore, There are various types of keystores available, including 'PKCS12' and Sun's 'JKS.'"/>
+ <c:simple-property name="verify-client" required="false" type="string" readOnly="true" description="Enable client certificate verification."/>
+ <c:simple-property name="verify-depth" required="false" type="integer" readOnly="true" description="Limit certificate nesting."/>
+ </c:map-property>
+ </c:group>
+ </resource-configuration>
+ </service>
+
+ <service name="VHost (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="VHostComponent">
<plugin-configuration>
- <c:simple-property name="path" default="subsystem=modcluster" readOnly="true"/>
+ <c:simple-property name="path" readOnly="true" default="virtual-server"/>
</plugin-configuration>
- <service name="Domain Service Configuration"
+ <metric property="_aliases" dataType="trait" defaultOn="true" description="Aliases for this virtual host"/>
+
+ <resource-configuration>
+ <c:list-property name="alias" readOnly="true" description="The virtual server aliases" displayName="Virtual server aliases">
+ <c:simple-property name="alias" readOnly="true"/>
+ </c:list-property>
+ <c:simple-property name="default-web-module" type="string" defaultValue="ROOT.war" readOnly="true" description="The web module deployment name that will be mapped as the root webapp."/>
+ <c:simple-property name="enable-welcome-root" type="boolean" defaultValue="false" readOnly="true" description="Whether or not the bundled welcome directory is used as the root web context. The default value is false."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="A unique virtual host name"/>
+
+ <c:group name="child:sso=configuration" displayName="The SSO configuration for this virtual server.">
+ <c:map-property name="*Configuration+" displayName="Configuration" readOnly="true" required="false">
+ <c:simple-property name="cache-container" required="false" type="string" readOnly="true" description="Enables clustered SSO using the specified clustered cache container.">
+ <c:option-source target="resource" expression="type='Cache Container' plugin=&pluginName;"/>
+ </c:simple-property>
+ <c:simple-property name="cache-name" required="false" type="string" readOnly="true" description="Name of the cache to use in the cache container."/>
+ <c:simple-property name="domain" required="false" type="string" readOnly="true" description="The cookie domain that will be used."/>
+ <c:simple-property name="reauthenticate" required="false" type="boolean" readOnly="true" description="Enables reauthentication with the realm when using SSO."/>
+ </c:map-property>
+ </c:group>
+ </resource-configuration>
+
+ <service name="Rewrite Rules (Managed Server)"
discovery="SubsystemDiscovery"
- class="ModClusterComponent">
+ description="A list of rewrite rules that will be processed in order on the URL or vhost specified in the request. Those follow the rules for mod_rewrite. Please consult the manual for help on settings"
+ class="BaseComponent">
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="mod-cluster-config=configuration"/>
+ <c:simple-property name="path" readOnly="true" default="rewrite"/>
</plugin-configuration>
- &modclusterSharedOpsConfig;
+ <resource-configuration>
+ <c:simple-property name="flags" required="true" type="string" readOnly="true" description="Option flags for this rewrite rule. Consult the mod_rewrite docs."/>
+ <c:simple-property name="pattern" required="true" type="string" readOnly="true" description="The pattern that will be matched. Consult the mod_rewrite docs."/>
+ <c:simple-property name="substitution" required="true" type="string" readOnly="true" description="The string that will replace the original URL or vhost. Consult the mod_rewrite docs."/>
+ <!-- embedded condition children - commented out for the moment -->
+ <c:group name="children:condition:name+" displayName="Rewrite conditions">
+ <c:list-property name="*1" displayName="Conditions" required="false" readOnly="true">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" required="true" readOnly="true" displayName="Condition-Name"/>
+ <c:simple-property name="flags" required="true" type="string" readOnly="true" description="Option flags for this condition. Consult the mod_rewrite docs."/>
+ <c:simple-property name="pattern" required="true" type="string" readOnly="true" description="The pattern to match. Consult the mod_rewrite docs."/>
+ <c:simple-property name="test" required="true" type="string" readOnly="true" description="Test pattern for the condition. Consult the mod_rewrite docs."/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ </resource-configuration>
+ </service>
- <service name="Domain Dynamic Load Provider"
- discovery="SubsystemDiscovery"
- createDeletePolicy="delete-only"
- class="BaseComponent">
+ <service name="Access Log (Managed Server)"
+ discovery="SubsystemDiscovery"
+ description="The access log configuration for this virtual server."
+ class="BaseComponent"
+ singleton="true">
- <runs-inside>
- <parent-resource-type name="Service Configuration" plugin="&pluginName;"/>
- <parent-resource-type name="ModCluster Service Configuration" plugin="&pluginName;"/>
- </runs-inside>
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="access-log=configuration"/>
+ </plugin-configuration>
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="dynamic-load-provider=configuration"/>
- </plugin-configuration>
+ <resource-configuration>
+ <c:simple-property name="extended" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable extended pattern, with more options. The default value is false."/>
+ <c:simple-property name="pattern" required="false" type="string" readOnly="true" defaultValue="common" description="The access log pattern. The default value is common."/>
+ <c:simple-property name="prefix" required="false" type="string" readOnly="true" defaultValue="false" description="Prefix for the log file name. The default value is false."/>
+ <c:simple-property name="resolve-hosts" required="false" type="boolean" readOnly="true" defaultValue="false" description="Host resolution. The default value is false."/>
+ <c:simple-property name="rotate" required="false" type="boolean" readOnly="true" defaultValue="true" description="Rotate the access log every day. The default value is true."/>
+
+ <c:group name="child:directory=configuration" displayName="The location for the access logging.">
+ <c:simple-property name="path" required="false" type="string" readOnly="true" description="The relative folder path."/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="true" defaultValue="jboss.server.log.dir" description="The folder the path is relative to. The default value is jboss.server.log.dir."/>
+ </c:group>
+ </resource-configuration>
+ </service>
+ </service>
+ </service>
- <resource-configuration>
- <c:simple-property name="decay" required="false" type="integer" readOnly="false" defaultValue="2" description="Decay. The default value is 2."/>
- <c:simple-property name="history" required="false" type="integer" readOnly="false" defaultValue="9" description="History. The default value is 9."/>
- </resource-configuration>
+ <service name="JCA (Managed Server)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="The Java EE Connector Architecture (JCA) subsystem providing general configuration for resource adapters"
+ singleton="true">
- <service name="Domain Custom Load Metric"
- discovery="SubsystemDiscovery"
- createDeletePolicy="delete-only"
- class="BaseComponent">
+ <plugin-configuration>
+ <c:simple-property name="path" default="subsystem=jca" readOnly="true"/>
+ <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
+ </plugin-configuration>
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="custom-load-metric"/>
- </plugin-configuration>
+ <resource-configuration>
+ <c:group name="child:bean-validation=bean-validation" displayName="Bean validation (JSR-303) for resource adapters.">
+ <c:simple-property name="enabled:1" required="false" type="boolean" readOnly="true" defaultValue="true" displayName="Enabled" description="Specify whether bean validation is enabled. The default value is true."/>
+ </c:group>
+ <c:group name="child:archive-validation=archive-validation" displayName="Archive validation for resource adapters.">
+ <c:simple-property name="enabled:2" required="false" type="boolean" readOnly="true" defaultValue="true" displayName="Enabled" description="Specify whether archive validation is enabled. The default value is true."/>
+ <c:simple-property name="fail-on-error" required="false" type="boolean" readOnly="true" defaultValue="true" description="Should an archive validation error report fail the deployment. The default value is true."/>
+ <c:simple-property name="fail-on-warn" required="false" type="boolean" readOnly="true" defaultValue="false" description="Should an archive validation warning report fail the deployment. The default value is false."/>
+ </c:group>
+ <c:group name="child:cached-connection-manager=cached-connection-manager" displayName="Cached connection manager for resource adapters.">
+ <c:simple-property name="debug" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable/disable debug information logging. The default value is false."/>
+ <c:simple-property name="error" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable/disable error information logging. The default value is false."/>
+ <c:simple-property name="install" required="false" type="boolean" readOnly="true" defaultValue="false" description="Enable/disable the cached connection manager valve and interceptor. The default value is false."/>
+ </c:group>
+ </resource-configuration>
- <resource-configuration>
- <c:simple-property name="capacity" required="false" type="integer" readOnly="false" defaultValue="1" description="Capacity of the metric. The default value is 1"/>
- <c:simple-property name="class" required="true" type="string" readOnly="false" description="Class name of the custom metric."/>
- <c:simple-property name="weight" required="false" type="integer" readOnly="false" defaultValue="1" description="Weight of the metric. The default value is 1."/>
- </resource-configuration>
- </service><!-- End of custom-load-metric service -->
+ <service name="BootstrapContext (Managed Server)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="Bootstrap context for resource adapters.">
- <service name="Domain Load Metric"
- discovery="SubsystemDiscovery"
- createDeletePolicy="delete-only"
- class="BaseComponent">
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="bootstrap-context"/>
+ </plugin-configuration>
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="load-metric"/>
- </plugin-configuration>
+ <resource-configuration>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="The name of the BootstrapContext"/>
+ <c:simple-property name="workmanager" required="false" type="string" readOnly="true" description="The WorkManager instance for the BootstrapContext">
+ <c:option-source target="resource" expression="type=Workmanager plugin=&pluginName;"/>
+ </c:simple-property>
+ </resource-configuration>
+ </service>
- <resource-configuration>
- <c:simple-property name="capacity" required="false" type="integer" readOnly="false" defaultValue="1" description="Capacity of the metric. The default value is 1."/>
- <c:simple-property name="type" required="true" type="string" defaultValue="busyness" readOnly="false" description="Type of the metric">
- <c:property-options>
- <c:option value="busyness"/>
- <c:option value="cpu" />
- <c:option value="heap"/>
- <c:option value="mem"/>
- <c:option value="requests"/>
- <c:option value="receive-traffic"/>
- <c:option value="send-traffic"/>
- <c:option value="sessions"/>
- </c:property-options>
- </c:simple-property>
- <c:simple-property name="weight" required="false" type="integer" readOnly="false" defaultValue="1" description="Weight of the metric. The default value is 1."/>
- </resource-configuration>
- </service><!-- End of load-metric service -->
- </service><!-- End of dynamic-load-provider service -->
+ <service name="Workmanager (Managed Server)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="WorkManager for resource adapters.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="workmanager"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="The name of the WorkManager"/>
+ </resource-configuration>
+
+ <service name="Long Running Thread Pool (Managed Server)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="Long running thread pool executor with a bounded queue where threads submitting tasks may block.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="long-running-threads"/>
+ </plugin-configuration>
+
+ <metric property="current-thread-count" description="The current number of threads in the pool."/>
+ <metric property="keepalive-time:time" description="The time"/>
+ <metric property="largest-thread-count" description="The largest number of threads that have ever simultaneously been in the pool."/>
+ <metric property="rejected-count" description="The number of tasks that have been passed to the handoff-executor (if one is specified) or discarded."/>
+
+ <resource-configuration>
+ <c:simple-property name="allow-core-timeout" required="false" type="boolean" readOnly="true" defaultValue="false" displayName="Allow Core Timeout" description="Whether core threads may time out. The default value is false."/>
+ <c:simple-property name="core-threads:expr" required="false" type="integer" readOnly="true" displayName="Core Threads" description="The core thread pool size which is smaller than the maximum pool size. If undefined, the core thread pool size is the same as the maximum thread pool size."/>
+ <c:map-property name="keepalive-time" required="true" displayName="Keepalive Time" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down.">
+ <c:simple-property name="time" required="true" type="long" readOnly="true" description="The time"/>
+ <c:simple-property name="unit" required="true" type="string" readOnly="true" description="The time unit"/>
+ </c:map-property>
+ <c:simple-property name="max-threads:expr" required="true" type="integer" readOnly="true" displayName="Max Threads" description="The maximum thread pool size."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" displayName="Name" description="The name of the thread pool."/>
+ <c:simple-property name="queue-length:expr" required="true" type="integer" readOnly="true" displayName="Queue Length" description="The queue length."/>
+ <c:simple-property name="thread-factory" required="false" type="string" readOnly="true" displayName="Thread Factory" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/>
+ </resource-configuration>
+ </service>
+
+ <service name="Short Running Thread Pool (Managed Server)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="Short running thread pool executor with a bounded queue where threads submitting tasks may block.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="short-running-threads"/>
+ </plugin-configuration>
+
+ <metric property="current-thread-count" description="The current number of threads in the pool."/>
+ <metric property="keepalive-time:time" description="The time"/>
+ <metric property="largest-thread-count" description="The largest number of threads that have ever simultaneously been in the pool."/>
+ <metric property="rejected-count" description="The number of tasks that have been passed to the handoff-executor (if one is specified) or discarded."/>
+
+ <resource-configuration>
+ <c:simple-property name="allow-core-timeout" required="false" type="boolean" readOnly="true" defaultValue="false" displayName="Allow Core Timeout" description="Whether core threads may time out. The default value is false."/>
+ <c:simple-property name="core-threads:expr" required="false" type="integer" readOnly="true" displayName="Core Threads" description="The core thread pool size which is smaller than the maximum pool size. If undefined, the core thread pool size is the same as the maximum thread pool size."/>
+ <c:map-property name="keepalive-time" required="true" readOnly="true" displayName="Keepalive Time" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down.">
+ <c:simple-property name="time" required="true" type="long" readOnly="true" description="The time"/>
+ <c:simple-property name="unit" required="true" type="string" readOnly="true" description="The time unit"/>
+ </c:map-property>
+ <c:simple-property name="max-threads:expr" required="true" type="integer" readOnly="true" displayName="Max Threads" description="The maximum thread pool size."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" displayName="Name" description="The name of the thread pool."/>
+ <c:simple-property name="queue-length:expr" required="true" type="integer" readOnly="true" displayName="Queue Length" description="The queue length."/>
+ <c:simple-property name="thread-factory" required="false" type="string" readOnly="true" displayName="Thread Factory" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/>
+ </resource-configuration>
+ </service>
+ </service>
+ </service>
+
+ <service name="Osgi (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The OSGi subsystem configuration."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=osgi"/>
+ <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
+ </plugin-configuration>
+
+ <operation name="subsystem:activate" displayName="Activate" description="Activate the OSGi subsystem.">
+ <results>
+ <c:simple-property name="operationResult" description="Activate the OSGi subsystem."/>
+ </results>
+ </operation>
+
+ <resource-configuration>
+ <c:simple-property name="activation" required="false" type="string" readOnly="true" defaultValue="LAZY" description="Activation flag for the OSGi subsystem. Possible values: lazy, eager. The default value is LAZY."/>
+ <c:simple-property name="startlevel" required="false" type="integer" readOnly="false" description="The current Start Level of the OSGi Framework. Changing this value will change the Start Level of the Framework accordingly."/>
+ </resource-configuration>
+
+ <service name="Capability (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="capability"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="startlevel" required="false" type="integer" readOnly="true" description="The startlevel for the capability. Can only be specified for OSGi bundles."/>
+ </resource-configuration>
+ </service>
+
+ <service name="Bundle (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Runtime bundle information.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="bundle"/>
+ </plugin-configuration>
+
+ <operation name="subsystem:start" displayName="Start" description="Starts the bundle.">
+ <results>
+ <c:simple-property name="operationResult" description="Starts the bundle."/>
+ </results>
+ </operation>
+
+ <operation name="subystem:stop" displayName="Stop" description="Stops the bundle.">
+ <results>
+ <c:simple-property name="operationResult" description="Stops the bundle."/>
+ </results>
+ </operation>
+
+ <resource-configuration>
+ <c:simple-property name="id" required="false" type="long" readOnly="true" description="The bundle ID."/>
+ <c:simple-property name="startlevel" required="false" type="integer" readOnly="true" description="The bundle's start level."/>
+ <c:simple-property name="symbolic-name" required="false" type="string" readOnly="true" description="The bundle symbolic name."/>
+ <c:simple-property name="version" required="false" type="string" readOnly="true" description="The bundle version."/>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="JMX (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The configuration of the JMX subsystem."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=jmx"/>
+ <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="show-model" required="false" type="boolean" readOnly="true" description="Set to 'true' to include MBeans for the model controller resources"/>
+ </resource-configuration>
+
+ <service name="Remoting Connector (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The configuration of a resource adapter."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="remoting-connector=jmx"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="use-management-endpoint" required="false" type="boolean" readOnly="true" defaultValue="true" description="If true the connector will use the management endpoint, otherwise it will use the remoting subsystem one. The default value is true."/>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Resource Adapters (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Configuration of the resource adapters subsystem."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=resource-adapters"/>
+ <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
+ </plugin-configuration>
+
+ <service name="Resource Adapter (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The configuration of a resource adapter.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="resource-adapter"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="archive" required="true" type="string" readOnly="true" description="Specifies the resource adapter archive"/>
+ <c:simple-property name="beanvalidationgroups" required="false" type="string" readOnly="true" description="Specifies the bean validation groups that should be used"/>
+ <c:simple-property name="bootstrapcontext" required="false" type="string" readOnly="true" description="Specifies the unique name of the bootstrap context that should be used"/>
+ <c:simple-property name="transaction-support" required="true" type="string" readOnly="true" description="Specifies the transaction support level of the resource adapter">
+ <c:property-options>
+ <c:option value="LocalTransaction"/>
+ <c:option value="XATransaction"/>
+ <c:option value="NoTransaction"/>
+ </c:property-options>
+ </c:simple-property>
+ </resource-configuration>
+
+ <service name="Admin Objects (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Specifies the administration objects.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="admin-objects"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="class-name" required="true" type="string" readOnly="true" description="Specifies the fully qualified class name of a managed connection factory or admin object"/>
+ <c:simple-property name="enabled" required="false" type="boolean" readOnly="true" defaultValue="true" description="Specifies if the resource adapter should be enabled. The default value is true."/>
+ <c:simple-property name="jndi-name" required="false" type="string" readOnly="true" description="Specifies the JNDI name for the connection factory or admin object"/>
+ <c:simple-property name="use-java-context" required="false" type="boolean" readOnly="true" defaultValue="true" description="Setting this to false will bind the object into global JNDI. The default value is true."/>
+ </resource-configuration>
+ </service>
+
+ <service name="Connection Definitions (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Specifies the connection definitions.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="connection-definitions"/>
+ </plugin-configuration>
+
+ <operation name="subsystem:flush-all-connection-in-pool" displayName="Flush All Connections in Pool" description="Flushes all connections in the pool">
+ <results>
+ <c:simple-property name="operationResult" description="Flushes all connections in the pool"/>
+ </results>
+ </operation>
+
+ <operation name="subsystem:flush-idle-connection-in-pool" displayName="Flush Idle Connections in Pool" description="Flushes all idle connections in the pool">
+ <results>
+ <c:simple-property name="operationResult" description="Flushes all idle connections in the pool"/>
+ </results>
+ </operation>
+
+ <operation name="subsystem:test-connection-in-pool" displayName="Test Connection in Pool" description="Test if a connection can be obtained">
+ <results>
+ <c:simple-property name="operationResult" description="Test if a connection can be obtained"/>
+ </results>
+ </operation>
+
+ <resource-configuration>
+ <c:simple-property name="allocation-retry:expr" required="false" type="long" readOnly="true" displayName="Allocation Retry" description="The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception"/>
+ <c:simple-property name="allocation-retry-wait-millis:expr" required="false" type="long" readOnly="true" displayName="Allocation Retry Wait Millis" description="The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection"/>
+ <c:simple-property name="background-validation" required="false" type="boolean" readOnly="true" defaultValue="false" description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value requires a server restart. The default value is false."/>
+ <c:simple-property name="background-validation-millis:expr" required="false" type="integer" readOnly="true" displayName="Background Validation Millis" description="The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value requires a server restart"/>
+ <c:simple-property name="blocking-timeout-wait-millis:expr" required="false" type="long" readOnly="true" displayName="Blocking Timeout Wait Millis" description="The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time"/>
+ <c:simple-property name="class-name" required="true" type="string" readOnly="true" description="Specifies the fully qualified class name of a managed connection factory or admin object"/>
+ <c:simple-property name="enabled" required="false" type="boolean" readOnly="true" defaultValue="true" description="Specifies if the resource adapter should be enabled. The default value is true."/>
+ <c:simple-property name="flush-strategy" required="false" type="string" readOnly="true" description="Specifies how the pool should be flush in case of an error." default="FailingConnectionOnly" defaultValue="FailingConnectionOnly">
+ <c:property-options>
+ <c:option value="FailingConnectionOnly"/>
+ <c:option value="IdleConnections"/>
+ <c:option value="EntirePool"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="idle-timeout-minutes:expr" required="false" type="long" readOnly="true" displayName="Idle Timeout Minutes" description="The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value requires a server restart."/>
+ <c:simple-property name="interleaving" required="false" type="boolean" readOnly="true" defaultValue="false" description="An element to enable interleaving for XA connections. The default value is false."/>
+ <c:simple-property name="jndi-name" required="false" type="string" readOnly="true" description="Specifies the JNDI name for the connection factory or admin object"/>
+ <c:simple-property name="max-pool-size:expr" required="false" type="integer" readOnly="true" defaultValue="20" displayName="Max Pool Size" description="The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool. The default value is 20."/>
+ <c:simple-property name="min-pool-size:expr" required="false" type="integer" readOnly="true" defaultValue="0" displayName="Min Pool Size" description="The min-pool-size element specifies the minimum number of connections for a pool. The default value is 0."/>
+ <c:simple-property name="no-recovery" required="false" type="boolean" readOnly="true" description="Specifies if the connection pool should be excluded from recovery"/>
+ <c:simple-property name="no-tx-separate-pool" required="false" type="boolean" readOnly="true" defaultValue="false" description="Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts. The default value is false."/>
+ <c:simple-property name="pad-xid" required="false" type="boolean" readOnly="true" defaultValue="false" description="Should the Xid be padded. The default value is false."/>
+ <c:simple-property name="pool-prefill" required="false" type="boolean" readOnly="true" defaultValue="false" description="Should the pool be prefilled. Changing this value requires a server restart. The default value is false."/>
+ <c:simple-property name="pool-use-strict-min" required="false" type="boolean" readOnly="true" defaultValue="false" description="Specifies if the min-pool-size should be considered strictly. The default value is false."/>
+ <c:simple-property name="recovery-password" required="false" type="string" readOnly="true" description="The password used for recovery"/>
+ <c:simple-property name="recovery-plugin-class-name" required="false" type="string" readOnly="true" description="The fully qualified class name of the recovery plugin implementation"/>
+ <c:map-property name="recovery-plugin-properties" required="false" displayName="Recovery Plugin Properties" description="The properties for the recovery plugin">
+ <c:simple-property name="recovery-plugin-properties" required="false" type="string" readOnly="true" displayName="Recovery Plugin Property"/>
+ </c:map-property>
+ <c:simple-property name="recovery-security-domain" required="false" type="string" readOnly="true" description="The security domain used for recovery"/>
+ <c:simple-property name="recovery-username" required="false" type="string" readOnly="true" description="The user name used for recovery"/>
+ <c:simple-property name="same-rm-override" required="false" type="boolean" readOnly="true" description="The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false"/>
+ <c:simple-property name="security-application" required="false" type="boolean" readOnly="true" description="Indicates that app supplied parameters (such as from getConnection(user, pw)) are used to distinguish connections in the pool"/>
+ <c:simple-property name="security-domain" required="false" type="string" readOnly="true" description="Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool"/>
+ <c:simple-property name="security-domain-and-application" required="false" type="string" readOnly="true" description="Indicates that either app supplied parameters (such as from getConnection(user, pw)) or Subject (from security domain) are used to distinguish connections in the pool"/>
+ <c:simple-property name="use-ccm" required="false" type="boolean" readOnly="true" defaultValue="true" description="Enable the use of a cached connection manager. The default value is true."/>
+ <c:simple-property name="use-fast-fail" required="false" type="boolean" readOnly="true" defaultValue="false" description="Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false). The default value is false."/>
+ <c:simple-property name="use-java-context" required="false" type="boolean" readOnly="true" defaultValue="true" description="Setting this to false will bind the object into global JNDI. The default value is true."/>
+ <c:simple-property name="use-try-lock:expr" required="false" type="long" readOnly="true" displayName="Use Try Lock" description="Any configured timeout for internal locks on the resource adapter objects in seconds"/>
+ <c:simple-property name="wrap-xa-resource" required="false" type="boolean" readOnly="true" defaultValue="true" description="Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance. The default value is true."/>
+ <c:simple-property name="xa-resource-timeout:expr" required="false" type="integer" readOnly="true" displayName="XA Resource Timeout" description="The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero"/>
+ </resource-configuration>
+ </service>
+ </service>
+ </service>
+
+ <service name="CMP (Managed Server)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="The configuration of the cmp subsystem."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" default="subsystem=cmp" readOnly="true"/>
+ <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
+ </plugin-configuration>
+
+ <service name="HiloKeygenerator (Managed Server)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="HiLo based key generators.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="hilo-keygenerator"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="block-size" required="false" type="long" readOnly="true" description="The block size"/>
+ <c:simple-property name="create-table" required="false" type="boolean" readOnly="true" description="Boolean to determine whether to create create the tables"/>
+ <c:simple-property name="create-table-ddl" required="false" type="string" readOnly="true" description="The DDL used to create the table"/>
+ <c:simple-property name="data-source" required="true" type="string" readOnly="true" description="The datasource used for sequence generation"/>
+ <c:simple-property name="drop-table" required="false" type="boolean" readOnly="true" description="Boolean to determine whether to create drop the tables"/>
+ <c:simple-property name="id-column" required="true" type="string" readOnly="true" description="The ID column name"/>
+ <c:simple-property name="select-hi-ddl" required="false" type="string" readOnly="true" description="The DDL used to select the hi value"/>
+ <c:simple-property name="sequence-column" required="true" type="string" readOnly="true" description="The sequence column name"/>
+ <c:simple-property name="sequence-name" required="true" type="string" readOnly="true" description="The name of the sequence"/>
+ <c:simple-property name="table-name" required="true" type="string" readOnly="true" description="The table name"/>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="EJB3 (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The configuration of the ejb3 subsystem."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=ejb3"/>
+ <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="default-clustered-sfsb-cache" required="false" type="string" readOnly="true" description="Name of the default stateful bean cache, which will be applicable to all clustered stateful EJBs, unless overridden at the deployment or bean level"/>
+ <c:simple-property name="default-entity-bean-instance-pool" required="false" type="string" readOnly="true" description="Name of the default entity bean instance pool, which will be applicable to all entity beans, unless overridden at the deployment or bean level"/>
+ <c:simple-property name="default-entity-bean-optimistic-locking" required="false" type="boolean" readOnly="true" description="If set to true entity beans will use optimistic locking by default"/>
+ <c:simple-property name="default-mdb-instance-pool" required="false" type="string" readOnly="true" description="Name of the default MDB instance pool, which will be applicable to all MDBs, unless overridden at the deployment or bean level"/>
+ <c:simple-property name="default-resource-adapter-name" required="false" type="string" readOnly="true" defaultValue="hornetq-ra" description="Name of the default resource adapter name that will be used by MDBs, unless overridden at the deployment or bean level. The default value is hornetq-ra."/>
+ <c:simple-property name="default-sfsb-cache" required="false" type="string" readOnly="true" description="Name of the default stateful bean cache, which will be applicable to all stateful EJBs, unless overridden at the deployment or bean level"/>
+ <c:simple-property name="default-singleton-bean-access-timeout:expr" required="false" type="string" readOnly="true" defaultValue="5000" description="The default access timeout for singleton beans. The default value is 5000."/>
+ <c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="true" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/>
+ <c:simple-property name="default-stateful-bean-access-timeout:expr" required="false" type="string" readOnly="true" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/>
+ <c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="true" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/>
+ </resource-configuration>
+
+ <service name="EJB3 Thread Pool (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A thread pool executor with an unbounded queue. Such a thread pool has a core size and a queue with no upper bound. When a task is submitted, if the number of running threads is less than the core size, a new thread is created. Otherwise, the task is placed in queue. If too many tasks are allowed to be submitted to this type of executor, an out of memory condition may occur.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="thread-pool"/>
+ </plugin-configuration>
+
+ <metric property="active-count" description="The approximate number of threads that are actively executing tasks."/>
+ <metric property="completed-task-count" description="The approximate total number of tasks that have completed execution."/>
+ <metric property="current-thread-count" description="The current number of threads in the pool."/>
+ <metric property="keepalive-time:time" description="The time"/>
+ <metric property="largest-thread-count" description="The largest number of threads that have ever simultaneously been in the pool."/>
+ <metric property="rejected-count" description="The number of tasks that have been rejected."/>
+ <metric property="task-count" description="The approximate total number of tasks that have ever been scheduled for execution."/>
+
+ <resource-configuration>
+ <c:map-property name="keepalive-time" readOnly="true" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down.">
+ <c:simple-property name="time" required="true" type="long" readOnly="true" description="The time"/>
+ <c:simple-property name="unit" required="true" type="string" readOnly="true" description="The time unit"/>
+ </c:map-property>
+ <c:simple-property name="max-threads:expr" required="false" type="string" readOnly="true" description="The maximum thread pool size."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="The name of the thread pool."/>
+ <c:simple-property name="thread-factory" required="false" type="string" readOnly="true" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/>
+ </resource-configuration>
+ </service>
+
+ <service name="File Passivation Store (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A file system based passivation store.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="file-passivation-store"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="groups-path" required="false" type="string" readOnly="true" defaultValue="ejb3/groups"/>
+ <c:simple-property name="idle-timeout:expr" required="false" type="string" readOnly="true" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
+ <c:simple-property name="idle-timeout-unit" required="false" type="string" readOnly="true" defaultValue="SECONDS" description="The unit of idle-timeout. The default value is SECONDS."/>
+ <c:simple-property name="max-size:expr" required="false" type="string" readOnly="true" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="true" defaultValue="jboss.server.data.dir"/>
+ <c:simple-property name="sessions-path" required="false" type="string" readOnly="true" defaultValue="ejb3/sessions"/>
+ <c:simple-property name="subdirectory-count:expr" required="false" type="string" readOnly="true" defaultValue="100"/>
+ </resource-configuration>
+ </service>
+
+ <service name="Strict Max Bean Instance Pool (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A bean instance pool with a strict upper limit">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="strict-max-bean-instance-pool"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="max-pool-size:expr" required="false" type="string" readOnly="true" defaultValue="20" description="The maximum number of bean instances that the pool can hold at a given point in time. The default value is 20."/>
+ <c:simple-property name="timeout:expr" required="false" type="string" readOnly="true" defaultValue="5" description="The maximum amount of time to wait for a bean instance to be available from the pool. The default value is 5."/>
+ <c:simple-property name="timeout-unit" required="false" type="string" readOnly="true" defaultValue="MINUTES" description="The instance acquisition timeout unit. The default value is MINUTES."/>
+ </resource-configuration>
+ </service>
+
+ <service name="SFSB Cache (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A SFSB cache.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="cache"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="aliases" readOnly="true" description="The aliases by which this cache may also be referenced">
+ <c:simple-property name="aliases" readOnly="true"/>
+ </c:list-property>
+ <c:simple-property name="passivation-store" required="false" type="string" readOnly="true" description="The passivation store used by this cache"/>
+ </resource-configuration>
+ </service>
+
+ <service name="Cluster Passivation Store (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A clustered passivation store.">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="cluster-passivation-store"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="bean-cache" required="false" type="string" readOnly="true" description="The name of the cache used to store bean instances."/>
+ <c:simple-property name="cache-container" required="false" type="string" readOnly="true" defaultValue="ejb" description="The name of the cache container used for the bean and client-mappings caches. The default value is ejb."/>
+ <c:simple-property name="client-mappings-cache" required="false" type="string" readOnly="true" defaultValue="remote-connector-client-mappings" description="The name of the cache used to store client-mappings of the EJB remoting connector's socket-bindings. The default value is remote-connector-client-mappings."/>
+ <c:simple-property name="idle-timeout:expr" required="false" type="string" readOnly="true" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
+ <c:simple-property name="idle-timeout-unit" required="false" type="string" readOnly="true" defaultValue="SECONDS" description="The unit of idle-timeout. The default value is SECONDS."/>
+ <c:simple-property name="max-size:expr" required="false" type="string" readOnly="true" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
+ <c:simple-property name="passivate-events-on-replicate" required="false" type="boolean" readOnly="true" defaultValue="true" description="Indicates whether replication should trigger passivation events on the bean. The default value is true."/>
+ </resource-configuration>
+ </service>
+
+ <service name="Async Service (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The EJB3 Asynchronous Invocation Service"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="service=async"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="thread-pool-name" required="false" type="string" readOnly="true" description="The name of the thread pool which handles asynchronous invocations"/>
+ </resource-configuration>
+ </service>
+
+ <service name="IIOP Service (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The IIOP service"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="service=iiop"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="enable-by-default" required="false" type="boolean" readOnly="true" description="If this is true EJB's will be exposed over IIOP by default, otherwise it needs to be explicitly enabled in the deployment descriptor"/>
+ <c:simple-property name="use-qualified-name" required="false" type="boolean" readOnly="true" description="If true EJB names will be bound into the naming service with the application and module name prepended to the name (e.g. myapp/mymodule/MyEjb)"/>
+ </resource-configuration>
+ </service>
+
+ <service name="Remote Service (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The EJB3 remote service"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="service=remote"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="connector-ref" required="false" type="string" readOnly="true" description="The name of the connector on which the EJB3 remoting channel is registered"/>
+ <c:simple-property name="thread-pool-name" required="false" type="string" readOnly="true" description="The name of the thread pool that handles remote invocations"/>
+ </resource-configuration>
+
+ <service name="Channel Creation Options (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The options that will be used during the EJB remote channel creation">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="channel-creation-options"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="type" required="false" type="string" readOnly="true" description="The type of the channel creation option">
+ <c:property-options>
+ <c:option value="remoting" name="remoting"/>
+ <c:option value="xnio" name="xnio"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="value" required="false" type="string" readOnly="true" description="The value for the EJB remote channel creation option"/>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Timer Service (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The EJB timer service"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="service=timer-service"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="path" required="false" type="string" readOnly="true" description="The directory to store persistent timer information in"/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="true" description="The relative path that is used to resolve the timer data store location"/>
+ <c:simple-property name="thread-pool-name" required="false" type="string" readOnly="true" description="The name of the thread pool used to run timer service invocations"/>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Threads (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="ThreadsComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=threads"/>
+ <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
+ </plugin-configuration>
+
+ <service name="ThreadFactory (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A thread factory (implementing java.util.concurrent.ThreadFactory).">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="thread-factory"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="group-name" required="false" type="string" readOnly="true" description="Specifies the name of a thread group to create for this thread factory."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="The name of the created thread factory."/>
+ <c:simple-property name="priority:expr" required="false" type="string" readOnly="true" defaultValue="-1" displayName="Priority" description="May be used to specify the thread priority of created threads. The default value is -1."/>
+ <c:simple-property name="thread-name-pattern" required="false" type="string" readOnly="true" description="The template used to create names for threads. The following patterns may be used:
+ %% - emit a percent sign
+ %t - emit the per-factory thread sequence number
+ %g - emit the global thread sequence number
+ %f - emit the factory sequence number
+ %i - emit the thread ID."/>
+ </resource-configuration>
+ </service>
+
+ <service name="ThreadPool (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="ThreadPoolComponent"
+ description="A thread pool executor">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="bounded-queue-thread-pool|queueless-thread-pool|scheduled-thread-pool|unbounded-queue-thread-pool"/>
+ </plugin-configuration>
+
+ <metric property="active-count" description="The approximate number of threads that are actively executing tasks."/>
+ <metric property="completed-task-count" description="The approximate total number of tasks that have completed execution."/>
+ <metric property="current-thread-count" description="The current number of threads in the pool."/>
+ <metric property="largest-thread-count" description="The largest number of threads that have ever simultaneously been in the pool."/>
+ <metric property="rejected-count" description="The number of tasks that have been rejected."/>
+ <metric property="task-count" description="The approximate total number of tasks that have ever been scheduled for execution."/>
+
+ <resource-configuration>
+ <c:map-property name="keepalive-time" readOnly="true" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down.">
+ <c:simple-property name="time" required="true" readOnly="true" type="long" description="The time"/>
+ <c:simple-property name="unit" required="true" readOnly="true" type="string" description="The time unit"/>
+ </c:map-property>
+ <c:simple-property name="max-threads:expr" required="true" type="string" readOnly="true" displayName="Max Threads" description="The maximum thread pool size."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="The name of the thread pool."/>
+ <c:simple-property name="thread-factory" required="false" type="string" readOnly="true" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/>
+
+ <c:simple-property name="type" readOnly="true" default="scheduled-thread-pool" displayName="Thread Pool Type" description="Thread pool type">
+ <c:property-options>
+ <c:option value="bounded-queue-thread-pool"/>
+ <c:option value="queueless-thread-pool"/>
+ <c:option value="unbounded-queue-thread-pool"/>
+ <c:option value="scheduled-thread-pool"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:template name="Bounded Queue Thread Pool" description="Bounded Queue Thread Pool">
+ <c:simple-property name="type" readOnly="true" default="bounded-queue-thread-pool"/>
+ </c:template>
+ <c:template name="Queueless Thread Pool" description="Queueless Thread Pool">
+ <c:simple-property name="type" readOnly="true" default="queueless-thread-pool"/>
+ </c:template>
+ <c:template name="Scheduled Thread Pool" description="Scheduled Thread Pool">
+ <c:simple-property name="type" readOnly="true" default="scheduled-thread-pool"/>
+ </c:template>
+ <c:template name="Unbounded Queue Thread Pool" description="Unbounded Queue Thread Pool">
+ <c:simple-property name="type" readOnly="true" default="unbounded-queue-thread-pool"/>
+ </c:template>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Security (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The configuration of the security subsystem."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=security"/>
+ <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="deep-copy-subject-mode" required="false" type="boolean" readOnly="true" defaultValue="false" description="Sets the copy mode of subjects done by the security managers to be deep copies that makes copies of the subject principals and credentials if they are cloneable. It should be set to true if subject include mutable content that can be corrupted when multiple threads have the same identity and cache flushes/logout clearing the subject in one thread results in subject references affecting other threads. The default value is false."/>
+ </resource-configuration>
+
+ <service name="Security Domain (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="security-domain"/>
+ </plugin-configuration>
+
+ <operation name="flush-cache" description="Remove entries stored in the authentication cache for this security domain. A single entry can be flushed by using the principal argument with the username as the value. If no argument is passed to the operation, all entries are flushed.">
+ <results>
+ <c:simple-property name="operationResult" description="Remove entries stored in the authentication cache for this security domain. A single entry can be flushed by using the principal argument with the username as the value. If no argument is passed to the operation, all entries are flushed."/>
+ </results>
+ </operation>
+
+ <operation name="list-cached-principals" description="Lists the principals stored in the authentication cache for this security domain.">
+ <results>
+ <c:simple-property name="operationResult" description="Lists the principals stored in the authentication cache for this security domain."/>
+ </results>
+ </operation>
+
+ <resource-configuration>
+ <c:simple-property name="cache-type" required="false" type="string" readOnly="true" description="Adds a cache to speed up authentication checks. Allowed values are 'default' to use simple map as the cache and 'infinispan' to use an Infinispan cache."/>
+ </resource-configuration>
+
+ <service name="ACL (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="acl=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="acl-modules" required="false" description="List of acl modules">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="true" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="true" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="true" description="Name of JBoss Module where the acl provider module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="true" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Audit (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="audit=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="provider-modules" required="false" description="List of provider modules">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="true" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="true" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Authentication (Classic - Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="authentication=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="login-modules" required="false" description="List of authentication modules">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="true" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="true" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="true" description="Name of JBoss Module where the login module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="true" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Authentication (Jaspi - Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="authentication=jaspi"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="auth-modules" required="true" description="List of authentication modules to be used." >
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="true" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="true" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="true" description="Name of JBoss Module where the auth module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="true" description="List of module options containing a name/value pair."/>
+ <c:simple-property name="login-module-stack-ref" required="false" type="string" readOnly="true" description="Reference to a login module stack name previously configured in the same security domain."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+
+ <service name="Login Module Stack (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="login-module-stack"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="login-modules" required="true" description="List of authentication modules" >
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="true" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="true" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="true" description="Name of JBoss Module where the login module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="true" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Authorization (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="authorization=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="policy-modules" required="false" description="List of authorization modules">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="true" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="true" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="true" description="Name of JBoss Module where the policy module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="true" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Identity Trust (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="identity-trust=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="trust-modules" required="false" description="List of trust modules">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="true" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="true" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="true" description="Name of JBoss Module where the identity trust module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="true" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+
+ <service name="JSSE (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="jsse"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="cipher-suites" required="false" type="string" readOnly="true" description="Comma separated list of cipher suites to enable on SSLSockets."/>
+ <c:simple-property name="client-alias" required="false" type="string" readOnly="true" description="Preferred alias to use when the KeyManager chooses the client alias."/>
+ <c:simple-property name="client-auth" required="false" type="boolean" readOnly="true" description="Boolean attribute to indicate if client's certificates should also be authenticated on the server side."/>
+ <c:map-property name="key-manager" required="false" description="JSEE Key Manager factory">
+ <c:simple-property name="algorithm" required="false" type="string" readOnly="true" description="Algorithm to use when creating the KeyManagerFactory."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="true" description="Provider class name to use when creating the KeyManagerFactory."/>
+ </c:map-property>
+ <c:map-property name="keystore" required="false" description="Configures a JSSE key store">
+ <c:simple-property name="password" required="false" type="string" readOnly="true" description="Sets the password of the keystore. Either this or 'truststore-password' must be present otherwise the security domain will be useless."/>
+ <c:simple-property name="type" required="false" type="string" readOnly="true" description="Type of the keystore. If not set, type defaults to 'JKS'."/>
+ <c:simple-property name="url" required="false" type="string" readOnly="true" description="URL of the keystore."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="true" description="Provider class name to use when creating the KeyStore."/>
+ <c:simple-property name="provider-argument" required="false" type="string" readOnly="true" description="String argument to pass to the keystore Provider constructor when instantiating it."/>
+ </c:map-property>
+ <c:simple-property name="protocols" required="false" type="string" readOnly="true" description="Comma separated list of protocols to enable on SSLSockets."/>
+ <c:simple-property name="server-alias" required="false" type="string" readOnly="true" description="Preferred alias to use when the KeyManager chooses the server alias."/>
+ <c:simple-property name="service-auth-token" required="false" type="string" readOnly="true" description="Token to retrieve PrivateKeys from the KeyStore."/>
+ <c:map-property name="trust-manager" required="false" description="JSEE Trust Manager factory">
+ <c:simple-property name="algorithm" required="false" type="string" readOnly="true" description="Algorithm to use when creating the TrustManagerFactory."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="true" description="Provider class name to use when creating the TrustManagerFactory."/>
+ </c:map-property>
+ <c:map-property name="truststore" required="false" description="Configures a JSSE trust store">
+ <c:simple-property name="password" required="false" type="string" readOnly="true" description="Sets the password of the truststore. Either this or 'keystore-password' must be present otherwise the security domain will be useless."/>
+ <c:simple-property name="type" required="false" type="string" readOnly="true" description="Type of the truststore. If not set, type defaults to 'JKS'."/>
+ <c:simple-property name="url" required="false" type="string" readOnly="true" description="URL of the truststore."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="true" description="Provider class name to use when creating the truststore."/>
+ <c:simple-property name="provider-argument" required="false" type="string" readOnly="true" description="String argument to pass to the truststore Provider constructor when instantiating it."/>
+ </c:map-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Mapping (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="mapping=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="mapping-modules" required="false" description="List of modules that map principal, role, and credential information">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="true" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="type" required="true" type="string" readOnly="true" description="Type of mapping this module performs. Allowed values are principal, role, attribute or credential.."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="true" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Vault (Managed Server)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="vault=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="code" required="false" type="string" readOnly="true" description="Fully Qualified Name of the Security Vault Implementation."/>
+ </resource-configuration>
+ </service>
+ </service>
+
+ </server>
+
+
+ <service name="Profile"
+ description="A profile in a domain. Profiles are assigned to server groups."
+ discovery="SubsystemDiscovery"
+ class="BaseComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="path" default="profile" readOnly="true"/>
+ </plugin-configuration>
+
+ <!-- Necessary to duplicate the ModCluster component for Standalone and Domain because supported operations
+ list is different. Update similar Standalone service if changes are necessary. -->
+ <service name="ModCluster Domain Service"
+ class="ModClusterComponent"
+ discovery="ModClusterDiscoveryComponent"
+ description="Mod_cluster support"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" default="subsystem=modcluster" readOnly="true"/>
+ </plugin-configuration>
+
+ <service name="Domain Service Configuration"
+ discovery="SubsystemDiscovery"
+ class="ModClusterComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="mod-cluster-config=configuration"/>
+ </plugin-configuration>
+
+ &modclusterSharedOpsConfig;
+
+ <service name="Domain Dynamic Load Provider"
+ discovery="SubsystemDiscovery"
+ createDeletePolicy="delete-only"
+ class="BaseComponent">
+
+ <runs-inside>
+ <parent-resource-type name="Service Configuration" plugin="&pluginName;"/>
+ <parent-resource-type name="ModCluster Service Configuration" plugin="&pluginName;"/>
+ </runs-inside>
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="dynamic-load-provider=configuration"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="decay" required="false" type="integer" readOnly="false" defaultValue="2" description="Decay. The default value is 2."/>
+ <c:simple-property name="history" required="false" type="integer" readOnly="false" defaultValue="9" description="History. The default value is 9."/>
+ </resource-configuration>
+
+ <service name="Domain Custom Load Metric"
+ discovery="SubsystemDiscovery"
+ createDeletePolicy="delete-only"
+ class="BaseComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="custom-load-metric"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="capacity" required="false" type="integer" readOnly="false" defaultValue="1" description="Capacity of the metric. The default value is 1"/>
+ <c:simple-property name="class" required="true" type="string" readOnly="false" description="Class name of the custom metric."/>
+ <c:simple-property name="weight" required="false" type="integer" readOnly="false" defaultValue="1" description="Weight of the metric. The default value is 1."/>
+ </resource-configuration>
+ </service><!-- End of custom-load-metric service -->
+
+ <service name="Domain Load Metric"
+ discovery="SubsystemDiscovery"
+ createDeletePolicy="delete-only"
+ class="BaseComponent">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="load-metric"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="capacity" required="false" type="integer" readOnly="false" defaultValue="1" description="Capacity of the metric. The default value is 1."/>
+ <c:simple-property name="type" required="true" type="string" defaultValue="busyness" readOnly="false" description="Type of the metric">
+ <c:property-options>
+ <c:option value="busyness"/>
+ <c:option value="cpu" />
+ <c:option value="heap"/>
+ <c:option value="mem"/>
+ <c:option value="requests"/>
+ <c:option value="receive-traffic"/>
+ <c:option value="send-traffic"/>
+ <c:option value="sessions"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="weight" required="false" type="integer" readOnly="false" defaultValue="1" description="Weight of the metric. The default value is 1."/>
+ </resource-configuration>
+ </service><!-- End of load-metric service -->
+ </service><!-- End of dynamic-load-provider service -->
+
+ <service name="Domain Ssl"
+ discovery="SubsystemDiscovery"
+ createDeletePolicy="both"
+ class="BaseComponent">
+
+ <runs-inside>
+ <parent-resource-type name="ModCluster Standalone Service" plugin="&pluginName;"/>
+ <parent-resource-type name="ModCluster Domain Service" plugin="&pluginName;"/>
+ </runs-inside>
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="ssl=configuration"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="ca-certificate-file" required="false" type="string" readOnly="false" description="Certificate authority."/>
+ <c:simple-property name="ca-revocation-ur" required="false" type="string" readOnly="false" description="Certificate authority revocation list."/>
+ <c:simple-property name="certificate-key-file" required="false" type="string" readOnly="false" defaultValue="${user.home}/.keystore" description="Key file for the certificate."/>
+ <c:simple-property name="cipher-suite" required="false" type="string" readOnly="false" description="The allowed cipher suite."/>
+ <c:simple-property name="key-alias" required="false" type="string" readOnly="false" description="The key alias."/>
+ <c:simple-property name="password" required="false" type="string" readOnly="false" defaultValue="changeit" description="Password."/>
+ <c:simple-property name="protocol" required="false" type="string" readOnly="false" defaultValue="TLS" description="The SSL protocols that are enabled."/>
+ </resource-configuration>
+ </service><!-- End of ssl service -->
+ </service><!-- End of Domain Modcluster Service Configuration -->
+ </service>
+
+ <service name="Naming (Profile)"
+ discovery="SubsystemDiscovery"
+ class="NamingComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=naming"/>
+ </plugin-configuration>
+
+ <service name="Binding (Profile)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="JNDI bindings for primitive types"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="binding"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="binding-type" required="true" type="string" readOnly="false" description="The type of binding to create, may be simple, lookup or object-factory">
+ <c:property-options>
+ <c:option value="simple"/>
+ <c:option value="lookup"/>
+ <c:option value="object-factory"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="class" required="false" type="string" readOnly="false" description="The object factory class name for object factory bindings"/>
+ <c:simple-property name="lookup" required="false" type="string" readOnly="false" description="The entry to lookup in JNDI for lookup bindings"/>
+ <c:simple-property name="module" required="false" type="string" readOnly="false" description="The module to load the object factory from for object factory bindings"/>
+ <c:simple-property name="type" required="false" type="string" readOnly="false" description="The type of the value to bind for simple bindings, this must be a primitive type"/>
+ <c:simple-property name="value" required="false" type="string" readOnly="false" description="The value to bind for simple bindings"/>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="JBossWeb (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=web"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="default-virtual-server" required="true" type="string" readOnly="false" defaultValue="default-host" description="The web container's default virtual server. The default value is default-host.">
+ <c:option-source target="resource" expression="type=VHost plugin=&pluginName;"/>
+ </c:simple-property>
+ <c:simple-property name="instance-id" readOnly="true" required="false" type="string" description="The identifier for this server instance."/>
+ <c:simple-property name="native" required="false" type="boolean" readOnly="true" defaultValue="true" description="Add the native initialization listener to the web container. The default value is true."/>
+
+ <c:group name="child:configuration=static-resources" displayName="Static Resources">
+ <c:simple-property name="disabled:0" required="false" type="boolean" defaultValue="false" description="Enable the default Servlet mapping. The default value is false."/>
+ <c:simple-property name="file-encoding" required="false" description="Force a file encoding." type="string"/>
+ <c:simple-property name="listings" required="false" type="boolean" defaultValue="false" description="Enable folder listings. The default value is false."/>
+ <c:simple-property name="max-depth" required="false" type="integer" defaultValue="3" description="Maximum recursion for PROPFIND. The default value is 3."/>
+ <c:simple-property name="read-only" required="false" type="boolean" defaultValue="true" description="Allow write HTTP methods (PUT, DELETE). The default value is true."/>
+ <c:simple-property name="sendfile" required="false" type="integer" defaultValue="49152" description="Enable sendfile if possible, for files bigger than the specified byte size. The default value is 49152."/>
+ <c:simple-property name="secret" required="false" type="string" readOnly="true" description="Secret for WebDAV locking operations."/>
+ <c:simple-property name="webdav" required="false" type="boolean" defaultValue="false" description="Enable WebDAV functionality. The default value is false."/>
+ </c:group>
+ <c:group name="child:configuration=jsp-configuration" displayName="JSP Configuration">
+ <c:simple-property name="check-interval" required="false" type="integer" readOnly="false" defaultValue="0" description="Check interval for JSP updates using a background thread. The default value is 0."/>
+ <c:simple-property name="development" required="false" type="boolean" readOnly="false" defaultValue="false" description="Enable the development mode, which gives more information when an error occurs. The default value is false."/>
+ <c:simple-property name="disabled:1" required="false" type="boolean" readOnly="false" defaultValue="false" description="Enable the JSP container. The default value is false."/>
+ <c:simple-property name="display-source-fragment" required="false" type="boolean" readOnly="false" defaultValue="true" description="When a runtime error occurs, attempts to display corresponding JSP source fragment. The default value is true."/>
+ <c:simple-property name="dump-smap" required="false" type="boolean" readOnly="false" defaultValue="false" description="Write SMAP data to a file. The default value is false."/>
+ <c:simple-property name="error-on-use-bean-invalid-class-attribute" required="false" type="boolean" readOnly="false" defaultValue="false" description="Enable errors when using a bad class in useBean. The default value is false."/>
+ <c:simple-property name="generate-strings-as-char-arrays" required="false" type="boolean" readOnly="false" defaultValue="false" description="Generate String constants as char arrays. The default value is false."/>
+ <c:simple-property name="java-encoding" required="false" type="string" readOnly="false" defaultValue="UTF8" description="Specify the encoding used for Java sources. The default value is UTF8."/>
+ <c:simple-property name="keep-generated" required="false" type="boolean" readOnly="false" defaultValue="true" description="Keep the generated Servlets. The default value is true."/>
+ <c:simple-property name="mapped-file" required="false" type="boolean" readOnly="false" defaultValue="true" description="Map to the JSP source. The default value is true."/>
+ <c:simple-property name="modification-test-interval" required="false" type="integer" readOnly="false" defaultValue="4" description="Minimum amount of time between two tests for updates, in seconds. The default value is 4."/>
+ <c:simple-property name="recompile-on-fail" required="false" type="boolean" readOnly="false" defaultValue="false" description="Retry failed JSP compilations on each request. The default value is false."/>
+ <c:simple-property name="scratch-dir" required="false" type="string" readOnly="false" description="Specify a different work directory."/>
+ <c:simple-property name="smap" required="false" type="boolean" readOnly="false" defaultValue="true" description="Enable SMAP. The default value is true."/>
+ <c:simple-property name="source-vm" required="false" type="string" readOnly="false" defaultValue="1.5" description="Source VM level for compilation. The default value is 1.5."/>
+ <c:simple-property name="tag-pooling" required="false" type="boolean" readOnly="false" defaultValue="true" description="Enable tag pooling. The default value is true."/>
+ <c:simple-property name="target-vm" required="false" type="string" readOnly="false" defaultValue="1.5" description="Target VM level for compilation. The default value is 1.5."/>
+ <c:simple-property name="trim-spaces" required="false" type="boolean" readOnly="false" defaultValue="false" description="Trim some spaces from the generated Servlet. The default value is false."/>
+ <c:simple-property name="x-powered-by" required="false" type="boolean" readOnly="false" defaultValue="true" description="Enable advertising the JSP engine in x-powered-by. The default value is true."/>
+ </c:group>
+ <c:group name="child:configuration=container" displayName="Container">
+ <!-- Commented out - see https://bugzilla.redhat.com/show_bug.cgi?id=815288
+ <c:list-property name="mime-mapping" description="A mime-mapping definition." required="false">
+ <c:map-property name="mime-mapping:collapsed">
+ <c:simple-property name="name:0" displayName="Name" description="A MIME mapping name without the dot (e.g. 'txt')"/>
+ <c:simple-property name="value:1" displayName="Value" description="A MIME mapping value (e.g. 'text/plain' )"/>
+ </c:map-property>
+ </c:list-property>
+ -->
+ <c:list-property name="welcome-file" required="false" description="A welcome file declaration.">
+ <c:simple-property name="welcome-file" type="string"/>
+ </c:list-property>
+ </c:group>
+ </resource-configuration>
+
+ <service name="Connector (Profile)"
+ discovery="SubsystemDiscovery"
+ class="WebConnectorComponent"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="connector"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="scheme" required="true" type="string" readOnly="false" description="The web connector scheme.">
+ <c:property-options>
+ <c:option value="http"/>
+ <c:option value="https"/>
+ <c:option value="ajp"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="socket-binding" required="true" type="string" description="The web connector socket-binding reference, this connector should be bound to.">
+ <c:option-source target="configuration" expression="*/socket-binding=name:type=SocketBindingGroup"/>
+ </c:simple-property>
+ <c:simple-property name="enabled" required="false" type="boolean" readOnly="false" defaultValue="true" description="Defines whether the connector should be started on startup. The default value is true."/>
+ <c:simple-property name="enable-lookups" required="false" type="boolean" readOnly="false" defaultValue="false" description="Enable DNS lookups for Servlet API. The default value is false."/>
+ <c:simple-property name="executor" required="false" type="string" readOnly="false" description="The name of the executor that should be used for the processing threads of this connector. If undefined defaults to using an internal pool."/>
+ <c:simple-property name="max-connections" required="false" type="integer" readOnly="false" description="Amount of concurrent connections that can be processed by the connector with optimum performance. The default value depends on the connector used and the number of cpu cores (512*cores for HTTP, 32*cores for AJP)."/>
+ <c:simple-property name="max-post-size" required="false" type="integer" readOnly="false" defaultValue="2097152" description="Maximum size in bytes of a POST request that can be parsed by the container. The default value is 2097152."/>
+ <c:simple-property name="max-save-post-size" required="false" type="integer" readOnly="false" defaultValue="4096" description="Maximum size in bytes of a POST request that will be saved during certain authentication schemes. The default value is 4096."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="A unique name for the connector."/>
+ <c:simple-property name="protocol" required="true" type="string" readOnly="false" default="HTTP/1.1" defaultValue="HTTP/1.1"
+ description="The web connector protocol. (e.g. 'HTTP/1.1' or 'AJP' or a name of a class implementing ProtocolHandler and MBeanRegistration )">
+ <!-- TODO let the user could enter a custom value here when the UI supports this. -->
+ <c:property-options>
+ <c:option value="HTTP/1.1"/>
+ <c:option value="AJP/1.3"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="proxy-name" required="false" type="string" readOnly="false" description="The host name that will be used when sending a redirect. The default value is null."/>
+ <c:simple-property name="proxy-port" required="false" type="integer" readOnly="false" description="The port that will be used when sending a redirect."/>
+ <c:simple-property name="redirect-port" required="false" type="integer" readOnly="false" defaultValue="8433" description="The port for redirection to a secure connector. The default value is 8433."/>
+ <c:simple-property name="secure" required="false" type="boolean" readOnly="false" defaultValue="false" description="Indicates if content sent or received by the connector is secured from the user perspective. The default value is false."/>
+ <c:simple-property name="virtual-server" required="false" type="string" readOnly="false" description="The list of virtual servers that can be accessed through this connector. The default is to allow all virtual servers."/>
+
+ <c:group name="child:ssl=configuration:enabled=secure=true" displayName="SSL Configuration">
+ <c:map-property name="*Configuration+" displayName="Configuration" readOnly="false" required="false">
+ <c:simple-property name="ca-certificate-file" required="false" type="string" readOnly="false" description="Certificate authority."/>
+ <c:simple-property name="ca-certificate-password" required="false" type="string" readOnly="false" description="Certificate password."/>
+ <c:simple-property name="ca-revocation-url" required="false" type="string" readOnly="false" description="Certificate authority revocation list."/>
+ <c:simple-property name="certificate-file" required="false" type="string" readOnly="false" description="Server certificate file. If the value is not given, ~/.keystore is the default"/>
+ <c:simple-property name="certificate-key-file" required="false" type="string" readOnly="false" description="Key file for the certificate."/>
+ <c:simple-property name="cipher-suite" required="false" type="string" readOnly="false" description="The allowed cipher suite."/>
+ <c:simple-property name="key-alias" required="false" type="string" readOnly="false" description="The key alias."/>
+ <c:simple-property name="keystore-type" required="false" type="string" readOnly="false" description="Type of the keystore, There are various types of keystores available, including 'PKCS12' and Sun's 'JKS.'"/>
+ <c:simple-property name="name" required="false" type="string" readOnly="false" description="The configuration name."/>
+ <c:simple-property name="password" required="false" type="string" readOnly="false" description="Password."/>
+ <c:simple-property name="protocol" required="false" type="string" readOnly="false" description="The SSL protocols that are enabled." default="ALL" defaultValue="ALL">
+ <c:property-options>
+ <c:option value="SSLv2"/>
+ <c:option value="SSLv3"/>
+ <c:option value="TLSv1"/>
+ <c:option value="SSLv2+SSLv3"/>
+ <c:option value="ALL"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="session-cache-size" required="false" type="integer" readOnly="false" description="SSL session cache."/>
+ <c:simple-property name="session-timeout" required="false" type="integer" readOnly="false" description="SSL session cache timeout."/>
+ <c:simple-property name="truststore-type" required="false" type="string" readOnly="false" description="Type of the truststore, There are various types of keystores available, including 'PKCS12' and Sun's 'JKS.'"/>
+ <c:simple-property name="verify-client" required="false" type="string" readOnly="false" description="Enable client certificate verification."/>
+ <c:simple-property name="verify-depth" required="false" type="integer" readOnly="false" description="Limit certificate nesting."/>
+ </c:map-property>
+ </c:group>
+ </resource-configuration>
+ </service>
+
+ <service name="VHost (Profile)"
+ discovery="SubsystemDiscovery"
+ class="VHostComponent"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="virtual-server"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="alias" description="The virtual server aliases" displayName="Virtual server aliases">
+ <c:simple-property name="alias"/>
+ </c:list-property>
+ <c:simple-property name="default-web-module" type="string" defaultValue="ROOT.war" description="The web module deployment name that will be mapped as the root webapp."/>
+ <c:simple-property name="enable-welcome-root" type="boolean" defaultValue="false" description="Whether or not the bundled welcome directory is used as the root web context. The default value is false."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="A unique virtual host name"/>
+
+ <c:group name="child:sso=configuration" displayName="The SSO configuration for this virtual server.">
+ <c:map-property name="*Configuration+" displayName="Configuration" readOnly="false" required="false">
+ <c:simple-property name="cache-container" required="false" type="string" readOnly="false" description="Enables clustered SSO using the specified clustered cache container.">
+ <c:option-source target="resource" expression="type='Cache Container' plugin=&pluginName;"/>
+ </c:simple-property>
+ <c:simple-property name="cache-name" required="false" type="string" readOnly="false" description="Name of the cache to use in the cache container."/>
+ <c:simple-property name="domain" required="false" type="string" readOnly="false" description="The cookie domain that will be used."/>
+ <c:simple-property name="reauthenticate" required="false" type="boolean" readOnly="false" description="Enables reauthentication with the realm when using SSO."/>
+ </c:map-property>
+ </c:group>
+ </resource-configuration>
+
+ <service name="Rewrite Rules (Profile)"
+ discovery="SubsystemDiscovery"
+ description="A list of rewrite rules that will be processed in order on the URL or vhost specified in the request. Those follow the rules for mod_rewrite. Please consult the manual for help on settings"
+ class="BaseComponent"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="rewrite"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="flags" required="true" type="string" readOnly="false" description="Option flags for this rewrite rule. Consult the mod_rewrite docs."/>
+ <c:simple-property name="pattern" required="true" type="string" readOnly="false" description="The pattern that will be matched. Consult the mod_rewrite docs."/>
+ <c:simple-property name="substitution" required="true" type="string" readOnly="false" description="The string that will replace the original URL or vhost. Consult the mod_rewrite docs."/>
+ <!-- embedded condition children - commented out for the moment -->
+ <c:group name="children:condition:name+" displayName="Rewrite conditions">
+ <c:list-property name="*1" displayName="Conditions" required="false" readOnly="true">
+ <c:map-property name="*:name" displayName="Name" readOnly="true">
+ <c:simple-property name="name" required="true" readOnly="true" displayName="Condition-Name"/>
+ <c:simple-property name="flags" required="true" type="string" readOnly="true" description="Option flags for this condition. Consult the mod_rewrite docs."/>
+ <c:simple-property name="pattern" required="true" type="string" readOnly="true" description="The pattern to match. Consult the mod_rewrite docs."/>
+ <c:simple-property name="test" required="true" type="string" readOnly="true" description="Test pattern for the condition. Consult the mod_rewrite docs."/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ </resource-configuration>
+ </service>
+
+ <service name="Access Log (Profile)"
+ discovery="SubsystemDiscovery"
+ description="The access log configuration for this virtual server."
+ class="BaseComponent"
+ singleton="true"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="access-log=configuration"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="extended" required="false" type="boolean" readOnly="false" defaultValue="false" description="Enable extended pattern, with more options. The default value is false."/>
+ <c:simple-property name="pattern" required="false" type="string" readOnly="false" defaultValue="common" description="The access log pattern. The default value is common."/>
+ <c:simple-property name="prefix" required="false" type="string" readOnly="false" defaultValue="false" description="Prefix for the log file name. The default value is false."/>
+ <c:simple-property name="resolve-hosts" required="false" type="boolean" readOnly="false" defaultValue="false" description="Host resolution. The default value is false."/>
+ <c:simple-property name="rotate" required="false" type="boolean" readOnly="false" defaultValue="true" description="Rotate the access log every day. The default value is true."/>
+
+ <c:group name="child:directory=configuration" displayName="The location for the access logging.">
+ <c:simple-property name="path" required="false" type="string" readOnly="false" description="The relative folder path."/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="false" defaultValue="jboss.server.log.dir" description="The folder the path is relative to. The default value is jboss.server.log.dir."/>
+ </c:group>
+ </resource-configuration>
+ </service>
+ </service>
+ </service>
+
+ <service name="JCA (Profile)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="The Java EE Connector Architecture (JCA) subsystem providing general configuration for resource adapters"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" default="subsystem=jca" readOnly="true"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:group name="child:bean-validation=bean-validation" displayName="Bean validation (JSR-303) for resource adapters.">
+ <c:simple-property name="enabled:1" required="false" type="boolean" readOnly="false" defaultValue="true" displayName="Enabled" description="Specify whether bean validation is enabled. The default value is true."/>
+ </c:group>
+ <c:group name="child:archive-validation=archive-validation" displayName="Archive validation for resource adapters.">
+ <c:simple-property name="enabled:2" required="false" type="boolean" readOnly="false" defaultValue="true" displayName="Enabled" description="Specify whether archive validation is enabled. The default value is true."/>
+ <c:simple-property name="fail-on-error" required="false" type="boolean" readOnly="false" defaultValue="true" description="Should an archive validation error report fail the deployment. The default value is true."/>
+ <c:simple-property name="fail-on-warn" required="false" type="boolean" readOnly="false" defaultValue="false" description="Should an archive validation warning report fail the deployment. The default value is false."/>
+ </c:group>
+ <c:group name="child:cached-connection-manager=cached-connection-manager" displayName="Cached connection manager for resource adapters.">
+ <c:simple-property name="debug" required="false" type="boolean" readOnly="false" defaultValue="false" description="Enable/disable debug information logging. The default value is false."/>
+ <c:simple-property name="error" required="false" type="boolean" readOnly="false" defaultValue="false" description="Enable/disable error information logging. The default value is false."/>
+ <c:simple-property name="install" required="false" type="boolean" readOnly="false" defaultValue="false" description="Enable/disable the cached connection manager valve and interceptor. The default value is false."/>
+ </c:group>
+ </resource-configuration>
+
+ <service name="BootstrapContext (Profile)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="Bootstrap context for resource adapters."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="bootstrap-context"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="name" required="false" type="string" readOnly="false" description="The name of the BootstrapContext"/>
+ <c:simple-property name="workmanager" required="false" type="string" readOnly="false" description="The WorkManager instance for the BootstrapContext">
+ <c:option-source target="resource" expression="type=Workmanager plugin=&pluginName;"/>
+ </c:simple-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Workmanager (Profile)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="WorkManager for resource adapters."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="workmanager"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="name" required="false" type="string" readOnly="false" description="The name of the WorkManager"/>
+ </resource-configuration>
+
+ <service name="Long Running Thread Pool (Profile)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="Long running thread pool executor with a bounded queue where threads submitting tasks may block."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="long-running-threads"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="allow-core-timeout" required="false" type="boolean" readOnly="false" defaultValue="false" displayName="Allow Core Timeout" description="Whether core threads may time out. The default value is false."/>
+ <c:simple-property name="core-threads:expr" required="false" type="integer" readOnly="false" displayName="Core Threads" description="The core thread pool size which is smaller than the maximum pool size. If undefined, the core thread pool size is the same as the maximum thread pool size."/>
+ <c:map-property name="keepalive-time" required="true" displayName="Keepalive Time" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down.">
+ <c:simple-property name="time" required="true" type="long" readOnly="false" description="The time"/>
+ <c:simple-property name="unit" required="true" type="string" readOnly="false" description="The time unit"/>
+ </c:map-property>
+ <c:simple-property name="max-threads:expr" required="true" type="integer" readOnly="false" displayName="Max Threads" description="The maximum thread pool size."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" displayName="Name" description="The name of the thread pool."/>
+ <c:simple-property name="queue-length:expr" required="true" type="integer" readOnly="false" displayName="Queue Length" description="The queue length."/>
+ <c:simple-property name="thread-factory" required="false" type="string" readOnly="false" displayName="Thread Factory" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/>
+ </resource-configuration>
+ </service>
+
+ <service name="Short Running Thread Pool (Profile)"
+ class="BaseComponent"
+ discovery="SubsystemDiscovery"
+ description="Short running thread pool executor with a bounded queue where threads submitting tasks may block."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="short-running-threads"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="allow-core-timeout" required="false" type="boolean" readOnly="false" defaultValue="false" displayName="Allow Core Timeout" description="Whether core threads may time out. The default value is false."/>
+ <c:simple-property name="core-threads:expr" required="false" type="integer" readOnly="false" displayName="Core Threads" description="The core thread pool size which is smaller than the maximum pool size. If undefined, the core thread pool size is the same as the maximum thread pool size."/>
+ <c:map-property name="keepalive-time" required="true" displayName="Keepalive Time" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down.">
+ <c:simple-property name="time" required="true" type="long" readOnly="false" description="The time"/>
+ <c:simple-property name="unit" required="true" type="string" readOnly="false" description="The time unit"/>
+ </c:map-property>
+ <c:simple-property name="max-threads:expr" required="true" type="integer" readOnly="false" displayName="Max Threads" description="The maximum thread pool size."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" displayName="Name" description="The name of the thread pool."/>
+ <c:simple-property name="queue-length:expr" required="true" type="integer" readOnly="false" displayName="Queue Length" description="The queue length."/>
+ <c:simple-property name="thread-factory" required="false" type="string" readOnly="false" displayName="Thread Factory" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/>
+ </resource-configuration>
+ </service>
+ </service>
+ </service>
+
+ <service name="Osgi (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The OSGi subsystem configuration."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=osgi"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="activation" required="false" type="string" readOnly="false" defaultValue="LAZY" description="Activation flag for the OSGi subsystem. Possible values: lazy, eager. The default value is LAZY."/>
+ <c:simple-property name="startlevel" required="false" type="integer" readOnly="true" description="The current Start Level of the OSGi Framework. Changing this value will change the Start Level of the Framework accordingly."/>
+ </resource-configuration>
+
+ <service name="Capability (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="capability"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="startlevel" required="false" type="integer" readOnly="true" description="The startlevel for the capability. Can only be specified for OSGi bundles."/>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Resource Adapters (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Configuration of the resource adapters subsystem."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=resource-adapters"/>
+ </plugin-configuration>
+
+ <service name="Resource Adapter (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The configuration of a resource adapter."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="resource-adapter"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="archive" required="true" type="string" readOnly="false" description="Specifies the resource adapter archive"/>
+ <c:simple-property name="beanvalidationgroups" required="false" type="string" readOnly="false" description="Specifies the bean validation groups that should be used"/>
+ <c:simple-property name="bootstrapcontext" required="false" type="string" readOnly="false" description="Specifies the unique name of the bootstrap context that should be used"/>
+ <c:simple-property name="transaction-support" required="true" type="string" readOnly="false" description="Specifies the transaction support level of the resource adapter">
+ <c:property-options>
+ <c:option value="LocalTransaction"/>
+ <c:option value="XATransaction"/>
+ <c:option value="NoTransaction"/>
+ </c:property-options>
+ </c:simple-property>
+ </resource-configuration>
+
+ <service name="Admin Objects (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Specifies the administration objects."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="admin-objects"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="class-name" required="true" type="string" readOnly="false" description="Specifies the fully qualified class name of a managed connection factory or admin object"/>
+ <c:simple-property name="enabled" required="false" type="boolean" readOnly="false" defaultValue="true" description="Specifies if the resource adapter should be enabled. The default value is true."/>
+ <c:simple-property name="jndi-name" required="false" type="string" readOnly="false" description="Specifies the JNDI name for the connection factory or admin object"/>
+ <c:simple-property name="use-java-context" required="false" type="boolean" readOnly="false" defaultValue="true" description="Setting this to false will bind the object into global JNDI. The default value is true."/>
+ </resource-configuration>
+ </service>
+
+ <service name="Connection Definitions (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Specifies the connection definitions."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="connection-definitions"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="allocation-retry:expr" required="false" type="long" readOnly="false" displayName="Allocation Retry" description="The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception"/>
+ <c:simple-property name="allocation-retry-wait-millis:expr" required="false" type="long" readOnly="false" displayName="Allocation Retry Wait Millis" description="The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection"/>
+ <c:simple-property name="background-validation" required="false" type="boolean" readOnly="false" defaultValue="false" description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value requires a server restart. The default value is false."/>
+ <c:simple-property name="background-validation-millis:expr" required="false" type="integer" readOnly="false" displayName="Background Validation Millis" description="The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value requires a server restart"/>
+ <c:simple-property name="blocking-timeout-wait-millis:expr" required="false" type="long" readOnly="false" displayName="Blocking Timeout Wait Millis" description="The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time"/>
+ <c:simple-property name="class-name" required="true" type="string" readOnly="false" description="Specifies the fully qualified class name of a managed connection factory or admin object"/>
+ <c:simple-property name="enabled" required="false" type="boolean" readOnly="false" defaultValue="true" description="Specifies if the resource adapter should be enabled. The default value is true."/>
+ <c:simple-property name="flush-strategy" required="false" type="string" readOnly="true"
+ description="Specifies how the pool should be flush in case of an error." default="FailingConnectionOnly" defaultValue="FailingConnectionOnly">
+ <c:property-options>
+ <c:option value="FailingConnectionOnly"/>
+ <c:option value="IdleConnections"/>
+ <c:option value="EntirePool"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="idle-timeout-minutes:expr" required="false" type="long" readOnly="false" displayName="Idle Timeout Minutes" description="The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value requires a server restart."/>
+ <c:simple-property name="interleaving" required="false" type="boolean" readOnly="false" defaultValue="false" description="An element to enable interleaving for XA connections. The default value is false."/>
+ <c:simple-property name="jndi-name" required="false" type="string" readOnly="false" description="Specifies the JNDI name for the connection factory or admin object"/>
+ <c:simple-property name="max-pool-size:expr" required="false" type="integer" readOnly="false" defaultValue="20" displayName="Max Pool Size" description="The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool. The default value is 20."/>
+ <c:simple-property name="min-pool-size:expr" required="false" type="integer" readOnly="false" defaultValue="0" displayName="Min Pool Size" description="The min-pool-size element specifies the minimum number of connections for a pool. The default value is 0."/>
+ <c:simple-property name="no-recovery" required="false" type="boolean" readOnly="false" description="Specifies if the connection pool should be excluded from recovery"/>
+ <c:simple-property name="no-tx-separate-pool" required="false" type="boolean" readOnly="false" defaultValue="false" description="Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts. The default value is false."/>
+ <c:simple-property name="pad-xid" required="false" type="boolean" readOnly="false" defaultValue="false" description="Should the Xid be padded. The default value is false."/>
+ <c:simple-property name="pool-prefill" required="false" type="boolean" readOnly="false" defaultValue="false" description="Should the pool be prefilled. Changing this value requires a server restart. The default value is false."/>
+ <c:simple-property name="pool-use-strict-min" required="false" type="boolean" readOnly="false" defaultValue="false" description="Specifies if the min-pool-size should be considered strictly. The default value is false."/>
+ <c:simple-property name="recovery-password" required="false" type="string" readOnly="false" description="The password used for recovery"/>
+ <c:simple-property name="recovery-plugin-class-name" required="false" type="string" readOnly="false" description="The fully qualified class name of the recovery plugin implementation"/>
+ <c:map-property name="recovery-plugin-properties" required="false" displayName="Recovery Plugin Properties" description="The properties for the recovery plugin">
+ <c:simple-property name="recovery-plugin-properties" required="false" type="string" readOnly="false" displayName="Recovery Plugin Property"/>
+ </c:map-property>
+ <c:simple-property name="recovery-security-domain" required="false" type="string" readOnly="false" description="The security domain used for recovery"/>
+ <c:simple-property name="recovery-username" required="false" type="string" readOnly="false" description="The user name used for recovery"/>
+ <c:simple-property name="same-rm-override" required="false" type="boolean" readOnly="false" description="The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false"/>
+ <c:simple-property name="security-application" required="false" type="boolean" readOnly="false" description="Indicates that app supplied parameters (such as from getConnection(user, pw)) are used to distinguish connections in the pool"/>
+ <c:simple-property name="security-domain" required="false" type="string" readOnly="false" description="Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool"/>
+ <c:simple-property name="security-domain-and-application" required="false" type="string" readOnly="false" description="Indicates that either app supplied parameters (such as from getConnection(user, pw)) or Subject (from security domain) are used to distinguish connections in the pool"/>
+ <c:simple-property name="use-ccm" required="false" type="boolean" readOnly="false" defaultValue="true" description="Enable the use of a cached connection manager. The default value is true."/>
+ <c:simple-property name="use-fast-fail" required="false" type="boolean" readOnly="false" defaultValue="false" description="Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false). The default value is false."/>
+ <c:simple-property name="use-java-context" required="false" type="boolean" readOnly="false" defaultValue="true" description="Setting this to false will bind the object into global JNDI. The default value is true."/>
+ <c:simple-property name="use-try-lock:expr" required="false" type="long" readOnly="false" displayName="Use Try Lock" description="Any configured timeout for internal locks on the resource adapter objects in seconds"/>
+ <c:simple-property name="wrap-xa-resource" required="false" type="boolean" readOnly="false" defaultValue="true" description="Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance. The default value is true."/>
+ <c:simple-property name="xa-resource-timeout:expr" required="false" type="integer" readOnly="false" displayName="XA Resource Timeout" description="The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero"/>
+ </resource-configuration>
+ </service>
+ </service>
+ </service>
+
+ <service name="EJB3 (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The configuration of the ejb3 subsystem."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=ejb3"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="default-clustered-sfsb-cache" required="false" type="string" readOnly="false" description="Name of the default stateful bean cache, which will be applicable to all clustered stateful EJBs, unless overridden at the deployment or bean level"/>
+ <c:simple-property name="default-entity-bean-instance-pool" required="false" type="string" readOnly="false" description="Name of the default entity bean instance pool, which will be applicable to all entity beans, unless overridden at the deployment or bean level"/>
+ <c:simple-property name="default-entity-bean-optimistic-locking" required="false" type="boolean" readOnly="false" description="If set to true entity beans will use optimistic locking by default"/>
+ <c:simple-property name="default-mdb-instance-pool" required="false" type="string" readOnly="false" description="Name of the default MDB instance pool, which will be applicable to all MDBs, unless overridden at the deployment or bean level"/>
+ <c:simple-property name="default-resource-adapter-name" required="false" type="string" readOnly="false" defaultValue="hornetq-ra" description="Name of the default resource adapter name that will be used by MDBs, unless overridden at the deployment or bean level. The default value is hornetq-ra."/>
+ <c:simple-property name="default-sfsb-cache" required="false" type="string" readOnly="false" description="Name of the default stateful bean cache, which will be applicable to all stateful EJBs, unless overridden at the deployment or bean level"/>
+ <c:simple-property name="default-singleton-bean-access-timeout:expr" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for singleton beans. The default value is 5000."/>
+ <c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="false" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/>
+ <c:simple-property name="default-stateful-bean-access-timeout:expr" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/>
+ <c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="false" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/>
+ </resource-configuration>
+
+ <service name="EJB3 Thread Pool (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A thread pool executor with an unbounded queue. Such a thread pool has a core size and a queue with no upper bound. When a task is submitted, if the number of running threads is less than the core size, a new thread is created. Otherwise, the task is placed in queue. If too many tasks are allowed to be submitted to this type of executor, an out of memory condition may occur."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="thread-pool"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:map-property name="keepalive-time" readOnly="false" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down.">
+ <c:simple-property name="time" required="true" type="long" readOnly="false" description="The time"/>
+ <c:simple-property name="unit" required="true" type="string" readOnly="false" description="The time unit"/>
+ </c:map-property>
+ <c:simple-property name="max-threads:expr" required="false" type="string" readOnly="false" displayName="Max Threads" description="The maximum thread pool size."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="The name of the thread pool."/>
+ <c:simple-property name="thread-factory" required="false" type="string" readOnly="false" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/>
+ </resource-configuration>
+ </service>
+
+ <service name="File Passivation Store (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A file system based passivation store."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="file-passivation-store"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="groups-path" required="false" type="string" readOnly="false" defaultValue="ejb3/groups"/>
+ <c:simple-property name="idle-timeout:expr" required="false" type="string" readOnly="false" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
+ <c:simple-property name="idle-timeout-unit" required="false" type="string" readOnly="false" defaultValue="SECONDS" description="The unit of idle-timeout. The default value is SECONDS."/>
+ <c:simple-property name="max-size:expr" required="false" type="string" readOnly="false" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="false" defaultValue="jboss.server.data.dir"/>
+ <c:simple-property name="sessions-path" required="false" type="string" readOnly="false" defaultValue="ejb3/sessions"/>
+ <c:simple-property name="subdirectory-count:expr" required="false" type="string" readOnly="false" defaultValue="100"/>
+ </resource-configuration>
+ </service>
+
+ <service name="Strict Max Bean Instance Pool (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A bean instance pool with a strict upper limit"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="strict-max-bean-instance-pool"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="max-pool-size:expr" required="false" type="string" readOnly="false" defaultValue="20" description="The maximum number of bean instances that the pool can hold at a given point in time. The default value is 20."/>
+ <c:simple-property name="timeout:expr" required="false" type="string" readOnly="false" defaultValue="5" description="The maximum amount of time to wait for a bean instance to be available from the pool. The default value is 5."/>
+ <c:simple-property name="timeout-unit" required="false" type="string" readOnly="false" defaultValue="MINUTES" description="The instance acquisition timeout unit. The default value is MINUTES."/>
+ </resource-configuration>
+ </service>
+
+ <service name="SFSB Cache (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A SFSB cache."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="cache"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="aliases" description="The aliases by which this cache may also be referenced">
+ <c:simple-property name="aliases"/>
+ </c:list-property>
+ <c:simple-property name="passivation-store" required="false" type="string" readOnly="false" description="The passivation store used by this cache"/>
+ </resource-configuration>
+ </service>
+
+ <service name="Cluster Passivation Store (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A clustered passivation store."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="cluster-passivation-store"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="bean-cache" required="false" type="string" readOnly="false" description="The name of the cache used to store bean instances."/>
+ <c:simple-property name="cache-container" required="false" type="string" readOnly="false" defaultValue="ejb" description="The name of the cache container used for the bean and client-mappings caches. The default value is ejb."/>
+ <c:simple-property name="client-mappings-cache" required="false" type="string" readOnly="false" defaultValue="remote-connector-client-mappings" description="The name of the cache used to store client-mappings of the EJB remoting connector's socket-bindings. The default value is remote-connector-client-mappings."/>
+ <c:simple-property name="idle-timeout:expr" required="false" type="string" readOnly="false" defaultValue="300" description="The timeout in units specified by idle-timeout-unit, after which a bean will passivate. The default value is 300."/>
+ <c:simple-property name="idle-timeout-unit" required="false" type="string" readOnly="false" defaultValue="SECONDS" description="The unit of idle-timeout. The default value is SECONDS."/>
+ <c:simple-property name="max-size:expr" required="false" type="string" readOnly="false" defaultValue="10000" description="The maximum number of beans this cache should store before forcing old beans to passivate. The default value is 10000."/>
+ <c:simple-property name="passivate-events-on-replicate" required="false" type="boolean" readOnly="false" defaultValue="true" description="Indicates whether replication should trigger passivation events on the bean. The default value is true."/>
+ </resource-configuration>
+ </service>
+
+ <service name="Async Service (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The EJB3 Asynchronous Invocation Service"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="service=async"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="thread-pool-name" required="false" type="string" readOnly="false" description="The name of the thread pool which handles asynchronous invocations"/>
+ </resource-configuration>
+ </service>
+
+ <service name="IIOP Service (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The IIOP service"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="service=iiop"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="enable-by-default" required="false" type="boolean" readOnly="false" description="If this is true EJB's will be exposed over IIOP by default, otherwise it needs to be explicitly enabled in the deployment descriptor"/>
+ <c:simple-property name="use-qualified-name" required="false" type="boolean" readOnly="false" description="If true EJB names will be bound into the naming service with the application and module name prepended to the name (e.g. myapp/mymodule/MyEjb)"/>
+ </resource-configuration>
+ </service>
+
+ <service name="Remote Service (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The EJB3 remote service"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="service=remote"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="connector-ref" required="false" type="string" readOnly="false" description="The name of the connector on which the EJB3 remoting channel is registered"/>
+ <c:simple-property name="thread-pool-name" required="false" type="string" readOnly="false" description="The name of the thread pool that handles remote invocations"/>
+ </resource-configuration>
+
+ <service name="Channel Creation Options (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The options that will be used during the EJB remote channel creation"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="channel-creation-options"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="type" required="false" type="string" readOnly="false" description="The type of the channel creation option">
+ <c:property-options>
+ <c:option value="remoting" name="remoting"/>
+ <c:option value="xnio" name="xnio"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="value" required="false" type="string" readOnly="false" description="The value for the EJB remote channel creation option"/>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Timer Service (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The EJB timer service"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="service=timer-service"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="path" required="false" type="string" readOnly="false" description="The directory to store persistent timer information in"/>
+ <c:simple-property name="relative-to" required="false" type="string" readOnly="false" description="The relative path that is used to resolve the timer data store location"/>
+ <c:simple-property name="thread-pool-name" required="false" type="string" readOnly="false" description="The name of the thread pool used to run timer service invocations"/>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Threads (Profile)"
+ discovery="SubsystemDiscovery"
+ class="ThreadsComponent"
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=threads"/>
+ </plugin-configuration>
+
+ <service name="ThreadFactory (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="A thread factory (implementing java.util.concurrent.ThreadFactory)."
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="thread-factory"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="group-name" required="false" type="string" readOnly="false" description="Specifies the name of a thread group to create for this thread factory."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="The name of the created thread factory."/>
+ <c:simple-property name="priority:expr" required="false" type="string" readOnly="false" defaultValue="-1" displayName="Priority" description="May be used to specify the thread priority of created threads. The default value is -1."/>
+ <c:simple-property name="thread-name-pattern" required="false" type="string" readOnly="false" description="The template used to create names for threads. The following patterns may be used:
+ %% - emit a percent sign
+ %t - emit the per-factory thread sequence number
+ %g - emit the global thread sequence number
+ %f - emit the factory sequence number
+ %i - emit the thread ID."/>
+ </resource-configuration>
+ </service>
+
+ <service name="ThreadPool (Profile)"
+ discovery="SubsystemDiscovery"
+ class="ThreadPoolComponent"
+ description="A thread pool executor"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="bounded-queue-thread-pool|queueless-thread-pool|scheduled-thread-pool|unbounded-queue-thread-pool"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:map-property name="keepalive-time" readOnly="false" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down.">
+ <c:simple-property name="time" required="true" readOnly="false" type="long" description="The time"/>
+ <c:simple-property name="unit" required="true" readOnly="false" type="string" description="The time unit"/>
+ </c:map-property>
+ <c:simple-property name="max-threads:expr" required="true" type="string" readOnly="false" displayName="Max Threads" description="The maximum thread pool size."/>
+ <c:simple-property name="name" required="false" type="string" readOnly="true" description="The name of the thread pool."/>
+ <c:simple-property name="thread-factory" required="false" type="string" readOnly="false" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/>
+
+ <c:simple-property name="type" readOnly="true" default="scheduled-thread-pool" displayName="Thread Pool Type" description="Thread pool type">
+ <c:property-options>
+ <c:option value="bounded-queue-thread-pool"/>
+ <c:option value="queueless-thread-pool"/>
+ <c:option value="unbounded-queue-thread-pool"/>
+ <c:option value="scheduled-thread-pool"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:template name="Bounded Queue Thread Pool" description="Bounded Queue Thread Pool">
+ <c:simple-property name="type" readOnly="true" default="bounded-queue-thread-pool"/>
+ </c:template>
+ <c:template name="Queueless Thread Pool" description="Queueless Thread Pool">
+ <c:simple-property name="type" readOnly="true" default="queueless-thread-pool"/>
+ </c:template>
+ <c:template name="Scheduled Thread Pool" description="Scheduled Thread Pool">
+ <c:simple-property name="type" readOnly="true" default="scheduled-thread-pool"/>
+ </c:template>
+ <c:template name="Unbounded Queue Thread Pool" description="Unbounded Queue Thread Pool">
+ <c:simple-property name="type" readOnly="true" default="unbounded-queue-thread-pool"/>
+ </c:template>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Security (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The configuration of the security subsystem."
+ singleton="true">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="subsystem=security"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="deep-copy-subject-mode" required="false" type="boolean" readOnly="false" defaultValue="false" description="Sets the copy mode of subjects done by the security managers to be deep copies that makes copies of the subject principals and credentials if they are cloneable. It should be set to true if subject include mutable content that can be corrupted when multiple threads have the same identity and cache flushes/logout clearing the subject in one thread results in subject references affecting other threads. The default value is false."/>
+ </resource-configuration>
+
+ <service name="Security Domain (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="security-domain"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="cache-type" required="false" type="string" readOnly="false" description="Adds a cache to speed up authentication checks. Allowed values are 'default' to use simple map as the cache and 'infinispan' to use an Infinispan cache."/>
+ </resource-configuration>
+
+ <service name="ACL (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="acl=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="acl-modules" required="false" description="List of acl modules">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the acl provider module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Audit (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="audit=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="provider-modules" required="false" description="List of provider modules">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Authentication (Classic - Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="authentication=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="login-modules" required="false" description="List of authentication modules">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the login module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Authentication (Jaspi - Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="authentication=jaspi"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="auth-modules" required="true" description="List of authentication modules to be used." >
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the auth module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ <c:simple-property name="login-module-stack-ref" required="false" type="string" readOnly="false" description="Reference to a login module stack name previously configured in the same security domain."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+
+ <service name="Login Module Stack (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="login-module-stack"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="login-modules" required="true" description="List of authentication modules" >
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the login module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Authorization (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="authorization=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="policy-modules" required="false" description="List of authorization modules">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the policy module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Identity Trust (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="identity-trust=classic"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="trust-modules" required="false" description="List of trust modules">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the identity trust module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
- <service name="Domain Ssl"
+ <service name="JSSE (Profile)"
discovery="SubsystemDiscovery"
- createDeletePolicy="both"
- class="BaseComponent">
-
- <runs-inside>
- <parent-resource-type name="ModCluster Standalone Service" plugin="&pluginName;"/>
- <parent-resource-type name="ModCluster Domain Service" plugin="&pluginName;"/>
- </runs-inside>
+ class="BaseComponent"
+ createDeletePolicy="both">
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="ssl=configuration"/>
+ <c:simple-property name="path" readOnly="true" default="jsse"/>
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="ca-certificate-file" required="false" type="string" readOnly="false" description="Certificate authority."/>
- <c:simple-property name="ca-revocation-ur" required="false" type="string" readOnly="false" description="Certificate authority revocation list."/>
- <c:simple-property name="certificate-key-file" required="false" type="string" readOnly="false" defaultValue="${user.home}/.keystore" description="Key file for the certificate."/>
- <c:simple-property name="cipher-suite" required="false" type="string" readOnly="false" description="The allowed cipher suite."/>
- <c:simple-property name="key-alias" required="false" type="string" readOnly="false" description="The key alias."/>
- <c:simple-property name="password" required="false" type="string" readOnly="false" defaultValue="changeit" description="Password."/>
- <c:simple-property name="protocol" required="false" type="string" readOnly="false" defaultValue="TLS" description="The SSL protocols that are enabled."/>
+ <c:simple-property name="cipher-suites" required="false" type="string" readOnly="false" description="Comma separated list of cipher suites to enable on SSLSockets."/>
+ <c:simple-property name="client-alias" required="false" type="string" readOnly="false" description="Preferred alias to use when the KeyManager chooses the client alias."/>
+ <c:simple-property name="client-auth" required="false" type="boolean" readOnly="false" description="Boolean attribute to indicate if client's certificates should also be authenticated on the server side."/>
+ <c:map-property name="key-manager" required="false" description="JSEE Key Manager factory">
+ <c:simple-property name="algorithm" required="false" type="string" readOnly="false" description="Algorithm to use when creating the KeyManagerFactory."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="false" description="Provider class name to use when creating the KeyManagerFactory."/>
+ </c:map-property>
+ <c:map-property name="keystore" required="false" description="Configures a JSSE key store">
+ <c:simple-property name="password" required="false" type="string" readOnly="false" description="Sets the password of the keystore. Either this or 'truststore-password' must be present otherwise the security domain will be useless."/>
+ <c:simple-property name="type" required="false" type="string" readOnly="false" description="Type of the keystore. If not set, type defaults to 'JKS'."/>
+ <c:simple-property name="url" required="false" type="string" readOnly="false" description="URL of the keystore."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="false" description="Provider class name to use when creating the KeyStore."/>
+ <c:simple-property name="provider-argument" required="false" type="string" readOnly="false" description="String argument to pass to the keystore Provider constructor when instantiating it."/>
+ </c:map-property>
+ <c:simple-property name="protocols" required="false" type="string" readOnly="false" description="Comma separated list of protocols to enable on SSLSockets."/>
+ <c:simple-property name="server-alias" required="false" type="string" readOnly="false" description="Preferred alias to use when the KeyManager chooses the server alias."/>
+ <c:simple-property name="service-auth-token" required="false" type="string" readOnly="false" description="Token to retrieve PrivateKeys from the KeyStore."/>
+ <c:map-property name="trust-manager" required="false" description="JSEE Trust Manager factory">
+ <c:simple-property name="algorithm" required="false" type="string" readOnly="false" description="Algorithm to use when creating the TrustManagerFactory."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="false" description="Provider class name to use when creating the TrustManagerFactory."/>
+ </c:map-property>
+ <c:map-property name="truststore" required="false" description="Configures a JSSE trust store">
+ <c:simple-property name="password" required="false" type="string" readOnly="false" description="Sets the password of the truststore. Either this or 'keystore-password' must be present otherwise the security domain will be useless."/>
+ <c:simple-property name="type" required="false" type="string" readOnly="false" description="Type of the truststore. If not set, type defaults to 'JKS'."/>
+ <c:simple-property name="url" required="false" type="string" readOnly="false" description="URL of the truststore."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="false" description="Provider class name to use when creating the truststore."/>
+ <c:simple-property name="provider-argument" required="false" type="string" readOnly="false" description="String argument to pass to the truststore Provider constructor when instantiating it."/>
+ </c:map-property>
</resource-configuration>
- </service><!-- End of ssl service -->
- </service><!-- End of Domain Modcluster Service Configuration -->
- </service>
+ </service>
- <service name="Naming (Profile)"
- discovery="SubsystemDiscovery"
- class="NamingComponent"
- singleton="true">
+ <service name="Mapping (Profile)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ createDeletePolicy="both">
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="subsystem=naming"/>
- </plugin-configuration>
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="mapping=classic"/>
+ </plugin-configuration>
- <service name="Binding (Profile)"
- class="BaseComponent"
+ <resource-configuration>
+ <c:list-property name="mapping-modules" required="false" description="List of modules that map principal, role, and credential information">
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="type" required="true" type="string" readOnly="false" description="Type of mapping this module performs. Allowed values are principal, role, attribute or credential.."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+ </service>
+
+ <service name="Vault (Profile)"
discovery="SubsystemDiscovery"
- description="JNDI bindings for primitive types"
+ class="BaseComponent"
+ singleton="true"
createDeletePolicy="both">
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="binding"/>
+ <c:simple-property name="path" readOnly="true" default="vault=classic"/>
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="binding-type" required="true" type="string" readOnly="false" description="The type of binding to create, may be simple, lookup or object-factory">
- <c:property-options>
- <c:option value="simple"/>
- <c:option value="lookup"/>
- <c:option value="object-factory"/>
- </c:property-options>
- </c:simple-property>
- <c:simple-property name="class" required="false" type="string" readOnly="false" description="The object factory class name for object factory bindings"/>
- <c:simple-property name="lookup" required="false" type="string" readOnly="false" description="The entry to lookup in JNDI for lookup bindings"/>
- <c:simple-property name="module" required="false" type="string" readOnly="false" description="The module to load the object factory from for object factory bindings"/>
- <c:simple-property name="type" required="false" type="string" readOnly="false" description="The type of the value to bind for simple bindings, this must be a primitive type"/>
- <c:simple-property name="value" required="false" type="string" readOnly="false" description="The value to bind for simple bindings"/>
+ <c:simple-property name="code" required="false" type="string" readOnly="false" description="Fully Qualified Name of the Security Vault Implementation."/>
</resource-configuration>
</service>
</service>
</service>
+
<service name="JVM"
discovery="JVMDiscoveryComponent"
class="BaseComponent"
@@ -2516,14 +4753,11 @@
singleton="true">
<runs-inside>
- <parent-resource-type name="Profile" plugin="&pluginName;"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
- <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="subsystem=web"/>
- <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
</plugin-configuration>
<resource-configuration>
@@ -5499,14 +7733,11 @@
singleton="true">
<runs-inside>
- <parent-resource-type name="Profile" plugin="&pluginName;"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
- <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" default="subsystem=jca" readOnly="true"/>
- <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
</plugin-configuration>
<resource-configuration>
@@ -5688,12 +7919,10 @@
<runs-inside>
<parent-resource-type name="Profile" plugin="&pluginName;"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
- <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" default="subsystem=cmp" readOnly="true"/>
- <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
</plugin-configuration>
<service name="HiloKeygenerator"
@@ -5707,18 +7936,18 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="block-size" required="false" type="long" readOnly="true" description="The block size"/>
- <c:simple-property name="create-table" required="false" type="boolean" readOnly="true" description="Boolean to determine whether to create create the tables"/>
- <c:simple-property name="create-table-ddl" required="false" type="string" readOnly="true" description="The DDL used to create the table"/>
- <c:simple-property name="data-source" required="true" type="string" readOnly="true" description="The datasource used for sequence generation">
+ <c:simple-property name="block-size" required="false" type="long" readOnly="false" description="The block size"/>
+ <c:simple-property name="create-table" required="false" type="boolean" readOnly="false" description="Boolean to determine whether to create create the tables"/>
+ <c:simple-property name="create-table-ddl" required="false" type="string" readOnly="false" description="The DDL used to create the table"/>
+ <c:simple-property name="data-source" required="true" type="string" readOnly="false" description="The datasource used for sequence generation">
<c:option-source target="resource" expression="type='DataSource (Standalone)' plugin=&pluginName;"/>
</c:simple-property>
- <c:simple-property name="drop-table" required="false" type="boolean" readOnly="true" description="Boolean to determine whether to create drop the tables"/>
- <c:simple-property name="id-column" required="true" type="string" readOnly="true" description="The ID column name"/>
- <c:simple-property name="select-hi-ddl" required="false" type="string" readOnly="true" description="The DDL used to select the hi value"/>
- <c:simple-property name="sequence-column" required="true" type="string" description="The sequence column name"/>
- <c:simple-property name="sequence-name" required="true" type="string" description="The name of the sequence"/>
- <c:simple-property name="table-name" required="true" type="string" description="The table name"/>
+ <c:simple-property name="drop-table" required="false" type="boolean" readOnly="false" description="Boolean to determine whether to create drop the tables"/>
+ <c:simple-property name="id-column" required="true" type="string" readOnly="false" description="The ID column name"/>
+ <c:simple-property name="select-hi-ddl" required="false" type="string" readOnly="false" description="The DDL used to select the hi value"/>
+ <c:simple-property name="sequence-column" required="true" type="string" readOnly="false" description="The sequence column name"/>
+ <c:simple-property name="sequence-name" required="true" type="string" readOnly="false" description="The name of the sequence"/>
+ <c:simple-property name="table-name" required="true" type="string" readOnly="false" description="The table name"/>
</resource-configuration>
</service>
@@ -5751,6 +7980,7 @@
</resource-configuration>
</service>
+
<service name="Security"
discovery="SubsystemDiscovery"
class="BaseComponent"
@@ -5758,14 +7988,11 @@
singleton="true">
<runs-inside>
- <parent-resource-type name="Profile" plugin="&pluginName;"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
- <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="subsystem=security"/>
- <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
</plugin-configuration>
<resource-configuration>
@@ -5800,64 +8027,164 @@
<service name="ACL"
discovery="SubsystemDiscovery"
class="BaseComponent"
+ singleton="true"
createDeletePolicy="both">
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="acl"/>
+ <c:simple-property name="path" readOnly="true" default="acl=classic"/>
</plugin-configuration>
<resource-configuration>
<c:list-property name="acl-modules" required="false" description="List of acl modules">
- <c:simple-property name="acl-modules"/>
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the acl provider module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
</c:list-property>
</resource-configuration>
-
</service>
<service name="Audit"
discovery="SubsystemDiscovery"
class="BaseComponent"
+ singleton="true"
createDeletePolicy="both">
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="audit"/>
+ <c:simple-property name="path" readOnly="true" default="audit=classic"/>
</plugin-configuration>
<resource-configuration>
<c:list-property name="provider-modules" required="false" description="List of provider modules">
- <c:simple-property name="provider-modules"/>
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
</c:list-property>
</resource-configuration>
</service>
- <service name="Authentication"
+ <service name="Authentication (Classic)"
discovery="SubsystemDiscovery"
class="BaseComponent"
+ singleton="true"
createDeletePolicy="both">
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="authentication"/>
+ <c:simple-property name="path" readOnly="true" default="authentication=classic"/>
</plugin-configuration>
<resource-configuration>
<c:list-property name="login-modules" required="false" description="List of authentication modules">
- <c:simple-property name="login-modules"/>
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the login module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+
+ <service name="Authentication (Jaspi)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="authentication=jaspi"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="auth-modules" required="true" description="List of authentication modules to be used." >
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the auth module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ <c:simple-property name="login-module-stack-ref" required="false" type="string" readOnly="false" description="Reference to a login module stack name previously configured in the same security domain."/>
+ </c:map-property>
</c:list-property>
</resource-configuration>
+
+ <service name="Login Module Stack"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="login-module-stack"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:list-property name="login-modules" required="true" description="List of authentication modules" >
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the login module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
+ </c:list-property>
+ </resource-configuration>
+ </service>
</service>
<service name="Authorization"
discovery="SubsystemDiscovery"
class="BaseComponent"
+ singleton="true"
createDeletePolicy="both">
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="authorization"/>
+ <c:simple-property name="path" readOnly="true" default="authorization=classic"/>
</plugin-configuration>
<resource-configuration>
<c:list-property name="policy-modules" required="false" description="List of authorization modules">
- <c:simple-property name="policy-modules"/>
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the policy module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
</c:list-property>
</resource-configuration>
</service>
@@ -5865,15 +8192,28 @@
<service name="Identity Trust"
discovery="SubsystemDiscovery"
class="BaseComponent"
+ singleton="true"
createDeletePolicy="both">
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="identity-trust"/>
+ <c:simple-property name="path" readOnly="true" default="identity-trust=classic"/>
</plugin-configuration>
<resource-configuration>
<c:list-property name="trust-modules" required="false" description="List of trust modules">
- <c:simple-property name="trust-modules"/>
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="flag" required="true" type="string" readOnly="false" description="The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.">
+ <c:property-options>
+ <c:option value="sufficient"/>
+ <c:option value="requisite"/>
+ <c:option value="optional"/>
+ <c:option value="required"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="module" required="true" type="string" readOnly="false" description="Name of JBoss Module where the identity trust module code is located."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
</c:list-property>
</resource-configuration>
</service>
@@ -5892,29 +8232,29 @@
<c:simple-property name="client-alias" required="false" type="string" readOnly="false" description="Preferred alias to use when the KeyManager chooses the client alias."/>
<c:simple-property name="client-auth" required="false" type="boolean" readOnly="false" description="Boolean attribute to indicate if client's certificates should also be authenticated on the server side."/>
<c:map-property name="key-manager" required="false" description="JSEE Key Manager factory">
- <c:simple-property name="algorithm" required="false" type="string" readOnly="true" description="Algorithm to use when creating the KeyManagerFactory."/>
- <c:simple-property name="provider" required="false" type="string" readOnly="true" description="Provider class name to use when creating the KeyManagerFactory."/>
+ <c:simple-property name="algorithm" required="false" type="string" readOnly="false" description="Algorithm to use when creating the KeyManagerFactory."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="false" description="Provider class name to use when creating the KeyManagerFactory."/>
</c:map-property>
<c:map-property name="keystore" required="false" description="Configures a JSSE key store">
- <c:simple-property name="password" required="false" type="string" readOnly="true" description="Sets the password of the keystore. Either this or 'truststore-password' must be present otherwise the security domain will be useless."/>
- <c:simple-property name="type" required="false" type="string" readOnly="true" description="Type of the keystore. If not set, type defaults to 'JKS'."/>
- <c:simple-property name="url" required="false" type="string" readOnly="true" description="URL of the keystore."/>
- <c:simple-property name="provider" required="false" type="string" readOnly="true" description="Provider class name to use when creating the KeyStore."/>
- <c:simple-property name="provider-argument" required="false" type="string" readOnly="true" description="String argument to pass to the keystore Provider constructor when instantiating it."/>
+ <c:simple-property name="password" required="false" type="string" readOnly="false" description="Sets the password of the keystore. Either this or 'truststore-password' must be present otherwise the security domain will be useless."/>
+ <c:simple-property name="type" required="false" type="string" readOnly="false" description="Type of the keystore. If not set, type defaults to 'JKS'."/>
+ <c:simple-property name="url" required="false" type="string" readOnly="false" description="URL of the keystore."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="false" description="Provider class name to use when creating the KeyStore."/>
+ <c:simple-property name="provider-argument" required="false" type="string" readOnly="false" description="String argument to pass to the keystore Provider constructor when instantiating it."/>
</c:map-property>
<c:simple-property name="protocols" required="false" type="string" readOnly="false" description="Comma separated list of protocols to enable on SSLSockets."/>
<c:simple-property name="server-alias" required="false" type="string" readOnly="false" description="Preferred alias to use when the KeyManager chooses the server alias."/>
<c:simple-property name="service-auth-token" required="false" type="string" readOnly="false" description="Token to retrieve PrivateKeys from the KeyStore."/>
<c:map-property name="trust-manager" required="false" description="JSEE Trust Manager factory">
- <c:simple-property name="algorithm" required="false" type="string" readOnly="true" description="Algorithm to use when creating the TrustManagerFactory."/>
- <c:simple-property name="provider" required="false" type="string" readOnly="true" description="Provider class name to use when creating the TrustManagerFactory."/>
+ <c:simple-property name="algorithm" required="false" type="string" readOnly="false" description="Algorithm to use when creating the TrustManagerFactory."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="false" description="Provider class name to use when creating the TrustManagerFactory."/>
</c:map-property>
<c:map-property name="truststore" required="false" description="Configures a JSSE trust store">
- <c:simple-property name="password" required="false" type="string" readOnly="true" description="Sets the password of the truststore. Either this or 'keystore-password' must be present otherwise the security domain will be useless."/>
- <c:simple-property name="type" required="false" type="string" readOnly="true" description="Type of the truststore. If not set, type defaults to 'JKS'."/>
- <c:simple-property name="url" required="false" type="string" readOnly="true" description="URL of the truststore."/>
- <c:simple-property name="provider" required="false" type="string" readOnly="true" description="Provider class name to use when creating the truststore."/>
- <c:simple-property name="provider-argument" required="false" type="string" readOnly="true" description="String argument to pass to the truststore Provider constructor when instantiating it."/>
+ <c:simple-property name="password" required="false" type="string" readOnly="false" description="Sets the password of the truststore. Either this or 'keystore-password' must be present otherwise the security domain will be useless."/>
+ <c:simple-property name="type" required="false" type="string" readOnly="false" description="Type of the truststore. If not set, type defaults to 'JKS'."/>
+ <c:simple-property name="url" required="false" type="string" readOnly="false" description="URL of the truststore."/>
+ <c:simple-property name="provider" required="false" type="string" readOnly="false" description="Provider class name to use when creating the truststore."/>
+ <c:simple-property name="provider-argument" required="false" type="string" readOnly="false" description="String argument to pass to the truststore Provider constructor when instantiating it."/>
</c:map-property>
</resource-configuration>
</service>
@@ -5922,15 +8262,20 @@
<service name="Mapping"
discovery="SubsystemDiscovery"
class="BaseComponent"
+ singleton="true"
createDeletePolicy="both">
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="mapping"/>
+ <c:simple-property name="path" readOnly="true" default="mapping=classic"/>
</plugin-configuration>
<resource-configuration>
<c:list-property name="mapping-modules" required="false" description="List of modules that map principal, role, and credential information">
- <c:simple-property name="mapping-modules"/>
+ <c:map-property name="*" required="false">
+ <c:simple-property name="code" required="true" type="string" readOnly="false" description="Class name of the module to be instantiated."/>
+ <c:simple-property name="type" required="true" type="string" readOnly="false" description="Type of mapping this module performs. Allowed values are principal, role, attribute or credential.."/>
+ <c:simple-property name="module-options" required="false" type="string" readOnly="false" description="List of module options containing a name/value pair."/>
+ </c:map-property>
</c:list-property>
</resource-configuration>
</service>
@@ -5938,32 +8283,33 @@
<service name="Vault"
discovery="SubsystemDiscovery"
- class="BaseComponent">
+ class="BaseComponent"
+ singleton="true"
+ createDeletePolicy="both">
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="vault"/>
+ <c:simple-property name="path" readOnly="true" default="vault=classic"/>
</plugin-configuration>
<resource-configuration>
<c:simple-property name="code" required="false" type="string" readOnly="false" description="Fully Qualified Name of the Security Vault Implementation."/>
</resource-configuration>
</service>
+
</service>
+
<service name="Threads"
discovery="SubsystemDiscovery"
class="ThreadsComponent"
singleton="true">
<runs-inside>
- <parent-resource-type name="Profile" plugin="&pluginName;"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
- <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="subsystem=threads"/>
- <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
</plugin-configuration>
<service name="ThreadFactory"
@@ -6048,14 +8394,11 @@
singleton="true">
<runs-inside>
- <parent-resource-type name="Profile" plugin="&pluginName;"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
- <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="subsystem=ejb3"/>
- <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
</plugin-configuration>
<resource-configuration>
@@ -6074,7 +8417,8 @@
<service name="EJB3 Thread Pool"
discovery="SubsystemDiscovery"
class="BaseComponent"
- description="A thread pool executor with an unbounded queue. Such a thread pool has a core size and a queue with no upper bound. When a task is submitted, if the number of running threads is less than the core size, a new thread is created. Otherwise, the task is placed in queue. If too many tasks are allowed to be submitted to this type of executor, an out of memory condition may occur.">
+ description="A thread pool executor with an unbounded queue. Such a thread pool has a core size and a queue with no upper bound. When a task is submitted, if the number of running threads is less than the core size, a new thread is created. Otherwise, the task is placed in queue. If too many tasks are allowed to be submitted to this type of executor, an out of memory condition may occur."
+ createDeletePolicy="both">
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="thread-pool"/>
@@ -6083,17 +8427,16 @@
<metric property="active-count" description="The approximate number of threads that are actively executing tasks."/>
<metric property="completed-task-count" description="The approximate total number of tasks that have completed execution."/>
<metric property="current-thread-count" description="The current number of threads in the pool."/>
- <metric property="keepalive-time:time" description="The time"/>
<metric property="largest-thread-count" description="The largest number of threads that have ever simultaneously been in the pool."/>
<metric property="rejected-count" description="The number of tasks that have been rejected."/>
<metric property="task-count" description="The approximate total number of tasks that have ever been scheduled for execution."/>
<resource-configuration>
- <c:map-property name="keepalive-time" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down.">
- <c:simple-property name="time" required="true" type="long" readOnly="true" description="The time"/>
- <c:simple-property name="unit" required="true" type="string" readOnly="true" description="The time unit"/>
+ <c:map-property name="keepalive-time" readOnly="false" description="Used to specify the amount of time that pool threads should be kept running when idle; if not specified, threads will run until the executor is shut down.">
+ <c:simple-property name="time" required="true" type="long" readOnly="false" description="The time"/>
+ <c:simple-property name="unit" required="true" type="string" readOnly="false" description="The time unit"/>
</c:map-property>
- <c:simple-property name="max-threads:expr" required="false" type="string" readOnly="false" description="The maximum thread pool size."/>
+ <c:simple-property name="max-threads:expr" required="false" type="string" readOnly="false" displayName="Max Threads" description="The maximum thread pool size."/>
<c:simple-property name="name" required="false" type="string" readOnly="true" description="The name of the thread pool."/>
<c:simple-property name="thread-factory" required="false" type="string" readOnly="false" description="Specifies the name of a specific thread factory to use to create worker threads. If not defined an appropriate default thread factory will be used."/>
</resource-configuration>
@@ -6102,7 +8445,8 @@
<service name="File Passivation Store"
discovery="SubsystemDiscovery"
class="BaseComponent"
- description="A file system based passivation store.">
+ description="A file system based passivation store."
+ createDeletePolicy="both">
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="file-passivation-store"/>
@@ -6122,7 +8466,8 @@
<service name="Strict Max Bean Instance Pool"
discovery="SubsystemDiscovery"
class="BaseComponent"
- description="A bean instance pool with a strict upper limit">
+ description="A bean instance pool with a strict upper limit"
+ createDeletePolicy="both">
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="strict-max-bean-instance-pool"/>
@@ -6135,10 +8480,11 @@
</resource-configuration>
</service>
- <service name="EJB3 Cache"
+ <service name="SFSB Cache"
discovery="SubsystemDiscovery"
class="BaseComponent"
- description="A SFSB cache.">
+ description="A SFSB cache."
+ createDeletePolicy="both">
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="cache"/>
@@ -6155,7 +8501,8 @@
<service name="Cluster Passivation Store"
discovery="SubsystemDiscovery"
class="BaseComponent"
- description="A clustered passivation store.">
+ description="A clustered passivation store."
+ createDeletePolicy="both">
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="cluster-passivation-store"/>
@@ -6217,6 +8564,27 @@
<c:simple-property name="connector-ref" required="false" type="string" readOnly="false" description="The name of the connector on which the EJB3 remoting channel is registered"/>
<c:simple-property name="thread-pool-name" required="false" type="string" readOnly="false" description="The name of the thread pool that handles remote invocations"/>
</resource-configuration>
+
+ <service name="Channel Creation Options"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The options that will be used during the EJB remote channel creation"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="channel-creation-options"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="type" required="false" type="string" readOnly="false" description="The type of the channel creation option">
+ <c:property-options>
+ <c:option value="remoting" name="remoting"/>
+ <c:option value="xnio" name="xnio"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="value" required="false" type="string" readOnly="false" description="The value for the EJB remote channel creation option"/>
+ </resource-configuration>
+ </service>
</service>
<service name="Timer Service"
@@ -6248,21 +8616,32 @@
<runs-inside>
<parent-resource-type name="Profile" plugin="&pluginName;"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
- <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="subsystem=jmx"/>
- <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
</plugin-configuration>
<resource-configuration>
<c:simple-property name="show-model" required="false" type="boolean" readOnly="false" description="Set to 'true' to include MBeans for the model controller resources"/>
- <c:group name="children:remoting-connector" displayName="JBoss remoting connector for the JMX subsystem.">
- <c:simple-property name="use-management-endpoint" required="false" type="boolean" readOnly="false" defaultValue="true" description="If true the connector will use the management endpoint, otherwise it will use the remoting subsystem one. The default value is true."/>
- </c:group>
</resource-configuration>
+ <service name="Remoting Connector"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The configuration of a resource adapter."
+ singleton="true"
+ createDeletePolicy="both">
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="remoting-connector=jmx"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="use-management-endpoint" required="false" type="boolean" readOnly="false" defaultValue="true" description="If true the connector will use the management endpoint, otherwise it will use the remoting subsystem one. The default value is true."/>
+ </resource-configuration>
+ </service>
+
</service>
@@ -6273,14 +8652,11 @@
singleton="true">
<runs-inside>
- <parent-resource-type name="Profile" plugin="&pluginName;"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
- <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="subsystem=resource-adapters"/>
- <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
</plugin-configuration>
<service name="Resource Adapter"
@@ -6325,22 +8701,6 @@
</service>
- <service name="Config Properties"
- discovery="SubsystemDiscovery"
- class="BaseComponent"
- description="Custom defined config properties."
- createDeletePolicy="both">
-
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="config-properties"/>
- </plugin-configuration>
-
- <resource-configuration>
- <c:simple-property name="value" required="false" type="string" readOnly="true" description="Custom defined config property value"/>
- </resource-configuration>
-
- </service>
-
<service name="Connection Definitions"
discovery="SubsystemDiscovery"
class="BaseComponent"
@@ -6413,21 +8773,6 @@
<c:simple-property name="wrap-xa-resource" required="false" type="boolean" readOnly="false" defaultValue="true" description="Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance. The default value is true."/>
<c:simple-property name="xa-resource-timeout:expr" required="false" type="integer" readOnly="false" displayName="XA Resource Timeout" description="The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero"/>
</resource-configuration>
-
- <service name="Config Properties (Connection Definition)"
- discovery="SubsystemDiscovery"
- class="BaseComponent"
- description="Custom defined config properties."
- createDeletePolicy="both">
-
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="config-properties"/>
- </plugin-configuration>
-
- <resource-configuration>
- <c:simple-property name="value" required="false" type="string" readOnly="true" description="Custom defined config property value"/>
- </resource-configuration>
- </service>
</service>
</service>
@@ -6607,14 +8952,11 @@
singleton="true">
<runs-inside>
- <parent-resource-type name="Profile" plugin="&pluginName;"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="&pluginName;"/>
- <parent-resource-type name="Managed Server" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="subsystem=osgi"/>
- <c:simple-property name="managedRuntime" default="true" type="boolean" readOnly="true"/>
</plugin-configuration>
<operation name="subsystem:activate" displayName="Activate" description="Activate the OSGi subsystem.">
@@ -6626,32 +8968,13 @@
<resource-configuration>
<c:simple-property name="activation" required="false" type="string" readOnly="false" defaultValue="LAZY" description="Activation flag for the OSGi subsystem. Possible values: lazy, eager. The default value is LAZY."/>
<c:simple-property name="startlevel" required="false" type="integer" readOnly="false" description="The current Start Level of the OSGi Framework. Changing this value will change the Start Level of the Framework accordingly."/>
- <c:list-property name="property" description="A list of generic key/value properties.">
- <c:map-property name="property:collapsed" displayName="Property">
- <c:simple-property name="name:0" type="string" displayName="Name" required="true"/>
- <c:simple-property name="value:1" type="string" displayName="Value" required="true"/>
- </c:map-property>
- </c:list-property>
</resource-configuration>
- <service name="Property (Osgi)"
- discovery="SubsystemDiscovery"
- class="BaseComponent"
- description="A framework property. The identity of the resource defines the property name.">
-
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="property"/>
- </plugin-configuration>
-
- <resource-configuration>
- <c:simple-property name="value" required="true" type="string" readOnly="false" description="The framework property value."/>
- </resource-configuration>
- </service>
-
<service name="Capability"
discovery="SubsystemDiscovery"
class="BaseComponent"
- description="A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle.">
+ description="A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle."
+ createDeletePolicy="both">
<plugin-configuration>
<c:simple-property name="path" readOnly="true" default="capability"/>
@@ -8217,6 +10540,8 @@
<runs-inside>
<parent-resource-type name="Endpoint" plugin="&pluginName;"/>
+ <parent-resource-type name="Osgi" plugin="&pluginName;"/>
+ <parent-resource-type name="Osgi (Profile)" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
@@ -8235,6 +10560,7 @@
<runs-inside>
<parent-resource-type name="Endpoint (Managed Server)" plugin="&pluginName;"/>
+ <parent-resource-type name="Osgi (Managed Server)" plugin="&pluginName;"/>
</runs-inside>
<plugin-configuration>
@@ -8246,4 +10572,45 @@
</resource-configuration>
</service>
+ <service name="Config Properties"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Custom defined config properties."
+ createDeletePolicy="both">
+
+ <runs-inside>
+ <parent-resource-type name="Connection Definitions" plugin="&pluginName;"/>
+ <parent-resource-type name="Connection Definitions (Profile)" plugin="&pluginName;"/>
+ <parent-resource-type name="Resource Adapter" plugin="&pluginName;"/>
+ <parent-resource-type name="Resource Adapter (Profile)" plugin="&pluginName;"/>
+ </runs-inside>
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="config-properties"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="value" required="false" type="string" readOnly="true" description="Custom defined config property value"/>
+ </resource-configuration>
+ </service>
+
+ <service name="Config Properties (Read Only)"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Custom defined config properties.">
+
+ <runs-inside>
+ <parent-resource-type name="Connection Definitions (Managed Server)" plugin="&pluginName;"/>
+ <parent-resource-type name="Resource Adapter (Managed Server)" plugin="&pluginName;"/>
+ </runs-inside>
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="config-properties"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="value" required="false" type="string" readOnly="true" description="Custom defined config property value"/>
+ </resource-configuration>
+ </service>
+
</plugin>
1
0
modules/core/util/src/main/java/org/rhq/core/util/exception/ThrowableUtil.java | 25 ++++++----
modules/core/util/src/test/java/org/rhq/core/util/exception/ThrowableUtilTest.java | 14 +++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java | 22 +++++---
3 files changed, 38 insertions(+), 23 deletions(-)
New commits:
commit b8f67855445081683f56bd1dd27e0239f7114a9e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 24 17:05:44 2012 -0400
[BZ 824898] fix the logging so we can see the full, real, exception with the ID. this lets you match the gwt client exception with the full server side exception. for some reason, this class lost the ability to log messages to the server log file - i think it happened when we changed to gwt logging
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
index f68d407..7017cc5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java
@@ -29,10 +29,12 @@ import javax.servlet.http.HttpServletResponse;
import com.google.gwt.user.server.rpc.RPCRequest;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
-import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.util.HibernatePerformanceMonitor;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -44,6 +46,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
public abstract class AbstractGWTServiceImpl extends RemoteServiceServlet {
private static final long serialVersionUID = 1L;
+ private Log log = LogFactory.getLog(this.getClass());
private ThreadLocal<Subject> sessionSubject = new ThreadLocal<Subject>();
private ThreadLocal<String> rpcMethod = new ThreadLocal<String>();
@@ -52,9 +55,13 @@ public abstract class AbstractGWTServiceImpl extends RemoteServiceServlet {
return sessionSubject.get();
}
+ protected Log getLog() {
+ return log;
+ }
+
@Override
protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- if (Log.isTraceEnabled()) {
+ if (log.isTraceEnabled()) {
printHeaders(req);
}
@@ -66,11 +73,11 @@ public abstract class AbstractGWTServiceImpl extends RemoteServiceServlet {
Subject subject = subjectManager.getSubjectBySessionId(Integer.parseInt(sid));
sessionSubject.set(subject);
} catch (Exception e) {
- Log.trace("Failed to validate request: sessionId was '" + sid + "', requestURL=" + req.getRequestURL());
+ log.trace("Failed to validate request: sessionId was '" + sid + "', requestURL=" + req.getRequestURL());
continueProcessing = false;
}
} else {
- Log.debug("Failed to validate request: sessionId missing, requestURL=" + req.getRequestURL());
+ log.debug("Failed to validate request: sessionId missing, requestURL=" + req.getRequestURL());
continueProcessing = false;
}
@@ -120,8 +127,7 @@ public abstract class AbstractGWTServiceImpl extends RemoteServiceServlet {
id.append("] ");
// log the exception server-side
- //logger.warning("Sending exception to client: " + id.toString(), t);
- Log.warn("Sending exception to client: " + id.toString(), t);
+ log.warn("Sending exception to client: " + id.toString(), t);
// cannot assume gwt client has our exception classes, only send the messages in a generic runtime exception
return new RuntimeException(id.toString() + ThrowableUtil.getAllMessages(t));
@@ -132,9 +138,9 @@ public abstract class AbstractGWTServiceImpl extends RemoteServiceServlet {
// TODO: figure out why SESSION_NAME header and other GWT-specific headers are missing occasionally
// seems to only happen on polling for recent alerts when there is no user activity for a few minutes
Enumeration<String> headerNames = req.getHeaderNames();
- Log.trace(req.getRequestURL().toString());
+ log.trace(req.getRequestURL().toString());
while (headerNames.hasMoreElements()) {
- Log.trace(" " + headerNames.nextElement());
+ log.trace(" " + headerNames.nextElement());
}
}
}
commit 802ff8d372ca0431c96a7c735021790ec0c0d1c0
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 24 17:03:26 2012 -0400
[BZ 824898] change to the throwables util class: if we were told not to show the class name but the message was null, show the class name at least - otherwise, you'll get an even more useless string of "null"
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/exception/ThrowableUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/exception/ThrowableUtil.java
index 23bc1cf..043856d 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/exception/ThrowableUtil.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/exception/ThrowableUtil.java
@@ -183,10 +183,11 @@ public class ThrowableUtil {
String msg;
+ String tMessage = t.getMessage();
if (includeExceptionName) {
- msg = t.getClass().getName() + ":" + t.getMessage();
+ msg = t.getClass().getName() + ":" + tMessage;
} else {
- msg = t.getMessage();
+ msg = (tMessage != null) ? tMessage : t.getClass().getName();
}
if (t instanceof SQLException) {
@@ -198,10 +199,11 @@ public class ThrowableUtil {
while ((t.getCause() != null) && (t != t.getCause())) {
t = t.getCause();
+ tMessage = t.getMessage();
if (includeExceptionName) {
- msg = t.getClass().getName() + ":" + t.getMessage();
+ msg = t.getClass().getName() + ":" + tMessage;
} else {
- msg = t.getMessage();
+ msg = (tMessage != null) ? tMessage : t.getClass().getName();
}
if (t instanceof SQLException) {
@@ -278,20 +280,24 @@ public class ThrowableUtil {
ArrayList<String> list = new ArrayList<String>();
if (t != null) {
+
+ String tMessage = t.getMessage();
if (includeExceptionName) {
- list.add(t.getClass().getName() + ":" + t.getMessage());
+ list.add(t.getClass().getName() + ":" + tMessage);
} else {
- list.add(t.getMessage());
+ list.add((tMessage != null) ? tMessage : t.getClass().getName());
+
}
while ((t.getNextException() != null) && (t != t.getNextException())) {
String msg;
t = t.getNextException();
+ tMessage = t.getMessage();
if (includeExceptionName) {
- msg = t.getClass().getName() + ":" + t.getMessage();
+ msg = t.getClass().getName() + ":" + tMessage;
} else {
- msg = t.getMessage();
+ msg = (tMessage != null) ? tMessage : t.getClass().getName();
}
list.add(msg + "(error-code=" + t.getErrorCode() + ",sql-state=" + t.getSQLState() + ")");
@@ -355,6 +361,7 @@ public class ThrowableUtil {
while ((t.getCause() != null) && (t != t.getCause())) {
t = t.getCause();
}
- return t.getMessage();
+ String rootMessage = t.getMessage();
+ return (rootMessage != null) ? rootMessage : t.getClass().getName();
}
}
\ No newline at end of file
diff --git a/modules/core/util/src/test/java/org/rhq/core/util/exception/ThrowableUtilTest.java b/modules/core/util/src/test/java/org/rhq/core/util/exception/ThrowableUtilTest.java
index 9d19293..1f76539 100644
--- a/modules/core/util/src/test/java/org/rhq/core/util/exception/ThrowableUtilTest.java
+++ b/modules/core/util/src/test/java/org/rhq/core/util/exception/ThrowableUtilTest.java
@@ -23,6 +23,7 @@
package org.rhq.core.util.exception;
import java.sql.SQLException;
+
import org.testng.annotations.Test;
/**
@@ -38,15 +39,16 @@ public class ThrowableUtilTest {
public void testGetAllMessagesArray() {
assert ThrowableUtil.getAllMessagesArray(null, false).length == 0;
assert ThrowableUtil.getAllMessagesArray(new Throwable(), false).length == 1;
- assert ThrowableUtil.getAllMessagesArray(new Throwable(), false)[0] == null;
+ assert ThrowableUtil.getAllMessagesArray(new Throwable(), false)[0].equals(Throwable.class.getName());
assert ThrowableUtil.getAllMessagesArray(new Throwable((String) null), false).length == 1;
- assert ThrowableUtil.getAllMessagesArray(new Throwable((String) null), false)[0] == null;
+ assert ThrowableUtil.getAllMessagesArray(new Exception((String) null), false)[0].equals(Exception.class
+ .getName());
assert ThrowableUtil.getAllMessagesArray(new Throwable("boo"), false).length == 1;
assert ThrowableUtil.getAllMessagesArray(new Throwable("boo"), false)[0].equals("boo");
assert ThrowableUtil.getAllMessages(null, false).equals(">> exception was null <<");
- assert ThrowableUtil.getAllMessages(new Throwable(), false).equals("null");
- assert ThrowableUtil.getAllMessages(new Throwable((String) null), false).equals("null");
+ assert ThrowableUtil.getAllMessages(new Throwable(), false).equals(Throwable.class.getName());
+ assert ThrowableUtil.getAllMessages(new Throwable((String) null), false).equals(Throwable.class.getName());
assert ThrowableUtil.getAllMessages(new Throwable("boo"), false).equals("boo");
Throwable t = new Throwable("one", new Exception("two", new Error("three")));
@@ -59,9 +61,9 @@ public class ThrowableUtilTest {
t = new Throwable("one", new Exception(null, new Error("three")));
assert ThrowableUtil.getAllMessagesArray(t, false).length == 3;
assert ThrowableUtil.getAllMessagesArray(t, false)[0].equals("one");
- assert ThrowableUtil.getAllMessagesArray(t, false)[1] == null;
+ assert ThrowableUtil.getAllMessagesArray(t, false)[1].equals(Exception.class.getName());
assert ThrowableUtil.getAllMessagesArray(t, false)[2].equals("three");
- assert ThrowableUtil.getAllMessages(t, false).equals("one -> null -> three");
+ assert ThrowableUtil.getAllMessages(t, false).equals("one -> " + Exception.class.getName() + " -> three");
}
public void testSqlException() {
1
0
modules/plugins/jboss-as-7/pom.xml | 6
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 74 ++++++++++
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 4
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java | 53 +++++--
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java | 13 +
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 4
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java | 4
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java | 3
8 files changed, 149 insertions(+), 12 deletions(-)
New commits:
commit 94eb3bb0338c2f16469b942df2912539fac89f07
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu May 24 11:40:12 2012 -0400
[BZ 813066] exclude the 'multicastAddress' trait from the null-metric-values test for Managed Servers, since a null value is expected when the managed servers are not in HA mode (https://bugzilla.redhat.com/show_bug.cgi?id=813066)
(cherry picked from commit b1e5c9b624041846262c53ebebefef102f513307)
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index f0a7f3d..c690ee1 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -380,6 +380,12 @@
<replace dir="${jboss7.home}"
includes="standalone/configuration/standalone*.xml, domain/configuration/host*.xml"
token="<inet-address " value="<loopback-address "/>
+ <!-- TODO (ips, 05/24/12): The below starts the managed servers in HA mode, but it also causes a
+ slew of HornetQ authentication errors - figure out how to make those go
+ away. -->
+ <!--<replace dir="${jboss7.home}"
+ includes="domain/configuration/host.xml"
+ token=' group="main-server-group"' value=' group="other-server-group"'/>-->
</target>
</configuration>
</execution>
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java
index 5d53c02..04c40de 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java
@@ -46,8 +46,8 @@ public abstract class AbstractJBossAS7PluginTest extends AbstractAgentPluginTest
protected static final String PLUGIN_NAME = "JBossAS7";
- public static final String MANAGEMENT_USERNAME = "test";
- public static final String MANAGEMENT_PASSWORD = "test";
+ public static final String MANAGEMENT_USERNAME = "admin";
+ public static final String MANAGEMENT_PASSWORD = "admin";
private static final int TYPE_HIERARCHY_DEPTH = 6;
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java
index 4fe5798..2b7ec7a 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java
@@ -51,7 +51,8 @@ public class GenericJBossAS7PluginTest extends AbstractJBossAS7PluginTest {
public void testAllMetricsHaveNonNullValues() throws Exception {
Map<ResourceType, String[]> excludedMetricNamesByType = new HashMap<ResourceType, String[]>();
// It's normal for the "startTime" trait to be null for a Managed Server that is down/disabled.
- excludedMetricNamesByType.put(ManagedServerTest.RESOURCE_TYPE, new String[] {"startTime"});
+ // It's normal for the "multicastAddress" trait to be null for a Managed Server that is not configured for JGroups HA.
+ excludedMetricNamesByType.put(ManagedServerTest.RESOURCE_TYPE, new String[] {"startTime", "multicastAddress"});
assertAllNumericMetricsAndTraitsHaveNonNullValues(excludedMetricNamesByType);
}
commit 002707acaed4221c7d7e2004d5b4be6c2d787b79
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed May 23 21:31:11 2012 -0400
[BZ 813066] expose new 'multicastAddress' trait on Standalone Server and Managed Server Resources that are running in HA/cluster mode (https://bugzilla.redhat.com/show_bug.cgi?id=813066)
(cherry picked from commit 6eb0643d9d1e27376628048f564759cb87868487)
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index ca247f5..b5b1192 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -62,6 +62,7 @@ import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
+import org.rhq.core.pluginapi.util.StartScriptConfiguration;
import org.rhq.modules.plugins.jbossas7.helper.ServerPluginConfiguration;
import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
@@ -742,6 +743,79 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone
return (T) res.getResult();
}
+ protected Address getServerAddress() {
+ throw new UnsupportedOperationException();
+ }
+
+ protected String getSocketBindingGroup() {
+ throw new UnsupportedOperationException();
+ }
+
+ protected void collectMulticastAddressTrait(MeasurementReport report, MeasurementScheduleRequest request) {
+ Address jgroupsUdpStackAddress = new Address(getServerAddress());
+ jgroupsUdpStackAddress.add("subsystem", "jgroups");
+ jgroupsUdpStackAddress.add("stack", "udp");
+ jgroupsUdpStackAddress.add("transport", "TRANSPORT");
+
+ String socketBinding;
+ try {
+ socketBinding = readAttribute(jgroupsUdpStackAddress, "socket-binding");
+ } catch (Exception e) {
+ socketBinding = null;
+ }
+
+ if (socketBinding != null) {
+ Address jgroupsSocketBindingAddress = new Address(getServerAddress());
+ String socketBindingGroup = getSocketBindingGroup();
+ jgroupsSocketBindingAddress.add("socket-binding-group", socketBindingGroup);
+ jgroupsSocketBindingAddress.add("socket-binding", socketBinding);
+ String multicastHost = null;
+ Integer multicastPort;
+ try {
+ try {
+ Map<String, String> map = readAttribute(jgroupsSocketBindingAddress, "multicast-address", Map.class);
+ String expressionValue = map.get("EXPRESSION_VALUE");
+ int beginIndex = expressionValue.indexOf("${jboss.default.multicast.address");
+ if (beginIndex >= 0) {
+ int endIndex = expressionValue.indexOf('}', beginIndex);
+ if (endIndex >= 0) {
+ String expression = expressionValue.substring(beginIndex + 2, endIndex);
+ StartScriptConfiguration startScriptConfig = getServerComponent().getStartScriptConfiguration();
+ List<String> startScriptArgs = startScriptConfig.getStartScriptArgs();
+ for (String startScriptArg : startScriptArgs) {
+ if (startScriptArg.startsWith("-Djboss.default.multicast.address=")) {
+ multicastHost = startScriptArg.substring("-Djboss.default.multicast.address=".length());
+ break;
+ }
+ }
+ if (multicastHost == null) {
+ int colonIndex = expression.indexOf(':');
+ String defaultValue = (colonIndex >= 0) ? expression.substring(colonIndex + 1) : null;
+ if (defaultValue != null) {
+ multicastHost = defaultValue;
+ } else {
+ log.error("Failed to resolve expression value [" + expressionValue
+ + "] of 'multicast-address' attribute.");
+ }
+ }
+ }
+ }
+ } catch (ClassCastException cce) {
+ multicastHost = readAttribute(jgroupsSocketBindingAddress, "multicast-address");
+ }
+ multicastPort = readAttribute(jgroupsSocketBindingAddress, "multicast-port", Integer.class);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to lookup multicast address for socket binding [" + socketBinding + "].");
+ }
+
+ if (multicastHost != null && multicastPort != null) {
+ String multicastAddress = multicastHost + ":" + multicastPort;
+ MeasurementDataTrait data = new MeasurementDataTrait(request, multicastAddress);
+ report.addData(data);
+ }
+ }
+ }
+
private static class ComplexRequest {
private String prop;
private String sub;
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 3aaa542..50f994a 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -186,6 +186,10 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend
return serverPluginConfig;
}
+ public StartScriptConfiguration getStartScriptConfiguration() {
+ return startScriptConfig;
+ }
+
@Override
public ASConnection getASConnection() {
return connection;
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
index 945682c..d26f54e 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java
@@ -102,18 +102,14 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?>
return super.getAvailability();
}
-
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
-
- Set<MeasurementScheduleRequest> leftovers = new HashSet<MeasurementScheduleRequest>(requests.size());
Set<MeasurementScheduleRequest> skmRequests = new HashSet<MeasurementScheduleRequest>(requests.size());
- for (MeasurementScheduleRequest req : requests) {
- if (req.getName().startsWith("_skm:"))
- skmRequests.add(req);
- }
+ Set<MeasurementScheduleRequest> leftovers = new HashSet<MeasurementScheduleRequest>(requests.size());
for (MeasurementScheduleRequest request : requests) {
- if (request.getName().equals("startTime")) {
+ if (request.getName().startsWith("_skm:")) {
+ skmRequests.add(request);
+ } else if (request.getName().equals("startTime")) {
String path = getPath();
path = path.replace("server-config", "server");
Address address = new Address(path);
@@ -127,10 +123,13 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?>
MeasurementDataTrait data = new MeasurementDataTrait(request, new Date(startTime).toString());
report.addData(data);
}
- } else if (!request.getName().startsWith("_skm:")) {
+ } else if (request.getName().equals("multicastAddress")) {
+ collectMulticastAddressTrait(report, request);
+ } else {
leftovers.add(request);
}
}
+
// Now handle the skm (this could go into a common method with BaseServerComponent's impl.
if (skmRequests.size() > 0) {
Address address = new Address();
@@ -169,6 +168,42 @@ public class ManagedASComponent extends BaseComponent<HostControllerComponent<?>
}
@Override
+ protected Address getServerAddress() {
+ String serverConfigElement = getAddress().get(1);
+ String serverName = serverConfigElement.substring(serverConfigElement.indexOf('=') + 1);
+ Address serverAddress = getAddress().getParent();
+ serverAddress.add("server", serverName);
+ return serverAddress;
+ }
+
+ @Override
+ protected String getSocketBindingGroup() {
+ String socketBindingGroup;
+ try {
+ socketBindingGroup = readAttribute("socket-binding-group");
+ } catch (Exception e) {
+ socketBindingGroup = null;
+ }
+ if (socketBindingGroup == null) {
+ String group;
+ try {
+ group = readAttribute("group");
+ } catch (Exception e) {
+ group = null;
+ }
+ if (group != null) {
+ Address groupAddress = new Address("server-group", group);
+ try {
+ socketBindingGroup = readAttribute(groupAddress, "socket-binding-group");
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ }
+ return socketBindingGroup;
+ }
+
+ @Override
public Configuration loadResourceConfiguration() throws Exception {
Configuration configuration = super.loadResourceConfiguration();
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
index f024530..6eb19f6 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
@@ -63,6 +63,8 @@ public class StandaloneASComponent<T extends ResourceComponent<?>> extends BaseS
String requestName = request.getName();
if (requestName.equals(SERVER_CONFIG_TRAIT)) {
collectConfigTrait(report, request);
+ } else if (requestName.equals("multicastAddress")) {
+ collectMulticastAddressTrait(report, request);
} else {
leftovers.add(request); // handled below
}
@@ -72,6 +74,17 @@ public class StandaloneASComponent<T extends ResourceComponent<?>> extends BaseS
}
@Override
+ protected Address getServerAddress() {
+ return getAddress();
+ }
+
+ @Override
+ protected String getSocketBindingGroup() {
+ // TODO (ips): Can this ever be something other than "standard-sockets"?
+ return "standard-sockets";
+ }
+
+ @Override
public OperationResult invokeOperation(String name,
Configuration parameters) throws Exception {
if (name.equals("start")) {
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index c49a0ee..3c34e96 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -905,6 +905,8 @@
<metric property="status" dataType="trait" displayName="Server state" description="Detailed server state"
displayType="summary"/>
<metric property="startTime" dataType="trait" displayName="Start time of the server" defaultOn="true"/>
+ <metric property="multicastAddress" displayName="JGroups Multicast Address" dataType="trait" displayType="summary"
+ description="the host and port used by JGroups for multicast"/>
<event name="logEntry" description="an entry in a log file"/>
@@ -1322,6 +1324,8 @@
displayType="summary"/>
&serverKindMetrics;
<metric property="startTime" dataType="trait" displayName="Server Start Time" defaultOn="true"/>
+ <metric property="multicastAddress" displayName="JGroups Multicast Address" dataType="trait" displayType="summary"
+ description="the host and port used by JGroups for multicast"/>
<metric property="config-file" dataType="trait" displayName="Server Config File" displayType="summary" defaultInterval="3600000"
description="The name of the server configuration file this server is using"/>
1
0
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java | 3
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 51 +++++++---
modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 2
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java | 2
6 files changed, 41 insertions(+), 21 deletions(-)
New commits:
commit a8339a172dddf1f7b98e4502d8bbc3f8b6ca3208
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu May 24 16:29:18 2012 -0400
[811288] Not part of the fix, additional logging.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java
index 59b3e51..1af10d6 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java
@@ -127,7 +127,7 @@ public class ConfigurationCheckExecutor implements Runnable, Callable {
}
if (checkChildren) {
- for (Resource child : this.inventoryManager.getContainerChildren(resourceContainer)) {
+ for (Resource child : this.inventoryManager.getContainerChildren(resource, resourceContainer)) {
try {
checkConfigurations(child, true);
} catch (Exception e) {
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
index c6f605e..0a4f5c3 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
@@ -166,7 +166,7 @@ public class DriftManager extends AgentService implements DriftAgentService, Dri
}
}
- for (Resource child : inventoryMgr.getContainerChildren(container)) {
+ for (Resource child : inventoryMgr.getContainerChildren(r, container)) {
initSchedules(child, inventoryMgr);
}
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
index bc9d57d..44a388d 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
@@ -348,8 +348,7 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo
availabilityReport.addAvailability(availability);
}
- // traverse the hierarchy using the container's resource, which should be up to date
- for (Resource child : this.inventoryManager.getContainerChildren(resourceContainer)) {
+ for (Resource child : this.inventoryManager.getContainerChildren(resource, resourceContainer)) {
checkInventory(child, availabilityReport, current, isForced, scan);
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index ac2ef61..30680d5 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -1299,22 +1299,42 @@ public class InventoryManager extends AgentService implements ContainerService,
* the container's resource is guaranteed to be up to date.
*
* @param parentResource
- * @return the children, may be empty, not null.
+ * @return the children. parentResouce children if there is no container. May be empty. Not null.
*/
public Set<Resource> getContainerChildren(Resource parentResource) {
- ResourceContainer container = getResourceContainer(parentResource);
- return (null == container) ? parentResource.getChildResources() : container.getResource().getChildResources();
+ return getContainerChildren(parentResource, getResourceContainer(parentResource));
}
- /**
+ /**
* Get the parent resource's children, ensuring we use the resource container version of the resource, because
* the container's resource is guaranteed to be up to date.
*
+ * @param parentResource
* @param parentContainer
- * @return the children, empty if parentContainer is null or there are no children. not null.
+ * @return the children, empty if parentContainer is null or there are no children. not null.
+ * @return the children, may be empty, not null.
*/
- public Set<Resource> getContainerChildren(ResourceContainer parentContainer) {
- return (null == parentContainer) ? new HashSet<Resource>() : parentContainer.getResource().getChildResources();
+ public Set<Resource> getContainerChildren(Resource parentResource, ResourceContainer container) {
+ if (null == container) {
+ return parentResource.getChildResources();
+ }
+
+ Resource parentContainerResource = container.getResource();
+
+ // this is just to log whether there was an reason to actually call this method
+ if (parentResource != parentContainerResource && log.isDebugEnabled()) {
+ Set<Resource> containerChildren = parentContainerResource.getChildResources();
+ Set<Resource> localChildren = parentResource.getChildResources();
+ if (containerChildren.equals(localChildren)) {
+ log.debug("Container resource different from local resource.\n Container: " + parentContainerResource
+ + "\n Local: " + parentResource);
+ } else {
+ log.debug("Container resource different from local resource and children differ!\n Container:"
+ + container + containerChildren + "\n Local:" + parentResource + localChildren);
+ }
+ }
+
+ return parentContainerResource.getChildResources();
}
public Resource getPlatform() {
@@ -1609,7 +1629,7 @@ public class InventoryManager extends AgentService implements ContainerService,
if (parentResourceContainer == null) {
// The parent probably just got uninventoried - log a DEBUG message and abort.
log.debug(resource + " not being prepared for activation - container not found for parent "
- + parentResource + ".");
+ + parentResource + ".");
return false;
}
}
@@ -1629,7 +1649,8 @@ public class InventoryManager extends AgentService implements ContainerService,
// Start the resource, but only if its parent component is running. If the parent is null, that means
// the resource is, itself, the root platform, which we always activate.
- boolean isParentStarted = (parentResourceContainer == null) || (parentResourceContainer.getResourceComponentState() == ResourceComponentState.STARTED);
+ boolean isParentStarted = (parentResourceContainer == null)
+ || (parentResourceContainer.getResourceComponentState() == ResourceComponentState.STARTED);
if (isParentStarted) {
PluginComponentFactory factory = PluginContainer.getInstance().getPluginComponentFactory();
@@ -1983,7 +2004,7 @@ public class InventoryManager extends AgentService implements ContainerService,
ResourceContainer container = getResourceContainer(resource);
if ((container != null) && (container.getResourceComponentState() == ResourceComponentState.STARTED)) {
// traverse the hierarchy using the container's resource, which should be up to date
- for (Resource child : getContainerChildren(container)) {
+ for (Resource child : getContainerChildren(resource, container)) {
deactivateResource(child);
}
@@ -2816,8 +2837,8 @@ public class InventoryManager extends AgentService implements ContainerService,
parentResource = parentResourceContainer.getResource();
} else {
log.debug("Skipping merge of " + resourceFromServer
- + " into local inventory, since a container was not found for its parent "
- + parentResourceFromServer + ".");
+ + " into local inventory, since a container was not found for its parent "
+ + parentResourceFromServer + ".");
return;
}
} else {
@@ -2827,8 +2848,8 @@ public class InventoryManager extends AgentService implements ContainerService,
// See if the Resource already exists in our inventory.
Resource existingResource = findMatchingChildResource(resourceFromServer, parentResource);
- if ((existingResource == null) &&
- (resourceFromServer.getResourceType().getCategory() == ResourceCategory.PLATFORM)) {
+ if ((existingResource == null)
+ && (resourceFromServer.getResourceType().getCategory() == ResourceCategory.PLATFORM)) {
// This should never happen, but add a check so we'll know if it ever does.
log.error("Existing platform [" + this.platform + "] has different Resource type and/or Resource key than "
+ "platform in Server inventory: " + resourceFromServer);
@@ -3047,7 +3068,7 @@ public class InventoryManager extends AgentService implements ContainerService,
if (activate) {
try {
activateResource(resource, container, false);
- for (Resource child : getContainerChildren(container)) {
+ for (Resource child : getContainerChildren(resource, container)) {
activateAndUpgradeResourceRecursively(child, doUpgrade);
}
} catch (InvalidPluginConfigurationException e) {
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
index 92621a3..9ab82cb 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java
@@ -209,7 +209,7 @@ public class MeasurementManager extends AgentService implements MeasurementAgent
scheduleCollection(resourceId, schedules);
}
- for (Resource child : this.inventoryManager.getContainerChildren(container)) {
+ for (Resource child : this.inventoryManager.getContainerChildren(resource, container)) {
reschedule(child);
}
}
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java
index 572fc54..cfa6fa7 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java
@@ -113,7 +113,7 @@ public abstract class AbstractResourceUpgradeHandlingTest extends ResourceUpgrad
"A resource that has not been upgraded due to upgrade error in parent should be stopped.");
//recurse, since the whole subtree under the failed resource should be not upgraded and stopped.
- Set<Resource> children = im.getContainerChildren(rc);
+ Set<Resource> children = im.getContainerChildren(res, rc);
checkResourcesNotUpgraded(children, children.size());
}
}
1
0
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 68 ++++++++--
1 file changed, 56 insertions(+), 12 deletions(-)
New commits:
commit 77d51c191153d189cce5866835fba566c7662bed
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu May 24 21:58:41 2012 +0200
BZ 824889 support outbound sockets
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index bc23504..aeb3112 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -1410,14 +1410,14 @@
<!-- This service locates the ModCluster node identifier aka jvmRoute details, parses getProxyInformation
from a valid modcluster configuration and only exposes webapplications hosted by the AS7 instance co-located
with the RHQ agent. Of these exposed resources the supported enable*/disable*/stop* -context operations
- are supported. In a homogeneous cluster environment where RHQ monitors all cluster members as well the entire
- webapp application context suite should be controllable via RHQ groups or from individual modcluster instances.
+ are supported. In a homogeneous cluster environment where RHQ monitors all cluster members as well the entire
+ webapp application context suite should be controllable via RHQ groups or from individual modcluster instances.
-->
<!-- [BZ 823624] this is disabled until this bug is addressed. Will need to uncomment and populate jvmRoute in
ModClusterContextDiscoveryComponent -->
- <!--<service name="Webapp Context"
+ <!--<service name="Webapp Context"
class="ModClusterContextComponent"
- discovery="ModClusterContextDiscoveryComponent"
+ discovery="ModClusterContextDiscoveryComponent"
description="Webapp Context">
<plugin-configuration>
@@ -1666,7 +1666,7 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="protocol-bindings" required="false" type="string" readOnly="true" description="Protocol binding"/>
+ <c:simple-property name="protocol-bindings" required="false" type="string" readOnly="true" description="Protocol binding"/>
</resource-configuration>
<service name="Post Handler (Managed Server)"
@@ -2018,7 +2018,9 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="true" description="Outbound Socket binding to POP3 server"/>
+ <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="true" description="Outbound Socket binding to SMTP server">
+ <c:option-source target="configuration" expression="*1/remote-destination-outbound-socket-binding=name:type=SocketBindingGroup"/>
+ </c:simple-property>
<c:simple-property name="password" required="false" type="string" readOnly="true" description="Password to authenticate on server"/>
<c:simple-property name="ssl" required="false" type="boolean" readOnly="true" defaultValue="false" description="Does server requires SSL?. The default value is false."/>
<c:simple-property name="username" required="false" type="string" readOnly="true" description="Username to authenticate on server"/>
@@ -2035,7 +2037,9 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="true" description="Outbound Socket binding to POP3 server"/>
+ <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="true" description="Outbound Socket binding to IMAP server">
+ <c:option-source target="configuration" expression="*1/remote-destination-outbound-socket-binding=name:type=SocketBindingGroup"/>
+ </c:simple-property>
<c:simple-property name="password" required="false" type="string" readOnly="true" description="Password to authenticate on server"/>
<c:simple-property name="ssl" required="false" type="boolean" readOnly="true" defaultValue="false" description="Does server requires SSL?. The default value is false."/>
<c:simple-property name="username" required="false" type="string" readOnly="true" description="Username to authenticate on server"/>
@@ -2052,7 +2056,9 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="true" description="Outbound Socket binding to POP3 server"/>
+ <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="true" description="Outbound Socket binding to POP3 server">
+ <c:option-source target="configuration" expression="*1/remote-destination-outbound-socket-binding=name:type=SocketBindingGroup"/>
+ </c:simple-property>
<c:simple-property name="password" required="false" type="string" readOnly="true" description="Password to authenticate on server"/>
<c:simple-property name="ssl" required="false" type="boolean" readOnly="true" defaultValue="false" description="Does server requires SSL?. The default value is false."/>
<c:simple-property name="username" required="false" type="string" readOnly="true" description="Username to authenticate on server"/>
@@ -3546,7 +3552,7 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="protocol-bindings" required="false" type="string" readOnly="false" description="Protocol binding"/>
+ <c:simple-property name="protocol-bindings" required="false" type="string" readOnly="false" description="Protocol binding"/>
</resource-configuration>
<service name="Post Handler"
@@ -3973,6 +3979,38 @@
</c:map-property>
</c:list-property>
</c:group>
+ <c:group name="children:remote-destination-outbound-socket-binding:name+" displayName="Remote outbound sockets">
+ <c:list-property name="*1" displayName="Bindings">
+ <c:map-property name="*:name">
+ <c:simple-property name="name" description="The name of the socket binding. Services which need to access the socket configuration information will find it using this name." readOnly="true"/>
+ <c:simple-property name="port:expr" displayName="Port" required="true" description="The port number of the remote destination to which the outbound socket should connect. ${} Expresions are allowed."/>
+ <c:simple-property name="host" displayName="Host" required="true" description="The host name or the IP address of the remote destination to which this outbound socket will connect."/>
+ <c:simple-property name="source-interface" displayName="Source Interface" required="false" description="The name of the interface which will be used for the source address of the outbound socket.">
+ <c:option-source target="resource" expression="type='Network Interface' plugin=&pluginName;"/>
+ </c:simple-property>
+ <c:simple-property name="source-port:expr" displayName="Source Port" required="false" description="The port number which will be used as the source port of the outbound socket.. ${} Expresions are allowed."/>
+ <c:simple-property name="fixed-source-port" description="Whether the port value should remain fixed even if numeric offsets are applied to the other outbound sockets in the socket group."
+ type="boolean" defaultValue="false"/>
+
+ </c:map-property>
+ </c:list-property>
+ </c:group>
+ <c:group name="children:local-destination-outbound-socket-binding:name+" displayName="Local outbound sockets">
+ <c:list-property name="*2" displayName="Bindings">
+ <c:map-property name="*:name">
+ <c:simple-property name="name" description="The name of the socket binding. Services which need to access the socket configuration information will find it using this name." readOnly="true"/>
+ <c:simple-property name="socket-binding-ref" required="true" readOnly="false" description="The name of the local socket-binding which will be used to determine the port to which this outbound socket connects.">
+ <c:option-source target="configuration" expression="*/socket-binding=name:type=SocketBindingGroup"/>
+ </c:simple-property>
+ <c:simple-property name="source-interface" displayName="Source Interface" required="false" description="The name of the interface which will be used for the source address of the outbound socket.">
+ <c:option-source target="resource" expression="type='Network Interface' plugin=&pluginName;"/>
+ </c:simple-property>
+ <c:simple-property name="source-port:expr" displayName="Source Port" required="false" description="The port number which will be used as the source port of the outbound socket.. ${} Expresions are allowed."/>
+ <c:simple-property name="fixed-source-port" description="Whether the port value should remain fixed even if numeric offsets are applied to the other outbound sockets in the socket group."
+ type="boolean" defaultValue="false"/>
+ </c:map-property>
+ </c:list-property>
+ </c:group>
</resource-configuration>
</service>
@@ -6704,7 +6742,9 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="false" description="Outbound Socket binding to POP3 server"/>
+ <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="false" description="Outbound Socket binding to SMTP server">
+ <c:option-source target="configuration" expression="*1/remote-destination-outbound-socket-binding=name:type=SocketBindingGroup"/>
+ </c:simple-property>
<c:simple-property name="password" required="false" type="string" readOnly="false" description="Password to authenticate on server"/>
<c:simple-property name="ssl" required="false" type="boolean" readOnly="false" defaultValue="false" description="Does server requires SSL?. The default value is false."/>
<c:simple-property name="username" required="false" type="string" readOnly="false" description="Username to authenticate on server"/>
@@ -6726,7 +6766,9 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="false" description="Outbound Socket binding to POP3 server"/>
+ <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="false" description="Outbound Socket binding to IMAP server">
+ <c:option-source target="configuration" expression="*1/remote-destination-outbound-socket-binding=name:type=SocketBindingGroup"/>
+ </c:simple-property>
<c:simple-property name="password" required="false" type="string" readOnly="false" description="Password to authenticate on server"/>
<c:simple-property name="ssl" required="false" type="boolean" readOnly="false" defaultValue="false" description="Does server requires SSL?. The default value is false."/>
<c:simple-property name="username" required="false" type="string" readOnly="false" description="Username to authenticate on server"/>
@@ -6748,7 +6790,9 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="false" description="Outbound Socket binding to POP3 server"/>
+ <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="false" description="Outbound Socket binding to POP3 server">
+ <c:option-source target="configuration" expression="*1/remote-destination-outbound-socket-binding=name:type=SocketBindingGroup"/>
+ </c:simple-property>
<c:simple-property name="password" required="false" type="string" readOnly="false" description="Password to authenticate on server"/>
<c:simple-property name="ssl" required="false" type="boolean" readOnly="false" defaultValue="false" description="Does server requires SSL?. The default value is false."/>
<c:simple-property name="username" required="false" type="string" readOnly="false" description="Username to authenticate on server"/>
1
0
modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java | 17 +++++++---
modules/core/plugin-container-itest/src/test/resources/arquillian.xml | 1
2 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit e2e88d3045ec9a26f04b8326e67467b20931442e
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu May 17 16:26:10 2012 -0400
fix some test failures
(cherry picked from commit c1f2e51dda4421551748deafb4b533371166dd57)
diff --git a/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java b/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java
index c367687..ea11189 100644
--- a/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java
+++ b/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java
@@ -20,8 +20,8 @@ package org.rhq.core.pc.inventory;
import java.io.File;
-import org.jboss.arquillian.container.test.api.Deployer;
import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.TargetsContainer;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -34,6 +34,7 @@ import org.rhq.core.pc.PluginContainerConfiguration;
import org.rhq.core.pc.inventory.testplugin.TestResourceComponent;
import org.rhq.core.pc.inventory.testplugin.TestResourceDiscoveryComponent;
import org.rhq.core.util.file.FileUtil;
+import org.rhq.test.arquillian.AfterDiscovery;
import org.rhq.test.arquillian.BeforeDiscovery;
import org.rhq.test.arquillian.FakeServerInventory;
import org.rhq.test.arquillian.MockingServerServices;
@@ -53,6 +54,7 @@ import static org.mockito.Mockito.when;
public class InventoryManagerTest extends Arquillian {
@Deployment(name = "test")
+ @TargetsContainer("pc")
public static RhqAgentPluginArchive getTestPlugin() {
RhqAgentPluginArchive pluginJar = ShrinkWrap.create(RhqAgentPluginArchive.class, "test-plugin.jar");
return pluginJar
@@ -69,20 +71,27 @@ public class InventoryManagerTest extends Arquillian {
@ArquillianResource
private PluginContainer pluginContainer;
- @ArquillianResource
- private Deployer pluginDeployer;
-
private FakeServerInventory fakeServerInventory;
+ private FakeServerInventory.CompleteDiscoveryChecker discoveryCompleteChecker;
+
@BeforeDiscovery
public void resetServerServices() throws Exception {
// Set up our fake server discovery ServerService, which will auto-import all Resources in reports it receives.
serverServices.resetMocks();
fakeServerInventory = new FakeServerInventory();
+ discoveryCompleteChecker = fakeServerInventory.createAsyncDiscoveryCompletionChecker(2);
when(serverServices.getDiscoveryServerService().mergeInventoryReport(any(InventoryReport.class))).then(
fakeServerInventory.mergeInventoryReport(InventoryStatus.COMMITTED));
}
+ @AfterDiscovery
+ public void waitForAsyncDiscoveries() throws Exception {
+ if (discoveryCompleteChecker != null) {
+ discoveryCompleteChecker.waitForDiscoveryComplete(10000);
+ }
+ }
+
/**
* Tests that Resources are properly synchronized after the plugin container is restarted with a clean data
* directory.
diff --git a/modules/core/plugin-container-itest/src/test/resources/arquillian.xml b/modules/core/plugin-container-itest/src/test/resources/arquillian.xml
index 2eb50c8..b8b9271 100644
--- a/modules/core/plugin-container-itest/src/test/resources/arquillian.xml
+++ b/modules/core/plugin-container-itest/src/test/resources/arquillian.xml
@@ -14,7 +14,6 @@
<container qualifier="pc">
<configuration>
- <property name="mode">manual</property>
<property name="serverServicesImplementationClassName">org.rhq.test.arquillian.MockingServerServices</property>
<property name="insideAgent">true</property>
<property name="startManagementBean">false</property>
1
0
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java | 15 ++++++----
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTestBase.java | 2 +
2 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit a01bc1b1fa16b21872ae99242d14d18a7fc29b6a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu May 24 11:45:54 2012 -0400
[823942] Update test code related to fixes for this issue.
(cherry picked from commit 5c91b4659d17ec66c01260dfa3339d182558702b)
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java
index 8228226..572fc54 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java
@@ -18,9 +18,14 @@
*/
package org.rhq.core.pc.upgrade;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
import java.util.Set;
import org.jmock.Expectations;
+
import org.rhq.core.clientapi.server.discovery.InvalidInventoryReportException;
import org.rhq.core.clientapi.server.discovery.InventoryReport;
import org.rhq.core.domain.configuration.Configuration;
@@ -33,10 +38,6 @@ import org.rhq.core.pc.ServerServices;
import org.rhq.core.pc.inventory.InventoryManager;
import org.rhq.core.pc.inventory.ResourceContainer;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
/**
* An abstract base class for Resource upgrade handling tests.
*
@@ -105,13 +106,15 @@ public abstract class AbstractResourceUpgradeHandlingTest extends ResourceUpgrad
assertFalse(res.getResourceKey().startsWith(UPGRADED_RESOURCE_KEY_PREFIX), "Resource " + res
+ " seems to be upgraded even though it shouldn't.");
- ResourceContainer rc = PluginContainer.getInstance().getInventoryManager().getResourceContainer(res);
+ InventoryManager im = PluginContainer.getInstance().getInventoryManager();
+ ResourceContainer rc = im.getResourceContainer(res);
assertEquals(rc.getResourceComponentState(), ResourceContainer.ResourceComponentState.STOPPED,
"A resource that has not been upgraded due to upgrade error in parent should be stopped.");
//recurse, since the whole subtree under the failed resource should be not upgraded and stopped.
- checkResourcesNotUpgraded(res.getChildResources(), res.getChildResources().size());
+ Set<Resource> children = im.getContainerChildren(rc);
+ checkResourcesNotUpgraded(children, children.size());
}
}
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTestBase.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTestBase.java
index 3035fef..5bdc2d6 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTestBase.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTestBase.java
@@ -23,6 +23,7 @@ package org.rhq.core.pc.upgrade;
import java.util.Set;
import org.jmock.Expectations;
+
import org.rhq.core.domain.discovery.AvailabilityReport;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
@@ -44,6 +45,7 @@ public abstract class ResourceUpgradeTestBase extends PluginContainerTest {
expectations.ignoring(ss.getConfigurationServerService());
expectations.ignoring(ss.getContentServerService());
expectations.ignoring(ss.getCoreServerService());
+ expectations.ignoring(ss.getDriftServerService());
expectations.ignoring(ss.getEventServerService());
expectations.ignoring(ss.getMeasurementServerService());
expectations.ignoring(ss.getOperationServerService());
1
0
modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java | 34 ++++
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 79 +++++-----
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java | 14 +
3 files changed, 88 insertions(+), 39 deletions(-)
New commits:
commit 53a0def0333e9ac88d7301a9970dc853a617f145
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu May 24 13:13:01 2012 -0400
[BZ 824401] handle condition of a missing parent resourceContainer more gracefully in a few places, since it's normal in situations where the corresponding resource was just uninventoried - we now log a DEBUG message, rather than an ERROR message + stack trace; add a PC integration test that verifies Resource uninventory works (https://bugzilla.redhat.com/show_bug.cgi?id=824401)
(cherry picked from commit 5c4322c3a5ac265cb9703b5bd3f58db5af645b02)
diff --git a/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java b/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java
index 3d4a581..c367687 100644
--- a/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java
+++ b/modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java
@@ -46,7 +46,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
/**
- * A unit test for the {@link InventoryManager}.
+ * An integration test for the {@link InventoryManager}.
*
* @author Ian Springer
*/
@@ -115,6 +115,38 @@ public class InventoryManagerTest extends Arquillian {
validatePluginContainerInventory();
}
+ /**
+ * Tests that uninventorying Resources works.
+ *
+ * @throws Exception if an error occurs
+ */
+ @Test(groups = "pc.itest.inventorymanager", dependsOnMethods = "testSyncUnknownResources")
+ public void testUninventoryResources() throws Exception {
+ validatePluginContainerInventory();
+
+ Resource platform = pluginContainer.getInventoryManager().getPlatform();
+ Resource server = platform.getChildResources().iterator().next();
+
+ // Uninventory the server.
+ fakeServerInventory.removeResource(server);
+ pluginContainer.getInventoryManager().uninventoryResource(server.getId());
+
+ platform = pluginContainer.getInventoryManager().getPlatform();
+ Assert.assertNotNull(platform);
+ Assert.assertEquals(platform.getInventoryStatus(), InventoryStatus.COMMITTED);
+
+ Assert.assertTrue(platform.getChildResources().isEmpty(), "Platform still has children: "
+ + platform.getChildResources());
+
+ // Now execute a full discovery.
+ System.out.println("Executing full discovery...");
+ pluginContainer.getInventoryManager().executeServerScanImmediately();
+ pluginContainer.getInventoryManager().executeServiceScanImmediately();
+
+ // Check that inventory is back to what it was before we uninventoried the server.
+ validatePluginContainerInventory();
+ }
+
private void validatePluginContainerInventory() {
System.out.println("Validating PC inventory...");
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 9811153..7288038 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -1498,13 +1498,7 @@ public class InventoryManager extends AgentService implements ContainerService,
ResourceContainer resourceContainer = getResourceContainer(resource);
if (resourceContainer == null) {
PluginComponentFactory factory = PluginContainer.getInstance().getPluginComponentFactory();
- ClassLoader classLoader;
- try {
- classLoader = factory.getResourceClassloader(resource);
- } catch (PluginContainerException e) {
- log.error("Access to resource [" + resource + "] will fail due to missing classloader", e);
- classLoader = null;
- }
+ ClassLoader classLoader = getResourceClassLoader(resource);
resourceContainer = new ResourceContainer(resource, classLoader);
if (!this.configuration.isInsideAgent()) {
// Auto-sync if the PC is running within the embedded JBossAS console.
@@ -1514,20 +1508,29 @@ public class InventoryManager extends AgentService implements ContainerService,
} else {
// container already exists, but make sure the classloader exists too
if (resourceContainer.getResourceClassLoader() == null) {
- PluginComponentFactory factory = PluginContainer.getInstance().getPluginComponentFactory();
- ClassLoader classLoader;
- try {
- classLoader = factory.getResourceClassloader(resource);
- } catch (PluginContainerException e) {
- log.error("Access to resource [" + resource + "] will fail due to missing classloader!", e);
- classLoader = null;
- }
+ ClassLoader classLoader = getResourceClassLoader(resource);
resourceContainer.setResourceClassLoader(classLoader);
}
}
return resourceContainer;
}
+ private ClassLoader getResourceClassLoader(Resource resource) {
+ PluginComponentFactory factory = PluginContainer.getInstance().getPluginComponentFactory();
+ ClassLoader classLoader;
+ try {
+ classLoader = factory.getResourceClassloader(resource);
+ } catch (PluginContainerException e) {
+ if (log.isTraceEnabled()) {
+ log.trace("Access to resource [" + resource + "] will fail due to missing classloader.", e);
+ } else {
+ log.debug("Access to resource [" + resource + "] will fail due to missing classloader - cause: " + e);
+ }
+ classLoader = null;
+ }
+ return classLoader;
+ }
+
/**
* This method prepares the resource and container for activation.
* <p>
@@ -1594,6 +1597,20 @@ public class InventoryManager extends AgentService implements ContainerService,
+ "]...");
}
+ ResourceContainer parentResourceContainer;
+ Resource parentResource = resource.getParentResource();
+ if (parentResource == null) {
+ parentResourceContainer = null;
+ } else {
+ parentResourceContainer = getResourceContainer(parentResource);
+ if (parentResourceContainer == null) {
+ // The parent probably just got uninventoried - log a DEBUG message and abort.
+ log.debug(resource + " not being prepared for activation - container not found for parent "
+ + parentResource + ".");
+ return false;
+ }
+ }
+
// If the component does not even exist yet, we need to instantiate it and set it on the container.
if (component == null) {
if (log.isDebugEnabled()) {
@@ -1601,28 +1618,17 @@ public class InventoryManager extends AgentService implements ContainerService,
}
try {
component = PluginContainer.getInstance().getPluginComponentFactory().buildResourceComponent(resource);
-
} catch (Throwable e) {
throw new PluginContainerException("Could not build component for Resource [" + resource + "]", e);
}
container.setResourceComponent(component);
}
- // start the resource, but only if its parent component is running. If the parent is null, that means
- // the resource is, itself, the root platform and we always activate that.
- ResourceContainer parentResourceContainer;
- boolean isParentStarted;
-
- if (resource.getParentResource() == null) {
- parentResourceContainer = null;
- isParentStarted = true;
- } else {
- parentResourceContainer = getResourceContainer(resource.getParentResource());
- isParentStarted = (parentResourceContainer.getResourceComponentState() == ResourceComponentState.STARTED);
- }
+ // Start the resource, but only if its parent component is running. If the parent is null, that means
+ // the resource is, itself, the root platform, which we always activate.
+ boolean isParentStarted = (parentResourceContainer == null) || (parentResourceContainer.getResourceComponentState() == ResourceComponentState.STARTED);
if (isParentStarted) {
-
PluginComponentFactory factory = PluginContainer.getInstance().getPluginComponentFactory();
ResourceType type = resource.getResourceType();
ResourceDiscoveryComponent discoveryComponent = factory
@@ -1642,8 +1648,8 @@ public class InventoryManager extends AgentService implements ContainerService,
ResourceComponent<?> parentComponent = null;
ResourceContext<?> parentResourceContext = null;
- if (resource.getParentResource() != null) {
- ResourceContainer rc = getResourceContainer(resource.getParentResource());
+ if (parentResource != null) {
+ ResourceContainer rc = getResourceContainer(parentResource);
parentComponent = rc.getResourceComponent();
parentResourceContext = rc.getResourceContext();
@@ -1652,8 +1658,8 @@ public class InventoryManager extends AgentService implements ContainerService,
ResourceContext context = createResourceContext(resource, parentComponent, parentResourceContext,
discoveryComponent);
container.setResourceContext(context);
- return true;
+ return true;
} else {
if (log.isDebugEnabled()) {
log.debug("Resource [" + resource + "] not being prepared for activation; parent isn't started: "
@@ -2806,15 +2812,20 @@ public class InventoryManager extends AgentService implements ContainerService,
if (parentResourceContainer != null) {
parentResource = parentResourceContainer.getResource();
} else {
- parentResource = null; // TODO right thing to do? Or directly return?
+ log.debug("Skipping merge of " + resourceFromServer
+ + " into local inventory, since a container was not found for its parent "
+ + parentResourceFromServer + ".");
+ return;
}
} else {
+ // A null parent means this is the platform.
parentResource = null;
}
// See if the Resource already exists in our inventory.
Resource existingResource = findMatchingChildResource(resourceFromServer, parentResource);
- if (parentResource == null && existingResource == null) {
+ if ((existingResource == null) &&
+ (resourceFromServer.getResourceType().getCategory() == ResourceCategory.PLATFORM)) {
// This should never happen, but add a check so we'll know if it ever does.
log.error("Existing platform [" + this.platform + "] has different Resource type and/or Resource key than "
+ "platform in Server inventory: " + resourceFromServer);
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java
index 5c2eab7..9866a64 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java
@@ -153,7 +153,14 @@ public class PluginComponentFactory implements ContainerService {
};
}
String className = getPluginManager().getMetadataManager().getComponentClass(resourceType);
- ClassLoader resourceClassloader = getResourceClassloader(resource);
+ ResourceContainer resourceContainer = getInventoryManager().getResourceContainer(resource);
+ if (resourceContainer == null) {
+ throw new PluginContainerException("Resource container not found for " + resource + " - cannot create ResourceComponent.");
+ }
+ ClassLoader resourceClassloader = resourceContainer.getResourceClassLoader();
+ if (resourceClassloader == null) {
+ throw new PluginContainerException("Resource classLoader not found for " + resource + " - cannot create ResourceComponent.");
+ }
ResourceComponent component = (ResourceComponent) instantiateClass(resourceClassloader, className);
if (log.isDebugEnabled()) {
@@ -173,7 +180,6 @@ public class PluginComponentFactory implements ContainerService {
* @throws PluginContainerException if the resource's classloader could not be created
*/
public ClassLoader getResourceClassloader(Resource resource) throws PluginContainerException {
-
try {
InventoryManager inventoryMgr = getInventoryManager();
PluginManager pluginMgr = getPluginManager();
@@ -193,8 +199,8 @@ public class PluginComponentFactory implements ContainerService {
if (parentResource != null) {
parentContainer = inventoryMgr.getResourceContainer(parentResource);
if (parentContainer == null) {
- throw new PluginContainerException("Missing parent resource container for parent resource="
- + parentResource);
+ throw new PluginContainerException("Missing container for parent " + parentResource + " of "
+ + resource + ".");
}
} else if (resource.equals(inventoryMgr.getPlatform())) {
// the given resource is our top platform resource - just use its plugin classloader
1
0