[Jboss-cvs] JBossAS SVN: r56360 - trunk/server/src/resources/schema
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 28 16:51:27 EDT 2006
Author: anil.saldhana at jboss.com
Date: 2006-08-28 16:51:27 -0400 (Mon, 28 Aug 2006)
New Revision: 56360
Modified:
trunk/server/src/resources/schema/security-config_5_0.xsd
Log:
JBAS-3577: Role Mapping + Mapping Framework
Modified: trunk/server/src/resources/schema/security-config_5_0.xsd
===================================================================
--- trunk/server/src/resources/schema/security-config_5_0.xsd 2006-08-28 20:51:11 UTC (rev 56359)
+++ trunk/server/src/resources/schema/security-config_5_0.xsd 2006-08-28 20:51:27 UTC (rev 56360)
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
-
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
+ elementFormDefault="qualified"
xmlns:jbsx="urn:jboss:security-config:5.0"
xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
targetNamespace="urn:jboss:security-config:5.0">
-
- <xsd:annotation>
+ <xsd:annotation>
<xsd:appinfo>
<jbxb:schemaBindings>
<jbxb:package name="org.jboss.security.config"/>
@@ -15,42 +13,38 @@
false</jbxb:ignoreUnresolvedFieldOrClass>
</jbxb:schemaBindings>
</xsd:appinfo>
- </xsd:annotation>
-
+ </xsd:annotation>
<xsd:element name="policy">
<xsd:complexType>
<xsd:annotation>
<xsd:appinfo>
- <jbxb:class impl="org.jboss.security.config.PolicyConfig"/>
- </xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.config.PolicyConfig"/>
+ </xsd:appinfo>
</xsd:annotation>
-
<xsd:sequence>
- <xsd:element maxOccurs="unbounded" ref="jbsx:application-policy"/>
+ <xsd:element ref="jbsx:application-policy" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
<xsd:element name="application-policy">
- <xsd:complexType>
+ <xsd:complexType>
<xsd:annotation>
<xsd:appinfo>
<jbxb:class impl="org.jboss.security.config.ApplicationPolicyContainer"/>
- <jbxb:addMethod name="add" valueType="org.jboss.security.config.ApplicationPolicy"/>
- </xsd:appinfo>
+ <jbxb:addMethod name="add" valueType="org.jboss.security.config.ApplicationPolicy"/>
+ </xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
- <xsd:choice>
- <xsd:element ref="jbsx:authentication"/>
- <xsd:element ref="jbsx:authentication-jaspi"/>
- </xsd:choice>
- <xsd:element minOccurs="0" maxOccurs="1"
- ref="jbsx:authorization"/>
+ <xsd:choice>
+ <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"/>
</xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
- </xsd:element>
-
+ </xsd:element>
<xsd:element name="authentication">
<xsd:annotation>
<xsd:appinfo>
@@ -63,20 +57,17 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
<xsd:element name="login-module">
<xsd:complexType>
<xsd:annotation>
<xsd:appinfo>
- <jbxb:class
- impl="org.jboss.security.auth.login.AppConfigurationEntryHolder"/>
+ <jbxb:class impl="org.jboss.security.auth.login.AppConfigurationEntryHolder"/>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="unbounded"
- ref="jbsx:module-option"/>
+ <xsd:element ref="jbsx:module-option" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="code" use="required" type="xsd:string"/>
+ <xsd:attribute name="code" type="xsd:string" use="required"/>
<xsd:attribute name="flag" use="required">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
@@ -89,7 +80,6 @@
</xsd:attribute>
</xsd:complexType>
</xsd:element>
-
<xsd:element name="module-option">
<xsd:complexType mixed="true">
<xsd:annotation>
@@ -98,18 +88,15 @@
while the value should be set with the setter.
This use-case is not supported out-of-the-box. So, we use this container. -->
- <jbxb:class
- impl="org.jboss.security.auth.login.ModuleOptionContainer"/>
+ <jbxb:class impl="org.jboss.security.auth.login.ModuleOptionContainer"/>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
- <xsd:any minOccurs="0" maxOccurs="1" namespace="##other"/>
+ <xsd:any namespace="##other" minOccurs="0"/>
</xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
</xsd:element>
-
-
<xsd:element name="authentication-jaspi">
<xsd:annotation>
<xsd:appinfo>
@@ -117,46 +104,39 @@
</xsd:appinfo>
</xsd:annotation>
<xsd:complexType>
- <xsd:choice>
- <xsd:element maxOccurs="unbounded" ref="jbsx:login-module-stack"/>
- <xsd:element maxOccurs="unbounded" ref="jbsx:auth-module"/>
- </xsd:choice>
+ <xsd:choice>
+ <xsd:element ref="jbsx:login-module-stack" maxOccurs="unbounded"/>
+ <xsd:element ref="jbsx:auth-module" maxOccurs="unbounded"/>
+ </xsd:choice>
</xsd:complexType>
- </xsd:element>
-
+ </xsd:element>
<xsd:element name="login-module-stack">
<xsd:complexType>
<xsd:annotation>
- <xsd:appinfo>
- <jbxb:class
- impl="org.jboss.security.auth.login.LoginModuleStackContainer"/>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.auth.login.LoginModuleStackContainer"/>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
- <xsd:element minOccurs="1" maxOccurs="unbounded"
- ref="jbsx:login-module"/>
+ <xsd:element ref="jbsx:login-module" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
</xsd:element>
-
<xsd:element name="auth-module">
<xsd:complexType>
<xsd:annotation>
<xsd:appinfo>
- <jbxb:class
- impl="org.jboss.security.auth.container.config.AuthModuleEntryHolder"/>
+ <jbxb:class impl="org.jboss.security.auth.container.config.AuthModuleEntryHolder"/>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="unbounded"
- ref="jbsx:module-option"/>
+ <xsd:element ref="jbsx:module-option" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="code" use="required" type="xsd:string"/>
+ <xsd:attribute name="code" type="xsd:string" use="required"/>
<xsd:attribute name="login-module-stack-ref" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
-
<xsd:element name="authorization">
<xsd:annotation>
<xsd:appinfo>
@@ -169,20 +149,17 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
<xsd:element name="policy-module">
<xsd:complexType>
<xsd:annotation>
<xsd:appinfo>
- <jbxb:class
- impl="org.jboss.security.authorization.config.AuthorizationConfigEntryHolder"/>
+ <jbxb:class impl="org.jboss.security.authorization.config.AuthorizationConfigEntryHolder"/>
</xsd:appinfo>
</xsd:annotation>
<xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="unbounded"
- ref="jbsx:module-option"/>
+ <xsd:element ref="jbsx:module-option" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="code" use="required" type="xsd:string"/>
+ <xsd:attribute name="code" type="xsd:string" use="required"/>
<xsd:attribute name="flag" use="required">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
@@ -195,4 +172,30 @@
</xsd:attribute>
</xsd:complexType>
</xsd:element>
+ <xsd:element name="rolemapping">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.mapping.config.RoleMappingConfigContainer"/>
+ <jbxb:addMethod name="addMappingInfo"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element ref="jbsx:mapping-module"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="mapping-module">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.mapping.config.MappingConfigEntryHolder"/>
+ </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:complexType>
+ </xsd:element>
</xsd:schema>
More information about the jboss-cvs-commits
mailing list