[jboss-cvs] JBossAS SVN: r64636 - trunk/server/src/resources/schema.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Aug 16 16:47:30 EDT 2007


Author: anil.saldhana at jboss.com
Date: 2007-08-16 16:47:30 -0400 (Thu, 16 Aug 2007)
New Revision: 64636

Modified:
   trunk/server/src/resources/schema/security-config_5_0.xsd
Log:
update schema with value containers

Modified: trunk/server/src/resources/schema/security-config_5_0.xsd
===================================================================
--- trunk/server/src/resources/schema/security-config_5_0.xsd	2007-08-16 20:41:22 UTC (rev 64635)
+++ trunk/server/src/resources/schema/security-config_5_0.xsd	2007-08-16 20:47:30 UTC (rev 64636)
@@ -1,10 +1,11 @@
 <!-- $Id$ -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
             xmlns:jbsx="urn:jboss:security-config:5.0" 
-            xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb" 
             xmlns="urn:jboss:security-config:5.0" 
+            xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb" 
             targetNamespace="urn:jboss:security-config:5.0" 
-            elementFormDefault="qualified">
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
    <xsd:annotation>
       <xsd:appinfo>
          <jbxb:schemaBindings>
@@ -35,8 +36,8 @@
          </xsd:annotation>
          <xsd:sequence>
             <xsd:choice>
-               <xsd:element ref="jbsx:authentication" minOccurs="0"/>
-               <xsd:element ref="jbsx:authentication-jaspi" minOccurs="0"/>
+               <xsd:element ref="jbsx:authentication"/>
+               <xsd:element ref="jbsx:authentication-jaspi"/>
             </xsd:choice>
             <xsd:element ref="jbsx:authorization" minOccurs="0"/>
             <xsd:element ref="jbsx:rolemapping" minOccurs="0"/>
@@ -95,29 +96,29 @@
       </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="auditInfo">
+      <xsd:annotation>
+         <xsd:appinfo>
+            <jbxb:skip/>
+         </xsd:appinfo>
+      </xsd:annotation>
       <xsd:sequence>
          <xsd:element ref="jbsx:provider-module"/>
       </xsd:sequence>
    </xsd:complexType>
    <xsd:complexType name="identityTrustInfo">
-      <xsd:sequence>
-         <xsd:element ref="jbsx:trust-module"/>
-      </xsd:sequence>
-   </xsd:complexType>
- 
-   <xsd:element name="login-module" type="jbsx:loginModuleInfo"/>
-   <xsd:complexType name="loginModuleInfo">
       <xsd:annotation>
          <xsd:appinfo>
-            <jbxb:class impl="org.jboss.security.auth.login.AppConfigurationEntryHolder"/>
+            <jbxb:skip/>
          </xsd:appinfo>
       </xsd:annotation>
       <xsd:sequence>
-         <xsd:element ref="jbsx:module-option" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element ref="jbsx:trust-module"/>
       </xsd:sequence>
-      <xsd:attribute name="code" type="xsd:string" use="required"/>
-      <xsd:attribute name="flag" use="required">
-        <xsd:annotation>
+   </xsd:complexType>
+    
+   
+   <xsd:simpleType name="module-option-flag">
+      <xsd:annotation>
            <xsd:documentation>The flag attribute controls how a login module
               participates in the overall authentication proceedure.
               Required - The LoginModule is required to succeed. If it
@@ -147,17 +148,27 @@
               LoginModules are configured for an application, then at least
               one sufficient or optional LoginModule must succeed.
            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleType>
-          <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="required" />
-            <xsd:enumeration value="requisite" />
-            <xsd:enumeration value="sufficient" />
-            <xsd:enumeration value="optional" />
-          </xsd:restriction>
-        </xsd:simpleType>
-      </xsd:attribute>
+        </xsd:annotation> 
+      <xsd:restriction base="xsd:string">
+         <xsd:enumeration value="required"/>
+         <xsd:enumeration value="requisite"/>
+         <xsd:enumeration value="sufficient"/>
+         <xsd:enumeration value="optional"/>
+      </xsd:restriction>
+   </xsd:simpleType>
 
+   <xsd:element name="login-module" type="jbsx:loginModuleInfo"/>
+   <xsd:complexType name="loginModuleInfo">
+      <xsd:annotation>
+         <xsd:appinfo>
+            <jbxb:class impl="org.jboss.security.auth.login.AppConfigurationEntryHolder"/>
+         </xsd:appinfo>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element ref="jbsx:module-option" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="code" type="xsd:string" use="required"/>
+      <xsd:attribute name="flag" type="jbsx:module-option-flag" use="required"/>
    </xsd:complexType>
    
    <xsd:element name="module-option">
@@ -214,48 +225,7 @@
             <xsd:element ref="jbsx:module-option" minOccurs="0" maxOccurs="unbounded"/>
          </xsd:sequence>
          <xsd:attribute name="code" type="xsd:string" use="required"/>
-         <xsd:attribute name="flag" use="required">
-          <xsd:annotation>
-           <xsd:documentation>The flag attribute controls how a login module
-              participates in the overall authentication proceedure.
-              Required - The LoginModule is required to succeed. If it
-              succeeds or fails, authentication still continues to proceed
-              down the LoginModule list.
-
-              Requisite - The LoginModule is required to succeed. If it succeeds,
-              authentication continues down the LoginModule list. If it fails,
-              control immediately returns to the application (authentication does not proceed
-              down the LoginModule list).
-
-              Sufficient - The LoginModule is  not required to succeed. If it does
-              succeed, control immediately returns to the application (authentication
-              does not proceed down the LoginModule list). If it fails,
-              authentication continues down the LoginModule list.
-                  
-              Optional - The LoginModule is not required to succeed. If it succeeds or
-              fails, authentication still continues to proceed down the
-              LoginModule list.
-                  
-              The overall authentication succeeds only if
-              all required and requisite LoginModules succeed. If a
-              sufficient LoginModule is configured and succeeds, then only
-              the required and requisite LoginModules prior to that
-              sufficient LoginModule need to have succeeded for the overall
-              authentication to succeed. If no required or requisite
-              LoginModules are configured for an application, then at least
-              one sufficient or optional LoginModule must succeed.
-           </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleType>
-          <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="required" />
-            <xsd:enumeration value="requisite" />
-            <xsd:enumeration value="sufficient" />
-            <xsd:enumeration value="optional" />
-          </xsd:restriction>
-        </xsd:simpleType>
-      </xsd:attribute>
-
+         <xsd:attribute name="flag" type="jbsx:module-option-flag" use="required"/>
       </xsd:complexType>
    </xsd:element>
    <xsd:element name="mapping-module">
@@ -288,55 +258,14 @@
       <xsd:complexType>
          <xsd:annotation>
             <xsd:appinfo>
-               <jbxb:class impl="org.jboss.security.trust.config.TrustConfigEntryHolder"/>
+               <jbxb:class impl="org.jboss.security.identitytrust.config.IdentityTrustConfigEntryHolder"/>
             </xsd:appinfo>
          </xsd:annotation>
          <xsd:sequence>
             <xsd:element ref="jbsx:module-option" minOccurs="0" maxOccurs="unbounded"/>
          </xsd:sequence>
          <xsd:attribute name="code" type="xsd:string" use="required"/>
-         <xsd:attribute name="flag" use="required">
-        <xsd:annotation>
-           <xsd:documentation>The flag attribute controls how a login module
-              participates in the overall authentication proceedure.
-              Required - The LoginModule is required to succeed. If it
-              succeeds or fails, authentication still continues to proceed
-              down the LoginModule list.
-
-              Requisite - The LoginModule is required to succeed. If it succeeds,
-              authentication continues down the LoginModule list. If it fails,
-              control immediately returns to the application (authentication does not proceed
-              down the LoginModule list).
-
-              Sufficient - The LoginModule is  not required to succeed. If it does
-              succeed, control immediately returns to the application (authentication
-              does not proceed down the LoginModule list). If it fails,
-              authentication continues down the LoginModule list.
-                  
-              Optional - The LoginModule is not required to succeed. If it succeeds or
-              fails, authentication still continues to proceed down the
-              LoginModule list.
-                  
-              The overall authentication succeeds only if
-              all required and requisite LoginModules succeed. If a
-              sufficient LoginModule is configured and succeeds, then only
-              the required and requisite LoginModules prior to that
-              sufficient LoginModule need to have succeeded for the overall
-              authentication to succeed. If no required or requisite
-              LoginModules are configured for an application, then at least
-              one sufficient or optional LoginModule must succeed.
-           </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleType>
-          <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="required" />
-            <xsd:enumeration value="requisite" />
-            <xsd:enumeration value="sufficient" />
-            <xsd:enumeration value="optional" />
-          </xsd:restriction>
-        </xsd:simpleType>
-      </xsd:attribute>
-
+         <xsd:attribute name="flag" type="jbsx:module-option-flag" use="required"/>
       </xsd:complexType>
    </xsd:element>
 </xsd:schema>




More information about the jboss-cvs-commits mailing list