[rhq] Branch 'release/jon3.1.x' - modules/plugins

snegrea snegrea at fedoraproject.org
Thu Aug 16 17:33:55 UTC 2012


 modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml |   65 ++++------
 1 file changed, 30 insertions(+), 35 deletions(-)

New commits:
commit 11e017fbfd37d7fc08fa9c3e2a3ad9b03431994e
Author: Stefan Negrea <snegrea at redhat.com>
Date:   Thu Aug 16 12:33:46 2012 -0500

    [BZ 824818] Removing required from keepalive-time because the validation rules on AS7 are too complex and not consistent with the resource definition.
    (cherry picked from commit 10ad78d37ed54185afee537929c7411f0f40b694)

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 ccf8edde..3697ea4 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
@@ -2502,16 +2502,15 @@
           </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 name="keepalive-time" 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" type="long" readOnly="true" description="The time"/>
+              <c:simple-property name="unit" 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."/>
@@ -2530,16 +2529,15 @@
           </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 name="keepalive-time" 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" type="long" readOnly="true" description="The time"/>
+              <c:simple-property name="unit" 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."/>
@@ -2842,15 +2840,14 @@
         <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:simple-property name="time" type="long" readOnly="true" description="The time"/>
+            <c:simple-property name="unit" type="string" readOnly="true" description="The time unit"/>
           </c:map-property>
           <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."/>
@@ -3067,8 +3064,8 @@
 
         <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:simple-property name="time" type="long" readOnly="false" description="The time"/>
+            <c:simple-property name="unit" type="string" readOnly="false" 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."/>
@@ -5485,9 +5482,9 @@
           <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 name="keepalive-time" 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" type="long" readOnly="false" description="The time"/>
+              <c:simple-property name="unit" 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."/>
@@ -5509,9 +5506,9 @@
           <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 name="keepalive-time" 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" type="long" readOnly="false" description="The time"/>
+              <c:simple-property name="unit" 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."/>
@@ -5697,8 +5694,8 @@
 
         <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:simple-property name="time" type="long" readOnly="false" description="The time"/>
+            <c:simple-property name="unit" 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."/>
@@ -5913,8 +5910,8 @@
 
         <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:simple-property name="time" type="long" readOnly="false" description="The time"/>
+            <c:simple-property name="unit" type="string" readOnly="false" 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."/>
@@ -10244,16 +10241,15 @@
         </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="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 name="keepalive-time" 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" type="long" readOnly="false" description="The time"/>
+            <c:simple-property name="unit" 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."/>
@@ -10273,16 +10269,15 @@
         </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="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 name="keepalive-time" 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" type="long" readOnly="false" description="The time"/>
+            <c:simple-property name="unit" 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."/>
@@ -10834,8 +10829,8 @@
 
       <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:simple-property name="time" type="long" readOnly="false" description="The time"/>
+          <c:simple-property name="unit" type="string" readOnly="false" 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."/>
@@ -10913,8 +10908,8 @@
 
       <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:simple-property name="time" type="long" readOnly="false" description="The time"/>
+          <c:simple-property name="unit" 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."/>




More information about the rhq-commits mailing list