modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 91 +++++++++- 1 file changed, 84 insertions(+), 7 deletions(-)
New commits: commit 2bc3201b3a1914ae14f6f2ceaa5d91ec1bc4aff9 Author: Simeon Pinder spinder@redhat.com Date: Fri May 25 17:38:37 2012 -0400
Missed one more option-set update.
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 755fae4..a1cf8cf 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 @@ -4283,7 +4283,27 @@ <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="code" required="true" type="string" readOnly="true" + description="Class name of the module to be instantiated."> + <c:property-options> + <c:option value="AdvancedADLdap" /> + <c:option value="AdvancedLdap" /> + <c:option value="Certificate" /> + <c:option value="CertificateRoles" /> + <c:option value="Client" /> + <c:option value="Database" /> + <c:option value="DatabaseCertificate" /> + <c:option value="DatabaseUsers" /> + <c:option value="Identity" /> + <c:option value="Kerberos" /> + <c:option value="Ldap" /> + <c:option value="LdapExtended" /> + <c:option value="RoleMapping" /> + <c:option value="Simple" /> + <c:option value="SPNEGOUsers" /> + <c:option value="UserRoles" /> + </c:property-options> + </c:simple-property> <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"/> @@ -8183,7 +8203,27 @@ <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="code" required="true" type="string" readOnly="true" + description="Class name of the module to be instantiated."> + <c:property-options> + <c:option value="AdvancedADLdap" /> + <c:option value="AdvancedLdap" /> + <c:option value="Certificate" /> + <c:option value="CertificateRoles" /> + <c:option value="Client" /> + <c:option value="Database" /> + <c:option value="DatabaseCertificate" /> + <c:option value="DatabaseUsers" /> + <c:option value="Identity" /> + <c:option value="Kerberos" /> + <c:option value="Ldap" /> + <c:option value="LdapExtended" /> + <c:option value="RoleMapping" /> + <c:option value="Simple" /> + <c:option value="SPNEGOUsers" /> + <c:option value="UserRoles" /> + </c:property-options> + </c:simple-property> <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"/>
commit e97ca2d233f8a00aab30a31547e4bad83bfcc0d6 Author: Simeon Pinder spinder@redhat.com Date: Fri May 25 15:55:40 2012 -0400
Add option-set values for some more resource-configurations for Security subsystem.
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 9fe561f..755fae4 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 @@ -2970,6 +2970,7 @@
<service name="Security Domain (Managed Server)" discovery="SubsystemDiscovery" + description="Configures a security domain. Authentication, authorization, ACL, mapping, auditing and identity trust are configured here." class="BaseComponent">
<plugin-configuration> @@ -2989,7 +2990,12 @@ </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."/> + <c:simple-property name="cache-type" required="false" type="string" defaultValue="default" 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."> + <c:property-options> + <c:option value="default"/> + <c:option value="infinispan" /> + </c:property-options> + </c:simple-property> </resource-configuration>
<service name="ACL (Managed Server)" @@ -3051,7 +3057,27 @@ <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="code" required="true" type="string" readOnly="true" + description="Class name of the module to be instantiated."> + <c:property-options> + <c:option value="AdvancedADLdap" /> + <c:option value="AdvancedLdap" /> + <c:option value="Certificate" /> + <c:option value="CertificateRoles" /> + <c:option value="Client" /> + <c:option value="Database" /> + <c:option value="DatabaseCertificate" /> + <c:option value="DatabaseUsers" /> + <c:option value="Identity" /> + <c:option value="Kerberos" /> + <c:option value="Ldap" /> + <c:option value="LdapExtended" /> + <c:option value="RoleMapping" /> + <c:option value="Simple" /> + <c:option value="SPNEGOUsers" /> + <c:option value="UserRoles" /> + </c:property-options> + </c:simple-property> <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"/> @@ -4187,7 +4213,12 @@ </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."/> + <c:simple-property name="cache-type" required="false" type="string" defaultValue="default" 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."> + <c:property-options> + <c:option value="default"/> + <c:option value="infinispan" /> + </c:property-options> + </c:simple-property> </resource-configuration>
<service name="ACL (Profile)" @@ -5415,7 +5446,8 @@ <c:simple-property name="formatter" required="false" type="string" readOnly="false" defaultValue="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n" description="Defines a formatter. The default value is %d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n."/> &logLevel; - <c:simple-property name="module" required="true" type="string" readOnly="true" description="The module that the logging handler depends on."/> + <c:simple-property name="module" required="true" type="string" readOnly="true" + description="The module that the logging handler depends on." /> <c:list-property name="properties"> <c:map-property name="properties:collapsed" displayName="Properties"> <c:simple-property name="name:0" displayName="Name" required="true" description="The name of the configuration property."/> @@ -8081,7 +8113,12 @@ </operation>
<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."/> + <c:simple-property name="cache-type" required="false" type="string" defaultValue="default" 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."> + <c:property-options> + <c:option value="default"/> + <c:option value="infinispan" /> + </c:property-options> + </c:simple-property> </resource-configuration>
<service name="ACL"